From 4af3f57a076f39db994316fd9fa505a5f47027e7 Mon Sep 17 00:00:00 2001 From: Shekhar Karande Date: Mon, 5 Feb 2018 15:51:28 +0000 Subject: [PATCH 1/6] first wes bos completed --- 01 - JavaScript Drum Kit/.vscode/database.json | 1 + 01 - JavaScript Drum Kit/index-START.html | 16 +++++++++++++++- 01 - JavaScript Drum Kit/style.css | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 01 - JavaScript Drum Kit/.vscode/database.json diff --git a/01 - JavaScript Drum Kit/.vscode/database.json b/01 - JavaScript Drum Kit/.vscode/database.json new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/01 - JavaScript Drum Kit/.vscode/database.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/01 - JavaScript Drum Kit/index-START.html b/01 - JavaScript Drum Kit/index-START.html index 4070d32767..33ea3b984a 100644 --- a/01 - JavaScript Drum Kit/index-START.html +++ b/01 - JavaScript Drum Kit/index-START.html @@ -58,7 +58,21 @@ diff --git a/01 - JavaScript Drum Kit/style.css b/01 - JavaScript Drum Kit/style.css index 075578c930..c4bfbbbee9 100644 --- a/01 - JavaScript Drum Kit/style.css +++ b/01 - JavaScript Drum Kit/style.css @@ -32,7 +32,7 @@ body,html { } .playing { - transform: scale(1.1); + transform: scale(1.6); border-color: #ffc600; box-shadow: 0 0 1rem #ffc600; } From b2113d2dbaf0af3f1976e8e793973fd283c81928 Mon Sep 17 00:00:00 2001 From: Shekhar Karande Date: Tue, 6 Feb 2018 19:09:42 +0000 Subject: [PATCH 2/6] addding the second chapter, TODO add the if statment to tackle the transition for the seconds hand --- 02 - JS and CSS Clock/.vscode/database.json | 1 + 02 - JS and CSS Clock/index-START.html | 26 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 02 - JS and CSS Clock/.vscode/database.json diff --git a/02 - JS and CSS Clock/.vscode/database.json b/02 - JS and CSS Clock/.vscode/database.json new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/02 - JS and CSS Clock/.vscode/database.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/02 - JS and CSS Clock/index-START.html b/02 - JS and CSS Clock/index-START.html index ee7eaefb1f..2fac0b7187 100644 --- a/02 - JS and CSS Clock/index-START.html +++ b/02 - JS and CSS Clock/index-START.html @@ -11,7 +11,7 @@
-
+
@@ -62,13 +62,37 @@ background:black; position: absolute; top:50%; + transform-origin: 100%; + transform: rotate(90deg); + transition: all 0.5s; + transition-timing-function: cubic-bezier(0.0, 0, 0.58, 1); } From 071975c9de6f6f0c471b37a66546fdb667f05e90 Mon Sep 17 00:00:00 2001 From: Shekhar Karande Date: Wed, 7 Feb 2018 18:39:06 +0000 Subject: [PATCH 3/6] adding stuff for 3rd video --- 03 - CSS Variables/.vscode/database.json | 1 + 03 - CSS Variables/index-START.html | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 03 - CSS Variables/.vscode/database.json diff --git a/03 - CSS Variables/.vscode/database.json b/03 - CSS Variables/.vscode/database.json new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/03 - CSS Variables/.vscode/database.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/03 - CSS Variables/index-START.html b/03 - CSS Variables/index-START.html index 8a4f0d556e..9293b76d81 100644 --- a/03 - CSS Variables/index-START.html +++ b/03 - CSS Variables/index-START.html @@ -21,7 +21,21 @@

Update CSS Variables with JS

From 50282421ec7e5f89296269965044911177d3ffe0 Mon Sep 17 00:00:00 2001 From: Shekhar Karande Date: Thu, 8 Feb 2018 15:17:52 +0000 Subject: [PATCH 4/6] fun stuff --- 04 - Array Cardio Day 1/.vscode/database.json | 1 + 04 - Array Cardio Day 1/index-START.html | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 04 - Array Cardio Day 1/.vscode/database.json diff --git a/04 - Array Cardio Day 1/.vscode/database.json b/04 - Array Cardio Day 1/.vscode/database.json new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/04 - Array Cardio Day 1/.vscode/database.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/04 - Array Cardio Day 1/index-START.html b/04 - Array Cardio Day 1/index-START.html index eec0ffc31d..dc47e854cc 100644 --- a/04 - Array Cardio Day 1/index-START.html +++ b/04 - Array Cardio Day 1/index-START.html @@ -31,7 +31,11 @@ // Array.prototype.filter() // 1. Filter the list of inventors for those who were born in the 1500's - + const fifteen = inventors.filter(function(inventor){ + if (inventor.year > 1499 && inventor.year < 1600) + return true + }) + console.table(fifteen) // Array.prototype.map() // 2. Give us an array of the inventors' first and last names From d578577637961c4561c47b72ab450399d2cc92bf Mon Sep 17 00:00:00 2001 From: Shekhar Karande Date: Thu, 8 Feb 2018 15:18:44 +0000 Subject: [PATCH 5/6] some more stuff --- 04 - Array Cardio Day 1/.vscode/temp.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 04 - Array Cardio Day 1/.vscode/temp.sql diff --git a/04 - Array Cardio Day 1/.vscode/temp.sql b/04 - Array Cardio Day 1/.vscode/temp.sql new file mode 100644 index 0000000000..e69de29bb2 From a5b965c2dd80bc62566b151c430a4b05c7dbfbd7 Mon Sep 17 00:00:00 2001 From: Shekhar Karande Date: Thu, 8 Feb 2018 18:02:51 +0000 Subject: [PATCH 6/6] part of array cardio --- .../.vscode/{temp.sql => last.sql} | 0 04 - Array Cardio Day 1/index-START.html | 14 ++++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) rename 04 - Array Cardio Day 1/.vscode/{temp.sql => last.sql} (100%) diff --git a/04 - Array Cardio Day 1/.vscode/temp.sql b/04 - Array Cardio Day 1/.vscode/last.sql similarity index 100% rename from 04 - Array Cardio Day 1/.vscode/temp.sql rename to 04 - Array Cardio Day 1/.vscode/last.sql diff --git a/04 - Array Cardio Day 1/index-START.html b/04 - Array Cardio Day 1/index-START.html index dc47e854cc..4751ea14ca 100644 --- a/04 - Array Cardio Day 1/index-START.html +++ b/04 - Array Cardio Day 1/index-START.html @@ -31,19 +31,25 @@ // Array.prototype.filter() // 1. Filter the list of inventors for those who were born in the 1500's - const fifteen = inventors.filter(function(inventor){ - if (inventor.year > 1499 && inventor.year < 1600) - return true - }) + const fifteen = inventors.filter(inventor => (inventor.year > 1499 && inventor.year < 1600)) console.table(fifteen) // Array.prototype.map() // 2. Give us an array of the inventors' first and last names + const name = inventors.map(inventor => `${inventor.first}, ${inventor.last}`) + console.table(name) // Array.prototype.sort() // 3. Sort the inventors by birthdate, oldest to youngest + const birthDate = inventors.sort((firstPerson,secondPerson) => firstPerson.year >secondPerson.year ? 1 : -1) + console.table (birthDate) // Array.prototype.reduce() // 4. How many years did all the inventors live? + const totalYears = inventors.reduce((total,inventor) => { + return total + (inventor.passed - inventor.year) + },0) + + console.log(totalYears) // 5. Sort the inventors by years lived