uhmull · kg-git-hub · May 16, 2024 · May 16, 2024 · May 16, 2024 · May 16, 2024
diff --git a/SchedulePage.html b/SchedulePage.html
@@ -2,8 +2,49 @@
 <html lang="en">
 <link rel="stylesheet" href="yapity_yappers.css">
 <head>
+  <script src="https://www.gstatic.com/firebasejs/9.6.0/firebase-app.js"></script>
+  <script src="https://www.gstatic.com/firebasejs/9.6.0/firebase-database.js"></script>
+  <script>
+    // Initialize Firebase
+    var firebaseConfig = {
+      apiKey: "YOUR_API_KEY",
+      authDomain: "YOUR_AUTH_DOMAIN",
+      databaseURL: "YOUR_DATABASE_URL",
+      projectId: "YOUR_PROJECT_ID",
+      storageBucket: "YOUR_STORAGE_BUCKET",
+      messagingSenderId: "YOUR_MESSAGING_SENDER_ID",
+      appId: "YOUR_APP_ID"
+    };
+    firebase.initializeApp(firebaseConfig);
+
+    function scheduleInit() {
+      // Your existing code...
+
+      // Convert the scheduleHTML to a string
+      var scheduleString = scheduleHTML;
+
+      // Get the current user ID
+      var userId = firebase.auth().currentUser.uid;
+
+      // Reference to the Firebase Realtime Database
+      var database = firebase.database();
+
+      // Save the schedule to Firebase
+      firebase.database().ref('users/' + userId).set({
+        schedule: scheduleString
+      }).then(function() {
+        // Redirect to the SchedulePage.html after saving
+        window.location.href = "SchedulePage.html";
+      }).catch(function(error) {
+        // Handle errors
+        console.error("Error saving schedule to Firebase: ", error);
+      });
+    }
+  </script>
+
   <style>
-    :left {
+    @import url('https://fonts.googleapis.com/css?family=Poppins:400,500,600,700&display=swap');
+    .left {
       display: flex;
       justify-content: center;
       align-items: center;
@@ -12,22 +53,27 @@
     .button {
       border: none;
       background-color: green;
-      padding: 4px 36px;
+      padding: 14px 56px;
       text-align: center;
       text-decoration: none;
       display: inline-block;
-      font-size: 16px;
+      font-size: 26px;
       margin: 6px 1px;
       transition-duration: 0.4s;
       cursor: pointer;
     }
+    .subject {
+      font-family: 'Poppins', sans-serif;
+      font-size: 40 px;
+    }
   </style>
 </head>
 <body>
   <div class="container">
+    <img src="SmatStudy_logo (2).png" alt="Girl in a jacket" height="300">
     <div class = "left">
       <button onclick="show()"><b>Generate your Study Schedule</b><button>
-      <div id="schedule"></div>
+      <div id="schedule" class="left"></div>
     </div>
   </div>
   <script src="home.js"></script>

diff --git a/forgot_password.css b/forgot_password.css
diff --git a/forgot_password.html b/forgot_password.html
diff --git a/home.html b/home.html
@@ -1,4 +1,7 @@
 <!DOCTYPE html>
+
+
+
 <html lang="en">
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -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;
     }
   </style>
 </head>
@@ -58,58 +61,20 @@ <h3> Time you Have for studying: </h3>
   <div class="wrapper">
     <form>
       <div class="center">
-        <h3> Subject 1 </h3>
-      </div>
-      <input placeholder="Name:" type="text" id="subject1Name" minlength="1"><br>
-      <input placeholder="Percent grade:" type="number" oninput="javascript:if (this.value > 100) this.value = 100;"
-        id="subject1Grade"><br>
-      <input placeholder="Days until next test:" type="number"
-        oninput="javascript:if (this.value > 100) this.value = 100;" id="subject1Time"><br>
-    </form>
-  </div>
-
-  <div class="center">
-    <form>
-      <div class="center">
-        <h3> Subject 2 </h3>
-      </div>
-      <input placeholder="Name:" type="text" id="subject2Name" minlength="1"><br>
-      <input placeholder="Percent grade:" type="number" oninput="javascript:if (this.value > 100) this.value = 100;"
-        id="subject2Grade"><br>
-      <input placeholder="Days until next test:" type="number"
-        oninput="javascript:if (this.value > 100) this.value = 100;" id="subject2Time"><br>
-    </form>
-  </div>
-
-  <div class="center">
-    <form>
-      <div class="center">
-        <h3> Subject 3 </h3>
+        <h3> Add Subject </h3>
       </div>
-      <input placeholder="Name:" type="text" id="subject3Name" minlength="1"><br>
+      <input placeholder="Name:" type="text" id="subjectName" minlength="1"><br>
       <input placeholder="Percent grade:" type="number" oninput="javascript:if (this.value > 100) this.value = 100;"
-        id="subject3Grade"><br>
+        id="subjectGrade"><br>
       <input placeholder="Days until next test:" type="number"
-        oninput="javascript:if (this.value > 100) this.value = 100;" id="subject3Time"><br>
+        oninput="javascript:if (this.value > 100) this.value = 100;" id="subjectTime"><br>
     </form>
   </div>
-
   <div class="center">
-    <form>
-      <div class="center">
-        <h3> Subject 4 </h3>
-      </div>
-      <input placeholder="Name:" type="text" id="subject4Name" minlength="1"><br>
-      <input placeholder="Percent grade:" type="number" oninput="javascript:if (this.value > 100) this.value = 100;"
-        id="subject4Grade"><br>
-      <input placeholder="Days until next test:" type="number"
-        oninput="javascript:if (this.value > 100) this.value = 100;" id="subject4Time"><br>
-    </form>
+    <button class="button button1" onclick="addSubject()"> <b>Add Subject </b> </button>
   </div>
-
   <div class="center">
     <button class="button button1" onclick="scheduleInit()"> <b>Create Schedule </b> </button>
   </div>
 </body>
-
 </html>
diff --git 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<subjectGrades.length; k++){
+    tempTotal = tempTotal + subject[k];
+  }
   scheduleHTML = "";
