Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
168 commits
Select commit Hold shift + click to select a range
3a9df82
create product element for grid
nselvakumar25 Jan 8, 2025
eb95e85
build grid structure
nselvakumar25 Jan 9, 2025
9d7c805
include placeholder data
nselvakumar25 Jan 9, 2025
496c38d
change color of product card and add link to product component
nselvakumar25 Jan 11, 2025
a002548
Merge pull request #16 from CSES-Open-Source/main
chase-of-the-fjords Jan 12, 2025
6fd4ef5
improve grid responsiveness
nselvakumar25 Jan 13, 2025
521fed3
Merge pull request #15 from CSES-Open-Source/feature/marketplace-grid
chase-of-the-fjords Jan 13, 2025
01c2354
added post
Jan 14, 2025
a05b29c
added delete
kylama Jan 14, 2025
a581089
added get individual
Jan 14, 2025
fc9d9a8
added patch route
Jan 14, 2025
2d97f44
Merge pull request #17 from CSES-Open-Source/feature/post-products
chase-of-the-fjords Jan 14, 2025
3e77e3a
added invalid id error fixes + added catch to patch
Jan 14, 2025
c390d66
added 404 to get route and added route comments
Jan 14, 2025
703b04e
Merge pull request #20 from CSES-Open-Source/feature/patch-product
chase-of-the-fjords Jan 14, 2025
5f8f2c1
Created navbar (desktop view & mobile view)
nicholas-ngyn Jan 15, 2025
37c0c76
added controller for products
Jan 15, 2025
2147cd1
fix horizontal scroll
nselvakumar25 Jan 15, 2025
57ebcb6
Fixed linting error
chase-of-the-fjords Jan 16, 2025
abcc863
Updated Firebase config
chase-of-the-fjords Jan 16, 2025
2fe1fe0
Fixed linting issue
chase-of-the-fjords Jan 16, 2025
0942e45
Merge pull request #32 from CSES-Open-Source/feature/update-firebase-…
chase-of-the-fjords Jan 16, 2025
3f32c35
Merge branch 'dev' into controller
chase-of-the-fjords Jan 16, 2025
653a1ed
Merge pull request #22 from CSES-Open-Source/controller
chase-of-the-fjords Jan 17, 2025
73d4dd3
Merge branch 'dev' into feature/marketplace-grid
chase-of-the-fjords Jan 17, 2025
c9da13d
Merge pull request #31 from CSES-Open-Source/feature/marketplace-grid
chase-of-the-fjords Jan 17, 2025
c7a4dee
Address feedback: moved json files, changed fonts of navbar, created …
nicholas-ngyn Jan 17, 2025
beb0b91
Merge branch 'dev' into feature/navbar
nicholas-ngyn Jan 17, 2025
a7879ae
Merge pull request #21 from CSES-Open-Source/feature/navbar
chase-of-the-fjords Jan 17, 2025
b424d53
create add product page
nselvakumar25 Jan 17, 2025
84be643
functionality for adding product
nselvakumar25 Jan 17, 2025
c04dcfd
show confirmation for adding product
nselvakumar25 Jan 19, 2025
20a4c33
error handling for adding product
nselvakumar25 Jan 20, 2025
ade4d4b
fetch products for marketplace grid
nselvakumar25 Jan 20, 2025
dc98058
fix error handling
nselvakumar25 Jan 20, 2025
cc5cc77
finished the layout for individual-product-page
nicholas-ngyn Jan 21, 2025
86ac4cd
Fixed linting issues in the front-end
chase-of-the-fjords Jan 21, 2025
b93d6ce
Fixed linting issues in the back-end
chase-of-the-fjords Jan 21, 2025
bb486e2
improve error handling
nselvakumar25 Jan 22, 2025
5328c5b
create add product page
nselvakumar25 Jan 17, 2025
89e2602
functionality for adding product
nselvakumar25 Jan 17, 2025
1304dbc
show confirmation for adding product
nselvakumar25 Jan 19, 2025
7fb094a
error handling for adding product
nselvakumar25 Jan 20, 2025
1d9b904
fix error handling
nselvakumar25 Jan 20, 2025
db58c5d
Merge branch 'feature/add-product-page' of https://github.com/CSES-Op…
nselvakumar25 Jan 22, 2025
f5a5f5a
improve error handling
nselvakumar25 Jan 22, 2025
fdcb18d
created footer
nicholas-ngyn Jan 22, 2025
bba967b
Update: made sure main content can grow and that footer is always at …
nicholas-ngyn Jan 22, 2025
7354ac6
Merge pull request #37 from CSES-Open-Source/feature/footer
chase-of-the-fjords Jan 22, 2025
ddc0bf7
Merge branch 'dev' into feature/marketplace-grid
chase-of-the-fjords Jan 22, 2025
4aff13e
Merge pull request #33 from CSES-Open-Source/feature/marketplace-grid
chase-of-the-fjords Jan 22, 2025
47a157e
Added comment (needed empty commit because PR was being weird)
chase-of-the-fjords Jan 22, 2025
ca85c59
Merge pull request #33 from CSES-Open-Source/feature/marketplace-grid
chase-of-the-fjords Jan 22, 2025
1e9c0c4
Merge branch 'dev' into feature/add-product-page
chase-of-the-fjords Jan 22, 2025
a57bdc5
image storage with firebase
navyaa31 Jan 22, 2025
b475855
Merge branch 'dev' into feature/individual-product-page
nicholas-ngyn Jan 22, 2025
141bcb5
fixing linting errors
navyaa31 Jan 22, 2025
3efb751
Merge branch 'dev' into feature/image-storage
navyaa31 Jan 22, 2025
4af99e3
updated individual-product-page
nicholas-ngyn Jan 22, 2025
124752e
updating packages
navyaa31 Jan 22, 2025
ca1aad5
Merge branch 'feature/image-storage' of github.com:CSES-Open-Source/L…
navyaa31 Jan 22, 2025
44a2753
fix package.json and change input labels
nselvakumar25 Jan 22, 2025
69fcbb6
setting up user schema
navyaa31 Jan 22, 2025
0623b1b
initial api set up
navyaa31 Jan 22, 2025
6ebf762
added get Users
Jan 22, 2025
1ead300
corrected fonts, fixed description box, fixed bolding & font size
nicholas-ngyn Jan 22, 2025
65e6ec9
add and delete user
navyaa31 Jan 23, 2025
95ecab6
login and logout for navbar buttons
nselvakumar25 Jan 23, 2025
23d4971
create private routes and redirect from home page
nselvakumar25 Jan 24, 2025
be25123
Update .env.development
chase-of-the-fjords Jan 24, 2025
aa6cf04
Delete package.json
chase-of-the-fjords Jan 24, 2025
c42410c
Delete package-lock.json
chase-of-the-fjords Jan 24, 2025
e7bf8b6
Add .env.development to .gitignore
chase-of-the-fjords Jan 24, 2025
ce12223
Merge branch 'feature/image-storage' of https://github.com/CSES-Open-…
chase-of-the-fjords Jan 24, 2025
823918e
Merge pull request #38 from CSES-Open-Source/feature/image-storage
chase-of-the-fjords Jan 24, 2025
bcc912b
add firebase token to request header
nselvakumar25 Jan 25, 2025
62f775f
Merge branch 'feature/add-product-page' of https://github.com/CSES-Op…
nselvakumar25 Jan 26, 2025
fa42d49
update user
kylama Jan 26, 2025
95b9b3f
fixed update user
kylama Jan 28, 2025
ba175fe
Merge branch 'dev' of https://github.com/CSES-Open-Source/LowPriceCen…
nselvakumar25 Jan 28, 2025
0735477
created homepage (desktop view)
nicholas-ngyn Jan 28, 2025
fcfd032
fixed formatting
nicholas-ngyn Jan 28, 2025
7448def
updates product routes to include user auth
Feb 2, 2025
bc234bc
Merge pull request #36 from CSES-Open-Source/feature/add-product-page
chase-of-the-fjords Feb 5, 2025
1e11ade
Merge pull request #45 from CSES-Open-Source/feature/token-header
chase-of-the-fjords Feb 5, 2025
092be6b
fixed middleware
navyaa31 Feb 5, 2025
762ea7a
Merge branch 'dev' of https://github.com/CSES-Open-Source/LowPriceCen…
n1sh1thaS Feb 11, 2025
b856b2b
fixed requested changes, changed sign in button, made page responsive
nicholas-ngyn Feb 12, 2025
ba99dc8
Merge branch 'dev' into feature/homepage
nicholas-ngyn Feb 12, 2025
afb9dfd
upload, fetch, and display images
n1sh1thaS Feb 12, 2025
0ab33f7
Merge pull request #46 from CSES-Open-Source/feature/homepage
chase-of-the-fjords Feb 12, 2025
d1d38b3
fixed font issues
nicholas-ngyn Feb 12, 2025
5e49dae
fix image access issue
n1sh1thaS Feb 12, 2025
1d0d0fd
Merge branch 'dev' of https://github.com/CSES-Open-Source/LowPriceCen…
n1sh1thaS Feb 12, 2025
5f93851
add product image placeholder
n1sh1thaS Feb 14, 2025
2ed88eb
Merge pull request #47 from CSES-Open-Source/feature/product-images
chase-of-the-fjords Feb 14, 2025
1782c30
Merge branch 'dev' of https://github.com/CSES-Open-Source/LowPriceCen…
n1sh1thaS Feb 17, 2025
0f90e14
fix marketplace responsiveness
n1sh1thaS Feb 17, 2025
2c75eb1
use correct fonts
n1sh1thaS Feb 17, 2025
593c45c
fetch individual product data and improve responsiveness
n1sh1thaS Feb 17, 2025
0b37122
Merge branch 'feature/individual-product-page' of https://github.com/…
n1sh1thaS Feb 17, 2025
a6c15c3
updating user api
navyaa31 Feb 17, 2025
5916d3d
updated .env.development (should be in .gitignore?)
chase-of-the-fjords Feb 17, 2025
5cdfdfa
Merge branch 'feature/validate-user-token' of https://github.com/CSES…
chase-of-the-fjords Feb 18, 2025
5e7a86a
Merge remote-tracking branch 'origin/dev' into feature/validate-user-…
chase-of-the-fjords Feb 18, 2025
6ce95e5
Fixed get route by changing "id" to "firebaseUid"
chase-of-the-fjords Feb 18, 2025
dd044bb
change marketplace and individual product routes
n1sh1thaS Feb 19, 2025
033148f
remove add product confirmation
n1sh1thaS Feb 19, 2025
4fbe34f
make email clickable
n1sh1thaS Feb 19, 2025
075219a
checking if user exists before adding
navyaa31 Feb 19, 2025
303cc2b
Merge branch 'feature/validate-user-token' of github.com:CSES-Open-So…
navyaa31 Feb 19, 2025
46da6f0
resolving merge conflicts
navyaa31 Feb 19, 2025
67cd640
Merge branch 'feature/validate-user-token' of https://github.com/CSES…
chase-of-the-fjords Feb 21, 2025
a457af9
Removed unneeded function and imports
chase-of-the-fjords Feb 21, 2025
4f16436
fixed product image sizing and homepage paragraph spacing
nicholas-ngyn Feb 22, 2025
6fb10f9
fix home page redirect
n1sh1thaS Feb 25, 2025
1883447
fixed image sizing/border and linked navbar to marketplace
nicholas-ngyn Feb 25, 2025
7253f1a
Merge branch 'feature/individual-product-page' of https://github.com/…
nicholas-ngyn Feb 25, 2025
a727923
edit assertOk function
n1sh1thaS Feb 26, 2025
bfb9a46
show error if product not found
n1sh1thaS Feb 26, 2025
1e34251
undo response copy in assertOk
n1sh1thaS Feb 26, 2025
9923cd9
Merge pull request #34 from CSES-Open-Source/feature/individual-produ…
chase-of-the-fjords Feb 28, 2025
0f85548
Merge pull request #51 from CSES-Open-Source/feature/error-handling
chase-of-the-fjords Feb 28, 2025
386e043
Merge remote-tracking branch 'origin/dev' into feature/validate-user-…
chase-of-the-fjords Feb 28, 2025
5ed7224
Integrated users & bug fixing
chase-of-the-fjords Feb 28, 2025
dd765f9
Merge pull request #48 from CSES-Open-Source/feature/validate-user-token
chase-of-the-fjords Feb 28, 2025
3e51bc9
Restricted adding user to UCSD emails
kylama Feb 28, 2025
f8fc3ff
getting updated
Feb 28, 2025
3f6fce6
Merge pull request #55 from CSES-Open-Source/feature/ucsd-emails
chase-of-the-fjords Mar 1, 2025
2027979
create edit product form and delete button
n1sh1thaS Mar 5, 2025
54015b7
email api v1
Mar 5, 2025
74440f1
Merge branch 'dev' into feature/interestEmailAPI
Mar 5, 2025
db4ded7
backend lint fix attempt
Mar 5, 2025
ce7c5d5
backend lint fix
Mar 5, 2025
d575194
lint fix
Mar 5, 2025
372dfc8
create 404 page
n1sh1thaS Mar 6, 2025
2459e2a
removing unneeded comments
navyaa31 Mar 6, 2025
3e712e3
make image more responsive
n1sh1thaS Mar 6, 2025
bdbc657
edit products button in navbar
n1sh1thaS Mar 6, 2025
51422ec
Merge pull request #59 from CSES-Open-Source/fix/navbar-buttons
chase-of-the-fjords Mar 6, 2025
e71103c
Reverted backend URL
chase-of-the-fjords Mar 6, 2025
67fb44b
Merge pull request #58 from CSES-Open-Source/feature/404-page
chase-of-the-fjords Mar 6, 2025
4866a75
Update lint-check.yaml
chase-of-the-fjords Mar 6, 2025
3803a39
Update run-tests.yaml
chase-of-the-fjords Mar 6, 2025
0574baf
Added rounding and hover animations to product cards
chase-of-the-fjords Mar 7, 2025
518c09b
Added button transitions
chase-of-the-fjords Mar 7, 2025
68c4196
Added transitions to navbar buttons
chase-of-the-fjords Mar 7, 2025
f566d49
Added email hover transition on individual product page
chase-of-the-fjords Mar 7, 2025
1a52daa
Merge pull request #60 from CSES-Open-Source/feature/mvp-styling-polish
chase-of-the-fjords Mar 7, 2025
25ac0e4
fixing issue with images for products
navyaa31 Mar 7, 2025
efccf54
removing unneeded console logs
navyaa31 Mar 7, 2025
147b5dd
Reverted file system to old model
chase-of-the-fjords Mar 7, 2025
81eb672
Merge pull request #56 from CSES-Open-Source/feature/interestEmailAPI
westonz7042 Mar 7, 2025
891140c
Merge pull request #57 from CSES-Open-Source/fix/middleware-bug
chase-of-the-fjords Mar 7, 2025
823501b
Merge branch 'dev' of https://github.com/CSES-Open-Source/LowPriceCen…
n1sh1thaS Mar 7, 2025
a11ba57
fix delete product functionality
n1sh1thaS Mar 7, 2025
9d180ee
fix edit product and authorization
n1sh1thaS Mar 7, 2025
e2c80a0
Merge pull request #61 from CSES-Open-Source/feature/edit-product
chase-of-the-fjords Mar 7, 2025
e214735
Added Weston's favicon
chase-of-the-fjords Mar 7, 2025
c732bd8
Merge pull request #62 from CSES-Open-Source/feature/new-icon
chase-of-the-fjords Mar 7, 2025
bd216f4
create search bar
n1sh1thaS Apr 13, 2025
7efec2d
build search functionality
n1sh1thaS Apr 13, 2025
6a2ac2f
Merge pull request #65 from CSES-Open-Source/feature/search
chase-of-the-fjords Apr 15, 2025
a84f3ce
Fixed some linting issues in /frontend
chase-of-the-fjords Apr 15, 2025
5c4fdd7
Merge branch 'dev' of https://github.com/CSES-Open-Source/LowPriceCen…
chase-of-the-fjords Apr 15, 2025
b3a4f25
Finished linting changes to /frontend
chase-of-the-fjords Apr 15, 2025
a9c1c95
Fixed back-end linting errors
chase-of-the-fjords Apr 15, 2025
14c5cde
Fixed last linting issues
chase-of-the-fjords Apr 15, 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
1 change: 0 additions & 1 deletion .github/workflows/lint-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ on:
pull_request:
branches:
- main
- dev

jobs:
backend:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/run-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ on:
pull_request:
branches:
- main
- dev
push:
branches:
- main
- dev
jobs:
frontend:
name: Frontend tests
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ web_modules/

# dotenv environment variable files
.env
.env.development
.env.development.local
.env.test.local
.env.production.local
Expand Down
2 changes: 2 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
Loading
Loading