Added auto-redirect if user is already signed in BOD-248

2020-08-10 08:54:54 -07:00
parent 4c869ceddf
commit 96d4f0372b
2 changed files with 13 additions and 9 deletions
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -0,0 +1,84 @@
+import { Grid } from "antd";
+import "antd/dist/antd.css";
+import React, { lazy, Suspense, useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { Route, Switch } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import ErrorBoundary from "../components/error-boundary/error-boundary.component";
+//Component Imports
+import LoadingSpinner from "../components/loading-spinner/loading-spinner.component";
+import TechPageContainer from "../pages/tech/tech.page.container";
+import { checkUserSession } from "../redux/user/user.actions";
+import { selectCurrentUser } from "../redux/user/user.selectors";
+import PrivateRoute from "../utils/private-route";
+import "./App.styles.scss";
+
+const LandingPage = lazy(() => import("../pages/landing/landing.page"));
+const ResetPassword = lazy(() =>
+  import("../pages/reset-password/reset-password.component")
+);
+const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
+const SignInPage = lazy(() => import("../pages/sign-in/sign-in.page"));
+const Unauthorized = lazy(() =>
+  import("../pages/unauthorized/unauthorized.component")
+);
+const CsiPage = lazy(() => import("../pages/csi/csi.container.page"));
+const MobilePaymentContainer = lazy(() =>
+  import("../pages/mobile-payment/mobile-payment.container")
+);
+
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+});
+const mapDispatchToProps = (dispatch) => ({
+  checkUserSession: () => dispatch(checkUserSession()),
+});
+
+export function App({ checkUserSession, currentUser }) {
+  useEffect(() => {
+    checkUserSession();
+  }, [checkUserSession]);
+
+  const b = Grid.useBreakpoint();
+  console.log("Breakpoints:", b);
+
+  const { t } = useTranslation();
+
+  if (currentUser.authorized === null) {
+    return <LoadingSpinner message={t("general.labels.loggingin")} />;
+  }
+
+  return (
+    <div>
+      <Switch>
+        <ErrorBoundary>
+          <Suspense fallback={<LoadingSpinner message="App.Js Suspense" />}>
+            <Route exact path="/" component={LandingPage} />
+            <Route exact path="/unauthorized" component={Unauthorized} />
+            <Route exact path="/signin" component={SignInPage} />
+            <Route exact path="/resetpassword" component={ResetPassword} />
+            <Route exact path="/csi/:surveyId" component={CsiPage} />
+            <Route
+              exact
+              path="/mp/:paymentIs"
+              component={MobilePaymentContainer}
+            />
+            <PrivateRoute
+              isAuthorized={currentUser.authorized}
+              path="/manage"
+              component={ManagePage}
+            />
+            <PrivateRoute
+              isAuthorized={currentUser.authorized}
+              path="/tech"
+              component={TechPageContainer}
+            />
+          </Suspense>
+        </ErrorBoundary>
+      </Switch>
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(App);