- change routes and some renaming #1878

metasfresh · Aug 7, 2018 · 81f5e19 · 81f5e19
1 parent fa5b1fb
commit 81f5e19
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/src/api/index.js b/src/api/index.js
@@ -14,6 +14,7 @@ import {
   localLoginRequest,
   loginCompletionRequest,
   logoutRequest,
+  resetPasswordRequest,
   getAvatar,
   getUserSession,
   getUserLang,
@@ -36,6 +37,7 @@ export {
   localLoginRequest,
   loginCompletionRequest,
   logoutRequest,
+  resetPasswordRequest,
   getAvatar,
   getUserSession,
   getUserLang,

diff --git a/src/api/login.js b/src/api/login.js
@@ -40,9 +40,9 @@ export function getUserSession() {
   return axios.get(`${config.API_URL}/userSession`);
 }
 
-export function resetPassword(form) {
+export function resetPasswordRequest(form) {
   console.log('resetPassword form: ', form)
   return axios.post(`${config.API_URL}/login/resetPassword`, {
-    ...form
+    ...form,
   });
 }
diff --git a/src/components/app/LoginForm.js b/src/components/app/LoginForm.js
@@ -147,7 +147,7 @@ class LoginForm extends Component {
 
   handleForgotPassword = () => {
     const { dispatch } = this.props;
-    dispatch(push('/login/forgottenPassword'));
+    dispatch(push('/forgottenPassword'));
   };
 
   openDropdown = () => {

diff --git a/src/routes.js b/src/routes.js
@@ -151,18 +151,30 @@ export const getRoutes = (store, auth, plugins) => {
         <IndexRoute component={Dashboard} />
       </Route>
       <Route
-        path="/login*"
-        component={({ location, routeParams }) => {
-          console.log('NEXTSTATE: ', location, routeParams)
-          return (<Login
-            splat={routeParams.splat.replace('/', '')}
+        path="/login"
+        component={({ location }) => (
+          <Login
             redirect={location.query.redirect}
             logged={localStorage.isLogged}
             {...{ auth }}
+          />
+        )}
+      />
+      <Route
+        path="/forgottenPassword"
+        component={({ location }) => (
+          <Login splat={location.pathname.replace('/', '')} />
+        )}
+      />
+      <Route
+        path="/resetPassword/:token"
+        component={(nextState) => {
+          console.log('RESET PASSWORD: ', nextState)
+          return (<Login
+            splat={nextState.location.pathname.replace('/', '')}
           />);
         }}
-      >
-      </Route>
+      />
       <Route path="*" component={NoMatch} />
     </Route>
   );