Add options and minor fixes

Signed-off-by: Anvay Mathur <[email protected]>

Author: megagames-me

.gitignore

@@ -9,6 +9,7 @@ lerna-debug.log*
 
 node_modules
 dist
+dist.zip
 dist-ssr
 *.local
 

manifest.config.js

@@ -37,6 +37,13 @@ export default defineManifest(async (env) => ({
       "js": ["src/content_script/guardianHome/index.ts"]
     }
   ],
+  "options_ui": {
+    "page": "src/options/index.html",
+    "open_in_tab": false
+  },
+  "icons": {
+    "128": "public/icon.png" 
+  },
   "permissions": ["storage"],
   "web_accessible_resources": [
     {

src/content_script/guardianHome/GPA.svelte

@@ -4,8 +4,6 @@
 
   export let classManager: ClassManager;
 
-  console.log("RERENDERING");
-
   $: sem1GPA = classManager.calculateGPA(1);
   $: sem2GPA = classManager.calculateGPA(2);
 
@@ -19,6 +17,7 @@
 </label>
 
 {#if !hideGPA}
+  <p class="tw-font-bold">Do not rely on any data from SAS PES!!</p>
   {#if sem1GPA && sem1GPA !== -1}
     <p>First Semester GPA: {classManager.calculateGPA(1).toFixed(2)}</p>
   {:else}

src/content_script/guardianHome/index.ts

@@ -25,15 +25,20 @@
 import { Class, ClassManager } from "../../models/classes";
 import GPA from "./GPA.svelte";
 import { listOfGrades, type Grade } from "../../models/grades";
+import { getFinalPercent } from "../scores/scoresUtilities";
 
 const classManager = new ClassManager([]);
 
 const rows = document.querySelectorAll(".linkDescList.grid > tbody > tr.center:not(.th2)");
 
+
+
 for (const row of rows) {
   const nameEle = row.querySelector("td:nth-child(2)");
-  const s1GradeEle = row.querySelector("td:nth-child(3)");
-  const s2GradeEle = row.querySelector("td:nth-child(4)");
+  const s1GradeEle = row.querySelector("td:nth-child(3) > a") as HTMLAnchorElement;
+  const s2GradeEle = row.querySelector("td:nth-child(4) > a");
+
+
 
   if (!nameEle || !s1GradeEle || !s2GradeEle) continue;
 
@@ -49,6 +54,23 @@ for (const row of rows) {
   if (!listOfGrades.includes(s2Grade as Grade)) s2Grade = null;
 
   if (!s1Grade && !s2Grade) continue;
+
+  if (s1Grade !== null && s1Grade !== "INC" && s1GradeEle.href !== null) {
+    const url = new URL(s1GradeEle.href);
+    let finalPercent = getFinalPercent(
+      url.searchParams.get(
+        "frn",
+      )!,
+      url.searchParams.get("fg")!
+    );
+
+    finalPercent.then((f) => {
+      console.log(f, "F");
+      if (f !== null)
+        s1GradeEle.innerHTML += ` (${f.toFixed(2)})`;
+    })
+  }
+
   classManager.addClass(new Class(name, { s1: s1Grade as Grade | null, s2: s2Grade as Grade | null }))
 }
 

src/content_script/home/Home.svelte

@@ -55,6 +55,23 @@
   </h1>
   <!-- svelte-ignore missing-declaration -->
   <p class="tw-font-medium tw-text-lg">v{SAS_PES_VERSION}</p>
+  <p>
+    <a href="https://github.com/sas-fossdev/saspes">Website/Source Code</a> |
+    <a href="https://github.com/sas-fossdev/saspes/issues">Issue Tracker</a>
+    | <a href="https://forms.gle/aDtP57UyEBQU9gQx6">Feedback/Bug Report Form</a>
+    |
+    <!-- svelte-ignore missing-declaration -->
+    <a
+      href="#"
+      on:click={() => {
+        if (chrome.runtime.openOptionsPage) {
+          chrome.runtime.openOptionsPage();
+        } else {
+          window.open(chrome.runtime.getURL("src/options/index.html"));
+        }
+      }}>Options</a
+    >
+  </p>
   <p><strong>Do not rely</strong> on the data provided by SAS PES.</p>
   {#if board}
     <!-- this is for a message board type of thing, where messages can be displayed without updating the extension everytime. This does NOT load javascript. -->
@@ -63,6 +80,9 @@
     </h3>
     <p class="tw-text-sm">{@html board.split("æ")[1]}</p>
   {/if}
+  <p class="tw-mt-2">
+    Copyright &copy; 2024 Anvay Mathur and the SAS PES Authors
+  </p>
 </div>
 
 <style>

src/content_script/scores/ScoreTools.svelte

@@ -16,7 +16,10 @@
     >
       <div>
         <h1 class="tw-pb-2 tw-text-2xl">Tools</h1>
-        <select bind:value={curTool}>
+        <select
+          bind:value={curTool}
+          class="tw-rounded-md tw-border-[#CCCCCC] tw-border-solid tw-border tw-p-1"
+        >
           <option value={Tools.CATEGORY_WEIGHTING}
             >Category Weighting and Advanced See All Possibilities</option
           >
@@ -27,6 +30,11 @@
       {#if curTool == Tools.CATEGORY_WEIGHTING}
         <SingleAssignment {finalPercent} {gradeManager} />
       {/if}
+      <p>
+        <span class="tw-font-bold">Do not rely on any data from SAS PES!!</span>
+        Teachers can override your final grade, and calculations are not entirely
+        accurate.
+      </p>
     </div>
   {/if}
 {/await}

src/content_script/scores/index.ts

@@ -25,6 +25,7 @@
 import { Assignment, Category, GradeManager, listOfGrades, type Grade, gradeToPercent } from "../../models/grades";
 import FinalPercent from "./FinalPercent.svelte";
 import ScoreTools from "./ScoreTools.svelte";
+import { getFinalPercent } from "./scoresUtilities";
 
 export enum Tools {
   CATEGORY_WEIGHTING = "CATEGORY_WEIGHTING",
@@ -51,31 +52,6 @@ function waitForElm(selector: string): Promise<Element | null> {
   });
 }
 
-async function getFinalPercent(): Promise<number | null> {
-  let finalGrade: number | null = null;
-  const url = new URL(window.location.href);
-  let text: string | null = null;
-  try {
-    text = await fetch(
-      `https://powerschool.sas.edu.sg/guardian/scores_ms_guardian.html?frn=${url.searchParams.get(
-        "frn",
-      )}&fg=${url.searchParams.get("fg")}`,
-    ).then((res) => res.text());
-  } catch (e) {
-    console.error(e);
-    return null;
-  }
-  console.log("Done fetching");
-
-  if (text) {
-    let match = text.match(/\[decode;[^;]*;[^;]*;([^;]*);/);
-    if (match?.[1] && !isNaN(parseFloat(match[1]))) {
-      finalGrade = parseFloat(match[1]);
-      return finalGrade;
-    }
-  }
-  return null;
-}
 
 let gradeManagerO = new GradeManager([], [], 100);
 
@@ -160,7 +136,14 @@ document
   .querySelector(".box-round")!
   .insertBefore(target, document.querySelector(".box-round > p"));
 
-let finalPercent = getFinalPercent();
+const url = new URL(window.location.href);
+
+let finalPercent = getFinalPercent(
+  url.searchParams.get(
+    "frn",
+  )!,
+  url.searchParams.get("fg")!
+);
 
 new FinalPercent({
   target: target as Element,