diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 2dc6087..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,14 +0,0 @@ -# .woodpecker.yml -steps: - - name: build & copy - image: node:18-alpine - commands: - - apk add --no-cache openssh-client - - mkdir -p /root/.ssh/ - - echo "$SSH_KEY" | tr -d '\r' > /root/.ssh/id_rsa - - chmod 600 /root/.ssh/id_rsa - - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config - - npm install - - npm run build - - scp -r dist/* root@10.0.10.4:/mnt/sda1/files/projects/equipment_tracker_frontend - secrets: [SSH_KEY] diff --git a/src/Components/API/API.tsx b/src/Components/API/API.tsx index d410b8e..437eb24 100644 --- a/src/Components/API/API.tsx +++ b/src/Components/API/API.tsx @@ -17,7 +17,7 @@ import { EquipmentInstanceLogListType, } from "../Types/Types"; -const debug = false; +const debug = true; let backendURL; if (debug) { diff --git a/src/Components/AddSKUModal/AddSKUModal.tsx b/src/Components/AddSKUModal/AddSKUModal.tsx index 6aa8946..5a68d29 100644 --- a/src/Components/AddSKUModal/AddSKUModal.tsx +++ b/src/Components/AddSKUModal/AddSKUModal.tsx @@ -86,39 +86,13 @@ export default function AddSKUModal() {
} - label="Workstation" + label="Glassware" style={styles.text_dark} /> } - label="Networking" - style={styles.text_dark} - /> - } - label="CCTV" - style={styles.text_dark} - /> -
-
- } - label="Furniture" - style={styles.text_dark} - /> - } - label="Peripherals" - style={styles.text_dark} - /> - } label="Miscellaneous" style={styles.text_dark} diff --git a/src/Components/EditItemInstanceModal/EditItemInstanceModal.tsx b/src/Components/EditItemInstanceModal/EditItemInstanceModal.tsx index 9fcc0f4..1717d3d 100644 --- a/src/Components/EditItemInstanceModal/EditItemInstanceModal.tsx +++ b/src/Components/EditItemInstanceModal/EditItemInstanceModal.tsx @@ -197,8 +197,7 @@ export default function EditItemInstanceModal(props: { Associated SKU:

- {equipment.data?.equipment_name} - {" (SKU #" + equipment.data?.equipment + ")"} + {equipment.data?.equipment}

diff --git a/src/Components/EditSKUModal/EditSKUModal.tsx b/src/Components/EditSKUModal/EditSKUModal.tsx index 35fed94..363f19a 100644 --- a/src/Components/EditSKUModal/EditSKUModal.tsx +++ b/src/Components/EditSKUModal/EditSKUModal.tsx @@ -221,39 +221,13 @@ export default function EditSKUModal(props: {
} - label="Workstation" + label="Glassware" style={styles.text_dark} /> } - label="Networking" - style={styles.text_dark} - /> - } - label="CCTV" - style={styles.text_dark} - /> -
-
- } - label="Furniture" - style={styles.text_dark} - /> - } - label="Peripherals" - style={styles.text_dark} - /> - } label="Miscellaneous" style={styles.text_dark} diff --git a/src/Pages/DashboardPage/DashboardPage.tsx b/src/Pages/DashboardPage/DashboardPage.tsx index 9d1d0e1..e7e4093 100644 --- a/src/Pages/DashboardPage/DashboardPage.tsx +++ b/src/Pages/DashboardPage/DashboardPage.tsx @@ -3,10 +3,6 @@ import styles from "../../styles"; import { useQueries } from "@tanstack/react-query"; import { EquipmentsAPI, EquipmentInstancesAPI } from "../../Components/API/API"; 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 NoteAddIcon from "@mui/icons-material/NoteAdd"; @@ -18,6 +14,8 @@ import { useState } from "react"; import AddSKUModal from "../../Components/AddSKUModal/AddSKUModal"; import Popup from "reactjs-popup"; import AddItemModal from "../../Components/AddItemModal/AddItemModal"; +import ScienceIcon from "@mui/icons-material/Science"; +import ColorizeIcon from "@mui/icons-material/Colorize"; export default function Dashboard() { const navigate = useNavigate(); @@ -388,7 +386,7 @@ export default function Dashboard() { }, }} > - { - navigate("/view/equipment_instances/filter/PC"); + navigate("/view/equipment_instances/filter/Glassware"); }} />

- Workstations + Glassware

- - -