@asaleh37/ui-base 1.1.9 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asaleh37/ui-base",
-  "version": "1.1.9",
+  "version": "1.2.1",
   "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/admin/AttachmentGrid.tsx

@@ -1,5 +1,5 @@
 import { useState } from "react";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
 

package/src/components/admin/AuthorityGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const AuthorityGrid: React.FC = () => {

package/src/components/admin/BluePrintGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const BluePrintGrid: React.FC = () => {

package/src/components/admin/BluePrintPageGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const BluePrintPageGrid: React.FC = () => {

package/src/components/admin/BluePrintPointGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const BluePrintPointGrid: React.FC = () => {

package/src/components/admin/DashboardGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const DashboardGrid: React.FC = () => {

package/src/components/admin/DashboardWidgetGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const DashboardWidgetGrid: React.FC = () => {

package/src/components/admin/DataQueryGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const DataQueryGrid: React.FC = () => {

package/src/components/admin/DataQueryParameterGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const DataQueryParameterGrid: React.FC = () => {

package/src/components/admin/DatasourceConnectionGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const DatasourceConnectionGrid: React.FC = () => {

package/src/components/admin/EmployeeGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const EmployeeGrid: React.FC = () => {

package/src/components/admin/EntityParameterGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const EntityParameterGrid: React.FC = () => {

package/src/components/admin/ExcelUploaderDetailGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const ExcelUploaderDetailGrid: React.FC = () => {

package/src/components/admin/ExcelUploaderHeaderGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const ExcelUploaderHeaderGrid: React.FC = () => {

package/src/components/admin/LookupGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const LookupGrid: React.FC = () => {

package/src/components/admin/MailAttachmentGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const MailAttachmentGrid: React.FC = () => {

package/src/components/admin/MailBodyGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const MailBodyGrid: React.FC = () => {

package/src/components/admin/MailNotificationQueueGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const MailNotificationQueueGrid: React.FC = () => {

package/src/components/admin/MailRecipientGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const MailRecipientGrid: React.FC = () => {

package/src/components/admin/MailTemplateGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const MailTemplateGrid: React.FC = () => {

package/src/components/admin/NewTableGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const NewTableGrid: React.FC = () => {

package/src/components/admin/NotificationGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const NotificationGrid: React.FC = () => {

package/src/components/admin/NotificationQueueGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const NotificationQueueGrid: React.FC = () => {

package/src/components/admin/OrganizationApplicationGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const OrganizationApplicationGrid: React.FC = () => {

package/src/components/admin/OrganizationGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const OrganizationGrid: React.FC = () => {

package/src/components/admin/OrganizationRankGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const OrganizationRankGrid: React.FC = () => {

package/src/components/admin/OrganizationUnitGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const OrganizationUnitGrid: React.FC = () => {

package/src/components/admin/OrganizationUserGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const OrganizationUserGrid: React.FC = () => {

package/src/components/admin/OrganizationUserRoleGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const OrganizationUserRoleGrid: React.FC = () => {

package/src/components/admin/ReportGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const ReportGrid: React.FC = () => {

package/src/components/admin/ReportParameterGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const ReportParameterGrid: React.FC = () => {

package/src/components/admin/RoleAuthorityGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const RoleAuthorityGrid: React.FC = () => {

package/src/components/admin/RoleGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const RoleGrid: React.FC = () => {

package/src/components/admin/UserAccountGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const UserAccountGrid: React.FC = () => {

package/src/components/admin/UserRequestGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const UserRequestGrid: React.FC = () => {

package/src/components/admin/WidgetGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const WidgetGrid: React.FC = () => {

package/src/components/admin/WorkflowDocumentActionGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const WorkflowDocumentActionGrid: React.FC = () => {

package/src/components/admin/WorkflowDocumentActionHistoryGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const WorkflowDocumentActionHistoryGrid: React.FC = () => {

package/src/components/admin/WorkflowDocumentActionMailGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const WorkflowDocumentActionMailGrid: React.FC = () => {

package/src/components/admin/WorkflowDocumentGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const WorkflowDocumentGrid: React.FC = () => {

package/src/components/admin/WorkflowDocumentMailLogGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const WorkflowDocumentMailLogGrid: React.FC = () => {

package/src/components/admin/WorkflowDocumentStatusGrid.tsx

@@ -1,6 +1,6 @@
 import { useState } from "react";
 import TemplateGrid from "../templates/DataEntryTemplates/TemplateDataGrid/TemplateGrid";
-import useApiActions from "../templates/DataEntryTemplates/useApiActions";
+import useApiActions from "../../hooks/useApiActions";
 import { FormElementProps } from "../templates/DataEntryTemplates/DataEntryTypes";
 
 const WorkflowDocumentStatusGrid: React.FC = () => {

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/components/templates/DataEntryTemplates/DataEntryTypes.ts

@@ -8,7 +8,7 @@ import {
 } from "@mui/x-data-grid-premium";
 import { UseFormReturn } from "react-hook-form";
 import { SxProps } from "@mui/material";
-import { ApiActions } from "./useApiActions";
+import { ApiActions } from "../../../hooks/useApiActions";
 export type MakeOptional<T, K extends keyof T> = Omit<T, K> &
   Partial<Pick<T, K>>;
 

package/src/hooks/index.ts

@@ -4,3 +4,4 @@ export { default as useLoadingMask } from "./useLoadingMask";
 export { useIsMobile } from "./UseMobile";
 export { default as useSession } from "./UseSession";
 export { useWindow } from "./UseWindow";
+export { default as useApiActions } from "./useApiActions";

package/src/{components/templates/DataEntryTemplates → hooks}/useApiActions.ts

@@ -1,8 +1,8 @@
 import { useDispatch, useSelector } from "react-redux";
-import { RootState } from "../../../redux/store";
-import useSession from "../../../hooks/UseSession";
-import useAxios from "../../../hooks/useAxios";
-import { setStoreData } from "../../../redux/features/common/CommonStoreSlice";
+import { RootState } from "../redux/store";
+import useSession from "./UseSession";
+import useAxios from "./useAxios";
+import { setStoreData } from "../redux/features/common/CommonStoreSlice";
 
 export type ApiActionsProps = {
   findAll?: string;

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