From d69945f789e0fff4909b87487e8a5cd3c675adff Mon Sep 17 00:00:00 2001 From: Keannu Bernasol Date: Thu, 21 Dec 2023 14:58:23 +0800 Subject: [PATCH] Restructure Dashboard page components folder hierarchy and add initial StudentTransactionListView component --- .../{ => Student}/StudentTransactionFilterMenu.tsx | 8 ++++---- .../DashboardPage/Student/StudentTransactionListView.tsx | 3 +++ .../{ => Technician}/TechnicianEquipmentButtons.tsx | 8 ++++---- .../{ => Technician}/TechnicianLogButtons.tsx | 4 ++-- .../DashboardPage/{ => Technician}/TechnicianWidgets.tsx | 4 ++-- src/Pages/DashboardPage/DashboardPage.tsx | 8 ++++---- 6 files changed, 19 insertions(+), 16 deletions(-) rename src/Components/DashboardPage/{ => Student}/StudentTransactionFilterMenu.tsx (98%) create mode 100644 src/Components/DashboardPage/Student/StudentTransactionListView.tsx rename src/Components/DashboardPage/{ => Technician}/TechnicianEquipmentButtons.tsx (97%) rename src/Components/DashboardPage/{ => Technician}/TechnicianLogButtons.tsx (96%) rename src/Components/DashboardPage/{ => Technician}/TechnicianWidgets.tsx (98%) diff --git a/src/Components/DashboardPage/StudentTransactionFilterMenu.tsx b/src/Components/DashboardPage/Student/StudentTransactionFilterMenu.tsx similarity index 98% rename from src/Components/DashboardPage/StudentTransactionFilterMenu.tsx rename to src/Components/DashboardPage/Student/StudentTransactionFilterMenu.tsx index 30523a8..c8cb43f 100644 --- a/src/Components/DashboardPage/StudentTransactionFilterMenu.tsx +++ b/src/Components/DashboardPage/Student/StudentTransactionFilterMenu.tsx @@ -1,4 +1,4 @@ -import styles from "../../styles"; +import styles from "../../../styles"; import { Button, FormControl, @@ -10,10 +10,10 @@ import { import HourglassBottomIcon from "@mui/icons-material/HourglassBottom"; import CheckCircleIcon from "@mui/icons-material/CheckCircle"; import FlashOffIcon from "@mui/icons-material/FlashOff"; -import { colors } from "../../styles"; +import { colors } from "../../../styles"; import Popup from "reactjs-popup"; -import AddItemModal from "../AddItemModal/AddItemModal"; -import AddSKUModal from "../AddSKUModal/AddSKUModal"; +import AddItemModal from "../../AddItemModal/AddItemModal"; +import AddSKUModal from "../../AddSKUModal/AddSKUModal"; import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline"; import ShoppingCartCheckoutIcon from "@mui/icons-material/ShoppingCartCheckout"; import AssignmentReturnedIcon from "@mui/icons-material/AssignmentReturned"; diff --git a/src/Components/DashboardPage/Student/StudentTransactionListView.tsx b/src/Components/DashboardPage/Student/StudentTransactionListView.tsx new file mode 100644 index 0000000..5fdefbb --- /dev/null +++ b/src/Components/DashboardPage/Student/StudentTransactionListView.tsx @@ -0,0 +1,3 @@ +export default function StudentTransactionListView() { + return
{"StudentTransactionListView"}
; +} diff --git a/src/Components/DashboardPage/TechnicianEquipmentButtons.tsx b/src/Components/DashboardPage/Technician/TechnicianEquipmentButtons.tsx similarity index 97% rename from src/Components/DashboardPage/TechnicianEquipmentButtons.tsx rename to src/Components/DashboardPage/Technician/TechnicianEquipmentButtons.tsx index da64391..ed33c37 100644 --- a/src/Components/DashboardPage/TechnicianEquipmentButtons.tsx +++ b/src/Components/DashboardPage/Technician/TechnicianEquipmentButtons.tsx @@ -1,16 +1,16 @@ -import styles from "../../styles"; +import styles from "../../../styles"; import { useNavigate } from "react-router-dom"; import { Button } from "@mui/material"; import FormatListBulletedIcon from "@mui/icons-material/FormatListBulleted"; import AddToQueueIcon from "@mui/icons-material/AddToQueue"; import NoteAddIcon from "@mui/icons-material/NoteAdd"; import NoteIcon from "@mui/icons-material/Note"; -import { colors } from "../../styles"; +import { colors } from "../../../styles"; import ScienceIcon from "@mui/icons-material/Science"; import ColorizeIcon from "@mui/icons-material/Colorize"; import Popup from "reactjs-popup"; -import AddItemModal from "../AddItemModal/AddItemModal"; -import AddSKUModal from "../AddSKUModal/AddSKUModal"; +import AddItemModal from "../../AddItemModal/AddItemModal"; +import AddSKUModal from "../../AddSKUModal/AddSKUModal"; import { useState } from "react"; export default function TechnicianEquipmentButtons() { const [addSKUmodalOpen, SetAddSKUModalOpen] = useState(false); diff --git a/src/Components/DashboardPage/TechnicianLogButtons.tsx b/src/Components/DashboardPage/Technician/TechnicianLogButtons.tsx similarity index 96% rename from src/Components/DashboardPage/TechnicianLogButtons.tsx rename to src/Components/DashboardPage/Technician/TechnicianLogButtons.tsx index 74fffe1..22a3b5e 100644 --- a/src/Components/DashboardPage/TechnicianLogButtons.tsx +++ b/src/Components/DashboardPage/Technician/TechnicianLogButtons.tsx @@ -1,8 +1,8 @@ import { Button } from "@mui/material"; import { useNavigate } from "react-router-dom"; import ManageSearchIcon from "@mui/icons-material/ManageSearch"; -import styles from "../../styles"; -import { colors } from "../../styles"; +import styles from "../../../styles"; +import { colors } from "../../../styles"; export default function TechnicianLogButtons() { const navigate = useNavigate(); diff --git a/src/Components/DashboardPage/TechnicianWidgets.tsx b/src/Components/DashboardPage/Technician/TechnicianWidgets.tsx similarity index 98% rename from src/Components/DashboardPage/TechnicianWidgets.tsx rename to src/Components/DashboardPage/Technician/TechnicianWidgets.tsx index 8c3c239..23bfe42 100644 --- a/src/Components/DashboardPage/TechnicianWidgets.tsx +++ b/src/Components/DashboardPage/Technician/TechnicianWidgets.tsx @@ -1,6 +1,6 @@ import { useQueries } from "@tanstack/react-query"; -import styles from "../../styles"; -import { EquipmentsAPI, EquipmentInstancesAPI, UserAPI } from "../API/API"; +import styles from "../../../styles"; +import { EquipmentsAPI, EquipmentInstancesAPI, UserAPI } from "../../API/API"; import CircularProgress from "@mui/material/CircularProgress"; export default function TechnicianWidgets() { diff --git a/src/Pages/DashboardPage/DashboardPage.tsx b/src/Pages/DashboardPage/DashboardPage.tsx index ae36dac..bac4dc5 100644 --- a/src/Pages/DashboardPage/DashboardPage.tsx +++ b/src/Pages/DashboardPage/DashboardPage.tsx @@ -1,10 +1,10 @@ import Header from "../../Components/Header/Header"; import styles from "../../styles"; import RestrictedComponent from "../../Components/RestrictedComponent/RestrictedComponent"; -import TechnicianWidgets from "../../Components/DashboardPage/TechnicianWidgets"; -import TechnicianEquipmentButtons from "../../Components/DashboardPage/TechnicianEquipmentButtons"; -import TechnicianLogButtons from "../../Components/DashboardPage/TechnicianLogButtons"; -import StudentTransactionFilterMenu from "../../Components/DashboardPage/StudentTransactionFilterMenu"; +import TechnicianWidgets from "../../Components/DashboardPage/Technician/TechnicianWidgets"; +import TechnicianEquipmentButtons from "../../Components/DashboardPage/Technician/TechnicianEquipmentButtons"; +import TechnicianLogButtons from "../../Components/DashboardPage/Technician/TechnicianLogButtons"; +import StudentTransactionFilterMenu from "../../Components/DashboardPage/Student/StudentTransactionFilterMenu"; export default function Dashboard() { return (