alu/cse110-fa22-group29
1
0
Fork 0
mirror of https://github.com/cse110-fa22-group29/cse110-fa22-group29.git synced 2024-12-27 09:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
522 Commits 4 Branches 1 Tag 140 MiB
sprint-3
Commit Graph

198 Commits

Author SHA1 Message Date
Kara Hoagland
847e8a1aa1 No tag duplicates 2022-11-28 18:48:55 -08:00
Kara Hoagland
5e06bd0cf7 Merge branch 'sprint-3' into separate-tag-storage 2022-11-27 20:34:12 -08:00
Kara Hoagland
dd0bcbe57d moved from details to localStorage 2022-11-27 17:31:13 -08:00
Kara Hoagland
1484a882b2 tag storage 2022-11-27 15:48:00 -08:00
Arthur Lu
f99cfd0eff fix tag vertical fitting issue 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-26 18:39:33 -08:00
Arthur Lu
a63552f32b fix ReviewCard css, 
fixes article tag overflow issue,
should resolve #85

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-26 18:00:09 -08:00
Arthur Lu
ae2e14172d change #d-mealImg to #d-meal-img and #d-mealName to #d-meal-name 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-26 17:38:19 -08:00
Arthur Lu
af4378ee40 fix some linting issues, 
fix bug in localStroage unit tests

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-26 16:06:24 -08:00
Arthur Lu
39aa535864 cleanup e2e test code 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-26 16:03:47 -08:00
Arthur Lu
9ff58a1c2c add sorting and filtering localStorage helper functions, 
add new unit tests for new helper functions

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-26 15:37:48 -08:00
Sanjit Joseph
4c649e7770 Update favicon with current logo 2022-11-24 02:41:02 -08:00
Sanjit Joseph
5db9320dae Give the raccoon a chef's hat 2022-11-24 02:36:02 -08:00
Sanjit Joseph
b2dd734ade Add hover text to new entry button 2022-11-24 02:27:27 -08:00
Sanjit Joseph
622d324c9a Add rounded corners to food image element 2022-11-24 02:24:37 -08:00
Sanjit Joseph
5901888475 Add hover text to home/edit/delete buttons 2022-11-24 02:13:41 -08:00
Sanjit Joseph
de1ec502b1 Fix default image cropping issues + add caption 2022-11-23 18:04:09 -08:00
Sanjit Joseph
4832726b14 Update E2E tests to check for new default image 2022-11-23 17:22:23 -08:00
Sanjit Joseph
0b7e101bb2 Select default_plate image when no food image uploaded 2022-11-23 17:20:55 -08:00
Arthur Lu
83a0358869 fix form tag wrap issue 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-22 14:46:01 -08:00
Arthur Lu
5ba0dab1a1 fix flex-flow css linting issue 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 18:00:58 -08:00
Arthur Lu
1dfd8c91a2 fix css linting issues 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 17:55:44 -08:00
Arthur Lu
ecff5313a1 increase timeout for e2e tests 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 17:38:34 -08:00
Arthur Lu
a12de4e058 fix some more css issues 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 17:31:12 -08:00
Arthur Lu
9194dd5166 fix html linting and some css linting issues 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 17:27:18 -08:00
Arthur Lu
63a7d5ce1f
Merge pull request #84 from cse110-fa22-group29/sprint-2-css-review-details 
Sprint 2 css review details
 2022-11-21 17:20:36 -08:00
Arthur Lu
9f9ac19b71 fix ReviewDetails CreatePage large tag display issue 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 17:20:12 -08:00
rheabhutada02
0912ea7956 fixed logo and tags 
Co-authored-by: Kara Hoagland <KH-Cl@users.noreply.github.com>
Co-authored-by: Arthur Lu <learthurgo@gmail.com>
Co-authored-by: d7hernan <d7hernan@users.noreply.github.com>
 2022-11-21 17:03:10 -08:00
rheabhutada02
b5e5a88163 fixed the pathing issue for images in main.e2e.test.js 2022-11-21 16:14:09 -08:00
rheabhutada02
5f1a246e6a moved all the icons to images and fixed path issues associated with this move 2022-11-21 16:12:17 -08:00
rheabhutada02
4073d2cc4b fixed and styled review details page 
Co-authored-by: Kara Hoagland <KH-Cl@users.noreply.github.com>
Co-authored-by: Arthur Lu <learthurgo@gmail.com>
Co-authored-by: d7hernan <d7hernan@users.noreply.github.com>
 2022-11-21 16:07:20 -08:00
