diff --git a/client/src/App/App.js b/client/src/App/App.js index 23b8cfb9d..587e3356d 100644 --- a/client/src/App/App.js +++ b/client/src/App/App.js @@ -1,4 +1,4 @@ -import React, { useEffect } from "react"; +import React, { useEffect, Suspense, lazy } from "react"; import { useApolloClient, useQuery } from "@apollo/react-hooks"; import { Switch, Route, Redirect } from "react-router-dom"; import firebase from "../firebase/firebase.utils"; @@ -6,18 +6,20 @@ import firebase from "../firebase/firebase.utils"; import "./App.css"; //Component Imports -import LandingPage from "../pages/landing/landing.page"; -import ManagePage from "../pages/manage/manage.page"; -import PrivateRoute from "../utils/private-route"; -import SignInPage from "../pages/sign-in/sign-in.page"; -import Unauthorized from "../pages/unauthorized/unauthorized.component"; +import LoadingSpinner from "../components/loading-spinner/loading-spinner.component"; +import AlertComponent from "../components/alert/alert.component"; import { auth } from "../firebase/firebase.utils"; import { UPSERT_USER } from "../graphql/user.queries"; import { GET_CURRENT_USER } from "../graphql/local.queries"; import { QUERY_BODYSHOP } from "../graphql/bodyshop.queries"; -import LoadingSpinner from "../components/loading-spinner/loading-spinner.component"; -import AlertComponent from "../components/alert/alert.component"; + +import PrivateRoute from "../utils/private-route"; + +const LandingPage = lazy(() => import("../pages/landing/landing.page")); +const ManagePage = lazy(() => import("../pages/manage/manage.page")); +const SignInPage = lazy(() => import("../pages/sign-in/sign-in.page")); +const Unauthorized = lazy(() => import("../pages/unauthorized/unauthorized.component")); export default () => { const apolloClient = useApolloClient(); @@ -103,24 +105,26 @@ export default () => { return (
- - - - HookCurrentUser.data.currentUser ? ( - - ) : ( - - ) - } - /> - + Suspended Loading...
}> + + + + HookCurrentUser.data.currentUser ? ( + + ) : ( + + ) + } + /> + + ); diff --git a/client/src/pages/manage/manage.page.jsx b/client/src/pages/manage/manage.page.jsx index b4cf8133e..0aba41cea 100644 --- a/client/src/pages/manage/manage.page.jsx +++ b/client/src/pages/manage/manage.page.jsx @@ -1,14 +1,18 @@ -import React from "react"; +import React, { lazy, Suspense } from "react"; import { Route } from "react-router"; +import { Layout, BackTop } from "antd"; //Component Imports -import WhiteBoardPage from "../white-board/white-board.page"; -import JobsPage from "../jobs/jobs.page"; -import JobsDetailPage from "../jobs-detail/jobs-detail.page"; +// import WhiteBoardPage from "../white-board/white-board.page"; +// import JobsPage from "../jobs/jobs.page"; +// import JobsDetailPage from "../jobs-detail/jobs-detail.page"; + import HeaderContainer from "../../components/header/header.container"; import FooterComponent from "../../components/footer/footer.component"; -import { Layout, BackTop } from "antd"; +const WhiteBoardPage = lazy(() => import("../white-board/white-board.page")); +const JobsPage = lazy(() => import("../jobs/jobs.page")); +const JobsDetailPage = lazy(() => import("../jobs-detail/jobs-detail.page")); const { Header, Content, Footer } = Layout; //This page will handle all routing for the entire application. @@ -20,10 +24,17 @@ export default function Manage({ match }) { - + TODO: Suspended Loading in Manage Page...} + > + - - + + +