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.

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

Random recipes #45

Merged
merged 45 commits into from
Oct 6, 2016
Merged

Random recipes #45

merged 45 commits into from
Oct 6, 2016

Conversation

verasveras
Copy link
Collaborator

Commented out tests.

dyoungsmith and others added 30 commits September 29, 2016 16:20
* deleted rando greeting from home page and renamed logo

* logoupdated along with file names

* working on nav items

* navbar looks good working well

* removed navbar scss not needed

* fixed layout view added favicon
* loginpage prettified

* in progress

* added oauth buttons to login page

* removed seed file

* added original seed
* first ingredients seeded

* fixed db errors for ingredients and recipes
* google oauth set

* facebook oauth set

* updated gitignore

* Delete development.js

* updated oauth keys

* readding developmentjs file
* made changes suggested by glebec

* Fixed async
* deleted rando greeting from home page and renamed logo

* logoupdated along with file names

* working on nav items

* navbar looks good working well

* removed navbar scss not needed

* fixed home layout dimensions and added favicon

* updated package.json details

* updated logo size

* set fixed main page vh

* updated favicon

* navbar view complete

* prev commit footer view complete and navbar view now

* fixed signup view form

* signup login and oauth button views done

* about page view set

* developmentjs file keys

* changed verbiage for signup on login page

* updated logo size

* corrected user model to allow oauth (#19)
* added allownull falses to recipe database and changed seed file to allow these errors

* working on seed file

* worked on the seed file without improving it

* resolved unique validation errors
* extracted food aisles

* user prefs model complete

* user prefs model updated

* filter recipes by user prefs

* associations added for user prefs
* added allownull falses to recipe database and changed seed file to allow these errors

* working on seed file

* worked on the seed file without improving it

* started im

* Started...

* Minor changes... nbd

* added preliminary tests for recipe model

* working on tests

* added tests for getRelatedMeals
* revert favicon

* updated favicon for heroku

* submit button on sign up takes you to prefs page

* user prefs test running no tests passing

* user prefs tests debugging

* user prefs tests passing
johannaperez and others added 15 commits October 4, 2016 21:32
* extracted food aisles

* user prefs model complete

* user prefs model updated

* filter recipes by user prefs

* associations added for user prefs

* writing tests for user prefs

* user prefs routes

* working on user pref routes

* third time is the charm?
* updated nav bar to be hamburger menu for small device view

* cleaned up tests and instance method
* user prefs routes: create new, get one, update one

* added general user routes
* getMealsWithSimilarIngredients first version

* Created tests for getMealsWithSimilarIngredients

* Added some comments for geatMealsWithSmiliarIngredients
* get ALL the ingredients (route)

* removed extraneous code
@dyoungsmith dyoungsmith merged commit 10b2ed3 into master Oct 6, 2016
@dyoungsmith dyoungsmith deleted the randomRecipes branch October 6, 2016 20:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants