From 300872930a1dd624ef994cf8d59641fa5bba902d Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Thu, 4 May 2023 16:15:48 -0700 Subject: [PATCH 01/16] First commit - Week 1 HTML completed. --- Week 1.1 - HTML/1. Build a Form/index.html | 8 ++++++- .../index.html | 9 +++++++- .../index.html | 9 +++++--- .../4. Mock Up a Design/index.html | 22 ++++++++++++++++--- 4 files changed, 40 insertions(+), 8 deletions(-) diff --git a/Week 1.1 - HTML/1. Build a Form/index.html b/Week 1.1 - HTML/1. Build a Form/index.html index 50432a8b..cc3a15fc 100644 --- a/Week 1.1 - HTML/1. Build a Form/index.html +++ b/Week 1.1 - HTML/1. Build a Form/index.html @@ -7,7 +7,13 @@ - +
+ +

+

+

\ No newline at end of file diff --git a/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html b/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html index a132ac2a..79ea9b8b 100644 --- a/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html +++ b/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html @@ -24,7 +24,14 @@ - + a light gray box with dark gray dynamic text that displays the current resolution of the image \ No newline at end of file diff --git a/Week 1.1 - HTML/3. Create a Reponsive Image - Aspect Ratio/index.html b/Week 1.1 - HTML/3. Create a Reponsive Image - Aspect Ratio/index.html index d8bb518c..ef7e5cd8 100644 --- a/Week 1.1 - HTML/3. Create a Reponsive Image - Aspect Ratio/index.html +++ b/Week 1.1 - HTML/3. Create a Reponsive Image - Aspect Ratio/index.html @@ -23,8 +23,11 @@ - - - + + + a light gray box with dark gray dynamic text that displays the current resolution of the image + \ No newline at end of file diff --git a/Week 1.1 - HTML/4. Mock Up a Design/index.html b/Week 1.1 - HTML/4. Mock Up a Design/index.html index a7252a6f..178ebac5 100644 --- a/Week 1.1 - HTML/4. Mock Up a Design/index.html +++ b/Week 1.1 - HTML/4. Mock Up a Design/index.html @@ -6,8 +6,24 @@ Mock Up a Design - - - + +
+

Phase 4:

+

Destination Thrive

+

Objective: Create omni-channel synergy

+

copy goes here

+
+

KEY FOCUS:

+ +

TIME

+ approx. 24 months and beyond +
\ No newline at end of file From b3b9c3ea5ef8defe9e215ef5a3b0f5c58df97069 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Thu, 4 May 2023 16:29:55 -0700 Subject: [PATCH 02/16] Week 1 HTML completed. Week 1 CSS complete. --- Week 1.2 - CSS/1. Selectors - Attributes/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Week 1.2 - CSS/1. Selectors - Attributes/index.html b/Week 1.2 - CSS/1. Selectors - Attributes/index.html index 3d9c05b8..d85854ca 100644 --- a/Week 1.2 - CSS/1. Selectors - Attributes/index.html +++ b/Week 1.2 - CSS/1. Selectors - Attributes/index.html @@ -9,7 +9,7 @@ From 1c46b9b58ea8a74177cc9807d8956595c4d59cc4 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Thu, 4 May 2023 16:34:15 -0700 Subject: [PATCH 03/16] Fixed error: All week 1 CSS exercises now pushed up. --- .../2. Selectors - Children/index.html | 2 +- .../3. Selectors - Siblings/index.html | 2 +- .../4. Inheritance and Systems/index.html | 30 ++++++++++++++++--- Week 1.2 - CSS/5. Transitions/index.html | 7 +++++ .../6. Tricks - Click Passthrough/index.html | 1 + 5 files changed, 36 insertions(+), 6 deletions(-) diff --git a/Week 1.2 - CSS/2. Selectors - Children/index.html b/Week 1.2 - CSS/2. Selectors - Children/index.html index 7ff366db..36cf1b96 100644 --- a/Week 1.2 - CSS/2. Selectors - Children/index.html +++ b/Week 1.2 - CSS/2. Selectors - Children/index.html @@ -9,7 +9,7 @@
    diff --git a/Week 1.2 - CSS/3. Selectors - Siblings/index.html b/Week 1.2 - CSS/3. Selectors - Siblings/index.html index b6086a75..1b683a91 100644 --- a/Week 1.2 - CSS/3. Selectors - Siblings/index.html +++ b/Week 1.2 - CSS/3. Selectors - Siblings/index.html @@ -16,7 +16,7 @@ - - - + + + \ No newline at end of file diff --git a/Week 1.2 - CSS/5. Transitions/index.html b/Week 1.2 - CSS/5. Transitions/index.html index 4fa3bd71..527d9e86 100644 --- a/Week 1.2 - CSS/5. Transitions/index.html +++ b/Week 1.2 - CSS/5. Transitions/index.html @@ -22,7 +22,14 @@ width: 100px; height: 100px; background-color: rebeccapurple; + transition: transform 160ms ease-in; } + + .box:hover { + transform: scale(2); + transition: transform 200ms ease-out; + } +
    diff --git a/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html b/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html index 769c1a18..05f6caf9 100644 --- a/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html +++ b/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html @@ -29,6 +29,7 @@ width: 100%; height: 100%; background-image: linear-gradient(to bottom, transparent, black); + pointer-events: none; } From 4f5571bf2b6d22fabeb3fba84145a2136613efe5 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Mon, 8 May 2023 08:33:14 -0700 Subject: [PATCH 04/16] Javascript Exercise 1 complete. --- Week 1.3 - JavaScript/1. Filter/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Week 1.3 - JavaScript/1. Filter/index.html b/Week 1.3 - JavaScript/1. Filter/index.html index e74982a2..93c97a3b 100644 --- a/Week 1.3 - JavaScript/1. Filter/index.html +++ b/Week 1.3 - JavaScript/1. Filter/index.html @@ -13,7 +13,7 @@ // Custom Code BEGIN // Modify the code in this block however you need to get the desired ending array. // You must store your new array in the `endingArray` variable for it to log out properly. - let endingArray; + let endingArray = startingArray.filter((num) => num % 2 === 0); // Custom Code END From 33c0d46ac83c1d68e643363880106db4b29299cc Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Mon, 8 May 2023 08:44:11 -0700 Subject: [PATCH 05/16] Javascript Exercise 2 complete. --- Week 1.3 - JavaScript/2. Map/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Week 1.3 - JavaScript/2. Map/index.html b/Week 1.3 - JavaScript/2. Map/index.html index 72fa39ee..ec605df6 100644 --- a/Week 1.3 - JavaScript/2. Map/index.html +++ b/Week 1.3 - JavaScript/2. Map/index.html @@ -13,7 +13,9 @@ // Custom Code BEGIN // Modify the code in this block however you need to get the desired ending array. // You must store your new array in the `endingArray` variable for it to log out properly. - let endingArray; + let endingArray = startingArray.map(function(name){ + return `{name: '${name}'}`; + }); // Custom Code END From 1b3126f664adbd80fd3b5607f379bbed4061e0b3 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Mon, 8 May 2023 16:53:01 -0700 Subject: [PATCH 06/16] Javascript Exercise 3 complete. --- Week 1.3 - JavaScript/2. Map/index.html | 7 +-- .../3. Objects as a Map/index.html | 48 +++++++++++++------ 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/Week 1.3 - JavaScript/2. Map/index.html b/Week 1.3 - JavaScript/2. Map/index.html index ec605df6..f538510d 100644 --- a/Week 1.3 - JavaScript/2. Map/index.html +++ b/Week 1.3 - JavaScript/2. Map/index.html @@ -13,9 +13,10 @@ // Custom Code BEGIN // Modify the code in this block however you need to get the desired ending array. // You must store your new array in the `endingArray` variable for it to log out properly. - let endingArray = startingArray.map(function(name){ - return `{name: '${name}'}`; - }); + + const endingArray = startingArray.map(function(value) { + return {name: value}; + }) // Custom Code END diff --git a/Week 1.3 - JavaScript/3. Objects as a Map/index.html b/Week 1.3 - JavaScript/3. Objects as a Map/index.html index 3004949a..8186532e 100644 --- a/Week 1.3 - JavaScript/3. Objects as a Map/index.html +++ b/Week 1.3 - JavaScript/3. Objects as a Map/index.html @@ -8,25 +8,45 @@ From 937184918857414847092891a460c70f0eb79837 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Tue, 9 May 2023 09:19:16 -0700 Subject: [PATCH 07/16] Javascript exercise 4 completed. --- Week 1.3 - JavaScript/4. Event Listeners/index.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Week 1.3 - JavaScript/4. Event Listeners/index.html b/Week 1.3 - JavaScript/4. Event Listeners/index.html index d284e48f..1950a763 100644 --- a/Week 1.3 - JavaScript/4. Event Listeners/index.html +++ b/Week 1.3 - JavaScript/4. Event Listeners/index.html @@ -8,7 +8,10 @@

    0

    - + + + + From 947f52051b40bbac8b29a641869cbeaa252eb36c Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Tue, 9 May 2023 14:22:17 -0700 Subject: [PATCH 08/16] Javascript exercise 5 complete. --- Week 1.3 - JavaScript/5. DOM Manipulation/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Week 1.3 - JavaScript/5. DOM Manipulation/index.html b/Week 1.3 - JavaScript/5. DOM Manipulation/index.html index ba0e04f2..d79986aa 100644 --- a/Week 1.3 - JavaScript/5. DOM Manipulation/index.html +++ b/Week 1.3 - JavaScript/5. DOM Manipulation/index.html @@ -24,6 +24,12 @@

    More Jeff Goldblum

    From 24671f98c75ac4a75967a5fccd7e6c5bbc047a33 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Wed, 10 May 2023 17:14:49 -0700 Subject: [PATCH 09/16] All CSS grid exercises completed. --- .../Data Fetching/index.html | 3 ++ .../1. Responsive Grids/index.html | 18 ++++--- .../2. Placing Items/index.html | 7 ++- .../3. Placing Items - Advanced/index.html | 50 ++++++++++++++++--- 4 files changed, 61 insertions(+), 17 deletions(-) diff --git a/Week 1.3 - JavaScript/Data Fetching/index.html b/Week 1.3 - JavaScript/Data Fetching/index.html index c1da8137..d07c4448 100644 --- a/Week 1.3 - JavaScript/Data Fetching/index.html +++ b/Week 1.3 - JavaScript/Data Fetching/index.html @@ -11,6 +11,9 @@ diff --git a/Week 2.1 - CSS Grid/1. Responsive Grids/index.html b/Week 2.1 - CSS Grid/1. Responsive Grids/index.html index 2d612e63..02560fec 100644 --- a/Week 2.1 - CSS Grid/1. Responsive Grids/index.html +++ b/Week 2.1 - CSS Grid/1. Responsive Grids/index.html @@ -29,55 +29,57 @@
    placeholder -

    Lorem Ipsum Dolor

    +

    Lorem Ipsum Dolor1

    Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine? Wh-what is-h-how did you get my espresso machine? I was part of something special. Eventually, you do plan to have dinosaurs on your dinosaur tour, right?

    Read More
    placeholder -

    Lorem Ipsum Dolor

    +

    Lorem Ipsum Dolor2

    Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine? Wh-what is-h-how did you get my espresso machine? I was part of something special.

    Read More
    placeholder -

    Lorem Ipsum Dolor

    +

    Lorem Ipsum Dolor3

    Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine? Wh-what is-h-how did you get my espresso machine?

    Read More
    placeholder -

    Lorem Ipsum Dolor

    +

    Lorem Ipsum Dolor4

    Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine?

    Read More
    placeholder -

    Lorem Ipsum Dolor

    +

    Lorem Ipsum Dolor5

    Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine?

    Read More
    placeholder -

    Lorem Ipsum Dolor

    +

    Lorem Ipsum Dolor6

    Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine? Wh-what is-h-how did you get my espresso machine?

    Read More
    placeholder -

    Lorem Ipsum Dolor

    +

    Lorem Ipsum Dolor7

    Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine? Wh-what is-h-how did you get my espresso machine? I was part of something special.

    Read More
    placeholder -

    Lorem Ipsum Dolor

    +

    Lorem Ipsum Dolor8

    Forget the fat lady! You're obsessed with the fat lady! Drive us out of here! Is this my espresso machine? Wh-what is-h-how did you get my espresso machine? I was part of something special. Eventually, you do plan to have dinosaurs on your dinosaur tour, right?

    Read More
    diff --git a/Week 2.1 - CSS Grid/2. Placing Items/index.html b/Week 2.1 - CSS Grid/2. Placing Items/index.html index fcd7781b..8854f027 100644 --- a/Week 2.1 - CSS Grid/2. Placing Items/index.html +++ b/Week 2.1 - CSS Grid/2. Placing Items/index.html @@ -12,13 +12,18 @@ max-width: 800px; } - .photo > * { mix-blend-mode: multiply; } + .photo > * { + mix-blend-mode: multiply; + }
    diff --git a/Week 2.1 - CSS Grid/3. Placing Items - Advanced/index.html b/Week 2.1 - CSS Grid/3. Placing Items - Advanced/index.html index 0161e9be..b3d9a0b3 100644 --- a/Week 2.1 - CSS Grid/3. Placing Items - Advanced/index.html +++ b/Week 2.1 - CSS Grid/3. Placing Items - Advanced/index.html @@ -43,63 +43,97 @@ border-color: mediumslateblue; background-color: lightcyan; } +
  • h
  • e
  • l
    • -
  • l
    • +
  • l
  • o
    • -
  • !
    • +
  • !
  • -
  • -
  • -
  • -
  • -
  • -
  • +
  • From 24605392fe0235239f1d59b9e5e8ec16f72a5364 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Thu, 11 May 2023 10:13:13 -0700 Subject: [PATCH 10/16] Flexbox Exercise 1 complete. --- Week 2.2 - Flexbox/1. Centering/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Week 2.2 - Flexbox/1. Centering/index.html b/Week 2.2 - Flexbox/1. Centering/index.html index 5283be49..9481a501 100644 --- a/Week 2.2 - Flexbox/1. Centering/index.html +++ b/Week 2.2 - Flexbox/1. Centering/index.html @@ -25,6 +25,10 @@ background-color: whitesmoke; /* Add to your code here to center the box within the container */ + display: flex; + justify-content: center; + align-items: center; + } From 90fd063d103e96aa95d99d71b169abace2039cd4 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Thu, 11 May 2023 10:47:31 -0700 Subject: [PATCH 11/16] Flexbox Exercise 2 complete. --- Week 2.2 - Flexbox/2. Placing Items/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Week 2.2 - Flexbox/2. Placing Items/index.html b/Week 2.2 - Flexbox/2. Placing Items/index.html index 986e0ee4..35b3e427 100644 --- a/Week 2.2 - Flexbox/2. Placing Items/index.html +++ b/Week 2.2 - Flexbox/2. Placing Items/index.html @@ -28,6 +28,10 @@ The `.logo` and `.links` should also be center aligned with each other. */ + + display: flex; + justify-content: space-between; + align-items: center; } From 7458fab8ddc1e4a5a26b0100e1289815b6fbc3ea Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Thu, 11 May 2023 14:22:17 -0700 Subject: [PATCH 12/16] Flexbox Exercise 3 complete. --- .../3. Placing Items - Advanced/index.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html b/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html index 9ff4f7e7..f083486f 100644 --- a/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html +++ b/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html @@ -24,7 +24,14 @@
    From 19de30a007ae78676db2c3b4d88b273888620125 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Thu, 11 May 2023 17:30:54 -0700 Subject: [PATCH 13/16] Flexbox Exercise 4 complete. --- Week 2.2 - Flexbox/4. Flexing/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Week 2.2 - Flexbox/4. Flexing/index.html b/Week 2.2 - Flexbox/4. Flexing/index.html index 443de97c..5bd6251c 100644 --- a/Week 2.2 - Flexbox/4. Flexing/index.html +++ b/Week 2.2 - Flexbox/4. Flexing/index.html @@ -40,14 +40,20 @@ From 36487e94a364f6bc312a4eb625758e9a70a4b823 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Thu, 18 May 2023 16:27:55 -0700 Subject: [PATCH 14/16] Data fetching exercise update - still incomplete --- .../Data Fetching/index.html | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/Week 1.3 - JavaScript/Data Fetching/index.html b/Week 1.3 - JavaScript/Data Fetching/index.html index d07c4448..d3f67b9d 100644 --- a/Week 1.3 - JavaScript/Data Fetching/index.html +++ b/Week 1.3 - JavaScript/Data Fetching/index.html @@ -11,9 +11,34 @@ From a7777a76d2009f8a788cb3a89723b918686987b5 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Mon, 22 May 2023 13:58:06 -0700 Subject: [PATCH 15/16] Data fetching exercise completed. --- Week 1.3 - JavaScript/Data Fetching/index.html | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Week 1.3 - JavaScript/Data Fetching/index.html b/Week 1.3 - JavaScript/Data Fetching/index.html index d3f67b9d..515a2f84 100644 --- a/Week 1.3 - JavaScript/Data Fetching/index.html +++ b/Week 1.3 - JavaScript/Data Fetching/index.html @@ -24,21 +24,13 @@ viewFilms.then(res => res.json() ).then(data => { - console.log(data); + const dataArr = data.results; + dataArr.forEach(elem => { + const filmItem = `
  • ${elem.title}
    • `; + document.querySelector('.movies').innerHTML += filmItem; + }) }).catch(handleError); - - - // function fetchTitles() { - // const res = fetch(baseEndpoint); - // const resData = res.json(); - // return resData; - // console.log(resData.title) - - // } - - - From 65b0e4347607a9175a57aca6d914dd895b1121f1 Mon Sep 17 00:00:00 2001 From: Alice Retz Date: Thu, 15 Jun 2023 14:49:26 -0700 Subject: [PATCH 16/16] Fixes in the html responsive images file and the css responsive grid file. --- .../index.html | 10 +++++----- Week 2.1 - CSS Grid/1. Responsive Grids/index.html | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html b/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html index 79ea9b8b..71a7e910 100644 --- a/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html +++ b/Week 1.1 - HTML/2. Create a Responsive Image - Resolution/index.html @@ -26,11 +26,11 @@ a light gray box with dark gray dynamic text that displays the current resolution of the image diff --git a/Week 2.1 - CSS Grid/1. Responsive Grids/index.html b/Week 2.1 - CSS Grid/1. Responsive Grids/index.html index 02560fec..f58fba24 100644 --- a/Week 2.1 - CSS Grid/1. Responsive Grids/index.html +++ b/Week 2.1 - CSS Grid/1. Responsive Grids/index.html @@ -30,7 +30,7 @@ .cards { /* Add your code here */ display: grid; - grid-template-columns: repeat( auto-fit, minmax(280px)); + grid-template-columns: repeat( auto-fit, minmax(280px, 1fr)); }