diff --git a/SchedulePage.html b/SchedulePage.html index f834d6e..cc71302 100644 --- a/SchedulePage.html +++ b/SchedulePage.html @@ -2,8 +2,49 @@ + + + +
+ Girl in a jacket
diff --git a/forgot_password.css b/forgot_password.css deleted file mode 100644 index 9e34ba3..0000000 --- a/forgot_password.css +++ /dev/null @@ -1,80 +0,0 @@ -@import url('https://fonts.googleapis.com/css?family=Poppins:400,500,600,700&display=swap'); - -* { - box-sizing: border-box; - margin: 0; - padding: 0; - font-family: 'Poppins', sans-serif; -} - -body { - background: -webkit-linear-gradient(left, #63a16d, #79adbe); -} - -h1 { - margin-bottom: 8%; - text-align: center; - color: #000000; - letter-spacing: 0.1em; -} - -p { - margin-top: 5%; - margin-bottom: 5%; - width: 100%; - text-align: center; - border-bottom: 1px solid #000; - line-height: 0.1em; -} - -p span { - background:#fff; - padding:0 10px; -} - -input { - margin-bottom: 3%; -} - -input:last-of-type { - margin-bottom: 0; -} - -input, button { - padding: 3%; - width: 100%; -} - -.login-container { - background-color: white; - padding: 7%; - box-shadow: 0 4px 8px 0 rgba(0,0,0,0.2); - width: 40vw; - margin-left: 30vw; - height: 50vh; /* Reduced height for simplicity */ - margin-top: 20vh; /* Adjusted margin-top for positioning */ -} - -#reset-submit { - border: none; - background-color: darkseagreen; - margin-top: 5%; -} - -button:hover { - cursor: pointer; - opacity: 0.8; - transition: 0.3s; -} - -#create-acct { - display: none; -} - -#return-login { - color: lightgray; - text-decoration: underline; - margin-top: 3%; - display: block; /* Ensures the link takes up full width */ - text-align: center; /* Centers the link */ -} diff --git a/forgot_password.html b/forgot_password.html deleted file mode 100644 index 40f4db6..0000000 --- a/forgot_password.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - Forgot Password - - - -
-
-

Forgot Password

- - -

or

- Return to Login -
-
- - - - diff --git a/home.html b/home.html index b9882e5..a23ea57 100644 --- a/home.html +++ b/home.html @@ -1,4 +1,7 @@ + + + @@ -30,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; } @@ -58,58 +61,20 @@

Time you Have for studying:

-

Subject 1

-
-
-
-
-
-
- -
-
-
-

Subject 2

-
-
-
-
-
-
- -
-
-
-

Subject 3

+

Add Subject

-
+

+ id="subjectGrade">

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

Subject 4

-
-
-
-
-
+
-
- diff --git a/home.js b/home.js index 11037c9..7747e20 100644 --- a/home.js +++ b/home.js @@ -5,39 +5,47 @@ let subjectGrades = []; let subjectDays = []; let studyTime = 0; let scheduleHTML = ""; +let j = 0; +let tempTotal = 0; function createStudySchedule(subject, time) { - let tempTotal = subject[0] + subject[1] + subject[2] + subject[3]; + for(let k = 0; k'; } - studyFinalHours[i] = tempval; - scheduleHTML += '
Study ' + subjectNames[i] + ' for ' + studyFinalHours[i] + ' hours
'; + else if (tempval2 > 0.25 && tempval2 < 0.75) { + studyFinalHours[i] = Math.floor(tempval) + 0.5; + scheduleHTML += '
Study ' + subjectNames[i] + ' for ' + studyFinalHours[i] + ' hours
'; + } + else { + studyFinalHours[i] = Math.round(tempval); + scheduleHTML += '
Study ' + subjectNames[i] + ' for ' + studyFinalHours[i] + ' hours
'; + } } return scheduleHTML; } +function addSubject(){ + subjectNames.push(document.getElementById("subjectName").value); + subjectGrades.push(document.getElementById("subjectGrade").value); + subjectDays.push(document.getElementById("subjectTime").value); + studyFinalValues[j] = (1 / (subjectGrades[j] * 1 * 1 * subjectDays[j])); + document.getElementById("subjectName").value = ''; + document.getElementById("subjectGrade").value = ''; + document.getElementById("subjectTime").value = ''; + j++; +} + + function scheduleInit() { - studyFinalValues = []; - studyFinalHours = []; - subjectNames = []; - subjectGrades = []; - subjectDays = []; - studyTime = 0; - scheduleHTML = ""; - studyTime = 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++) { - 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; diff --git a/index.html b/index.html index 30fecb2..8bed389 100644 --- a/index.html +++ b/index.html @@ -1,6 +1,13 @@ + Girl in a jacket + Login @@ -24,7 +31,7 @@

Sign Up

- Forgot password? + diff --git a/main.css b/main.css index 2a258ed..bd22276 100644 --- a/main.css +++ b/main.css @@ -14,9 +14,9 @@ body { h1 { margin-bottom: 8%; text-align: center; - font-family: "Fredoka One", cursive; + font-family: 'Calibri, 'Trebuchet MS', sans-serif color: #000000; - letter-spacing: 0.1em; + letter-spacing: 0.01em; } p { diff --git a/script.js b/script.js index 8c47c57..56f5809 100644 --- a/script.js +++ b/script.js @@ -104,3 +104,4 @@ returnBtn.addEventListener("click", function() { main.style.display = "block"; createacct.style.display = "none"; }); + diff --git a/style.css b/style.css index 992168b..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{ @@ -13,3 +13,7 @@ html,body{ place-items: center; background: -webkit-linear-gradient(left, #9fd0a7, #98d0e1); } + +.subject{ + font-size: 40 px; +} 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 {