Skip to content
Permalink
Browse files

v0.7.7

* Moved webpack configs to 'config' folder
* Updated files to 0.16 electron-react-boilerplate
* Updated all npm packages
* Replaced react-redux-router with connected-react-router
* Replaced last module.exports with export default
* Removed unused counter action and reducer
* Updated babel to v7
*
  • Loading branch information...
killpowa committed Oct 28, 2018
1 parent 1646213 commit 5865b5cf5da128b44aeb40ade456bed3051104d7
Showing with 14,100 additions and 15,172 deletions.
  1. +0 −27 .babelrc
  2. +8 −25 .eslintrc
  3. +1 −1 .prettierrc
  4. +2 −2 .stylelintrc
  5. +5 −2 .travis.yml
  6. +7 −3 .vscode/settings.json
  7. +1 −1 app/actions/auth.js
  8. +4 −0 app/babel-register.js
  9. +3 −3 app/components/Common/Modal/Modal.js
  10. +82 −38 app/components/Common/SideBar/SideBar.js
  11. +3 −4 app/components/DInstance/DInstance.js
  12. +1 −1 app/components/InstanceCreatorModal/InstanceCreatorModal.js
  13. +18 −15 app/components/InstanceManagerModal/ModsManager/ModsBrowser/ModsList.js
  14. +1 −1 app/components/InstanceManagerModal/Settings/Settings.js
  15. +1 −1 app/constants.js
  16. +1 −1 app/containers/Root.js
  17. +1 −1 app/index.js
  18. +0 −3 app/main.dev.js
  19. +0 −289 app/menu.js
  20. +1 −1 app/package-lock.json
  21. +2 −2 app/package.json
  22. +0 −21 app/reducers/counter.js
  23. +17 −15 app/reducers/index.js
  24. +12 −12 app/store/configureStore.dev.js
  25. +11 −5 app/store/configureStore.js
  26. +3 −3 app/store/configureStore.prod.js
  27. +6 −6 app/utils/getAppPath.js
  28. +69 −0 babel.config.js
  29. +8 −6 { → config}/webpack.config.base.js
  30. +3 −0 config/webpack.config.eslint.js
  31. +15 −15 { → config}/webpack.config.main.prod.js
  32. +7 −7 { → config}/webpack.config.renderer.dev.dll.js
  33. +8 −8 { → config}/webpack.config.renderer.dev.js
  34. +27 −25 { → config}/webpack.config.renderer.prod.js
  35. +1 −6 { → config}/webpack.config.web.dev.js
  36. +26 −15 internals/scripts/CheckNativeDep.js
  37. +1 −1 internals/scripts/ElectronRebuild.js
  38. +13,629 −14,522 package-lock.json
  39. +115 −81 package.json
  40. +0 −3 webpack.config.eslint.js

This file was deleted.

