Added Dark and Light Logo

Author: hackstarsj

Backend/EcommerceInventory/EcommerceInventory/__pycache__/settings.cpython-311.pyc

@@ -67,10 +67,11 @@
     'PAGE_SIZE':10
 }
 
-CORS_ALLOWED_ORIGINS = [
-    'http://localhost:3000',
-]
+# CORS_ALLOWED_ORIGINS = [
+#     "http://*"
+# ]
 
+CORS_ALLOW_ALL_ORIGINS = True
 ROOT_URLCONF = 'EcommerceInventory.urls'
 
 TEMPLATES = [

Backend/EcommerceInventory/EcommerceInventory/settings.py

@@ -1 +1 @@
-REACT_APP_API_URL='http://ec2-3-110-164-200.ap-south-1.compute.amazonaws.com/api/'
+REACT_APP_API_URL='http://192.168.0.140:8000/api/'

Frontend/ecommerce_inventory/.env

@@ -11,7 +11,7 @@ import { Outlet,useLocation,useNavigate } from 'react-router-dom'; // Import Out
 import { expandItem,activateItem,triggerPageChange } from '../redux/reducer/sidebardata';
 import {useDispatch} from 'react-redux';
 
-const Layout = ({sidebarList,pageTitle}) => {
+const Layout = ({sidebarList,pageTitle,childPage}) => {
   const [mobileOpen, setMobileOpen] = useState(false);
   const [desktopOpen, setDesktopOpen] = useState(true); // State for desktop sidebar
   const [themeMode, setThemeMode] = useState('light');
@@ -177,7 +177,7 @@ const Layout = ({sidebarList,pageTitle}) => {
       className='sidebar'
     >
       <Box sx={{ display: 'flex', alignItems: 'center', marginBottom: '16px' }}>
-        <img src={'/logo_l.png'} alt="Logo" className='logo' style={{ marginRight: '16px',width:'100%' }} />
+        <img src={theme?.logo?.rectangle} alt="Logo" className='logo' style={{ marginRight: '16px',width:'100%' }} />
 
       </Box>
       <List sx={{ '& .MuiListItem-root': { transition: 'background-color 0.3s' } }}>
@@ -456,7 +456,7 @@ const Layout = ({sidebarList,pageTitle}) => {
             {profileMenu}
             {themeMenuUI}
             <section className='main-content' style={{ padding: '20px' }}>
-              <Outlet/>
+              {childPage?childPage:<Outlet/>}
             </section>
             <Box
               component="footer"

Frontend/ecommerce_inventory/public/logo.png

@@ -1,5 +1,4 @@
 import { createTheme } from '@mui/material/styles';
-
 // Dark Theme
 export const orangeDarkTheme = createTheme({
   typography: {
@@ -73,6 +72,10 @@ export const orangeDarkTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_light.png',
+    square:'/logo_square_light.png',
+  },
 });
 
 export const orangeLightTheme = createTheme({
@@ -147,6 +150,10 @@ export const orangeLightTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_dark.png',
+    square:'/logo_square_dark.png',
+  },
 });
 
 export const redDarkTheme = createTheme({
@@ -224,6 +231,10 @@ export const redDarkTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_light.png',
+    square:'/logo_square_light.png',
+  },
 });
 
 export const redLightTheme = createTheme({
@@ -300,6 +311,11 @@ export const redLightTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_dark.png',
+    square:'/logo_square_dark.png',
+  },
+
 });
 export const greenDarkTheme = createTheme({
   typography: {
@@ -373,6 +389,10 @@ export const greenDarkTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_light.png',
+    square:'/logo_square_light.png',
+  },
 });
 export const greenLightTheme = createTheme({
   typography: {
@@ -448,6 +468,11 @@ export const greenLightTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_dark.png',
+    square:'/logo_square_dark.png',
+  },
+
 });
 
 export const blueDarkTheme = createTheme({
@@ -522,6 +547,11 @@ export const blueDarkTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_light.png',
+    square:'/logo_square_light.png',
+  },
+
 });
 
 export const blueLightTheme = createTheme({
@@ -598,6 +628,10 @@ export const blueLightTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_dark.png',
+    square:'/logo_square_dark.png',
+  },
 });
 
 
@@ -667,6 +701,10 @@ export const customTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_dark.png',
+    square:'/logo_square_dark.png',
+  },
 });
 export const lightTheme = createTheme({
   typography: {
@@ -685,6 +723,7 @@ export const lightTheme = createTheme({
     background: {
       paper: 'rgba(241, 244, 250, 1)',
       default: 'rgba(255, 255, 255, 1)',
+      light: 'rgba(255, 255, 255, 1)',
     },
     error: {
       main: 'rgba(255, 0, 0, 1)', // Set error color to red
@@ -762,6 +801,11 @@ export const lightTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_dark.png',
+    square:'/logo_square_dark.png',
+  },
+
 });
 
 
@@ -833,6 +877,10 @@ export const darkTheme = createTheme({
       },
     },
   },
+  logo:{
+    rectangle:'/logo_light.png',
+    square:'/logo_square_light.png',
+  },
 });
 export const basicTheme = createTheme({
   typography: {
@@ -865,6 +913,10 @@ export const basicTheme = createTheme({
       primary: 'rgba(255, 255, 255, 1)',
     },
   },
+  logo:{
+    rectangle:'/logo_light.png',
+    square:'/logo_square_light.png',
+  },
   components: {
     MuiButton: {
       styleOverrides: {

Frontend/ecommerce_inventory/public/logo192.png

@@ -13,6 +13,7 @@ const Auth = () => {
   const [themeMode, setThemeMode] = useState('basic');
   const navigate=useNavigate();
   const {callApi,error,loading}=useApi();
+  
   useEffect(() => {
     const savedTheme = localStorage.getItem('theme') || 'basic';
     setThemeMode(savedTheme);
@@ -107,7 +108,7 @@ const doLogin = async(e) => {
           <Card sx={{ maxWidth: 400, width: '100%' }}>
             <CardContent>
               <Box sx={{ display: 'flex', justifyContent: 'center', mb: 2 }}>
-                <img src={'/logo.png'} alt="Logo" style={{ borderRadius: '50%',width:'100px' }} />
+                <img src={theme.logo.square} alt="Logo" style={{ borderRadius: '50%',width:'100px' }} />
               </Box>
               <Typography variant="h5" align="center" gutterBottom>
                 EzyMarket