Added ability to disable notifications, added grades link

Closes #2 (finally, I think, it seems to work) Closes #17
aopell · Jan 17, 2018 · 491f7b7 · 491f7b7
1 parent 4a7e1db
commit 491f7b7
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 40 deletions.
diff --git a/css/all.css b/css/all.css
@@ -181,7 +181,7 @@ video.easter-egg {
 }
 
 .setting-entry {
-    padding-bottom: 4px;
+    margin-bottom: 8px;
 }
 
 .setting-modified {
@@ -190,5 +190,12 @@ video.easter-egg {
 
 .modal-button {
     margin-left: 0 !important;
-    margin-top: 4px;
+    margin-top: 8px;
+}
+
+.modal-body input[type=text], .modal-body input[type=number] {
+    color: #333;
+    border: 1px solid #c7c7c7;
+    font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif;
+    padding: 4px;
 }
diff --git a/js/all.js b/js/all.js
@@ -1,15 +1,13 @@
 // Page Modifications
 
 let svg = '<a href="/home"><svg id="logo" viewBox="0 -2 220 31" width="174" height="31" style="fill: white;"><path d="M15.4 30.7C6.9 30.7 0 23.8 0 15.4 0 6.9 6.9 0 15.4 0s15.4 6.9 15.4 15.4c-.1 8.4-7 15.3-15.4 15.3zm0-28.1C8.3 2.6 2.6 8.3 2.6 15.4c0 7.1 5.8 12.8 12.8 12.8 7.1 0 12.8-5.8 12.8-12.8 0-7.1-5.8-12.8-12.8-12.8z"></path><path d="M14.7 16.3c-2.5-.6-5.6-1.3-5.6-4.6 0-2.9 2.4-4.7 6.1-4.7 3 0 6.2 1.4 6.7 5.1l-2.9.4c0-1-.1-1.7-1.1-2.5s-2.2-.9-3-.9c-2.1 0-3.1 1.2-3.1 2.3 0 1.5 1.7 2 3.8 2.5l1.5.4c1.9.4 5.2 1.2 5.2 4.5 0 2.6-2.3 5-6.6 5-1.8 0-3.6-.4-4.9-1.3-.5-.4-2-1.6-2.3-4.3l3-.5c0 .7 0 2 1.2 3.1.9.8 2.1.9 3.2.9 2.3 0 3.7-.9 3.7-2.6 0-1.8-1.4-2.1-3.3-2.5l-1.6-.3z"></path><g><path d="M153.7 18.6h-4.3v-1.7h7.2V25h-1.8v-1.9s.3-.3 0 0c-1.3 1.5-3.2 2.2-5.5 2.2-5.6 0-7.6-4.2-7.6-7.9 0-4.3 2.3-8.2 7.4-8.2 2.5 0 6 .9 7.1 5.1l-2.8.3c-.1-.6-.6-3.5-4.1-3.5-4.4 0-4.6 4.8-4.6 6.2 0 1.7.3 3.1 1 4.1.9 1.4 2.2 2 3.8 2 3.7 0 4.1-3 4.3-4.2l-.1-.6zM45.5 18.2C43 17.6 40 17 40 13.8c0-2.8 2.4-4.5 5.9-4.5 2.9 0 6 1.4 6.5 5l-2.8.4c0-.9-.1-1.7-1.1-2.5s-2.2-.9-2.9-.9c-2 0-3 1.2-3 2.2 0 1.5 1.6 1.9 3.7 2.4l1.5.4c1.8.4 5.1 1.2 5.1 4.4 0 2.5-2.2 4.8-6.4 4.8-1.7 0-3.5-.4-4.7-1.2-.5-.4-2-1.6-2.3-4.1l2.9-.5c0 .7 0 2 1.1 3 .9.8 2 .9 3.1.9 2.3 0 3.6-.9 3.6-2.5 0-1.7-1.3-2.1-3.2-2.4l-1.5-.5zM69 19.5c-.1.6-.3 1.5-.9 2.6-1.3 2.3-3.4 3.4-6.2 3.4-5.6 0-7.6-4.2-7.6-7.9 0-4.3 2.3-8.3 7.4-8.3 2.5 0 6.1.9 7.1 5.1l-2.8.3c-.1-.6-.6-3.5-4.1-3.5-4.4 0-4.6 4.8-4.6 6.2 0 1.6.3 3.1 1 4.1.9 1.4 2.2 2 3.8 2 3.7 0 4.1-3 4.3-4.2l2.6.2zM70.6 2.1h2.6v9.2c1.6-1.7 3.2-2 4.6-2 3.4 0 4.7 1.9 5.1 3.4.3 1 .3 2 .3 3.5V25h-2.6v-8.1c0-2 0-3.2-.6-4.1-.6-.9-1.7-1.3-2.7-1.3-1.7 0-3.4.9-4 3.3-.2.8-.2 1.7-.2 2.8V25h-2.6V2.1zM93.3 25.4c-5.3 0-7.5-3.9-7.5-8 0-3.4 1.7-8.2 7.6-8.2 5 0 7.4 3.9 7.3 8.1 0 4.6-2.7 8.1-7.4 8.1zm4.5-10.2c-.6-3-2.6-3.9-4.3-3.9-3.5 0-4.9 2.7-4.9 6.2 0 3.2 1.3 5.9 4.7 5.9 4.3 0 4.6-4.5 4.7-6 0-1.1-.1-1.8-.2-2.2zM110 25.4c-5.3 0-7.5-3.9-7.5-8 0-3.4 1.7-8.2 7.6-8.2 5 0 7.4 3.9 7.3 8.1 0 4.6-2.7 8.1-7.4 8.1zm4.5-10.2c-.6-3-2.6-3.9-4.3-3.9-3.5 0-4.9 2.7-4.9 6.2 0 3.2 1.3 5.9 4.7 5.9 4.3 0 4.6-4.5 4.7-6 0-1.1-.1-1.8-.2-2.2zM122.6 2.1V25h-2.5V2.1h2.5zM132.7 25.4c-5.3 0-7.5-3.9-7.5-8 0-3.4 1.7-8.2 7.6-8.2 5 0 7.4 3.9 7.3 8.1 0 4.6-2.8 8.1-7.4 8.1zm4.4-10.2c-.6-3-2.6-3.9-4.3-3.9-3.5 0-4.9 2.7-4.9 6.2 0 3.2 1.3 5.9 4.7 5.9 4.3 0 4.6-4.5 4.7-6 0-1.1-.1-1.8-.2-2.2zM169.9 9.5h-2.5l-3.9 6.2-3.8-6.2h-2.9l5.5 8.4V25h2.4v-7.1l5.6-8.4zM174.9 11c0 .9-.8 1.7-1.7 1.7-1 0-1.7-.7-1.7-1.7 0-.9.8-1.7 1.7-1.7.9 0 1.7.7 1.7 1.7zm-3 0c0 .7.6 1.3 1.3 1.3.7 0 1.3-.6 1.3-1.3 0-.7-.6-1.3-1.3-1.3-.8 0-1.3.6-1.3 1.3zm1 .8h-.4v-1.7c.2 0 .4-.1.6-.1.3 0 .5.1.6.1.1.1.2.2.2.4s-.2.3-.3.4c.2.1.2.2.3.4 0 .3.1.3.1.4h-.4c-.1-.1-.1-.2-.1-.4s-.1-.3-.3-.3h-.2v.8zm0-.9h.2c.2 0 .4-.1.4-.2 0-.2-.1-.3-.4-.3h-.2v.5z"></path></g></svg></a>';
-let modalHTML = '<div id="settings-modal" class="modal"> <div class="modal-content"> <div class="modal-header"> <span class="close">&times;</span> <p class="modal-title">Schoology Plus Settings</p> </div><div class="modal-body"> </div><div class="modal-footer"> <p class="modal-footer-text">&copy; Aaron Opell 2018</p></div></div></div>';
+let modalHTML = `<div id="settings-modal" class="modal"> <div class="modal-content"> <div class="modal-header"> <span class="close">&times;</span> <p class="modal-title">Schoology Plus Settings</p> </div><div class="modal-body"> </div><div class="modal-footer"> <p class="modal-footer-text">&copy; Aaron Opell 2018 | Schoology Plus v${chrome.runtime.getManifest().version}${chrome.runtime.getManifest().update_url ? '' : ' dev'}</p></div></div></div>`;
+document.getElementById("primary-home").insertAdjacentElement("afterEnd", createElement("li", undefined, { id: "primary-home", innerHTML: '<a href="/grades"><span>Grades</span></a>' }));
 document.getElementById("home").innerHTML = svg;
 document.body.appendChild(document.createElement("div")).innerHTML = modalHTML;
 
 let modal = document.getElementById("settings-modal");
 
-let modalFooterText = document.querySelector(".modal-footer-text");
-modalFooterText.textContent += ` | Schoology Plus v${chrome.runtime.getManifest().version}`;
-
 let video = document.body.appendChild(createElement("video", ["easter-egg"], {
     onended: function () {
         this.style.visibility = "hidden";
@@ -57,12 +55,16 @@ window.onclick = function (event) {
     }
 }
 
+function openOptionsMenu() {
+    modalBody.innerHTML = "";
+    modalBody.appendChild(getModalContents());
+    document.getElementById("settings-modal").style.display = "block";
+}
+
 function modalClose() {
-    if(anySettingsModified()){
-        if(!confirm("You have unsaved settings.\nAre you sure you want to exit?")) return;
+    if (anySettingsModified()) {
+        if (!confirm("You have unsaved settings.\nAre you sure you want to exit?")) return;
         updateSettings();
-        modalBody.innerHTML = "";
-        modalBody.appendChild(getModalContents());
     }
     modal.style.display = "none";
 }
diff --git a/js/background.js b/js/background.js
@@ -28,19 +28,19 @@ chrome.browserAction.onClicked.addListener(function () {
 });
 
 function onAlarm(alarm) {
-    if (alarm && alarm.name === "notification") {
-        try {
-            console.log(`[${new Date()}] Checking for new notifications`);
-            fetch("https://lms.lausd.net/home/notifications?filter=all", {
-                credentials: "same-origin"
-            }).then(function (response) {
-                if (response.ok) {
-                    return response.json();
-                }
-                throw new Error("Error loading notifications: " + response);
-            }).then(function (response) {
-                chrome.storage.sync.get("lastTime", function (value) {
-                    console.log(value);
+    chrome.storage.sync.get(null, function (value) {
+        if (alarm && alarm.name === "notification" && value.notifications != "disabled") {
+            try {
+                console.log(`[${new Date()}] Checking for new notifications`);
+                fetch("https://lms.lausd.net/home/notifications?filter=all", {
+                    credentials: "same-origin"
+                }).then(function (response) {
+                    if (response.ok) {
+                        return response.json();
+                    }
+                    throw new Error("Error loading notifications: " + response);
+                }).then(function (response) {
+                    console.log("Last new grade: " + new Date(value.lastTime).toString());
                     let time = value.lastTime;
                     let timeModified = false;
                     if (!time) {
@@ -94,22 +94,34 @@ function onAlarm(alarm) {
                             isClickable: true
                         };
                         console.dir(n);
-                        chrome.browserAction.getBadgeText({}, x => {
-                            let num = Number.parseInt(x);
-                            chrome.browserAction.setBadgeText({ text: (num ? num + totalAssignments : totalAssignments).toString() });
-                        });
-                        chrome.notifications.create("gradeNotification", n, null);
+                        if (!value.notifications || value.notifications == "enabled" || value.notifications == "badge") {
+                            chrome.browserAction.getBadgeText({}, x => {
+                                let num = Number.parseInt(x);
+                                chrome.browserAction.setBadgeText({ text: (num ? num + totalAssignments : totalAssignments).toString() });
+                            });
+                        } else {
+                            console.log("Number badge is disabled");
+                        }
+                        if (!value.notifications || value.notifications == "enabled" || value.notifications == "popup") {
+                            chrome.notifications.create("gradeNotification", n, null);
+                        } else {
+                            console.log("Popup notifications are disabled");
+                        }
                     }
 
                     if (timeModified) {
                         chrome.storage.sync.set({ lastTime: time }, () => { console.log("Set new time " + new Date(time)) });
                     } else {
                         console.log("No new notifications");
                     }
+
                 });
-            });
-        } catch (error) {
-            console.error(error);
+            } catch (error) {
+                console.error(error);
+            }
+        }
+        else if (value.notifications === "disabled") {
+            console.log("Notifications are disabled");
         }
-    }
+    });
 }
diff --git a/js/preload.js b/js/preload.js
@@ -8,10 +8,6 @@ function getModalContents() {
     return modalContents;
 }
 
-function openOptionsMenu() {
-    document.getElementById("settings-modal").style.display = "block";
-}
-
 let rainbowInterval = undefined;
 let rainbowColor = 0;
 function colorLoop() {
@@ -102,6 +98,35 @@ function updateSettings() {
                 },
                 element => element.value === "true"
             ),
+            createSetting(
+                "notifications",
+                "Desktop Notifications",
+                "Displays desktop notifications and a number badge on the extension button when new grades are entered",
+                "select",
+                {
+                    options: [
+                        {
+                            text: "Number Badge and Desktop Notifications",
+                            value: "enabled"
+                        },
+                        {
+                            text: "Number Badge Only",
+                            value: "badge"
+                        },
+                        {
+                            text: "Desktop Notifications Only",
+                            value: "popup"
+                        },
+                        {
+                            text: "Disabled",
+                            value: "disabled"
+                        }
+                    ]
+                },
+                (value, element) => element.value = value || "enabled",
+                undefined,
+                element => element.value
+            ),
             createElement("span", ["submit-span-wrapper", "modal-button"], { onclick: saveSettings }, [createElement("input", ["form-submit"], { type: "button", value: "Save Settings", id: "save-settings" })])
         ]);
     });
@@ -174,16 +199,16 @@ function settingModified(event) {
     let element = event.target || event;
     let parent = element.parentElement;
     if (parent && !parent.querySelector(".setting-modified")) {
-        parent.appendChild(createElement("span", ["setting-modified"], { textContent: " *" }));
+        parent.appendChild(createElement("span", ["setting-modified"], { textContent: " *", title: "This setting has been modified from its saved value" }));
     }
     let setting = settings[element.dataset.settingName];
     setting.modified = true;
     setting.onmodify(event);
 }
 
 function anySettingsModified() {
-    for(let setting in settings) {
-        if(settings[setting].modified) {
+    for (let setting in settings) {
+        if (settings[setting].modified) {
             return true;
         }
     }

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
     "name": "Schoology Plus",
     "description": "Provides some enhancements to your LAUSD Schoology experience",
-    "version": "3.0.2",
+    "version": "3.1",
     "icons": {
         "128": "imgs/[email protected]",
         "64": "imgs/[email protected]",