Fixed merge conflicts

browser/js/common/directives/navbar/navbar.js

@@ -49,4 +49,4 @@ app.directive('navbar', function ($rootScope, AuthService, AUTH_EVENTS, $state)
 
     };
 
-});
+});

browser/js/groceries/groceries.html

@@ -20,4 +20,4 @@ <h3> {{ section }} </h3>
             </div>
         </section>
     </div>
-</md-content>
+</md-content>

browser/js/groceries/groceries.js

@@ -142,4 +142,4 @@ app.factory('ListFactory', function($http) {
     }
 
     return ListFactory;
-});
+});

browser/js/home/home.html

@@ -18,4 +18,4 @@ <h1>get your dish'd on</h1>
             </section>
         </div>
     </div>
-</md-content>
+</md-content>

browser/js/home/home.js

@@ -15,7 +15,6 @@ app.config(function ($stateProvider) {
 app.controller('HomeCtrl', function ($scope, currentUser, $mdMedia) {
 
         $scope.user = currentUser;
-        // $scope.smallScreen = $mdMedia('xs');
         $scope.resources = [
             '*.ogv',
             'js/home/media/girls_cooking.mp4',

browser/js/login/login.html

@@ -22,4 +22,4 @@
             </div>
         </form>
     </div>
-</md-content>
+</md-content>

browser/js/meals/meals.html

@@ -67,4 +67,4 @@ <h2>
             </div>
         </section>
     </div>
-</md-content>
+</md-content>

browser/js/meals/meals.js

@@ -192,4 +192,4 @@ app.factory('MealFactory', function($http) {
     }
 
     return MealFactory;
-});
+});

browser/js/my-account/my-account.html

@@ -31,4 +31,4 @@
         </div>
 
     </div>
-</md-content>
+</md-content>

browser/js/my-account/my-account.js

@@ -70,15 +70,4 @@ app.factory('MemberInfoFactory', function($http){
             })
         }
     }
-});
-
-// app.factory('SecretStash', function ($http) {
-//     var getStash = function () {
-//         return $http.get('/api/members/secret-stash').then(function (response) {
-//             return response.data;
-//         });
-//     };
-//     return {
-//         getStash: getStash
-//     };
-// });
+});

browser/js/signup/signup.html

@@ -54,4 +54,4 @@
                 </div>
             </form>
         </div>
-</md-content>
+</md-content>

browser/js/visualizations/categories/categories-vis.js

@@ -30,4 +30,4 @@ app.controller('CategoriesCtrl', ($scope, $log, currentUser, mealPlans, VisFacto
 			duration: 250
 		}
 	};
-});
+});

browser/js/visualizations/overlap/overlap-imports.json

