cse110-fa22-group29

alu/cse110-fa22-group29

Fork 0

mirror of https://github.com/cse110-fa22-group29/cse110-fa22-group29.git synced 2025-09-08 23:57:21 +00:00

Commit Graph

Select branches

Hide Pull Requests

main

sprint-1

sprint-2

sprint-3

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#37

#38

#4

#41

#42

#43

#44

#46

#47

#5

#52

#53

#55

#56

#57

#58

#6

#62

#65

#66

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#78

#79

#8

#80

#81

#82

#83

#84

#86

#87

#88

#9

#90

#92

#93

#94

#95

#96

#97

#98

#99

working

20cdc4ce76 Merge remote-tracking branch 'origin/sprint-3' into 49-image-feature Henry Feng 2022-11-29 17:21:55 -08:00
a68bf60f44 Rename 112922-doccumentation-jsdoc.md to 112922-documentation-jsdoc.md rheabhutada02 2022-11-29 16:20:25 -08:00
d01c4d2ef5 documentation updates for html files rheabhutada02 2022-11-29 16:17:26 -08:00
58e4f6fdeb Documentation for ReviewDetails.js rheabhutada02 2022-11-29 16:13:58 -08:00
ea41495e49 documentation rheabhutada02 2022-11-29 15:59:57 -08:00
5405cbfd7c Documented CreatePage.js rheabhutada02 2022-11-29 15:39:43 -08:00
6ca0ee1763 Merge branch 'main' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 rheabhutada02 2022-11-29 15:10:23 -08:00
7757d1d0da Documented CreatePage.html rheabhutada02 2022-11-29 15:10:20 -08:00
5aa1616f17 Merge pull request #99 from cse110-fa22-group29/add-prettier rheabhutada02 2022-11-29 14:53:48 -08:00
529f24f306 update phase 2 with future ci features Arthur Lu 2022-11-29 22:51:03 +00:00
c1fd10c268 update cicd phase 2 status Arthur Lu 2022-11-29 22:46:16 +00:00
e74b3f5597 add prettier requirements and commands, add prettier ADR, add prettier action Arthur Lu 2022-11-29 22:38:22 +00:00
eb4cb54b05 Merge pull request #92 from cse110-fa22-group29/separate-tag-storage rheabhutada02 2022-11-29 14:28:39 -08:00
6a0708a3f0 moved break for delete Kara Hoagland 2022-11-29 14:27:48 -08:00
fbea45e151 Delete js-docs.yml rheabhutada02 2022-11-29 14:27:11 -08:00
68020ccae7 Merge pull request #97 from cse110-fa22-group29/add-js-docs rheabhutada02 2022-11-29 14:25:44 -08:00
603fb849f3 add explanation of JSDoc usage to ADR Arthur Lu 2022-11-29 22:23:24 +00:00
dcee487737 add JSDoc ADR, add JSDoc to publish action Arthur Lu 2022-11-29 22:18:32 +00:00
1cdaa63935 delete tag bug Kara Hoagland 2022-11-29 14:16:17 -08:00
929de8c98b fix js-doc command Arthur Lu 2022-11-29 22:11:12 +00:00
beb3e6cc98 added JS Docs to workflow Graydogminer 2022-11-29 13:59:02 -08:00
131e14d611 added jsdocs to package.json Marc 2022-11-29 21:53:05 +00:00
bc6012af76 fix perttier action naming Arthur Lu 2022-11-29 13:49:57 -08:00
5ee4c4d231 Merge pull request #96 from cse110-fa22-group29/prettier-init-changes rheabhutada02 2022-11-29 13:44:56 -08:00
fd07a93d50 Merge pull request #95 from cse110-fa22-group29/remove-.vscode rheabhutada02 2022-11-29 13:42:22 -08:00
9d7a928032 Rename 112722-retrospective2.md to 112822-retrospective.md look-its-ashton 2022-11-29 13:25:27 -08:00
29fca61a85 add and update phase 2 docs Arthur Lu 2022-11-29 13:18:30 -08:00
5c4e4c38f4 add prettier lint action Arthur Lu 2022-11-29 08:32:45 -08:00
b7d79b6b50 remove .vscode folder, add .vscode to .gitignore Arthur Lu 2022-11-29 08:20:53 -08:00
0ca848e26b add prettier to devDependencies, add lint-prettier and fix-prettier commands Arthur Lu 2022-11-29 08:15:59 -08:00
847e8a1aa1 No tag duplicates Kara Hoagland 2022-11-28 18:48:55 -08:00
46bdee7b68 Retrospective 2 Meeting Notes look-its-ashton 2022-11-28 16:45:33 -08:00
f44d8713a0 Added Gavin's section look-its-ashton 2022-11-28 14:02:55 -08:00
7bdeafa483 added Daniels progress to sprint review 2 look-its-ashton 2022-11-27 23:59:00 -08:00
5e06bd0cf7 Merge branch 'sprint-3' into separate-tag-storage Kara Hoagland 2022-11-27 20:34:12 -08:00
dd0bcbe57d moved from details to localStorage Kara Hoagland 2022-11-27 17:31:13 -08:00
f91520ed85 Merge pull request #93 from cse110-fa22-group29/sprint-2 look-its-ashton 2022-11-27 17:23:07 -08:00
e77fe1406c Sprint 2 typo sprint-2 look-its-ashton 2022-11-27 17:14:33 -08:00
57be3a11ed Merge branch 'sprint-2' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2 look-its-ashton 2022-11-27 17:07:34 -08:00
c381bd1f60 retrospectiev 2 started and sprint 2 review 2.md look-its-ashton 2022-11-27 17:07:10 -08:00
1484a882b2 tag storage Kara Hoagland 2022-11-27 15:48:00 -08:00
f99cfd0eff fix tag vertical fitting issue Arthur Lu 2022-11-26 18:39:33 -08:00
a63552f32b fix ReviewCard css, fixes article tag overflow issue, should resolve #85 Arthur Lu 2022-11-26 18:00:09 -08:00
ae2e14172d change #d-mealImg to #d-meal-img and #d-mealName to #d-meal-name Arthur Lu 2022-11-26 17:38:19 -08:00
af4378ee40 fix some linting issues, fix bug in localStroage unit tests Arthur Lu 2022-11-26 16:06:24 -08:00
39aa535864 cleanup e2e test code Arthur Lu 2022-11-26 16:03:47 -08:00
9ff58a1c2c add sorting and filtering localStorage helper functions, add new unit tests for new helper functions Arthur Lu 2022-11-26 15:37:48 -08:00
4c649e7770 Update favicon with current logo Sanjit Joseph 2022-11-24 02:41:02 -08:00
5db9320dae Give the raccoon a chef's hat Sanjit Joseph 2022-11-24 02:36:02 -08:00
b2dd734ade Add hover text to new entry button Sanjit Joseph 2022-11-24 02:27:27 -08:00
622d324c9a Add rounded corners to food image element Sanjit Joseph 2022-11-24 02:24:37 -08:00
5901888475 Add hover text to home/edit/delete buttons Sanjit Joseph 2022-11-24 02:13:41 -08:00
de1ec502b1 Fix default image cropping issues + add caption Sanjit Joseph 2022-11-23 18:04:09 -08:00
4832726b14 Update E2E tests to check for new default image Sanjit Joseph 2022-11-23 17:22:23 -08:00
0b7e101bb2 Select default_plate image when no food image uploaded Sanjit Joseph 2022-11-23 17:20:55 -08:00
e6ac5ea33d Update 111622-checkin6.md rheabhutada02 2022-11-23 15:59:30 -08:00
31633ff825 Update 112322-checkin7.md rheabhutada02 2022-11-23 15:59:06 -08:00
5443b61825 Update 112322-checkin7.md rheabhutada02 2022-11-23 15:58:54 -08:00
aeab069dec Create 112322-checkin7.md rheabhutada02 2022-11-23 15:58:15 -08:00
f5d9b6e906 Upload status video 1 Sanjit Joseph 2022-11-22 21:45:45 -08:00
3ebefac2db Delete statusvideo1.mp4 Sanjit Joseph 2022-11-22 21:44:03 -08:00
a9bf42a849 Merge pull request #88 from sm-joseph/main Sanjit Joseph 2022-11-22 21:38:41 -08:00
53f51bce5f Upload status video 1 Sanjit Joseph 2022-11-22 21:37:12 -08:00
1017bd48a2 Merge pull request #87 from sm-joseph/main Sanjit Joseph 2022-11-22 21:26:55 -08:00
3131391d92 Merge branch 'cse110-fa22-group29:main' into main Sanjit Joseph 2022-11-22 21:24:25 -08:00
88ac0aea66 Upload status video 1 Sanjit Joseph 2022-11-22 21:10:50 -08:00
c7d2a5434d Merge pull request #86 from sm-joseph/main Sanjit Joseph 2022-11-22 21:11:53 -08:00
ade244707a Upload status video #1 Sanjit Joseph 2022-11-22 21:10:50 -08:00
33e619c2d5 Merge pull request #79 from cse110-fa22-group29/sprint-2 Arthur Lu 2022-11-22 16:40:27 -08:00
83a0358869 fix form tag wrap issue Arthur Lu 2022-11-22 14:46:01 -08:00
5ba0dab1a1 fix flex-flow css linting issue Arthur Lu 2022-11-21 18:00:58 -08:00
1dfd8c91a2 fix css linting issues Arthur Lu 2022-11-21 17:55:44 -08:00
ecff5313a1 increase timeout for e2e tests Arthur Lu 2022-11-21 17:38:34 -08:00
a12de4e058 fix some more css issues Arthur Lu 2022-11-21 17:31:12 -08:00
9194dd5166 fix html linting and some css linting issues Arthur Lu 2022-11-21 17:27:18 -08:00
63a7d5ce1f Merge pull request #84 from cse110-fa22-group29/sprint-2-css-review-details Arthur Lu 2022-11-21 17:20:36 -08:00
9f9ac19b71 fix ReviewDetails CreatePage large tag display issue Arthur Lu 2022-11-21 17:20:12 -08:00
0912ea7956 fixed logo and tags rheabhutada02 2022-11-21 17:03:10 -08:00
b5e5a88163 fixed the pathing issue for images in main.e2e.test.js rheabhutada02 2022-11-21 16:14:09 -08:00
5f1a246e6a moved all the icons to images and fixed path issues associated with this move rheabhutada02 2022-11-21 16:12:17 -08:00
4073d2cc4b fixed and styled review details page rheabhutada02 2022-11-21 16:07:20 -08:00
23657853e5 Merge branch 'sprint-2-css-review-details' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2-css-review-details rheabhutada02 2022-11-21 15:28:23 -08:00
ec9d0246ca fixed the update form, and update functionality, and formatted rheabhutada02 2022-11-21 15:27:45 -08:00
1cbefee26f fix favicon linking Arthur Lu 2022-11-21 14:37:37 -08:00
dd56207892 fix update form listener Arthur Lu 2022-11-21 14:26:54 -08:00
123057f0f1 fixed the css linking rheabhutada02 2022-11-21 13:56:00 -08:00
50283be4f5 renamed the file rheabhutada02 2022-11-21 13:52:48 -08:00
46b1ec4b07 fixed form formatting, moved it to its own file rheabhutada02 2022-11-21 13:52:44 -08:00
661feafa40 Merge branch 'sprint-2-css-review-details' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-2-css-review-details rheabhutada02 2022-11-21 12:35:52 -08:00
68b0c8edf5 cleaned css and html rheabhutada02 2022-11-21 12:32:54 -08:00
5d2c446551 Merge pull request #83 from cse110-fa22-group29/remove-alt-img Kara Hoagland 2022-11-21 12:32:50 -08:00
52bc6a27a4 default img if img fails to load Kara Hoagland 2022-11-21 12:29:06 -08:00
1db54e9f7a remove alt from js/html/tests Kara Hoagland 2022-11-21 11:58:26 -08:00
d70881c912 sprint2 meeting 3 notes look-its-ashton 2022-11-21 11:16:05 -08:00
1798835807 modified css for CreatePage and color palette for homepage d7hernan 2022-11-21 00:56:54 -08:00
1055f7ef26 updating font rheabhutada02 2022-11-20 23:50:54 -08:00
5a05741e08 Merge pull request #80 from cse110-fa22-group29/req-stars-fix Kara Hoagland 2022-11-20 23:37:45 -08:00
4c5132c2b2 Merge branch 'sprint-2' into sprint-2-css-review-details d7hernan 2022-11-20 22:49:51 -08:00
49f85d5468 color palette changes d7hernan 2022-11-20 22:35:02 -08:00
9ef3c59fee added restaurant, tag, and comments to reviewDetails d7hernan 2022-11-20 22:22:31 -08:00