diff --git a/src/index.tsx b/src/index.tsx index 82665f71..2ca1ac84 100755 --- a/src/index.tsx +++ b/src/index.tsx @@ -25,23 +25,41 @@ import MyQuizzesFull from "./pages/createQuize/MyQuizzesFull"; const root = ReactDOM.createRoot( document.getElementById('root') as HTMLElement ); + +const routeslink: {path: string; page: JSX.Element; header: boolean; sidebar: boolean} [] = [ + {path: "/", page:
, header: false, sidebar: false}, + {path: "/list", page: , header: false, sidebar: false}, + {path: "/list-empty", page: , header: false, sidebar: false}, + {path: "/list-full", page: , header: false, sidebar: false}, + {path: "/list-short", page: , header: false, sidebar: false}, + {path: "/create", page: , header: true, sidebar: true}, + {path: "/questions", page: , header: true, sidebar: true}, + {path: "/contacts", page: , header: true, sidebar: true}, + {path: "/result", page: , header: true, sidebar: true}, + {path: "/settings", page: , header: true, sidebar: true}, + {path: "/install", page: , header: true, sidebar: true}, +] + root.render( - }/> - } /> - } /> - } /> - } /> + {routeslink.map((e,i) =>( + + ))} + {/* }/>*/} + {/*} />*/} + {/*} />*/} + {/*} />*/} + {/*} />*/} - } /> - } /> - } /> - } /> - } /> - } /> + {/*} />*/} + {/*} />*/} + {/*} />*/} + {/*} />*/} + {/*} />*/} + {/*} />*/} diff --git a/src/pages/main.tsx b/src/pages/main.tsx index d0500506..8f79cb59 100755 --- a/src/pages/main.tsx +++ b/src/pages/main.tsx @@ -5,7 +5,7 @@ import {Outlet} from "react-router-dom"; import {useTheme} from "@mui/material"; -export default function Main () { +export default function Main (sidebar: boolean) { const theme = useTheme(); return ( <> @@ -14,7 +14,7 @@ export default function Main () { display: 'flex' }} > - + - : - mode === "createQuiz" ? - - : -
; + return isLoggedIn ? ( +
+ ):( + + ) } \ No newline at end of file diff --git a/src/ui_kit/Sidebar.tsx b/src/ui_kit/Sidebar.tsx index 862e3e44..d7a48e7f 100755 --- a/src/ui_kit/Sidebar.tsx +++ b/src/ui_kit/Sidebar.tsx @@ -30,7 +30,8 @@ const quizSettingsMenuItems = [ [GearIcon, "Настройки"], ] as const; -export default function Sidebar() { + +export default function Sidebar(sidebar: boolean) { const theme = useTheme(); const [isMenuCollapsed, setIsMenuCollapsed] = useState(false); const [activeMenuItemIndex, setActiveMenuItemIndex] = useState(0); @@ -45,7 +46,7 @@ export default function Sidebar() { minWidth: isMenuCollapsed ? "80px" : "230px", width: isMenuCollapsed ? "80px" : "230px", height: 'calc(100vh - 80px)', - display: "flex", + display: sidebar ? "flex" : "none", flexDirection: "column", py: "19px", transitionProperty: "width, min-width",