Merge pull request #4 from mjakeman/qol-changes

v0.3 - Auto Updating / Misc Changes

Author: mjakeman

.github/workflows/node.js.yml

@@ -32,4 +32,4 @@ jobs:
       run: npm install --global web-ext && web-ext build --no-config-discovery
 
     - name: Validate Web Extension (Firefox)
-      run: web-ext lint --no-config-discovery
+      run: web-ext lint --self-hosted --no-config-discovery

css/Easel.module.css

@@ -42,6 +42,14 @@
     background-color: #111;
 }
 
+.SidebarItemActive {
+    background: #49bfaa;
+}
+
+.SidebarItemActive:hover {
+    background: rgb(58, 184, 161);
+}
+
 .Sidebar h2,
 .SidebarMessage {
     padding: 0 15px;

fx-updates.json

@@ -8,13 +8,13 @@
         },
         {
           "version": "0.2",
-          "update_link": "https://github.com/mjakeman/easel/releases/download/v0.2/easel-firefox.xpi",
+          "update_link": "https://github.com/mjakeman/easel/releases/download/v0.2/easel-firefox.xpi"
         },
         {
           "version": "0.2.1",
-          "update_link": "https://github.com/mjakeman/easel/releases/download/v0.2.1/easel-firefox.xpi",
+          "update_link": "https://github.com/mjakeman/easel/releases/download/v0.2.1/easel-firefox.xpi"
         }
       ]
     }
   }
-}
+}

manifest.json

@@ -1,13 +1,14 @@
 {
     "manifest_version": 2,
     "name": "Easel - Lecture Recordings (UoA)",
-    "version": "0.2.1",
+    "version": "0.3",
     "author": "Matt Jakeman",
     "description": "An unofficial enhancement suite for watching Lecture Recordings at the University of Auckland.",
 
     "browser_specific_settings": {
       "gecko": {
-        "id": "easel@mattjakeman.com"
+        "id": "easel@mattjakeman.com",
+        "update_url": "https://raw.githubusercontent.com/mjakeman/easel/master/fx-updates.json"
       }
     },    
 

package-lock.json

@@ -24,20 +24,21 @@
     "webpack-dev-server": "^3.11.2"
   },
   "dependencies": {
-    "typescript-plugin-css-modules": "^3.4.0",
-    "@types/arrive": "^2.4.0",
-    "@types/jest": "^26.0.23",
-    "@types/node": "^12.20.15",
-    "@types/react": "^17.0.11",
-    "@types/react-dom": "^17.0.7",
+    "@types/arrive": "^2.4.1",
+    "@types/jest": "^26.0.24",
+    "@types/node": "^12.20.17",
+    "@types/react": "^17.0.15",
+    "@types/react-dom": "^17.0.9",
     "arrive": "^2.4.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-scripts": "4.0.3",
-    "ts-loader": "^9.2.3",
-    "typescript": "^4.3.2",
+    "ts-loader": "^9.2.4",
+    "typescript": "^4.3.5",
+    "typescript-plugin-css-modules": "^3.4.0",
+    "web-ext": "^6.2.0",
     "web-vitals": "^1.1.2",
     "webextension-polyfill-ts": "^0.25.0",
-    "webpack": "^5.38.1"
+    "webpack": "^5.46.0"
   }
 }

package.json

@@ -10,6 +10,14 @@ export interface SidebarItemProps {
 export class SidebarItem extends React.Component<SidebarItemProps, {}> {
     render() {
         let recording = this.props.recording;
-        return <a className={Style.SidebarItem} href={recording.url}>{recording.title}</a>
+
+        // Check if the target URL matches our current URL
+        let isActive = (recording.url === window.location.href);
+
+        var activeClass = isActive
+            ? Style.SidebarItemActive
+            : "";
+
+        return <a className={`${Style.SidebarItem} ${activeClass}`} href={recording.url}>{recording.title}</a>
     }
 }

src/components/SidebarItem.tsx

@@ -38,6 +38,11 @@ btn.onclick = function() {
         let title = titleAnchor.innerText;
         let url = titleAnchor.href;
 
+        // Replace mediastore URLs with mediaplayer
+        if (url.includes("mediastore")) {
+            url = url.replace("mediastore", "mediaplayer");
+        }
+
         let lectureInfo = lecture.querySelectorAll("td");
         if (lectureInfo === null)
             continue;

src/recordings.ts

@@ -17,11 +17,11 @@ function load() {
 }
 
 // Redirect to mediaplayer
-let url = window.location.href;
+// let url = window.location.href;
 
-if (url.includes("mediastore")) {
-    var newUrl = window.location.href.replace("mediastore", "mediaplayer");
-    window.location.replace(newUrl);
-}
+// if (url.includes("mediastore")) {
+//     var newUrl = window.location.href.replace("mediastore", "mediaplayer");
+//     window.location.replace(newUrl);
+// }
 
 document.arrive("video", load);