From 38d0f180e38cee1dd64da966e3c55c7c0424243d Mon Sep 17 00:00:00 2001 From: Tatiane Komrij Date: Thu, 4 Jul 2019 14:10:46 +0200 Subject: [PATCH 1/2] done --- starter-code/.DS_Store | Bin 0 -> 6148 bytes starter-code/index.html | 31 ++++++++------ starter-code/pizza.css | 15 ++++++- starter-code/pizza.js | 92 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 14 deletions(-) create mode 100644 starter-code/.DS_Store diff --git a/starter-code/.DS_Store b/starter-code/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..82c604234df5008b3937552bd1b8e571d371bb7e GIT binary patch literal 6148 zcmeHKyG{c!5S)b+2NXo2p>#(mKnkLxIYptM<_91N5<~|9LL{K_@9>o{>ow@^ay3F| zH(Jly-m%Xk#SZ{7TFr()A3#A@6b(8|n>)KUa&nI-X^dAK;}$QtN7XUVUu@EE-^Lvt zFvAUM-+xgprju$hVZVxVMjw18V+8DCjwh_hdBz)#aKe=j>8JELmM!*2i@k+M&iT&Y zHS?!fwi&WV#zAeqqQO|3K_c@HYx%6YxdN_$E8q&a0-Xx*%vLLQ483#(Tme_$M*-a* z0$s7p7!A|b!6H2YhX6N`Jr9(5VVPBQ7eRt!vBE xvo_GL=xUl5HJ~wWTmo3pePlm%T7S@(d1c0EsH13mq7(fhkOc9<75D`Oz5wc)Ls|d; literal 0 HcmV?d00001 diff --git a/starter-code/index.html b/starter-code/index.html index 189a3311..b7beffed 100755 --- a/starter-code/index.html +++ b/starter-code/index.html @@ -17,7 +17,7 @@

Pizza Builder

  • - +
  • @@ -26,10 +26,10 @@

    Pizza Builder

  • - +
  • - +
@@ -40,19 +40,20 @@

Pizza Builder

Your pizza's price

