Hanjum6#17

Open

hanjum66 wants to merge 229 commits into

CSC207-2025F-UofT:mainfrom

Jerry-Zeng-UofT:hanjum6

Commits on Nov 11, 2024

Fix TODOs in use case
Alan-Na
committed
Merge pull request #3 from Jerry-Zeng-UofT/xinengss.na
Alan-Na
authored
demo pull request
Haris Anjum
committed
demo
Haris Anjum
committed
Merge pull request #4 from Jerry-Zeng-UofT/hanjum6
hanjum66
authored
modifying the View to handle ingredient search
Haris Anjum
committed
Added Interface adapter Recipe Search State and Updated View, Recipe Search View
Haris Anjum
committed
Merge pull request #5 from Jerry-Zeng-UofT/hanjum6
Alan-Na
authored
Implementing RecipeSearchEdamam Class for data_access and RecipeForSearch class is edited version of original Recipe entity so that it can fit on our edamam api.
KaiBaek
committed
Merge pull request #6 from Jerry-Zeng-UofT/kai.baek
KaiBaek
authored
Changes on RecipeSearchEdamam for correct queries.
KaiBaek
committed
Merge pull request #7 from Jerry-Zeng-UofT/kai.baek
KaiBaek
authored
Version 1 for recipe search use case
Alan-Na
committed
Merge pull request #8 from Jerry-Zeng-UofT/xinengss.na
Alan-Na
authored
The implementation of RecipeSearchController and RecipeSearchViewModel

Jerry Zeng
authored and
Jerry Zeng
committed
The implementation of RecipeSearchController and RecipeSearchViewModel

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #9 from Jerry-Zeng-UofT/Jerry.Zeng
Alan-Na
authored
Fixed bugs in Interface Interactor
Haris Anjum
committed
Merge pull request #10 from Jerry-Zeng-UofT/hanjum6
hanjum66
authored
New code for recipe search exception
Haris Anjum
committed
Usecase for output boundary
Haris Anjum
committed
Merge pull request #11 from Jerry-Zeng-UofT/hanjum6
hanjum66
authored
Implemented Main and Recipe App builder
Haris Anjum
committed
Merge pull request #12 from Jerry-Zeng-UofT/hanjum6
Jerry-Zeng-UofT
authored
Bug fix in recipe search use case
Haris Anjum
committed
Merge pull request #13 from Jerry-Zeng-UofT/hanjum6
hanjum66
authored
new version of recipe search impl
Haris Anjum
committed
Merge pull request #14 from Jerry-Zeng-UofT/hanjum6
hanjum66
authored

Commits on Nov 14, 2024

Add Starting page view
Alan-Na
committed

Commits on Nov 16, 2024

Entities for User Story 2
Haris Anjum
committed
Merge pull request #16 from Jerry-Zeng-UofT/hanjum6
KaiBaek
authored

Commits on Nov 17, 2024

Implementation of NutritionAnalysis use case, Including NutritionAnalysis.java, NutritionAnalysisException.java and NutritionAnalysisoutputBoundary.java.

Jerry Zeng
authored and
Jerry Zeng
committed
Implementation of NutritionAnalysis use case. The NutritionAnalysisImpl.java.

Jerry Zeng
authored and
Jerry Zeng
committed
Implementation of Nutrient.java entity and some related changes.

Jerry Zeng
authored and
Jerry Zeng
committed
files made for interface adapter of Meal Planning

Haris Anjum
authored and
Haris Anjum
committed
Merge pull request #17 from Jerry-Zeng-UofT/hanjum6
Alan-Na
authored
Implementation of NutritionAnalysis interface, including NutritionAnalysisController.java, NutritionAnalysisState.java and NutritionAnalysisViewModel.java.

Jerry Zeng
authored and
Jerry Zeng
committed
Implementation of NutritionAnalysis interface. The NutritionAnalysisPresenter.java, and some minor changes to other files

