-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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
- Loading branch information
1 parent
10b2ed3
commit 15d2975
Showing
19 changed files
with
424 additions
and
241 deletions.
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| <md-content flex> | ||
| <div id="meals"> | ||
| <h1>Your Personalized Menu</h1> | ||
| <section layout="row"> | ||
| <!-- these buttons need to dynamically ng-repeat and give correct day --> | ||
| <div class="days"> | ||
| <md-button class="md-fab">today</md-button> | ||
| <md-button class="md-fab">fri</md-button> | ||
| <md-button class="md-fab">sat</md-button> | ||
| <md-button class="md-fab">sun</md-button> | ||
| <md-button class="md-fab">mon</md-button> | ||
| <md-button class="md-fab">tues</md-button> | ||
| <md-button class="md-fab">wed</md-button> | ||
| </div> | ||
| </section> | ||
| <section layout="row" flex> | ||
| <div class="meal"> | ||
| <md-button class="md-fab" ng-click="slickConfig.method.slickPrev()"> | ||
| <</md-button> | ||
| <slick slides-to-show=1> | ||
| <md-card> | ||
| <md-card-content layout="row" layout-align="space-between"> | ||
| <div class="md-media-xl card-media" style="background: url(https://lighterphotos-production.s3.amazonaws.com/uploads/recipe/image/1519/SuperSeedSalad6773.jpg) no-repeat center;"> | ||
| </div> | ||
| <div class="recipe" layout="column"> | ||
| <md-card-title> | ||
| <md-card-title-text> | ||
| <span class="md-headline">Recipe Title</span> | ||
| </md-card-title-text> | ||
| </md-card-title> | ||
| <md-card-actions layout="row"> | ||
| <md-button class="md-icon-button" aria-label="Favorite"> | ||
| <ng-md-icon icon="favorite"></ng-md-icon> | ||
| </md-button> | ||
| <md-button class="md-icon-button" aria-label="Settings"> | ||
| <ng-md-icon icon="shopping_basket"></ng-md-icon> | ||
| </md-button> | ||
| <md-button class="md-icon-button" aria-label="Share"> | ||
| <ng-md-icon icon="dehaze"></ng-md-icon> | ||
| </md-button> | ||
| </md-card-actions> | ||
| </div> | ||
| </md-card-content> | ||
| </md-card> | ||
| </slick> | ||
| <md-button class="md-fab" ng-click="slickConfig.method.slickNext()">></md-button> | ||
| </div> | ||
| </section> | ||
| <section> | ||
| </section> | ||
| </div> | ||
| </md-content> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| app.config(function ($stateProvider) { | ||
|
|
||
| $stateProvider.state('meals', { | ||
| url: '/meals', | ||
| templateUrl: 'js/meals/meals.html', | ||
| }); | ||
| }); | ||
|
|
||
| app.controller('Meals', function($scope){ | ||
| $scope.slickConfig = { | ||
| method: { | ||
| slickPrev: () => { | ||
| console.log('previous recipe suggestion') | ||
| }, | ||
| slickNext: () => { | ||
| console.log('next recipe suggestion') | ||
| } | ||
|
|
||
| } | ||
| } | ||
| }); |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| <md-content flex> | ||
| <h1>My Account</h1> | ||
| <md-button>Edit Preferences</md-button> | ||
| <md-button ui-sref="meals">My Meals</md-button> | ||
| <md-button ui-sref="prefs">Edit Preferences</md-button> | ||
| </md-content> |
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,76 @@ | ||
| app.config(function ($stateProvider){ | ||
| $stateProvider.state('prefs', { | ||
| url: '/preferences', | ||
| templateUrl: 'js/user-prefs/user-prefs.html' | ||
| url: '/users/:userId/preferences', | ||
| templateUrl: 'js/user-prefs/user-prefs.html', | ||
| controller: 'PrefsCtrl' | ||
| }); | ||
| }); | ||
|
|
||
| app.controller('PrefsCtrl', function ($scope, $log, $state, PrefsFactory, $stateParams) { | ||
|
|
||
| PrefsFactory.getInitialPrefs($stateParams.userId) | ||
| .then(prefs => { | ||
| $scope.myPrefs = prefs; | ||
| }) | ||
| .catch($log.error); | ||
|
|
||
|
|
||
| PrefsFactory.getAllIngredients() | ||
| .then(ings => { | ||
| $scope.allIngs = ings; | ||
| }) | ||
| .catch($log.error); | ||
|
|
||
|
|
||
| $scope.queryFilter = query => { | ||
| if (query) { | ||
| return $scope.allIngs.filter(ing => { | ||
| return ing.name.includes(query) | ||
| }); | ||
| } | ||
| else { | ||
| return $scope.allIngs; | ||
| } | ||
| }; | ||
|
|
||
| $scope.addDislikes = selectedItem => { | ||
| if (selectedItem !== null) $scope.myPrefs.dislikes.push(selectedItem); | ||
| $scope.searchText = ''; // reset search bar | ||
| }; | ||
|
|
||
| $scope.removeDislike = itemToDelete => { | ||
| $scope.myPrefs.dislikes.splice($scope.myPrefs.dislikes.indexOf(itemToDelete), 1); | ||
| }; | ||
|
|
||
| $scope.savePrefs = () => { | ||
| return PrefsFactory.savePrefs($stateParams.userId, $scope.myPrefs); | ||
| }; | ||
| }); | ||
|
|
||
|
|
||
| app.factory('PrefsFactory', function($http, $log){ | ||
|
|
||
| const sendResponse = response => { | ||
| return response.data; | ||
| } | ||
|
|
||
| let obj = { | ||
| getInitialPrefs: userId => { | ||
| return $http.get(`/api/users/${userId}/preferences`) | ||
| .then(sendResponse); | ||
| }, | ||
|
|
||
| getAllIngredients: () => { | ||
| return $http.get('/api/ingredients') | ||
| .then(sendResponse); | ||
| }, | ||
|
|
||
| savePrefs: (userId, prefsObj) => { | ||
| return $http.put(`/api/users/${userId}/preferences`, prefsObj) | ||
| .then(sendResponse) | ||
| .catch($log.error); | ||
| } | ||
| } | ||
|
|
||
| return obj; | ||
| }) |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,3 +32,4 @@ a { | |
| @import 'login/main'; | ||
| @import 'signup/main'; | ||
| @import 'user-prefs/main'; | ||
| @import 'meals/main'; | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| #meals { | ||
| display: flex; | ||
| align-items: center; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| width: 100vw; | ||
| height: 85vh; | ||
| .meal { | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| } | ||
| .days { | ||
| align-items: center; | ||
| justify-content: center; | ||
| } | ||
| md-card { | ||
| height: 55vh; | ||
| width: 60vw; | ||
| md-card-content .md-media-xl { | ||
| height: 50vh; | ||
| width: 40vw; | ||
| } | ||
| .recipe { | ||
| width: 18vw !important | ||
| } | ||
| // md-card-title: { | ||
| // width: 18vw !important | ||
| // } | ||
| } | ||
| } | ||
|
|
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
Oops, something went wrong.