Merge pull request #40 from reedoooo/refine/logicandstyles

new images
reedoooo · May 3, 2024 · f114a3d · f114a3d
2 parents 9c86006 + 312639d
commit f114a3d
Show file tree

Hide file tree

Showing 27 changed files with 91 additions and 432 deletions.
diff --git a/cleanup/ActionButton.jsx b/cleanup/ActionButton.jsx
diff --git a/cleanup/ChartConfigs.jsx b/cleanup/ChartConfigs.jsx
diff --git a/cleanup/MainContentSection.jsx b/cleanup/MainContentSection.jsx
diff --git a/public/images/pages/cart-checkout.png b/public/images/pages/cart-checkout.png
diff --git a/...s/Screenshot 2024-04-30 at 9.40.57 AM.png → public/images/pages/collection-home.png b/...s/Screenshot 2024-04-30 at 9.40.57 AM.png → public/images/pages/collection-home.png
diff --git a/...s/Screenshot 2024-04-30 at 9.46.02 AM.png → public/images/pages/deck-home.png b/...s/Screenshot 2024-04-30 at 9.46.02 AM.png → public/images/pages/deck-home.png
diff --git a/public/images/pages/homepage.png b/public/images/pages/homepage.png
diff --git a/public/images/pages/profile-home.png b/public/images/pages/profile-home.png
diff --git a/public/images/pages/store-home.png b/public/images/pages/store-home.png
diff --git a/src/App.js b/src/App.js
@@ -4,26 +4,10 @@ import './assets/css/index.css';
 import './assets/css/card.css';
 import './assets/css/page.css';
 import Main from './Main';
-import { useMode, ConfiguratorProvider } from './context';
-import { ThemeProvider } from 'styled-components';
-import { CssBaseline, GlobalStyles } from '@mui/material';
-import { ParallaxProvider } from 'react-scroll-parallax';
-
 // ==============================|| APP ||============================== //
 
 const App = () => {
-  const { theme } = useMode();
-  return (
-    <ThemeProvider theme={theme}>
-      <CssBaseline theme={theme} />
-      <GlobalStyles />
-      <ParallaxProvider>
-        <ConfiguratorProvider>
-          <Main />
-        </ConfiguratorProvider>
-      </ParallaxProvider>
-    </ThemeProvider>
-  );
+  return <Main />;
 };
 
 export default App;
diff --git a/src/Main.jsx b/src/Main.jsx
@@ -2,14 +2,14 @@ import React, { Suspense, lazy, useEffect } from 'react';
 import { Route, Routes } from 'react-router-dom';
 import PrivateRoute from './layout/navigation/PrivateRoute.jsx';
 import LoginDialog from './pages/LoginDialog.jsx';
-import { useConfiguratorContext, useMode } from './context';
 import PageLayout from './layout/REUSABLE_COMPONENTS/layout-utils/PageLayout.jsx';
 import Navigation from './layout/navigation/Navigation.jsx';
 import Configurator from './layout/REUSABLE_COMPONENTS/Configurator/index.jsx';
 import { CSSTransition, TransitionGroup } from 'react-transition-group';
 import LoadingOverlay from './layout/REUSABLE_COMPONENTS/system-utils/LoadingOverlay.jsx';
 import useManageCookies from './context/hooks/useManageCookies.jsx';
 import { ROUTE_CONFIG } from './data/route-config.jsx';
+import { useConfigurator } from 'context/hooks/useConfigurator.jsx';
 
 // ==============================|| MAIN ROUTING ||============================== //
 
@@ -19,8 +19,8 @@ const LazyRoute = ({ componentName, ...rest }) => {
 };
 const Main = () => {
   const { getCookie } = useManageCookies();
-  const { isLoggedIn, userId } = getCookie(['isLoggedIn', 'userId']);
-  const { isConfiguratorOpen } = useConfiguratorContext();
+  const { isLoggedIn } = getCookie(['isLoggedIn']);
+  const { isConfiguratorOpen } = useConfigurator();
   return (
     <PageLayout
       sx={{