From afb0d69d49baa0cd8f77fd58efcc1d9229f8ea35 Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Wed, 15 May 2024 19:53:07 -0700 Subject: [PATCH 01/43] Add files via upload --- SchedulePage.html | 47 +++++++++++++++++++++++++++++++++++++++++--- forgot_password.css | 2 +- forgot_password.html | 8 ++++---- forgot_password.js | 33 +++++++++++++++++++++++++++++++ home.html | 5 ++++- home.js | 23 +++++++++++++--------- index.html | 2 +- main.css | 6 +++--- script.js | 1 + style.css | 4 ++++ yapity_yappers.css | 2 +- 11 files changed, 110 insertions(+), 23 deletions(-) create mode 100644 forgot_password.js diff --git a/SchedulePage.html b/SchedulePage.html index f834d6e..c978a5c 100644 --- a/SchedulePage.html +++ b/SchedulePage.html @@ -2,6 +2,46 @@ + + + + @@ -73,4 +78,4 @@ - \ No newline at end of file + From 103134d5bf254959fac4ccd69ff57a884e6046d4 Mon Sep 17 00:00:00 2001 From: uhmull <146273318+uhmull@users.noreply.github.com> Date: Sat, 18 May 2024 21:50:48 -0700 Subject: [PATCH 07/43] Update index.html pic --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index b736a05..8187662 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ Login + Girl in a jacket
From 1c399c304229fe7c97520e9a66005e90a7b12f31 Mon Sep 17 00:00:00 2001 From: uhmull <146273318+uhmull@users.noreply.github.com> Date: Sat, 18 May 2024 21:52:04 -0700 Subject: [PATCH 08/43] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 8187662..794166f 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,9 @@ + Girl in a jacket Login - Girl in a jacket
From d1087034758b023f30539fa489d8e963c9ea43f4 Mon Sep 17 00:00:00 2001 From: uhmull <146273318+uhmull@users.noreply.github.com> Date: Sat, 18 May 2024 21:52:28 -0700 Subject: [PATCH 09/43] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 794166f..f895534 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - Girl in a jacket + Girl in a jacket Login From 5f6ac487964d28f6bd6a442aaf4fc33e99815f2d Mon Sep 17 00:00:00 2001 From: uhmull <146273318+uhmull@users.noreply.github.com> Date: Sat, 18 May 2024 21:52:50 -0700 Subject: [PATCH 10/43] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index f895534..e674c6c 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - Girl in a jacket + Girl in a jacket Login From 61c39a43a8153b2a69b9725e3001b432f10075be Mon Sep 17 00:00:00 2001 From: uhmull <146273318+uhmull@users.noreply.github.com> Date: Sat, 18 May 2024 21:54:57 -0700 Subject: [PATCH 11/43] Update index.html --- index.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/index.html b/index.html index e674c6c..bd1862b 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,13 @@ Girl in a jacket + Login From 10597b502c5f2cd91bb5a467a6b0b5dd32f5b516 Mon Sep 17 00:00:00 2001 From: uhmull <146273318+uhmull@users.noreply.github.com> Date: Sat, 18 May 2024 21:55:22 -0700 Subject: [PATCH 12/43] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index bd1862b..73ecff8 100644 --- a/index.html +++ b/index.html @@ -1,7 +1,7 @@ - Girl in a jacket + Girl in a jacket Login From 44942eaf1f7d161582e441cccf6b0c8062dd4919 Mon Sep 17 00:00:00 2001 From: uhmull <146273318+uhmull@users.noreply.github.com> Date: Sat, 18 May 2024 22:01:00 -0700 Subject: [PATCH 14/43] Update index.html From 09676e76ad4ce9db8ad508fdd5e8e739c146c157 Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Wed, 22 May 2024 13:47:32 -0700 Subject: [PATCH 15/43] Update home.html Changed UI significantly --- home.html | 50 ++++++-------------------------------------------- 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/home.html b/home.html index 1b5b61f..c687cd6 100644 --- a/home.html +++ b/home.html @@ -61,58 +61,20 @@

Time you Have for studying:

-

Subject 1

+

Add Subject

-
+

+ id="subjectGrade">

+ oninput="javascript:if (this.value > 100) this.value = 100;" id="subjectTime">
-
-
-
-

Subject 2

-
-
-
-
-
+
- -
-
-
-

Subject 3

-
-
-
-
-
-
- -
-
-
-

Subject 4

