@asaleh37/ui-base 1.1.9 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "description": "",
   "license": "ISC",
   "author": "Ahmed Saleh Mohamed",

package/src/components/App.tsx

@@ -1,16 +1,74 @@
 import { useDispatch, useSelector } from "react-redux";
-import { createTheme } from "@mui/material";
+import { createTheme, ThemeOptions } from "@mui/material";
 import { ThemeProvider } from "@emotion/react";
 import React, { useEffect } from "react";
 import { RootState } from "../redux/store";
-import { LightThemeOptions } from "../theme/LightThemeOptions";
-import { DarkThemeOptions } from "../theme/DarkThemeOptions";
 import Layout from "../layout/Layout";
 import { AppInfo, AppInfoActions } from "../redux/features/common/AppInfoSlice";
 import { LicenseInfo } from "@mui/x-license";
 
 const App: React.FC<AppInfo> = (props: AppInfo) => {
   LicenseInfo.setLicenseKey(props.muiPremiumKey);
+  const LightThemeOptions: ThemeOptions = {
+    components: {
+      MuiCssBaseline: {
+        styleOverrides: `
+        /* Custom Scrollbar */
+        * {
+          scrollbar-width: thin;
+          scrollbar-color: ${props.appTheme.light.primaryColor} #ffffff;
+        }
+  
+        /* Webkit Browsers */
+        *::-webkit-scrollbar {
+          width: 12px;
+          height: 10px;
+        }   
+      `,
+      },
+    },
+    palette: {
+      mode: "light",
+      primary: {
+        main: props.appTheme.light.primaryColor,
+      },
+      secondary: {
+        main: props.appTheme.light.secondaryColor,
+      },
+      background: {
+        default: "#f5f5f5",
+        paper: "#f5f5f5",
+      },
+    },
+  };
+  const DarkThemeOptions: ThemeOptions = {
+    components: {
+      MuiCssBaseline: {
+        styleOverrides: `
+        /* Custom Scrollbar */
+        * {
+          scrollbar-width: thin;
+          scrollbar-color: ${props.appTheme.dark.primaryColor} #121212;
+        }
+  
+        /* Webkit Browsers */
+        *::-webkit-scrollbar {
+          width: 12px;
+          height: 10px;
+        }   
+      `,
+      },
+    },
+    palette: {
+      mode: "dark",
+      primary: {
+        main: props.appTheme.dark.primaryColor,
+      },
+      secondary: {
+        main: props.appTheme.dark.secondaryColor,
+      },
+    },
+  };
   const dispatch = useDispatch();
   const AppLayoutState = useSelector((state: RootState) => state.AppLayout);
   let themeOptions = { ...LightThemeOptions };

package/src/components/BaseApp.tsx

@@ -9,12 +9,19 @@ import "react-toastify/dist/ReactToastify.css";
 import App from "./App";
 import { AppInfo } from "../redux/features/common/AppInfoSlice";
 import { commonStoresInitialState } from "../redux/features/common/CommonStoreSlice";
+import { ADMINISTRATION_STORES } from "../redux/features/administration/AdministrationStoresMetaData";
 
 library.add(fab);
 library.add(far);
 library.add(fas);
 
 export const BaseApp: React.FC<AppInfo> = (props) => {
+  if (props.enableAdministrationModule) {
+    for (let adminStoreKey of Object.keys(ADMINISTRATION_STORES)) {
+      commonStoresInitialState[adminStoreKey] =
+        ADMINISTRATION_STORES[adminStoreKey];
+    }
+  }
   if (props?.businessCommonStoresMetaData) {
     for (let businessStoreKey of Object.keys(
       props.businessCommonStoresMetaData

package/src/components/common/Login.tsx

@@ -14,7 +14,6 @@ import axios from "axios";
 import { toast } from "react-toastify";
 import { RootState } from "../../redux/store";
 import { UserSessionActions } from "../../redux/features/common/UserSessionSlice";
-import { DarkThemeOptions } from "../../theme/DarkThemeOptions";
 
 const Login: React.FC = () => {
   const appInfo = useSelector((state: RootState) => state.AppInfo.value);
@@ -67,7 +66,34 @@ const Login: React.FC = () => {
   const userSession = useSelector(
     (state: RootState) => state.UserSession.value
   );
-  const loginTheme = createTheme(DarkThemeOptions);
+  const loginTheme = createTheme({
+    components: {
+      MuiCssBaseline: {
+        styleOverrides: `
+        /* Custom Scrollbar */
+        * {
+          scrollbar-width: thin;
+          scrollbar-color: ${appInfo.appTheme.dark.primaryColor} #121212;
+        }
+  
+        /* Webkit Browsers */
+        *::-webkit-scrollbar {
+          width: 12px;
+          height: 10px;
+        }   
+      `,
+      },
+    },
+    palette: {
+      mode: "dark",
+      primary: {
+        main: appInfo.appTheme.dark.primaryColor,
+      },
+      secondary: {
+        main: appInfo.appTheme.dark.secondaryColor,
+      },
+    },
+  });
   const checkUserSession = async () => {
     if (appInfo?.apiBaseUrl) {
       if (userSession.isAuthenticated == null) {

package/src/layout/MainContent.tsx

@@ -9,6 +9,7 @@ import { SystemRoute } from "../routes/types";
 
 const MainContent: React.FC = () => {
   const AppLayoutState = useSelector((state: RootState) => state.AppLayout);
+  const AppInfo = useSelector((state: RootState) => state.AppInfo.value);
   const businessRoutes = useSelector(
     (state: RootState) => state.AppInfo.value.businessRoutes
   );
@@ -28,15 +29,17 @@ const MainContent: React.FC = () => {
         }}
       >
         <Routes>
-          {SYSTEM_ROUTES.map((route: SystemRoute, index) => {
-            return (
-              <Route
-                key={"adm" + index}
-                path={route.path}
-                Component={route.component}
-              />
-            );
-          })}
+          {AppInfo.enableAdministrationModule
+            ? SYSTEM_ROUTES.map((route: SystemRoute, index) => {
+                return (
+                  <Route
+                    key={"adm" + index}
+                    path={route.path}
+                    Component={route.component}
+                  />
+                );
+              })
+            : null}
           {businessRoutes.map((route: SystemRoute, index) => {
             return (
               <Route

package/src/layout/NavigationTree.tsx

@@ -232,9 +232,7 @@ const CustomTreeItem = React.forwardRef(function CustomTreeItem(
 export default function NavigationTree() {
   const navigate = useNavigate();
   const appLayoutState = useSelector((state: RootState) => state.AppLayout);
-  const businessNavigationItems = useSelector(
-    (state: RootState) => state.AppInfo.value.businessNavigationItems
-  );
+  const AppInfo = useSelector((state: RootState) => state.AppInfo.value);
   const dispatch = useDispatch();
   const isMobile = useIsMobile();
   const { isUserAuthorized } = useSession();
@@ -254,18 +252,21 @@ export default function NavigationTree() {
       });
   };
 
-  const mergedNavigationItems = [
-    ...NavigationItems,
-    ...businessNavigationItems,
-  ];
-
+  const mergedNavigationItems = [];
+  if (AppInfo.enableAdministrationModule) {
+    mergedNavigationItems.push(...NavigationItems);
+  }
+  mergedNavigationItems.push(...AppInfo.businessNavigationItems);
   const authoriedNavigationItems = filterData(mergedNavigationItems);
 
   return (
     <RichTreeView
       items={authoriedNavigationItems}
       onItemClick={(event, itemId) => {
-        const navigationItem = findNavigationItemById(itemId, NavigationItems);
+        const navigationItem = findNavigationItemById(
+          itemId,
+          mergedNavigationItems
+        );
         if (
           navigationItem?.action === "NAVIGATION" &&
           navigationItem?.actionPayload != null &&

package/src/redux/features/common/AppInfoSlice.ts

@@ -14,6 +14,11 @@ export type AppInfo = {
   businessReduxReducers: { [key: string]: Reducer<any> };
   businessCommonStoresMetaData: { [key: string]: StoreMetaData };
   muiPremiumKey: string;
+  enableAdministrationModule: boolean;
+  appTheme: {
+    light: { primaryColor: string; secondaryColor: string };
+    dark: { primaryColor: string; secondaryColor: string };
+  };
 };
 
 export type AppInfoProp = {
@@ -28,10 +33,15 @@ const initialState: AppInfoProp = {
     appVersion: null,
     appLogo: null,
     muiPremiumKey: null,
+    enableAdministrationModule: false,
     businessRoutes: [],
     businessNavigationItems: [],
     businessReduxReducers: {},
     businessCommonStoresMetaData: {},
+    appTheme: {
+      light: { primaryColor: "#37505C", secondaryColor: "#ff6d00" },
+      dark: { primaryColor: "#ea690e", secondaryColor: "#74776B" },
+    },
   },
 };
 

package/src/redux/features/common/CommonStoreSlice.ts

@@ -1,5 +1,4 @@
 import { createSlice, PayloadAction } from "@reduxjs/toolkit";
-import { ADMINISTRATION_STORES } from "../administration/AdministrationStoresMetaData";
 
 export interface CommonStoresInterface {
   [key: string]: StoreMetaData;
@@ -17,9 +16,7 @@ export interface StoreMetaData {
   authority?: string;
 }
 
-export const commonStoresInitialState: CommonStoresInterface = {
-  ...ADMINISTRATION_STORES,
-};
+export const commonStoresInitialState: CommonStoresInterface = {};
 
 const commonStoreSlice = createSlice({
   name: "loadingMask",

package/src/theme/DarkThemeOptions.ts

@@ -1,30 +0,0 @@
-import { ThemeOptions } from "@mui/material";
-
-export const DarkThemeOptions: ThemeOptions = {
-  components: {
-    MuiCssBaseline: {
-      styleOverrides: `
-      /* Custom Scrollbar */
-      * {
-        scrollbar-width: thin;
-        scrollbar-color: #ea690e #121212;
-      }
-
-      /* Webkit Browsers */
-      *::-webkit-scrollbar {
-        width: 12px;
-        height: 10px;
-      }   
-    `,
-    },
-  },
-  palette: {
-    mode: "dark",
-    primary: {
-      main: "#ea690e",
-    },
-    secondary: {
-      main: "#74776B",
-    },
-  },
-};

package/src/theme/LightThemeOptions.ts

@@ -1,34 +0,0 @@
-import { ThemeOptions } from "@mui/material";
-
-export const LightThemeOptions: ThemeOptions = {
-  components: {
-    MuiCssBaseline: {
-      styleOverrides: `
-      /* Custom Scrollbar */
-      * {
-        scrollbar-width: thin;
-        scrollbar-color: #37505C #ffffff;
-      }
-
-      /* Webkit Browsers */
-      *::-webkit-scrollbar {
-        width: 12px;
-        height: 10px;
-      }   
-    `,
-    },
-  },
-  palette: {
-    mode: "light",
-    primary: {
-      main: "#37505C",
-    },
-    secondary: {
-      main: "#ff6d00",
-    },
-    background: {
-      default: "#f5f5f5",
-      paper: "#f5f5f5",
-    },
-  },
-};