Skip to content
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

Image to recipe #46

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open

Image to recipe #46

wants to merge 54 commits into from

Conversation

siddiquizayaan
Copy link

@siddiquizayaan siddiquizayaan commented Oct 31, 2024 •
edited
Loading

Image upload/url option added

anurgj and others added 30 commits October 23, 2024 23:45
@anurgj
Added landing page with Get Started button
24bc60a
Replace existing .env with sample.env file
6c3a53b
@robbiethomas1101
Merge pull request #10 from SE-Fall24-RZA/dotenv-fix
9cc4344 
Remove sensitive .env file from repo
Added function to rate existing recipes in database
ae58525
Tests now use correct cluster
aec0859
Created api route for rating existing recipes
7220766
added unit test for new rating system
c010e88
Replaced displayed numeric rating with star ratings
70fa6e6
Added button to rate existing recipes from frontend
714525d
@robbiethomas1101
Merge pull request #15 from SE-Fall24-RZA/rating-system
bc1924d 
Rating system
Added initialization for test data prior to tests being run
8bc6070
@robbiethomas1101
Merge pull request #16 from SE-Fall24-RZA/test-improvements
7f41146 
Added initialization for test data prior to backend tests being run
Created API route to add a recipe to the meal plan
da03335
Created API route to get the meal plan for a user
abb89e0
@anurgj
Made UI Changes, need to fix Remove Bookmark
dc85e7d
Fixed errors with removing and adding bookmarks
ffdfd66
Test for removing recipe from meal plan
f171481
@robbiethomas1101
Merge branch 'group31-fall24' into meal-plan
147daa6
@robbiethomas1101
Merge pull request #18 from SE-Fall24-RZA/meal-plan
6cb7f7b 
Implemented Meal Plan backend
Fixed error from resolving merge conflict
6270d38
@anurgj
Updated Login/Signup forms
f8d9814
Updated getMealPlan to return full recipes instead of just ids
f871ecd
Created basic meal plan ui page
8e34c41
@anurgj
Merge pull request #19 from SE-Fall24-RZA/new-login-form
3b425fc 
Updated Login/Signup forms
Refined meal plan UI page
28243cd
Added ability to add/remove recipes from meal plan on frontend
f5d59a2
@robbiethomas1101
Merge branch 'group31-fall24' into meal-plan-ui
ef1e40e
@siddiquizayaan
Updated AddRecipe.js to accomodate uploading image
91d9c8f
@robbiethomas1101
Merge pull request #20 from SE-Fall24-RZA/meal-plan-ui
b566679 
Meal Plan UI
Added workflow to run backend tests on push
6f79c40
rtthoma3 and others added 24 commits October 29, 2024 15:23
Modifications to jest environment for workflow
3e3830b
Update testing workflow
50a5f01
Added babel to support jest testing
a98956a
Adjustments to babel config
4b1095f
More babel adjustments
a027d6c
Adjustments to setup for tests
8c3be27
Adjustments to input data in test setup
37b2bad
Cleaned up testing workflow and testing seup
73df3e4
Configured tests to run on PR opening, and stopped old coverage workflow
401df41
@robbiethomas1101
Merge pull request #21 from SE-Fall24-RZA/testing-workflows
9dcec0a 
Workflow for backend tests
Fixed bug making meal plan disappear
54cd524
@robbiethomas1101
Merge pull request #25 from SE-Fall24-RZA/meal-plan-bug
cbd12d9 
Fixed bug making meal plan disappear
Enabled code coverage for backend tests
71a6b9a
Added more tests for user api routes
2afc18e
Added more bookmarks tests
e7a43e8
Added more recipes backend tests
e4089e0
Added remove bookmark tests
731ce5c
Added test for ingredient list
6eddaf6
Updated existing backendTests workflow
5bee88b
Added a workflow to run the tests and collect coverage information
5f7f101
Removed unneeded console.log calls to reduce terminal clutter
0dee34b
@robbiethomas1101
Merge pull request #29 from SE-Fall24-RZA/backend-testing
d155eda 
Improvements to backend testing
@siddiquizayaan
Update AddRecipe.js accepting both image url/upload
0074123
@siddiquizayaan
Trying to integrate with backend
c6fc007
@robbiethomas1101 robbiethomas1101 deleted the image_to_recipe branch November 2, 2024 03:23
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.
3 participants
@siddiquizayaan @anurgj @robbiethomas1101