Skip to content
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
wants to merge 116 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 115 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 Mar 20, 2024
909df7d
reshuffled the lib and components into src folder. added shadcn compo…
magiicloud Mar 20, 2024
02aed13
converted proj into TS
magiicloud Mar 21, 2024
65dee16
installde @types dependencies to remove error and also changed import…
magiicloud Mar 23, 2024
dd9c273
added auth and nav to dash, added basic boilerplate for other pages f…
magiicloud Mar 26, 2024
8b62071
amended dependencies version, changed module to ESNext, retrived item…
magiicloud Mar 27, 2024
e5dc389
amended AllItems table to show data on quantity and rooms
magiicloud Mar 27, 2024
f9737c6
added the itemform and added basic stylings
magiicloud Mar 27, 2024
7cdda45
added radio group to choose transaction type and amended form schema
magiicloud Mar 27, 2024
e227ea8
changed to select item for transactions and add to cart instead
magiicloud Mar 27, 2024
f656de4
Allow user to highlight an area of a picture with a div on the floorp…
patrickkok Mar 29, 2024
ad9c959
Remove unused variables, fix bug where screen would scroll while drag…
patrickkok Mar 29, 2024
ea5bc10
Shift new floorplan into a popup dialog
patrickkok Mar 29, 2024
2fe1b65
Add border radius and transparency to select divs
patrickkok Mar 29, 2024
917b96e
Rename pages, shift new floorplan to it's own component, initialise f…
patrickkok Mar 29, 2024
7ddbfaa
Add feature to upload image to firebase storage, removed unused states
patrickkok Mar 29, 2024
fb22539
Change floorplan to building to be consistent with backend
patrickkok Mar 30, 2024
4201a3f
Add feature to fetch and display current buildings from the backend
patrickkok Mar 30, 2024
8b59f78
Merge pull request #1 from magiicloud/firebase-storage
magiicloud Mar 31, 2024
713e50a
able to search with serial num and brings out existing inventory deta…
magiicloud Mar 31, 2024
74dd715
able to search either via dropdown or serial num
magiicloud Mar 31, 2024
37404fe
added onsumbit function to update values in db
magiicloud Mar 31, 2024
478366d
added validations and toast after submit form
magiicloud Mar 31, 2024
38b4bf5
Merge pull request #2 from magiicloud/additemform
patrickkok Mar 31, 2024
59b45cf
shifted rooms up, added rooms prop to search function. allitems now s…
magiicloud Apr 1, 2024
bab4f8f
refactored fetching of items and rooms into separate reusable hooks
magiicloud Apr 1, 2024
7092513
watch transaction type and render itemName and serialNum fields accor…
magiicloud Apr 1, 2024
9c19856
changed the naming for managing items and adding new items. added a n…
magiicloud Apr 1, 2024
bd61a14
added protected routes and auth but not working
magiicloud Apr 1, 2024
94afa9f
Add ability to update backend with new building, change to format of …
patrickkok Apr 1, 2024
22d567d
Merge pull request #3 from magiicloud/add-building
magiicloud Apr 2, 2024
49714b0
refactored forms into individual component of AddNewItem and CycleCou…
magiicloud Apr 2, 2024
28010eb
edited layout of the tabs and to display diff forms into tabs
magiicloud Apr 2, 2024
7a1a97f
Merge pull request #4 from magiicloud/manage-items
patrickkok Apr 2, 2024
71cb2f7
new delete form and link to backend delete controllers and routes
magiicloud Apr 2, 2024
f59741f
Add input field validation for new buildings
patrickkok Apr 2, 2024
9a3b67b
added autosearch when enter serial num
magiicloud Apr 2, 2024
cf68bf7
remove tx type for cycle count. resolved selection error bugs
magiicloud Apr 2, 2024
826af59
edited layout to show p tags for 2 line of same items
magiicloud Apr 2, 2024
dfb2b23
added a template dashboard to wrap app contents
magiicloud Apr 2, 2024
e70e7d0
styled forms in relation to dashboard template
magiicloud Apr 2, 2024
8700c72
added MenuFrame to relayout the app, pages now render inside the frame
magiicloud Apr 4, 2024
f43419f
added Cart component to render cart items
magiicloud Apr 4, 2024
8ed5820
adjusted sheet size, added cart into cyclecount page
magiicloud Apr 4, 2024
0c903d1
refactored into separate functions when opening cart and checking out…
magiicloud Apr 4, 2024
a59a824
pass down state to resetform
magiicloud Apr 4, 2024
9b14136
amended overlay size to 3xl
magiicloud Apr 4, 2024
d6360d4
added data table for all items and test as demo component first
magiicloud Apr 5, 2024
62ca9ef
change main allitems page to the new datatable
magiicloud Apr 5, 2024
0a04c99
left out checkbox ui component that is required for data table
magiicloud Apr 5, 2024
de456a6
forgot to add package for tanstack for datatable
magiicloud Apr 5, 2024
eed0ada
installed geist font
magiicloud Apr 5, 2024
6a95d14
Handle errors on the backend, update button UI
patrickkok Apr 6, 2024
866e380
Merge pull request #5 from magiicloud/new-building-validation
magiicloud Apr 6, 2024
6fc50bb
added search serial num
magiicloud Apr 6, 2024
a398974
Merge pull request #6 from magiicloud/deleteitem
patrickkok Apr 6, 2024
d81e52f
added auth protected routes and to persist by storing in local storag…
magiicloud Apr 6, 2024
2576494
Merge pull request #7 from magiicloud/auth
patrickkok Apr 6, 2024
ba7ae2a
changed users tab to buildings tab
magiicloud Apr 6, 2024
a7187ab
Merge pull request #8 from magiicloud/auth
magiicloud Apr 6, 2024
5df7f3e
Add rooms page, Add backend url env var, add link to rooms
patrickkok Apr 6, 2024
22f07cf
added search icon and adjusted table to grid for phone rendering
magiicloud Apr 6, 2024
3092b91
added reusable get token hook
magiicloud Apr 6, 2024
62acc20
added audience and scope
magiicloud Apr 6, 2024
13b1088
added get token to routes
magiicloud Apr 6, 2024
b3c19e6
Add room name and building name to room UI, Add method to fetch room …
patrickkok Apr 7, 2024
2eec9ed
added the delete button function to button
magiicloud Apr 7, 2024
88076bd
Add cards to display room items, add button to link to add items page
patrickkok Apr 7, 2024
1f0d7ff
Add logic to add user to the SQL database upon login
patrickkok Apr 7, 2024
d1aa534
added dashboard as default landing page. dashboard to trace short exp…
magiicloud Apr 7, 2024
1663f05
added function to generate excel reports
magiicloud Apr 7, 2024
85442fd
amended styling and css of overall design
magiicloud Apr 7, 2024
a6dd1b8
Merge pull request #9 from magiicloud/rooms
magiicloud Apr 7, 2024
e4b2885
Merge pull request #10 from magiicloud/add-user
magiicloud Apr 8, 2024
1f6a47e
resolved conflicts
magiicloud Apr 8, 2024
a98d21a
Add user email to the body of the requests to get buildings and add n…
patrickkok Apr 8, 2024
fd54448
edited to try catch block for login. comment out building component i…
magiicloud Apr 8, 2024
8505d85
Add admin to the building if the current user is the admin of the bui…
patrickkok Apr 8, 2024
8985618
Merge pull request #11 from magiicloud/auth-dash
patrickkok Apr 8, 2024
148312f
added download excel function for all items table to download selecte…
magiicloud Apr 9, 2024
9e69c83
added download excel function for all items table to download selecte…
magiicloud Apr 9, 2024
3b8cf3e
Merge branch 'auth-dash' of github.com:magiicloud/project3-frontend-b…
magiicloud Apr 9, 2024
ae2e63c
amended login page to post user information to backend
magiicloud Apr 9, 2024
5211458
Merge pull request #13 from magiicloud/auth-dash
patrickkok Apr 9, 2024
34eabb2
added usercontext to store userid after logging in. that will be pass…
magiicloud Apr 9, 2024
e125005
Merge pull request #12 from magiicloud/building-users
magiicloud Apr 9, 2024
22f8618
Merge pull request #14 from magiicloud/auth-dash
patrickkok Apr 9, 2024
d3d99c0
Change fetch building logic. Update page rerender on building addition
patrickkok Apr 10, 2024
cb5cc59
Use userId to fetch buildings and create new building
patrickkok Apr 10, 2024
03eba03
Create useBuildings hook to access fetch buildings method and object …
patrickkok Apr 10, 2024
a86ce2f
Add current building preview to dashboard, change building icon, touc…
patrickkok Apr 10, 2024
e6c04b6
Add interface to add user to building, update building page UI
patrickkok Apr 10, 2024
cda13cc
Merge pull request #15 from magiicloud/main-building
magiicloud Apr 11, 2024
124b578
added sheets to rooms add items
magiicloud Apr 13, 2024
1555094
reverted to userId for fetchBuildings
magiicloud Apr 13, 2024
096ac83
Merge pull request #16 from magiicloud/ux-update
patrickkok Apr 13, 2024
b662de0
Update Dashboard to only display expiring items and items below par f…
patrickkok Apr 13, 2024
310b65d
Update allItems to only show items in rooms the user is a part of
patrickkok Apr 13, 2024
729d170
Update useRooms hook to only fetch rooms the user is part of
patrickkok Apr 13, 2024
b38f84d
changed back paritems formatting to previous format to accomodate res…
magiicloud Apr 14, 2024
66dd06e
Merge pull request #17 from magiicloud/get-items-by-building
magiicloud Apr 14, 2024
36cfed8
deleted reports page on menu, added overflow scroll to sheets for car…
magiicloud Apr 13, 2024
c9f7c2b
Update readme with project planning information
patrickkok Apr 14, 2024
e6182df
Merge pull request #18 from magiicloud/readme-update
patrickkok Apr 14, 2024
1c3fe04
changed overall theme
magiicloud Apr 15, 2024
443c880
Merge pull request #19 from magiicloud/ux-update
patrickkok Apr 15, 2024
9645f54
amended login layout and added protected route to login
magiicloud Apr 16, 2024
36dda47
added build script to compile ts and ignore env variables for production
magiicloud Apr 16, 2024
29a1406
removed tsx from run build
magiicloud Apr 16, 2024
23ffec6
Merge pull request #20 from magiicloud/ux-update
patrickkok Apr 16, 2024
1284117
added @typescript-eslint/parser to dependency to resolve DeprecationE…
magiicloud Apr 16, 2024
250ac25
minor amendments to toast layout and form refresh after submit
magiicloud Apr 16, 2024
da3472e
Merge pull request #21 from magiicloud/ux-update
magiicloud Apr 16, 2024
4573129
cleaned up code
magiicloud Apr 20, 2024
b6d3465
Merge pull request #22 from magiicloud/code-cleanup
magiicloud Apr 20, 2024
14e0cd7
Update README.md
patrickkok Apr 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "rocket-academy-proj3"
}
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/node_modules
/.pnp
.pnp.js
/dist

