Skip to content

Commit 40ee078

Browse files
committed
remove marketplace container
1 parent e579953 commit 40ee078

File tree

1 file changed

+22
-18
lines changed

1 file changed

+22
-18
lines changed

app/src/containers/AppContainer.tsx

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
import React, { useState, useEffect } from 'react';
2-
import { ThemeProvider, Theme, StyledEngineProvider } from '@mui/material/styles';
3-
import NavBar from '../components/top/NavBar';
4-
import LeftContainer from './LeftContainer';
5-
import MainContainer from './MainContainer';
1+
import React, { useEffect, useState } from 'react';
2+
import {
3+
StyledEngineProvider,
4+
Theme,
5+
ThemeProvider
6+
} from '@mui/material/styles';
67
import { theme1, theme2 } from '../public/styles/theme';
7-
import {setStyle} from '../redux/reducers/slice/styleSlice';
88
// Imports for redux toolkit usage
9-
import { useSelector, useDispatch } from 'react-redux';
9+
import { useDispatch, useSelector } from 'react-redux';
1010

11+
import LeftContainer from './LeftContainer';
12+
import MainContainer from './MainContainer';
13+
import MarketplaceContainer from './MarketplaceContainer';
14+
import NavBar from '../components/top/NavBar';
15+
import { setStyle } from '../redux/reducers/slice/styleSlice';
1116

1217
declare module '@mui/styles/defaultTheme' {
1318
// eslint-disable-next-line @typescript-eslint/no-empty-interface
@@ -19,34 +24,33 @@ const lightTheme = theme1;
1924
const darkTheme = theme2; // dark mode color in theme.ts not reached
2025
const AppContainer = () => {
2126
// setting state for changing light vs dark themes; linked to NavBar.tsx
22-
23-
const {isDarkMode, style }= useSelector((store) =>({
24-
isDarkMode: store.darkMode.isDarkMode,
25-
style: store.styleSlice,
26-
} ));
27+
28+
const { isDarkMode, style } = useSelector((store) => ({
29+
isDarkMode: store.darkMode.isDarkMode,
30+
style: store.styleSlice
31+
}));
2732

2833
const [isThemeLight, setTheme] = useState(!isDarkMode);
2934
const dispatch = useDispatch();
3035

31-
3236
// Set background color of left and bottom panel on the first render
3337
// Without this hook, the first render is always going to be white
3438
useEffect(() => {
35-
if (!isDarkMode) dispatch(setStyle(null)) ;
39+
if (!isDarkMode) dispatch(setStyle(null));
3640
else dispatch(setStyle({ backgroundColor: '#21262c' }));
3741
}, [isDarkMode]);
3842

39-
4043
return (
4144
<StyledEngineProvider injectFirst>
4245
<ThemeProvider theme={!isDarkMode ? lightTheme : darkTheme}>
4346
<div>
44-
<NavBar setTheme={setTheme} isThemeLight={isThemeLight}/>
47+
<NavBar setTheme={setTheme} isThemeLight={isThemeLight} />
4548
</div>
4649
<div className="app-container">
47-
<LeftContainer isThemeLight={isThemeLight}/>
48-
<MainContainer isThemeLight={isThemeLight}/>
50+
<LeftContainer isThemeLight={isThemeLight} />
51+
<MainContainer isThemeLight={isThemeLight} />
4952
</div>
53+
{/* <MarketplaceContainer /> */}
5054
</ThemeProvider>
5155
</StyledEngineProvider>
5256
);

0 commit comments

Comments
 (0)