-  for (let i = 0; i < 4; i++) {
+  for (let i = 0; i < subjectNames.length; i++) {
     let tempval = time * (subject[i] / tempTotal);
-    if (tempval < 1) {
-      tempval = 1;
-    }
-    else{
-      tempval = Math.round(tempval);
+    let tempval2 = tempval - Math.trunc(tempval);
+    if (Math.round(tempval) == 0 && tempval2 < 0.25) {
+      studyFinalHours[i] = 0;
+      scheduleHTML += '<div class = "subject"> You dont need to study ' + subjectNames[i] + '</div>';
     }
-    studyFinalHours[i] = tempval;
-    scheduleHTML += '<div class = "subject"> Study ' + subjectNames[i] + ' for ' + studyFinalHours[i] + ' hours </div>';
+    else if (tempval2 > 0.25 && tempval2 < 0.75) {
+        studyFinalHours[i] = Math.floor(tempval) + 0.5;
+        scheduleHTML += '<div class = "subject"> Study ' + subjectNames[i] + ' for ' + studyFinalHours[i] + ' hours </div>';
+      }
+      else {
+        studyFinalHours[i] = Math.round(tempval);
+        scheduleHTML += '<div class = "subject"> Study ' + subjectNames[i] + ' for ' + studyFinalHours[i] + ' hours </div>';
+      }
   }
   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
@@ -1,6 +1,13 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <img src="SmatStudy_logo (2).png" alt="Girl in a jacket" height="80">
+  <style>
+    .center {
+      display: flex;
+      justify-content: center;
+      font-family: 'Poppins', calibri;
+  </style>
   <title>Login</title>
   <link rel = "stylesheet" href = "main.css">
 </head>
@@ -24,7 +31,7 @@ <h1>Sign Up</h1>
       <button id = "create-acct-btn">Create Account</button>
       <button id = "return-btn">Return to Login</button>
     </div>
-    <a href="forgot_password.html" id="resetLink">Forgot password?</a>
+
   </div>
   <script type = "module" src = "script.js"></script>
 </body>

diff --git 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
@@ -104,3 +104,4 @@ returnBtn.addEventListener("click", function() {
     main.style.display = "block";
     createacct.style.display = "none";
 });
+
diff --git 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;
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -104,3 +104,4 @@ returnBtn.addEventListener("click", function() {
		main.style.display = "block";
		createacct.style.display = "none";
		});