Jerry Zeng
authored and
Jerry Zeng
committed
Modified view models code to receive servings from users
KaiBaek
committed
Fix bugs in restrictions searching
Alan-Na
committed
Merge pull request #18 from Jerry-Zeng-UofT/xinengss.na
hanjum66
authored
Domain Layer for the Meal Planner
Haris Anjum
committed
Merge pull request #19 from Jerry-Zeng-UofT/hanjum6
KaiBaek
authored
Change in RecipeSearchEdamam.java, including the implementation of analyzeNutrition method that gets info from API. There are Some relative changes to interface and use case.

Jerry Zeng
authored and
Jerry Zeng
committed

Commits on Nov 18, 2024

Modified view models code to receive servings from users
KaiBaek
committed
Just to save the testing copy for the newest version
KaiBaek
committed
Merge remote-tracking branch 'origin/kai.baek' into kai.baek
KaiBaek
committed
NutritionAnalysisView.java

Jerry Zeng
authored and
Jerry Zeng
committed
Some minor changes

Jerry Zeng
authored and
Jerry Zeng
committed
Just to save the testing copy for the newest version
KaiBaek
committed
Delete useless comments
Alan-Na
committed
Interface Adapter for Meal Planning

Haris Anjum
authored and
Haris Anjum
committed
Implementing UI for the meal planner

Haris Anjum
authored and
Haris Anjum
committed
Updates

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #21 from Jerry-Zeng-UofT/hanjum6
hanjum66
authored
Changes in RecipeSearchController.java, RecipeAppBuilder.java, RecipeSearchPresenter.java and the RecipeSearchState.java.

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #23 from Jerry-Zeng-UofT/ABC
hanjum66
authored
Merge pull request #20 from Jerry-Zeng-UofT/xinengss.na
hanjum66
authored
Fixing remove recipe bug in the meal planner

Haris Anjum
authored and
Haris Anjum
committed
Defines the interface for recipe search functionality, including methods to search recipes by ingredients or restrictions and save recipes.
KaiBaek
committed
Implements recipe search using the Edamam API, supporting ingredient-based, restriction-based, and ID-based recipe queries
KaiBaek
committed
Provides the implementation of the RecipeSearch interface, integrating API calls with data processing and output handling.
KaiBaek
committed
Defines an interface for presenting search results, errors, and success messages to the user.
KaiBaek
committed
Implements a graphical user interface for recipe searching, displaying results, managing user inputs, and handling interactions.
KaiBaek
committed
Minor changes on MainRecipeApplication for the meal planning calendar
KaiBaek
committed
Merge pull request #25 from Jerry-Zeng-UofT/Meal_planning_calendar
Alan-Na
authored
Merge pull request #24 from Jerry-Zeng-UofT/hanjum6
Alan-Na
authored
Meal Planning Output Boundary

Haris Anjum
authored and
Haris Anjum
committed
Merge pull request #26 from Jerry-Zeng-UofT/hanjum6
Jerry-Zeng-UofT
authored

Commits on Nov 19, 2024

Use cases for meal planning

Haris Anjum
authored and
Haris Anjum
committed
Merge branch 'hanjum6' of https://github.com/Jerry-Zeng-UofT/Group-project-209

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #27 from Jerry-Zeng-UofT/hanjum6
Jerry-Zeng-UofT
authored
Fixed bugs realted to the Filter Frame View

Haris Anjum
authored and
Haris Anjum
committed
Merge branch 'hanjum6' of https://github.com/Jerry-Zeng-UofT/Group-project-209

Jerry Zeng
authored and
Jerry Zeng
committed
Merge branch 'main' into hanjum6
hanjum66
authored
Merge pull request #28 from Jerry-Zeng-UofT/hanjum6
Alan-Na
authored
Merge branch 'hanjum6' of https://github.com/Jerry-Zeng-UofT/Group-project-209

Jerry Zeng
authored and
Jerry Zeng
committed

