Pārlūkot izejas kodu

fixed double matching Routes

Skylsmoi 6 gadus atpakaļ
vecāks
revīzija
f35a712f11
2 mainītis faili ar 3 papildinājumiem un 4 dzēšanām
  1. 0 1
      src/action-creator.async.js
  2. 3 3
      src/container/Tracim.jsx

+ 0 - 1
src/action-creator.async.js Parādīt failu

@@ -12,7 +12,6 @@ import {
12 12
   updateUserData,
13 13
   setUserRole,
14 14
   WORKSPACE,
15
-  setWorkspaceData,
16 15
   WORKSPACE_LIST,
17 16
   updateWorkspaceListData,
18 17
   FOLDER,

+ 3 - 3
src/container/Tracim.jsx Parādīt failu

@@ -58,10 +58,10 @@ class Tracim extends React.Component {
58 58
               <Route path={PAGE.LOGIN} component={Login} />
59 59
 
60 60
               <PrivateRoute exact path={PAGE.HOME} component={WorkspaceContent} />
61
-              <PrivateRoute path={PAGE.WORKSPACE.CONTENT_LIST(':idws')} component={WorkspaceContent} />
61
+              <PrivateRoute exact path={PAGE.WORKSPACE.CONTENT_LIST(':idws')} component={WorkspaceContent} /> {/* "exact" here to not double match Route WORKSPACE.CONTENT */}
62 62
               <PrivateRoute path={PAGE.WORKSPACE.CONTENT(':idws', ':idcts')} component={WorkspaceContent} />
63
-              <PrivateRoute exact path={PAGE.ACCOUNT} component={Account} />
64
-              <PrivateRoute exact path={PAGE.WORKSPACE.DASHBOARD(':idws')} component={Dashboard} />
63
+              <PrivateRoute path={PAGE.ACCOUNT} component={Account} />
64
+              <PrivateRoute path={PAGE.WORKSPACE.DASHBOARD(':idws')} component={Dashboard} />
65 65
               <PrivateRoute path={'/wip/:cp'} component={WIPcomponent} /> {/* for testing purpose only */}
66 66
 
67 67
               <Footer />