From 731c47d6d5efbac834d2a60542367b974b681255 Mon Sep 17 00:00:00 2001 From: mas Date: Mon, 30 Nov 2020 22:23:26 +0330 Subject: [PATCH 1/9] Ex1 --- Week3/js-exercises/ex1-AddSix.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Week3/js-exercises/ex1-AddSix.js b/Week3/js-exercises/ex1-AddSix.js index 67e8bb63f..2f812940a 100644 --- a/Week3/js-exercises/ex1-AddSix.js +++ b/Week3/js-exercises/ex1-AddSix.js @@ -10,10 +10,18 @@ Call the function three times. The return values should be: */ -function createBase( /* ???? */ ) { +function createBase(num) { // Put here your logic... + function add(num) { + return num + 9; + } + return add; } const addSix = createBase(6); +console.log(addSix(6)); +console.log(addSix(15)); +console.log(addSix(24)); // Put here your function calls... + From 6826f59aa621e52dffa883739d243b6c2e5f70d7 Mon Sep 17 00:00:00 2001 From: mas Date: Tue, 1 Dec 2020 17:41:38 +0330 Subject: [PATCH 2/9] Ex2 --- Week3/js-exercises/ex2-RemoveDuplicates.js | 48 ++++++++-------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/Week3/js-exercises/ex2-RemoveDuplicates.js b/Week3/js-exercises/ex2-RemoveDuplicates.js index f1eea3b8c..7f3c25f7c 100644 --- a/Week3/js-exercises/ex2-RemoveDuplicates.js +++ b/Week3/js-exercises/ex2-RemoveDuplicates.js @@ -1,35 +1,19 @@ -/** - - ** Exercise 2: The lottery machine ** - Write a function called removeDuplicates. This function accept an array as an argument - does not return anything but removes any duplicate elements from the array. +const letters = ['a', 'b', 'b', 'c', 'd', 'a', 'e', 'f', 'f', 'c', 'b']; +const nonDuplicates = []; - The function should remove duplicate elements. So the result should be: - ['a', 'b', 'c', 'd', 'e', 'f'] - - */ - -/** - * Checks your solution against correct solution - * @param {Array} array your solution - * @returns boolean - */ -function checkSolution(array) { - const solution = ['a', 'b', 'c', 'd', 'e', 'f']; - if (array == null) return false; - if (array.length !== solution.length) return false; - - for (let i = 0; i < solution.length; i++) { - if (array[i] !== solution[i]) return false; +function removeDuplicates(array) { + nonDuplicates.push(array[0]); + for (let i = 1; i < array.length; i++) { + const x = []; + for (let j = 0; j < i; j++) { + if (array[j] == array[i]) { + x.push(array[j]); + } + } + if (x.length == 0) { + nonDuplicates.push(array[i]); + } } - return true; + return nonDuplicates; } - -// WRITE YOUR FUNCTION HERE - -const letters = ['a', 'b', 'c', 'd', 'a', 'e', 'f', 'c', 'b']; -removeDuplicates(letters); - -if (checkSolution(letters)) { - console.log("Hooray!"); -} \ No newline at end of file +console.log(removeDuplicates(letters)); \ No newline at end of file From 5cf8dc31127a2d99132c41068e4e0296eb44fe88 Mon Sep 17 00:00:00 2001 From: mas Date: Tue, 1 Dec 2020 17:46:05 +0330 Subject: [PATCH 3/9] Ex3 --- Week3/js-exercises/ex3-GuessTheOutput.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Week3/js-exercises/ex3-GuessTheOutput.js b/Week3/js-exercises/ex3-GuessTheOutput.js index 7d783ceef..926de36b8 100644 --- a/Week3/js-exercises/ex3-GuessTheOutput.js +++ b/Week3/js-exercises/ex3-GuessTheOutput.js @@ -18,4 +18,6 @@ const x = (function () { }; })(); -x(); \ No newline at end of file +x(); + +//Output is alert to brower number 12, change the value of a to 12 because a declares as a global variable. \ No newline at end of file From 925292a2d06da4982bf071f81108e5ff1e5aea8f Mon Sep 17 00:00:00 2001 From: mas Date: Tue, 1 Dec 2020 17:50:15 +0330 Subject: [PATCH 4/9] Ex4 --- Week3/js-exercises/ex4-GuessMore.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Week3/js-exercises/ex4-GuessMore.js b/Week3/js-exercises/ex4-GuessMore.js index 81a4ec273..0d48e12f9 100644 --- a/Week3/js-exercises/ex4-GuessMore.js +++ b/Week3/js-exercises/ex4-GuessMore.js @@ -15,7 +15,7 @@ function f1(val) { return val; } f1(x); -console.log(x); +console.log(f1(x)); const y = { x: 9 @@ -26,4 +26,6 @@ function f2(val) { return val; } f2(y); -console.log(y); \ No newline at end of file +console.log(f2(y)); + +// In this example, x has 2 parts, one of them is varible and the other is property of object y \ No newline at end of file From 4ab7470fc6452bee90141f9cf2a82a8264017b4e Mon Sep 17 00:00:00 2001 From: mas Date: Tue, 1 Dec 2020 18:17:03 +0330 Subject: [PATCH 5/9] Ex5 --- Week3/js-exercises/ex5-LotteryMachine.js | 35 ++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/Week3/js-exercises/ex5-LotteryMachine.js b/Week3/js-exercises/ex5-LotteryMachine.js index ad09b963c..588305ef0 100644 --- a/Week3/js-exercises/ex5-LotteryMachine.js +++ b/Week3/js-exercises/ex5-LotteryMachine.js @@ -29,10 +29,41 @@ Don't you just love the thrill of the lottery? What if I told you we can make ou function threeFive(startIndex, stopIndex, threeCallback, fiveCallback) { const numbers = []; // make array + if (startIndex > stopIndex) { + console.log('Change the values: The stop number should be greater than start number') + } else { + let pointer = startIndex; + for (let i = 0; i < stopIndex - startIndex + 1; i++) { + numbers.push(pointer); + pointer++; + } + } // start at beginning of array and check if you should call threeCallback or fiveCallback or go on to next + numbers.forEach(function (arr) { + if (arr % 3 == 0 && arr % 5 == 0) { + threeCallback(arr); + fiveCallback(arr); + } else if (arr % 5 == 0) { + fiveCallback(arr); + } else if (arr % 3 == 0) { + threeCallback(arr); + } else { + console.log('number ' + arr + ' is not divisible by 3 or 5'); + } + }) + + } -threeFive(10, 15, sayThree, sayFive); +threeFive(1, 10, sayThree, sayFive); // Should create an array [10,11,12,13,14,15] -// and call sayFive, sayThree, sayThree, sayFive \ No newline at end of file +// and call sayFive, sayThree, sayThree, sayFive + +function sayThree(arr) { + console.log('Number ' + arr + ' is divisible by 3'); +} + +function sayFive(arr) { + console.log('Number ' + arr + ' is divisible by 5'); +} From a83d2b98f0f43fd99bbd9fa0558829609e89dbc5 Mon Sep 17 00:00:00 2001 From: mas Date: Thu, 3 Dec 2020 01:10:54 +0330 Subject: [PATCH 6/9] Finished project --- Week3/project/index.html | 33 ++++++++++++- Week3/project/index.js | 26 +++++++++- Week3/project/style.css | 103 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 159 insertions(+), 3 deletions(-) create mode 100644 Week3/project/style.css diff --git a/Week3/project/index.html b/Week3/project/index.html index fac819b21..5ee2969f9 100644 --- a/Week3/project/index.html +++ b/Week3/project/index.html @@ -5,10 +5,41 @@ Tip Calculator + -
+
+

Tip Calculator

+
+
+ + + + + + + + + + +
+ +
+

TIP AMOUNT

+ 40 + each +
+
+ + diff --git a/Week3/project/index.js b/Week3/project/index.js index e12fb76ed..f26160359 100644 --- a/Week3/project/index.js +++ b/Week3/project/index.js @@ -1,3 +1,25 @@ -// Your code goes in here +const bill = document.getElementById('bill'); +const service = document.getElementById('service'); +const people = document.getElementById('people'); +const calculate = document.getElementById('calculate'); +const amount = document.getElementById('amount'); +const each = document.getElementById('each'); -document.querySelector("#app").innerText = "Tip Calculator"; \ No newline at end of file +calculate.addEventListener("click", calculateTip); + +function calculateTip(e) { + e.preventDefault(); + + + if (bill.value == '' || service.value == 'default' || people.value == '') { + alert('Please fill all fields!'); + } else { + amount.textContent = parseFloat(service.value * bill.value / 100 / people.value).toFixed(2); + each.style.display = 'block'; + + if (people.value == 1) { + each.style.display = 'none'; + } + } + +} diff --git a/Week3/project/style.css b/Week3/project/style.css new file mode 100644 index 000000000..51718b7dc --- /dev/null +++ b/Week3/project/style.css @@ -0,0 +1,103 @@ +*{ + padding: 0; + margin: 0; + box-sizing: border-box; +} + +body{ + font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif; + font-size: 20px; + background-color: aquamarine; + color: azure; +} + +#app{ + width: 450px; + margin: 0; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background-color: coral; + padding: 30px ; + border-radius: 10px; +} + +h1{ + text-align: center; + margin-bottom: 20px; + font-size: 2.5em; +} + +hr{ + border: 1px solid white; +} + +form{ + margin-top: 20px; + + } + +label{ + font-size: 1.2em; + margin: 10px 0; +} + +input[type=number], select { + width: 100%; + padding: 5px 20px; + margin: 8px auto; + font-size: 1em; + text-align: center; + text-align-last: center; +} + +label:first-child::after{ + content: '$'; + color: black; + position: absolute; + top: 165px; + left: 50px; + font-size: 1.4em; +} + +span, label, button, select, input{ + display: block; +} + +button{ + margin:50px 10px 0 0; + width: 100px; + height: 50px; + font-size: 1em; + background-color: white; + border: none; + color: coral; + border-radius: 5px; + float:right; + +} + +.amount{ + background-color: tomato; + border: 1px solid white; + width: 60%; + margin: 20px auto; + padding: 10px; + text-align: center; + border-radius: 5px; + float: left; + box-shadow: 0px 0px 50px; +} + +span{ + font-size: 1.2em; + position: relative; +} + +#amount::before{ + content: '$'; + position: absolute; + top: 0px; + left: 50px; +} \ No newline at end of file From cc0b008b7f4670660fec2c90678f1d7ea62c186f Mon Sep 17 00:00:00 2001 From: mas Date: Thu, 3 Dec 2020 10:44:39 +0330 Subject: [PATCH 7/9] Add modal and some features, responsive, fixed some bugs --- Week3/project/index.html | 15 ++++++- Week3/project/index.js | 24 ++++++++---- Week3/project/style.css | 84 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 9 deletions(-) diff --git a/Week3/project/index.html b/Week3/project/index.html index 5ee2969f9..c721d7383 100644 --- a/Week3/project/index.html +++ b/Week3/project/index.html @@ -34,9 +34,20 @@

Tip Calculator

TIP AMOUNT

- 40 - each + - + -
+ +
+ +
+
+

Warning

+

Please fill all fields

+ +
+
+ diff --git a/Week3/project/index.js b/Week3/project/index.js index f26160359..49bd8c621 100644 --- a/Week3/project/index.js +++ b/Week3/project/index.js @@ -1,25 +1,35 @@ +//declare variables const bill = document.getElementById('bill'); const service = document.getElementById('service'); const people = document.getElementById('people'); const calculate = document.getElementById('calculate'); const amount = document.getElementById('amount'); const each = document.getElementById('each'); +const modal = document.querySelector('.modal'); +const close = document.getElementById('close'); -calculate.addEventListener("click", calculateTip); +// When press on calculate button +calculate.addEventListener('click', calculateTip); +//calculate tip function calculateTip(e) { e.preventDefault(); - - + // Display modal element when at least one field empty if (bill.value == '' || service.value == 'default' || people.value == '') { - alert('Please fill all fields!'); - } else { + modal.style.display = 'block'; + close.addEventListener('click', function () { + modal.style.display = 'none'; + clearTimeout(timing); + }); + const timing = setTimeout(function () { + modal.style.display = 'none'; + }, 5000); + } else { //Calculate tip when all fields are filled amount.textContent = parseFloat(service.value * bill.value / 100 / people.value).toFixed(2); + each.textContent = 'each'; each.style.display = 'block'; - if (people.value == 1) { each.style.display = 'none'; } } - } diff --git a/Week3/project/style.css b/Week3/project/style.css index 51718b7dc..df01c66dd 100644 --- a/Week3/project/style.css +++ b/Week3/project/style.css @@ -75,6 +75,7 @@ button{ color: coral; border-radius: 5px; float:right; + cursor: pointer; } @@ -100,4 +101,87 @@ span{ position: absolute; top: 0px; left: 50px; +} + +#amount { + font-size: 1.5em; +} + +.clearfix{ + clear: both; +} + +.modal{ + background-color: rgb(0, 0,0,0.5); + position: fixed; + width: 100%; + height: 100%; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + display: none; + border-radius: 10px; +} +.modal-box{ + background-color: orangered; + width: 60%; + margin: auto; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + border-radius: 10px; + text-align: center; + padding: 10px 10px; + font-size: 1.5em; +} + +.modal button{ + width: 50px; + height: 25px; + font-size: 0.5em; + margin: 10px; + float: none; + margin:10px auto; + font-weight: 700; + cursor: pointer; +} + +@media only screen and (max-width: 500px){ + #app{ + width: 300px; + padding: 10px ; + } + + h1{ + font-size: 2em; + } + + label:first-child::after{ + top: 133px; + left: 20px; + } + .amount{ + margin: 10px auto; + padding: 10px; + } + + .amount h2{ + font-size: 1.05em; + } + + button{ + margin:50px 0 0 0; + width: 100px; + height: 40px; + font-size: 0.9em; + } + + #amount::before{ + left: 20px; + } + + .modal-box{ + width: 80%; + } } \ No newline at end of file From 322923f74aa331cd1a045f46e0e036708a225b1e Mon Sep 17 00:00:00 2001 From: mas Date: Thu, 3 Dec 2020 15:57:11 +0330 Subject: [PATCH 8/9] fixed folder --- Week3/{ => Masoud}/LESSONPLAN.md | 0 Week3/{ => Masoud}/MAKEME.md | 0 Week3/{ => Masoud}/README.md | 0 Week3/{ => Masoud}/js-exercises/ex1-AddSix.js | 0 Week3/{ => Masoud}/js-exercises/ex2-RemoveDuplicates.js | 0 Week3/{ => Masoud}/js-exercises/ex3-GuessTheOutput.js | 0 Week3/{ => Masoud}/js-exercises/ex4-GuessMore.js | 0 Week3/{ => Masoud}/js-exercises/ex5-LotteryMachine.js | 0 Week3/{ => Masoud}/old-homework/step2-1.js | 0 Week3/{ => Masoud}/old-homework/step2-2.js | 0 Week3/{ => Masoud}/old-homework/step2-3.js | 0 Week3/{ => Masoud}/old-homework/step2-4.js | 0 Week3/{ => Masoud}/old-homework/step2-5.js | 0 Week3/{ => Masoud}/old-homework/step2-6.js | 0 Week3/{ => Masoud}/old-homework/step2-7.js | 0 Week3/{ => Masoud}/old-homework/step3-bonus.js | 0 Week3/{ => Masoud}/old-homework/step3.js | 0 Week3/{ => Masoud}/project/index.html | 0 Week3/{ => Masoud}/project/index.js | 0 Week3/{ => Masoud}/project/style.css | 0 Week3/{ => Masoud}/test/console-test.js | 0 Week3/{ => Masoud}/test/step2-1.test.js | 0 Week3/{ => Masoud}/test/step2-2.test.js | 0 Week3/{ => Masoud}/test/step2-3.test.js | 0 Week3/{ => Masoud}/test/step2-4.test.js | 0 Week3/{ => Masoud}/test/step2-5.test.js | 0 Week3/{ => Masoud}/test/step2-6.test.js | 0 Week3/{ => Masoud}/test/step3-bonus.test.js | 0 Week3/{ => Masoud}/test/step3.test.js | 0 29 files changed, 0 insertions(+), 0 deletions(-) rename Week3/{ => Masoud}/LESSONPLAN.md (100%) rename Week3/{ => Masoud}/MAKEME.md (100%) rename Week3/{ => Masoud}/README.md (100%) rename Week3/{ => Masoud}/js-exercises/ex1-AddSix.js (100%) rename Week3/{ => Masoud}/js-exercises/ex2-RemoveDuplicates.js (100%) rename Week3/{ => Masoud}/js-exercises/ex3-GuessTheOutput.js (100%) rename Week3/{ => Masoud}/js-exercises/ex4-GuessMore.js (100%) rename Week3/{ => Masoud}/js-exercises/ex5-LotteryMachine.js (100%) rename Week3/{ => Masoud}/old-homework/step2-1.js (100%) rename Week3/{ => Masoud}/old-homework/step2-2.js (100%) rename Week3/{ => Masoud}/old-homework/step2-3.js (100%) rename Week3/{ => Masoud}/old-homework/step2-4.js (100%) rename Week3/{ => Masoud}/old-homework/step2-5.js (100%) rename Week3/{ => Masoud}/old-homework/step2-6.js (100%) rename Week3/{ => Masoud}/old-homework/step2-7.js (100%) rename Week3/{ => Masoud}/old-homework/step3-bonus.js (100%) rename Week3/{ => Masoud}/old-homework/step3.js (100%) rename Week3/{ => Masoud}/project/index.html (100%) rename Week3/{ => Masoud}/project/index.js (100%) rename Week3/{ => Masoud}/project/style.css (100%) rename Week3/{ => Masoud}/test/console-test.js (100%) rename Week3/{ => Masoud}/test/step2-1.test.js (100%) rename Week3/{ => Masoud}/test/step2-2.test.js (100%) rename Week3/{ => Masoud}/test/step2-3.test.js (100%) rename Week3/{ => Masoud}/test/step2-4.test.js (100%) rename Week3/{ => Masoud}/test/step2-5.test.js (100%) rename Week3/{ => Masoud}/test/step2-6.test.js (100%) rename Week3/{ => Masoud}/test/step3-bonus.test.js (100%) rename Week3/{ => Masoud}/test/step3.test.js (100%) diff --git a/Week3/LESSONPLAN.md b/Week3/Masoud/LESSONPLAN.md similarity index 100% rename from Week3/LESSONPLAN.md rename to Week3/Masoud/LESSONPLAN.md diff --git a/Week3/MAKEME.md b/Week3/Masoud/MAKEME.md similarity index 100% rename from Week3/MAKEME.md rename to Week3/Masoud/MAKEME.md diff --git a/Week3/README.md b/Week3/Masoud/README.md similarity index 100% rename from Week3/README.md rename to Week3/Masoud/README.md diff --git a/Week3/js-exercises/ex1-AddSix.js b/Week3/Masoud/js-exercises/ex1-AddSix.js similarity index 100% rename from Week3/js-exercises/ex1-AddSix.js rename to Week3/Masoud/js-exercises/ex1-AddSix.js diff --git a/Week3/js-exercises/ex2-RemoveDuplicates.js b/Week3/Masoud/js-exercises/ex2-RemoveDuplicates.js similarity index 100% rename from Week3/js-exercises/ex2-RemoveDuplicates.js rename to Week3/Masoud/js-exercises/ex2-RemoveDuplicates.js diff --git a/Week3/js-exercises/ex3-GuessTheOutput.js b/Week3/Masoud/js-exercises/ex3-GuessTheOutput.js similarity index 100% rename from Week3/js-exercises/ex3-GuessTheOutput.js rename to Week3/Masoud/js-exercises/ex3-GuessTheOutput.js diff --git a/Week3/js-exercises/ex4-GuessMore.js b/Week3/Masoud/js-exercises/ex4-GuessMore.js similarity index 100% rename from Week3/js-exercises/ex4-GuessMore.js rename to Week3/Masoud/js-exercises/ex4-GuessMore.js diff --git a/Week3/js-exercises/ex5-LotteryMachine.js b/Week3/Masoud/js-exercises/ex5-LotteryMachine.js similarity index 100% rename from Week3/js-exercises/ex5-LotteryMachine.js rename to Week3/Masoud/js-exercises/ex5-LotteryMachine.js diff --git a/Week3/old-homework/step2-1.js b/Week3/Masoud/old-homework/step2-1.js similarity index 100% rename from Week3/old-homework/step2-1.js rename to Week3/Masoud/old-homework/step2-1.js diff --git a/Week3/old-homework/step2-2.js b/Week3/Masoud/old-homework/step2-2.js similarity index 100% rename from Week3/old-homework/step2-2.js rename to Week3/Masoud/old-homework/step2-2.js diff --git a/Week3/old-homework/step2-3.js b/Week3/Masoud/old-homework/step2-3.js similarity index 100% rename from Week3/old-homework/step2-3.js rename to Week3/Masoud/old-homework/step2-3.js diff --git a/Week3/old-homework/step2-4.js b/Week3/Masoud/old-homework/step2-4.js similarity index 100% rename from Week3/old-homework/step2-4.js rename to Week3/Masoud/old-homework/step2-4.js diff --git a/Week3/old-homework/step2-5.js b/Week3/Masoud/old-homework/step2-5.js similarity index 100% rename from Week3/old-homework/step2-5.js rename to Week3/Masoud/old-homework/step2-5.js diff --git a/Week3/old-homework/step2-6.js b/Week3/Masoud/old-homework/step2-6.js similarity index 100% rename from Week3/old-homework/step2-6.js rename to Week3/Masoud/old-homework/step2-6.js diff --git a/Week3/old-homework/step2-7.js b/Week3/Masoud/old-homework/step2-7.js similarity index 100% rename from Week3/old-homework/step2-7.js rename to Week3/Masoud/old-homework/step2-7.js diff --git a/Week3/old-homework/step3-bonus.js b/Week3/Masoud/old-homework/step3-bonus.js similarity index 100% rename from Week3/old-homework/step3-bonus.js rename to Week3/Masoud/old-homework/step3-bonus.js diff --git a/Week3/old-homework/step3.js b/Week3/Masoud/old-homework/step3.js similarity index 100% rename from Week3/old-homework/step3.js rename to Week3/Masoud/old-homework/step3.js diff --git a/Week3/project/index.html b/Week3/Masoud/project/index.html similarity index 100% rename from Week3/project/index.html rename to Week3/Masoud/project/index.html diff --git a/Week3/project/index.js b/Week3/Masoud/project/index.js similarity index 100% rename from Week3/project/index.js rename to Week3/Masoud/project/index.js diff --git a/Week3/project/style.css b/Week3/Masoud/project/style.css similarity index 100% rename from Week3/project/style.css rename to Week3/Masoud/project/style.css diff --git a/Week3/test/console-test.js b/Week3/Masoud/test/console-test.js similarity index 100% rename from Week3/test/console-test.js rename to Week3/Masoud/test/console-test.js diff --git a/Week3/test/step2-1.test.js b/Week3/Masoud/test/step2-1.test.js similarity index 100% rename from Week3/test/step2-1.test.js rename to Week3/Masoud/test/step2-1.test.js diff --git a/Week3/test/step2-2.test.js b/Week3/Masoud/test/step2-2.test.js similarity index 100% rename from Week3/test/step2-2.test.js rename to Week3/Masoud/test/step2-2.test.js diff --git a/Week3/test/step2-3.test.js b/Week3/Masoud/test/step2-3.test.js similarity index 100% rename from Week3/test/step2-3.test.js rename to Week3/Masoud/test/step2-3.test.js diff --git a/Week3/test/step2-4.test.js b/Week3/Masoud/test/step2-4.test.js similarity index 100% rename from Week3/test/step2-4.test.js rename to Week3/Masoud/test/step2-4.test.js diff --git a/Week3/test/step2-5.test.js b/Week3/Masoud/test/step2-5.test.js similarity index 100% rename from Week3/test/step2-5.test.js rename to Week3/Masoud/test/step2-5.test.js diff --git a/Week3/test/step2-6.test.js b/Week3/Masoud/test/step2-6.test.js similarity index 100% rename from Week3/test/step2-6.test.js rename to Week3/Masoud/test/step2-6.test.js diff --git a/Week3/test/step3-bonus.test.js b/Week3/Masoud/test/step3-bonus.test.js similarity index 100% rename from Week3/test/step3-bonus.test.js rename to Week3/Masoud/test/step3-bonus.test.js diff --git a/Week3/test/step3.test.js b/Week3/Masoud/test/step3.test.js similarity index 100% rename from Week3/test/step3.test.js rename to Week3/Masoud/test/step3.test.js From 3a07b78ff3772f47056b64b33fdd7e81c36d8203 Mon Sep 17 00:00:00 2001 From: mas Date: Fri, 4 Dec 2020 13:40:46 +0330 Subject: [PATCH 9/9] Add modal transition --- Week3/Masoud/project/index.html | 2 +- Week3/Masoud/project/index.js | 8 +++++++- Week3/Masoud/project/style.css | 9 +++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Week3/Masoud/project/index.html b/Week3/Masoud/project/index.html index c721d7383..d53d50ff8 100644 --- a/Week3/Masoud/project/index.html +++ b/Week3/Masoud/project/index.html @@ -40,7 +40,7 @@

TIP AMOUNT

-
+