-
Notifications
You must be signed in to change notification settings - Fork 1
Feedback #60
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
Open
LaurieMV
wants to merge
170
commits into
Feedback
Choose a base branch
from
main
base: Feedback
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
Feedback #60
Changes from all commits
Commits
Show all changes
170 commits
Select commit
Hold shift + click to select a range
69fd397
Added columns and routes
SameeraChinta13 504f4f4
Added category and image columns
SameeraChinta13 888f97c
Merge pull request #9 from katara-org/sameera
Mohammad-SJamal 3394b50
add Header component into App
LaneLR bc3acc4
create Header component
LaneLR 94c3356
removed max-width, max-height of body; added 0 margin and padding to …
LaneLR 73e37e3
made Card component for items display
LaneLR 42285d1
add Card component for styling and rendering testing
LaneLR d133877
made CardWrapper component to make displaying all Cards look better
LaneLR 1516515
add 100vh and 100vw to the body
LaneLR ec82cbe
added single page view functionality. No single page component yet. I…
8c0e684
Merge pull request #11 from katara-org/cardlist
LaneLR 567224e
Merge pull request #12 from katara-org/style/root-body-changes
LaneLR ade2d0d
added browserrouter
e200b63
added BrowserRouter for routing
LaneLR e1667c5
finished single page view that reproduces only a single card
78a320f
Merge pull request #15 from katara-org/feat/browser-router
Mohammad-SJamal 545dd36
Merge pull request #17 from katara-org/cardlist
LaneLR eda30c2
Created AddForm.js
SameeraChinta13 9ba121f
Merge pull request #25 from katara-org/Addform
LaneLR 39269d3
edited singlepage style, displaying all information and buttons
Mohammad-SJamal acb98e5
changed package and package-log and imported browserrouter from react…
Mohammad-SJamal f6f5435
Merge remote-tracking branch 'origin/main' into SinglePage
Mohammad-SJamal e90b15e
imported BrowserRouter from react-router-dom
LaneLR 42e9b97
incorporated Routes using BrowserRouter; removed state not being used…
LaneLR 9f2c44c
add Link to replace div for wrapping Card component; use item.id as k…
LaneLR 1c33956
add useParams, useState, useEffect for fetching individual item data
LaneLR e4573fb
Merge pull request #26 from katara-org/feat/browser-router-adding-routes
Mohammad-SJamal de16d72
edited back button and other button style
Mohammad-SJamal 650ee73
Merge remote-tracking branch 'origin/main' into SinglePage
Mohammad-SJamal 75dc1e2
merged with main, not currently working
Mohammad-SJamal 44dd26b
fixed return to list button to work with browserrouter
Mohammad-SJamal af0f923
Merge pull request #29 from katara-org/SinglePage
LaneLR a7bb2f4
refactor and adjusted style of Card components
LaneLR 0c98818
refactor and change content justification and padding
LaneLR cc53f57
Added DeleteForm.jsx
SameeraChinta13 bbfb74f
Merge pull request #30 from katara-org/style/landing-page-header-adju…
sameera13 6a5447d
Merge pull request #31 from katara-org/DeleteForm
LaneLR c9aa9ec
add buttons and styled Links to Header; minor style additions
LaneLR bb6bf9f
add handleItemAdded as props into AddForm at route; refactor
LaneLR 2647547
changed default value of price from empoty string to 0 (model defined…
LaneLR 2fc146a
Merge branch 'main' into feat/addform-added-in-header
LaneLR 3377662
Merge branch 'main' into feat/deleteform-page
LaneLR d04e8e6
fixed line merge conflict
LaneLR 40f1329
Merge pull request #32 from katara-org/feat/addform-added-in-header
Mohammad-SJamal 0758bd9
Added UpdatedForm.jsx
SameeraChinta13 be58a2e
edited the style of the form to show preview. Should make input boxes…
Mohammad-SJamal 59451bd
finished up styling for AddForm
Mohammad-SJamal 2199918
Merge pull request #34 from katara-org/updatedForm
LaneLR 6332e1d
add '/delete-items' route, passed handleItemDeleted into SinglePage a…
LaneLR 48102f6
debugged resetting state
LaneLR ee30f97
passed as props handeItemDeleted; set min value in input to 1
LaneLR 0578c33
refactor
LaneLR a884364
add Link to '/delete-items'
LaneLR 3482d27
add handleDelete function and useParams for deleting item of current …
LaneLR 671d46c
add Link to '/delete-items'
LaneLR d02ba0a
Merge branch 'main' into feat/deleteform-page
LaneLR 51d4e36
resolved conflicts
LaneLR 8b2d9e1
resolved conflicts
LaneLR 2f48eb4
Merge pull request #35 from katara-org/feat/deleteform-page
Mohammad-SJamal 474e52b
Merge remote-tracking branch 'origin/main' into FormStyle
Mohammad-SJamal 0fca5bc
add overflow to x axis to improve user experience
LaneLR d36428b
merged with main, changed hover for delete button to red
Mohammad-SJamal 2954e9c
Merge pull request #36 from katara-org/style/hide-overflow
Mohammad-SJamal 3befd6e
Merge remote-tracking branch 'origin/main' into FormStyle
Mohammad-SJamal b7d099f
add route to '/edit-item'
LaneLR 5165b36
add Link to '/edit-item'
LaneLR 90a85d0
passed handleItemUpdated as props
LaneLR ab8c911
revert react-router-dom to version 6.22.3
LaneLR 7568969
merged w/ main
Mohammad-SJamal 058ea98
Merge pull request #37 from katara-org/FormStyle
LaneLR 8486000
downloaded react-router-dom 6.30 to make it work
Mohammad-SJamal fef8859
converting to react-router-dom@6.30.1
LaneLR 19e2930
Merge pull request #38 from katara-org/bugfix/change-rrd-version-to-6…
LaneLR 8b15da4
made changes to routing
LaneLR 4280366
Merge branch 'main' into feat/make-update-form-work
LaneLR af2fcac
Merge remote-tracking branch 'origin/main' into FormStyle
Mohammad-SJamal b1dcc09
add route using :id param for UpdateForm
LaneLR 0b17c42
add Link to each item's id (primary key)
LaneLR 74f289e
add useNavigate for page changes and useEffect to update form automat…
LaneLR a8c7db7
Merge pull request #39 from katara-org/feat/make-update-form-work
Mohammad-SJamal 58cc6a9
Merge remote-tracking branch 'origin/main' into FormStyle
Mohammad-SJamal cc03a9b
add quantity to Item model
LaneLR fbbcb64
updte seed with quantity property
LaneLR f5c02b5
add quantity properties to components and functions
LaneLR 0e6df46
finished styling for update form and delete form
Mohammad-SJamal 38523b3
Merge pull request #41 from katara-org/FormStyle
sameera13 d248011
made confirmation modal for item deletion
LaneLR 7707b81
add DeleteModal to SinglePage
LaneLR 7047c3c
refactor
LaneLR 2a580ce
style changes to modal
LaneLR ec5bce2
Merge branch 'main' into feat/delete-confirmation-modal
LaneLR a912d0a
Merge pull request #42 from katara-org/feat/delete-confirmation-modal
Mohammad-SJamal bca0234
readded confirmDelete() back into DeleteModal pop-up in SinglePage
LaneLR 57908b8
minor style change to Card component
LaneLR 1cc573b
Merge pull request #47 from katara-org/bugfig/fix-single-page-delete
sameera13 4447d25
changed TitleFont to only fit on two rows, weight change
LaneLR e0d34c2
changed flexbox to grid for better layout and user experience
LaneLR 8f59832
add Button component for reusability
LaneLR 760ef87
changed styling to incorporate Button component and styling changes
LaneLR 3576326
changed background color of app
LaneLR 7c83bef
react-router-dom
LaneLR e2c6236
Merge pull request #48 from katara-org/style/landing-page-v1.0
sameera13 e81c35e
Merge pull request #49 from katara-org/style/main-page-v1.1
sameera13 c584e4b
Added Modules and routes for Order and User, And also added validatio…
SameeraChinta13 30f91f4
Merge branch 'main' into sameera
LaneLR b354c3c
Merge pull request #50 from katara-org/sameera
LaneLR 854066e
created user login or create account form
LaneLR 2bacc3b
changed user icon to 'login', style changes
LaneLR e73427b
refactor
LaneLR 6f8a50f
all Buttons will have pointer cursor on hover
LaneLR 2590772
made route to CreateUserForm
LaneLR dc194f9
Merge pull request #51 from katara-org/feat/user-create-page
Mohammad-SJamal a320125
edited Button.jsx to be a styled button, while also having onClick pr…
Mohammad-SJamal 5aa0612
removed button comments
Mohammad-SJamal 89d1f50
Merge pull request #52 from katara-org/style/buttons
LaneLR f6c716e
removed styled button
LaneLR 2e6f342
add handleUserAdded for creating users
LaneLR 0268c75
imported Button component
LaneLR 4ce34f8
changed '/users/:id' for '/login'
LaneLR 778506f
changed '/users/:id' for '/login'
LaneLR 9d58fcf
change button from styled div to styled button
LaneLR dfc2929
add login and create user functions
LaneLR 5b14a93
Merge branch 'main' of https://github.com/katara-org/inventory-app in…
LaneLR c02ffa7
add html to body styling for uniformity
LaneLR fc2c95e
add new state for isLoggedIn and currentUser
LaneLR 9b22162
refactored and fixed creating user and logging in
LaneLR 7e97d23
removed validate from User model since default value is set and to re…
LaneLR 0a6524c
changed routes to reflect login and users
LaneLR 75880c4
refactor
LaneLR 8f9a59a
header changes based on isLoggedIn state and style adjustments
LaneLR aadcd5d
removed redundancy in POST route
LaneLR 0fac904
added 'customer' as role default value
LaneLR 5564f77
Merge pull request #53 from katara-org/feat/user-create-and-login
Mohammad-SJamal 6540c87
removed nested Links
LaneLR a97357a
added extra validation in PUT and POST routes
LaneLR 659e12e
added min values to inputs to prevent negative numbers
LaneLR 671aa98
added extra validation in PUT and POST routes
LaneLR 29e0fb3
Merge pull request #54 from katara-org/feat/user-create-and-login
LaneLR 3c64590
Merge pull request #55 from katara-org/upgrade/item-route-validation
LaneLR 55dd0bc
finished prototype sidebar with input boxes to check
Mohammad-SJamal 309d372
fixed minor style annoyances for prototype
Mohammad-SJamal 9451700
add route to CheckoutCart
LaneLR 8b2fc2c
initialized CheckoutCart page
LaneLR 26dc65b
implemented ascending/descending price order
Mohammad-SJamal fa7c790
made sidebar text clickable and nicer lookign
Mohammad-SJamal a88e2e1
make button for adding items to cart
LaneLR 39df881
add cart state; add cart add and remove functions; add cart route; re…
LaneLR 32c8d18
box-shadow style change
LaneLR 466e5cd
fix nested anchors; style changes
LaneLR 14a8e5b
fix nest Links; add addToCartButton component; remove Button fixed to…
LaneLR baeb055
make and style CheckOut page; add functionality
LaneLR 7b01f28
add Cart icon for CheckOut page; style additions
LaneLR 9f5b1e9
Merge branch 'main' into feat/checkout-page
LaneLR 0ba78af
style change to empty page
LaneLR 81ae4d7
Merge branch 'main' into feat/sidebar
LaneLR 7bb3e50
Merge branch 'feat/checkout-page' into feat/sidebar
LaneLR 6e4172e
edits to route to ensure functioning login
LaneLR 6bba6fe
Merge branch 'feat/sidebar' of https://github.com/katara-org/inventor…
LaneLR e4a9549
resolved conflicts
LaneLR 359a8b0
Merge pull request #56 from katara-org/feat/sidebar
LaneLR eb0041e
Update README.md
sameera13 d5a5dee
Update README.md
sameera13 32ad689
add conditional if user is not admin or logged in to now show admin r…
LaneLR 0a8136d
updated state of singlepage to allow adding items from singlepage
LaneLR 85532f2
add state for adding to cart; style adjustments
LaneLR daabce6
Update README.md
sameera13 5925b7d
Merge pull request #59 from katara-org/feat/admin-or-customer-view
sameera13 1beec41
Debugging and changes made for demo
LaneLR d9bec8f
removed props drilling and replaced with Context
LaneLR 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 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
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 version is correctly included in your package and package-lock, so there should be no need to add the extra line here.