fix: added children/replaced leftNav w/dashboard

Chia-Network · Dec 14, 2021 · b90e646 · b90e646
1 parent 65bae5a
commit b90e646
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/src/components/layout/Dashboard.js b/src/components/layout/Dashboard.js
@@ -28,16 +28,19 @@ const Body = styled('div')`
   height: 46.75rem;
   margin: 1.5rem;
   background-color: #ffffff;
+  overflow: hidden;
 `;
 
-const Dashboard = withTheme(() => {
+const Dashboard = withTheme(({children}) => {
   //const appStore = useSelector(state => state.app);
   return (
     <Main>
-      <LeftNav />
+      <LeftNav/>
       <Container>
         <Headline />
-        <Body />
+        <Body>
+          {children}
+        </Body>
       </Container>
     </Main>
   );

diff --git a/src/navigation/AppNavigator.js b/src/navigation/AppNavigator.js
@@ -4,15 +4,15 @@ import { BrowserRouter as Router, Route } from 'react-router-dom';
 import { IndeterminateProgressOverlay, Dashboard } from '../components/';
 import * as Pages from '../pages';
 
-import { AppContainer, LeftNav } from '../components';
+import { AppContainer } from '../components';
 
 const AppNavigator = () => {
   const { showProgressOverlay } = useSelector(store => store.app);
   return (
     <AppContainer>
       {showProgressOverlay && <IndeterminateProgressOverlay />}
       <Router>
-        <LeftNav>
+        <Dashboard>
           <Suspense fallback={<IndeterminateProgressOverlay />}>
             <Route exact path="/">
               <Pages.Home />
@@ -45,8 +45,8 @@ const AppNavigator = () => {
               <Pages.StoryBook />
             </Route>
           </Suspense>
-        </LeftNav>
-        <Dashboard />
+        </Dashboard>
+
       </Router>
 
     </AppContainer>

diff --git a/src/pages/demo/Projects/index.js b/src/pages/demo/Projects/index.js
@@ -7,7 +7,7 @@ const Projects = () => {
   const dispatch = useDispatch();
   const climateWarehouseStore = useSelector(store => store.climateWarehouse);
 
-  useEffect(() => dispatch(getProjects({ useMockedResponse: false })), []);
+  useEffect(() => dispatch(getProjects({ useMockedResponse: true })), []);
   return (
     <>
       <Card>

diff --git a/src/pages/demo/Units/index.js b/src/pages/demo/Units/index.js
@@ -7,7 +7,7 @@ const Units = () => {
   const dispatch = useDispatch();
   const climateWarehouseStore = useSelector(store => store.climateWarehouse);
 
-  useEffect(() => dispatch(getUnits({ useMockedResponse: false })), []);
+  useEffect(() => dispatch(getUnits({ useMockedResponse: true })), []);
 
   return (
     <>