diff --git a/CHANGELOG.md b/CHANGELOG.md index bbbd44e49..77b8c2360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,402 +1,11 @@ -# 0.13.2 (2018.1.31) -- Hot Module Reload (HMR) fixes -- Bumped all dependencies to latest semver -- Prevent error propagation of `CheckNativeDeps` script - -# 0.13.1 (2018.1.13) -- Hot Module Reload (HMR) fixes -- Bumped all dependencies to latest semver -- Fixed electron-rebuild script -- Fixed tests scripts to run on all platforms -- Skip redux logs in console in test ENV - -# 0.13.0 (2018.1.6) - -#### Additions -- Add native dependencies check on postinstall -- Updated all dependencies to latest semver - -# 0.12.0 (2017.7.8) - -#### Misc -- Removed `babel-polyfill` -- Renamed and alphabetized npm scripts - -#### Breaking -- Changed node dev `__dirname` and `__filename` to node built in fn's (https://github.com/chentsulin/electron-react-boilerplate/pull/1035) -- Renamed `app/bundle.js` to `app/renderer.prod.js` for consistency -- Renamed `dll/vendor.js` to `dll/renderer.dev.dll.js` for consistency - -#### Additions -- Enable node_modules cache on CI - -# 0.11.2 (2017.5.1) - -Yay! Another patch release. This release mostly includes refactorings and router bug fixes. Huge thanks to @anthonyraymond! - -⚠️ Windows electron builds are failing because of [this issue](https://github.com/electron/electron/issues/9321). This is not an issue with the boilerplate ⚠️ - -#### Breaking -- **Renamed `./app/main.development.js` => `./app/main.{dev,prod}.js`:** [#963](https://github.com/chentsulin/electron-react-boilerplate/pull/963) - -#### Fixes -- **Fixed reloading when not on `/` path:** [#958](https://github.com/chentsulin/electron-react-boilerplate/pull/958) [#949](https://github.com/chentsulin/electron-react-boilerplate/pull/949) - -#### Additions -- **Added support for stylefmt:** [#960](https://github.com/chentsulin/electron-react-boilerplate/pull/960) - -# 0.11.1 (2017.4.23) - -You can now debug the production build with devtools like so: -``` -DEBUG_PROD=true npm run package -``` - -🎉🎉🎉 - -#### Additions -- **Added support for debugging production build:** [#fab245a](https://github.com/chentsulin/electron-react-boilerplate/pull/941/commits/fab245a077d02a09630f74270806c0c534a4ff95) - -#### Bug Fixes -- **Fixed bug related to importing native dependencies:** [#933](https://github.com/chentsulin/electron-react-boilerplate/pull/933) - -#### Improvements -- **Updated all deps to latest semver** - -# 0.11.0 (2017.4.19) - -Here's the most notable changes since `v0.10.0`. Its been about a year since a release has been pushed. Expect a new release to be published every 3-4 weeks. - -#### Breaking Changes - -- **Dropped support for node < 6** -- **Refactored webpack config files** -- **Migrate to two-package.json project structure** -- **Updated all devDeps to latest semver** -- **Migrated to Jest:** [#768](https://github.com/chentsulin/electron-react-boilerplate/pull/768) -- **Migrated to `react-router@4`** -- **Migrated to `electron-builder@4`** -- **Migrated to `webpack@2`** -- **Migrated to `react-hot-loader@3`** -- **Changed default live reload server PORT to `1212` from `3000`** - -#### Additions - -- **Added support for Yarn:** [#451](https://github.com/chentsulin/electron-react-boilerplate/pull/451) -- **Added support for Flow:** [#425](https://github.com/chentsulin/electron-react-boilerplate/pull/425) -- **Added support for stylelint:** [#911](https://github.com/chentsulin/electron-react-boilerplate/pull/911) -- **Added support for electron-builder:** [#876](https://github.com/chentsulin/electron-react-boilerplate/pull/876) -- **Added optional support for SASS:** [#880](https://github.com/chentsulin/electron-react-boilerplate/pull/880) -- **Added support for eslint-plugin-flowtype:** [#911](https://github.com/chentsulin/electron-react-boilerplate/pull/911) -- **Added support for appveyor:** [#280](https://github.com/chentsulin/electron-react-boilerplate/pull/280) -- **Added support for webpack dlls:** [#860](https://github.com/chentsulin/electron-react-boilerplate/pull/860) -- **Route based code splitting:** [#884](https://github.com/chentsulin/electron-react-boilerplate/pull/884) -- **Added support for Webpack Bundle Analyzer:** [#922](https://github.com/chentsulin/electron-react-boilerplate/pull/922) - -#### Improvements - -- **Parallelize renderer and main build processes when running `npm run build`** -- **Dynamically generate electron app menu** -- **Improved vscode integration:** [#856](https://github.com/chentsulin/electron-react-boilerplate/pull/856) - -#### Bug Fixes - -- **Fixed hot module replacement race condition bug:** [#917](https://github.com/chentsulin/electron-react-boilerplate/pull/917) [#920](https://github.com/chentsulin/electron-react-boilerplate/pull/920) - -# 0.10.0 (2016.4.18) - -#### Improvements - -- **Use Babel in main process with Webpack build:** [#201](https://github.com/chentsulin/electron-react-boilerplate/pull/201) -- **Change targets to built-in support by webpack:** [#197](https://github.com/chentsulin/electron-react-boilerplate/pull/197) -- **use es2015 syntax for webpack configs:** [#195](https://github.com/chentsulin/electron-react-boilerplate/pull/195) -- **Open application when webcontent is loaded:** [#192](https://github.com/chentsulin/electron-react-boilerplate/pull/192) -- **Upgraded dependencies** - -#### Bug fixed - -- **Fix `npm list electron-prebuilt` in package.js:** [#188](https://github.com/chentsulin/electron-react-boilerplate/pull/188) - - -# 0.9.0 (2016.3.23) - -#### Improvements - -- **Added [redux-logger](https://github.com/fcomb/redux-logger)** -- **Upgraded [react-router-redux](https://github.com/reactjs/react-router-redux) to v4** -- **Upgraded dependencies** -- **Added `npm run dev` command:** [#162](https://github.com/chentsulin/electron-react-boilerplate/pull/162) -- **electron to v0.37.2** - -#### Breaking Changes - -- **css module as default:** [#154](https://github.com/chentsulin/electron-react-boilerplate/pull/154). -- **set default NODE_ENV to production:** [#140](https://github.com/chentsulin/electron-react-boilerplate/issues/140) - - -# 0.8.0 (2016.2.17) - -#### Bug fixed - -- **Fix lint errors** -- **Fix Webpack publicPath for production builds**: [#119](https://github.com/chentsulin/electron-react-boilerplate/issues/119). -- **package script now chooses correct OS icon extension** - -#### Improvements - -- **babel 6** -- **Upgrade Dependencies** -- **Enable CSS source maps** -- **Add json-loader**: [#128](https://github.com/chentsulin/electron-react-boilerplate/issues/128). -- **react-router 2.0 and react-router-redux 3.0** - - -# 0.7.1 (2015.12.27) - -#### Bug fixed - -- **Fixed npm script on windows 10:** [#103](https://github.com/chentsulin/electron-react-boilerplate/issues/103). -- **history and react-router version bump**: [#109](https://github.com/chentsulin/electron-react-boilerplate/issues/109), [#110](https://github.com/chentsulin/electron-react-boilerplate/pull/110). - -#### Improvements - -- **electron 0.36** - - - -# 0.7.0 (2015.12.16) - -#### Bug fixed - -- **Fixed process.env.NODE_ENV variable in webpack:** [#74](https://github.com/chentsulin/electron-react-boilerplate/pull/74). -- **add missing object-assign**: [#76](https://github.com/chentsulin/electron-react-boilerplate/pull/76). -- **packaging in npm@3:** [#77](https://github.com/chentsulin/electron-react-boilerplate/pull/77). -- **compatibility in windows:** [#100](https://github.com/chentsulin/electron-react-boilerplate/pull/100). -- **disable chrome debugger in production env:** [#102](https://github.com/chentsulin/electron-react-boilerplate/pull/102). - -#### Improvements - -- **redux** -- **css-modules** -- **upgrade to react-router 1.x** -- **unit tests** -- **e2e tests** -- **travis-ci** -- **upgrade to electron 0.35.x** -- **use es2015** -- **check dev engine for node and npm** - - -# 0.6.5 (2015.11.7) - -#### Improvements - -- **Bump style-loader to 0.13** -- **Bump css-loader to 0.22** - - -# 0.6.4 (2015.10.27) - -#### Improvements - -- **Bump electron-debug to 0.3** - - -# 0.6.3 (2015.10.26) - -#### Improvements - -- **Initialize ExtractTextPlugin once:** [#64](https://github.com/chentsulin/electron-react-boilerplate/issues/64). - - -# 0.6.2 (2015.10.18) - -#### Bug fixed - -- **Babel plugins production env not be set properly:** [#57](https://github.com/chentsulin/electron-react-boilerplate/issues/57). - - -# 0.6.1 (2015.10.17) - -#### Improvements - -- **Bump electron to v0.34.0** - - -# 0.6.0 (2015.10.16) - -#### Breaking Changes - -- **From react-hot-loader to react-transform** - - -# 0.5.2 (2015.10.15) - -#### Improvements - -- **Run tests with babel-register:** [#29](https://github.com/chentsulin/electron-react-boilerplate/issues/29). - - -# 0.5.1 (2015.10.12) - -#### Bug fixed - -- **Fix #51:** use `path.join(__dirname` instead of `./`. - - -# 0.5.0 (2015.10.11) - -#### Improvements - -- **Simplify webpack config** see [#50](https://github.com/chentsulin/electron-react-boilerplate/pull/50). - -#### Breaking Changes - -- **webpack configs** -- **port changed:** changed default port from 2992 to 3000. -- **npm scripts:** remove `start-dev` and `dev-server`. rename `hot-dev-server` to `hot-server`. - - -# 0.4.3 (2015.9.22) - -#### Bug fixed - -- **Fix #45 zeromq crash:** bump version of `electron-prebuilt`. - - -# 0.4.2 (2015.9.15) - -#### Bug fixed - -- **run start-hot breaks chrome refresh(CTRL+R) (#42)**: bump `electron-debug` to `0.2.1` - - -# 0.4.1 (2015.9.11) - -#### Improvements - -- **use electron-prebuilt version for packaging (#33)** - - -# 0.4.0 (2015.9.5) - -#### Improvements - -- **update dependencies** - - -# 0.3.0 (2015.8.31) - -#### Improvements - -- **eslint-config-airbnb** - - -# 0.2.10 (2015.8.27) - -#### Features - -- **custom placeholder icon** - -#### Improvements - -- **electron-renderer as target:** via [webpack-target-electron-renderer](https://github.com/chentsulin/webpack-target-electron-renderer) - - -# 0.2.9 (2015.8.18) - -#### Bug fixed - -- **Fix hot-reload** - - -# 0.2.8 (2015.8.13) - -#### Improvements - -- **bump electron-debug** -- **babelrc** -- **organize webpack scripts** - - -# 0.2.7 (2015.7.9) - -#### Bug fixed - -- **defaultProps:** fix typos. - - -# 0.2.6 (2015.7.3) - -#### Features - -- **menu** - -#### Bug fixed - -- **package.js:** include webpack build. - - -# 0.2.5 (2015.7.1) - -#### Features - -- **NPM Script:** support multi-platform -- **package:** `--all` option - - -# 0.2.4 (2015.6.9) - -#### Bug fixed - -- **Eslint:** typo, [#17](https://github.com/chentsulin/electron-react-boilerplate/issues/17) and improve `.eslintrc` - - -# 0.2.3 (2015.6.3) - -#### Features - -- **Package Version:** use latest release electron version as default -- **Ignore Large peerDependencies** - -#### Bug fixed - -- **Npm Script:** typo, [#6](https://github.com/chentsulin/electron-react-boilerplate/pull/6) -- **Missing css:** [#7](https://github.com/chentsulin/electron-react-boilerplate/pull/7) - - -# 0.2.2 (2015.6.2) - -#### Features - -- **electron-debug** - -#### Bug fixed - -- **Webpack:** add `.json` and `.node` to extensions for imitating node require. -- **Webpack:** set `node_modules` to externals for native module support. - - -# 0.2.1 (2015.5.30) - -#### Bug fixed - -- **Webpack:** #1, change build target to `atom`. - - -# 0.2.0 (2015.5.30) - -#### Features - -- **Ignore:** `test`, `tools`, `release` folder and devDependencies in `package.json`. -- **Support asar** -- **Support icon** - - -# 0.1.0 (2015.5.27) - -#### Features - -- **Webpack:** babel, react-hot, ... -- **Flux:** actions, api, components, containers, stores.. -- **Package:** darwin (osx), linux and win32 (windows) platform. +# 0.9.3 (6.1.2019) +- Fixed ram being reset when toggling java autodetect [#128](https://github.com/gorilla-devs/GDLauncher/issues/128) +- Updated every console.log to log.log. Now every log is written to the log file +- Added a new theme (Bloody Murder) +- Added more checks for legacy config. Now when the launcher is updated, the old config file should be updated to the new formats if needed [#128](https://github.com/gorilla-devs/GDLauncher/issues/128) +- Fixed the CurseForge modpacks search. It's now more responsive and should give more consistent results [#126](https://github.com/gorilla-devs/GDLauncher/issues/126) [#115](https://github.com/gorilla-devs/GDLauncher/issues/115) +- Started updating the changelog :) [#130](https://github.com/gorilla-devs/GDLauncher/issues/130) +- Added the modpack explorer dialog [#117](https://github.com/gorilla-devs/GDLauncher/issues/117) [#108](https://github.com/gorilla-devs/GDLauncher/issues/108) +- Improved lazy loading performance +- Fixed a bug where clearing the searchbox in the modpacks browser caused the launcher to crash [#125](https://github.com/gorilla-devs/GDLauncher/issues/125) [#116](https://github.com/gorilla-devs/GDLauncher/issues/116) +- Fixed the ram slider color. It now adapts to the themes \ No newline at end of file diff --git a/app/actions/downloadManager.js b/app/actions/downloadManager.js index 0f5e50716..c3b0e80a5 100644 --- a/app/actions/downloadManager.js +++ b/app/actions/downloadManager.js @@ -4,6 +4,7 @@ import { promisify } from 'util'; import axios from 'axios'; import makeDir from 'make-dir'; import fse from 'fs-extra'; +import log from 'electron-log'; import Promise from 'bluebird'; import fs from 'fs'; import Zip from 'adm-zip'; @@ -238,7 +239,7 @@ export function downloadPack(pack) { ); mods = await getModsList(manifest.files, pack); } catch (err) { - console.error(err); + log.error(err); } const totalFiles = diff --git a/app/actions/instancesManager.js b/app/actions/instancesManager.js index 36b2162cd..894bd326a 100644 --- a/app/actions/instancesManager.js +++ b/app/actions/instancesManager.js @@ -43,11 +43,11 @@ export function startInstance(instanceName) { { cwd: path.join(PACKS_PATH, instanceName) }, (error, stdout, stderr) => { if (error) { - console.error(`exec error: ${error}`); + log.error(`Cannot start this instance. Error: ${error}`); return; } - console.log(`stdout: ${stdout}`); - console.log(`stderr: ${stderr}`); + log.log(`stdout: ${stdout}`); + log.log(`stderr: ${stderr}`); } ); dispatch({ diff --git a/app/actions/settings.js b/app/actions/settings.js index e23060aae..fcd4fc494 100644 --- a/app/actions/settings.js +++ b/app/actions/settings.js @@ -27,7 +27,11 @@ export function loadSettings() { const javaSettings = { autodetected: true, path: null, memory: 3072 }; - if (!settings.java || Object.keys(settings.java).length === 0 || isLegacy(javaSettings, settings.java)) { + if (!settings.java || + Object.keys(settings.java).length === 0 || + isLegacy(javaSettings, settings.java) || + typeof settings.java.memory != 'number' + ) { store.set('settings.java', javaSettings); } // Reads the settings again after patching diff --git a/app/app.global.scss b/app/app.global.scss index 5bf991d19..638ae1a1a 100644 --- a/app/app.global.scss +++ b/app/app.global.scss @@ -414,6 +414,19 @@ a:hover { background: var(--secondary-color-2); } +.ant-slider-track, .ant-slider:hover .ant-slider-track { + background-color: var(--primary); +} + +.ant-slider-handle, +.ant-slider-dot-active, +.ant-slider:hover .ant-slider-handle:not(.ant-tooltip-open), +.ant-slider-handle .ant-tooltip-open { + background-color: var(--secondary-color-3); + border: solid 2px var(--primary); + border-color: var(--primary) !important; +} + .container { max-width: 24rem; margin: 1rem auto; diff --git a/app/components/CurseModpackExplorerModal/CurseModpackExplorerModal.js b/app/components/CurseModpackExplorerModal/CurseModpackExplorerModal.js new file mode 100644 index 000000000..4446cea39 --- /dev/null +++ b/app/components/CurseModpackExplorerModal/CurseModpackExplorerModal.js @@ -0,0 +1,53 @@ +import React, { useState, useEffect } from 'react'; +import ContentLoader from 'react-content-loader'; +import axios from 'axios'; +import Modal from '../Common/Modal/Modal'; +import { CURSEMETA_API_URL } from '../../constants'; +import styles from './CurseModpackExplorerModal.scss'; + +const Loader = () => + + {[...Array(Math.round(window.innerHeight / 85))].map((v, i) => )} + +; + +export default props => { + const { addonID } = props.match.params; + const [unMount, setUnMount] = useState(false); + const [packData, setPackData] = useState(null); + + useEffect(async () => { + const { data } = await axios.get(`${CURSEMETA_API_URL}/direct/addon/${addonID}`); + setPackData(data); + }, []); + + return ( + + {packData !== null ?
+

