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

# Inventory App

You are a team of developers for an e-commerce company. The Engineering team is rebuilding their inventory tracking app from the ground up. Your team has been tasked with creating a Full-Sack (front and back end) RESTful CRUD application to track the items.
The Inventory App is a full-stack web application designed to streamline product management for an e-commerce store. It allows users to browse available items, view detailed information for each product, and search based on specific criteria. Admin users have the ability to add, update, or delete inventory items through secure, server-side validated forms. The app supports full CRUD functionality and is built with a scalable architecture for future enhancements like user orders, cart functionality

## Getting Started

1. `npm install`
2. `npm run server-dev`
3. In a seperate terminal, `npm run client-dev`

## Inventory App “Tiers”

The tiers describe different levels of functionality in your application with the difficulty becoming more complex as you advance through the tiers. Start with Tier I, and complete everything you can, moving as quickly as possible as you can to Tier II. They are described as user stories.
## Key Features

Your team should strive to finish at least the first 4 tiers (a CRUD application) and attempt some of the bonus material.
- View all inventory items with detailed information
- Add, edit, and delete items (admin-only)
- Filter items by category or price range
- Add items to cart and place orders
- User authentication
- Server-side validations for data integrity

### Tier I: MVP Application

- As a User, I want to view all items in inventory
- Sequelize Model for Item
- Name, Description, Price, Category, Image
- Express Route to GET all Items
- Front-end View for all Items
- As a User, I want to view any individual item
- Express Route to GET one Item
- Front-end view for one item (click to see)

Once you have defined your model, `npm run seed` to populate the table.

### Tier II: Adding an Item

- As a User, I want to add an item by completing a form
- Add Item front-end form
- Express Route to ADD the Item
- Form or Fetch request to add item when form is submitted
## Getting Started

### Tier III: Deleting an Item
1. Clone the repository
- git clone git@github.com:katara-org/inventory-app.git
2. Change the directory
- cd inventory-app
3. Install dependence
- npm install
- npm install react-router-dom@6.30.1
Copy link
Copy Markdown
Author

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.

5. Seed the database
- npm run seed
6. Start the app
- npm start

- As a User, I want to remove an item from inventory
- Delete button on Single Item View
- Express Route to DELETE the Item
- Fetch request to delete item when button is clicked

### Tier IV: Updating an Item
## Deployed Link
https://inventory-app-ts3j.onrender.com/

- As a User, I want to edit an item by filling a form
- Edit form on Single Item View
- Express Route to UPDATE the Item
- Fetch request to update item when form is submitted
## Collaborators

### Tier V: Bonus Stuff
- Lane Richardson
- Mohammad Jamal
- Sameera Chinta

- Models, Routes for Users and Orders
- As a User, I want my Inventory site to be visually stunning
- As a User, I want to be able to search through data based on search criteria
- As a User, I want to add items to a cart and purchase
- As a User, I want to use the application on a mobile browser
- As an Admin, I want all Add and Edit item requests to have server-side validations
Loading