generated from rocketacademy/cra-bootcamp-template
-
Notifications
You must be signed in to change notification settings - Fork 39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Patrick-HongYun-Project3-Frontend #47
Open
patrickkok
wants to merge
116
commits into
rocketacademy:main
Choose a base branch
from
magiicloud:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
116 commits
Select commit
Hold shift + click to select a range
38b4e8f
installed tailwind, react-router, axios, shadcn as dependencies. crea…
magiicloud 909df7d
reshuffled the lib and components into src folder. added shadcn compo…
magiicloud 02aed13
converted proj into TS
magiicloud 65dee16
installde @types dependencies to remove error and also changed import…
magiicloud dd9c273
added auth and nav to dash, added basic boilerplate for other pages f…
magiicloud 8b62071
amended dependencies version, changed module to ESNext, retrived item…
magiicloud e5dc389
amended AllItems table to show data on quantity and rooms
magiicloud f9737c6
added the itemform and added basic stylings
magiicloud 7cdda45
added radio group to choose transaction type and amended form schema
magiicloud e227ea8
changed to select item for transactions and add to cart instead
magiicloud f656de4
Allow user to highlight an area of a picture with a div on the floorp…
patrickkok ad9c959
Remove unused variables, fix bug where screen would scroll while drag…
patrickkok ea5bc10
Shift new floorplan into a popup dialog
patrickkok 2fe1b65
Add border radius and transparency to select divs
patrickkok 917b96e
Rename pages, shift new floorplan to it's own component, initialise f…
patrickkok 7ddbfaa
Add feature to upload image to firebase storage, removed unused states
patrickkok fb22539
Change floorplan to building to be consistent with backend
patrickkok 4201a3f
Add feature to fetch and display current buildings from the backend
patrickkok 8b59f78
Merge pull request #1 from magiicloud/firebase-storage
magiicloud 713e50a
able to search with serial num and brings out existing inventory deta…
magiicloud 74dd715
able to search either via dropdown or serial num
magiicloud 37404fe
added onsumbit function to update values in db
magiicloud 478366d
added validations and toast after submit form
magiicloud 38b4bf5
Merge pull request #2 from magiicloud/additemform
patrickkok 59b45cf
shifted rooms up, added rooms prop to search function. allitems now s…
magiicloud bab4f8f
refactored fetching of items and rooms into separate reusable hooks
magiicloud 7092513
watch transaction type and render itemName and serialNum fields accor…
magiicloud 9c19856
changed the naming for managing items and adding new items. added a n…
magiicloud bd61a14
added protected routes and auth but not working
magiicloud 94afa9f
Add ability to update backend with new building, change to format of …
patrickkok 22d567d
Merge pull request #3 from magiicloud/add-building
magiicloud 49714b0
refactored forms into individual component of AddNewItem and CycleCou…
magiicloud 28010eb
edited layout of the tabs and to display diff forms into tabs
magiicloud 7a1a97f
Merge pull request #4 from magiicloud/manage-items
patrickkok 71cb2f7
new delete form and link to backend delete controllers and routes
magiicloud f59741f
Add input field validation for new buildings
patrickkok 9a3b67b
added autosearch when enter serial num
magiicloud cf68bf7
remove tx type for cycle count. resolved selection error bugs
magiicloud 826af59
edited layout to show p tags for 2 line of same items
magiicloud dfb2b23
added a template dashboard to wrap app contents
magiicloud e70e7d0
styled forms in relation to dashboard template
magiicloud 8700c72
added MenuFrame to relayout the app, pages now render inside the frame
magiicloud f43419f
added Cart component to render cart items
magiicloud 8ed5820
adjusted sheet size, added cart into cyclecount page
magiicloud 0c903d1
refactored into separate functions when opening cart and checking out…
magiicloud a59a824
pass down state to resetform
magiicloud 9b14136
amended overlay size to 3xl
magiicloud d6360d4
added data table for all items and test as demo component first
magiicloud 62ca9ef
change main allitems page to the new datatable
magiicloud 0a04c99
left out checkbox ui component that is required for data table
magiicloud de456a6
forgot to add package for tanstack for datatable
magiicloud eed0ada
installed geist font
magiicloud 6a95d14
Handle errors on the backend, update button UI
patrickkok 866e380
Merge pull request #5 from magiicloud/new-building-validation
magiicloud 6fc50bb
added search serial num
magiicloud a398974
Merge pull request #6 from magiicloud/deleteitem
patrickkok d81e52f
added auth protected routes and to persist by storing in local storag…
magiicloud 2576494
Merge pull request #7 from magiicloud/auth
patrickkok ba7ae2a
changed users tab to buildings tab
magiicloud a7187ab
Merge pull request #8 from magiicloud/auth
magiicloud 5df7f3e
Add rooms page, Add backend url env var, add link to rooms
patrickkok 22f07cf
added search icon and adjusted table to grid for phone rendering
magiicloud 3092b91
added reusable get token hook
magiicloud 62acc20
added audience and scope
magiicloud 13b1088
added get token to routes
magiicloud b3c19e6
Add room name and building name to room UI, Add method to fetch room …
patrickkok 2eec9ed
added the delete button function to button
magiicloud 88076bd
Add cards to display room items, add button to link to add items page
patrickkok 1f0d7ff
Add logic to add user to the SQL database upon login
patrickkok d1aa534
added dashboard as default landing page. dashboard to trace short exp…
magiicloud 1663f05
added function to generate excel reports
magiicloud 85442fd
amended styling and css of overall design
magiicloud a6dd1b8
Merge pull request #9 from magiicloud/rooms
magiicloud e4b2885
Merge pull request #10 from magiicloud/add-user
magiicloud 1f6a47e
resolved conflicts
magiicloud a98d21a
Add user email to the body of the requests to get buildings and add n…
patrickkok fd54448
edited to try catch block for login. comment out building component i…
magiicloud 8505d85
Add admin to the building if the current user is the admin of the bui…
patrickkok 8985618
Merge pull request #11 from magiicloud/auth-dash
patrickkok 148312f
added download excel function for all items table to download selecte…
magiicloud 9e69c83
added download excel function for all items table to download selecte…
magiicloud 3b8cf3e
Merge branch 'auth-dash' of github.com:magiicloud/project3-frontend-b…
magiicloud ae2e63c
amended login page to post user information to backend
magiicloud 5211458
Merge pull request #13 from magiicloud/auth-dash
patrickkok 34eabb2
added usercontext to store userid after logging in. that will be pass…
magiicloud e125005
Merge pull request #12 from magiicloud/building-users
magiicloud 22f8618
Merge pull request #14 from magiicloud/auth-dash
patrickkok d3d99c0
Change fetch building logic. Update page rerender on building addition
patrickkok cb5cc59
Use userId to fetch buildings and create new building
patrickkok 03eba03
Create useBuildings hook to access fetch buildings method and object …
patrickkok a86ce2f
Add current building preview to dashboard, change building icon, touc…
patrickkok e6c04b6
Add interface to add user to building, update building page UI
patrickkok cda13cc
Merge pull request #15 from magiicloud/main-building
magiicloud 124b578
added sheets to rooms add items
magiicloud 1555094
reverted to userId for fetchBuildings
magiicloud 096ac83
Merge pull request #16 from magiicloud/ux-update
patrickkok b662de0
Update Dashboard to only display expiring items and items below par f…
patrickkok 310b65d
Update allItems to only show items in rooms the user is a part of
patrickkok 729d170
Update useRooms hook to only fetch rooms the user is part of
patrickkok b38f84d
changed back paritems formatting to previous format to accomodate res…
magiicloud 66dd06e
Merge pull request #17 from magiicloud/get-items-by-building
magiicloud 36cfed8
deleted reports page on menu, added overflow scroll to sheets for car…
magiicloud c9f7c2b
Update readme with project planning information
patrickkok e6182df
Merge pull request #18 from magiicloud/readme-update
patrickkok 1c3fe04
changed overall theme
magiicloud 443c880
Merge pull request #19 from magiicloud/ux-update
patrickkok 9645f54
amended login layout and added protected route to login
magiicloud 36dda47
added build script to compile ts and ignore env variables for production
magiicloud 29a1406
removed tsx from run build
magiicloud 23ffec6
Merge pull request #20 from magiicloud/ux-update
patrickkok 1284117
added @typescript-eslint/parser to dependency to resolve DeprecationE…
magiicloud 250ac25
minor amendments to toast layout and form refresh after submit
magiicloud da3472e
Merge pull request #21 from magiicloud/ux-update
magiicloud 4573129
cleaned up code
magiicloud b6d3465
Merge pull request #22 from magiicloud/code-cleanup
magiicloud 14e0cd7
Update README.md
patrickkok File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"projects": { | ||
"default": "rocket-academy-proj3" | ||
} | ||
} |
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
{ | ||
"$schema": "https://ui.shadcn.com/schema.json", | ||
"style": "new-york", | ||
"rsc": false, | ||
"tsx": true, | ||
"tailwind": { | ||
"config": "tailwind.config.js", | ||
"css": "src/index.css", | ||
"baseColor": "slate", | ||
"cssVariables": true, | ||
"prefix": "" | ||
}, | ||
"aliases": { | ||
"components": "@/components", | ||
"utils": "@/lib/utils" | ||
} | ||
} |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"hosting": { | ||
"public": "public", | ||
"ignore": [ | ||
"firebase.json", | ||
"**/.*", | ||
"**/node_modules/**" | ||
] | ||
}, | ||
"storage": { | ||
"rules": "storage.rules" | ||
} | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is missing install instructions and how to setup firebase