Flatten Modules

Author: modularcoder

src/Dashboard/Admin/Accounts/AccountsEditor/.gitkeep renamed to src/Administration/Accounts/AccountsEditor/.gitkeep

@@ -4,26 +4,11 @@ import { ThemeProvider } from '@material-ui/styles'
 
 import CssBaseline from '@material-ui/core/CssBaseline'
 
-import config from './config'
-import authService from './_services/authService'
-
-import api from './_api'
-
-import store from './_store'
+import store from './_state'
 import theme from './_theme'
 
 import AppRouter from './AppRouter'
 
-// Init the API service
-authService.init({
-  useSampleData: config.useSampleData,
-})
-
-// Init rest API client
-api.init({
-  useSampleData: config.useSampleData,
-})
-
 const App: React.FC = () => {
   return (
     <div className="App">

src/Dashboard/Admin/Accounts/AccountsList/.gitkeep renamed to src/Administration/Accounts/AccountsList/.gitkeep

@@ -1,11 +1,56 @@
-import React from 'react'
-import { HashRouter, BrowserRouter, Route, RouteProps, Redirect } from 'react-router-dom' //
+import React, { useEffect } from 'react'
+import {
+  HashRouter,
+  BrowserRouter,
+  Route,
+  RouteProps,
+  Redirect,
+  Switch,
+} from 'react-router-dom' //
+import LinearProgress from '@material-ui/core/LinearProgress'
 
-import config from './config'
+import config from './_config'
 import authService from './_services/authService'
+import { useAppState, useAppEffects } from './_state/appState'
 
+// Import application modules
+import Sales from './Sales'
+import Content from './Content'
+import Admin from './Administration'
+
+// Import core modules
 import Auth from './Auth/Auth'
-import { DashboardContainer } from './Dashboard'
+import Profile from './Profile'
+import Organization from './Organization'
+import NotFound from './Misc/NotFound'
+
+// Theme demo module
+import Demo from './Demo'
+
+const LoggedInRouter = () => {
+  const { loading, error } = useAppState()
+  const effects = useAppEffects()
+
+  useEffect(() => {
+    effects.request()
+  }, [effects])
+
+  if (loading) return <LinearProgress />
+  if (error) return <p>Error :(</p>
+
+  return (
+    <Switch>
+      <Route exact path="/" render={() => <Redirect to="/sales/dashboard" />} />
+      <Route path={`/sales`} component={Sales} />
+      <Route path={`/content`} component={Content} />
+      <Route path={`/admin`} component={Admin} />
+      <Route path={`/profile`} component={Profile} />
+      <Route path={`/account`} component={Organization} />
+      <Route path={`/demo`} component={Demo} />
+      <Route component={NotFound} />
+    </Switch>
+  )
+}
 
 // Use different router type depending on configuration
 const AppRouterComponent: React.ComponentType<any> =
@@ -14,7 +59,7 @@ const AppRouterComponent: React.ComponentType<any> =
 const AppRouter: React.FC = () => (
   <AppRouterComponent>
     <Route path="/auth" component={Auth} />
-    <PrivateRoute path="/" component={DashboardContainer} />
+    <PrivateRoute path="/" component={LoggedInRouter} />
   </AppRouterComponent>
 )