Skip to content
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

View listing #19

Open
wants to merge 87 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
620360d
created first base base repo
Cljwen Feb 5, 2023
69d367f
added navbar
oheirelavv Feb 7, 2023
4714360
intro page
Cljwen Feb 11, 2023
6dc29b5
Merge pull request #2 from Cljwen/carmen_branch
Cljwen Feb 11, 2023
91e7052
navbar v2
oheirelavv Feb 12, 2023
c3612ee
merged the welcome page with GET request for pictures
longpaladin Feb 12, 2023
4602a90
Merge pull request #3 from Cljwen/welcomepageGET
longpaladin Feb 12, 2023
a4f17e8
added user profile page
oheirelavv Feb 13, 2023
af0d302
added edit listing page
oheirelavv Feb 14, 2023
af63477
added navbar v2
oheirelavv Feb 11, 2023
25a202c
edited css
oheirelavv Feb 14, 2023
35af204
Merge branch 'main' into val-branch
oheirelavv Feb 14, 2023
a1e291c
Merge pull request #4 from Cljwen/val-branch
oheirelavv Feb 14, 2023
fc65862
added homepage, create form and listing page draft yay
Cljwen Feb 14, 2023
44299f0
Merge pull request #5 from Cljwen/carmen_branch
Cljwen Feb 14, 2023
2285f18
cleaned up folder structure and added navbar in main pages (forms to…
Cljwen Feb 18, 2023
d005a7a
Merge pull request #6 from Cljwen/carmen_branch
Cljwen Feb 18, 2023
877d0d7
added in edit & create profile page
oheirelavv Feb 18, 2023
438f0ce
Merge pull request #7 from Cljwen/val-branch
oheirelavv Feb 18, 2023
516488c
added in user individual listing page
oheirelavv Feb 19, 2023
0da9aab
Merge pull request #8 from Cljwen/val-branch
oheirelavv Feb 19, 2023
bb25c2a
added globalstyles css
Cljwen Feb 19, 2023
c47839e
Merge branch 'main' of https://github.com/Cljwen/GT-Project3-Frontend
Cljwen Feb 19, 2023
de359b5
navbar on every pg added and standardised, added jj's code on welcome…
Cljwen Feb 19, 2023
4ab9c4e
navbar on every pg added and standardised, added jj's code on welcome…
Cljwen Feb 19, 2023
4cd2c0a
Merge pull request #9 from Cljwen/carmen_branch
Cljwen Feb 19, 2023
c5743dd
back buttons on relevant pages done
Cljwen Feb 19, 2023
07b3088
Merge pull request #10 from Cljwen/carmen_branch
Cljwen Feb 19, 2023
8ae8cf1
updated welcome page (added auth0 links & banner)
oheirelavv Feb 19, 2023
8e85a3b
Merge pull request #11 from Cljwen/val-branch
oheirelavv Feb 19, 2023
187d679
temp save
longpaladin Feb 18, 2023
001bd14
resolved conflicts
longpaladin Feb 20, 2023
44f3c49
Merge pull request #13 from Cljwen/feature4
longpaladin Feb 20, 2023
1962b4a
user profile and edit listing done
longpaladin Feb 21, 2023
18d736e
Merge pull request #14 from Cljwen/feature4
longpaladin Feb 21, 2023
1f7dc13
solved auth0 loading page redirection and create profile page
longpaladin Feb 22, 2023
17d57b2
Merge pull request #15 from Cljwen/feature4
longpaladin Feb 22, 2023
8683483
made minor changes
Cljwen Feb 20, 2023
b3f3305
added category filter function and more seeder files
Cljwen Feb 22, 2023
bc288ae
Merge pull request #16 from Cljwen/carmen_branch
Cljwen Feb 22, 2023
156b98d
listing type filter & card display done
Cljwen Feb 23, 2023
ce73687
Merge pull request #17 from Cljwen/carmen_branch
Cljwen Feb 23, 2023
de76572
solved createprofile upload photo bug
longpaladin Feb 23, 2023
1017f4f
added spinners, pending to solve redirection of userid issue
longpaladin Feb 23, 2023
c65ac74
Merge pull request #19 from Cljwen/feature4
longpaladin Feb 23, 2023
44a189d
updated welcome page
oheirelavv Feb 24, 2023
4cd7897
Merge pull request #20 from Cljwen/updated-styling
oheirelavv Feb 24, 2023
245c342
updated navbar, edit profile & loading
oheirelavv Feb 24, 2023
ffde3eb
Merge pull request #21 from Cljwen/updated-styling
oheirelavv Feb 24, 2023
5808e37
updated styling for createlisting page
oheirelavv Feb 24, 2023
dd91439
Merge pull request #22 from Cljwen/updated-styling
oheirelavv Feb 24, 2023
e0e8d7a
updated styling for createprofile page
oheirelavv Feb 24, 2023
edbe8fc
Merge pull request #23 from Cljwen/updated-styling
oheirelavv Feb 24, 2023
d46175c
added search function + search page
Cljwen Feb 25, 2023
d0d8e4b
Merge pull request #24 from Cljwen/carmen_branch
Cljwen Feb 25, 2023
1c90a6c
repaired create listing page
longpaladin Feb 25, 2023
2b6289c
updated styling & added spinners for home page
oheirelavv Feb 25, 2023
4abf4cd
Merge pull request #25 from Cljwen/updated-styling
oheirelavv Feb 25, 2023
f7a5d50
disabled email change
longpaladin Feb 25, 2023
6476dbb
Merge pull request #26 from Cljwen/feature4
longpaladin Feb 25, 2023
b5aa6dc
Merge pull request #27 from Cljwen/feature6
longpaladin Feb 25, 2023
7685f20
minor edits
Cljwen Feb 25, 2023
d2b673d
Merge branch 'main' of https://github.com/Cljwen/GT-Project3-Frontend
Cljwen Feb 25, 2023
59109d6
updated styling for view listing & added links to welcome page cards
oheirelavv Feb 25, 2023
b546f1c
Merge pull request #28 from Cljwen/view-listing
oheirelavv Feb 25, 2023
f6d6f33
added in modal in navbar
oheirelavv Feb 25, 2023
ef1a999
Merge pull request #29 from Cljwen/view-listing
oheirelavv Feb 25, 2023
a886ee9
liked button feature working, pending styling
longpaladin Feb 25, 2023
00e978d
updated styling for edit listing & user profile pages
oheirelavv Feb 26, 2023
af7f890
Merge pull request #30 from Cljwen/view-listing
oheirelavv Feb 26, 2023
75dd126
deleted code from own like function
Cljwen Feb 26, 2023
205d524
Merge branch 'main' of https://github.com/Cljwen/GT-Project3-Frontend
Cljwen Feb 26, 2023
b773bb6
Merge pull request #31 from Cljwen/feature6
longpaladin Feb 26, 2023
b0b6c64
fixed edit listing & profile page
oheirelavv Feb 26, 2023
afa93d9
Merge pull request #32 from Cljwen/view-listing
oheirelavv Feb 27, 2023
e47dd0d
Merge branch 'main' of https://github.com/Cljwen/GT-Project3-Frontend
Cljwen Feb 27, 2023
7491b8c
added results number in search page
Cljwen Feb 25, 2023
018bcb7
resolved some nav issues
Cljwen Feb 26, 2023
fd90b9a
resolved more nav stuff
Cljwen Feb 26, 2023
e99d922
edited some styling for search page, and back button for user listing
Cljwen Feb 27, 2023
01967af
edited some styling for search page, and back button for user listing
Cljwen Feb 27, 2023
a5e51bf
Merge pull request #33 from Cljwen/carmen_branch
Cljwen Feb 27, 2023
9ed66c1
fixed styling issues for all pages
oheirelavv Feb 27, 2023
c14cc52
Merge pull request #34 from Cljwen/view-listing
oheirelavv Feb 27, 2023
f1e8b82
fixed user listing edit link
Cljwen Feb 27, 2023
9e33a2f
Merge pull request #35 from Cljwen/carmen_branch
Cljwen Feb 27, 2023
ec4c5e4
final styling touches
oheirelavv Feb 28, 2023
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
5 changes: 5 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# REACT_APP_AUTH0_DOMAIN="dev-pzzy2fglpmspp6bw.us.auth0.com"
# REACT_APP_AUTH0_CLIENT_ID="fD0uQXtcWn0PnTC3gvvEJ34k42PGhBcf"

REACT_APP_AUTH0_DOMAIN="dev-crafqg1op5ery45z.us.auth0.com"
REACT_APP_AUTH0_CLIENT_ID="fcTTg5pZr9diDOV3VheazgkBvky6huFU"
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

.env

# dependencies
/node_modules
/.pnp
.pnp.js
.env

# testing
/coverage
Expand Down
Binary file added camera.webp
Binary file not shown.
Binary file added filmcamera.webp
Binary file not shown.
Binary file added instax.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading