From 2222975a89878e45e9c8891ef8fcbf6ebe1f778a Mon Sep 17 00:00:00 2001 From: Meg Clarke Date: Wed, 25 Jan 2017 08:58:19 -0500 Subject: [PATCH 01/12] completed drumkit --- 01 - JavaScript Drum Kit/index-START.html | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/01 - JavaScript Drum Kit/index-START.html b/01 - JavaScript Drum Kit/index-START.html index 4070d32767..b688f3db6a 100644 --- a/01 - JavaScript Drum Kit/index-START.html +++ b/01 - JavaScript Drum Kit/index-START.html @@ -59,6 +59,23 @@ From 14ea131d45d96f105130c85a0e733407ff7dc361 Mon Sep 17 00:00:00 2001 From: Meg Clarke Date: Wed, 25 Jan 2017 08:58:44 -0500 Subject: [PATCH 02/12] completed clock --- 02 - JS + CSS Clock/index-START.html | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/02 - JS + CSS Clock/index-START.html b/02 - JS + CSS Clock/index-START.html index 2712384201..a681ef1153 100644 --- a/02 - JS + CSS Clock/index-START.html +++ b/02 - JS + CSS Clock/index-START.html @@ -61,13 +61,40 @@ background:black; position: absolute; top:50%; + /*Meg input */ + transform-origin: 100%; + transform:rotate(90deg); + transition: all 0.05s; + transition-timing-function: cubic-bezier(0.1, 2.7, 0.58, 1); } From 7556c05e419c303a7242aaf993de68a95dab3166 Mon Sep 17 00:00:00 2001 From: Meg Clarke Date: Wed, 25 Jan 2017 08:59:19 -0500 Subject: [PATCH 03/12] completed blur and colour variable --- 03 - CSS Variables/index-START.html | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/03 - CSS Variables/index-START.html b/03 - CSS Variables/index-START.html index 7171607a8b..fffbcc950c 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 8e999deb4c46e6def21be73526009ce59575e839 Mon Sep 17 00:00:00 2001 From: Meg Clarke Date: Wed, 25 Jan 2017 09:00:12 -0500 Subject: [PATCH 04/12] completed challeneges like coffee and code --- 04 - Array Cardio Day 1/index-START.html | 69 ++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/04 - Array Cardio Day 1/index-START.html b/04 - Array Cardio Day 1/index-START.html index 927fb03540..51938d2e17 100644 --- a/04 - Array Cardio Day 1/index-START.html +++ b/04 - Array Cardio Day 1/index-START.html @@ -33,28 +33,97 @@ // Array.prototype.filter() // 1. Filter the list of inventors for those who were born in the 1500's + // Meg's code + + // const filter = inventors.filter(function(inventor){ + // if(inventor.year >= 1500 && inventor.year < 1600){ + // return true; + // } + // }) + + // REDUCED CODE BY MEG + + const filter = inventors.filter(inventor => inventor.year >= 1500 && inventor.year < 1600) + + + // Array.prototype.map() // 2. Give us an array of the inventors' first and last names + const fullNames = inventor => inventor.first + '' + inventor.last + + // Array.prototype.sort() // 3. Sort the inventors by birthdate, oldest to youngest + // Meg's code + // const ordered = inventor.sort(function(a, b){ + // if (a.year > b.year){ + // return 1; + // } else { + // return -1; + // } + // }); + + // reduced code by Meg + const ordered = inventors.sort((a, b) => a.year > b.year ? 1 : -1); + // this is a turnerary, where question mark means if true return and the semi colon means else return + + // 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); + + // 5. Sort the inventors by years lived + const oldest = inventors.sort(function(a, b){ + const lastGuy = a.passed - a.year; + const nextGuy = b.passed - b.year; + return lastGuy > nextGuy ? -1 : 1; + + // if(lastGuy > nextGuy) { + // return -1; + // }else{ + // return 1; + // } + }); + console.table(olderst) + // 6. create a list of Boulevards in Paris that contain 'de' anywhere in the name // https://en.wikipedia.org/wiki/Category:Boulevards_in_Paris + const category = document.querySelector('.mw-category'); + const links = Array.from(category.querySelectorAll('a'); + const de = links + .map(link => link.textContent); + .filter(streetName => streetName.includes('de')); // 7. sort Exercise // Sort the people alphabetically by last name + const alpha = people.sort((lastOne, nextOne) =>{ + const [alast, afirst] = lastOne.split(','); + const [blast, bfirst] = nextOne.split(','); + return alast > blast ? 1 : -1; + }); + + // 8. Reduce Exercise // Sum up the instances of each of these const data = ['car', 'car', 'truck', 'truck', 'bike', 'walk', 'car', 'van', 'bike', 'walk', 'car', 'van', 'car', 'truck' ]; + const transportation = data.reduce(function(obj, item){ + if (!obj[item]){ + obj[item] = 0 + } + obj[item]++; + return obj; + }, {}) + From 9579863f6925b674d21cf9f55cd368191b141202 Mon Sep 17 00:00:00 2001 From: Meg Clarke Date: Thu, 26 Jan 2017 23:36:55 -0500 Subject: [PATCH 05/12] completed gallery css challenge --- 05 - Flex Panel Gallery/index-START.html | 36 +++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/05 - Flex Panel Gallery/index-START.html b/05 - Flex Panel Gallery/index-START.html index e1d643ad5c..06fb323174 100644 --- a/05 - Flex Panel Gallery/index-START.html +++ b/05 - Flex Panel Gallery/index-START.html @@ -24,6 +24,7 @@ .panels { min-height:100vh; overflow: hidden; + display:flex; } .panel { @@ -39,8 +40,13 @@ flex 0.7s cubic-bezier(0.61,-0.19, 0.7,-0.11), background 0.2s; font-size: 20px; - background-size:cover; + background-size: cover; background-position:center; + flex: 1; + justify-content: center; + align-items: center; + display: flex; + flex-direction: column; } @@ -50,12 +56,23 @@ .panel4 { background-image:url(https://source.unsplash.com/ITjiVXcwVng/1500x1500); } .panel5 { background-image:url(https://source.unsplash.com/3MNzGlQM7qs/1500x1500); } +/*Meg these are the children in Flex*/ .panel > * { margin:0; width: 100%; transition:transform 0.5s; + border: 1px solid red; + flex: 1 0 auto; + display: flex; + justify-content: center; + align-items: center; } + .panel > *:first-child {transform: translateY(-100%);} + .panel.open-active > *:first-child {transform: translateY(0);} + .panel > *:last-child {transform: translateY(100%);} + .panel.open-active > *:last-child{transform: translateY(0);} + .panel p { text-transform: uppercase; font-family: 'Amatic SC', cursive; @@ -68,6 +85,7 @@ .panel.open { font-size:40px; + flex: 5; } .cta { @@ -107,6 +125,22 @@ From 218b32158a3511b067c30dd7f4090907cf7edaa5 Mon Sep 17 00:00:00 2001 From: Meg Clarke Date: Fri, 27 Jan 2017 20:47:44 -0500 Subject: [PATCH 06/12] Completed type ahead challenge --- 06 - Type Ahead/index-START.html | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/06 - Type Ahead/index-START.html b/06 - Type Ahead/index-START.html index 1436886918..0f4a5eb730 100644 --- a/06 - Type Ahead/index-START.html +++ b/06 - Type Ahead/index-START.html @@ -17,6 +17,50 @@ From aef3145f3a1c820b59c6f474fa2f86a9d4abe132 Mon Sep 17 00:00:00 2001 From: Meg Clarke Date: Sat, 28 Jan 2017 22:21:12 -0500 Subject: [PATCH 07/12] Array challenge complete --- 07 - Array Cardio Day 2/index-START.html | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/07 - Array Cardio Day 2/index-START.html b/07 - Array Cardio Day 2/index-START.html index b80ab6b650..d420a27379 100644 --- a/07 - Array Cardio Day 2/index-START.html +++ b/07 - Array Cardio Day 2/index-START.html @@ -25,16 +25,56 @@ // Some and Every Checks // Array.prototype.some() // is at least one person 19? + // const isAdult = people.some(function(person){ + // const currentYear = (New Date()).getFullYear(); + // if(currentYear = person.year >= 19){ + // return true; + // } + // }); + // Meg Alternet answer 1 + // const isAdult = people.some(person => { + // const currentYear = (new Date()).getFUllYear(); + // return currentYear - person.year >= 19; + // }); + // Meg Alternate answer 2 + const isAdult = people.some(person => ((new Date()).getFullYear()) - person.year >= 19); + + console.log({isAdult}); // Array.prototype.every() // is everyone 19? + const allAdults = people.every(person => ((new Date()).getFullYear()) - person.year >= 19); + + console.log({allAdults}); + + // Array.prototype.find() // Find is like filter, but instead returns just the one you are looking for // find the comment with the ID of 823423 + // const comment = comments.find(function(comment){ + // if(comment.id === 823423){ + // return true; + // } + // }) + // Meg Alternative answer + const comment = comments.find(comment => comment.id === 823423); + + console.log(comment); // Array.prototype.findIndex() // Find the comment with this ID // delete the comment with the ID of 823423 + const index = comments.findIndex(comment => comment.id === 823423); + + console.log(index); + + // comments.splice(index, 1); + const newComments = [ + ...comments.slice(0, index), + ...comments.slice(index + 1) + ]; + + From 162689926f843cb4a6a876e736ddb643de0da8ac Mon Sep 17 00:00:00 2001 From: Meg Clarke Date: Sun, 29 Jan 2017 00:09:20 -0500 Subject: [PATCH 08/12] Created a cool canvas drawing code --- 08 - Fun with HTML5 Canvas/index-START.html | 53 +++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/08 - Fun with HTML5 Canvas/index-START.html b/08 - Fun with HTML5 Canvas/index-START.html index 37c148df07..1152bd3c2b 100644 --- a/08 - Fun with HTML5 Canvas/index-START.html +++ b/08 - Fun with HTML5 Canvas/index-START.html @@ -7,6 +7,59 @@