bump(version): 3.4.3 + changelog

Add mention for grades calc in readme

README.md

@@ -43,6 +43,7 @@
   - Easier Access Notices
   - Assessments
 - Options to remove certain items from the side menu
+- Grades calculator
 - Fully customisable themes and an offical theme store
 - Notification for next lesson (sent 5 minutes before end of the lesson)
 - Browser Support

package.json

@@ -1,6 +1,6 @@
 {
   "name": "betterseqtaplus",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "type": "module",
   "description": "Enhance SEQTA Learn's usability and aesthetics! A fork of BetterSEQTA to continue development, while incorporating a plethora of new and improved features!",
   "browserslist": "> 0.5%, last 2 versions, not dead",
@@ -69,7 +69,7 @@
     "@uiw/codemirror-theme-github": "^4.23.3",
     "@vitejs/plugin-react": "^4.3.1",
     "autoprefixer": "^10.4.20",
-    "caniuse-lite": "^1.0.30001684",
+    "caniuse-lite": "^1.0.30001696",
     "classnames": "^2.5.1",
     "codemirror": "^6.0.1",
     "color": "^4.2.3",

src/SEQTA.ts

@@ -76,6 +76,10 @@ async function init() {
       if (settingsState.onoff) {
         enableCurrentTheme()
 
+        if (typeof settingsState.assessmentsAverage == 'undefined') {
+          settingsState.assessmentsAverage = true
+        }
+
         // TEMP FIX for bug! -> this is a hack to get the injected.css file to have HMR in development mode as this import system is currently broken with crxjs
         if (import.meta.env.MODE === 'development') {
           import('./css/injected.scss')
@@ -161,6 +165,14 @@ export function OpenWhatsNewPopup() {
     /* html */ `
   <div class="whatsnewTextContainer" style="height: 50%;overflow-y: scroll;">  
   
+    <h1>3.4.3 - Minor Bug Fixes</h1>
+    <li>Fixed a bug where timetable colours couldn't be changed</li>
+    <li>Other minor bug fixes</li>
+
+    <h1>3.4.2 - Minor Bug Fixes</h1>
+    <li>Fixed a bug where Assessment Average wasn't enabled by default</li>
+    <li>Fixed floating menus would sometimes be placed behind other elements</li>
+
     <h1>3.4.1 - Bug Fixes and Performance Improvements</h1>
     <li>Added a new "Subject Average" section to the assessments page</li>
     <li>Fixed a bug where animations wouldn't play correctly</li>
@@ -2189,10 +2201,10 @@ export async function loadHomePage() {
 
   const skeletonStructure = stringToHTML(/* html */`
     <div class="home-container" id="home-container">
-      <div class="shortcut-container border">
+      <div class="border shortcut-container">
-        <div class="shortcuts border" id="shortcuts"></div>
+        <div class="border shortcuts" id="shortcuts"></div>
       </div>
-      <div class="timetable-container border">
+      <div class="border timetable-container">
         <div class="home-subtitle">
           <h2 id="home-lesson-subtitle">Today's Lessons</h2>
           <div class="timetable-arrows">
@@ -2207,7 +2219,7 @@ export async function loadHomePage() {
         <div class="day-container loading" id="day-container">
         </div>
       </div>
-      <div class="upcoming-container border">
+      <div class="border upcoming-container">
         <div class="upcoming-title">
           <h2 class="home-subtitle">Upcoming Assessments</h2>
           <div class="upcoming-filters" id="upcoming-filters"></div>
@@ -2215,7 +2227,7 @@ export async function loadHomePage() {
         <div class="upcoming-items loading" id="upcoming-items">
         </div>
       </div>
-      <div class="notices-container border">
+      <div class="border notices-container">
         <div style="display: flex; justify-content: space-between">
           <h2 class="home-subtitle">Notices</h2>
           <input type="date" />

src/background.ts

@@ -167,6 +167,7 @@ const DefaultValues: SettingsState = {
   originalSelectedColor: '',
   DarkMode: true,
   animations: true,
+  assessmentsAverage: true,
   defaultPage: 'home',
   shortcuts: [
     {

src/css/injected.scss

@@ -1,5 +1,4 @@
 @use "sass:meta";
-@charset "UTF-8";
 @import url("https://fonts.googleapis.com/css?family=Rubik:300,400,500,600");
 
 @include meta.load-css("injected/sidebar-animation.scss");
@@ -1879,6 +1878,9 @@ blurred {
 .uiSlidePane > .pane > .header {
   background: var(--better-main);
 }
+.modaliser-container {
+  pointer-events: none;
+}
 .content [placeholder="Subject…"] {
   padding-left: 12px !important;
   border-radius: 16px;
@@ -1933,6 +1935,7 @@ div.bar.flat {
   transition: background-color 0.5s ease-in-out;
   background-color: rgba(0, 0, 0, 0);
   transition-duration: 500ms !important;
+  z-index: 22 !important;
 }
 .uiSlidePane.shown > .pane {
   transform: translatey(0%) !important;

src/manifests/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "BetterSEQTA+",
-  "version": "3.4.1",
+  "version": "3.4.3",
   "description": "Enhance SEQTA Learn's usability and aesthetics! A fork of BetterSEQTA to continue development add add heaps more features!",
   "icons": {
     "32": "resources/icons/icon-32.png",

src/seqta/ui/AddBetterSEQTAElements.ts

@@ -6,21 +6,59 @@ import { settingsState } from "@/seqta/utils/listeners/SettingsState";
 import { updateAllColors } from "./colors/Manager";
 import { delay } from "@/seqta/utils/delay";
 
+let cachedUserInfo: any = null;
+
+async function getUserInfo() {
+  if (cachedUserInfo) return cachedUserInfo;
+  
+  try {
+    const response = await fetch(`${location.origin}/seqta/student/login`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json; charset=utf-8',
+      },
+      body: JSON.stringify({
+        mode: 'normal',
+        query: null,
+        redirect_url: location.origin,
+      }),
+    });
+
+    const responseData = await response.json();
+    cachedUserInfo = responseData.payload;
+    return cachedUserInfo;
+  } catch (error) {
+    console.error('Error fetching user info:', error);
+    throw error;
+  }
+}
+
 export async function AddBetterSEQTAElements() {
   if (settingsState.onoff) {    
     initializeSettings();
     if (settingsState.DarkMode) {
       document.documentElement.classList.add('dark');
     }
-    createHomeButton();
+    
+    const fragment = document.createDocumentFragment();
+    const menu = document.getElementById('menu')!;
+    const menuList = menu.firstChild as HTMLElement;
+    
+    createHomeButton(fragment, menuList);
+    createNewsButton(fragment, menu);
+    
+    menuList.insertBefore(fragment, menuList.firstChild);
+    
     try {
-      await appendBackgroundToUI();
+      await Promise.all([
+        appendBackgroundToUI(),
+        handleUserInfo(),
+        handleStudentData()
+      ]);
     } catch (error) {
-      console.error('Error appending background to UI:', error);
+      console.error('Error initializing UI elements:', error);
     }
-    await handleUserInfo();
+    
-    handleStudentData();
-    createNewsButton();
     setupEventListeners();
     await addDarkLightToggle();
     customizeMenuToggle();
@@ -28,7 +66,6 @@ export async function AddBetterSEQTAElements() {
 
   addExtensionSettings();
   await createSettingsButton();
-
   setupSettingsButton();
 }
 
@@ -37,18 +74,15 @@ function initializeSettings() {
   updateBgDurations();
 }
 
-function createHomeButton() {
+function createHomeButton(fragment: DocumentFragment, menuList: HTMLElement) {
   const container = document.getElementById('content')!;
   const div = document.createElement('div');
   div.classList.add('titlebar');
   container.append(div);
   
   const NewButton = stringToHTML('<li class="item" data-key="home" id="homebutton" data-path="/home" data-betterseqta="true"><label><svg style="width:24px;height:24px" viewBox="0 0 24 24"><path fill="currentColor" d="M10,20V14H14V20H19V12H22L12,3L2,12H5V20H10Z" /></svg><span>Home</span></label></li>');
-  const menu = document.getElementById('menu')!;
-  const List = menu.firstChild! as HTMLElement;
-  
   if (NewButton.firstChild) {
-    List.insertBefore(NewButton.firstChild, List.firstChild);
+    fragment.appendChild(NewButton.firstChild);
   }
 }
 
@@ -125,28 +159,6 @@ async function handleStudentData() {
   }
 }
 
-async function getUserInfo() {
-  try {
-    const response = await fetch(`${location.origin}/seqta/student/login`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-      },
-      body: JSON.stringify({
-        mode: 'normal',
-        query: null,
-        redirect_url: location.origin,
-      }),
-    });
-
-    const responseData = await response.json();
-    return responseData.payload;
-  } catch (error) {
-    console.error('Error fetching user info:', error);
-    throw error; // Rethrow the error after logging it
-  }
-}
-
 async function updateStudentInfo(students: any) {
   const info = await getUserInfo();
   var index = students.findIndex(function (person: any) {
@@ -179,41 +191,42 @@ async function updateStudentInfo(students: any) {
   }
 }
 
-function createNewsButton() {
+function createNewsButton(fragment: DocumentFragment, menu: HTMLElement) {
   const NewsButtonStr = '<li class="item" data-key="news" id="newsbutton" data-path="/news" data-betterseqta="true"><label><svg style="width:24px;height:24px" viewBox="0 0 24 24"><path fill="currentColor" d="M20 3H4C2.89 3 2 3.89 2 5V19C2 20.11 2.89 21 4 21H20C21.11 21 22 20.11 22 19V5C22 3.89 21.11 3 20 3M5 7H10V13H5V7M19 17H5V15H19V17M19 13H12V11H19V13M19 9H12V7H19V9Z" /></svg><span>News</span></label></li>';
   const NewsButton = stringToHTML(NewsButtonStr);
-  const menu = document.getElementById('menu')!;
-  const List = menu.firstChild! as HTMLElement;
   
-  List!.appendChild(NewsButton.firstChild!);
+  if (NewsButton.firstChild) {
+    fragment.appendChild(NewsButton.firstChild);
+  }
   
-  let a = document.createElement('div');
+  let iconCover = document.createElement('div');
-  a.classList.add('icon-cover');
+  iconCover.classList.add('icon-cover');
-  a.id = 'icon-cover';
+  iconCover.id = 'icon-cover';
-  menu!.appendChild(a);
+  menu.appendChild(iconCover);
 }
 
 function setupEventListeners() {
   const menuCover = document.querySelector('#icon-cover');
-  menuCover!.addEventListener('click', function () {
-    location.href = '../#?page=/home';
-    loadHomePage();
-    (document!.getElementById('menu')!.firstChild! as HTMLElement).classList.remove('noscroll');
-  });
-
   const homebutton = document.getElementById('homebutton');
-  homebutton!.addEventListener('click', function () {
+  const newsbutton = document.getElementById('newsbutton');
-    if (!homebutton?.classList.contains('draggable') && !homebutton?.classList.contains('active')) {
+  
+  homebutton?.addEventListener('click', function() {
+    if (!homebutton.classList.contains('draggable') && !homebutton.classList.contains('active')) {
       loadHomePage();
     }
   });
 
-  const newsbutton = document.getElementById('newsbutton');
+  newsbutton?.addEventListener('click', function() {
-  newsbutton!.addEventListener('click', function () {
+    if (!newsbutton.classList.contains('draggable') && !newsbutton.classList.contains('active')) {
-    if (!newsbutton?.classList.contains('draggable') && !newsbutton?.classList.contains('active')) {
       SendNewsPage();
     }
   });
+
+  menuCover?.addEventListener('click', function() {
+    location.href = '../#?page=/home';
+    loadHomePage();
+    (document.getElementById('menu')!.firstChild! as HTMLElement).classList.remove('noscroll');
+  });
 }
 
 async function createSettingsButton() {