diff --git a/src/Components/Header/Header.tsx b/src/Components/Header/Header.tsx index a8e961f..739477a 100644 --- a/src/Components/Header/Header.tsx +++ b/src/Components/Header/Header.tsx @@ -14,7 +14,7 @@ export default function Header(props: props) { style={{ position: "sticky", top: 0, - zIndex: -1, + zIndex: 1, backgroundColor: colors.header_color, display: "flex", flexDirection: "row", diff --git a/src/Pages/DashboardPage/DashboardPage.tsx b/src/Pages/DashboardPage/DashboardPage.tsx index 046cfde..0d33072 100644 --- a/src/Pages/DashboardPage/DashboardPage.tsx +++ b/src/Pages/DashboardPage/DashboardPage.tsx @@ -2,8 +2,14 @@ import Header from "../../Components/Header/Header"; import styles from "../../styles"; import { useQueries } from "@tanstack/react-query"; import { EquipmentsAPI, EquipmentInstancesAPI } from "../../Components/API/API"; -import { CircularProgress } from "@mui/material"; - +import { Button, CircularProgress } from "@mui/material"; +import ComputerIcon from "@mui/icons-material/Computer"; +import RouterIcon from "@mui/icons-material/Router"; +import CameraOutdoorIcon from "@mui/icons-material/CameraOutdoor"; +import ChairIcon from "@mui/icons-material/Chair"; +import FormatListBulletedIcon from "@mui/icons-material/FormatListBulleted"; +import AddToQueueIcon from "@mui/icons-material/AddToQueue"; +import { colors } from "../../styles"; export default function Dashboard() { const queries = useQueries({ queries: [ @@ -18,7 +24,7 @@ export default function Dashboard() { ], }); const isLoading = queries.some((result) => result.isLoading); - + if (isLoading) { return (
@@ -50,7 +56,16 @@ export default function Dashboard() {
-
+
- Equipment Types in Database + Equipment Types in Database

-
+
+

+ Equipments +

+
+ + +
+ +
+ + + + + +
); } diff --git a/src/styles.tsx b/src/styles.tsx index 4a8f257..3ad2dc1 100644 --- a/src/styles.tsx +++ b/src/styles.tsx @@ -20,6 +20,7 @@ const styles: { [key: string]: React.CSSProperties } = { width: "100%", minHeight: "100%", minWidth: "100%", + overflowY: "scroll", }, text_dark: { color: colors.font_dark,