@@ -0,0 +1,43 @@
+[
+{"name":"meals.baked-falafel-burger.parsley","size":500,"imports":["meals.kofta-meatballs.parsely","meals.wild-rice-stuffing.parsely"]},
+{"name":"meals.baked-falafel-burger.sea-salt","size":500,"imports":["meals.kofta-meatballs.salt","meals.wild-rice-stuffing.sea-salt"]},
+{"name":"meals.baked-falafel-burger.cumin","size":500,"imports":["meals.kofta-meatballs.cumin"]},
+{"name":"meals.baked-falafel-burger.garlic","size":500,"imports":["meals.wild-rice-stuffing.garlic"]},
+{"name":"meals.baked-falafel-burger.lemon","size":500,"imports":["meals.kofta-meatballs.lemon-juice"]},
+{"name":"meals.baked-falafel-burger.chickpeas","size":500,"imports":[]},
+{"name":"meals.baked-falafel-burger.chili-garlic-sauce","size":500,"imports":[]},
+{"name":"meals.baked-falafel-burger.oat-flour","size":500,"imports":[]},
+{"name":"meals.baked-falafel-burger.tomato","size":500,"imports":[]},
+{"name":"meals.baked-falafel-burger.greens","size":500,"imports":[]},
+{"name":"meals.baked-falafel-burger.hummus","size":500,"imports":[]},
+{"name":"meals.kofta-meatballs.parsely","size":500,"imports":["meals.baked-falafel-burger.parsley","meals.wild-rice-stuffing.parsely"]},
+{"name":"meals.kofta-meatballs.salt","size":500,"imports":["meals.baked-falafel-burger.sea-salt","meals.wild-rice-stuffing.sea-salt"]},
+{"name":"meals.kofta-meatballs.cumin","size":500,"imports":["meals.baked-falafel-burger.cumin"]},
+{"name":"meals.kofta-meatballs.lemon-juice","size":500,"imports":["meals.baked-falafel-burger.lemon"]},
+{"name":"meals.kofta-meatballs.cinnamon","size":500,"imports":["meals.wild-rice-stuffing.cinnamon"]},
+{"name":"meals.kofta-meatballs.dried-cherries","size":500,"imports":["meals.wild-rice-stuffing.dried-cranberries"]},
+{"name":"meals.kofta-meatballs.allspice","size":500,"imports":[]},
+{"name":"meals.kofta-meatballs.fresh-mint","size":500,"imports":[]},
+{"name":"meals.kofta-meatballs.cloves","size":500,"imports":[]},
+{"name":"meals.kofta-meatballs.ground-lamb","size":500,"imports":[]},
+{"name":"meals.kofta-meatballs.honey","size":500,"imports":[]},
+{"name":"meals.kofta-meatballs.olive-oil","size":500,"imports":[]},
+{"name":"meals.kofta-meatballs.pepper","size":500,"imports":[]},
+{"name":"meals.kofta-meatballs.shallot","size":500,"imports":[]},
+{"name":"meals.kofta-meatballs.sparkling-water","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.parsely","size":500,"imports":["meals.baked-falafel-burger.parsley","meals.kofta-meatballs.parsely"]},
+{"name":"meals.wild-rice-stuffing.sea-salt","size":500,"imports":["meals.kofta-meatballs.salt","meals.baked-falafel-burger.sea-salt"]},
+{"name":"meals.wild-rice-stuffing.garlic","size":500,"imports":["meals.baked-falafel-burger.garlic"]},
+{"name":"meals.wild-rice-stuffing.cinnamon","size":500,"imports":["meals.kofta-meatballs.cinnamon"]},
+{"name":"meals.wild-rice-stuffing.dried-cranberries","size":500,"imports":["meals.kofta-meatballs.dried-cherries"]},
+{"name":"meals.wild-rice-stuffing.bosc-pear","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.butternut-squash","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.celery","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.coconut-oil","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.dried-oregano","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.dry-white-wine","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.orange-zest","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.pecans","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.wild-rice","size":500,"imports":[]},
+{"name":"meals.wild-rice-stuffing.yellow-onion","size":500,"imports":[]}
+]

browser/js/visualizations/spending/spending-vis.js

@@ -58,4 +58,4 @@ app.controller('SpendingCtrl', ($scope, $log, currentUser, mealPlans, VisFactory
 			},
 		};
 	}
-});
+});

browser/scss/groceries/groceries.scss

@@ -30,4 +30,4 @@
 #cost {
         display: flex;
         align-items: center;
-    }
+    }

browser/scss/home/main.scss

@@ -7,9 +7,12 @@
     width: 100vw;
     height: 90vh;
     navbar {
+<<<<<<< HEAD
         position: fixed;
         top: 0;
         z-index: 100;
+=======
+>>>>>>> master
         h1 {
             color: white;
         }
@@ -28,7 +31,11 @@
         .link {
             color: #FDFDFD;
             cursor: pointer;
+<<<<<<< HEAD
             border-bottom: $theme-border;
+=======
+            border-bottom: 1px dotted #9a9a9a;
+>>>>>>> master
             font-size: 16px;
         }
     }

browser/scss/main.scss

