fix(generation): default to gen 7

pokedextracker · Dec 5, 2016 · 2904501 · 2904501
1 parent 4e84fcc
commit 2904501
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/app/actions/user.js b/app/actions/user.js
@@ -9,15 +9,20 @@ import { setToken }     from './session';
 export const SET_USER         = 'SET_USER';
 export const SET_CURRENT_USER = 'SET_CURRENT_USER';
 
-export function createUser ({ username, password, password_confirm, friend_code, title, shiny, generation }) {
+export function createUser (payload) {
+  const { password, password_confirm, title, username } = payload;
+  payload = Object.assign({ referrer: document.referrer }, payload);
+
   return (dispatch) => {
     return Promise.resolve()
     .then(() => {
       if (password !== password_confirm) {
         throw new Error('passwords need to match');
       }
 
-      return API.post(`${Config.API_HOST}/users`, { username, password, friend_code, referrer: document.referrer, title, shiny, generation });
+      Reflect.deleteProperty(payload, 'password_confirm');
+
+      return API.post(`${Config.API_HOST}/users`, payload);
     })
     .then(({ token }) => {
       dispatch(setToken(token));

diff --git a/app/components/dex-create.jsx b/app/components/dex-create.jsx
@@ -71,9 +71,9 @@ export class DexCreate extends Component {
             </div>
             <div className="form-group">
               <label htmlFor="generation">Generation</label>
-              <select className="form-control" ref={(c) => this._generation = c} defaultValue="6">
-                <option value="6">Six</option>
+              <select className="form-control" ref={(c) => this._generation = c} defaultValue="7">
                 <option value="7">Seven</option>
+                <option value="6">Six</option>
               </select>
               <i className="fa fa-chevron-down" />
             </div>

diff --git a/app/components/register.jsx b/app/components/register.jsx
@@ -46,10 +46,11 @@ export class Register extends Component {
     const title = this._title.value;
     const shiny = this._shiny.checked;
     const generation = this._generation.value;
+    const region = parseInt(generation) === 7 ? 'alola' : 'national';
 
     this.setState({ ...this.state, error: null });
 
-    register({ username, password, password_confirm, friend_code, title, shiny, generation })
+    register({ username, password, password_confirm, friend_code, title, shiny, generation, region })
     .then(() => ReactGA.event({ action: 'register', category: 'Session' }))
     .catch((err) => {
       this.setState({ ...this.state, error: err.message });
@@ -111,7 +112,8 @@ export class Register extends Component {
                   </div>
                   <div className="form-group">
                     <label htmlFor="generation">Generation</label>
-                    <select className="form-control" ref={(c) => this._generation = c} defaultValue="6">
+                    <select className="form-control" ref={(c) => this._generation = c} defaultValue="7">
+                      <option value="7">Seven</option>
                       <option value="6">Six</option>
                     </select>
                     <i className="fa fa-chevron-down" />