Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
512f454
Development test (#38)
Kfey8 Apr 8, 2022
8356f06
Production IP requests
KylePancamo Apr 8, 2022
7e90aea
style updates (#34)
miketitan58 Apr 8, 2022
c7ab192
Merge branch 'production' into development
KylePancamo Apr 8, 2022
a722664
Adding admin portal on nav bar (#41)
Kfey8 Apr 8, 2022
da061ae
removed redundant files (#42)
miketitan58 Apr 9, 2022
4d0deeb
changed ShoppingCart to ShoppingName
yiy045 Apr 11, 2022
2d545d3
fixed header/added a couple of things
yiy045 Apr 11, 2022
612991b
Browse Page achieved?
yiy045 Apr 11, 2022
a219b22
CSS conflict fix
KylePancamo Apr 11, 2022
46bd0ee
small changes
Kfey8 Apr 11, 2022
5e974d7
Basic order history with DB query
KylePancamo Apr 12, 2022
d7c3db1
Added admin tools UI
michellebarrows Apr 13, 2022
8851597
Improve Orderhistory
KylePancamo Apr 14, 2022
635ca83
Send user information instead of array containing user information fo…
KylePancamo Apr 14, 2022
75fb862
DB query for shopping page
KylePancamo Apr 14, 2022
9db7644
Fix broken image icon
KylePancamo Apr 14, 2022
9e12478
Align table text and scale to window size
KylePancamo Apr 14, 2022
d914a00
Add <thead> to table and move button inside <tr>
KylePancamo Apr 14, 2022
2da58a9
Add basic checkout page with simple checkout functionality
KylePancamo Apr 14, 2022
31e0ec0
Remove checkout page and make cart place orders instead
KylePancamo Apr 14, 2022
9c14084
formatting product page
Kfey8 Apr 15, 2022
b830cea
join order and item_template tables in query for order history
KylePancamo Apr 17, 2022
37f7090
delete data.js
KylePancamo Apr 17, 2022
7fc4c8e
commented out ./data
miketitan58 Apr 17, 2022
be0668a
Implement account_id order history queries
KylePancamo Apr 19, 2022
117e679
Better redirection for order history
KylePancamo Apr 19, 2022
b23c611
Query image pathnames from DB for future uploading
KylePancamo Apr 19, 2022
5aa0222
fix spaces and formatting
KylePancamo Apr 19, 2022
28171f2
Add & Update Product Tools
michellebarrows Apr 20, 2022
fc8ca85
Sign-in & Registration page rewords
KylePancamo Apr 21, 2022
a39a4bd
Implement image uploading
KylePancamo Apr 21, 2022
b1fdaf2
css specific for registration and signin pages
KylePancamo Apr 21, 2022
a5dadb6
add check for user when checking out
KylePancamo Apr 21, 2022
910aba8
Fix sales tax and add an alert when order is placed
KylePancamo Apr 22, 2022
8e0cb92
ShoppingPage specific CSS
KylePancamo Apr 22, 2022
17c1c14
Remove import and old products
KylePancamo Apr 22, 2022
b682411
Remove shopping cart image
KylePancamo Apr 22, 2022
15138fe
Implement checkout backend functionality
KylePancamo Apr 22, 2022
168c091
Implement logout functionality
KylePancamo Apr 22, 2022
055f67b
Alert for logout
KylePancamo Apr 22, 2022
0fc890c
got rid of import cartImage on HomePage
yiy045 Apr 22, 2022
1258e36
View Product Button
KylePancamo Apr 22, 2022
90826cb
Admin page visuals & account page functionality
michellebarrows Apr 22, 2022
b6b8893
Merge branch 'development' of https://github.com/KylePancamo/react-ap…
michellebarrows Apr 22, 2022
6605a96
Removing signout button from account page
michellebarrows Apr 22, 2022
05fbfe8
Fix sorting for order history
KylePancamo Apr 22, 2022
2dd5977
Fix item_id sorting
KylePancamo Apr 22, 2022
5274b4f
Additional check for localStorage when logging out
KylePancamo Apr 22, 2022
849977a
Fix for admin portal.
KylePancamo Apr 22, 2022
b1529c2
Switched order of Registration Page
yiy045 Apr 22, 2022
1cd6bb5
Shopping page & product page rename
KylePancamo Apr 22, 2022
eea6693
implement view product functionality
KylePancamo Apr 22, 2022
4d2a269
Move admin portal css up
KylePancamo Apr 22, 2022
fa8f96c
Got rid of the comments on RegistrationPage.js
yiy045 Apr 22, 2022
90c93d2
Add product page items to shopping cart and memorize shopping cart it…
KylePancamo Apr 22, 2022
73d65a3
Remove unused imports
KylePancamo Apr 22, 2022
11cd200
Change CSS color schemes
KylePancamo Apr 22, 2022
f2fa938
Login State: Additional checks for endpoints
KylePancamo Apr 23, 2022
cc23105
Fix eyesore for buttons
KylePancamo Apr 23, 2022
e825dfa
Order of operations ig
KylePancamo Apr 24, 2022
7d3fd9c
DealsOfTheDay & simple discount functionality
KylePancamo Apr 24, 2022
c1e2c2b
Shopping Page: Add the ability to clear sorting option
KylePancamo Apr 24, 2022
162c00b
Simple search functionality for shopping page
KylePancamo Apr 24, 2022
f902527
Shopping Page: sorting capabilities
KylePancamo Apr 24, 2022
c545bba
ShoppingPage: Sort by caption and CSS
KylePancamo Apr 24, 2022
9053fe0
Redirect to home page after logging out
KylePancamo Apr 24, 2022
79551f2
Query db for discount codes
KylePancamo Apr 24, 2022
fe51cc6
Order History Button to Account Page, Modified Product/Order History …
yiy045 Apr 25, 2022
4ca3f2e
Deals Of the Day: Implement deals & fixup CSS and searchbar
KylePancamo Apr 25, 2022
d4ec12a
HomePage CSS: Specific div for header
KylePancamo Apr 25, 2022
7d8415b
Added a Link back to AccountPage in OrderHistory
yiy045 Apr 25, 2022
14f74fd
Better CSS for homepage
KylePancamo Apr 25, 2022
939f6ed
Change shipping price
KylePancamo Apr 25, 2022
e84f95e
Add item list when updating a product
KylePancamo Apr 25, 2022
48b96eb
HomePage: Clean up CSS a bit more
KylePancamo Apr 24, 2022
bef0c6a
Search based on manufacturer
KylePancamo Apr 25, 2022
c0e762c
Template for updating user info
KylePancamo Apr 25, 2022
434c27c
Backend: update-user endpoint
KylePancamo Apr 25, 2022
e0d2432
HomePage: Header font size
KylePancamo Apr 25, 2022
6d31ed7
UpdateProduct: Better item updating reload for table
KylePancamo Apr 25, 2022
8cebd6e
changed signin page
miketitan58 Apr 25, 2022
fb136d3
update user information on account page
michellebarrows Apr 25, 2022
ce3b3b4
Begin cleanup of CSS and making things presentable
KylePancamo Apr 25, 2022
75706fc
Ability to delete discount codes & add welcome message when logged in
KylePancamo Apr 26, 2022
d68024b
Account page useEffect re-render on refresh
michellebarrows Apr 26, 2022
74bd396
Remove unused images
KylePancamo Apr 26, 2022
df66932
Better images (I hope)
KylePancamo Apr 26, 2022
758ad1d
Update user info after updating + template background img
KylePancamo Apr 26, 2022
6deecd2
Make things a bit nicer
KylePancamo Apr 26, 2022
aa58740
cleaned up home page visuals
michellebarrows Apr 26, 2022
c1215ff
Navbar: display first name instead of last name
KylePancamo Apr 26, 2022
c971488
Add order history for admins & update Order History webpage
KylePancamo Apr 26, 2022
915393f
Uploading missing image
KylePancamo Apr 26, 2022
4cb1f36
Add Product: Add manufacturer for inserting
KylePancamo Apr 26, 2022
8f86dde
update product page
miketitan58 Apr 26, 2022
74dba5f
style updates
miketitan58 Apr 26, 2022
4bff2d2
fixed bug
miketitan58 Apr 26, 2022
cf17cd0
style update
miketitan58 Apr 26, 2022
1289fb0
update READ.md
miketitan58 Apr 26, 2022
47c2a0d
update READ.md
miketitan58 Apr 26, 2022
085d9c9
Merge branch 'development' of https://github.com/KylePancamo/react-ap…
miketitan58 Apr 26, 2022
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
17 changes: 17 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "pwa-node",
"request": "launch",
"name": "Launch Program",
"skipFiles": [
"<node_internals>/**"
],
"program": "${workspaceFolder}\\server.js"
}
]
}
18 changes: 18 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
## WorldWide Frames

This project was designed by Team 2 (Kyle Pancamo, Kamryn Fey, Michael Stepp, Michelle Barrows, Yash Kapoor)
for Software Engineering: CS3773-001 and is indented for educational and learning purposes only. This is our
first website that we have built together and it simulates an online marketplace that sells a variety of glasses
from unique manufacturers. This project was quickly designed and built in a period of just under 3 months. We are
very proud of how the site has turned out given that none of us on the team had any web development expericence prior
to this project.

## Tools/Languages Used
```
Hosting: Amazon Web Services EC2 instance
Web Server: Nginx
Front-End: ReactJS
Back-End: NodeJS
Database: MySQL
```

## Installation

1. `npm install`
Expand Down
22,216 changes: 416 additions & 21,800 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"private": true,
"homepage": ".",
"dependencies": {
"@material-ui/core": "^4.12.4",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^11.2.7",
"@testing-library/user-event": "^12.8.3",
Expand All @@ -15,12 +16,14 @@
"express": "^4.17.1",
"express-session": "^1.17.2",
"font-awesome": "^4.7.0",
"multer": "^1.4.4",
"mysql": "^2.18.1",
"path": "^0.12.7",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"universal-cookie": "^4.0.4",
"web-vitals": "^1.1.2"
},
"scripts": {
Expand Down
Binary file removed public/favicon.ico
Binary file not shown.
Binary file added public/images/001.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/002.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/003.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/004.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/005.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/006.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/007.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/008.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/009.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/010.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/011.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/012.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/013.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/014.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/015.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/016.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/017.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/018.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/019.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/020.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/021.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/022.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/023.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/024.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/025.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/026.jpg
Binary file added public/images/027.jpg
Binary file added public/images/028.jpeg
Binary file added public/images/029.jpg
Binary file added public/images/030.jpg
Binary file added public/images/031.jpg
Binary file added public/images/032.jpg
Binary file added public/images/033.jpg
Binary file added public/images/034.jpeg
Binary file added public/images/035.jpg
Binary file added public/images/036.jpg
Binary file added public/images/037.jpg
Binary file added public/images/038.jpeg
Binary file added public/images/039.jpg
Binary file added public/images/040.jpeg
6 changes: 3 additions & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/logo123.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo123.jpg" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand All @@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
<title>WorldWide Frames</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
Binary file added public/logo123.ico
Binary file not shown.
Binary file added public/logo123.jpg
Binary file removed public/logo192.png
Diff not rendered.
Binary file removed public/logo512.png
Diff not rendered.
12 changes: 6 additions & 6 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"short_name": "React App",
"short_name": "WorldWide Frames",
"name": "Create React App Sample",
"icons": [
{
"src": "favicon.ico",
"src": "logo123.ico",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"type": "image/png",
"src": "logo123.jpg",
"type": "image/jpg",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"src": "logo123.jpg",
"type": "image/jpg",
"sizes": "512x512"
}
],
Expand Down
Loading