Просмотр исходного кода

fix breadcrumb

MergeProblem1^2
kelvin.yau 15 часов назад
Родитель
Сommit
b537d3433a
2 измененных файлов: 8 добавлений и 2 удалений
  1. +0
    -2
      src/app/(main)/layout.tsx
  2. +8
    -0
      src/components/AppBar/AppBar.tsx

+ 0
- 2
src/app/(main)/layout.tsx Просмотреть файл

@@ -5,7 +5,6 @@ import { redirect } from "next/navigation";
import Box from "@mui/material/Box"; import Box from "@mui/material/Box";
import { NAVIGATION_CONTENT_WIDTH } from "@/config/uiConfig"; import { NAVIGATION_CONTENT_WIDTH } from "@/config/uiConfig";
import Stack from "@mui/material/Stack"; import Stack from "@mui/material/Stack";
import Breadcrumb from "@/components/Breadcrumb";
import { AxiosProvider } from "@/app/(main)/axios/AxiosProvider"; import { AxiosProvider } from "@/app/(main)/axios/AxiosProvider";
import { SetupAxiosInterceptors } from "@/app/(main)/axios/axiosInstance"; import { SetupAxiosInterceptors } from "@/app/(main)/axios/axiosInstance";
import { CameraProvider } from "@/components/Cameras/CameraProvider"; import { CameraProvider } from "@/components/Cameras/CameraProvider";
@@ -54,7 +53,6 @@ export default async function MainLayout({
> >
<Stack spacing={2}> <Stack spacing={2}>
<I18nProvider namespaces={["common"]}> <I18nProvider namespaces={["common"]}>
<Breadcrumb />
{children} {children}
</I18nProvider> </I18nProvider>
</Stack> </Stack>


+ 8
- 0
src/components/AppBar/AppBar.tsx Просмотреть файл

@@ -6,6 +6,8 @@ import Box from "@mui/material/Box";
import NavigationToggle from "./NavigationToggle"; import NavigationToggle from "./NavigationToggle";
import { I18nProvider } from "@/i18n"; import { I18nProvider } from "@/i18n";
import { Typography } from "@mui/material"; import { Typography } from "@mui/material";
import Breadcrumb from "@/components/Breadcrumb";
import { NAVIGATION_CONTENT_WIDTH } from "@/config/uiConfig";


export interface AppBarProps { export interface AppBarProps {
avatarImageSrc?: string; avatarImageSrc?: string;
@@ -18,6 +20,12 @@ const AppBar: React.FC<AppBarProps> = ({ avatarImageSrc, profileName }) => {
<MUIAppBar position="sticky" color="default" elevation={0}> <MUIAppBar position="sticky" color="default" elevation={0}>
<Toolbar sx={{ minHeight: { xs: 56, sm: 64 }, px: 2 }}> <Toolbar sx={{ minHeight: { xs: 56, sm: 64 }, px: 2 }}>
<NavigationToggle /> <NavigationToggle />
<Box sx={{ ml: NAVIGATION_CONTENT_WIDTH, display: { xs: "none", xl: "block" } }}>
<Breadcrumb />
</Box>
<Box sx={{ display: { xl: "none" } }}>
<Breadcrumb />
</Box>
<Box <Box
sx={{ sx={{
flexGrow: 1, flexGrow: 1,


Загрузка…
Отмена
Сохранить