fix upcoming assessments bug

package.json

@@ -5,8 +5,8 @@
   "description": "![Logo](https://raw.githubusercontent.com/SethBurkart123/BetterThanBetterSeqta/c96edd5956fc11571408310aea98cf7222d6876f/src/icons/betterseqta-light-full.png#gh-dark-mode-only) ![Logo](https://raw.githubusercontent.com/SethBurkart123/BetterThanBetterSeqta/c96edd5956fc11571408310aea98cf7222d6876f/src/icons/betterseqta-dark-full.png#gh-light-mode-only)",
   "main": "webpack.config.js",
   "scripts": {
-    "build": "webpack --config webpack.config.js --mode production",
+    "build": "webpack --config webpack.config.js --mode production && sh ./package.sh",
-    "dev": "webpack --config webpack.config.js --watch --mode production"
+    "dev": "webpack --config webpack.config.js --watch --mode development"
   },
   "keywords": [],
   "author": "",

src/SEQTA.js

@@ -2636,7 +2636,8 @@ function CreateFilters(subjects) {
     let filterdiv = document.querySelector("#upcoming-filters");
     for (let i = 0; i < subjects.length; i++) {
       const element = subjects[i];
-      if (!filteroptions.prototype.hasOwnProperty.call(element.code)) {
+      // eslint-disable-next-line
+      if (!Object.prototype.hasOwnProperty.call(filteroptions, element.code)) {
         filteroptions[element.code] = true;
         chrome.storage.local.set({ subjectfilters: filteroptions });
       }
@@ -3200,13 +3201,15 @@ function SendHomePage() {
         );
       }
     });
+    console.log("Getting assessments");
     let activeClassList;
     GetUpcomingAssessments().then((assessments) => {
       GetActiveClasses().then((classes) => {
         // Gets all subjects for the student
         for (let i = 0; i < classes.length; i++) {
           const element = classes[i];
-          if (element.prototype.hasOwnProperty.call("active")) {
+          // eslint-disable-next-line
+          if (element.hasOwnProperty("active")) { // for some reason eslint gets mad, even though it works?
             // Finds the active class list with the current subjects
             activeClassList = classes[i];
           }
@@ -3215,20 +3218,22 @@ function SendHomePage() {
 
         let activeSubjectCodes = [];
         // Gets the code for each of the subjects and puts them in an array
+        let element;
         for (let i = 0; i < activeSubjects.length; i++) {
-          const element = activeSubjects[i];
+          element = activeSubjects[i];
           activeSubjectCodes.push(element.code);
         }
 
         let CurrentAssessments = [];
         for (let i = 0; i < assessments.length; i++) {
-          const element = assessments[i];
+          element = assessments[i];
           if (activeSubjectCodes.includes(element.code)) {
             CurrentAssessments.push(element);
           }
         }
 
         CurrentAssessments.sort(comparedate);
+        console.log(CurrentAssessments, activeSubjects);
 
         CreateUpcomingSection(CurrentAssessments, activeSubjects);
 

src/inject/injected.css

@@ -145,7 +145,7 @@ ul.magicDelete > li.deleting {
 
 #menu li,
 #menu section {
-  margin: 3px 20px;
+  margin-right: 8px !important;
   border-bottom: none;
   box-shadow: none;
   border-radius: 12px;
@@ -191,6 +191,10 @@ ul.magicDelete > li.deleting {
   width: 85% !important;
 }
 
+li.item.draggable {
+  width: 100% !important;
+}
+
 #menu li.active > .sub > ul > .item {
   box-shadow: inset 3px 0 var(--item-colour, transparent);
   border-radius: 0px 8px 8px 0px;
@@ -714,7 +718,7 @@ div > ol:has(.uiFileHandlerWrapper) {
 }
 
 .border {
-  border-radius: 8px;
+  border-radius: 0.5rem 1rem;
 }
 
 .shortcut-container h2 {
@@ -1617,7 +1621,7 @@ body {
   height: 100%;
   background: black;
   position: absolute;
-  z-index: 19;
+  z-index: 10;
   opacity: 0.4;
 }
 
@@ -1636,7 +1640,7 @@ body {
 .editmenuoption-container {
   width: 100%;
   height: 42px;
-  background: var(--background-primary);
+  background: var(--better-main);
   bottom: 0;
   display: flex;
   justify-content: space-between;
@@ -1751,9 +1755,8 @@ body {
 }
 
 .draggable::before {
-  left: 0 !important;
+  top: 1.1rem;
-  top: 100% !important;
+  left: -0.5rem;
-  transform: translateY(-100%) !important;
 }
 
 #menuToggle {