From d45cfc487f45ccf26212a42f1c34acab956d2c2e Mon Sep 17 00:00:00 2001 From: WillowWillowWillow Date: Mon, 13 Feb 2017 16:03:42 -0600 Subject: [PATCH 1/2] Skip Tutorial Added a Skip-Tutorial button to the settings menu! --- app/components/Settings.js | 16 +++++++++++++++- app/containers/Account.js | 4 ++-- app/containers/Players.js | 6 +++++- app/reducers/settings.js | 1 + 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/components/Settings.js b/app/components/Settings.js index 7529dab..561314e 100644 --- a/app/components/Settings.js +++ b/app/components/Settings.js @@ -77,7 +77,8 @@ export class Settings extends Component { render() { const { - rpm, minCredits, maxCard, autoStop, snipeOnly, autoUpdate, buy, sell, bin, relistAll + rpm, minCredits, maxCard, autoStop, snipeOnly, + skipTutorial, autoUpdate, buy, sell, bin, relistAll } = this.props.settings; return (
@@ -150,6 +151,18 @@ export class Settings extends Component { />
+
+
+ +

Automatically skip the tutorial on startup

+
+
+ (this.skipTutorialInput = skipTutorialInput)} name="skipTutorial" + checked={skipTutorial} type="checkbox" onChange={this.handleChange.bind(this)} + /> +
+
Price Settings
@@ -241,6 +254,7 @@ Settings.propTypes = { maxCard: PropTypes.string, autoStop: PropTypes.string, snipeOnly: PropTypes.bool, + skipTutorial: PropTypes.bool, autoUpdate: PropTypes.bool, buy: PropTypes.string, sell: PropTypes.string, diff --git a/app/containers/Account.js b/app/containers/Account.js index a167392..63bf82f 100644 --- a/app/containers/Account.js +++ b/app/containers/Account.js @@ -211,8 +211,8 @@ export class Account extends Component {

Connect to EA Sports

- Automate your transfer market bidding by connecting - your Origin account to FIFA Autobuyer. + Automate your transfer market bidding by connecting + your Origin account to FIFA Autobuyer.

diff --git a/app/containers/Players.js b/app/containers/Players.js index f3bc680..a205eee 100644 --- a/app/containers/Players.js +++ b/app/containers/Players.js @@ -195,6 +195,7 @@ export class Players extends Component { return (
+ { this.props.skipTutorial ? null : (this.joyride = c)} steps={steps} @@ -207,6 +208,7 @@ export class Players extends Component { run locale={{ back: 'Back', close: 'Close', last: 'Done', next: 'Next', skip: 'Skip' }} /> + }
@@ -283,6 +285,7 @@ Players.propTypes = { pathname: PropTypes.string }), bidding: PropTypes.bool, + skipTutorial: PropTypes.bool, start: PropTypes.func, stop: PropTypes.func, clear: PropTypes.func, @@ -296,7 +299,8 @@ function mapStateToProps(state) { return { player: state.player, history: state.history, - bidding: state.bid.bidding + bidding: state.bid.bidding, + skipTutorial: state.settings.skipTutorial }; } diff --git a/app/reducers/settings.js b/app/reducers/settings.js index 0410e6b..3b58628 100644 --- a/app/reducers/settings.js +++ b/app/reducers/settings.js @@ -7,6 +7,7 @@ export const initialState = { maxCard: '10', autoStop: '0', snipeOnly: false, + skipTutorial: false, autoUpdate: true, buy: '90', sell: '100', From ff0792828df4cc535acdcd2ffdaca462700b2948 Mon Sep 17 00:00:00 2001 From: Jason Hunter Date: Mon, 13 Feb 2017 23:03:28 -0500 Subject: [PATCH 2/2] fix tests, fix baseId calculation, bump version --- app/containers/Players.js | 32 ++++++++++++++++++-------------- app/package.json | 2 +- package.json | 4 ++-- test/reducers/settings.spec.js | 1 + 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app/containers/Players.js b/app/containers/Players.js index a205eee..3024022 100644 --- a/app/containers/Players.js +++ b/app/containers/Players.js @@ -195,20 +195,24 @@ export class Players extends Component { return (
- { this.props.skipTutorial ? null : - (this.joyride = c)} - steps={steps} - stepIndex={0} - autoStart={!Object.keys(players).length} - type="continuous" - showSkipButton - showStepsProgress - disableOverlay - run - locale={{ back: 'Back', close: 'Close', last: 'Done', next: 'Next', skip: 'Skip' }} - /> - } + { + this.props.skipTutorial + ? + null + : + (this.joyride = c)} + steps={steps} + stepIndex={0} + autoStart={!Object.keys(players).length} + type="continuous" + showSkipButton + showStepsProgress + disableOverlay + run + locale={{ back: 'Back', close: 'Close', last: 'Done', next: 'Next', skip: 'Skip' }} + /> + }
diff --git a/app/package.json b/app/package.json index 17e01e3..3e25908 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "fifa-autobuyer", "productName": "FIFA Autobuyer", - "version": "0.4.1", + "version": "0.4.2", "description": "Autobuyer for FIFA 17 Ultimate Team", "main": "./main.js", "author": { diff --git a/package.json b/package.json index a9e01c3..33f5433 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "fifa-autobuyer", "productName": "FIFA Autobuyer", - "version": "0.4.1", + "version": "0.4.2", "description": "Autobuyer for FIFA 17 Ultimate Team", "main": "main.js", "scripts": { @@ -162,7 +162,7 @@ "electron-auto-updater": "^0.9.2", "electron-debug": "^1.1.0", "font-awesome": "^4.7.0", - "fut-promise": "^1.1.0", + "fut-promise": "^1.1.1", "highcharts": "^5.0.6", "jquery": "^3.1.1", "lodash": "^4.16.3", diff --git a/test/reducers/settings.spec.js b/test/reducers/settings.spec.js index dd15840..a118dbe 100644 --- a/test/reducers/settings.spec.js +++ b/test/reducers/settings.spec.js @@ -12,6 +12,7 @@ describe('reducers', () => { maxCard: '10', autoStop: '0', snipeOnly: false, + skipTutorial: false, autoUpdate: true, buy: '90', sell: '100',