alu/cse110-fa22-group29
1
0
Fork 0
mirror of https://github.com/cse110-fa22-group29/cse110-fa22-group29.git synced 2024-09-20 00:37:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
559 Commits 4 Branches 1 Tag 140 MiB
aa7e13b205
Commit Graph

206 Commits

Author SHA1 Message Date
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
Arthur Lu
9cf7baf3e5 remove commented form from index 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-18 14:43:59 -08:00
Arthur Lu
f6a9fb7fc5 remove implied init from localStorage unit tests 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-18 14:08:19 -08:00
Arthur Lu
5f84e700d1 update e2e test layout 2022-11-18 12:34:59 -08:00
Arthur Lu
3422f584f9 fix linting in js 2022-11-18 07:56:07 +00:00
Arthur Lu
89b7319dd8 cleanup unused html and js code 2022-11-18 07:52:43 +00:00
Arthur Lu
5e83338668 update unit tests to match new localStorage implementations 2022-11-18 07:51:08 +00:00
Arthur Lu
6493fbd171 modularize localStorage calls into localStorage.js in preparation for unit testing 2022-11-18 07:13:53 +00:00
rheabhutada02
35f44049a2 updated crud features to work better 
Co-authored-by: look-its-ashton <look-its-ashton@users.noreply.github.com>
Co-authored-by: Kara Hoagland <KH-Cl@users.noreply.github.com>
Co-authored-by: Gavyn Ezell <ezellgavyn@gmail.com>
 2022-11-17 18:45:53 -08:00
Henry Feng
416d26658d implementation of basic image local storage 2022-11-17 16:17:51 -08:00
Arthur Lu
6c00246e2d fix linting issues 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-17 15:33:12 -08:00
Arthur Lu
c45aec116b fix e2e test for create, 
split create test into two parts,
split other test templates into two parts

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-17 15:32:37 -08:00
Arthur Lu
1518fda766 add e2e tests for update and delete, 
fix package.json commadns for lint and fix-style

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-17 13:54:58 -08:00
Sanjit Joseph
4eaa1f38bb
Merge pull request #65 from cse110-fa22-group29/sprint-2-star-rating 
Sprint 2 star rating
 2022-11-17 12:53:41 -08:00
Sanjit Joseph
004e5cc2a2 Attempt CSS linting fix - v2 2022-11-17 12:44:19 -08:00
Arthur Lu
c66f43f6e9 add empty crud e2e tests 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-17 12:32:38 -08:00
Sanjit Joseph
f9074a2bc6 Attempt CSS linting fix 2022-11-17 12:31:51 -08:00
rheabhutada02
cf551f932b updated name ReviewDetails.html ReviewDetails.js 2022-11-17 12:25:18 -08:00
Sanjit Joseph
85dc0544c7 Add star rating system to main page 2022-11-17 12:19:26 -08:00
Arthur Lu
7abc995ffe fix linting errors 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-16 16:46:02 -08:00
Arthur Lu
dd7d876f29 add dependencies to package.json, 
add http-server script to package.json,
add simple e2e test in main.e2e.test.js

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-16 16:10:31 -08:00
Kara Hoagland
0c40de81a0 comment 2022-11-14 18:11:57 -08:00
Kara Hoagland
bc276dc30c star path error fix 2022-11-14 18:07:33 -08:00
Arthur Lu
b6f3a57231 adjust JS Unit tests to be more permissive 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-15 01:11:48 +00:00
Arthur Lu
837ba92d7d fix css style issues, 
removed css for rating stars

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-15 01:08:32 +00:00
Arthur Lu
66dd92f0dc fix js linting 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-15 00:53:07 +00:00
Arthur Lu
39cb507bc5 move html and css to source folder 
Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-13 22:33:00 +00:00
Kara Hoagland
74f3bdde19 Merge Conflicts 2022-11-12 14:20:25 -08:00
Kara Hoagland
17bea4c21c reviewDetails+Update+Delete 2022-11-12 14:16:03 -08:00
Gavyn Ezell
cbc00af073 interacting with description from user 2022-11-12 10:33:30 -08:00
Gavyn Ezell
365e701924 review page functionality 2022-11-12 10:10:07 -08:00
Kara Hoagland
d72e8ea601 merge 2022-11-11 12:12:29 -08:00
Kara Hoagland
9ee980f57e added stars back 2022-11-11 12:07:58 -08:00
Arthur Lu
0c0b49264e
Merge pull request #47 from cse110-fa22-group29/fix-es6-compatibility 
Fix JS unit test ES6 compatibility
 2022-11-11 08:58:39 -08:00
Kara Hoagland
524db534b6 Merge branch 'sprint-1' of https://github.com/cse110-fa22-group29/cse110-fa22-group29 into sprint-1 2022-11-11 00:04:24 -08:00
Kara Hoagland
8263aa6082 newWindow/cleaning/miniFixes 2022-11-11 00:03:56 -08:00
Sanjit Joseph
ef8a689b3f Upload default plate icons 2022-11-10 23:34:13 -08:00
Sanjit Joseph
4945285e2e Remove old star icons 2022-11-10 23:32:56 -08:00
Arthur Lu
8b2ae89bd2 switch localStorage mock to mock-local-storage, 
fix unit tests to work with ES6 import syntax,
remove testenv module
 2022-11-11 02:39:40 +00:00
Arthur Lu
b85a73400d add another unit test to localStorage.test.js, 
reflect fixes to packages.json from main
 2022-11-10 22:33:47 +00:00
Gavyn Ezell
c168d0f902 tag functionality 2022-11-10 13:22:32 -08:00
Arthur Lu
1718c7cedb move localStorage util to localStorage.js, 
update main,js to rquire localStroage,
add simple unit tests to localStroage.test.js,
create symlink of testenv.js to source/assets/scripts,
update package.json with proper recursive call

Signed-off-by: Arthur Lu <learthurgo@gmail.com>
 2022-11-10 01:35:41 +00:00
Gavyn Ezell
55f0f5d645 resolve merge: css files and index.html 2022-11-08 22:08:38 -08:00
Gavyn Ezell
3e4ae68e2e tag functionality in form, review card changes 2022-11-08 21:51:03 -08:00
d7hernan
7419a0ffe8 file no longer needed 2022-11-08 16:14:36 -08:00
Gavyn Ezell
d8ed4d24a8 started review cards, form change 2022-11-08 15:57:02 -08:00
Gavyn Ezell
b28380fa54 index move 2022-11-07 19:22:50 -08:00
Gavyn Ezell
e64222aec1 lab6 starter 2022-11-07 19:18:05 -08:00
rheabhutada02
cfb2bfd560 Github Setup (adding files and folders) 2022-10-12 12:04:40 -07:00