@@ -1,5 +1,9 @@
 * {
+<<<<<<< HEAD
     box-sizing: border-box;
+=======
+  box-sizing: border-box;
+>>>>>>> master
 }
 
 @mixin clearfix {
@@ -20,6 +24,7 @@ a {
 }
 
 #main {
+<<<<<<< HEAD
     display: flex;
     height: 100vh;
     md-content {
@@ -32,6 +37,16 @@ a {
             border-bottom: 1px dotted grey;
         }
     }
+=======
+  display: flex;
+  height: 100vh;
+  md-content {
+    background-color: #F7F7F7;
+    // button .rectangle {
+    //   background-color: #FEE778
+    // }
+  }
+>>>>>>> master
 }
 
 @import 'directives/main';
@@ -45,6 +60,9 @@ a {
 @import 'my-account/my-account';
 @import 'groceries/groceries';
 @import 'recipe/recipe.scss';
+<<<<<<< HEAD
 @import 'favorites/main.scss';
 @import 'history/history.scss';
 @import 'card/card.scss';
+=======
+>>>>>>> master

browser/scss/meals/main.scss

@@ -23,14 +23,6 @@
         padding-top: 30vh;
         color: $theme-yellow;
     }
-    // .meal-list {
-    //     md-card-actions {
-    //         background-color: $theme-yellow;
-    //         margin-left: 7vw;
-    //         border: $theme-border;
-    //         border-radius: 2px;
-    //     }
-    // }
     .title {
         justify-content: center;
     }
@@ -48,17 +40,6 @@
             width: 100vw;
             height: 100vh;
         }
-        // md-card-actions {
-        //     background-color: $theme-yellow;
-        //     @media all and (min-width: 600px) {
-        //         margin-left: 5vw;
-        //     }
-        //     @media all and (max-width: 599px) {
-        //         margin-left: 40vw;
-        //     }
-        //     border: $theme-border;
-        //     border-radius: 2px;
-        // }
         .btn {
             display: flex;
             align-self: center;
@@ -132,4 +113,4 @@
     .s {
         padding-left: 5px;
     }
-}
+}

browser/scss/my-account/my-account.scss

@@ -69,4 +69,4 @@
     .link--target {
         stroke: $theme-yellow;
     }
-}
+}

browser/scss/user-prefs/main.scss

@@ -38,4 +38,4 @@
         justify-content: center;
         max-width: 80vw;
     }
-}
+}

server/app/routes/user/meal-routes.js

@@ -1,4 +1,3 @@
-
 const db = require('../../../db');
 const Recipe = db.model('recipe');
 const User = db.model('user');

server/db-setup/api-responses10.json

@@ -16816,4 +16816,4 @@
       "instructions": "Preheat oven to 325FPlace 8 custard cups or small mason jars (the 4 oz size) in a large panHeat the cream and the milk to just under a simmer, bubbles will form around the edge of the potBlend the peanut butter into the cream mixture with a blender, set asideBeat the egg yolks at high speed while adding the sugar and brown sugar slowlyBeat until the yolk mixture is lemon colored and loses any graininess from the sugarAdd vanillaSlowly add the warm cream mixture, stirring constantlyAdd the custard mixture evenly to the cupsFill the pan with hot water until it comes halfway up the sides of the custard cupsCover the pan tightly with foilBake until set, about 30 minutes, center will remain jigglyRemove from oven and allow to sit for 20 minutesRemove from pan and cover the custard cups tightly (mason jars work great for this because of the screw on lids)Refrigerate overnight or for 6 hoursJust before serving sprinkle about 1 tbs brown sugar over the top of each custard and flame it until it melts and bubbles - don't let it burn"
     }
   ]
-}
+}

server/db-setup/api-responses11.json

@@ -16703,4 +16703,4 @@
       "instructions": "Prepare the orecchiette in salted water per instructions. Drain reserving 1/4 cup of cooking liquid.While the pasta is cooking, heat a teaspoon of olive oil in a large skillet over medium heat. Add the grape tomatoes and chopped asparagus; cook, stirring often, for 3-4 minutes. Add the remaining olive oil to the pan then add the minced garlic and crushed red pepper flakes. Cook, stirring constantly, for 1 minute. Add the orecchiette along with the spinach, pine nuts, and some reserved liquid if needed. Season well with sea salt and freshly cracked pepper, to taste; toss to coat evenly. Pour into a serving bowl and serve with Parmesan cheese. Enjoy."
     }
   ]
-}
+}