diff --git a/package.json b/package.json index 93285561..a30943a0 100644 --- a/package.json +++ b/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", - "dev": "webpack --config webpack.config.js --watch --mode production" + "build": "webpack --config webpack.config.js --mode production && sh ./package.sh", + "dev": "webpack --config webpack.config.js --watch --mode development" }, "keywords": [], "author": "", diff --git a/src/.DS_Store b/src/.DS_Store index f54b8ea6..46f977ba 100644 Binary files a/src/.DS_Store and b/src/.DS_Store differ diff --git a/src/SEQTA.js b/src/SEQTA.js index 74c190eb..1adf5327 100644 --- a/src/SEQTA.js +++ b/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); diff --git a/src/inject/injected.css b/src/inject/injected.css index 39fad7a4..568d574e 100644 --- a/src/inject/injected.css +++ b/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: 100% !important; - transform: translateY(-100%) !important; + top: 1.1rem; + left: -0.5rem; } #menuToggle { diff --git a/src/seqta/ui/Loading.js b/src/seqta/ui/Loading.js index d4b7cea2..655bdb6d 100644 --- a/src/seqta/ui/Loading.js +++ b/src/seqta/ui/Loading.js @@ -2,12 +2,12 @@ import stringToHTML from "../utils/stringToHTML.js"; export function AppendLoadingSymbol(givenID, position) { - let loadingsymbol = stringToHTML(` + let loadingsymbol = stringToHTML(String.raw`
- - - - + + + +
`).firstChild; document.querySelector(position).appendChild(loadingsymbol); @@ -16,7 +16,7 @@ export function AppendLoadingSymbol(givenID, position) { export default function loading() { let loadinghtml = stringToHTML( String.raw` -
+
- - - - + + + +
v${ chrome.runtime.getManifest().version }
`,