-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Feedback #1
Open
github-classroom
wants to merge
90
commits into
feedback
Choose a base branch
from
master
base: feedback
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feedback #1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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
…ameter during instantiation
95b7af2
to
6116cab
Compare
implement add/remove/show shopping cart APIs and inventory manager
M.abdelhamid
Johnathon login
… 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
👋! GitHub Classroom created this pull request as a place for your teacher to leave feedback on your work. It will update automatically. Don’t close or merge this pull request, unless you’re instructed to do so by your teacher.
In this pull request, your teacher can leave comments and feedback on your code. Click the Subscribe button to be notified if that happens.
Click the Files changed or Commits tab to see all of the changes pushed to
master
since the assignment started. Your teacher can see this too.Notes for teachers
Use this PR to leave feedback. Here are some tips:
master
since the assignment started. To leave comments on specific lines of code, put your cursor over a line of code and click the blue + (plus sign). To learn more about comments, read “Commenting on a pull request”.master
. Click a commit to see specific changes.For more information about this pull request, read “Leaving assignment feedback in GitHub”.
Subscribed: @yanisakham @coder-tim @abdelhamidm @jmartin4849