{packData.name}

+
+ +
+
: } + + ) +}; \ No newline at end of file diff --git a/app/components/CurseModpackExplorerModal/CurseModpackExplorerModal.scss b/app/components/CurseModpackExplorerModal/CurseModpackExplorerModal.scss new file mode 100644 index 000000000..f757a7703 --- /dev/null +++ b/app/components/CurseModpackExplorerModal/CurseModpackExplorerModal.scss @@ -0,0 +1,16 @@ +.container { + display: block; + width: 100%; + height: 100%; + text-align: center; + overflow-y: auto; + padding: 30px; +} + +.description { + margin-right: 20px; + img { + max-width: 100%; + height: auto; + } +} \ No newline at end of file diff --git a/app/components/CurseModpacksBrowser/CurseModpacksBrowser.js b/app/components/CurseModpacksBrowser/CurseModpacksBrowser.js index a02b6789a..d8d5373fa 100644 --- a/app/components/CurseModpacksBrowser/CurseModpacksBrowser.js +++ b/app/components/CurseModpacksBrowser/CurseModpacksBrowser.js @@ -21,7 +21,7 @@ import styles from './CurseModpacksBrowser.scss'; function CurseModpacksBrowser(props) { const [packs, setPacks] = useState([]); - const [loading, setLoading] = useState(false); + const [loading, setLoading] = useState(true); const [filterType, setFilterType] = useState('Featured'); const [searchQuery, setSearchQuery] = useState(''); @@ -29,27 +29,27 @@ function CurseModpacksBrowser(props) { loadPacks(); }, [filterType]) - const loadPacks = async (reset = true) => { + const loadPacks = async (reset = true, emptySearch = false) => { setLoading(true); const loadingArr = [...new Array(15)].map(() => ({ loading: true, name: null })); if (reset === true) setPacks(loadingArr); - else setPacks(packs.concat(loadingArr)); + else setPacks(packs => packs.concat(loadingArr)); const res = await axios.get( `${CURSEMETA_API_URL}/direct/addon/search?gameId=432&pageSize=15&index=${ - packs.length}&sort=${filterType}&searchFilter=${encodeURI(searchQuery)}&categoryId=0§ionId=4471&sortDescending=${filterType !== + reset === true ? 0 : packs.length}&sort=${filterType}&searchFilter=${emptySearch === true ? '' : encodeURI(searchQuery)}&categoryId=0§ionId=4471&sortDescending=${filterType !== 'author' && filterType !== 'name'}` ); // We now remove the previous 15 elements and add the real 15 const data = reset === true ? res.data : packs.concat(res.data); - setPacks(data); console.log(packs); + setPacks(data); setLoading(false); }; const loadMore = - !loading && packs.length !== 0 ? ( + !loading && packs.length !== 0 && packs.length % 15 === 0 ? (
{ - loadPacks(true); + loadPacks(); }; const emitEmptySearchText = async () => { setSearchQuery(''); + loadPacks(true, true); }; const downloadLatest = (modpackData) => { - console.log(modpackData); props.addCursePackToQueue('test', modpackData.id, modpackData.defaultFileId) }; @@ -115,16 +115,16 @@ function CurseModpacksBrowser(props) {
Sort By{' '} @@ -148,7 +148,16 @@ function CurseModpacksBrowser(props) { > , - !item.loading && + !item.loading && + + ]} > {item.loading ? ( @@ -202,10 +211,9 @@ function CurseModpacksBrowser(props) { } title={ {item.name} } diff --git a/app/components/CurseModpacksBrowserCreatorModal/CurseModpacksBrowserCreatorModal.js b/app/components/CurseModpacksBrowserCreatorModal/CurseModpacksBrowserCreatorModal.js index f6ef845a2..d0ec127d8 100644 --- a/app/components/CurseModpacksBrowserCreatorModal/CurseModpacksBrowserCreatorModal.js +++ b/app/components/CurseModpacksBrowserCreatorModal/CurseModpacksBrowserCreatorModal.js @@ -51,8 +51,6 @@ const CurseModpackBrowserCreatorModal = props => { }); }; - if (loading) return
Loading...
; - return ( { size="large" style={{ width: 335, display: 'inline-block' }} placeholder="Select a version" + loading={loading} > {_.reverse(versions.map(addon => {addon.fileName}).slice())} diff --git a/app/components/DInstance/DInstance.js b/app/components/DInstance/DInstance.js index cfdd50b86..83f73bffe 100644 --- a/app/components/DInstance/DInstance.js +++ b/app/components/DInstance/DInstance.js @@ -293,6 +293,12 @@ export default class DInstance extends Component { > Create Shortcut + {/* {}} + > + Duplicate + */} this.props.addToQueue(name, version, forgeVersion)} diff --git a/app/components/InstanceCreatorModal/InstanceCreatorModal.js b/app/components/InstanceCreatorModal/InstanceCreatorModal.js index e90b1838a..95aa3f8a0 100644 --- a/app/components/InstanceCreatorModal/InstanceCreatorModal.js +++ b/app/components/InstanceCreatorModal/InstanceCreatorModal.js @@ -142,7 +142,6 @@ class InstanceCreatorModal extends Component { options={this.state.versions} size="large" showSearch={{ filter: this.filter }} - onChange={value => console.log(value)} style={{ width: 335, display: 'inline-block' }} placeholder="Select a version" /> diff --git a/app/constants.js b/app/constants.js index 3959856eb..5107338d8 100644 --- a/app/constants.js +++ b/app/constants.js @@ -60,11 +60,11 @@ export const THEMES = { 'secondary-color-2': '#272b2e', 'secondary-color-3': '#13171a' }, - christmas: { - name: 'Christmas', - primary: '#16A085', - "secondary-color-1": "#4f649d", - "secondary-color-2": "#3b5089", - "secondary-color-3": "#273c75" + bloodyMurder: { + name: 'Bloody Murder', + primary: '#aa1e0f', + "secondary-color-1": "#282c2f", + "secondary-color-2": "#14181b", + "secondary-color-3": "#000407" } }; \ No newline at end of file diff --git a/app/index.js b/app/index.js index 94c80665e..ddd36a741 100644 --- a/app/index.js +++ b/app/index.js @@ -1,5 +1,6 @@ import React from 'react'; import { render } from 'react-dom'; +import log from 'electron-log'; import { AppContainer, setConfig } from 'react-hot-loader'; import Root from './containers/Root'; import { configureStore, history } from './store/configureStore'; @@ -11,10 +12,7 @@ if (module.hot) pureRender: true, // RHL will not change render method }) const store = configureStore(); -console.log( - '%cWelcome to GDLauncher', - 'background: #2c3e50; color: white; display: block; font-size:50px;' -); +log.log('Welcome to GDLauncher'); render( diff --git a/app/reducers/settings.js b/app/reducers/settings.js index ccffabaad..e227019c4 100644 --- a/app/reducers/settings.js +++ b/app/reducers/settings.js @@ -31,6 +31,7 @@ export default function Settings(state = initialState, action) { return { ...state, java: { + ...state.java, autodetected: action.autodetected, path: action.path } diff --git a/app/routes.js b/app/routes.js index 027fccbee..50b41e7a0 100644 --- a/app/routes.js +++ b/app/routes.js @@ -17,7 +17,6 @@ import DManager from './components/DManager/containers/DManagerPage'; import InstanceManagerModal from './components/InstanceManagerModal/containers/InstanceManagerModal'; import Settings from './components/Settings/Settings'; import CurseModpacksBrowser from './components/CurseModpacksBrowser/CurseModpacksBrowser'; -import CurseModpacksBrowserCreatorModal from './components/CurseModpacksBrowserCreatorModal/CurseModpacksBrowserCreatorModal'; const Login = lazy(() => import('./components/Login/Login')); const HomePage = lazy(() => import('./components/Home/containers/HomePage')); @@ -30,6 +29,13 @@ const InstanceCreatorModal = lazy(() => const loginHelperModal = lazy(() => import('./components/LoginHelperModal/LoginHelperModal') ); +const CurseModpacksBrowserCreatorModal = lazy(() => + import('./components/CurseModpacksBrowserCreatorModal/CurseModpacksBrowserCreatorModal') +); +const CurseModpackExplorerModal = lazy(() => + import('./components/CurseModpackExplorerModal/CurseModpackExplorerModal') +); + type Props = { location: object, @@ -133,7 +139,13 @@ class RouteDef extends Component { {isModal ? ( + ) : null} + {isModal ? ( + ) : null} {isModal ? ( diff --git a/app/utils/cli.js b/app/utils/cli.js index fbbb80eb7..eb3eaa272 100644 --- a/app/utils/cli.js +++ b/app/utils/cli.js @@ -1,5 +1,6 @@ import minimist from 'minimist'; import { exec } from 'child_process'; +import log from 'electron-log'; import launchCommand from './MCLaunchCommand'; import store from '../localStore'; @@ -11,11 +12,11 @@ const parseCLI = async (data, callback) => { await launchCommand(instanceName, auth), (error, stdout, stderr) => { if (error) { - console.error(`exec error: ${error}`); + log.error(`exec error: ${error}`); return; } - console.log(`stdout: ${stdout}`); - console.log(`stderr: ${stderr}`); + log.log(`stdout: ${stdout}`); + log.log(`stderr: ${stderr}`); } ); start.on('exit', () => { diff --git a/app/utils/getMCFilesList.js b/app/utils/getMCFilesList.js index d44e4af93..9304f0e9d 100644 --- a/app/utils/getMCFilesList.js +++ b/app/utils/getMCFilesList.js @@ -136,7 +136,6 @@ export const getForgeLibraries = async forge => { }; export const computeVanillaAndForgeLibraries = async (vnl, forge) => { - console.log(vnl); let libraries = []; if (forge !== null) { libraries = await getForgeLibraries(forge); diff --git a/package.json b/package.json index db91e6f50..97ae4b348 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "gdlauncher", "productName": "GDLauncher", "main": "./app/main.prod.js", - "version": "0.9.1", + "version": "0.9.3", "description": "GDLauncher is simple, yet powerful Minecraft custom launcher with a strong focus on the user experience", "scripts": { "build": "yarn build-antd && concurrently \"yarn build-main\" \"yarn build-renderer\"", @@ -292,6 +292,7 @@ "react-router-dom": "^4.3.1", "react-sortable-hoc": "^0.8.4", "react-transition-group": "^2.5.2", + "react-window": "^1.5.0", "redux": "^4.0.1", "redux-thunk": "^2.3.0", "request": "^2.88.0", diff --git a/yarn.lock b/yarn.lock index 91535e73b..3fa42d9d4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1131,6 +1131,13 @@ pirates "^4.0.0" source-map-support "^0.5.9" +"@babel/runtime@^7.0.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f" + integrity sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg== + dependencies: + regenerator-runtime "^0.12.0" + "@babel/runtime@^7.1.2": version "7.1.5" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.1.5.tgz#4170907641cf1f61508f563ece3725150cc6fe39" @@ -8454,6 +8461,11 @@ mem@^4.0.0: mimic-fn "^1.0.0" p-is-promise "^1.1.0" +memoize-one@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-3.1.1.tgz#ef609811e3bc28970eac2884eece64d167830d17" + integrity sha512-YqVh744GsMlZu6xkhGslPSqSurOv6P+kLN2J3ysBZfagLcL5FdRK/0UpgLoL8hwjjEvvAVkjJZyFP+1T6p1vgA== + memory-fs@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290" @@ -11234,6 +11246,14 @@ react-transition-group@^2.5.2: prop-types "^15.6.2" react-lifecycles-compat "^3.0.4" +react-window@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.5.0.tgz#3e56b720b97666bce38a9e932bdd238d56e258f1" + integrity sha512-55WeZKjMNF5JdCuKghc/H65DBecoeGgH8MOX3CgT7BJ66xb4ITRuXPUlz0qU6r50wetdF/oLhorYBRvKD4Z1IQ== + dependencies: + "@babel/runtime" "^7.0.0" + memoize-one "^3.1.1" + react@next: version "16.7.0-alpha.2" resolved "https://registry.yarnpkg.com/react/-/react-16.7.0-alpha.2.tgz#924f2ae843a46ea82d104a8def7a599fbf2c78ce"