…20Fall/project1-webapp-group6-importteamname-1 into tim-starter-code-setup

Generated front-end and back-end starter code using WebTemplateStudio

Cpp 30 - Set up RDS and table schemas

…tation needed

…ameter during instantiation

implement add/remove/show shopping cart APIs and inventory manager

M.abdelhamid

Changed src folder name to client

…ucture

fix client folder and add container and pages folders

Added unit tests for api/show_users endpoint

Add to, remove from and show shopping list (CCP-14, CCP-15)

* fix lint errors and add recipe personalization manager

* fix flask-cors import

* t :q

* fix flask-cors import and start script

* update start script

* reverse npm and yarn sequence in scripts

* remove yarn commands

* remove install-requirements

* remove yarn

* add concurrently dependency

* typo in start script

* add python requirements to start script

* remove dev-dependency

* pip install python requirements

* fix start script

* move requirements out of server

* remove python requirements install from start script

* fix requirements format

* specify port

* add procfile

* fix procfile

* only deploy frontned

* add backend

* separate front/backend scripts

* remove proxy

* modify procfile

* debug prints

* add gunicorn requirement

* add buildpack

* fix python path

* remove proxy

* add debug prints

* fix syntax in print

* temporarily remove 500 for user_id

* clean up repo

* linting, standardize backend url

* remove print statement

…cipe-detail

Added recipe_id as a path parameter for the route /RecipeDetail

