From 2e41065130276fb2b68e597aa09d039d577d2484 Mon Sep 17 00:00:00 2001 From: Zuzanna Skokowska Date: Mon, 11 Sep 2023 13:59:21 +0200 Subject: [PATCH 1/7] first changes --- src/index.html | 72 +++++++++++++++++++++++++++++++++++++++----------- src/script.js | 1 + 2 files changed, 57 insertions(+), 16 deletions(-) diff --git a/src/index.html b/src/index.html index 04bd19e..7c6316c 100644 --- a/src/index.html +++ b/src/index.html @@ -4,8 +4,14 @@ JobSimulator.Dev - - + + @@ -23,23 +29,42 @@ > - - Browse Challenges - Sign Up + + Browse Challenges + Sign Up -
- Browse Challenges - Sign Up + -
@@ -70,9 +104,15 @@

Browse Our Challenges

Sign Up & Get Started

- - - + + +
diff --git a/src/script.js b/src/script.js index 529f585..04403e5 100644 --- a/src/script.js +++ b/src/script.js @@ -33,6 +33,7 @@ addEventListener("submit", (event) => { }); let toggleNav = () => { + console.log("click"); var nav = document.getElementById("mobile-nav"); if (nav.className.indexOf("show") == -1) { nav.className += " show"; From 84ba771262119e54d14e830cade7ce671da052d6 Mon Sep 17 00:00:00 2001 From: Zuzanna Skokowska Date: Fri, 15 Sep 2023 14:34:04 +0200 Subject: [PATCH 2/7] nav bar is working but not on mobile --- src/index.html | 25 +++++++++++++++++-------- src/script.js | 1 + 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/index.html b/src/index.html index 7c6316c..fb38bf8 100644 --- a/src/index.html +++ b/src/index.html @@ -16,8 +16,6 @@ - -
diff --git a/src/script.js b/src/script.js index 04403e5..b802577 100644 --- a/src/script.js +++ b/src/script.js @@ -35,6 +35,7 @@ addEventListener("submit", (event) => { let toggleNav = () => { console.log("click"); var nav = document.getElementById("mobile-nav"); + // let nav = document.getElementsByClassName("top"); if (nav.className.indexOf("show") == -1) { nav.className += " show"; } else { From 72e774bc0e8e085074eaef03a36803f884789615 Mon Sep 17 00:00:00 2001 From: Zuzanna Skokowska Date: Mon, 18 Sep 2023 11:30:11 +0200 Subject: [PATCH 3/7] email authorisation --- src/script.js | 15 ++++++++------- src/styles.css | 5 ++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/script.js b/src/script.js index b802577..abb5991 100644 --- a/src/script.js +++ b/src/script.js @@ -24,18 +24,19 @@ addEventListener("submit", (event) => { resetMessage(); let email = document.getElementById("email").value; - - // TODO: Show Correct Status Messages on Signup Form - // 1. successful signup - // 2. empty email - // 3. taken email - // 4. repeat email + if (usersTable.map((users) => users.username).includes(email)) { + renderEmailTakenError(); + } else if (email === "") { + renderEmailEmptyError(); + } else { + usersTable.push({ username: email }); + renderSuccess(); + } }); let toggleNav = () => { console.log("click"); var nav = document.getElementById("mobile-nav"); - // let nav = document.getElementsByClassName("top"); if (nav.className.indexOf("show") == -1) { nav.className += " show"; } else { diff --git a/src/styles.css b/src/styles.css index 2cbb72e..8f87427 100644 --- a/src/styles.css +++ b/src/styles.css @@ -669,7 +669,7 @@ form > span { #jumbo-image { max-height: 20rem; - /* TODO: Invert banner colors using CSS */ + filter: invert(95%); } @media (max-width: 600px) { @@ -876,8 +876,7 @@ form > span { #challenge-grid { display: grid; - /* TODO: Fix Issue, Tiles Need to be 2x2 Grid. Change only grid-template-columns */ - grid-template-columns: none; + grid-template-columns: 1fr 1fr; grid-auto-rows: 10rem; gap: 1rem; padding-top: 2rem; From f6e7d02680181047aa40192bc6b48a5bb28d10a4 Mon Sep 17 00:00:00 2001 From: Zuzanna Skokowska Date: Mon, 18 Sep 2023 11:40:05 +0200 Subject: [PATCH 4/7] all done --- src/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.html b/src/index.html index fb38bf8..d5697d4 100644 --- a/src/index.html +++ b/src/index.html @@ -31,13 +31,13 @@ > Browse Challenges Sign Up From 614b21747bd4522aa1203b68c32fe8ee16df8469 Mon Sep 17 00:00:00 2001 From: Zuzanna Skokowska Date: Mon, 18 Sep 2023 11:55:01 +0200 Subject: [PATCH 5/7] fixed hide-small --- src/index.html | 6 +++--- src/styles.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.html b/src/index.html index d5697d4..ffe73dd 100644 --- a/src/index.html +++ b/src/index.html @@ -26,19 +26,19 @@ title="Toggle Navigation Menu" > - Browse Challenges Sign Up diff --git a/src/styles.css b/src/styles.css index 8f87427..f070778 100644 --- a/src/styles.css +++ b/src/styles.css @@ -725,7 +725,7 @@ form > span { } } @media (max-width: 992px) and (min-width: 601px) { - .hide-medium { + .hide-small { display: none !important; } } From 8bcfa8868fa0cd769766c5bb0710a4fbdbcb5e99 Mon Sep 17 00:00:00 2001 From: Zuzanna Skokowska Date: Mon, 18 Sep 2023 12:58:47 +0200 Subject: [PATCH 6/7] new fix --- src/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles.css b/src/styles.css index f070778..c7c94fa 100644 --- a/src/styles.css +++ b/src/styles.css @@ -669,7 +669,7 @@ form > span { #jumbo-image { max-height: 20rem; - filter: invert(95%); + filter: invert(1); } @media (max-width: 600px) { From ae4cc5df75fd71195b203dbded9d1dee60858dec Mon Sep 17 00:00:00 2001 From: Zuzanna Skokowska Date: Mon, 18 Sep 2023 13:03:43 +0200 Subject: [PATCH 7/7] fix --- src/index.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index ffe73dd..e1d02cc 100644 --- a/src/index.html +++ b/src/index.html @@ -26,7 +26,10 @@ title="Toggle Navigation Menu" > -