Permalink
Switch branches/tags
Nothing to show
Commits on Nov 11, 2016
  1. Updated README

    johanna08 committed Nov 11, 2016
  2. Created README

    johanna08 committed Nov 11, 2016
Commits on Oct 18, 2016
  1. fixed merge conflicts

    johanna08 johanna08
    johanna08 authored and johanna08 committed Oct 18, 2016
  2. recipe popup card mobile ready portrait mode

    johanna08 johanna08
    johanna08 authored and johanna08 committed Oct 18, 2016
  3. fixed grocery cost btn

    johanna08 johanna08
    johanna08 authored and johanna08 committed Oct 18, 2016
  4. about pic mobile friendly

    johanna08 johanna08
    johanna08 authored and johanna08 committed Oct 18, 2016
  5. home page pic mobile ready

    johanna08 johanna08
    johanna08 authored and johanna08 committed Oct 18, 2016
Commits on Oct 17, 2016
  1. fixed lingering merge conflict lines

    johanna08 johanna08
    johanna08 authored and johanna08 committed Oct 17, 2016
  2. fixed lingering merge conflict lines

    johanna08 johanna08
    johanna08 authored and johanna08 committed Oct 17, 2016
  3. removed merge conflict remarks

    johanna08 johanna08
    johanna08 authored and johanna08 committed Oct 17, 2016
  4. removed merge conflict remarks

    johanna08 johanna08
    johanna08 authored and johanna08 committed Oct 17, 2016
  5. Developer (#109)

    verasveras authored and johanna08 committed Oct 17, 2016
    * added my meals to nav bar (#60)
    
    * Mealsviews (#61)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * Meal plan model (#62)
    
    * created meal plan model with associations to user and recipes
    
    * created route to add a new meal plan
    
    * Created put route to mark current meal plan as complete and get brand new meal suggestions
    
    * Groceryviews (#63)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * grocery view skeleton done
    
    * Mainpage (#65)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * grocery view skeleton done
    
    * background img settings completed
    
    * added free shutterstock vid to home page
    
    * angular video background directive works
    
    * background vid for home page complete
    
    * home page bg image re-sized to zoom out
    
    * Mealsviewv2 (#66)
    
    * added col for chosen meals
    
    * user can add and delete groceries to my meals
    
    * user can add meals to grocery list and they are sent to the database
    
    * spending chart is a go
    
    * spending chart is a go (#69)
    
    * Navbarchange (#70)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * changed vh for meals page
    
    * made nav transparent on all pages
    
    * Grocery list (#71)
    
    * Created method on meal plan model to getGroceryList()
    
    * Added column to mealPlanModel that contains groceryList
    
    * Created route /users/:userid/meals/grocerylist to get a grocerylist
    
    * Created a ListFactory with method to getGroceryList
    
    * Hooked up back grocery list with front end
    
    * Grocery list is now divided by sections and is alphabetical
    
    * Savemeals (#72)
    
    * user can press a button to see a new set of meals
    
    * commit
    
    * updated refresh functionality
    
    * meals page doesn't bug out on refresh
    
    * fixed other pages with refresh problem
    
    * Sunburst foods (#73)
    
    * spending chart is a go
    
    * sunburst setup
    
    * sunburst and spending graphs are running
    
    * sunburst chart complete for one meal
    
    * reworking my account page layout
    
    * currency layout
    
    * Popuprecipe (#74)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * changed vh for meals page
    
    * recipe popup working, organizing layout
    
    * popup card layout for web done
    
    * updated color theme
    
    * updated background color
    
    * popupcard properly working and displaying correct info for chosen meal
    
    * Better meal ui (#75)
    
    * Developer (#47)
    
    * first 100 recipes seeded; recipe and ingredient routes defined
    
    * first ingredients seeded (#5)
    
    * Layoutandnav (#9)
    
    * 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
    
    * Origin/loginview (#10)
    
    * loginpage prettified
    
    * in progress
    
    * added oauth buttons to login page
    
    * removed seed file
    
    * added original seed
    
    * fixed login view height
    
    * expanded user db
    
    * wrote test for signup route
    
    * added link to signup state
    
    * signup state, template, controller, and method in authservice
    
    * added styling to signup view
    
    * added mixin to SCSS to make it dry
    
    * Db ingredients (#14)
    
    * first ingredients seeded
    
    * fixed db errors for ingredients and recipes
    
    * fixed linter error
    
    * Oauth (#16)
    
    * google oauth set
    
    * facebook oauth set
    
    * updated gitignore
    
    * Delete development.js
    
    * updated oauth keys
    
    * readding developmentjs file
    
    * Made chancges suggested by glebec (#17)
    
    * made changes suggested by glebec
    
    * Fixed async
    
    * Footer (#18)
    
    * 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)
    
    * extracted food aisles (#22)
    
    * Clean db (#23)
    
    * 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
    
    * Deleted useless file
    
    * Food categories (#26)
    
    * extracted food aisles
    
    * user prefs model complete
    
    * user prefs model updated
    
    * filter recipes by user prefs
    
    * associations added for user prefs
    
    * Meal planning1 (#27)
    
    * 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
    
    * Fixed some error handling (#28)
    
    * Food prefs (#29)
    
    * 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
    
    * Food categories (#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 package json dependency for linting as per glebecs sugg
    
    * Userprefmodel (#33)
    
    * 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 (#36)
    
    * Prefs (#37)
    
    * user prefs routes: create new, get one, update one
    
    * added general user routes
    
    * skeleton user pref view (#38)
    
    * Mealplanning2 (#34)
    
    * getMealsWithSimilarIngredients first version
    
    * Created tests for getMealsWithSimilarIngredients
    
    * Added some comments for geatMealsWithSmiliarIngredients
    
    * fixed signup route by changing state go (#39)
    
    * removed console log
    
    * prefs controller added
    
    * Ingredient routes (#41)
    
    * get ALL the ingredients (route)
    
    * removed extraneous code
    
    * getting all ingredients need to work on autocomplete
    
    * added skeleton view for meals page dates
    
    * renamed app to Dishd
    
    * Dislikes bar (#43)
    
    * removed console log
    
    * prefs controller added
    
    * getting all ingredients need to work on autocomplete
    
    * dislikes bar filters! :D
    
    * selected dislikes get added to preference object
    
    * dislike buttons added and deleted with user input
    
    * new user creates default userPref; user dislikes remembered on refresh; null dislike taken care of
    
    * numPeople and availableTime added to userPref model and hooked up to frontend
    
    * skeleton meals view
    
    * adding that x
    
    * removing pre tag
    
    * adapted meal view so user can only choose 5 meals
    
    * fixed some linter errors
    
    * alternate view if user has already selected a set of meals
    
    * increased height of meals section and moved title to the top
    
    * added md-list styling to selected meals list
    
    * fixed refresh bug on accounts page
    
    * Palette (#76)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * changed vh for meals page
    
    * recipe popup working, organizing layout
    
    * popup card layout for web done
    
    * updated color theme
    
    * updated background color
    
    * updated recipe card banner color
    
    * prefs page btns updated
    
    * updated prefs page btn icons
    
    * Not sure. (#78)
    
    * Headers (#81)
    
    * Developer (#47)
    
    * first 100 recipes seeded; recipe and ingredient routes defined
    
    * first ingredients seeded (#5)
    
    * Layoutandnav (#9)
    
    * 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
    
    * Origin/loginview (#10)
    
    * loginpage prettified
    
    * in progress
    
    * added oauth buttons to login page
    
    * removed seed file
    
    * added original seed
    
    * fixed login view height
    
    * expanded user db
    
    * wrote test for signup route
    
    * added link to signup state
    
    * signup state, template, controller, and method in authservice
    
    * added styling to signup view
    
    * added mixin to SCSS to make it dry
    
    * Db ingredients (#14)
    
    * first ingredients seeded
    
    * fixed db errors for ingredients and recipes
    
    * fixed linter error
    
    * Oauth (#16)
    
    * google oauth set
    
    * facebook oauth set
    
    * updated gitignore
    
    * Delete development.js
    
    * updated oauth keys
    
    * readding developmentjs file
    
    * Made chancges suggested by glebec (#17)
    
    * made changes suggested by glebec
    
    * Fixed async
    
    * Footer (#18)
    
    * 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)
    
    * extracted food aisles (#22)
    
    * Clean db (#23)
    
    * 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
    
    * Deleted useless file
    
    * Food categories (#26)
    
    * extracted food aisles
    
    * user prefs model complete
    
    * user prefs model updated
    
    * filter recipes by user prefs
    
    * associations added for user prefs
    
    * Meal planning1 (#27)
    
    * 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
    
    * Fixed some error handling (#28)
    
    * Food prefs (#29)
    
    * 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
    
    * Food categories (#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 package json dependency for linting as per glebecs sugg
    
    * Userprefmodel (#33)
    
    * 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 (#36)
    
    * Prefs (#37)
    
    * user prefs routes: create new, get one, update one
    
    * added general user routes
    
    * skeleton user pref view (#38)
    
    * Mealplanning2 (#34)
    
    * getMealsWithSimilarIngredients first version
    
    * Created tests for getMealsWithSimilarIngredients
    
    * Added some comments for geatMealsWithSmiliarIngredients
    
    * fixed signup route by changing state go (#39)
    
    * removed console log
    
    * prefs controller added
    
    * Ingredient routes (#41)
    
    * get ALL the ingredients (route)
    
    * removed extraneous code
    
    * getting all ingredients need to work on autocomplete
    
    * added skeleton view for meals page dates
    
    * renamed app to Dishd
    
    * Dislikes bar (#43)
    
    * removed console log
    
    * prefs controller added
    
    * getting all ingredients need to work on autocomplete
    
    * dislikes bar filters! :D
    
    * selected dislikes get added to preference object
    
    * dislike buttons added and deleted with user input
    
    * new user creates default userPref; user dislikes remembered on refresh; null dislike taken care of
    
    * numPeople and availableTime added to userPref model and hooked up to frontend
    
    * skeleton meals view
    
    * adding that x
    
    * removing pre tag
    
    * added page headings to nav bar
    
    * re-centered login form
    
    * moved dowlaod button on grocery list
    
    * added more styling to shopping list
    
    * refresh button styling
    
    * Logov2 (#82)
    
    * changed logo to white on home page
    
    * home page login and signup btns added
    
    * adjusted prefs page height size
    
    * updated meals page and prefs page
    
    * Overlap vis (#83)
    
    * Developer (#47)
    
    * first 100 recipes seeded; recipe and ingredient routes defined
    
    * first ingredients seeded (#5)
    
    * Layoutandnav (#9)
    
    * 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
    
    * Origin/loginview (#10)
    
    * loginpage prettified
    
    * in progress
    
    * added oauth buttons to login page
    
    * removed seed file
    
    * added original seed
    
    * fixed login view height
    
    * expanded user db
    
    * wrote test for signup route
    
    * added link to signup state
    
    * signup state, template, controller, and method in authservice
    
    * added styling to signup view
    
    * added mixin to SCSS to make it dry
    
    * Db ingredients (#14)
    
    * first ingredients seeded
    
    * fixed db errors for ingredients and recipes
    
    * fixed linter error
    
    * Oauth (#16)
    
    * google oauth set
    
    * facebook oauth set
    
    * updated gitignore
    
    * Delete development.js
    
    * updated oauth keys
    
    * readding developmentjs file
    
    * Made chancges suggested by glebec (#17)
    
    * made changes suggested by glebec
    
    * Fixed async
    
    * Footer (#18)
    
    * 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)
    
    * extracted food aisles (#22)
    
    * Clean db (#23)
    
    * 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
    
    * Deleted useless file
    
    * Food categories (#26)
    
    * extracted food aisles
    
    * user prefs model complete
    
    * user prefs model updated
    
    * filter recipes by user prefs
    
    * associations added for user prefs
    
    * Meal planning1 (#27)
    
    * 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
    
    * Fixed some error handling (#28)
    
    * Food prefs (#29)
    
    * 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
    
    * Food categories (#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 package json dependency for linting as per glebecs sugg
    
    * Userprefmodel (#33)
    
    * 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 (#36)
    
    * Prefs (#37)
    
    * user prefs routes: create new, get one, update one
    
    * added general user routes
    
    * skeleton user pref view (#38)
    
    * Mealplanning2 (#34)
    
    * getMealsWithSimilarIngredients first version
    
    * Created tests for getMealsWithSimilarIngredients
    
    * Added some comments for geatMealsWithSmiliarIngredients
    
    * fixed signup route by changing state go (#39)
    
    * removed console log
    
    * prefs controller added
    
    * Ingredient routes (#41)
    
    * get ALL the ingredients (route)
    
    * removed extraneous code
    
    * getting all ingredients need to work on autocomplete
    
    * added skeleton view for meals page dates
    
    * renamed app to Dishd
    
    * Dislikes bar (#43)
    
    * removed console log
    
    * prefs controller added
    
    * getting all ingredients need to work on autocomplete
    
    * dislikes bar filters! :D
    
    * selected dislikes get added to preference object
    
    * dislike buttons added and deleted with user input
    
    * new user creates default userPref; user dislikes remembered on refresh; null dislike taken care of
    
    * numPeople and availableTime added to userPref model and hooked up to frontend
    
    * skeleton meals view
    
    * adding that x
    
    * removing pre tag
    
    * spending chart is a go
    
    * moving bundle chart over
    
    * fixing eslint warnings and bundle diagram
    
    * updating karma file
    
    * re-styling my acct page
    
    * interpolate numPeople/availableTime preferences to live upload
    
    * changed my account layout
    
    * fixed the footer links -- DAMN YOU GLOBAL CSS! (#84)
    
    * changed pdfmake source to outside host (#85)
    
    * Myacctstyles (#87)
    
    * banner buttons aligned
    
    * charts resized for demo
    
    * my acct page layout done
    
    * prefs and login page re-route to meals (#88)
    
    * Clean db (#89)
    
    * New files for seeding
    
    * Almost ready to delete..
    
    * Able to filter through the json
    
    * Final json for db
    
    * Homepgbtns (#91)
    
    * working on home page hiding login and signup btns
    
    * minor change to HomeCtrl syntax
    
    * home page correctly hides btns for signup and login after user logs in
    
    * deleted console logs
    
    * Favorite routes (#92)
    
    * Developer (#90)
    
    * added my meals to nav bar (#60)
    
    * Mealsviews (#61)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * Meal plan model (#62)
    
    * created meal plan model with associations to user and recipes
    
    * created route to add a new meal plan
    
    * Created put route to mark current meal plan as complete and get brand new meal suggestions
    
    * Groceryviews (#63)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * grocery view skeleton done
    
    * Mainpage (#65)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * grocery view skeleton done
    
    * background img settings completed
    
    * added free shutterstock vid to home page
    
    * angular video background directive works
    
    * background vid for home page complete
    
    * home page bg image re-sized to zoom out
    
    * Mealsviewv2 (#66)
    
    * added col for chosen meals
    
    * user can add and delete groceries to my meals
    
    * user can add meals to grocery list and they are sent to the database
    
    * spending chart is a go
    
    * spending chart is a go (#69)
    
    * Navbarchange (#70)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * changed vh for meals page
    
    * made nav transparent on all pages
    
    * Grocery list (#71)
    
    * Created method on meal plan model to getGroceryList()
    
    * Added column to mealPlanModel that contains groceryList
    
    * Created route /users/:userid/meals/grocerylist to get a grocerylist
    
    * Created a ListFactory with method to getGroceryList
    
    * Hooked up back grocery list with front end
    
    * Grocery list is now divided by sections and is alphabetical
    
    * Savemeals (#72)
    
    * user can press a button to see a new set of meals
    
    * commit
    
    * updated refresh functionality
    
    * meals page doesn't bug out on refresh
    
    * fixed other pages with refresh problem
    
    * Sunburst foods (#73)
    
    * spending chart is a go
    
    * sunburst setup
    
    * sunburst and spending graphs are running
    
    * sunburst chart complete for one meal
    
    * reworking my account page layout
    
    * currency layout
    
    * Popuprecipe (#74)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * changed vh for meals page
    
    * recipe popup working, organizing layout
    
    * popup card layout for web done
    
    * updated color theme
    
    * updated background color
    
    * popupcard properly working and displaying correct info for chosen meal
    
    * Better meal ui (#75)
    
    * Developer (#47)
    
    * first 100 recipes seeded; recipe and ingredient routes defined
    
    * first ingredients seeded (#5)
    
    * Layoutandnav (#9)
    
    * 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
    
    * Origin/loginview (#10)
    
    * loginpage prettified
    
    * in progress
    
    * added oauth buttons to login page
    
    * removed seed file
    
    * added original seed
    
    * fixed login view height
    
    * expanded user db
    
    * wrote test for signup route
    
    * added link to signup state
    
    * signup state, template, controller, and method in authservice
    
    * added styling to signup view
    
    * added mixin to SCSS to make it dry
    
    * Db ingredients (#14)
    
    * first ingredients seeded
    
    * fixed db errors for ingredients and recipes
    
    * fixed linter error
    
    * Oauth (#16)
    
    * google oauth set
    
    * facebook oauth set
    
    * updated gitignore
    
    * Delete development.js
    
    * updated oauth keys
    
    * readding developmentjs file
    
    * Made chancges suggested by glebec (#17)
    
    * made changes suggested by glebec
    
    * Fixed async
    
    * Footer (#18)
    
    * 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)
    
    * extracted food aisles (#22)
    
    * Clean db (#23)
    
    * 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
    
    * Deleted useless file
    
    * Food categories (#26)
    
    * extracted food aisles
    
    * user prefs model complete
    
    * user prefs model updated
    
    * filter recipes by user prefs
    
    * associations added for user prefs
    
    * Meal planning1 (#27)
    
    * 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
    
    * Fixed some error handling (#28)
    
    * Food prefs (#29)
    
    * 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
    
    * Food categories (#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 package json dependency for linting as per glebecs sugg
    
    * Userprefmodel (#33)
    
    * 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 (#36)
    
    * Prefs (#37)
    
    * user prefs routes: create new, get one, update one
    
    * added general user routes
    
    * skeleton user pref view (#38)
    
    * Mealplanning2 (#34)
    
    * getMealsWithSimilarIngredients first version
    
    * Created tests for getMealsWithSimilarIngredients
    
    * Added some comments for geatMealsWithSmiliarIngredients
    
    * fixed signup route by changing state go (#39)
    
    * removed console log
    
    * prefs controller added
    
    * Ingredient routes (#41)
    
    * get ALL the ingredients (route)
    
    * removed extraneous code
    
    * getting all ingredients need to work on autocomplete
    
    * added skeleton view for meals page dates
    
    * renamed app to Dishd
    
    * Dislikes bar (#43)
    
    * removed console log
    
    * prefs controller added
    
    * getting all ingredients need to work on autocomplete
    
    * dislikes bar filters! :D
    
    * selected dislikes get added to preference object
    
    * dislike buttons added and deleted with user input
    
    * new user creates default userPref; user dislikes remembered on refresh; null dislike taken care of
    
    * numPeople and availableTime added to userPref model and hooked up to frontend
    
    * skeleton meals view
    
    * adding that x
    
    * removing pre tag
    
    * adapted meal view so user can only choose 5 meals
    
    * fixed some linter errors
    
    * alternate view if user has already selected a set of meals
    
    * increased height of meals section and moved title to the top
    
    * added md-list styling to selected meals list
    
    * fixed refresh bug on accounts page
    
    * Palette (#76)
    
    * made card image dynamic on resize
    
    * added btn to save meal plan
    
    * updated slick btn icon
    
    * changed title and card btn alignment
    
    * added material icons hosted new btn icons and link to recipe
    
    * trying to get a recipe pop up window working
    
    * dialog box opens no interpolation
    
    * changed vh for meals page
    
    * recipe popup working, organizing layout
    
    * popup card layout for web done
    
    * updated color theme
    
    * updated background color
    
    * updated recipe card banner color
    
    * prefs page btns updated
    
    * updated prefs page btn icons
    
    * Not sure. (#78)
    
    * Headers (#81)
    
    * Developer (#47)
    
    * first 100 recipes seeded; recipe and ingredient routes defined
    
    * first ingredients seeded (#5)
    
    * Layoutandnav (#9)
    
    * 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
    
    * Origin/loginview (#10)
    
    * loginpage prettified
    
    * in progress
    
    * added oauth buttons to login page
    
    * removed seed file
    
    * added original seed
    
    * fixed login view height
    
    * expanded user db
    
    * wrote test for signup route
    
    * added link to signup state
    
    * signup state, template, controller, and method in authservice
    
    * added styling to signup view
    
    * added mixin to SCSS to make it dry
    
    * Db ingredients (#14)
    
    * first ingredients seeded
    
    * fixed db errors for ingredients and recipes
    
    * fixed linter error
    
    * Oauth (#16)
    
    * google oauth set
    
    * facebook oauth set
    
    * updated gitignore
    
    * Delete development.js
    
    * updated oauth keys
    
    * readding developmentjs file
    
    * Made chancges suggested by glebec (#17)
    
    * made changes suggested by glebec
    
    * Fixed async
    
    * Footer (#18)
    
    * 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)
    
    * extracted food aisles (#22)
    
    * Clean db (#23)
    
    * 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
    
    * Deleted useless file
    
    * Food categories (#26)
    
    * extracted food aisles
    
    * user prefs model complete
    
    * user prefs model updated
    
    * filter recipes by user prefs
    
    * associations added for user prefs
    
    * Meal planning1 (#27)
    
    * 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
    
    * Fixed some error handling (#28)
    
    * Food prefs (#29)
    
    * 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
    
    * Food categories (#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 package json dependency for linting as per glebecs sugg
    
    * Userprefmodel (#33)
    
    * 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 (#36)
    
    * Prefs (#37)
    
    * user prefs routes: create new, get one, update one
    
    * added general user routes
    
    * skeleton user pref view (#38)
    
    * Mealplanning2 (#34)
    
    * getMealsWithSimilarIngredients first version
    
    * Created tests for getMealsWithSimilarIngredients
    
    * Added some comments for geatMealsWithSmiliarIngredients
    
    * fixed signup route by changing state go (#39)
    
    * removed console log
    
    * prefs controller added
    
    * Ingredient routes (#41)
    
    * get ALL the ingredients (route)
    
    * removed extraneous code
    
    * getting all ingredients need to work on autocomplete
    
    * added skeleton view for meals page dates
    
    * renamed app to Dishd
    
    * Dislikes bar (#43)
    
    * removed console log
    
    * prefs controller added
    
    * getting all ingredients need to work on autocomplete
    
    * dislikes bar filters! :D
    
    * selected dislikes get added to preference object
    
    * dislike buttons added and deleted with user input
    
    * new user creates default userPref; user dislikes remembered on refresh; null dislike taken care of
    
    * numPeople and availableTime added to userPref model and hooked up to frontend
    
    * skeleton meals view
    
    * adding that x
    
    * removing pre tag
    
    * added page headings to nav bar
    
    * re-centered login form
    
    * moved dowlaod button on grocery list
    
    * added more styling to shopping list
    
    * refresh button styling
    
    * Logov2 (#82)
    
    * changed logo to white on home page
    
    * home page login and signup btns added
    
    * adjusted prefs page height size
    
    * updated meals page and prefs page
    
    * Overlap vis (#83)
    
    * Developer (#47)
    
    * first 100 recipes seeded; recipe and ingredient routes defined
    
    * first ingredients seeded (#5)
    
    * Layoutandnav (#9)
    
    * 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
    
    * Origin/loginview (#10)
    
    * loginpage prettified
    
    * in progress
    
    * added oauth buttons to login page
    
    * removed seed file
    
    * added original seed
    
    * fixed login view height
    
    * expanded user db
    
    * wrote test for signup route
    
    * added link to signup state
    
    * signup state, template, controller, and method in authservice
    
    * added styling to signup view
    
    * added mixin to SCSS to make it dry
    
    * Db ingredients (#14)
    
    * first ingredients seeded
    
    * fixed db errors for ingredients and recipes
    
    * fixed linter error
    
    * Oauth (#16)
    
    * google oauth set
    
    * facebook oauth set
    
    * updated gitignore
    
    * Delete development.js
    
    * updated oauth keys
    
    * readding developmentjs file
    
    * Made chancges suggested by glebec (#17)
    
    * made changes suggested by glebec
    
    * Fixed async
    
    * Footer (#18)
    
    * 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)
    
    * extracted food aisles (#22)
    
    * Clean db (#23)
    
    * 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
    
    * Deleted useless file
    
    * Food categories (#26)
    
    * extracted food aisles
    
    * user prefs model complete
    
    * user prefs model updated
    
    * filter recipes by user prefs
    
    * associations added for user prefs
    
    * Meal planning1 (#27)
    
    * 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
    
    * Fixed some error handling (#28)
    
    * Food prefs (#29)
    
    * 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
    
    * Food categories (#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 package json dependency for linting as per glebecs sugg
    
    * Userprefmodel (#33)
    
    * 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 (#36)
    
    * Prefs (#37)
    
    * user prefs routes: create new, get one, update one
    
    * added general user routes
    
    * skeleton user pref view (#38)
    
    * Mealplanning2 (#34)
    
    * getMealsWithSimilarIngredients first version
    
    * Created tests for getMealsWithSimilarIngredients
    
    * Added some comments for geatMealsWithSmiliarIngredients
    
    * fixed signup route by changing state go (#39)
    
    * removed console log
    
    * prefs controller added
    
    * Ingredient routes (#41)
    
    * get ALL the ingredients (route)
    
    * removed extraneous code
    
    * getting all ingredients need to work on autocomplete
    
    * added skeleton view for meals page dates
    
    * renamed app to Dishd
    
    * Dislikes bar (#43)
    
    * removed console log
    
    * prefs controller added
    
    * getting all ingredients need to work on autocomplete
    
    * dislikes bar filters! :D
    
    * selected dislikes get added to preference object
    
    * dislike buttons added and deleted with user input
    
    * new user creates default userPref; user dislikes remembered on refresh; null dislike taken care of
    
    * numPeople and availableTime added to userPref model and hooked up to frontend
    
    * skeleton meals view
    
    * adding that x
    
    * removing pre tag
    
    * spending chart is a go
    
    * moving bundle chart over
    
    * fixing eslint warnings and bundle diagram
    
    * updating karma file
    
    * re-styling my acct page
    
    * interpolate numPeople/availableTime preferences to live upload
    
    * changed my account layout
    
    * fixed the footer links -- DAMN YOU GLOBAL CSS! (#84)
    
    * changed pdfmake source to outside host (#85)
    
    * Myacctstyles (#87)
    
    * banner buttons aligned
    
    * charts resized for demo
    
    * my acct page layout done
    
    * prefs and login page re-route to meals (#88)
    
    * Clean db (#89)
    
    * New files for seeding
    
    * Almost ready to delete..
    
    * Able to filter through the json
    
    * Final json for db
    
    * added favorites button and tooltip text
    
    * Added user/recipe association for favorites. Create route to view, add, and remove favorites.
    
    * Meal plans are sometimes seeded randomly, sometimes seeded with a favorite.
    
    * Favorites are functional in the backend.
    
    * Commiting pre merge
    
    * Created MealFactory Methods to add and remove favorites
    
    * fixed merge conflict
    
    * added a favorites state
    
    * added styling to favorites page
    
    * Aboutpg (#93)
    
    * layout and about page info done
    
    * about page layout updated and nav bar fixed to top on scroll and responsive
    
    * Navbarv2 (#94)
    
    * layout and about page info done
    
    * about page layout updated and nav bar fixed to top on scroll and responsive
    
    * navbar dotted border and fixed on scroll
    
    * New meal view (#95)
    
    * meals lookin pretty good
    
    * added some color
    
    * added in meals selected view
    
    * New grocery view (#96)
    
    * shopping list lookin pretty nice
    
    * added consistency amonsgt cards on different pages
    
    * added a cute lil loading circle
    
    * added meals back on right:
    
    * removed background color on meals sidebar
    
    * moved out refresh button
    
    * added scss variables
    
    * added alternate view for no groceries
    
    * Mobile (#97)
    
    * home login signup prefs pgs look good on mobile
    
    * most pages responsive
    
    * Connect graphs (#98)
    
    * hooked up spending and categories charts to advanced ui-router
    
    * category chart updates for active mealPlan
    
    * fixing abstract state ui-sref
    
    * refactored overlap chart js to controller
    
    * filtering overlap data to build d3 format
    
    * getting logic together for overlap d3 formatting
    
    * upper camelCasing input ingredients and recipes
    
    * overlap chart responds to active meal plans
    
    * working on window resize for spending vis
    
    * all charts are responsive
    
    * History page (#99)
    
    * Created state/factory/controller for new history page
    
    * Route to get detailed meal plan history
    
    * Changed history route so that it always gives you all the details possible
    
    * Skeleton view for seeing past meals
    
    * Almost totally styled history page.
    
    * More history page styles
    
    * Fixed an off by one error in seeding the mealplan
    
    * Bug fix (#100)
    
    * Fixed an off by one error in seeding the mealplan
    
    * Bug fixed in two places.
    
    * Mdcardresponsive (#101)
    
    * meals select slider looks good on mobile portrait
    
    * fixed prefs btns to center on mobile
    
    * spending vis hooked up to all-time data (#103)
    
    * meals fixed
    
    * Debugging (#104)
    
    * chart bugs fixed
    
    * figured out edge case problems
    
    * fixed meal card bug; added new route to use exclusively for vis
    
    * all charts show active mp data
    
    * working on dealing with no active mp
    
    * all active meal plans display on visualizations; edge cases for no active or past MPs taken care of
    
    * categories vis updates for active MP and all-time view changes
    
    * all-time data and viewChange enabled on overlap vis
    
    * spending vis displays chronologically
    
    * added home page bg poster pic for mobile view (#105)
    
    * Costbtn (#107)
    
    * added form dialog for entering grocery cost
    
    * need to work on getting grocery cost data
    
    * made grocery cost dialog popup correct hxw and all other dialog cards unaffected
    
    * cost button hooked up
    
    * made link on myacct page style
    
    * removed console logs
    
    * Card directive (#106)
    
    * basic directive skeleton
    
    * this thing is WORKING now lets make it responsive
    
    * added scss to cards
    
    * meal page functional with card directive
    
    * meal card directive in use everywhere meal cards are used
    
    * added watch function for automatic adjustments
    
    * minor adjustment to history page scss
    
    * Oauthlive (#108)
    
    * added form dialog for entering grocery cost
    
    * need to work on getting grocery cost data
    
    * made grocery cost dialog popup correct hxw and all other dialog cards unaffected
    
    * added oauth btns to signup page
    
    * oauth switched to live and properly displays name
    
    * Tests brought back in. (#102)
    
    * Fixed an off by one error in seeding the mealplan
    
    * Changed tests to use a testing database
    
    * Losts of tests up and runnning.
  6. Fixed merge conflicts

    verasveras committed Oct 17, 2016
  7. Tests brought back in. (#102)

    verasveras authored and johanna08 committed Oct 17, 2016
    * Fixed an off by one error in seeding the mealplan
    
    * Changed tests to use a testing database
    
    * Losts of tests up and runnning.
  8. Oauthlive (#108)

    johanna08 authored and verasveras committed Oct 17, 2016
    * added form dialog for entering grocery cost
    
    * need to work on getting grocery cost data
    
    * made grocery cost dialog popup correct hxw and all other dialog cards unaffected
    
    * added oauth btns to signup page
    
    * oauth switched to live and properly displays name
  9. Card directive (#106)

    galencorey authored and johanna08 committed Oct 17, 2016
    * basic directive skeleton
    
    * this thing is WORKING now lets make it responsive
    
    * added scss to cards
    
    * meal page functional with card directive
    
    * meal card directive in use everywhere meal cards are used
    
    * added watch function for automatic adjustments
    
    * minor adjustment to history page scss
  10. Costbtn (#107)

    johanna08 authored and dyoungsmith committed Oct 17, 2016
    * added form dialog for entering grocery cost
    
    * need to work on getting grocery cost data
    
    * made grocery cost dialog popup correct hxw and all other dialog cards unaffected
    
    * cost button hooked up
    
    * made link on myacct page style
    
    * removed console logs
  11. Debugging (#104)

    dyoungsmith authored and verasveras committed Oct 17, 2016
    * chart bugs fixed
    
    * figured out edge case problems
    
    * fixed meal card bug; added new route to use exclusively for vis
    
    * all charts show active mp data
    
    * working on dealing with no active mp
    
    * all active meal plans display on visualizations; edge cases for no active or past MPs taken care of
    
    * categories vis updates for active MP and all-time view changes
    
    * all-time data and viewChange enabled on overlap vis
    
    * spending vis displays chronologically
Commits on Oct 14, 2016
  1. meals fixed

    dyoungsmith committed Oct 14, 2016
  2. Mdcardresponsive (#101)

    johanna08 authored and galencorey committed Oct 14, 2016
    * meals select slider looks good on mobile portrait
    
    * fixed prefs btns to center on mobile
  3. Bug fix (#100)

    verasveras authored and johanna08 committed Oct 14, 2016
    * Fixed an off by one error in seeding the mealplan
    
    * Bug fixed in two places.
  4. History page (#99)

    verasveras authored and dyoungsmith committed Oct 14, 2016
    * Created state/factory/controller for new history page
    
    * Route to get detailed meal plan history
    
    * Changed history route so that it always gives you all the details possible
    
    * Skeleton view for seeing past meals
    
    * Almost totally styled history page.
    
    * More history page styles
  5. Connect graphs (#98)

    dyoungsmith authored and galencorey committed Oct 14, 2016
    * hooked up spending and categories charts to advanced ui-router
    
    * category chart updates for active mealPlan
    
    * fixing abstract state ui-sref
    
    * refactored overlap chart js to controller
    
    * filtering overlap data to build d3 format
    
    * getting logic together for overlap d3 formatting
    
    * upper camelCasing input ingredients and recipes
    
    * overlap chart responds to active meal plans
    
    * working on window resize for spending vis
    
    * all charts are responsive
  6. Mobile (#97)

    johanna08 authored and galencorey committed Oct 14, 2016
    * home login signup prefs pgs look good on mobile
    
    * most pages responsive
  7. New grocery view (#96)

    galencorey authored and johanna08 committed Oct 14, 2016
    * shopping list lookin pretty nice
    
    * added consistency amonsgt cards on different pages
    
    * added a cute lil loading circle
    
    * added meals back on right:
    
    * removed background color on meals sidebar
    
    * moved out refresh button
    
    * added scss variables
    
    * added alternate view for no groceries
Commits on Oct 13, 2016
  1. New meal view (#95)

    galencorey authored and verasveras committed Oct 13, 2016
    * meals lookin pretty good
    
    * added some color
    
    * added in meals selected view
  2. Navbarv2 (#94)

    johanna08 authored and galencorey committed Oct 13, 2016
    * layout and about page info done
    
    * about page layout updated and nav bar fixed to top on scroll and responsive
    
    * navbar dotted border and fixed on scroll