Commits on Nov 21, 2024

Merge remote-tracking branch 'origin/main' into kai.baek
KaiBaek
committed

Commits on Nov 22, 2024

Commits on Nov 23, 2024

Completely rewrite of NutritionAnalysis user story base on the newest version of the app. Most files are finished except the RecipeSearchView.

Jerry Zeng
authored and
Jerry Zeng
committed

Commits on Nov 24, 2024

All files of Nutrition Analysis user story have been implemented. There is a problem of API POST. The app fails to get Nutrition info from the api.

Jerry Zeng
authored and
Jerry Zeng
committed
Problem solved with API, a few files Recipe Search related files have been changed.

Jerry Zeng
authored and
Jerry Zeng
committed
Bug fix and it successfully shows the result, whereas the result is messy.

Jerry Zeng
authored and
Jerry Zeng
committed
Updated version, result well displayed

Jerry Zeng
authored and
Jerry Zeng
committed
deletion of some unnecessary System.out.println statements (Those for finding bugs)

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #30 from Jerry-Zeng-UofT/Jerry.Zeng
KaiBaek
authored
Minor changes on RecipeSearchEdamam so that it can create ingredient entity properly, and made few cahnges on how the recipe results shows up on the screen removed the recipeforsearch entity and me…
KaiBaek
committed
Merge remote-tracking branch 'origin/testing_for_serving' into testing_for_serving
KaiBaek
committed

Commits on Nov 25, 2024

Commits on Nov 26, 2024

Commits on Nov 27, 2024

Updated meal planner implementation
Haris Anjum
committed
Minor changes to the recipe results panel
KaiBaek
committed
Updated meal planner
Haris Anjum
committed
changes in api
KaiBaek
committed
Merge pull request #36 from Jerry-Zeng-UofT/hanjum6
Alan-Na
authored
Merge pull request #37 from Jerry-Zeng-UofT/testing_for_serving
Alan-Na
authored
Tests for entities

Jerry Zeng
authored and
Jerry Zeng
committed
Minor changes

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #38 from Jerry-Zeng-UofT/Jerry.Zeng
Alan-Na
authored
Finish front page design
Alan-Na
committed
Merge pull request #39 from Jerry-Zeng-UofT/xinengss.na
hanjum66
authored

Commits on Nov 28, 2024

Commits on Nov 30, 2024

Commits on Dec 1, 2024

Commits on Dec 2, 2024

Refactoring and Fixing Checkstyle issues for the Meal Plan use case
Haris Anjum
committed
fixed checkstyle issues for serving adjust user story
KaiBaek
committed
Merge branch 'main' of https://github.com/Jerry-Zeng-UofT/Group-project-209 into Jerry.Zeng

Jerry Zeng
authored and
Jerry Zeng
committed
Test and some change change

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #52 from Jerry-Zeng-UofT/hanjum6
Alan-Na
authored
Merge pull request #51 from Jerry-Zeng-UofT/xinengss.na
Jerry-Zeng-UofT
authored
Merge pull request #53 from Jerry-Zeng-UofT/cde_ca
Jerry-Zeng-UofT
authored
Merge branch 'main' of https://github.com/Jerry-Zeng-UofT/Group-project-209 into Jerry.Zeng

Jerry Zeng
authored and
Jerry Zeng
committed
Refactoring, fix Checkstyle issues and code cleaning
Alan-Na
committed
Major Refactoring of MealPlanning View to fix Checkstyle Issues
Haris Anjum
committed
Merge pull request #54 from Jerry-Zeng-UofT/xinengss.na
hanjum66
authored
Merge pull request #55 from Jerry-Zeng-UofT/hanjum6
Alan-Na
authored
Fixing CheckStyle issues in all used entities and the nutrition analysis use case related files.

Jerry Zeng
authored and
Jerry Zeng
committed
fixed some issues with serving adjust user story
KaiBaek
committed
Working on Readme
KaiBaek
committed
Update LICENSE
KaiBaek
authored
Working on Readme
KaiBaek
committed

Commits on Dec 3, 2024

Finish recipe search test cases(100% coverage) and fix some issues
Alan-Na
committed
Merge pull request #56 from Jerry-Zeng-UofT/Jerry.Zeng
Alan-Na
authored
Merge pull request #58 from Jerry-Zeng-UofT/KaiBaek-patch-1
Jerry-Zeng-UofT
authored
Merge pull request #57 from Jerry-Zeng-UofT/kai.baek
Jerry-Zeng-UofT
authored
Fix issues
Alan-Na
committed
Working on Readme
KaiBaek
committed
Fix conflicts in constant
Alan-Na
committed
Working on Readme
KaiBaek
committed
Fix issues
Alan-Na
committed
Merge remote-tracking branch 'origin/kai.baek' into kai.baek
KaiBaek
committed
Deal with conflicts
Alan-Na
committed
Conflicts
Alan-Na
committed
COnflict again
Alan-Na
committed
Merge branch 'main' into xinengss.na
Alan-Na
authored
Merge pull request #60 from Jerry-Zeng-UofT/xinengss.na
Jerry-Zeng-UofT
authored
Move constants to ViewConstant
Alan-Na
committed
Added adjust serving interactor test case and due to that, i added junit dependency in pom.xml
KaiBaek
committed
1: Change of name of NutritionAnalysisImpl.java to NutritionAnalysisInteractor.java based on CA.

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #61 from Jerry-Zeng-UofT/xinengss.na
KaiBaek
authored
Fixed bugs with nutritional analysis when calling analyze over filtered out recipes.
KaiBaek
committed
Refactoring so Meal planning use case follows CA

Haris Anjum
authored and
Haris Anjum
committed
Merge pull request #62 from Jerry-Zeng-UofT/Jerry.Zeng
hanjum66
authored
Rename MealPlanning

Haris Anjum
authored and
Haris Anjum
committed
Changes in tests

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #64 from Jerry-Zeng-UofT/hanjum6
Alan-Na
authored
Merge branch 'main' of https://github.com/Jerry-Zeng-UofT/Group-project-209 into Jerry.Zeng

Jerry Zeng
authored and
Jerry Zeng
committed
Done Readme
KaiBaek
committed
Merge branch 'main' into kai.baek
KaiBaek
authored
Merge pull request #65 from Jerry-Zeng-UofT/kai.baek
Alan-Na
authored
Refactor to follow CA
Alan-Na
committed
Merge pull request #66 from Jerry-Zeng-UofT/xinengss.na
Jerry-Zeng-UofT
authored
working on refactoring
KaiBaek
committed
Finish test cases for restriction search
Alan-Na
committed
The accessibility-

Jerry Zeng
authored and
Jerry Zeng
committed
Merge branch 'main' of https://github.com/Jerry-Zeng-UofT/Group-project-209 into Jerry.Zeng

Jerry Zeng
authored and
Jerry Zeng
committed
Merge pull request #67 from Jerry-Zeng-UofT/xinengss.na
KaiBaek
authored
Merge branch 'main' of https://github.com/Jerry-Zeng-UofT/Group-project-209 into Jerry.Zeng

Jerry Zeng
authored and
Jerry Zeng
committed
change in test

Jerry Zeng
authored and
Jerry Zeng
committed
working on refactoring
KaiBaek
committed
Merge pull request #70 from Jerry-Zeng-UofT/kai.baek
Alan-Na
authored
Merge pull request #69 from Jerry-Zeng-UofT/Jerry.Zeng
Alan-Na
authored
Tests for meal planner
Haris Anjum
committed
Merge pull request #72 from Jerry-Zeng-UofT/hanjum6
Alan-Na
authored

Commits on Dec 4, 2024

Test Cases with full Coverage
Haris Anjum
committed