SPRINT-12: added skeletons throughout widgets, fixed page header under breadcrumb, misc other improvements

This commit is contained in:
Tim Chamberlain
2022-10-04 12:38:53 -05:00
parent e67301dc4b
commit 30f2da17a4
16 changed files with 353 additions and 223 deletions

View File

@ -36,6 +36,7 @@ import {Md5} from "ts-md5/dist/md5";
import {setMiniSidenav, setOpenConfigurator, useMaterialUIController} from "context";
import Settings from "layouts/pages/account/settings";
import ProfileOverview from "layouts/pages/profile/profile-overview";
import QContext from "QContext";
import Sidenav from "qqq/components/Sidenav";
import Configurator from "qqq/components/Temporary/Configurator";
import MDAvatar from "qqq/components/Temporary/MDAvatar";
@ -469,31 +470,39 @@ export default function App()
</MDBox>
);
const [pageHeader, setPageHeader] = useState("");
return (
appRoutes && (
<ThemeProvider theme={theme}>
<CssBaseline />
{layout === "dashboard" && (
<>
<Sidenav
color={sidenavColor}
icon={branding.icon}
logo={branding.logo}
companyName={branding.companyName}
routes={sideNavRoutes}
onMouseEnter={handleOnMouseEnter}
onMouseLeave={handleOnMouseLeave}
/>
<Configurator />
</>
)}
<Routes>
<Route path="*" element={<Navigate to="/dashboards/overview" />} />
{appRoutes && getRoutes(appRoutes)}
{getRoutes(getStaticRoutes())}
{profileRoutes && getRoutes([profileRoutes])}
</Routes>
</ThemeProvider>
<QContext.Provider value={{
pageHeader: pageHeader,
setPageHeader: (header: string) => setPageHeader(header)
}}>
<ThemeProvider theme={theme}>
<CssBaseline />
{layout === "dashboard" && (
<>
<Sidenav
color={sidenavColor}
icon={branding.icon}
logo={branding.logo}
companyName={branding.companyName}
routes={sideNavRoutes}
onMouseEnter={handleOnMouseEnter}
onMouseLeave={handleOnMouseLeave}
/>
<Configurator />
</>
)}
<Routes>
<Route path="*" element={<Navigate to="/dashboards/overview" />} />
{appRoutes && getRoutes(appRoutes)}
{getRoutes(getStaticRoutes())}
{profileRoutes && getRoutes([profileRoutes])}
</Routes>
</ThemeProvider>
</QContext.Provider>
)
);
}