Skip to content

Cindy image #328

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

Jump to bottom
Open
wants to merge 108 commits into
base: main
Choose a base branch
from
Open

Cindy image #328

wants to merge 108 commits into from

Conversation

Cindyzzz616
Copy link

No description provided.

Cindyzzz616 and others added 30 commits November 3, 2024 22:19
@Cindyzzz616
Start README.md for project
36d88ae
@kayzoo8
created a basic recipe, ingredient, and nutrition class to build upon
708402b
@Cindyzzz616
Merge pull request #1 from Cindyzzz616/kk.zhou
cfb76f1 
created a basic recipe, ingredient, and nutrition class to build upon
@wusungch
Use Case 1 Completed
ff1cf78
@wusungch
Use Case 1 Completed
8999bce
@wusungch
Use Case 1 Completed
7ce968b
@Cindyzzz616
getting the API to work
bf93b2b
@Cindyzzz616
added Hongcheng to README.md
23ad3cb
@hhcgoodluck
Update README.md
53bcbc6 
team member information
@wusungch
Lab files deleted
2e02711
@Cindyzzz616
Merge remote-tracking branch 'origin/main'
89d2d3f
@Cindyzzz616
setting up the API
fb44133
@wusungch
Use Case 1 Completed
e6a8a82
@wusungch
lab files deleted
0125522
@wusungch
resolving conflict lab files deleted
29daddc
@kayzoo8
fixed some checkstyle errors
fc87dd6
@Cindyzzz616
added working API call example and a file with the API key
9f8219b
@Cindyzzz616
changed names to alphabetical order
461ae91
@wusungch
Updated the code for the first use case to utilize api
7fdf52a
@Cindyzzz616
edited api sample
3061d11
@kayzoo8
added a SearchFilter class and amended Recipe class to include cuisin…
5f852cd 
…e type
@kayzoo8
added a SearchFilter class and added cuisineType to Recipe class
545fb38
@hhcgoodluck
the design of Nutrition class (version 1.0)
595a73a
@hhcgoodluck
the design of Nutrition class (version 1.0)
40bfd1e
@hhcgoodluck
Merge remote-tracking branch 'origin/main'
abafe7c
@hhcgoodluck
the design of Nutrition class (version 1.0)
cc5c194
@kayzoo8
created a DietaryPreference class w/ 4 preferences for now
2dd3852
@hhcgoodluck
(data access) implementation of the Nutrition View Interface
df5d8b4
@hhcgoodluck
(use case) Interface of Nutrition View Data Access
c4e4659
@hhcgoodluck
(Test) Data Access Test of Nutrition Information View
1b7c8ff
kayzoo8 and others added 30 commits November 18, 2024 14:44
@kayzoo8
created input boundary interface for my use case
7a8f758
@hhcgoodluck
fix the error
8c0f3d0
@Cindyzzz616
started controller and use casefor bookmark and recently viewed
77d2278
@kayzoo8
adding classes in app business rules layer for filter recipes
11186f4
@kayzoo8
Merge pull request #11 from Cindyzzz616/kate.nov23
0598f3e 
adding classes in app business rules layer for filter recipes
@farshad-haddadi
git commit -m "Add shopping list features"
489c84a
@farshad-haddadi
Merge branch 'main' of https://github.com/Cindyzzz616/CSC207-Project-…
871c6da 
…--Recipe-Generator
@Cindyzzz616
users.json changed
27b559d
@Cindyzzz616
Merge remote-tracking branch 'origin/main'
7fba03f 
# Conflicts:
#	users.json
@kayzoo8
WIP: adding GUI to filtering recipes
1e69b63
@kayzoo8
Merge pull request #12 from Cindyzzz616/kate.nov24
8cf6245 
WIP: adding GUI to filtering recipes
@Cindyzzz616
Merge remote-tracking branch 'origin/main'
ad1b291
@Cindyzzz616
Split recipeListView search function into two buttons; made the Login…
b333c54 
…SignupPage close when login is successful
@Cindyzzz616
Merge pull request #13 from Cindyzzz616/cindy_RecipeListController
a0ce1ee 
Cindy recipe list controller
@Cindyzzz616
Merge remote-tracking branch 'origin/main'
139bf99
@Cindyzzz616
fixed minor issues after merging RecipeListView
0a8cb93
@hhcgoodluck
finish IndividualRecipeView.java (Nutrition Part)
5186f75 
(Now use case3 is usable)
@kayzoo8
implemented filtering recipes in api DAO and refactored app business …
89d7f81 
…rules layer
@kayzoo8
Merge pull request #14 from Cindyzzz616/kate.nov24
e0c246b 
implemented filtering recipes in api DAO and refactored app business rules layer
@farshad-haddadi
A simple change in size of homepage , All buttons are visible
4897955
@Cindyzzz616
Merge pull request #15 from farshad-haddadi/main
b14acaf 
 A simple change in size of homepage , All buttons are visible
@Cindyzzz616
added the other search recipe list use case
d45be8b
@Cindyzzz616
Merge remote-tracking branch 'origin/main'
1051cb8
@Cindyzzz616
added the other search recipe list use case
1b6aeb5
@Cindyzzz616
fixed small error
3185095
@Cindyzzz616
fixed bookmark controller
b808fe9
@kayzoo8
added controller and presenter classes
c06e771
@kayzoo8
Merge pull request #16 from Cindyzzz616/kate.nov25
78f2420 
added controller and presenter classes
@Cindyzzz616
adjusted load image functionality
19c6490
@Cindyzzz616
fixed load image functionality
461996a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Cindyzzz616 @kayzoo8 @wusungch @hhcgoodluck @farshad-haddadi