# testing
/coverage
Expand All @@ -14,9 +15,11 @@
# misc
.DS_Store
.env.local
.env
.env.development.local
.env.test.local
.env.production.local
.env.production

npm-debug.log*
yarn-debug.log*
Expand Down
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Rocket Academy Coding Bootcamp: Project 3 Frontend

## Welcome to Stock Trakr

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


A stock tracking app that lets you input your building layout and create rooms directly in the UI to start storing your stock. It allows you to add items to your rooms and perform cycle counts when needed. For large offices and small homes alike.

A project by Patrick Kok and Hong Yun

# User Stories

Emily: Managing the logistics at work is a tough job, it is harder that the software is confusing and limiting. There's is no inbuilt way to create new room layouts and I have to create an IT ticket to slightly change the layout. The UI is also hard to navigate, making it hard to onboard new talent who may not have seen the programe we use before.

Bob: Organising the house has been hard, we used to use Excel sheets to track items but they are hard to maintain with the amount of manual work needed to add items and do cycle counts. We are slipping behind on updating our tracker that we are starting to think it is not worth the effort.

## Planning Links

ERD: https://drawsql.app/teams/project-3-7/diagrams/project-3-stock-taking

Wireframe: https://www.figma.com/file/ITBTgPAx48DvqSWhB1glXp/Inventory-App?type=design&node-id=0%3A1&mode=design&t=nGq6GGT4MfsH6myv-1

## Available Scripts

This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). In the project directory, you can run:
Expand Down
17 changes: 17 additions & 0 deletions components.json
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"
}
}
13 changes: 13 additions & 0 deletions firebase.json
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"
}
}
Loading