Patrick-HongYun-Project3-Frontend#47
Open
patrickkok wants to merge 116 commits into
Open
Conversation
…ted initial dummy text.
…nents. redid the login page temporarily.
… to relative paths
…or basic nav. amended routes
…ging on touch screen
Firebase storage
…ils. also able to select item name and pull out serial num
Manage item form to update cycle count values No conflicts, remember to remove unused console.log statements in the future
…dingly. reset fields when changing tx type
…ew form to add new items to the inventory
…h up buildingList styling
Main building
added sheets to rooms add items
…or the current user, add select menu for buildings, Add qty on itms in rooms
…ponse from backend
Only show items that is in the user's building
…t and add item in rooms page
Update readme with project planning information
amended login layout and added protected route to login
…rror: 'originalKeywordKind' has been deprecated since v5.0.0 and can no longer be used
cleaned up code
Flashrob
reviewed
Apr 28, 2024
Comment on lines
+1
to
+31
| // import React from "react"; | ||
| // import { BrowserRouter, Routes, Route, Navigate } from "react-router-dom"; | ||
| // import { Login } from "./pages/Login"; | ||
| // import { MenuFrame } from "./pages/MenuFrame"; | ||
| // import { Buildings } from "./pages/Buildings"; | ||
| // import { Room } from "./pages/Room"; | ||
| // import { ManageItems } from "./pages/ManageItems"; | ||
| // import { AddNewItem } from "./pages/AddNewItem"; | ||
| // import { AllItems } from "./pages/allitems/page"; | ||
|
|
||
| // const App = () => { | ||
| // return ( | ||
| // <BrowserRouter> | ||
| // <Routes> | ||
| // <Route path="/" element={<Login />} /> | ||
| // <Route path="/landing" element={<MenuFrame />}> | ||
| // {/* Nested routes will render within <MenuFrame /> */} | ||
| // <Route path="buildings" element={<Buildings />} /> | ||
| // <Route path="room" element={<Room />} /> | ||
| // <Route path="allitems" element={<AllItems />} /> | ||
| // <Route path="manageitems" element={<ManageItems />} /> | ||
| // <Route path="addnewitem" element={<AddNewItem />} /> | ||
| // </Route> | ||
| // {/* Redirect to "/landing/allitems" or a default nested route if "/landing" is accessed directly */} | ||
| // <Route | ||
| // path="/landing" | ||
| // element={<Navigate replace to="/landing/allitems" />} | ||
| // /> | ||
| // </Routes> | ||
| // </BrowserRouter> | ||
| // ); |
There was a problem hiding this comment.
U know what I want to comment here, right? :D
| <Route path="/" element={<Login />} /> | ||
| {/* Apply the ProtectedRoute component here to protect all nested routes */} | ||
| <Route | ||
| path="/landing" |
There was a problem hiding this comment.
While it is nice to protect all the components in this manner, I find the routing of prefixing every page with /landing questionable!
|
|
||
| import { cn } from "../../lib/utils"; | ||
|
|
||
| const Avatar = React.forwardRef< |
There was a problem hiding this comment.
Why do u need a ref on an image? I am a bit confused
| @@ -0,0 +1,48 @@ | |||
| import * as React from "react"; | |||
There was a problem hiding this comment.
All files in your ui folder are components. So those should be in capital letter
| @@ -0,0 +1,92 @@ | |||
| Geist Sans and Geist Mono Font | |||
| <TableBody> | ||
| {allItems.map((item) => ( | ||
| <TableRow key={item.id}> | ||
| <TableCell>{item.serial_num}</TableCell> |
There was a problem hiding this comment.
Having a TableItem component would be nice here for abstraction
Comment on lines
+101
to
+104
| form.setValue("itemName", response.data.serial_num); | ||
| form.setValue("quantity", response.data.roomItems[0].quantity); | ||
| form.setValue( | ||
| "expiryDate", |
There was a problem hiding this comment.
Is there a way to set multiple form values at once?
Comment on lines
+55
to
+56
| const [expCount, setExpCount] = useState(0); | ||
| const [expItems, setExpItems] = useState<ExpItem[]>([]); |
There was a problem hiding this comment.
A single object would work here, which contains the count and the items
There was a problem hiding this comment.
Also, naming this exp can mean many different things. I would try to be more clear here
| const [parCount, setParCount] = useState(0); | ||
| const [parItems, setParItems] = useState<ParItem[]>([]); | ||
| const [buildings, setBuildings] = useState<buildingList>([]); | ||
| const [currentBuilding, setCurrentBuilding] = useState<building | undefined>( |
There was a problem hiding this comment.
are we using undefined here only for the default value? If so, why not use an empty building object here instead?
| const onSubmit = async (formData: z.infer<typeof formSchema>) => { | ||
| if (form.getValues("type") === "deleteroomitem") { | ||
| try { | ||
| const response = await sendRequest(`/deleteroomitem/`, { |
There was a problem hiding this comment.
that route seems not in line with REST patterns. Maybe look that up once more and find a more appropriate route
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.