Feedback - #60

Open

LaurieMV wants to merge 170 commits into

Commits on Jun 3, 2025

Added columns and routes
SameeraChinta13
committed
69fd397
Added category and image columns
SameeraChinta13
committed
504f4f4
Merge pull request #9 from katara-org/sameera
Mohammad-SJamal
authored
888f97c
add Header component into App
LaneLR
committed
3394b50
create Header component
LaneLR
committed
bc3acc4
removed max-width, max-height of body; added 0 margin and padding to root
LaneLR
committed
94c3356
made Card component for items display
LaneLR
committed
73e37e3
add Card component for styling and rendering testing
LaneLR
committed
42285d1
made CardWrapper component to make displaying all Cards look better
LaneLR
committed
d133877
add 100vh and 100vw to the body
LaneLR
committed
1516515
added single page view functionality. No single page component yet. Implemented grid list
Jamal
committed
ec82cbe
Merge pull request #11 from katara-org/cardlist
LaneLR
authored
8c0e684
Merge pull request #12 from katara-org/style/root-body-changes
LaneLR
authored
567224e
added browserrouter
Jamal
committed
ade2d0d
added BrowserRouter for routing
LaneLR
committed
e200b63
finished single page view that reproduces only a single card
Jamal
committed
e1667c5
Merge pull request #15 from katara-org/feat/browser-router
Mohammad-SJamal
authored
78a320f
Merge pull request #17 from katara-org/cardlist
LaneLR
authored
545dd36

Commits on Jun 4, 2025

