Merge pull request #132 from hunterjm/develop

v0.4.2
hunterjm · Feb 14, 2017 · 6c0dbb5 · 6c0dbb5
2 parents 0350821 + ff07928
commit 6c0dbb5
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 19 deletions.
diff --git 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 (
       <div className="preferences">
@@ -150,6 +151,18 @@ export class Settings extends Component {
                 />
               </div>
             </div>
+            <div className="option">
+              <div className="option-name">
+                <label htmlFor="skipTutorial">Skip Tutorial</label>
+                <p><small>Automatically skip the tutorial on startup</small></p>
+              </div>
+              <div className="option-value">
+                <input
+                  ref={skipTutorialInput => (this.skipTutorialInput = skipTutorialInput)} name="skipTutorial"
+                  checked={skipTutorial} type="checkbox" onChange={this.handleChange.bind(this)}
+                />
+              </div>
+            </div>
           </div>
           <div className="title">Price Settings</div>
           <div className="price">
@@ -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
@@ -211,8 +211,8 @@ export class Account extends Component {
             <div className="content">
               <h1>Connect to EA Sports</h1>
               <p>
-                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.
               </p>
             </div>
           </div>

diff --git a/app/containers/Players.js b/app/containers/Players.js
@@ -195,18 +195,24 @@ export class Players extends Component {
 
     return (
       <div className="containers">
-        <Joyride
-          ref={c => (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
+          :
+            <Joyride
+              ref={c => (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' }}
+            />
+        }
         <ConnectedHeader hideLogin={false} />
         <div className="containers-body">
           <div className="sidebar">
@@ -283,6 +289,7 @@ Players.propTypes = {
     pathname: PropTypes.string
   }),
   bidding: PropTypes.bool,
+  skipTutorial: PropTypes.bool,
   start: PropTypes.func,
   stop: PropTypes.func,
   clear: PropTypes.func,
@@ -296,7 +303,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/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/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',

diff --git 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
@@ -12,6 +12,7 @@ describe('reducers', () => {
         maxCard: '10',
         autoStop: '0',
         snipeOnly: false,
+        skipTutorial: false,
         autoUpdate: true,
         buy: '90',
         sell: '100',