From 740bf422e37aaedb76347c7796f22fa6ae6b5504 Mon Sep 17 00:00:00 2001 From: C1DeChand Date: Thu, 16 Apr 2020 21:55:32 -0700 Subject: [PATCH 1/4] test01 --- assets/script.js | 7 ------- assets/style.css | 3 --- index.html | 4 +--- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/assets/script.js b/assets/script.js index ababf79..6c0d046 100644 --- a/assets/script.js +++ b/assets/script.js @@ -100,7 +100,6 @@ function GetDrink(baseAlcohol) { $("#drinkImg").attr("src", response.drinks[DrinkRandom].strDrinkThumb); console.log(response.drinks[DrinkRandom].strDrinkThumb) $("#drinkTitle").text(response.drinks[DrinkRandom].strDrink); - }); } @@ -111,9 +110,3 @@ $(".button1").click(function() { $(this).siblings(`.button1[value=${otherButton}]`).css({'background':'transparent', 'color':'#808080'}); $(this).siblings(".answer").val(this.value); }); - - - }); - -} - diff --git a/assets/style.css b/assets/style.css index 3e159f2..0de54e9 100644 --- a/assets/style.css +++ b/assets/style.css @@ -1,13 +1,11 @@ @import url('https://fonts.googleapis.com/css?family=Codystar:300&display=swap'); body { - display: flex; justify-content: center; align-items: center; background: black; background-image: url('data:image/svg+xml,%3Csvg width="42" height="44" viewBox="0 0 42 44" xmlns="http://www.w3.org/2000/svg"%3E%3Cg id="Page-1" fill="none" fill-rule="evenodd"%3E%3Cg id="brick-wall" fill="%239C92AC" fill-opacity="0.4"%3E%3Cpath d="M0 0h42v44H0V0zm1 1h40v20H1V1zM0 23h20v20H0V23zm22 0h20v20H22V23z"/%3E%3C/g%3E%3C/g%3E%3C/svg%3E'); - } .neons { @@ -122,7 +120,6 @@ label { #nameTag { margin-left: 46rem; - } .button { diff --git a/index.html b/index.html index 5f74b1d..e5f91e3 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,3 @@ - @@ -59,7 +58,7 @@ - +

7. Do you sing in the shower?
@@ -75,7 +74,6 @@ -

From e14d36dabec1453611e6af058c753693abe22e55 Mon Sep 17 00:00:00 2001 From: C1DeChand Date: Fri, 17 Apr 2020 16:15:24 -0700 Subject: [PATCH 2/4] Added_drink_ingrediants_nullBug --- assets/script.js | 19 +++++++++++++++++++ assets/style.css | 7 +++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/assets/script.js b/assets/script.js index 6c0d046..7fa75dd 100644 --- a/assets/script.js +++ b/assets/script.js @@ -100,6 +100,25 @@ function GetDrink(baseAlcohol) { $("#drinkImg").attr("src", response.drinks[DrinkRandom].strDrinkThumb); console.log(response.drinks[DrinkRandom].strDrinkThumb) $("#drinkTitle").text(response.drinks[DrinkRandom].strDrink); + $(".cocktail-content").html("" + response.drinks[DrinkRandom].strIngredient1 + ": " + response.drinks[DrinkRandom].strMeasure1 + "
" + + response.drinks[DrinkRandom].strIngredient2 + ": " + response.drinks[DrinkRandom].strMeasure2 + "
" + + response.drinks[DrinkRandom].strIngredient3 + ": " + response.drinks[DrinkRandom].strMeasure3 + "
" + + response.drinks[DrinkRandom].strIngredient4 + ": " + response.drinks[DrinkRandom].strMeasure4 + "
" + + response.drinks[DrinkRandom].strIngredient5 + ": " + response.drinks[DrinkRandom].strMeasure5 + "
" + + response.drinks[DrinkRandom].strIngredient6 + ": " + response.drinks[DrinkRandom].strMeasure6 + "
" + + response.drinks[DrinkRandom].strIngredient7 + ": " + response.drinks[DrinkRandom].strMeasure7 + "
" + + response.drinks[DrinkRandom].strIngredient8 + ": " + response.drinks[DrinkRandom].strMeasure8 + "
" + + response.drinks[DrinkRandom].strIngredient9 + ": " + response.drinks[DrinkRandom].strMeasure9 + "
" + + response.drinks[DrinkRandom].strIngredient10 + ": " + response.drinks[DrinkRandom].strMeasure10 + "
" + + response.drinks[DrinkRandom].strIngredient11 + ": " + response.drinks[DrinkRandom].strMeasure11 + "
" + + response.drinks[DrinkRandom].strIngredient12 + ": " + response.drinks[DrinkRandom].strMeasure12 + "
" + + response.drinks[DrinkRandom].strIngredient13 + ": " + response.drinks[DrinkRandom].strMeasure13 + "
" + + response.drinks[DrinkRandom].strIngredient14 + ": " + response.drinks[DrinkRandom].strMeasure14 + "
" + + response.drinks[DrinkRandom].strIngredient15 + ": " + response.drinks[DrinkRandom].strMeasure15 + "
"); + if ($("

") !== null) { + } else { + $("

").addClass("hide") + } }); } diff --git a/assets/style.css b/assets/style.css index 0de54e9..16fe12a 100644 --- a/assets/style.css +++ b/assets/style.css @@ -48,8 +48,6 @@ main { } p { - font-size: 20px; - font-weight: bold; color: white; } @@ -67,6 +65,8 @@ label { .question { padding-left: 40px; + font-size: 20px; + font-weight: bold; } .center-cols > .col { @@ -100,6 +100,9 @@ label { .pumpkin { background-color: #e9724c; + font-size: 20px; + font-weight: bold; + color: white; } .darkRed { From ee665bbc816c35c6e856bb7656b4356c724150f3 Mon Sep 17 00:00:00 2001 From: C1DeChand Date: Fri, 17 Apr 2020 19:46:05 -0700 Subject: [PATCH 3/4] code_dump --- assets/CodeDump.txt | 54 +++++++++++++++++++++++++++++++++++++++++++++ assets/script.js | 23 +++---------------- index.html | 6 ++--- 3 files changed, 60 insertions(+), 23 deletions(-) create mode 100644 assets/CodeDump.txt diff --git a/assets/CodeDump.txt b/assets/CodeDump.txt new file mode 100644 index 0000000..90087fe --- /dev/null +++ b/assets/CodeDump.txt @@ -0,0 +1,54 @@ + /* $(".cocktail-content").html("" + + + response.drinks[DrinkRandom].strIngredient1 + ": " + response.drinks[DrinkRandom].strMeasure1 + "
" + + + response.drinks[DrinkRandom].strIngredient2 + ": " + response.drinks[DrinkRandom].strMeasure2 + "
" + + + response.drinks[DrinkRandom].strIngredient3 + ": " + response.drinks[DrinkRandom].strMeasure3 + "
" + + + response.drinks[DrinkRandom].strIngredient4 + ": " + response.drinks[DrinkRandom].strMeasure4 + "
" + + + response.drinks[DrinkRandom].strIngredient5 + ": " + response.drinks[DrinkRandom].strMeasure5 + "
" + + + response.drinks[DrinkRandom].strIngredient6 + ": " + response.drinks[DrinkRandom].strMeasure6 + "
" + + + response.drinks[DrinkRandom].strIngredient7 + ": " + response.drinks[DrinkRandom].strMeasure7 + "
" + + + response.drinks[DrinkRandom].strIngredient8 + ": " + response.drinks[DrinkRandom].strMeasure8 + "
" + + + response.drinks[DrinkRandom].strIngredient9 + ": " + response.drinks[DrinkRandom].strMeasure9 + "
" + + + response.drinks[DrinkRandom].strIngredient10 + ": " + response.drinks[DrinkRandom].strMeasure10 + "
" + + + response.drinks[DrinkRandom].strIngredient11 + ": " + response.drinks[DrinkRandom].strMeasure11 + "
" + + + response.drinks[DrinkRandom].strIngredient12 + ": " + response.drinks[DrinkRandom].strMeasure12 + "
" + + + response.drinks[DrinkRandom].strIngredient13 + ": " + response.drinks[DrinkRandom].strMeasure13 + "
" + + + response.drinks[DrinkRandom].strIngredient14 + ": " + response.drinks[DrinkRandom].strMeasure14 + "
" + + + response.drinks[DrinkRandom].strIngredient15 + ": " + response.drinks[DrinkRandom].strMeasure15 + "
" + + ); */ + + // if ($("

") !== null) { + // } else { + // $("

").addClass("hide") + // } + + + // for (i = 0 + 1; i < 15; i++) { + // console.log("string") + // if (response.drinks[DrinkRandom].strIngredient[i] !== null) { + // console.log(response.drinks[DrinkRandom].strIngredient[i]) + // } + // console.log(response.drinks[DrinkRandom].strIngredient1) + // if (response.drinks[DrinkRandom].strIngredient[i] === null) { + + // } + + // } + + + \ No newline at end of file diff --git a/assets/script.js b/assets/script.js index 7fa75dd..62f32f2 100644 --- a/assets/script.js +++ b/assets/script.js @@ -79,11 +79,11 @@ function fetchRecipes(ingredients) { } } return $.ajax(settings) + } function GetDrink(baseAlcohol) { console.log("Start Function GetDrink()") - //Cocktail API baseAlcohol = baseAlcohol ? baseAlcohol : chosenAlcohol; console.log(baseAlcohol) @@ -100,25 +100,8 @@ function GetDrink(baseAlcohol) { $("#drinkImg").attr("src", response.drinks[DrinkRandom].strDrinkThumb); console.log(response.drinks[DrinkRandom].strDrinkThumb) $("#drinkTitle").text(response.drinks[DrinkRandom].strDrink); - $(".cocktail-content").html("" + response.drinks[DrinkRandom].strIngredient1 + ": " + response.drinks[DrinkRandom].strMeasure1 + "
" - + response.drinks[DrinkRandom].strIngredient2 + ": " + response.drinks[DrinkRandom].strMeasure2 + "
" - + response.drinks[DrinkRandom].strIngredient3 + ": " + response.drinks[DrinkRandom].strMeasure3 + "
" - + response.drinks[DrinkRandom].strIngredient4 + ": " + response.drinks[DrinkRandom].strMeasure4 + "
" - + response.drinks[DrinkRandom].strIngredient5 + ": " + response.drinks[DrinkRandom].strMeasure5 + "
" - + response.drinks[DrinkRandom].strIngredient6 + ": " + response.drinks[DrinkRandom].strMeasure6 + "
" - + response.drinks[DrinkRandom].strIngredient7 + ": " + response.drinks[DrinkRandom].strMeasure7 + "
" - + response.drinks[DrinkRandom].strIngredient8 + ": " + response.drinks[DrinkRandom].strMeasure8 + "
" - + response.drinks[DrinkRandom].strIngredient9 + ": " + response.drinks[DrinkRandom].strMeasure9 + "
" - + response.drinks[DrinkRandom].strIngredient10 + ": " + response.drinks[DrinkRandom].strMeasure10 + "
" - + response.drinks[DrinkRandom].strIngredient11 + ": " + response.drinks[DrinkRandom].strMeasure11 + "
" - + response.drinks[DrinkRandom].strIngredient12 + ": " + response.drinks[DrinkRandom].strMeasure12 + "
" - + response.drinks[DrinkRandom].strIngredient13 + ": " + response.drinks[DrinkRandom].strMeasure13 + "
" - + response.drinks[DrinkRandom].strIngredient14 + ": " + response.drinks[DrinkRandom].strMeasure14 + "
" - + response.drinks[DrinkRandom].strIngredient15 + ": " + response.drinks[DrinkRandom].strMeasure15 + "
"); - if ($("

") !== null) { - } else { - $("

").addClass("hide") - } + var i = 1 + console.log(response.drinks[DrinkRandom]) }); } diff --git a/index.html b/index.html index e5f91e3..f0fb76b 100644 --- a/index.html +++ b/index.html @@ -30,14 +30,14 @@ - +

3. Do you like long walks on the beach?
- - + +

4. Do you dance in the car when no one is watching?
From 18606e80bd9fcc815888316bf9fe4e7cb6d3ae4a Mon Sep 17 00:00:00 2001 From: C1DeChand Date: Fri, 17 Apr 2020 20:16:26 -0700 Subject: [PATCH 4/4] MVP_Final --- assets/script.js | 36 ++++++++++---- assets/style.css | 10 ++-- index.html | 122 ++++++++++++++++++++++++++++------------------- 3 files changed, 103 insertions(+), 65 deletions(-) diff --git a/assets/script.js b/assets/script.js index 62f32f2..94a39c5 100644 --- a/assets/script.js +++ b/assets/script.js @@ -5,7 +5,7 @@ var foodArray = [] var beef = 0 var chicken = 0 var tofu = 0 -var fish = 0 +var salmon = 0 $("#resultsCalc").on("click", function () { @@ -16,8 +16,8 @@ $("#resultsCalc").on("click", function () { if (foodArray[i] === 'chicken') { chicken++; } - if (foodArray[i] === 'fish') { - fish++; + if (foodArray[i] === 'salmon') { + salmon++; } if (foodArray[i] === 'tofu') { tofu++; @@ -33,24 +33,25 @@ $("#resultsCalc").on("click", function () { $("#foodImg").attr("src", jsonResponse.results[foodRandom].thumbnail); $("#foodTitle").text(jsonResponse.results[foodRandom].title); $("#foodLink").text(jsonResponse.results[foodRandom].ingredients); + $(".recipe-content").html("Link to Recipe.") }) GetDrink() }) function winnerPick() { - if (beef > chicken && beef > fish && beef > tofu) { + if (beef > chicken && beef > salmon && beef > tofu) { chosenIngredient = "beef" chosenAlcohol = "tequila" } - else if (chicken > beef && chicken > fish && chicken > tofu) { + else if (chicken > beef && chicken > salmon && chicken > tofu) { chosenIngredient = "chicken" chosenAlcohol = "rum" } - else if (fish > chicken && fish > beef && fish > tofu) { - chosenIngredient = "fish" + else if (salmon > chicken && salmon > beef && salmon > tofu) { + chosenIngredient = "salmon" chosenAlcohol = "vodka" } - else if (tofu > chicken && tofu > beef && tofu > fish) { + else if (tofu > chicken && tofu > beef && tofu > salmon) { chosenIngredient = "tofu" chosenAlcohol = "gin" } @@ -84,6 +85,7 @@ function fetchRecipes(ingredients) { function GetDrink(baseAlcohol) { console.log("Start Function GetDrink()") + //Cocktail API baseAlcohol = baseAlcohol ? baseAlcohol : chosenAlcohol; console.log(baseAlcohol) @@ -100,8 +102,22 @@ function GetDrink(baseAlcohol) { $("#drinkImg").attr("src", response.drinks[DrinkRandom].strDrinkThumb); console.log(response.drinks[DrinkRandom].strDrinkThumb) $("#drinkTitle").text(response.drinks[DrinkRandom].strDrink); - var i = 1 - console.log(response.drinks[DrinkRandom]) + $(".cocktail-content").html("Top three Ingredients:
" + response.drinks[DrinkRandom].strIngredient1 + ": " + response.drinks[DrinkRandom].strMeasure1 + "
" + + response.drinks[DrinkRandom].strIngredient2 + ": " + response.drinks[DrinkRandom].strMeasure2 + "
" + + response.drinks[DrinkRandom].strIngredient3 + ": " + response.drinks[DrinkRandom].strMeasure3 + "
" + /* + response.drinks[DrinkRandom].strIngredient4 + ": " + response.drinks[DrinkRandom].strMeasure4 + "
" + + response.drinks[DrinkRandom].strIngredient5 + ": " + response.drinks[DrinkRandom].strMeasure5 + "
" + + response.drinks[DrinkRandom].strIngredient6 + ": " + response.drinks[DrinkRandom].strMeasure6 + "
" + + response.drinks[DrinkRandom].strIngredient7 + ": " + response.drinks[DrinkRandom].strMeasure7 + "
" + + response.drinks[DrinkRandom].strIngredient8 + ": " + response.drinks[DrinkRandom].strMeasure8 + "
" + + response.drinks[DrinkRandom].strIngredient9 + ": " + response.drinks[DrinkRandom].strMeasure9 + "
" + + response.drinks[DrinkRandom].strIngredient10 + ": " + response.drinks[DrinkRandom].strMeasure10 + "
" + + response.drinks[DrinkRandom].strIngredient11 + ": " + response.drinks[DrinkRandom].strMeasure11 + "
" + + response.drinks[DrinkRandom].strIngredient12 + ": " + response.drinks[DrinkRandom].strMeasure12 + "
" + + response.drinks[DrinkRandom].strIngredient13 + ": " + response.drinks[DrinkRandom].strMeasure13 + "
" + + response.drinks[DrinkRandom].strIngredient14 + ": " + response.drinks[DrinkRandom].strMeasure14 + "
" + + response.drinks[DrinkRandom].strIngredient15 + ": " + response.drinks[DrinkRandom].strMeasure15 + "
" */); + }); } diff --git a/assets/style.css b/assets/style.css index 16fe12a..46166d2 100644 --- a/assets/style.css +++ b/assets/style.css @@ -9,7 +9,6 @@ body { } .neons { - margin-top: 10rem; text-align: center; font-family: 'Codystar'; } @@ -28,7 +27,7 @@ body { color: #fff; text-shadow: 0 0 10px #00fff2, 0 0 20px #00fff2, 0 0 30px #00fff2, 0 0 40px #00fff2, 0 0 50px #00fff2, 0 0 60px #00fff2, 0 0 70px #00fff2, 0 0 90px #00fff2; } - + to { color: gray; text-shadow: 0 0 20px #00fff2, 0 0 30px #00fff2, 0 0 40px #00fff2, 0 0 50px #00fff2, 0 0 60px #00fff2, 0 0 70px #00fff2, 0 0 80px #00fff2, 0 1 90px #00fff2; @@ -60,13 +59,14 @@ hr { label { margin-left: 1.5rem; color: black; - + } .question { padding-left: 40px; font-size: 20px; font-weight: bold; + color: white; } .center-cols > .col { @@ -92,6 +92,7 @@ label { padding-left: 5rem; padding-right: 5rem; font-weight: bold; + border: 2px solid #e7e7e7; } .buttonRes:active { @@ -102,7 +103,6 @@ label { background-color: #e9724c; font-size: 20px; font-weight: bold; - color: white; } .darkRed { @@ -165,4 +165,4 @@ th { tr:nth-child(even) { background-color: #f2f2f2; -} \ No newline at end of file +} \ No newline at end of file diff --git a/index.html b/index.html index f0fb76b..2556c03 100644 --- a/index.html +++ b/index.html @@ -13,70 +13,97 @@

+
+
+

Welcome to Date Night Helper- the source of inspiration for your celebratory needs! Answer some questions + about your personality and we'll recommend a main dish and cocktail you can make for your special + occasion. Bon appetit!

+
+

1. Do you like to stay up late?
- - - + + +

2. Are you superstitious?
- - - + + +

3. Do you like long walks on the beach?
- - - + + +

4. Do you dance in the car when no one is watching?
- - - + + +

5. Do you know how to ride a bike?
- - - + + +

6. Have you sent a text to the wrong person?
- - - + + +

7. Do you sing in the shower?
- - - + + +

8. Do you eat all the free samples at Costco?
- - - + + +

+
+ +
-
+

-Julie's Awesome App-

@@ -86,39 +113,34 @@

-Julie's Awesome App-


-
-

- -

-

-