Merge pull request #1 from Noah-H3467/In-Development

In development
Noah-H3467 · Feb 19, 2025 · beb925d · beb925d
2 parents 483a050 + ce81115
commit beb925d
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 359 deletions.
diff --git a/calculator.py b/calculator.py
diff --git a/index.html b/index.html
@@ -8,44 +8,54 @@
     <title>Main Page</title>
   </head>
   <body>
-    <h1>Welcome to the N+N GPA Calculator!</h1>
+    <h1>Welcome to the GPA Calculator with HTML!</h1>
+
+    <div>
+      <p id="instructionText"></p>
+    </div>
+
     <div id="calculator">
         <input id="display" readonly>
         <div id="keys">
-            <button onclick="clearDisplay()" class="operator-btn">C</button>
-            <button onclick="appendToDisplay('3.1415926535')">PI</button>
-            <button onclick="appendToDisplay('2.718281828459045')">e</button>
-            <button onclick="appendToDisplay('+')" class="operator-btn">+</button>
+            <button onclick="restart()" class="operator-btn">Restart</button>
+            <button onclick="crediter(0.5)" class="credit-btn">0.5 Credits</button>
+            <button onclick="crediter(1)" class="credit-btn">1 Credit</button>
+            <button onclick="crediter(2)" class="credit-btn">2 Credits</button>
+            <button onclick="weighter('Normal')" class = "weight-btn">Regular</button>
+            <button onclick="weighter('Honors')" class="weight-btn">Honors</button>
+            <button onclick="weighter('AP')" class="weight-btn">AP</button>
             <button onclick="grader('A+', 12, 4.0)">A+</button>
-            <button onclick="appendToDisplay('8')">A</button>
-            <button onclick="appendToDisplay('9')">A-</button>
-            <button onclick="appendToDisplay('-')" class="operator-btn">-</button>
-            <button onclick="appendToDisplay('4')">B+</button>
-            <button onclick="appendToDisplay('5')">B</button>
-            <button onclick="appendToDisplay('6')">B-</button>
-            <button onclick="appendToDisplay('*')" class="operator-btn">*</button>
-            <button onclick="appendToDisplay('1')">C+</button>
-            <button onclick="appendToDisplay('2')">C</button>
-            <button onclick="appendToDisplay('3')">C-</button>
-            <button onclick="appendToDisplay('/')" class="operator-btn">/</button>
-            <button onclick="appendToDisplay('0')">D+</button>
-            <button onclick="appendToDisplay('.')">.</button>
-            <button onclick="calculate()">=</button>
+            <button onclick="grader('A', 11, 4.0)">A</button>
+            <button onclick="grader('A-', 10, 3.67)">A-</button>
+            <button onclick="grader('B+', 9, 3.33)">B+</button>
+            <button onclick="grader('B', 8, 3.0)">B</button>
+            <button onclick="grader('B-', 7, 2.67)">B-</button>
+            <button onclick="grader('C+', 6, 2.33)">C+</button>
+            <button onclick="grader('C', 5, 2.0)">C</button>
+            <button onclick="grader('C-', 4, 1.67)">C-</button>
+            <button onclick="grader('D+', 3, 1.33)">D+</button>
+            <button onclick="grader('D', 2, 1.0)">D</button>
+            <button onclick="grader('D-', 1, 0.67)">D-</button>
+            <button onclick="grader('F', 0, 0.0)">F</button>
+            <button onclick="storeData()" class="operator-btn">Next Class</button>
+            <button onclick="calculateGPA()" class="operator-btn">Calculate</button>
 
         </div>
     </div>
 
     <div>
-        <p>
-            This text will contain the feedback for the user
-        </p>
+      <p id="gradesText"></p>
+      <p id="weightsText"></p>
+      <p id="creditsText"></p>
     </div>
 
     <div>
-        <h3>
-            This section will become visible once calculate GPA is pressed. It will display the GPAs.
+        <h3 id="gpaText">
+            <!-- This section will become visible once calculate GPA is pressed. It will display the GPAs. -->
         </h3>
+        <h3 id="wgpaText"></h3>
     </div>
+
     <script src="index.js"></script>
   </body>
 </html>