Merge branch 'master' into Feature/js-fixes-vic

Author: victormasson21

public/.DS_Store

@@ -2,31 +2,41 @@
 
 body {
   margin: 0;
-  font-family: 'Overlock', cursive;
-
+  font-family: 'Nobile', sans-serif;
+  font-size: 1em;
+  font-weight: bold;
 }
 
 .btn {
-  background-color:#814256;
+  font-family: 'Nobile', sans-serif;
+  cursor:pointer;
+  box-shadow: 1px 2px 4px rgba(0, 0, 0, .5);
+  background-color:#F26157;
   width: 10em;
-  height: 5em;
-  border-radius: 20%;
+  height: 3em;
+  border-radius: 1em;
   border-style: none;
   color: #F7F4F3;
+  font-size: 1em;
+  font-weight: bold;
+}
+
+.btn:hover{
+  transform:translateY(-3px);
 
 }
 
+
 .header {
-  margin-top:0;
+  font-family: "Nobile", sans-serif;
+  margin-top: 0;
   padding-top: 1em;
-  font-size: 3em;
+  font-size: 2.5em;
   font-weight: bold;
   text-align: center;
-
-
 }
 
-.background{
+.background {
   height: 20vh;
   background-image: url("../assets/food-background.jpeg");
   background-size: 100%;
@@ -38,25 +48,23 @@ body {
   grid-template-columns: repeat(6, 1fr);
   grid-template-rows: repeat(8, 1fr);
   height: 75vh;
-  background-color: #F7F4F3;
+  background-color: #f7f4f3;
   padding-bottom: 2em;
-
-
 }
 /* .onboarding__logo{
   grid-column: 2/span 4;
   grid-row: 1/span 1;
   width: 80%;
 } */
 
-.header__onboarding{
+.header__onboarding {
   grid-column: 3 / span 2;
   grid-row: 1 / span 1;
   justify-self: center;
   font-size: 2.5em;
 }
 
-.paragraph__onboarding__one{
+.paragraph__onboarding__one {
   justify-self: right;
   grid-column: 1 / span 2;
   grid-row: 2 / span 1;
@@ -67,22 +75,32 @@ body {
   grid-row: 4 / span 1;
 }
 
-.paragraph__onboarding__three{
+.paragraph__onboarding__three {
   grid-column: 3 / span 2;
   grid-row: 6 / span 1;
   justify-self: center;
 }
 
-
-.form__onboarding__form{
+.form__onboarding__form {
   display: flex;
-  justify-content: space-between;
+  justify-content: space-around;
   align-items: center;
   grid-column: 2 / span 4;
   grid-row: 8 / span 1;
 }
 
 
+.btn__onboarding__view-plans{
+  margin: 0.5em;
+  font-size: 0.8em;
+  width: 15em;
+}
+
+.btn__onboarding__new-plan{
+    margin: 0.5em;
+    font-size: 0.8em;
+    width: 15em;
+}
 
 /* all meal plans page */
 

public/assets/.DS_Store

@@ -1,9 +1,10 @@
 .meal-plan-container {
-   background-color: #D8D8D8;
+   background-color: #f2edeb;
+   box-shadow: 1px 2px 4px rgba(0, 0, 0, .5);
     display: flex;
     height: 18vh;
     margin: 1em;
-    border-radius: 10%;
+    border-radius: 1em;
     padding: 1em;
 
 }
@@ -23,10 +24,13 @@
 
 .btn__meal-plans__new-plan {
     width: 5em;
+    height: 3.5em;
     font-size: 1em;
     font-weight: bold;
-
 }
+/* .btn__back__new-plan{
+
+} */
 
 .meal-plan-container {
     display: flex;
@@ -40,14 +44,21 @@
     justify-content: space-around;
     flex-direction:row;
 }
-.paragraph__ meal-plan__days{
-    width:2em;
+.paragraph__meal-plan__days{
+    margin-top: 0.5em;
+
+    text-decoration: italic;
 }
 
  .header__meal-plan{
-
-    font-size: 2em;
+    /* font-size: 1.8em; */
     padding-right:1em;
     margin:0;
+}
 
+.link__meal-plan{
+  text-align: center;
+    text-decoration: none;
+    height: 2em;
+    width: 8em
 }

public/assets/heart.png

@@ -4,15 +4,17 @@
   grid-template-columns: repeat(6, 1fr);
   grid-template-rows: repeat(4, 1fr);
   margin: 2em;
-  border: solid black 2px;
-  border-radius: 20%;
+  background-color: #f2edeb;
+  box-shadow: 1px 2px 4px rgba(0, 0, 0, .5);
+  border-radius: 1em;
   padding-bottom: 1em;
+  padding-left: 1em;
 }
 
 .recipe-image__newplan{
   position: relative;
-  max-width: 100px;
-  border-radius: 20%;
+  max-width: 6em;
+  border-radius: 1em;
   grid-column: 1/span 2;
   grid-row: 2/span 2;
   align-self: center;
@@ -27,28 +29,56 @@
 }
 
 .recipe-time__newplan{
-  grid-column: 5/span 2;
+  grid-column: 6/span 1;
   grid-row: 2/span 2;
   align-self: center;
   justify-self: center;
+  font-size:1.5em;
 }
 
 .recipe-health__newplan{
-  grid-column: 3/ span 2;
+  grid-column: 4/ span 1;
   grid-row: 2/span 2;
   align-self: center;
   justify-self: center;
+  font-size:1.5em;
 }
 
 .btn__newplan-select{
   grid-column: 3/span 3;
   grid-row: 4/span 1;
-  width: 10em;
+  width: 8em;
+  height: 3em;
   align-self: center;
   justify-self: center;
 
 }
 
+.image__timer-icon{
+  max-width: 2em;
+  grid-column: 5/span 1;
+  grid-row: 2/span 2;
+  align-self: center;
+  justify-self: center;
+}
+.image__health-icon{
+  margin-left: 1em;
+  grid-column: 3/ span 1;
+  grid-row: 2/span 2;
+  max-width: 2em;
+  align-self: center;
+  justify-self: center;
+}
+
+.btn__back__new-plan{
+  height:3em;
+  width:8em;
+}
+
+.btn__next__new-plan{
+  height:3em;
+  width:8em;
+}
 .container__next-back-buttons{
   display: flex;
   justify-content: space-around;
@@ -57,5 +87,6 @@
 .form__newplan__load-more{
   display: flex;
   justify-content: center;
-  padding-top: 1em;
+  padding-top: 2em;
+  padding-bottom:2em;
 }

public/assets/stopwatch.png

@@ -1,18 +1,25 @@
+
+.container__newplan-additional-main{
+  background-color: white;
+}
 .container__pick-more-recipes{
   height: 30vh;
   display: grid;
   grid-template-columns: repeat(6, 1fr);
   grid-template-rows: repeat(4, 1fr);
   margin: 2em;
-  border: solid black 2px;
-  border-radius: 20%;
+  padding-left: 1em;
+  background-color: #f2edeb;
+  box-shadow: 1px 2px 4px rgba(0, 0, 0, .5);
+  border-radius: 1em;
   padding-bottom: 1em;
 }
 
+
 .recipe-image__additional-plan{
   position: relative;
-  max-width: 100px;
-  border-radius: 20%;
+  max-width: 6em;
+  border-radius: 1em;
   grid-column: 1/span 2;
   grid-row: 2/span 2;
   align-self: center;
@@ -43,23 +50,41 @@
 .recipe__select{
   grid-column: 3/span 3;
   grid-row: 4/span 1;
-  width: 10em;
+  width: 8em;
+  height: 3em;
   align-self: center;
   justify-self: center;
 
 }
 
 .second-choices__back-button{
-  display: flex;
-  justify-content: space-around;
+  margin: 1em;
+  height: 3em;
+  width:7em;
+
+}
+.second-choices__save-button{
+  margin:1em;
+  height: 3em;
+  width: 7em;
 }
 
+
 .second-choices__form{
   display: flex;
   justify-content: center;
-  padding-top: 1em;
+  flex-wrap: wrap;
+}
+
+.second-choices__name-plan{
+  width: 80%;
+  height:3.5em;
+  text-align: center;
+  border-radius: 1em;
+  box-shadow: 1px 2px 4px rgba(0, 0, 0, .5);
+
 }
 
 /* .second-choices__name-plan{
-  
+
 } */

public/css/home.css

@@ -113,10 +113,42 @@ exports.individualRecipe = (req, res) => {
 // route to make a db call for shopping list page
 
 exports.shoppingList = (req, res) => {
+  let ingredientsArray = [];
+  let ingredientsObject = {};
+  let uniqueIngredients = [];
+  let duplicateIngredients = [];
   queries
     .getShoppingList(req.params.id)
     .then(result => {
-      res.render("shoppingList", { ingredients: result.rows });
+      result.rows.forEach(e => {
+        ingredientsArray.push(e.ingredient_name);
+      });
+      return ingredientsArray;
+    })
+    .then(ingredientsArray => {
+      ingredientsArray.forEach(e => {
+        if (Object.keys(ingredientsObject).includes(e)) {
+          ingredientsObject[e] = true;
+        } else {
+          ingredientsObject[e] = false;
+        }
+      });
+      return ingredientsObject;
+    })
+    .then(ingredientsObject => {
+      Object.entries(ingredientsObject).forEach((e, i) => {
+        if (e.includes(true)) {
+          duplicateIngredients.push(e[0]);
+        } else {
+          uniqueIngredients.push(e[0]);
+        }
+      });
+    })
+    .then(ingredientsObject => {
+      res.render("shoppingList", {
+        uniqueIngredients: uniqueIngredients,
+        duplicateIngredients: duplicateIngredients
+      });
     })
     .catch(err => {
       res.render("error", {