-
-
-
-
-
-
-
- - \ No newline at end of file + From d4c387db5b9469c932bed0b9eb874248bcd3b29e Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Wed, 22 May 2024 13:49:28 -0700 Subject: [PATCH 16/43] Update home.js Made the subject sections modular --- home.js | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/home.js b/home.js index ae871dc..a031e7e 100644 --- a/home.js +++ b/home.js @@ -9,7 +9,7 @@ let scheduleHTML = ""; function createStudySchedule(subject, time) { let tempTotal = subject[0] + subject[1] + subject[2] + subject[3]; scheduleHTML = ""; - for (let i = 0; i < 4; i++) { + for (let i = 0; i < subjectNames.length; i++) { let tempval = time * (subject[i] / tempTotal); let tempval2 = tempval - Math.trunc(tempval); if (Math.round(tempval) == 0 && tempval2 < 0.25) { @@ -28,21 +28,21 @@ function createStudySchedule(subject, time) { return scheduleHTML; } +function addSubject(){ + subjectNames.push(document.getElementById("subjectName").value) + subjectGrades.push(document.getElementById("subjectGrade").value) + subjectDays.push(document.getElementById("subjectTime").value) + document.getElementById("subjectName").value = "" + document.getElementById("subjectGrade").value = "" + document.getElementById("subjectTime").value = "" +} + + function scheduleInit() { - studyFinalValues = []; - studyFinalHours = []; - subjectNames = []; - subjectGrades = []; - subjectDays = []; - studyTime = 0; - scheduleHTML = ""; - studyTime = Math.round(1 * document.getElementById("hrs").value); - for (let i = 0; i < 4; i++) { subjectNames[i] = document.getElementById("subject" + (i + 1) + "Name").value; } - for (let i = 0; i < 4; i++) { subjectGrades[i] = Math.abs(document.getElementById("subject" + (i + 1) + "Grade").value) + 1; } - for (let i = 0; i < 4; i++) { subjectDays[i] = Math.abs(document.getElementById("subject" + (i + 1) + "Time").value) + 1; } - for (let i = 0; i < 4; i++) { + for (let i = 0; i < subjectNames.length; i++) { studyFinalValues[i] = 1 / (subjectGrades[i] * subjectDays[i]); } + studyTime = Math.round(1 * document.getElementById("hrs").value); document.cookie = createStudySchedule(studyFinalValues, studyTime); window.location.href = "SchedulePage.html"; document.getElementById("schedule").innerHTML = document.cookie; @@ -52,4 +52,11 @@ function show() { document.getElementById("schedule").innerHTML = ""; let x =document.cookie.split(";")[2]; document.getElementById("schedule").innerHTML = x; -} \ No newline at end of file + studyFinalValues = []; + studyFinalHours = []; + subjectNames = []; + subjectGrades = []; + subjectDays = []; + studyTime = 0; + scheduleHTML = ""; +} From 2c2377cde870dd4bfa29b58fc29ecfb12a3e94cb Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Wed, 22 May 2024 13:54:38 -0700 Subject: [PATCH 17/43] Update home.js fixed bug --- home.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home.js b/home.js index a031e7e..6e6a685 100644 --- a/home.js +++ b/home.js @@ -32,9 +32,9 @@ function addSubject(){ subjectNames.push(document.getElementById("subjectName").value) subjectGrades.push(document.getElementById("subjectGrade").value) subjectDays.push(document.getElementById("subjectTime").value) - document.getElementById("subjectName").value = "" - document.getElementById("subjectGrade").value = "" - document.getElementById("subjectTime").value = "" + document.getElementById("subjectName").value = '' + document.getElementById("subjectGrade").value = '' + document.getElementById("subjectTime").value = '' } From b0339e8fd6b8c2e2ed41360b6cbfe08f892e40ae Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 12:47:57 -0700 Subject: [PATCH 18/43] Update home.js fixed bug --- home.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home.js b/home.js index 6e6a685..f839e7f 100644 --- a/home.js +++ b/home.js @@ -33,8 +33,8 @@ function addSubject(){ subjectGrades.push(document.getElementById("subjectGrade").value) subjectDays.push(document.getElementById("subjectTime").value) document.getElementById("subjectName").value = '' - document.getElementById("subjectGrade").value = '' - document.getElementById("subjectTime").value = '' + document.getElementById("subjectGrade").value = 0 + document.getElementById("subjectTime").value = 0 } From 08ca6587884b38b9aba3237a61bf366e50923ee8 Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 12:52:42 -0700 Subject: [PATCH 19/43] Update SchedulePage.html --- SchedulePage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SchedulePage.html b/SchedulePage.html index 0b57917..0ad4b3f 100644 --- a/SchedulePage.html +++ b/SchedulePage.html @@ -44,7 +44,7 @@ Login From 3a847bbe692d571742ac8bdfc40b851608537681 Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 16:44:24 -0700 Subject: [PATCH 35/43] Update main.css --- main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.css b/main.css index fce8c58..16ffd63 100644 --- a/main.css +++ b/main.css @@ -4,7 +4,7 @@ box-sizing: border-box; margin: 0; padding: 0; - font-family: callibri; + font-family: 'Poppins', 'sans-serif'; } body { @@ -14,7 +14,7 @@ body { h1 { margin-bottom: 8%; text-align: center; - font-family: 'Calibri, 'Trebuchet MS', sans-serif + font-family: 'Poppins', sans-serif color: #000000; letter-spacing: 0.01em; } From 62750fec32db4f5629d09f535ff7b08ff9a9b6e6 Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 16:47:55 -0700 Subject: [PATCH 36/43] Update main.css Reverted commit --- main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.css b/main.css index 16ffd63..bd22276 100644 --- a/main.css +++ b/main.css @@ -4,7 +4,7 @@ box-sizing: border-box; margin: 0; padding: 0; - font-family: 'Poppins', 'sans-serif'; + font-family: sans-serif; } body { @@ -14,7 +14,7 @@ body { h1 { margin-bottom: 8%; text-align: center; - font-family: 'Poppins', sans-serif + font-family: 'Calibri, 'Trebuchet MS', sans-serif color: #000000; letter-spacing: 0.01em; } From 90bb96905f22bb38fece4ab6b14f695503f25cfa Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 16:49:22 -0700 Subject: [PATCH 37/43] Update style.css --- style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style.css b/style.css index 79dd541..a1eb743 100644 --- a/style.css +++ b/style.css @@ -3,7 +3,7 @@ margin: 0; padding: 0; box-sizing: border-box; - font-family: callibri; + font-family: 'Poppins', sans-serif; } html,body{ @@ -15,5 +15,5 @@ html,body{ } .subject{ - + font-size: 40 px; } From 6764c973d9b9e8b2b31ac998080b5a635a01d9be Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 16:50:18 -0700 Subject: [PATCH 38/43] Update yapity_yappers.css --- yapity_yappers.css | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/yapity_yappers.css b/yapity_yappers.css index 929bad6..6562939 100644 --- a/yapity_yappers.css +++ b/yapity_yappers.css @@ -22,20 +22,20 @@ body { text-align: center; } -button { - border: none; - color: white; - padding: 4px 36px; - text-align: center; - text-decoration: none; - display: inline-block; - font-size: 16px; - margin: 6px 1px; - transition-duration: 0.4s; - cursor: pointer; - background-color: #08be7b; - color: black; - border: 2px solid #04AA6D; +.button { + border: none; + background-color: green; + padding: 10px 50px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 18px; + margin: 20px 0; + transition-duration: 0.4s; + cursor: pointer; + border-radius: 5px; + color: #fff; + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); } .button:hover { From 0217acaa6114c8265f7c1bcbcfcd17a0974d128c Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 16:51:47 -0700 Subject: [PATCH 39/43] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 914ecf7..c20e582 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ display: flex; justify-content: center; align-items: center; - font-family: 'Poppins', sans-serif} + font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif} Login From 8a756b3ccd45ece89ee1f12e90ca0f452728c696 Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 16:52:43 -0700 Subject: [PATCH 40/43] Update style.css --- style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style.css b/style.css index a1eb743..393b4c8 100644 --- a/style.css +++ b/style.css @@ -3,7 +3,7 @@ margin: 0; padding: 0; box-sizing: border-box; - font-family: 'Poppins', sans-serif; + font-family: 'Poppins', callibri; } html,body{ From a6cbeea1956e27c42417b8a790060e52f10cc295 Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 16:53:32 -0700 Subject: [PATCH 41/43] Update index.html --- index.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/index.html b/index.html index c20e582..8bed389 100644 --- a/index.html +++ b/index.html @@ -6,8 +6,7 @@ .center { display: flex; justify-content: center; - align-items: center; - font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif} + font-family: 'Poppins', calibri; Login From e186a240743bec5dff0f289f62fe7fc0a2b545ca Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 16:54:36 -0700 Subject: [PATCH 42/43] Update home.html --- home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.html b/home.html index c687cd6..a23ea57 100644 --- a/home.html +++ b/home.html @@ -33,7 +33,7 @@ display: flex; justify-content: center; align-items: center; - font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif + font-family: 'Poppins', calibri; } From edc09065272f9dd316a0a466eaa239290abc1cb2 Mon Sep 17 00:00:00 2001 From: kg-git-hub <148393612+kg-git-hub@users.noreply.github.com> Date: Fri, 24 May 2024 16:56:36 -0700 Subject: [PATCH 43/43] Update yapity_yappers.css --- yapity_yappers.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yapity_yappers.css b/yapity_yappers.css index 6562939..dbb6cd7 100644 --- a/yapity_yappers.css +++ b/yapity_yappers.css @@ -14,7 +14,7 @@ body { display: flex; justify-content: center; align-items: center; - font-family: 'Poppins', sans-serif; + font-family: 'Poppins', calibri; background: linear-gradient(to right, #9fd0a7, #98d0e1); } @@ -36,6 +36,7 @@ body { border-radius: 5px; color: #fff; box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); + font-family: 'Poppins', calibri; } .button:hover { @@ -47,6 +48,8 @@ body { padding: 20px; border-radius: 10px; box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); + font-family: 'Poppins', calibri; + font-size: 30 px; } .left {