diff --git a/src/App.tsx b/src/App.tsx
index d294418..ddc36da 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -22,6 +22,7 @@ import AddTransactionPage from "./Pages/AddTransactionPage/AddTransactionPage";
import TransactionPage from "./Pages/TransactionPage/TransactionPage";
import EquipmentInstanceTallyPage from "./Pages/EquipmentTallyPage/EquipmentTallyPage";
import TransactionReportPage from "./Pages/TransactionReportPage/TransactionReportPage";
+import ManageEquipmentPage from "./Pages/ManageEquipmentPage/ManageEquipmentPage";
const queryClient = new QueryClient();
const router = createHashRouter([
@@ -67,6 +68,17 @@ const router = createHashRouter([
),
errorElement: ,
},
+ {
+ path: "/view/ManageEquipment",
+ element: (
+ <>
+
+
+
+ >
+ ),
+ errorElement: ,
+ },
{
path: "/view/equipment_instances/filter/:filter_by",
element: (
diff --git a/src/Components/DashboardPage/Technician/TechnicianNavigation.tsx b/src/Components/DashboardPage/Technician/TechnicianNavigation.tsx
index dfa3f0a..ce853d5 100644
--- a/src/Components/DashboardPage/Technician/TechnicianNavigation.tsx
+++ b/src/Components/DashboardPage/Technician/TechnicianNavigation.tsx
@@ -16,34 +16,35 @@ export default function TechnicianNavigation() {
alignItems: "center",
gap: "24px",
alignSelf: "stretch",
+ paddingBottom: "5rem"
}}
>
-
-
-
-
- Feature
-
+
+ Feature
+
-
-
+
+ {/* Yellow Capsule */}
-
- Available Equipments
-
+ {/* Pending Req */}
+
+
+ {queries[1].data?.length || "Loading..."}
+
-
- {queries[1].data?.filter(
- (equipment) => equipment.status == "Available"
- ).length || "Loading..."}
-
-
-
-
- Broken Equipments
-
+
+ Total Equipment
+
+
+
+
+
+ Available
+
+
+ {queries[1].data?.filter(
+ (equipment) => equipment.status == "Available"
+ ).length || "Loading..."}
+
-
- {queries[1].data?.filter(
- (equipment) => equipment.status == "Broken"
- ).length || "Loading..."}
-
-
-
-
-
-
- Total Transactions Today
-
+
+ Pending
+
+
+ {queries[1].data?.filter(
+ (equipment) => equipment.status == "Pending"
+ ).length || 0}
+
-
- {queries[3].data?.filter((transaction) =>
- moment(transaction.timestamp, "MM-DD-YYYY hh:mm A").isBetween(
- todayStartOfDay,
- todayEndOfDay
- )
- ).length || "Loading..."}
-
-
-
-
- Total Transactions this Month
-
+
+ Broken
+
+
+ {queries[1].data?.filter(
+ (equipment) => equipment.status == "Broken"
+ ).length || 0}
+
+
+
+
- {queries[3].data?.filter((transaction) =>
- moment(transaction.timestamp, "MM-DD-YYYY hh:mm A").isBetween(
- thisMonthStart,
- thisMonthEnd
- )
- ).length || "Loading..."}
+ Equipment Tracking
diff --git a/src/Components/Header/Header.tsx b/src/Components/Header/Header.tsx
index b5680f7..219a8d1 100644
--- a/src/Components/Header/Header.tsx
+++ b/src/Components/Header/Header.tsx
@@ -1,5 +1,5 @@
import { useState } from "react";
-import styles, { colors } from "../../styles";
+import styles from "../../styles";
import MenuIcon from "@mui/icons-material/Menu";
import SidebarModal from "../Drawer/Drawer";
import { Drawer } from "@mui/material";
diff --git a/src/Pages/DashboardPage/DashboardPage.tsx b/src/Pages/DashboardPage/DashboardPage.tsx
index ed18c6e..bc923ef 100644
--- a/src/Pages/DashboardPage/DashboardPage.tsx
+++ b/src/Pages/DashboardPage/DashboardPage.tsx
@@ -2,8 +2,6 @@ import Header from "../../Components/Header/Header";
import styles from "../../styles";
import RestrictedComponent from "../../Components/RestrictedComponent/RestrictedComponent";
import TechnicianWidgets from "../../Components/DashboardPage/Technician/TechnicianWidgets";
-import TechnicianEquipmentButtons from "../../Components/DashboardPage/Technician/TechnicianEquipmentButtons";
-import TechnicianLogButtons from "../../Components/DashboardPage/Technician/TechnicianLogButtons";
import StudentTransactionListView from "../../Components/DashboardPage/Student/StudentTransactionListView";
import StudentDashboard from "../../Components/DashboardPage/Student/StudentDashboard";
import TechnicianNavigation from "../../Components/DashboardPage/Technician/TechnicianNavigation";
@@ -16,8 +14,6 @@ export default function Dashboard() {
-
-
-
+
+
diff --git a/src/Pages/ManageEquipmentPage/ManageEquipmentPage.tsx b/src/Pages/ManageEquipmentPage/ManageEquipmentPage.tsx
new file mode 100644
index 0000000..5bcabe9
--- /dev/null
+++ b/src/Pages/ManageEquipmentPage/ManageEquipmentPage.tsx
@@ -0,0 +1,20 @@
+import Header from "../../Components/Header/Header";
+import styles from "../../styles";
+import RestrictedComponent from "../../Components/RestrictedComponent/RestrictedComponent";
+import TechnicianEquipmentButtons from "../../Components/DashboardPage/Technician/TechnicianEquipmentButtons";
+import TechnicianLogButtons from "../../Components/DashboardPage/Technician/TechnicianLogButtons";
+
+
+export default function ManageEquipmentPage() {
+return (
+
+);
+}
diff --git a/src/Pages/TransactionPage/TransactionPage.tsx b/src/Pages/TransactionPage/TransactionPage.tsx
index f4d7d5a..ab6ceb2 100644
--- a/src/Pages/TransactionPage/TransactionPage.tsx
+++ b/src/Pages/TransactionPage/TransactionPage.tsx
@@ -53,6 +53,7 @@ export default function TransactionPage() {
alignContent: "center",
justifyContent: "center",
alignItems: "center",
+ marginTop: 64
}}
>