Merge pull request #33 from TaloDev/develop

Release 0.8.0

Author: tudddorrr

package.json

@@ -66,5 +66,5 @@
   "lint-staged": {
     "*.{js,jsx}": "eslint --fix"
   },
-  "version": "0.7.3"
+  "version": "0.8.0"
 }

src/App.jsx

@@ -107,6 +107,9 @@ const App = () => {
 
             <Switch>
               <Route exact path={routes.dashboard} component={Dashboard} />
+              <Route exact path={routes.account} component={Account} />
+              <Route exact path={routes.confirmPassword} component={ConfirmPassword} />
+
               {activeGame &&
                 <>
                   <Route exact path={routes.players} component={Players} />
@@ -117,8 +120,6 @@ const App = () => {
                   {canViewPage(user, routes.dataExports) && <Route exact path={routes.dataExports} component={DataExports} />}
                   <Route exact path={routes.leaderboards} component={Leaderboards} />
                   <Route exact path={routes.leaderboardEntries} component={LeaderboardEntries} />
-                  <Route exact path={routes.account} component={Account} />
-                  <Route exact path={routes.confirmPassword} component={ConfirmPassword} />
                   {canViewPage(user, routes.activity) && <Route exact path={routes.activity} component={Activity} />}
                   <Route exact path={routes.stats} component={Stats} />
                   <Route exact path={routes.playerStats} component={PlayerStats} />

src/api/register.js

@@ -1,3 +1,3 @@
 import api from './api'
 
-export default async (data) => api.post('/public/users/register', data)
+export default (data) => api.post('/public/users/register', data)

src/pages/Register.jsx

@@ -11,7 +11,8 @@ import buildError from '../utils/buildError'
 import AuthService from '../services/AuthService'
 
 const Register = () => {
-  const [name, setName] = useState('')
+  const [organisationName, setOrganisationName] = useState('')
+  const [username, setUsername] = useState('')
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
   const [, setUser] = useRecoilState(userState)
@@ -31,7 +32,7 @@ const Register = () => {
     setLoading(true)
 
     try {
-      const res = await register({ email, password, organisationName: name })
+      const res = await register({ email, password, organisationName, username })
       const accessToken = res.data.accessToken
       AuthService.setToken(accessToken)
       setUser(res.data.user)
@@ -48,11 +49,20 @@ const Register = () => {
 
         <TextInput
           id='name'
-          label='Name'
-          placeholder={'Your name or your team/organisation\'s name'}
+          label='Team name'
+          placeholder={'Your team\'s name'}
           type='text'
-          onChange={setName}
-          value={name}
+          onChange={setOrganisationName}
+          value={organisationName}
+        />
+
+        <TextInput
+          id='username'
+          label='Username'
+          type='text'
+          placeholder='Your name or a screen name'
+          onChange={setUsername}
+          value={username}
         />
 
         <TextInput
@@ -76,7 +86,7 @@ const Register = () => {
         {error && <ErrorMessage error={error} />}
 
         <Button
-          disabled={!name || !email || !password}
+          disabled={!organisationName || !username || !email || !password}
           onClick={onRegisterClick}
           isLoading={isLoading}
         >