@@ -4,21 +4,16 @@
"sourceType": "module",
"allowImportExportEverywhere": true
},
"extends": [
"airbnb",
"prettier",
"prettier/flowtype",
"prettier/react"
],
"extends": ["airbnb", "prettier", "prettier/flowtype", "prettier/react"],
"env": {
"browser": true,
"node": true
},
"rules": {
"linebreak-style": 0,
"arrow-parens": [
"off"
],
"arrow-parens": ["off"],
"compat/compat": "error",
"consistent-return": "off",
"comma-dangle": "off",
"flowtype/boolean-style": ["error", "boolean"],
"flowtype/define-flow-type": "warn",
"flowtype/delimiter-dangle": ["error", "never"],
@@ -36,9 +31,6 @@
"flowtype/union-intersection-spacing": ["error", "always"],
"flowtype/use-flow-type": "error",
"flowtype/valid-syntax": "error",
"compat/compat": "error",
"consistent-return": "off",
"comma-dangle": "off",
"generator-star-spacing": "off",
"import/no-unresolved": "error",
"import/no-extraneous-dependencies": "off",
@@ -66,26 +58,17 @@
"react/jsx-filename-extension": [
"error",
{
"extensions": [
".js",
".jsx"
]
"extensions": [".js", ".jsx"]
}
],
"react/prefer-stateless-function": "off"
},
"plugins": [
"flowtype",
"import",
"promise",
"compat",
"react"
],
"plugins": ["flowtype", "import", "promise", "compat", "react"],
"settings": {
"import/resolver": {
"webpack": {
"config": "webpack.config.eslint.js"
}
}
}
}
}
@@ -1,7 +1,7 @@
{
"overrides": [
{
"files": [".prettierrc", ".babelrc", ".eslintrc"],
"files": [".prettierrc", ".babelrc", ".eslintrc", ".stylelintrc"],
"options": {
"parser": "json"
}
@@ -1,3 +1,3 @@
{
"extends": "stylelint-config-recommended"
}
"extends": ["stylelint-config-standard", "stylelint-config-prettier"]
}
@@ -7,18 +7,21 @@ matrix:
language: node_js
node_js:
- node
- 9
- 8
addons:
apt:
update: true
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-multilib
- g++-4.8
- g++-multilib
- icnsutils
- graphicsmagick
- xz-utils
- xorriso
- rpm
before_install:
# This should fix https://github.com/travis-ci/travis-ci/issues/9630
- sudo chown -R travis:travis $HOME/.cache
@@ -28,7 +31,7 @@ matrix:
language: node_js
node_js:
- node
- 9
- 8
env:
- ELECTRON_CACHE=$HOME/.cache/electron
- ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
@@ -17,11 +17,15 @@
},
"editor.tabSize": 2,
"files.associations": {
".eslintrc": "jsonc",
".babelrc": "jsonc",
".prettierrc": "jsonc"
".eslintrc": "jsonc",
".prettierrc": "jsonc",
".stylelintrc": "json",
".dockerignore": "ignore",
".eslintignore": "ignore",
".flowconfig": "ignore"
},
"javascript.format.enable": true,
"typescript.validate.enable": false,
"typescript.format.enable": false,
"typescript.format.enable": false
}
@@ -1,5 +1,5 @@
import axios from 'axios';
import { push } from 'react-router-redux';
import { push } from 'connected-react-router';
import { message } from 'antd';
import path from 'path';
import fsa from 'fs-extra';
@@ -0,0 +1,4 @@
const path = require('path');
require('@babel/register')({
cwd: path.join(__dirname, '..')
});
@@ -20,7 +20,7 @@ export default class Modal extends Component<Props> {
transition: 'all 200ms',
willChange: 'transform',
transitionTimingFunction: 'ease-in-out',
...this.props.style
...props.style
},
bgStyle: {
background: 'rgba(0, 0, 0, 0)',
@@ -33,7 +33,7 @@ export default class Modal extends Component<Props> {
setTimeout(this.mountStyle, 10); // call the into animiation
}

componentWillReceiveProps(newProps) { // check for the mounted props
componentWillReceiveProps = (newProps) => { // check for the mounted props
if (newProps.unMount) {
setTimeout(this.props.history.goBack, 200);
return this.unMountStyle(); // call the into animiation
@@ -42,7 +42,7 @@ export default class Modal extends Component<Props> {
}


unMountStyle() { // css for unmount animation
unMountStyle = () => { // css for unmount animation
this.setState({
style: {
display: 'block',
@@ -11,9 +11,7 @@ import * as AuthActions from '../../../actions/auth';
import * as ProfileActions from '../../../actions/profile';
import * as autoUpdater from '../../../actions/autoUpdater';


type Props = {
};
type Props = {};

class SideBar extends Component<Props> {
props: Props;
@@ -22,34 +20,65 @@ class SideBar extends Component<Props> {
super(props);
this.state = {
updateTextVisible: true
}
this.props.checkForUpdates();
};
}

componentDidMount = () => {
this.props.checkForUpdates();
};

render() {
return (
<aside className={styles.sidenav}>
{this.props.updateAvailable && <div className={styles.updateAvailable}>
<Button loading={this.props.updating} onClick={this.props.update} type="primary" size="small" style={{ marginLeft: 5 }}>
<a href={`https://github.com/gorilla-devs/GDLauncher/releases/tag/v${this.props.latestVersion}`} target="_blank" rel="noopener noreferrer">
Update Available ({this.props.latestVersion})
{this.props.updateAvailable && (
<div className={styles.updateAvailable}>
<Button
loading={this.props.updating}
onClick={this.props.update}
type="primary"
size="small"
style={{ marginLeft: 5 }}
>
<a
href={`https://github.com/gorilla-devs/GDLauncher/releases/tag/v${
this.props.latestVersion
}`}
target="_blank"
rel="noopener noreferrer"
>
Update Available ({this.props.latestVersion})
</a>
</Button>
</div>}
</Button>
</div>
)}
<div className={styles.header}>
<span>
<CIcon size={32}>
{this.props.username && this.props.username.charAt(0).toUpperCase()}
{this.props.username &&
this.props.username.charAt(0).toUpperCase()}
</CIcon>
</span>
<span>{this.props.username}</span>
<div onClick={() => this.props.logout()}>
<i className={`fas fa-sign-out-alt ${styles.logout}`} />
</div>
</div>
<div style={{ textAlign: 'center', fontWeight: 'italic', fontSize: 12 }}>
<span>Playing on</span> <Popover placement="left" title="Title">
<b className={styles.playingServer} style={{ fontStyle: 'italic', fontWeight: '900', fontSize: 13, cursor: 'pointer' }}>AnonymousCraft</b>
<div
style={{ textAlign: 'center', fontWeight: 'italic', fontSize: 12 }}
>
<span>Playing on</span>{' '}
<Popover placement="left" title="Title">
<b
className={styles.playingServer}
style={{
fontStyle: 'italic',
fontWeight: '900',
fontSize: 13,
cursor: 'pointer'
}}
>
AnonymousCraft
</b>
</Popover>
</div>
<hr />
@@ -65,35 +94,44 @@ class SideBar extends Component<Props> {
<div style={{ height: 1000 }}>
<div className={styles.serv}>
AnonymousCraft
<i className='fas fa-play' style={{ marginTop: 3 }} />
</div>
<div className={styles.serv}>
HyPixel
</div>
<div className={styles.serv}>
PvPWars
</div>
<div className={styles.serv}>
Mineplex
<i className="fas fa-play" style={{ marginTop: 3 }} />
</div>
<div className={styles.serv}>HyPixel</div>
<div className={styles.serv}>PvPWars</div>
<div className={styles.serv}>Mineplex</div>
</div>
</div>
<hr />
<div className={styles.socialsContainer}>
{ /* eslint-disable */}
<a href="https://twitter.com/gorilladevs" target="_blank" rel="noopener noreferrer" className={styles.socialBtn}>
{/* eslint-disable */}
<a
href="https://twitter.com/gorilladevs"
target="_blank"
rel="noopener noreferrer"
className={styles.socialBtn}
>
<i className="fab fa-twitter" />
</a>
<a href="https://facebook.com/gorilladevs" target="_blank" rel="noopener noreferrer" className={styles.socialBtn}>
<i className="fab fa-facebook"
/>
<a
href="https://facebook.com/gorilladevs"
target="_blank"
rel="noopener noreferrer"
className={styles.socialBtn}
>
<i className="fab fa-facebook" />
</a>
<a href="https://discordapp.com/invite/4cGYzen" target="_blank" rel="noopener noreferrer" className={styles.socialBtn}>
<i className="fab fa-discord"
/>
<a
href="https://discordapp.com/invite/4cGYzen"
target="_blank"
rel="noopener noreferrer"
className={styles.socialBtn}
>
<i className="fab fa-discord" />
</a>
<span className={styles.version}>v{require('../../../package.json').version}</span>
{ /* eslint-enable */}
<span className={styles.version}>
v{require('../../../package.json').version}
</span>
{/* eslint-enable */}
</div>
</aside>
);
@@ -108,12 +146,18 @@ function mapStateToProps(state) {
downloadQueue: state.downloadManager.downloadQueue,
updateAvailable: state.autoUpdater.updateAvailable,
updating: state.autoUpdater.checkingForUpdates,
latestVersion: state.autoUpdater.latestVersion,
latestVersion: state.autoUpdater.latestVersion
};
}

function mapDispatchToProps(dispatch) {
return bindActionCreators({ ...AuthActions, ...ProfileActions, ...autoUpdater }, dispatch);
return bindActionCreators(
{ ...AuthActions, ...ProfileActions, ...autoUpdater },
dispatch
);
}

export default connect(mapStateToProps, mapDispatchToProps)(SideBar);
export default connect(
mapStateToProps,
mapDispatchToProps
)(SideBar);

0 comments on commit 5865b5c

Please sign in to comment.
You can’t perform that action at this time.