Created AddForm.js
SameeraChinta13
committed
eda30c2
Merge pull request #25 from katara-org/Addform
LaneLR
authored
9ba121f
edited singlepage style, displaying all information and buttons
Mohammad-SJamal
committed
39269d3
changed package and package-log and imported browserrouter from react-router-dom in index.js
Mohammad-SJamal
committed
acb98e5
Merge remote-tracking branch 'origin/main' into SinglePage
Mohammad-SJamal
committed
f6f5435
imported BrowserRouter from react-router-dom
LaneLR
committed
e90b15e
incorporated Routes using BrowserRouter; removed state not being used in App
LaneLR
committed
42e9b97
add Link to replace div for wrapping Card component; use item.id as key to map each card; set link to url containing item.id as param; add StyledLink to styling
LaneLR
committed
9f2c44c
add useParams, useState, useEffect for fetching individual item data
LaneLR
committed
1c33956
Merge pull request #26 from katara-org/feat/browser-router-adding-routes
Mohammad-SJamal
authored
e4573fb
edited back button and other button style
Mohammad-SJamal
committed
de16d72
Merge remote-tracking branch 'origin/main' into SinglePage
Mohammad-SJamal
committed
650ee73
merged with main, not currently working
Mohammad-SJamal
committed
75dc1e2
fixed return to list button to work with browserrouter
Mohammad-SJamal
committed
44dd26b
Merge pull request #29 from katara-org/SinglePage
LaneLR
authored
af0f923
refactor and adjusted style of Card components
LaneLR
committed
a7bb2f4
refactor and change content justification and padding
LaneLR
committed
0c98818
Added DeleteForm.jsx
SameeraChinta13
committed
cc53f57
Merge pull request #30 from katara-org/style/landing-page-header-adjustments
sameera13
authored
bbfb74f
Merge pull request #31 from katara-org/DeleteForm
LaneLR
authored
6a5447d
add buttons and styled Links to Header; minor style additions
LaneLR
committed
c9aa9ec
add handleItemAdded as props into AddForm at route; refactor
LaneLR
committed
bb6bf9f
changed default value of price from empoty string to 0 (model defined using Float, a String won't work); replaced onAddItem with handleItemAdded
LaneLR
committed
2647547
Merge branch 'main' into feat/addform-added-in-header
LaneLR
authored
2fc146a
Merge branch 'main' into feat/deleteform-page
LaneLR
committed
3377662
fixed line merge conflict
LaneLR
committed
d04e8e6
Merge pull request #32 from katara-org/feat/addform-added-in-header
Mohammad-SJamal
authored
40f1329
Added UpdatedForm.jsx
SameeraChinta13
committed
0758bd9
edited the style of the form to show preview. Should make input boxes nicer
Mohammad-SJamal
committed
be58a2e
finished up styling for AddForm
Mohammad-SJamal
committed
59451bd
Merge pull request #34 from katara-org/updatedForm
LaneLR
authored
2199918
add '/delete-items' route, passed handleItemDeleted into SinglePage and Deleteform
LaneLR
committed
6332e1d
debugged resetting state
LaneLR
committed
48102f6
passed as props handeItemDeleted; set min value in input to 1
LaneLR
committed
ee30f97
refactor
LaneLR
committed
0578c33
add Link to '/delete-items'
LaneLR
committed
a884364
add handleDelete function and useParams for deleting item of current page; useNavigate to return to landing page
LaneLR
committed
3482d27
add Link to '/delete-items'
LaneLR
committed
671d46c
Merge branch 'main' into feat/deleteform-page
LaneLR
authored
d02ba0a
resolved conflicts
LaneLR
committed
51d4e36
resolved conflicts
LaneLR
committed
8b2d9e1
Merge pull request #35 from katara-org/feat/deleteform-page
Mohammad-SJamal
authored
2f48eb4
Merge remote-tracking branch 'origin/main' into FormStyle
Mohammad-SJamal
committed
474e52b
add overflow to x axis to improve user experience
LaneLR
committed
0fca5bc
merged with main, changed hover for delete button to red
Mohammad-SJamal
committed
d36428b
Merge pull request #36 from katara-org/style/hide-overflow
Mohammad-SJamal
authored
2954e9c
Merge remote-tracking branch 'origin/main' into FormStyle
Mohammad-SJamal
committed
3befd6e
add route to '/edit-item'
LaneLR
committed
b7d099f
add Link to '/edit-item'
LaneLR
committed
5165b36
passed handleItemUpdated as props
LaneLR
committed
90a85d0
revert react-router-dom to version 6.22.3
LaneLR
committed
ab8c911
merged w/ main
Mohammad-SJamal
committed
7568969
Merge pull request #37 from katara-org/FormStyle
LaneLR
authored
058ea98
downloaded react-router-dom 6.30 to make it work
Mohammad-SJamal
committed
8486000
converting to react-router-dom@6.30.1
LaneLR
committed
fef8859
Merge pull request #38 from katara-org/bugfix/change-rrd-version-to-6-30-1
LaneLR
authored
19e2930
made changes to routing
LaneLR
committed
8b15da4
Merge branch 'main' into feat/make-update-form-work
LaneLR
committed
4280366
Merge remote-tracking branch 'origin/main' into FormStyle
Mohammad-SJamal
committed
af2fcac

Commits on Jun 5, 2025

add route using :id param for UpdateForm
LaneLR
committed
b1dcc09
add Link to each item's id (primary key)
LaneLR
committed
0b17c42
add useNavigate for page changes and useEffect to update form automatically with data for item to not get empty input fields; remove id input; refactor
LaneLR
committed
74f289e
Merge pull request #39 from katara-org/feat/make-update-form-work
Mohammad-SJamal
authored
a8c7db7
Merge remote-tracking branch 'origin/main' into FormStyle
Mohammad-SJamal
committed
58cc6a9
add quantity to Item model
LaneLR
committed
cc03a9b
updte seed with quantity property
LaneLR
committed
fbbcb64
add quantity properties to components and functions
LaneLR
committed
f5c02b5
finished styling for update form and delete form
Mohammad-SJamal
committed
0e6df46
Merge pull request #41 from katara-org/FormStyle
sameera13
authored
38523b3
made confirmation modal for item deletion
LaneLR
committed
d248011
add DeleteModal to SinglePage
LaneLR
committed
7707b81
refactor
LaneLR
committed
7047c3c
style changes to modal
LaneLR
committed
2a580ce
Merge branch 'main' into feat/delete-confirmation-modal
LaneLR
committed
ec5bce2
Merge pull request #42 from katara-org/feat/delete-confirmation-modal
Mohammad-SJamal
authored
a912d0a
readded confirmDelete() back into DeleteModal pop-up in SinglePage
LaneLR
committed
bca0234
minor style change to Card component
LaneLR
committed
57908b8
Merge pull request #47 from katara-org/bugfig/fix-single-page-delete
sameera13
authored
1cc573b
changed TitleFont to only fit on two rows, weight change
LaneLR
committed
4447d25
changed flexbox to grid for better layout and user experience
LaneLR
committed
e0d34c2
add Button component for reusability
LaneLR
committed
8f59832
changed styling to incorporate Button component and styling changes
LaneLR
committed
760ef87
changed background color of app
LaneLR
committed
3576326
react-router-dom
LaneLR
committed
7c83bef

Commits on Jun 6, 2025

Merge pull request #48 from katara-org/style/landing-page-v1.0
sameera13
authored
e2c6236
Merge pull request #49 from katara-org/style/main-page-v1.1
sameera13
authored
e81c35e
Added Modules and routes for Order and User, And also added validations for all 3 items,users and orders
SameeraChinta13
committed
c584e4b
Merge branch 'main' into sameera
LaneLR
authored
30f91f4
Merge pull request #50 from katara-org/sameera
LaneLR
authored
b354c3c
created user login or create account form
LaneLR
committed
854066e
changed user icon to 'login', style changes
LaneLR
committed
2bacc3b
refactor
LaneLR
committed
e73427b
all Buttons will have pointer cursor on hover
LaneLR
committed
6f8a50f
made route to CreateUserForm
LaneLR
committed
2590772
Merge pull request #51 from katara-org/feat/user-create-page
Mohammad-SJamal
authored
dc194f9
edited Button.jsx to be a styled button, while also having onClick prop to work with onClick events. Added these buttons to update form, delete form, and single page view, and the delete modal. Add…
Mohammad-SJamal
committed
a320125
removed button comments
Mohammad-SJamal
committed
5aa0612
Merge pull request #52 from katara-org/style/buttons
LaneLR
authored
89d1f50
removed styled button
LaneLR
committed
f6c716e
add handleUserAdded for creating users
LaneLR
committed
2e6f342
imported Button component
LaneLR
committed
0268c75
changed '/users/:id' for '/login'
LaneLR
committed
4ce34f8
changed '/users/:id' for '/login'
LaneLR
committed
778506f
change button from styled div to styled button
LaneLR
committed
9d58fcf
add login and create user functions
LaneLR
committed
dfc2929
Merge branch 'main' of https://github.com/katara-org/inventory-app into feat/user-create-page
LaneLR
committed
5b14a93
add html to body styling for uniformity
LaneLR
committed
c02ffa7
add new state for isLoggedIn and currentUser
LaneLR
committed
fc2c95e
refactored and fixed creating user and logging in
LaneLR
committed
9b22162
removed validate from User model since default value is set and to remove bugs
LaneLR
committed
7e97d23
changed routes to reflect login and users
LaneLR
committed
0a6524c
refactor
LaneLR
committed
75880c4
header changes based on isLoggedIn state and style adjustments
LaneLR
committed
8f9a59a
removed redundancy in POST route
LaneLR
committed
aadcd5d
added 'customer' as role default value
LaneLR
committed
0fac904
Merge pull request #53 from katara-org/feat/user-create-and-login
Mohammad-SJamal
authored
5564f77
removed nested Links
LaneLR
committed
6540c87
added extra validation in PUT and POST routes
LaneLR
committed
a97357a
added min values to inputs to prevent negative numbers
LaneLR
committed
659e12e
added extra validation in PUT and POST routes
LaneLR
committed
671aa98
Merge pull request #54 from katara-org/feat/user-create-and-login
LaneLR
authored
29e0fb3
Merge pull request #55 from katara-org/upgrade/item-route-validation
LaneLR
authored
3c64590
finished prototype sidebar with input boxes to check
Mohammad-SJamal
committed
55dd0bc
fixed minor style annoyances for prototype
Mohammad-SJamal
committed
309d372
add route to CheckoutCart
LaneLR
committed
9451700
initialized CheckoutCart page
LaneLR
committed
8b2fc2c
implemented ascending/descending price order
Mohammad-SJamal
committed
26dc65b
made sidebar text clickable and nicer lookign
Mohammad-SJamal
committed
fa7c790
make button for adding items to cart
LaneLR
committed
a88e2e1
add cart state; add cart add and remove functions; add cart route; refactor
LaneLR
committed
39df881
box-shadow style change
LaneLR
committed
32c8d18
fix nested anchors; style changes
LaneLR
committed
466e5cd
fix nest Links; add addToCartButton component; remove Button fixed to Card
LaneLR
committed
14a8e5b
make and style CheckOut page; add functionality
LaneLR
committed
baeb055
add Cart icon for CheckOut page; style additions
LaneLR
committed
7b01f28
Merge branch 'main' into feat/checkout-page
LaneLR
committed
9f5b1e9

Commits on Jun 7, 2025

Commits on Jun 9, 2025

Merge branch 'feat/sidebar' of https://github.com/katara-org/inventory-app into feat/sidebar
LaneLR
committed
6bba6fe
resolved conflicts
LaneLR
committed
e4a9549
Merge pull request #56 from katara-org/feat/sidebar
LaneLR
authored
359a8b0
Update README.md
sameera13
authored
eb0041e
Update README.md
sameera13
authored
d5a5dee
add conditional if user is not admin or logged in to now show admin related functions
LaneLR
committed
32ad689
updated state of singlepage to allow adding items from singlepage
LaneLR
committed
0a8136d
add state for adding to cart; style adjustments
LaneLR
committed
85532f2
Update README.md
sameera13
authored
daabce6
Merge pull request #59 from katara-org/feat/admin-or-customer-view
sameera13
authored
5925b7d

Commits on Jun 10, 2025

Debugging and changes made for demo
LaneLR
committed
1beec41
removed props drilling and replaced with Context
LaneLR
committed
d9bec8f