Make requests to handle contextual routes as UnwrappedApp does

Lokiedu · Jul 6, 2017 · 01ba256 · 01ba256
1 parent 237745b
commit 01ba256
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/src/pages/auth.js b/src/pages/auth.js
@@ -69,12 +69,6 @@ export class UnwrappedAuth extends React.Component {
     const isLoggedIn = (currentUserId !== null);
 
     if (!isLoggedIn) {
-      store.dispatch(attachContextualRoutes(
-        UnwrappedAuth.displayName,
-        getRoutesNames(router.routes),
-        ['#login']
-      ));
-
       return null;
     }
 
@@ -101,6 +95,14 @@ export class UnwrappedAuth extends React.Component {
     };
   }
 
+  componentWillMount() {
+    this.props.dispatch(attachContextualRoutes(
+      UnwrappedAuth.displayName,
+      getRoutesNames(this.props.routes),
+      ['#login']
+    ));
+  }
+
   componentWillUnmount() {
     this.props.dispatch(detachContextualRoutes(
       UnwrappedAuth.displayName,

diff --git a/src/pages/password-reset.js b/src/pages/password-reset.js
@@ -77,14 +77,6 @@ export class PasswordResetPage extends React.Component {
     location: { hash: '', pathname: '', search: '' }
   };
 
-  static fetchData(router, store) {
-    store.dispatch(attachContextualRoutes(
-      PasswordResetPage.displayName,
-      getRoutesNames(router.routes),
-      ['#login']
-    ));
-  }
-
   constructor(props, ...args) {
     super(props, ...args);
 
@@ -97,6 +89,14 @@ export class PasswordResetPage extends React.Component {
     };
   }
 
+  componentWillMount() {
+    this.props.dispatch(attachContextualRoutes(
+      PasswordResetPage.displayName,
+      getRoutesNames(this.props.routes),
+      ['#login']
+    ));
+  }
+
   componentWillUnmount() {
     this.props.dispatch(detachContextualRoutes(
       PasswordResetPage.displayName,

diff --git a/src/pages/welcome.js b/src/pages/welcome.js
@@ -48,12 +48,6 @@ class Welcome extends React.Component {
       return { status: 307, redirectTo: '/' };
     }
 
-    store.dispatch(attachContextualRoutes(
-      Welcome.displayName,
-      getRoutesNames(router.routes),
-      ['#login']
-    ));
-
     return await trigger.setQuotes();
   }
 
@@ -69,6 +63,14 @@ class Welcome extends React.Component {
     };
   }
 
+  componentWillMount() {
+    this.props.dispatch(attachContextualRoutes(
+      Welcome.displayName,
+      getRoutesNames(this.props.routes),
+      ['#login']
+    ));
+  }
+
   componentWillUnmount() {
     this.props.dispatch(detachContextualRoutes(
       Welcome.displayName,