ui imrpovement, system parameter, navbar

This commit is contained in:
Harish Sargar
2025-04-02 19:39:36 +05:30
parent 1ce1c27f8c
commit a7965fc12f
14 changed files with 957 additions and 853 deletions

View File

@@ -3,7 +3,7 @@ import { useLocation } from "react-router-dom";
import AdminNavbar from "components/Navbars/AdminNavbar.js";
import AdminFooter from "components/Footers/AdminFooter.js";
import Sidebar from "components/Sidebar/Sidebar.js";
import { useSystemParameters } from "../context/SystemParameterContext";
import { Outlet } from "react-router-dom"; // Import Outlet for nested routing
import routes from "routes.js";
@@ -39,7 +39,7 @@ const Admin = (props) => {
// Check if the current page is an admin page
const isAdminPage = location.pathname.startsWith("/admin");
const { systemParameters, loading, error } = useSystemParameters();
return (
<>
{/* Render Navbar only on admin pages */}
@@ -47,7 +47,7 @@ const Admin = (props) => {
<div className="navbar-container">
<AdminNavbar
{...props}
brandText={getBrandText(location.pathname)}
brandText={systemParameters ? systemParameters.company_Display_Name : "Loading..."}
/>
</div>
)}