$10 cheese pizza -
    -
  • $1 pepperonni
    • -
  • $1 mushrooms
    • -
  • $1 green peppers
    • -
  • $3 white sauce
    • -
  • $5 gluten-free crust
    • +
      +
    • $1 pepperonni
      • +
    • $1 mushrooms
      • +
    • $1 green peppers
      • +
    • $3 white sauce
      • +
    • $5 gluten-free crust
    - $21 + $13
    +
    @@ -74,7 +75,8 @@

    Your pizza's price

    - +
    +
    1
    @@ -234,7 +236,9 @@

    Your pizza's price

    31
    +
    +
    1
    2
    3
    @@ -267,10 +271,11 @@

    Your pizza's price

    30
    31
    33
    - -
    +
    +
    +
    diff --git a/starter-code/pizza.css b/starter-code/pizza.css index 2d125b3d..b83cc96f 100755 --- a/starter-code/pizza.css +++ b/starter-code/pizza.css @@ -229,7 +229,7 @@ p.description { box-shadow: none; } -.btn-sauce { +.btn-sauce2 { background: #fff4aa; box-shadow: 0 6px #998500; color: #555; @@ -335,6 +335,14 @@ p.description { box-shadow: inset 0 0 40px #d3c3bb; } +.white { + display: none; +} + +.gluten { + display: none; +} + .sauce { position: absolute; width: 620px; @@ -349,6 +357,10 @@ p.description { background: #fff4aa; } +.sauce-red { + background: #dd2f25; +} + .cheese { position: absolute; width: 600px; @@ -369,6 +381,7 @@ p.description { transform: rotate(12deg) translate(-4px, -600px); } + .pep { position: absolute; width: 80px; diff --git a/starter-code/pizza.js b/starter-code/pizza.js index b473d048..35ef16b7 100755 --- a/starter-code/pizza.js +++ b/starter-code/pizza.js @@ -1 +1,93 @@ // Write your Pizza Builder JavaScript in this file. + +$(document).ready(function () { + + //all options + $(".btn-pepperonni").click(function() { + $(".roni").fadeToggle() + }); + + $(".btn-mushrooms").click(function() { + $(".shroom").fadeToggle() + }); + + $(".btn-green-peppers").click(function() { + $(".bell-pepper").fadeToggle() + }); + + $(".btn-sauce").click(function(){ + $(".sauce-red").fadeToggle() + }); + + $(".btn-crust").click(function(){ + $(".crust").toggleClass("crust-gluten-free") + }); + + $(".btn-pepperonni").click(function(){ + $(".btn-pepperonni").toggleClass("active") + }); + + $(".btn-mushrooms").click(function(){ + $(".btn-mushrooms").toggleClass("active") + }); + + $(".btn-green-peppers").click(function(){ + $(".btn-green-peppers").toggleClass("active") + }); + +//extras put on + $(".btn-sauce").click(function(){ + $(".white").toggle("white") + }); + + $(".btn-crust").click(function(){ + $(".gluten").toggle("gluten") + }); + + //major toppings go away + $(".btn-pepperonni").click(function() { + $("#toni").toggle("toni") + }); + + $(".btn-mushrooms").click(function() { + $("#oms").fadeToggle("oms") + }); + + $(".btn-green-peppers").click(function() { + $("#ers").fadeToggle("ers") + }); + + //change price + + $(".btn-pepperonni").click(function() { + let top1 = parseFloat(document.getElementById("top1").innerHTML) + let prices = parseFloat(document.getElementById("prices").innerHTML) + let price = prices - top1 + document.getElementById("prices").innerHTML = price + }); + $(".btn-mushrooms").click(function() { + let top2 = parseFloat(document.getElementById("top2").innerHTML) + let prices = parseFloat(document.getElementById("prices").innerHTML) + let price = prices - top2 + document.getElementById("prices").innerHTML = price + }); + $(".btn-green-peppers").click(function() { + let top3 = parseFloat(document.getElementById("top3").innerHTML) + let prices = parseFloat(document.getElementById("prices").innerHTML) + let price = prices - top3 + document.getElementById("prices").innerHTML = price + }); + $(".btn-sauce").click(function() { + let top4 = parseFloat(document.getElementById("top4").innerHTML) + let prices = parseFloat(document.getElementById("prices").innerHTML) + let price = prices + top4 + document.getElementById("prices").innerHTML = price + }); + $(".btn-crust").click(function() { + let top5 = parseFloat(document.getElementById("top5").innerHTML) + let prices = parseFloat(document.getElementById("prices").innerHTML) + let price = prices + top5 + document.getElementById("prices").innerHTML = price + }); +}); + From 077e27a60d2d3ede7761e686f220e90c22621754 Mon Sep 17 00:00:00 2001 From: Tatiane Komrij Date: Thu, 4 Jul 2019 14:55:35 +0200 Subject: [PATCH 2/2] done --- starter-code/pizza.js | 46 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/starter-code/pizza.js b/starter-code/pizza.js index 35ef16b7..814854a7 100755 --- a/starter-code/pizza.js +++ b/starter-code/pizza.js @@ -23,9 +23,9 @@ $(document).ready(function () { $(".crust").toggleClass("crust-gluten-free") }); - $(".btn-pepperonni").click(function(){ - $(".btn-pepperonni").toggleClass("active") - }); + // $(".btn-pepperonni").click(function(){ + // $(".btn-pepperonni").toggleClass("active") + // }); $(".btn-mushrooms").click(function(){ $(".btn-mushrooms").toggleClass("active") @@ -60,33 +60,63 @@ $(document).ready(function () { //change price $(".btn-pepperonni").click(function() { + + $(".btn-pepperonni").toggleClass("active") let top1 = parseFloat(document.getElementById("top1").innerHTML) let prices = parseFloat(document.getElementById("prices").innerHTML) - let price = prices - top1 + let price + if ($(".btn-pepperonni").hasClass("active")) { + price = prices + top1 + } else { + price = prices - top1 + } document.getElementById("prices").innerHTML = price }); + $(".btn-mushrooms").click(function() { let top2 = parseFloat(document.getElementById("top2").innerHTML) let prices = parseFloat(document.getElementById("prices").innerHTML) - let price = prices - top2 + let price + if ($(".btn-mushrooms").hasClass("active")) { + price = prices + top2 + } else { + price = prices - top2 + } document.getElementById("prices").innerHTML = price }); + $(".btn-green-peppers").click(function() { let top3 = parseFloat(document.getElementById("top3").innerHTML) let prices = parseFloat(document.getElementById("prices").innerHTML) - let price = prices - top3 + let price + if ($(".btn-green-peppers").hasClass("active")) { + price = prices + top3 + } else { + price = prices - top3 + } document.getElementById("prices").innerHTML = price }); + $(".btn-sauce").click(function() { let top4 = parseFloat(document.getElementById("top4").innerHTML) let prices = parseFloat(document.getElementById("prices").innerHTML) - let price = prices + top4 + let price + if ($(".btn-sauce").hasClass("active")) { + price = prices + top4 + } else { + price = prices - top4 + } document.getElementById("prices").innerHTML = price }); $(".btn-crust").click(function() { let top5 = parseFloat(document.getElementById("top5").innerHTML) let prices = parseFloat(document.getElementById("prices").innerHTML) - let price = prices + top5 + let price + if ($(".btn-crust").hasClass("active")) { + price = prices + top5 + } else { + price = prices - top5 + } document.getElementById("prices").innerHTML = price }); });