Challenge 2 JavaScript is working

This commit is contained in:
Nanne Baars
2017-04-08 10:31:56 +02:00
parent d1bf80a670
commit 599f36fdb8
5 changed files with 78 additions and 52 deletions

View File

@ -7,6 +7,7 @@
</div>
<div class="lesson-page-wrapper">
<div class="adoc-content" th:replace="doc:Challenge_1.adoc"></div>
<div class="attack-container">
<div class="assignment-success"><i class="fa fa-2 fa-check hidden" aria-hidden="true"></i></div>
<div class="panel panel-default">
@ -54,8 +55,8 @@
</div>
</div>
<div class="lesson-page-wrapper">
<div class="adoc-content" th:replace="doc:Challenge_2.adoc"></div>
<link rel="stylesheet" type="text/css" th:href="@{/lesson_css/challenge2.css}"/>
<script th:src="@{/lesson_js/challenge2.js}" language="JavaScript"></script>
<div class="attack-container">
@ -66,23 +67,23 @@
<img style="max-width:100%;" th:src="@{/images/samsung-black.jpg}"/>
</div>
<div class="col-xs-5" style="border:0px solid gray">
<h3>Samsung Galaxy S8 Plus 64GB Android Phone</h3>
<h5 style="color:#337ab7">Manufacturer <a href="http://www.samsung.com">Samsung</a> ·
<small style="color:#337ab7">(5054 reviews)</small>
<h3>Samsung Galaxy S8 Plus Android Phone</h3>
<h5 style="color:#337ab7"><a href="http://www.samsung.com">Samsung</a> ·
<small style="color:#337ab7">(124421 reviews)</small>
</h5>
<h6 class="title-price">
<small>PRICE</small>
</h6>
<h3 style="margin-top:0px;">US $899</h3>
<h3 style="margin-top:0px;"><span>US $</span><span id="price">899</span></h3>
<div class="section">
<h6 class="title-attr" style="margin-top:15px;">
<small>COLOR</small>
</h6>
<div>
<div class="attr" style="width:25px;background:#5a5a5a;"></div>
<div class="attr" style="width:25px;background:white;"></div>
<div class="attr" style="width:25px;background:lightgrey;"></div>
<div class="attr" style="width:25px;background:black;"></div>
</div>
</div>
<div class="section" style="padding-bottom:5px;">
@ -90,8 +91,8 @@
<small>CAPACITY</small>
</h6>
<div>
<div class="attr2">16 GB</div>
<div class="attr2">32 GB</div>
<div class="attr2">64 GB</div>
<div class="attr2">128 GB</div>
</div>
</div>
<div class="section" style="padding-bottom:20px;">
@ -100,11 +101,23 @@
</h6>
<div>
<div class="btn-minus"><span class="glyphicon glyphicon-minus"></span></div>
<input value="1"/>
<input class="quantity" value="1"/>
<div class="btn-plus"><span class="glyphicon glyphicon-plus"></span></div>
</div>
</div>
<div class="section" style="padding-bottom:20px;">
<h6 class="title-attr">
<small>CHECKOUT CODE</small>
</h6>
<!--
Checkout code: pre-order-webgoat, pre-order-owasp, pre-order-webgoat-owasp
-->
<input class="checkoutCode" value=""/>
</div>
<div class="section" style="padding-bottom:20px;">
<button class="btn btn-success"><span style="margin-right:20px"
class="glyphicon glyphicon-shopping-cart"

View File

@ -1,11 +1,11 @@
$(document).ready(function(){
$(document).ready(function () {
//-- Click on detail
$("ul.menu-items > li").on("click",function(){
$("ul.menu-items > li").on("click", function () {
$("ul.menu-items > li").removeClass("active");
$(this).addClass("active");
})
$(".attr,.attr2").on("click",function(){
$(".attr,.attr2").on("click", function () {
var clase = $(this).attr("class");
$("." + clase).removeClass("active");
@ -13,21 +13,36 @@ $(document).ready(function(){
})
//-- Click on QUANTITY
$(".btn-minus").on("click",function(){
$(".btn-minus").on("click", function () {
var now = $(".section > div > input").val();
if ($.isNumeric(now)){
if (parseInt(now) -1 > 0){ now--;}
$(".section > div > input").val(now);
}else{
$(".section > div > input").val("1");
if ($.isNumeric(now)) {
if (parseInt(now) - 1 > 0) {
now--;
}
$(".quantity").val(now);
} else {
$(".quantity").val("1");
}
})
$(".btn-plus").on("click",function(){
$(".btn-plus").on("click", function () {
var now = $(".section > div > input").val();
if ($.isNumeric(now)){
$(".section > div > input").val(parseInt(now)+1);
}else{
$(".section > div > input").val("1");
if ($.isNumeric(now)) {
$(".quantity").val(parseInt(now) + 1);
} else {
$(".quantity").val("1");
}
})
$(".checkoutCode").on("blur", function () {
var checkoutCode = $(".checkoutCode").val();
$.get("challenge-store/coupons/" + checkoutCode, function (result, status) {
var discount = result.discount;
if (discount > 0) {
var price = $('#price').val();
$('#price').text((899 - (899 * discount / 100)).toFixed(2));
} else {
$('#price').text(899);
}
});
})
})

View File

@ -0,0 +1 @@
=== No need to pay... (WIP!!)