Merge pull request #569 from cboard-org/fix-board-render

Blank page when try to get a local board from remote
cboard-org · Nov 22, 2019 · 4d2c372 · 4d2c372
2 parents 66dd9e6 + c2a964a
commit 4d2c372
Show file tree

Hide file tree

Showing 18 changed files with 1,799 additions and 1,184 deletions.
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "jszip-utils": "0.0.2",
     "keycode": "^2.2.0",
     "lodash": "^4.17.11",
+    "moment": "2.24.0",
     "opencollective": "^1.0.3",
     "pdfmake": "^0.1.39",
     "prop-types": "^15.7.2",

diff --git a/src/components/Account/Login/__snapshots__/Login.component.test.js.snap b/src/components/Account/Login/__snapshots__/Login.component.test.js.snap
@@ -143,6 +143,15 @@ ShallowWrapper {
           >
             [Function]
           </Formik>
+          <WithStyles(Button)
+            color="primary"
+            disabled={false}
+            size="small"
+          >
+            <FormattedMessage
+              values={Object {}}
+            />
+          </WithStyles(Button)>
         </WithStyles(DialogContent)>,
       ],
       "onClose": [Function],
@@ -294,6 +303,15 @@ ShallowWrapper {
             >
               [Function]
             </Formik>,
+            <WithStyles(Button)
+              color="primary"
+              disabled={false}
+              size="small"
+            >
+              <FormattedMessage
+                values={Object {}}
+              />
+            </WithStyles(Button)>,
           ],
         },
         "ref": null,
@@ -431,6 +449,33 @@ ShallowWrapper {
             "rendered": [Function],
             "type": [Function],
           },
+          Object {
+            "instance": null,
+            "key": undefined,
+            "nodeType": "class",
+            "props": Object {
+              "children": <FormattedMessage
+                values={Object {}}
+              />,
+              "color": "primary",
+              "disabled": false,
+              "onClick": undefined,
+              "size": "small",
+            },
+            "ref": null,
+            "rendered": Object {
+              "instance": null,
+              "key": undefined,
+              "nodeType": "class",
+              "props": Object {
+                "values": Object {},
+              },
+              "ref": null,
+              "rendered": null,
+              "type": [MockFunction],
+            },
+            "type": [Function],
+          },
         ],
         "type": [Function],
       },
@@ -565,6 +610,15 @@ ShallowWrapper {
             >
               [Function]
             </Formik>
+            <WithStyles(Button)
+              color="primary"
+              disabled={false}
+              size="small"
+            >
+              <FormattedMessage
+                values={Object {}}
+              />
+            </WithStyles(Button)>
           </WithStyles(DialogContent)>,
         ],
         "onClose": [Function],
@@ -716,6 +770,15 @@ ShallowWrapper {
               >
                 [Function]
               </Formik>,
+              <WithStyles(Button)
+                color="primary"
+                disabled={false}
+                size="small"
+              >
+                <FormattedMessage
+                  values={Object {}}
+                />
+              </WithStyles(Button)>,
             ],
           },
           "ref": null,
@@ -853,6 +916,33 @@ ShallowWrapper {
               "rendered": [Function],
               "type": [Function],
             },
+            Object {
+              "instance": null,
+              "key": undefined,
+              "nodeType": "class",
+              "props": Object {
+                "children": <FormattedMessage
+                  values={Object {}}
+                />,
+                "color": "primary",
+                "disabled": false,
+                "onClick": undefined,
+                "size": "small",
+              },
+              "ref": null,
+              "rendered": Object {
+                "instance": null,
+                "key": undefined,
+                "nodeType": "class",
+                "props": Object {
+                  "values": Object {},
+                },
+                "ref": null,
+                "rendered": null,
+                "type": [MockFunction],
+              },
+              "type": [Function],
+            },
           ],
           "type": [Function],
         },

diff --git a/src/components/App/App.component.js b/src/components/App/App.component.js
@@ -45,12 +45,6 @@ export class App extends Component {
 
         <Notifications />
 
-        <Route
-          component={isFirstVisit && !isLogged ? WelcomeScreen : BoardContainer}
-          exact
-          path="/"
-        />
-
         <Switch>
           <RedirectIfLogged
             component={AuthScreen}
@@ -63,6 +57,13 @@ export class App extends Component {
           <Route path="/reset/:userid/:url" component={ChangePassword} />
           <Route path="/login/:type/callback" component={OAuthLogin} />
           <Route path="/board/:id" component={BoardContainer} />
+          <Route
+            exact
+            path="/"
+            component={
+              isFirstVisit && !isLogged ? WelcomeScreen : BoardContainer
+            }
+          />
           <Route component={NotFound} />
         </Switch>
       </div>