rheabhutada02
23657853e5 Merge branch 'sprint-2-css-review-details' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2-css-review-details 2022-11-21 15:28:23 -08:00
rheabhutada02
ec9d0246ca fixed the update form, and update functionality, and formatted 
Co-authored-by: Kara Hoagland <KH-Cl@users.noreply.github.com>
Co-authored-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 15:27:45 -08:00
Arthur Lu
1cbefee26f fix favicon linking 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 14:37:37 -08:00
Arthur Lu
dd56207892 fix update form listener 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 14:26:54 -08:00
rheabhutada02
123057f0f1 fixed the css linking 2022-11-21 13:56:00 -08:00
rheabhutada02
50283be4f5 renamed the file 2022-11-21 13:52:48 -08:00
rheabhutada02
46b1ec4b07 fixed form formatting, moved it to its own file 2022-11-21 13:52:44 -08:00
rheabhutada02
661feafa40 Merge branch 'sprint-2-css-review-details' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2-css-review-details 
Co-authored-by: Arthur Lu <learthurgo@gmail.com>
Co-authored-by: Kara Hoagland <KH-Cl@users.noreply.github.com>
 2022-11-21 12:35:52 -08:00
rheabhutada02
68b0c8edf5 cleaned css and html 
Co-authored-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-21 12:32:54 -08:00
Kara Hoagland
52bc6a27a4 default img if img fails to load 2022-11-21 12:29:06 -08:00
Kara Hoagland
1db54e9f7a remove alt from js/html/tests 2022-11-21 11:58:26 -08:00
d7hernan
1798835807 modified css for CreatePage and color palette for homepage 
Co-authored-by: rheabhutada02
Co-authored-by: Kara Hoagland
 2022-11-21 00:56:54 -08:00
rheabhutada02
1055f7ef26 updating font 2022-11-20 23:50:54 -08:00
Kara Hoagland
5a05741e08
Merge pull request #80 from cse110-fa22-group29/req-stars-fix 
Req stars fix
 2022-11-20 23:37:45 -08:00
d7hernan
4c5132c2b2 Merge branch 'sprint-2' into sprint-2-css-review-details 2022-11-20 22:49:51 -08:00
d7hernan
49f85d5468 color palette changes 2022-11-20 22:35:02 -08:00
d7hernan
9ef3c59fee added restaurant, tag, and comments to reviewDetails 
Co-authored-by: rheabhutada02
 2022-11-20 22:22:31 -08:00
d7hernan
069aff88af centered search journal form 2022-11-20 21:58:44 -08:00
d7hernan
6d126f6085 Merge branch 'sprint-2-css-review-details' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2-css-review-details 2022-11-20 21:21:25 -08:00
d7hernan
948f638cd7 fixed indentation 2022-11-20 21:21:18 -08:00
Arthur Lu
b24b1110f6 configure htmlHint and stylelint to use tab indentation, 
fix html and css linting issues
 2022-11-21 03:50:54 +00:00
Arthur Lu
eed39f580f cleanup css in homepage.css and index.html 2022-11-21 03:17:32 +00:00
Arthur Lu
259018ca97 fix linting issue 2022-11-21 03:06:47 +00:00
Arthur Lu
142e6d93b6 set e2e test connection to 2 seconds 2022-11-21 02:53:50 +00:00
Arthur Lu
a5ac2dc940 fix review card spacing and centering in homepage 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 17:03:55 -08:00
Arthur Lu
331f8e731c add some padding to icons 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 16:54:15 -08:00
Arthur Lu
4336157371
Merge branch 'sprint-2' into sprint-2-css-review-details 2022-11-20 16:41:35 -08:00
Arthur Lu
9e82dae202 add comment for homepage mobile logic 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 16:39:51 -08:00
Arthur Lu
1f832aadd2 fix homepage structal issues, 
TODO: clean css

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 16:31:32 -08:00
d7hernan
6ce15a094e css and js for ReviewDetails 
Co-authored-by: Kara Hoagland <KH-Cl@users.noreply.github.com>
Co-authored-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 16:27:27 -08:00
look-its-ashton
c412282e04 Merge branch 'sprint-2' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2 2022-11-20 15:46:37 -08:00
look-its-ashton
8c2ad629d2 updated main page 2022-11-20 15:46:13 -08:00
Arthur Lu
7b7abad2e6 fix error in test syntax 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 15:33:31 -08:00
Arthur Lu
70c863c378
Merge branch 'add-multiple-testing' into sprint-2 2022-11-20 15:29:16 -08:00
Arthur Lu
12e818e079 fix js linting 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 15:23:22 -08:00
Kara Hoagland
250617776b more details 2022-11-20 14:47:26 -08:00
Henry Feng
131553ddeb Merge remote-tracking branch 'origin/sprint-2' into allow-for-user-uploaded-images 2022-11-20 14:40:17 -08:00
Kara Hoagland
302af4bbd5 tempIfElseAlert 2022-11-20 14:36:03 -08:00
Henry Feng
3c7b5f7f4e addresses case where image is not updated 2022-11-20 14:27:24 -08:00
rheabhutada02
4f2d88db9f Co-authored-by: Gavyn Ezell <ezellgavyn@gmail.com> 
Co-authored-by: Kara Hoagland <KH-Cl@users.noreply.github.com>
 2022-11-20 14:12:34 -08:00
