Skip to content

Cindy final cleanup #369

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.

Sign up for GitHub

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

Open
Cindyzzz616 wants to merge 211 commits into
base: main
Choose a base branch
from
Open

Cindy final cleanup #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
211 commits
Select commit Hold shift + click to select a range
36d88ae
Start README.md for project
Cindyzzz616 Nov 4, 2024
708402b
created a basic recipe, ingredient, and nutrition class to build upon
kayzoo8 Nov 4, 2024
cfb76f1
Merge pull request #1 from Cindyzzz616/kk.zhou
Cindyzzz616 Nov 4, 2024
ff1cf78
Use Case 1 Completed
wusungch Nov 4, 2024
8999bce
Use Case 1 Completed
wusungch Nov 4, 2024
7ce968b
Use Case 1 Completed
wusungch Nov 4, 2024
bf93b2b
getting the API to work
Cindyzzz616 Nov 4, 2024
23ad3cb
added Hongcheng to README.md
Cindyzzz616 Nov 4, 2024
53bcbc6
Update README.md
hhcgoodluck Nov 4, 2024
2e02711
Lab files deleted
wusungch Nov 4, 2024
89d2d3f
Merge remote-tracking branch 'origin/main'
Cindyzzz616 Nov 4, 2024
fb44133
setting up the API
Cindyzzz616 Nov 4, 2024
e6a8a82
Use Case 1 Completed
wusungch Nov 4, 2024
0125522
lab files deleted
wusungch Nov 4, 2024
29daddc
resolving conflict lab files deleted
wusungch Nov 4, 2024
fc87dd6
fixed some checkstyle errors
kayzoo8 Nov 4, 2024
9f8219b
added working API call example and a file with the API key
Cindyzzz616 Nov 10, 2024
461ae91
changed names to alphabetical order
Cindyzzz616 Nov 10, 2024
7fdf52a
Updated the code for the first use case to utilize api
wusungch Nov 11, 2024
3061d11
edited api sample
Cindyzzz616 Nov 11, 2024
5f852cd
added a SearchFilter class and amended Recipe class to include cuisin…
kayzoo8 Nov 11, 2024
545fb38
added a SearchFilter class and added cuisineType to Recipe class
kayzoo8 Nov 11, 2024
595a73a
the design of Nutrition class (version 1.0)
hhcgoodluck Nov 11, 2024
40bfd1e
the design of Nutrition class (version 1.0)
hhcgoodluck Nov 11, 2024
abafe7c
Merge remote-tracking branch 'origin/main'
hhcgoodluck Nov 11, 2024
cc5c194
the design of Nutrition class (version 1.0)
hhcgoodluck Nov 11, 2024
2dd3852
created a DietaryPreference class w/ 4 preferences for now
kayzoo8 Nov 11, 2024
df5d8b4
(data access) implementation of the Nutrition View Interface
hhcgoodluck Nov 11, 2024
c4e4659
(use case) Interface of Nutrition View Data Access
hhcgoodluck Nov 11, 2024
1b7c8ff
(Test) Data Access Test of Nutrition Information View
hhcgoodluck Nov 11, 2024
9b65359
created BookmarkView, IndividualRecipeView and NutritionView; added s…
Cindyzzz616 Nov 11, 2024
1227fb1
Merge pull request #2 from Cindyzzz616/cindy
Cindyzzz616 Nov 11, 2024
1ed2a3e
the design of Nutrition class (version 1.0)
hhcgoodluck Nov 11, 2024
d3aa27e
the design of Nutrition class (version 1.0)
hhcgoodluck Nov 11, 2024
92a57ed
added a SearchFilter class and amended Recipe class to include cuisin…
kayzoo8 Nov 11, 2024
726a14b
the design of Nutrition class (version 1.0)
hhcgoodluck Nov 11, 2024
9c20e81
created a DietaryPreference class w/ 4 preferences for now
kayzoo8 Nov 11, 2024
99b4e18
(data access) implementation of the Nutrition View Interface
hhcgoodluck Nov 11, 2024
dc37a2d
(use case) Interface of Nutrition View Data Access
hhcgoodluck Nov 11, 2024
254d9af
(Test) Data Access Test of Nutrition Information View
hhcgoodluck Nov 11, 2024
6ae85e4
Added SignupLoginPage, HomePage, and User Classes
wusungch Nov 11, 2024
e13c90b
messageMerge branch 'main' of https://github.com/Cindyzzz616/CSC207-P…
wusungch Nov 11, 2024
fac1557
commented out unfinished functionality in views
Cindyzzz616 Nov 11, 2024
a5bdf1d
Merge pull request #3 from Cindyzzz616/cindy-views
Cindyzzz616 Nov 11, 2024
535a280
Changed Main to temporarily display the incomplete BookmarkView upon …
Cindyzzz616 Nov 11, 2024
6a98788
Nothing
wusungch Nov 11, 2024
c0e736a
Resolving Conflicts
wusungch Nov 11, 2024
132fa8a
（Test) add the test part for this project
hhcgoodluck Nov 12, 2024
fa69410
fix the error
hhcgoodluck Nov 12, 2024
04de60f
added methods to User and Recipe, modified BookmarkView, and added te…
Cindyzzz616 Nov 13, 2024
6b1f5e8
Merge pull request #4 from Cindyzzz616/cindy_user_dao
Cindyzzz616 Nov 13, 2024
9969343
created RecentlyViewedView and added corresponding methods to User
Cindyzzz616 Nov 13, 2024
95bb974
Merge pull request #5 from Cindyzzz616/cindy_recently_viewed
Cindyzzz616 Nov 13, 2024
2399482
added double click to view recipe function to BookmarkView
Cindyzzz616 Nov 13, 2024
0797e11
RecipeListView parent class - UNFINISHED
Cindyzzz616 Nov 14, 2024
d2ca049
completed RecipeListView as parent class of BookmarkView and Recently…
Cindyzzz616 Nov 14, 2024
e79569e
refactored Recipe and Ingredient constructors; added features to Indi…
Cindyzzz616 Nov 14, 2024
646c9ec
Merge pull request #6 from Cindyzzz616/cindy_IndividualRecipeView
Cindyzzz616 Nov 14, 2024
3942062
added attributes to Recipe and Ingredient
Cindyzzz616 Nov 14, 2024
ce1073e
Merge pull request #7 from Cindyzzz616/cindy_IndividualRecipeView
Cindyzzz616 Nov 14, 2024
a587e99
added getters for Ingredient
Cindyzzz616 Nov 16, 2024
2058afe
fixed layout for IndividualRecipeView
Cindyzzz616 Nov 16, 2024
b077a18
changed IndividualRecipeView to display image and names of ingredients
Cindyzzz616 Nov 16, 2024
d349317
added search components to RecipeListView
Cindyzzz616 Nov 16, 2024
4b6389c
added diet and additional constructor to Recipe and getters for Searc…
kayzoo8 Nov 16, 2024
03b702d
new filter recipes use case file
kayzoo8 Nov 16, 2024
9f9b920
included a mock recipe w/ filter parameters and getter for diet
kayzoo8 Nov 18, 2024
65cfb26
added a filter use case class and filterByDiet method for now
kayzoo8 Nov 18, 2024
bc593dc
matchesRecipe method in both diet and cuisine classes; search filter …
kayzoo8 Nov 18, 2024
79f843b
fixed the order of opening the windows
Cindyzzz616 Nov 18, 2024
0c028b0
Merge pull request #8 from Cindyzzz616/cindy_fixing_views
Cindyzzz616 Nov 18, 2024
dea1ff2
made the list from search clickable
Cindyzzz616 Nov 18, 2024
7dbbe5d
Merge pull request #9 from Cindyzzz616/cindy_individual_recipes
Cindyzzz616 Nov 18, 2024
23fafe9
finish the NutritionView and change data type of the recipeId
hhcgoodluck Nov 18, 2024
ea08452
Merge remote-tracking branch 'origin/main'
hhcgoodluck Nov 18, 2024
cd7fc63
fix the style
hhcgoodluck Nov 18, 2024
10743aa
created new package for use case and input data class
kayzoo8 Nov 18, 2024
36d64ac
Merge pull request #10 from Cindyzzz616/kate.inputdata
kayzoo8 Nov 18, 2024
7a8f758
created input boundary interface for my use case
kayzoo8 Nov 18, 2024
8c0f3d0
fix the error
hhcgoodluck Nov 18, 2024
77d2278
started controller and use casefor bookmark and recently viewed
Cindyzzz616 Nov 18, 2024
11186f4
adding classes in app business rules layer for filter recipes
kayzoo8 Nov 24, 2024
0598f3e
Merge pull request #11 from Cindyzzz616/kate.nov23
kayzoo8 Nov 24, 2024
489c84a
git commit -m "Add shopping list features"
farshad-haddadi Nov 24, 2024
871c6da
Merge branch 'main' of https://github.com/Cindyzzz616/CSC207-Project-…
farshad-haddadi Nov 24, 2024
27b559d
users.json changed
Cindyzzz616 Nov 24, 2024
7fba03f
Merge remote-tracking branch 'origin/main'
Cindyzzz616 Nov 24, 2024
1e69b63
WIP: adding GUI to filtering recipes
kayzoo8 Nov 24, 2024
8cf6245
Merge pull request #12 from Cindyzzz616/kate.nov24
kayzoo8 Nov 24, 2024
ad1b291
Merge remote-tracking branch 'origin/main'
Cindyzzz616 Nov 25, 2024
b333c54
Split recipeListView search function into two buttons; made the Login…
Cindyzzz616 Nov 25, 2024
a0ce1ee
Merge pull request #13 from Cindyzzz616/cindy_RecipeListController
Cindyzzz616 Nov 25, 2024
139bf99
Merge remote-tracking branch 'origin/main'
Cindyzzz616 Nov 25, 2024
0a8cb93
fixed minor issues after merging RecipeListView
Cindyzzz616 Nov 25, 2024
5186f75
finish IndividualRecipeView.java (Nutrition Part)
hhcgoodluck Nov 25, 2024
89d7f81
implemented filtering recipes in api DAO and refactored app business …
kayzoo8 Nov 25, 2024
e0c246b
Merge pull request #14 from Cindyzzz616/kate.nov24
kayzoo8 Nov 25, 2024
4897955
A simple change in size of homepage , All buttons are visible
farshad-haddadi Nov 25, 2024
b14acaf
Merge pull request #15 from farshad-haddadi/main
Cindyzzz616 Nov 25, 2024
d45be8b
added the other search recipe list use case
Cindyzzz616 Nov 25, 2024
1051cb8
Merge remote-tracking branch 'origin/main'
Cindyzzz616 Nov 25, 2024
1b6aeb5
added the other search recipe list use case
Cindyzzz616 Nov 25, 2024
3185095
fixed small error
Cindyzzz616 Nov 25, 2024
b808fe9
fixed bookmark controller
Cindyzzz616 Nov 25, 2024
c06e771
added controller and presenter classes
kayzoo8 Nov 25, 2024
78f2420
Merge pull request #16 from Cindyzzz616/kate.nov25
kayzoo8 Nov 25, 2024
9f893e4
fixed presenter from showing error and edited recipe list view
kayzoo8 Nov 25, 2024
19c6490
adjusted load image functionality
Cindyzzz616 Nov 25, 2024
f01cc2e
fixed errors in presenter class and edited recipe list view
kayzoo8 Nov 25, 2024
461996a
fixed load image functionality
Cindyzzz616 Nov 25, 2024
125c943
Merge remote-tracking branch 'origin/main'
Cindyzzz616 Nov 25, 2024
ffa76ef
Merge pull request #17 from Cindyzzz616/cindy-image
Cindyzzz616 Nov 25, 2024
766e8c6
Merge remote-tracking branch 'origin/main'
Cindyzzz616 Nov 25, 2024
3253406
edited RecipeListView for filter recipes
kayzoo8 Nov 25, 2024
1696c67
Merge pull request #18 from Cindyzzz616/kate.nov25.2
kayzoo8 Nov 25, 2024
0e245b8
implemented bookmark button
Cindyzzz616 Nov 25, 2024
1b57346
Merge pull request #20 from Cindyzzz616/cindy-bookmark-button
Cindyzzz616 Nov 25, 2024
dfa0edb
Merge branch 'main' into kate.nov25
kayzoo8 Nov 25, 2024
cd8ce5e
Merge pull request #19 from Cindyzzz616/kate.nov25
kayzoo8 Nov 25, 2024
5133d3f
small typo error
kayzoo8 Nov 25, 2024
b782971
commenting out bug in recipelistview
kayzoo8 Nov 25, 2024
dfd1b79
fixed recently viewed view
Cindyzzz616 Nov 25, 2024
70096ec
Merge pull request #21 from Cindyzzz616/cindy-recentlyviewedlist
Cindyzzz616 Nov 25, 2024
6a4f1c1
fixed the ingredient list display in individual recipe view
Cindyzzz616 Nov 25, 2024
543e2a2
added notes
Cindyzzz616 Nov 25, 2024
cb83718
fixed ingredient list display
Cindyzzz616 Nov 25, 2024
8edb73a
fixed recently viewed view
Cindyzzz616 Nov 25, 2024
0debafb
fixed the ingredient list display in individual recipe view
Cindyzzz616 Nov 25, 2024
1b61267
added notes
Cindyzzz616 Nov 25, 2024
815e53d
fixed ingredient list display
Cindyzzz616 Nov 25, 2024
587deb9
Merge remote-tracking branch 'origin/main'
Cindyzzz616 Nov 25, 2024
b0e33e2
began modifying userdao
Cindyzzz616 Nov 25, 2024
0daf809
implemented the functionality of saving bookmarks and recently viewed…
Cindyzzz616 Nov 26, 2024
58790d4
Merge pull request #22 from Cindyzzz616/cindy-userdao
Cindyzzz616 Nov 26, 2024
994ec2f
added some notes and todos
Cindyzzz616 Nov 26, 2024
edba0c4
The chckstyle errors were resolved for main.java
farshad-haddadi Nov 26, 2024
6f44eab
2 dots ...
farshad-haddadi Nov 26, 2024
bedcbae
Merge pull request #23 from farshad-haddadi/main
farshad-haddadi Nov 26, 2024
c141a72
added clickable url to individual recipe view
Cindyzzz616 Nov 26, 2024
8c37f14
implemented search functions in bookmarks and recently viewed
Cindyzzz616 Nov 26, 2024
c97befd
added clear recently viewed button
Cindyzzz616 Nov 26, 2024
825dc88
changed some small things
Cindyzzz616 Nov 26, 2024
0cdd044
added amount and unit to next to ingredients in individual recipe view
Cindyzzz616 Nov 26, 2024
3e08854
Merge pull request #24 from Cindyzzz616/shopping-list-clickable
Cindyzzz616 Nov 26, 2024
29b6589
fixed error upon login
Cindyzzz616 Nov 26, 2024
07eaa8d
modified use case layer according to view needs
kayzoo8 Nov 27, 2024
d0591d6
Merge pull request #25 from Cindyzzz616/kate.nov26
kayzoo8 Nov 27, 2024
298eb62
adding dropdown menus to correct class and filter recipes controller …
kayzoo8 Nov 27, 2024
fafa3a9
Merge pull request #26 from Cindyzzz616/kate.nov26
Cindyzzz616 Nov 27, 2024
a03093c
WIP: added spoonacularRecipeDAO to RecipeView to try populating dropdown
kayzoo8 Nov 27, 2024
e3ce5a4
updated input boundary, input data, controller, and interactor
kayzoo8 Nov 28, 2024
9ee6d40
took FR controller out of recipe view constructor
kayzoo8 Nov 28, 2024
10b1201
recipe filters show up in dropdown menu
kayzoo8 Nov 29, 2024
c91d0b3
WIP: debugging filter recipe view
kayzoo8 Nov 29, 2024
a877305
added helper method for getting complete recipe info; not yet called …
kayzoo8 Nov 29, 2024
84b0724
added fillIngredients=true to url in filterSearchRecipes to get symme…
kayzoo8 Nov 29, 2024
4beb549
filter search should be working
kayzoo8 Nov 30, 2024
4d7ae16
Merge pull request #33 from Cindyzzz616/kate.filterview
kayzoo8 Nov 30, 2024
8a3ee11
change api
wusungch Nov 30, 2024
a0c2e42
Refactored SearchRecipe Use Case, changes are also made to RecipeView
wusungch Nov 30, 2024
c24102b
update API
wusungch Nov 30, 2024
3e66f9a
change the api key
hhcgoodluck Nov 30, 2024
aced4e4
update the api key
hhcgoodluck Nov 30, 2024
c5fe80f
Merge pull request #34 from Cindyzzz616/william3
wusungch Dec 1, 2024
2c0b7b3
reverting RecipeView to pre-refactoring to maintain functionality and…
kayzoo8 Dec 1, 2024
90bdfdc
additional parameters to recipeview constructor and fixed checkstyle …
kayzoo8 Dec 1, 2024
b4a7046
Merge pull request #35 from Cindyzzz616/kate.refactor
kayzoo8 Dec 1, 2024
dbf02ab
added handleSearch and cleaned up event listeners according to willia…
kayzoo8 Dec 1, 2024
59c75c1
Merge pull request #36 from Cindyzzz616/kate.refactor
kayzoo8 Dec 1, 2024
7d470a1
recipeview sufficiently refactored and added some documentation
kayzoo8 Dec 1, 2024
727d43d
deleted outdated diet, cuisine, and search filter entities
kayzoo8 Dec 1, 2024
4caf57b
changed api key
Cindyzzz616 Dec 1, 2024
df5f9d5
Merge branch 'main' of https://github.com/Cindyzzz616/CSC207-Project-…
Cindyzzz616 Dec 1, 2024
c15f9bd
Created AppConstants class and refactored the direct usages of the AP…
Cindyzzz616 Dec 1, 2024
76f3dc1
created mock DAO and test for filter recipes use case; only filter se…
kayzoo8 Dec 1, 2024
46b9f45
Merge pull request #37 from Cindyzzz616/kate.refactor
kayzoo8 Dec 1, 2024
fe1c8de
began implemented the folder feature, added dropdown menu to Bookmark…
Cindyzzz616 Dec 1, 2024
5d2ab28
completed test with coverage and overloading constructor in interactor
kayzoo8 Dec 1, 2024
3a8f038
Merge pull request #38 from Cindyzzz616/kate.refactor
Cindyzzz616 Dec 1, 2024
48c0b5a
finished implementing folder feature by modifying RecipeListView and …
Cindyzzz616 Dec 1, 2024
3f0ba79
added section headers and some brief notes under each; also links to …
kayzoo8 Dec 1, 2024
0f4864b
began refactoring for CA
Cindyzzz616 Dec 1, 2024
6ad4373
created accessibility report and added some initial points
Cindyzzz616 Dec 2, 2024
d2b0e4c
Merge pull request #40 from Cindyzzz616/kate.readme
Cindyzzz616 Dec 2, 2024
7310565
fixed checkstyle errors
Cindyzzz616 Dec 2, 2024
4af468f
adjusted some views
Cindyzzz616 Dec 2, 2024
41e6507
Merge pull request #39 from Cindyzzz616/cindy-folder-impl
farshad-haddadi Dec 2, 2024
778d271
(refactor) about NutritionInformation usecase part
hhcgoodluck Dec 2, 2024
3a825cd
Merge remote-tracking branch 'origin/main'
hhcgoodluck Dec 2, 2024
99124ae
（Refactor And Code style) for the Nutrition Information
hhcgoodluck Dec 2, 2024
fa60f7e
Merge pull request #41 from Cindyzzz616/hhc-nutrition-refactor
hhcgoodluck Dec 2, 2024
3fe6f90
restored folders feature
Cindyzzz616 Dec 2, 2024
007c378
adjusted number of recipes returned from search to 20
wusungch Dec 2, 2024
ecc2ea8
Merge pull request #42 from Cindyzzz616/cindy-folder-impl
farshad-haddadi Dec 2, 2024
3973221
Resolved conflicts
wusungch Dec 2, 2024
b526d7b
add the test file for NutritionInformation
hhcgoodluck Dec 2, 2024
2f34a9b
Merge pull request #43 from Cindyzzz616/hhc-nutrition-test
hhcgoodluck Dec 2, 2024
027b8b9
deleted old class
kayzoo8 Dec 2, 2024
ea980f3
implemented search recipe list by ingredient interactor test
Cindyzzz616 Dec 2, 2024
6f2af2e
created DAI, input/output boundaries, input/output data and interacto…
Cindyzzz616 Dec 2, 2024
1e7907e
added search recipe by name controller to recipe list view; still nee…
Cindyzzz616 Dec 3, 2024
d787da4
got the search recipe list functions working using controllers, prese…
Cindyzzz616 Dec 3, 2024
5c072a3
Merge pull request #44 from Cindyzzz616/cindy-final-CA
farshad-haddadi Dec 3, 2024
4c8a018
updated readme to be mostly complete with an image
kayzoo8 Dec 3, 2024
e864bda
Merge pull request #45 from Cindyzzz616/kate.readme
Cindyzzz616 Dec 3, 2024
9a8d1e3
clean up: removed old commented out code
kayzoo8 Dec 3, 2024
c03e59c
Merge pull request #46 from Cindyzzz616/kate.refactor
kayzoo8 Dec 3, 2024
8b7241c
dependency between recipe view and controller
kayzoo8 Dec 3, 2024
cead34e
Merge pull request #47 from Cindyzzz616/kate.refactor
kayzoo8 Dec 3, 2024
a214c5f
cleaned up some print statements in the code; completed the accessibi…
Cindyzzz616 Dec 3, 2024
a981403
Merge branch 'main' into cindy-final-cleanup
kayzoo8 Dec 3, 2024
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
20 changes: 20 additions & 0 deletions .idea/artifacts/homework_5_jar.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/material_theme_project_new.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading