From 9d0e39d36377a57aa04a572d68bd12071daeb437 Mon Sep 17 00:00:00 2001 From: Christy Date: Tue, 19 Apr 2022 15:50:40 -0700 Subject: [PATCH 01/14] Initial changes for responsive image --- .../3. Create a Reponsive Image - Aspect Ratio/index.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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..10326c82 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,12 @@ - + + + + + \ No newline at end of file From ea215532fa1b160f94b166bc1ce31fc885d94f76 Mon Sep 17 00:00:00 2001 From: Christy Date: Tue, 19 Apr 2022 15:58:05 -0700 Subject: [PATCH 02/14] Updated spacing --- .../3. Create a Reponsive Image - Aspect Ratio/index.html | 1 + 1 file changed, 1 insertion(+) 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 10326c82..9c50597f 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,6 +23,7 @@ + From e1ded23e7498392b712ad76b801e89960906e9e0 Mon Sep 17 00:00:00 2001 From: Christy Date: Thu, 21 Apr 2022 13:27:19 -0700 Subject: [PATCH 03/14] Completed Form Assesment --- Week 1.1 - HTML/1. Build a Form/README.md | 12 ++++++------ Week 1.1 - HTML/1. Build a Form/index.html | 7 +++++++ login | 0 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 login diff --git a/Week 1.1 - HTML/1. Build a Form/README.md b/Week 1.1 - HTML/1. Build a Form/README.md index 54a9fabf..ccba6ae8 100644 --- a/Week 1.1 - HTML/1. Build a Form/README.md +++ b/Week 1.1 - HTML/1. Build a Form/README.md @@ -1,12 +1,12 @@ # Build a Form Build a form with the following specifications: -- [ ] An input field to accept and validate emails -- [ ] An input field to accept a password -- [ ] A button to submit the form -- [ ] The form submits to the a page at `/login/` -- [ ] The form uses POST to submit the form data +- [x ] An input field to accept and validate emails +- [x ] An input field to accept a password +- [x ] A button to submit the form +- [x ] The form submits to the a page at `/login/` +- [x ] The form uses POST to submit the form data - [ ] Form is accessible to a screen reader -- [ ] Form is keyboard navigable +- [x ] Form is keyboard navigable Build your form in designated area in the provided HTML file. \ No newline at end of file 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..46f1a8e5 100644 --- a/Week 1.1 - HTML/1. Build a Form/index.html +++ b/Week 1.1 - HTML/1. Build a Form/index.html @@ -8,6 +8,13 @@ +
+ +
+ +
+ +
\ No newline at end of file diff --git a/login b/login new file mode 100644 index 00000000..e69de29b From 866770a3b8cb56e4c65f9b96aeecc33e4af85685 Mon Sep 17 00:00:00 2001 From: Christy Date: Thu, 21 Apr 2022 15:58:39 -0700 Subject: [PATCH 04/14] Completed Responsive Image assesments --- .../index.html | 13 +++++++++++-- .../index.html | 4 ++-- 2 files changed, 13 insertions(+), 4 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 a132ac2a..3e6937d8 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 @@ -25,6 +25,15 @@ - + + + + + + + + - \ No newline at end of file + + + \ 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 9c50597f..c9e7bb92 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 @@ -28,8 +28,8 @@ - - + + \ No newline at end of file From 07df9a85ac1ce347008320bce99106611c349b23 Mon Sep 17 00:00:00 2001 From: Christy Date: Thu, 21 Apr 2022 17:15:51 -0700 Subject: [PATCH 05/14] Complete Mock Up Assesment --- .../4. Mock Up a Design/index.html | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) 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..ffd467ea 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 @@ -8,6 +8,32 @@ + + +
+
+

Phase 4:

+

Destination Thrive

+

Objective: Create omni-channel synergy

+

This is the time to fully leverage your heard work and thrive. During this + phase, attention should be given to create omni-channel synergy, syncing your + messagin and channels from top to bottom. Scale hi performing channels and fully + harvest the demand your top of funnel awareness campaigns have been creating. Use + insights gained from your contact lists, data, and web analytics to do prospecting + and build look-a-like audiences for incremental growth. +

+
+

Key focus:

+
    +
  • Harvesting the demand created by your content marketing effords
    • +
  • Scale paid media and social efforts
    • +
  • Leverage your new audiences
    • +
  • Omni-channel synergy
    • +
+

Time clock

+

approx. 24 months and beyond

+
+
\ No newline at end of file From 57f6219dde6678489143a68359fae7baf501d217 Mon Sep 17 00:00:00 2001 From: Christy Date: Mon, 25 Apr 2022 16:56:12 -0700 Subject: [PATCH 06/14] Completed CSS assesments --- .../1. Selectors - Attributes/index.html | 2 +- .../2. Selectors - Children/index.html | 2 +- .../3. Selectors - Siblings/index.html | 2 +- .../4. Inheritance and Systems/index.html | 33 ++++++++++++++++--- Week 1.2 - CSS/5. Transitions/index.html | 7 ++++ .../6. Tricks - Click Passthrough/index.html | 1 + 6 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Week 1.2 - CSS/1. Selectors - Attributes/index.html b/Week 1.2 - CSS/1. Selectors - Attributes/index.html index 3d9c05b8..3cebce6c 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 @@ diff --git a/Week 1.2 - CSS/2. Selectors - Children/index.html b/Week 1.2 - CSS/2. Selectors - Children/index.html index 7ff366db..3a43d88b 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..3dadcde2 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: width 200ms, height 200ms; } + + .box:hover { + width: 200px; + height: 200px; + } +
    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..14c2a661 100644 --- a/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html +++ b/Week 1.2 - CSS/6. Tricks - Click Passthrough/index.html @@ -22,6 +22,7 @@ From aeeefc81bf2be6243d10a189706b938c9a398ce1 Mon Sep 17 00:00:00 2001 From: Christy Date: Tue, 26 Apr 2022 15:25:05 -0700 Subject: [PATCH 08/14] Completed JS Filter Assessment --- 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..b2537489 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(item => item % 2 === 0); // Custom Code END From aec6b8e172303f57721e5573834745864c90f4cc Mon Sep 17 00:00:00 2001 From: Christy Date: Tue, 26 Apr 2022 15:32:49 -0700 Subject: [PATCH 09/14] Completed Map Assesment --- Week 1.3 - JavaScript/2. Map/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Week 1.3 - JavaScript/2. Map/index.html b/Week 1.3 - JavaScript/2. Map/index.html index 72fa39ee..91ccf0a2 100644 --- a/Week 1.3 - JavaScript/2. Map/index.html +++ b/Week 1.3 - JavaScript/2. Map/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.map(item => ({name: item})); // Custom Code END From 3da9d30fb6cad74e133c29a72abcde5f92459684 Mon Sep 17 00:00:00 2001 From: Christy Date: Thu, 28 Apr 2022 15:12:02 -0700 Subject: [PATCH 10/14] Completed several JS assesments and began fetching --- .../3. Objects as a Map/index.html | 18 +++++++----------- .../4. Event Listeners/index.html | 2 ++ .../5. DOM Manipulation/index.html | 3 +++ Week 1.3 - JavaScript/Data Fetching/index.html | 7 +++++++ 4 files changed, 19 insertions(+), 11 deletions(-) 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..068331f6 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 @@ -13,19 +13,15 @@ // Rewrite this function to replace the if/else logic with a map lookup. function getInformation(key) { - let rtn; + const data = new Map(); - if (key === 'date') { - rtn = 'October 6, 1986'; - } else if (key === 'time') { - rtn = '21:13 PM'; - } else if (key === 'mood') { - rtn = 'Powerful, spirited...'; - } else { - rtn = 'Error: Invalid option selected...'; - } + data.set('date', 'October 6, 1986'); + data.set('time', '21:13 PM'); + data.set('Powerful, spirited...'); + console.log(data); - return rtn; + let rtn = data.has(key) ? data.get(key) : 'Error: Invalid option selected...' + return rtn } diff --git a/Week 1.3 - JavaScript/4. Event Listeners/index.html b/Week 1.3 - JavaScript/4. Event Listeners/index.html index d284e48f..6b041df9 100644 --- a/Week 1.3 - JavaScript/4. Event Listeners/index.html +++ b/Week 1.3 - JavaScript/4. Event Listeners/index.html @@ -20,6 +20,8 @@

    0

    } // Add your code here to make clicking the button run the increment function + const buttonEl = document.querySelector('[data-action="increment-counter"]'); + buttonEl.addEventListener('click', increment); diff --git a/Week 1.3 - JavaScript/5. DOM Manipulation/index.html b/Week 1.3 - JavaScript/5. DOM Manipulation/index.html index ba0e04f2..ef79aa59 100644 --- a/Week 1.3 - JavaScript/5. DOM Manipulation/index.html +++ b/Week 1.3 - JavaScript/5. DOM Manipulation/index.html @@ -24,6 +24,9 @@

    More Jeff Goldblum

    diff --git a/Week 1.3 - JavaScript/Data Fetching/index.html b/Week 1.3 - JavaScript/Data Fetching/index.html index c1da8137..2acddf89 100644 --- a/Week 1.3 - JavaScript/Data Fetching/index.html +++ b/Week 1.3 - JavaScript/Data Fetching/index.html @@ -11,6 +11,13 @@ From dc199b1b32481dccb3cbdf0b2d903722199e18a7 Mon Sep 17 00:00:00 2001 From: Christy Date: Fri, 29 Apr 2022 11:33:58 -0700 Subject: [PATCH 11/14] Completed last JS assesment Data Fetching --- .../Data Fetching/index.html | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/Week 1.3 - JavaScript/Data Fetching/index.html b/Week 1.3 - JavaScript/Data Fetching/index.html index 2acddf89..3b93a7cd 100644 --- a/Week 1.3 - JavaScript/Data Fetching/index.html +++ b/Week 1.3 - JavaScript/Data Fetching/index.html @@ -12,12 +12,26 @@ From 10fd7c541275b2ddf35b52bad8c8c54dbd46760a Mon Sep 17 00:00:00 2001 From: Christy Date: Fri, 29 Apr 2022 13:31:43 -0700 Subject: [PATCH 12/14] Completed Assessments for Flexbox and Grid --- .../Data Fetching/index.html | 2 +- .../1. Responsive Grids/index.html | 2 + .../2. Placing Items/index.html | 8 ++++ .../3. Placing Items - Advanced/index.html | 48 ++++++++++++++++--- Week 2.2 - Flexbox/1. Centering/index.html | 3 ++ .../2. Placing Items/index.html | 3 ++ .../3. Placing Items - Advanced/index.html | 8 ++++ Week 2.2 - Flexbox/4. Flexing/index.html | 6 +++ 8 files changed, 73 insertions(+), 7 deletions(-) diff --git a/Week 1.3 - JavaScript/Data Fetching/index.html b/Week 1.3 - JavaScript/Data Fetching/index.html index 3b93a7cd..e23ce0a3 100644 --- a/Week 1.3 - JavaScript/Data Fetching/index.html +++ b/Week 1.3 - JavaScript/Data Fetching/index.html @@ -22,7 +22,7 @@ const newLi = `

  • ${element.title}


    - +
    • `; // I added more than just a simple li cause I wanted it to be more than a list moviesEl.insertAdjacentHTML('beforeend', newLi) }); 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..ee7afc65 100644 --- a/Week 2.1 - CSS Grid/1. Responsive Grids/index.html +++ b/Week 2.1 - CSS Grid/1. Responsive Grids/index.html @@ -29,6 +29,8 @@ 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..dfe30b90 100644 --- a/Week 2.1 - CSS Grid/2. Placing Items/index.html +++ b/Week 2.1 - CSS Grid/2. Placing Items/index.html @@ -19,6 +19,14 @@
    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..fc0b6d1a 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 @@ -49,6 +49,42 @@
    @@ -64,42 +100,42 @@
  • -
  • +
  • -
  • +
  • -
  • +
  • -
  • +
  • -
  • +
  • -
  • +
  • diff --git a/Week 2.2 - Flexbox/1. Centering/index.html b/Week 2.2 - Flexbox/1. Centering/index.html index 5283be49..89ae2f99 100644 --- a/Week 2.2 - Flexbox/1. Centering/index.html +++ b/Week 2.2 - Flexbox/1. Centering/index.html @@ -25,6 +25,9 @@ background-color: whitesmoke; /* Add to your code here to center the box within the container */ + display: flex; + justify-content: center; + align-items: center; } diff --git a/Week 2.2 - Flexbox/2. Placing Items/index.html b/Week 2.2 - Flexbox/2. Placing Items/index.html index 986e0ee4..318fbdcf 100644 --- a/Week 2.2 - Flexbox/2. Placing Items/index.html +++ b/Week 2.2 - Flexbox/2. Placing Items/index.html @@ -28,6 +28,9 @@ The `.logo` and `.links` should also be center aligned with each other. */ + display: flex; + justify-content: space-between; + align-items: center; } 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..d26c33ab 100644 --- a/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html +++ b/Week 2.2 - Flexbox/3. Placing Items - Advanced/index.html @@ -25,6 +25,14 @@
    diff --git a/Week 2.2 - Flexbox/4. Flexing/index.html b/Week 2.2 - Flexbox/4. Flexing/index.html index 443de97c..9a9a6b65 100644 --- a/Week 2.2 - Flexbox/4. Flexing/index.html +++ b/Week 2.2 - Flexbox/4. Flexing/index.html @@ -40,14 +40,20 @@ From 3cedb6266d95d4f950e795c6242314e127326539 Mon Sep 17 00:00:00 2001 From: Christy Date: Tue, 10 May 2022 10:36:28 -0700 Subject: [PATCH 13/14] Fixed missing key for 'mood' --- Week 1.3 - JavaScript/3. Objects as a Map/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 068331f6..18541103 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 @@ -17,7 +17,7 @@ data.set('date', 'October 6, 1986'); data.set('time', '21:13 PM'); - data.set('Powerful, spirited...'); + data.set('mood', 'Powerful, spirited...'); console.log(data); let rtn = data.has(key) ? data.get(key) : 'Error: Invalid option selected...' From a272273701766873674e4fff794acd8c1b1cf47b Mon Sep 17 00:00:00 2001 From: Christy Date: Tue, 10 May 2022 10:43:20 -0700 Subject: [PATCH 14/14] Fixed to width:100% --- .../2. Create a Responsive Image - Resolution/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3e6937d8..e276bfb3 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 @@ -30,7 +30,7 @@ - +