Commit Graph

112 Commits

Author SHA1 Message Date
Kara Hoagland
6a0708a3f0 moved break for delete 2022-11-29 14:27:48 -08:00
Kara Hoagland
1cdaa63935 delete tag bug 2022-11-29 14:16:17 -08:00
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
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
ecff5313a1 increase timeout for e2e tests
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
2022-11-21 17:38:34 -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
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
rheabhutada02
46b1ec4b07 fixed form formatting, moved it to its own file 2022-11-21 13:52:44 -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
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
9ef3c59fee added restaurant, tag, and comments to reviewDetails
Co-authored-by: rheabhutada02
2022-11-20 22:22:31 -08: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
4336157371
Merge branch 'sprint-2' into sprint-2-css-review-details 2022-11-20 16:41:35 -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
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
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