Arthur Lu
8a9a32414e Merge branch 'sprint-2' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2 2022-11-20 14:07:02 -08:00
Arthur Lu
e73a544ab2 fix js linting 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 14:07:01 -08:00
rheabhutada02
db3e8dba8d
Merge branch 'sprint-2' into sprint-2-homepage-integration 2022-11-20 14:06:14 -08:00
Marc
f2edc4dc6a added for loops for multiple tests 2022-11-20 14:01:48 -08:00
Marc
5d331c3800 added for loops to tests 2022-11-20 13:56:27 -08:00
Henry Feng
f340f3ed82 Added local img storage to updating 2022-11-20 13:51:28 -08:00
Arthur Lu
72e2f0fa03 comment appTestHelpers.js 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 13:43:42 -08:00
Arthur Lu
3b1b0cfd57 quick async fix 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 13:39:52 -08:00
Arthur Lu
e7d8eaea59 fix issue with tag checking, 
modularize frequent app opperations in appTestHelpers.js,
fix isue with tage count checking

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-20 13:39:21 -08:00
Arthur Lu
1c1ac64c58 change e2e tests to use default images 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-19 12:34:29 -08:00
Gavyn Ezell
5668e68594 first style integration 
Co-authored-by: d7hernan <d7hernan@users.noreply.github.com>
Co-authored-by: look-its-ashton <look-its-ashton@users.noreply.github.com>
 2022-11-19 12:29:50 -08:00
Arthur Lu
8338156cb8 fix delete test issue with alert handling 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-19 12:16:03 -08:00
Henry Feng
3e909ed381 Merge remote-tracking branch 'origin/sprint-2' into allow-for-user-uploaded-images 2022-11-19 12:10:55 -08:00
Arthur Lu
20e9842aea fix expected values for ratings and src tests 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-19 12:00:59 -08:00
Arthur Lu
7035fa46ee fixes to tag-add-btn, 
fixes to tests with rating selection

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-19 11:42:30 -08:00
Gavyn Ezell
23ae101f56 testing images 
Co-authored-by: d7hernan <d7hernan@users.noreply.github.com>
 2022-11-19 11:19:57 -08:00
rheabhutada02
1379c22f6f
Merge pull request #73 from cse110-fa22-group29/add-crud-e2e-testing 
Add crud e2e testing
 2022-11-19 10:58:14 -08:00
rheabhutada02
c5229c7bc1 Updated ReviewDetails.js 2022-11-19 10:45:28 -08:00
Arthur Lu
20afab9b1f remove create test review card reference 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-19 10:21:43 -08:00
Arthur Lu
2e95147336 Merge branch 'add-crud-e2e-testing' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into add-crud-e2e-testing 2022-11-18 23:26:54 -08:00
Arthur Lu
ef5dccfd1a temp fix issue with root user 2022-11-18 23:26:51 -08:00
Marc
d5be6a2e4d Check details & homepage for create & read 2022-11-18 23:08:54 -08:00
Arthur Lu
274a05fdc2 convert page.click() to button.click() 2022-11-18 20:43:55 -08:00
Arthur Lu
65815998e9 fix create new review star selection 2022-11-18 20:37:33 -08:00
Arthur Lu
cac2b0bf07 populate part of add review, 
various bug fixes,
TODO: resolve issue with star selectors
 2022-11-18 20:36:10 -08:00
Arthur Lu
82be561bfe add wait for page navigation to applicable tests 2022-11-18 19:21:53 -08:00
Arthur Lu
b75e4172b4
Merge pull request #72 from cse110-fa22-group29/storage-revamp 
Pull CRUD implementation changes from revamp-storage to add-crud-e2e-testing
 2022-11-18 19:12:22 -08:00
Arthur Lu
32323eaf83
Merge pull request #71 from cse110-fa22-group29/sprint-2 
Reflect changes to sprint-2 to storage-revamp
 2022-11-18 15:28:38 -08:00
Arthur Lu
f332b27168
Merge pull request #70 from cse110-fa22-group29/remove-unused-files 
Reflect main changes to sprint-2
 2022-11-18 15:17:43 -08:00
Arthur Lu
baa722b55e remove unused files 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-18 15:15:20 -08:00