…OST/GET/DELETE recipes and ingredients (#13)

* Added recipe scraper and refactored recipe model class and recipe_ingredient model class

* Fixed byte encoding bug related to recipe ID

* Refactored api/add_recipe to get data from POST request body

* Added endpoint for deleting all recipes from the DB

* Fixed issue related to populating DB and getting 400 response

* Fixed issue related to recipe_id being hexadecimal

* Moved recipe scraper endpoints to constants.py

* Removed empty function

* Return number of recipes deleted in the DB

* Changed recipe_image to image_url

* Changed data type of nutrition-related fields to float

* Fixed JSON decode error in recipe_scraper.py

* Clean up constants.py and added BASE_URL for spoonacular API

* Changed data type for recipe instructions from String() to Text()

* Modified recipe_id in model classes for Yanisa to debug

* Fixed recipe_id deserialization problem

* Added endpoints for adding and retrieving ingredients from the database

* Fixed recipe_id variable name

* Added methods for retrieving ingredients from Spoonacular API

* Finished code for scraping/populating recipes and ingredients tables

* Added docstring

* Cleaned up recipe_info_object creation inside recipe controller

* Moved request.get_json() statement from recipe_controller.py to server.py

* Moved request.get_json() statement from ingredients_controller.py to server.py

* Fixed typo in recipe_scraper.py

* Make calls to Recipe table and RecipeIngredient table directly inside scraper, instead of making HTTP calls to server.py

* Added endpoint for deleting all ingredients from RecipeIngredient table

* Construct ingredient_object in a cleaner way

…igrations

Tim yanisa recipe table migrations

…s page and Recipe Detail page (#15)

* Initial implementation for recipe search results page + RecipeCard

* Fixed routing issue

* Fixed issue related to scrolling

* Added recipe search results page and recipe details page

* Switched locations of the 2 UI columns on recipe detail page

* add user rating, recipe cart and favs list

* remove random variable

* remove debugging comments

…d RecipeDetail (#19)

* Use useEffect() to call redux action and fetch recipes from backend

* Redux mapStateToProps working for both RecipeSearchResults and RecipeDetail

* RecipeDetail page can now render data for specific recipes

* Added props to RecipeDetailPage child components so they could render recipe data

* Added PropType checks for eslint

* Removed commented out code

* Implemented fetch ingredients in RecipeDetail page

* Added endpoint for GET ingredient by recipe_id

* Fix ingredients component for RecipeDetail

* Refactored GET ingredients by recipe_id to perform filter_by.().all()

* Render recipe ingredients without any error

* Save redux states to localStorage so that data doesnt get lost on page refresh

* Fix constants

* Fix URLs in constant.js caused earlier from resolving conflicts

* Removed debugging statements

* Changed string.concat to format strings

* Changed axios calls to fetch calls

* Added servings in Ingredients

* Made code look cleaner

Johnathon login

…ites list (#23)

… servings, timeToCook (#21)

* Added buttons to sort recipes by preparation time ascending and descending

* Refactored PropTypes checks

* Make useStyles code cleaner by reusing common code

* Finished feature for sorting recipes by TimeToCook, Calories, Servings ascending/descending

* Implemented button to clear sort filter

* Initialize sortedRecipes at the start of the function

* Made code cleaner and added some comments

* Changed if-else statement to ternary statement

* fix cookie session info, add user notes component

* fix routing to Add Ingredients

* Added styling for ingredients and nutrition facts panels

* Added styling to recipe photo and recipe instructions panel

* Added icons for recipe instructions

* Changed background color for RecipeSearchResult and RecipeDetail

* Changed NavBar color

* Added more styling to footer

* Adjusted padding and width of RecipeDetail page cards

* Resolve eslint errors

* Added temporary color for NavBar text (NavBar will be completed replaced later)

…lt page (#26)

* Created card components for recipe search results

* Finished styling recipe search results. Cant rate recipe on search results page

* Minor style changes

* Added pagination for recipe search results

* De-coupled RecipeCard styling

* Removed skeleton app endpoints and example endpoints

* Fixed bug related to recipes not sorting properly

* Modified pagination onChange() into an inline function

#28)

* Fixed some styling issues on the page after re-populating our DB with Spoonacular recipes

* Changed footer color to black

…serActions to recipe card and moved link to within recipe cart (#31)

Johnathon pantry search

* Changed location of Pantry button on the NavBar

* Added Redux and connected Pantry to RecipeSearchResult page

* Fixed routing issue on Pantry page by using <Link> for routing instead of href

* Fixed another routing issue

* Added some text for better user experience and fixed typo

* Prevent user from logging out after clicking the top left icon

* Added more styling

* Fixed routing issue related to Profile page

* Removed gear icon from NavBar since its not being used

* Fixed margin issues in RecipeCart and FavouriteRecipes

* Attempt to fix pagination issue

* Fixed height and margin issues for RecipeCard

* More style fixes for RecipeCard

* Uncomment eslint

* Further attempt in debugging pagination rendering issue

…#35)

* Refactored sort recipe feature into a drop-down menu

* Fixed eslint error and bug related to sort ascending/descending

* Added text to display recipe count in search results

* Fixed styling issues for sort

* Fixed race condition issue between React Router <Link> and fetch() call promise

* Removed commented out code

* Refactored nav bar for better aesthetics and mobile support

* Fixed typo

* Fixed input form text overflow

* Removed nutrition tracker from Nav menu

* Removed divider line

* Uncomment eslint

* Remove unused import

* fix small frontend bugs and start separating out the routes

* move routes to separate files based on method, clean up utils

* remove unused endpoints and commented out code

* fix small frontend bugs and start separating out the routes

* move routes to separate files based on method, clean up utils

* remove unused endpoints and commented out code

* frontend cleanup

* remove unused constants

* Added unit tests for backend

* Removed add_recipe_test

* Fixed unit test errors

* Added more test cases

* Added ci config file

* Update ci.yml

* Added unit tests for backend

* Removed add_recipe_test

* Fixed unit test errors

* Added backend unit tests

* Fix indentation

Co-authored-by: Tim Fei <[email protected]>
Co-authored-by: Mohamed Abdelhamid <[email protected]>

* Added header comments to all frontend files

* Added header comments for backend files

* Added header comments to routes files

* Fixed typo in header comments

* Added comments to frontend files

* Removed periods from some header comments

* fix flask-cors import

* t :q

* fix flask-cors import and start script

* update start script

* reverse npm and yarn sequence in scripts

* remove yarn commands

* remove install-requirements

* remove yarn

* add concurrently dependency

* typo in start script

* add python requirements to start script

* remove dev-dependency

* pip install python requirements

* fix start script

* move requirements out of server

* remove python requirements install from start script

* fix requirements format

* specify port

* add procfile

* fix procfile

* only deploy frontned

* add backend

* separate front/backend scripts

* remove proxy

* modify procfile

* debug prints

* add gunicorn requirement

* add buildpack

* fix python path

* remove proxy

* add debug prints

* fix syntax in print

* temporarily remove 500 for user_id

* clean up repo

* linting, standardize backend url

* remove print statement

* remove yarn lock

* resolve merge conflicts

* add cors headers

* specify support credentials

* cors on deletes

* cors debugging

* cors debugging

* cors

* cors

* cors

* cors'

* cors

* remove cors

* remove cors

* revert package json

* fix typo

* remove comments

Co-authored-by: Tim <[email protected]>

* fix flask-cors import

* t :q

* fix flask-cors import and start script

* update start script

* reverse npm and yarn sequence in scripts

* remove yarn commands

* remove install-requirements

* remove yarn

* add concurrently dependency

* typo in start script

* add python requirements to start script

* remove dev-dependency

* pip install python requirements

* fix start script

* move requirements out of server

* remove python requirements install from start script

* fix requirements format

* specify port

* add procfile

* fix procfile

* only deploy frontned

* add backend

* separate front/backend scripts

* remove proxy

* modify procfile

* debug prints

* add gunicorn requirement

* add buildpack

* fix python path

* remove proxy

* add debug prints

* fix syntax in print

* temporarily remove 500 for user_id

* clean up repo

* linting, standardize backend url

* remove print statement

* remove yarn lock

* resolve merge conflicts

* add cors headers

* specify support credentials

* cors on deletes

* cors debugging

* cors debugging

* cors

* cors

* cors

* cors'

* cors

* remove cors

* remove cors

* revert package json

* fix typo

* remove comments

* Fixed unit tests after deployment code changes

Co-authored-by: yanisakham <[email protected]>

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md