fix EducationPerfect shortcut

This commit is contained in:
SethBurkart123
2023-09-25 11:00:04 +10:00
parent 661ba7709e
commit 3e805f91fb
2 changed files with 54 additions and 9 deletions
+16 -2
View File
@@ -118,7 +118,7 @@ export default function Shortcuts() {
{/* Shortcuts Section */} {/* Shortcuts Section */}
{settingsState.shortcuts ? ( {settingsState.shortcuts ? (
settingsState.shortcuts.map((shortcut) => ( settingsState.shortcuts.map((shortcut) => shortcut.name && (
<div className="flex items-center justify-between px-4 py-3" key={shortcut.name}> <div className="flex items-center justify-between px-4 py-3" key={shortcut.name}>
{shortcut.name} {shortcut.name}
<Switch state={shortcut.enabled} onChange={(isOn) => switchChange(shortcut.name, isOn)} /> <Switch state={shortcut.enabled} onChange={(isOn) => switchChange(shortcut.name, isOn)} />
@@ -133,7 +133,21 @@ export default function Shortcuts() {
settingsState.customshortcuts.map((shortcut, index) => ( settingsState.customshortcuts.map((shortcut, index) => (
<div className="flex items-center justify-between px-4 py-3" key={shortcut.name}> <div className="flex items-center justify-between px-4 py-3" key={shortcut.name}>
{shortcut.name} {shortcut.name}
<button onClick={() => deleteCustomShortcut(index)}>Delete</button> <button onClick={() => deleteCustomShortcut(index)}>
<svg
xmlns="http://www.w3.org/2000/svg"
className="w-4 h-4 text-red-500"
viewBox="0 0 20 20"
fill="currentColor"
>
<path
fillRule="evenodd"
// eslint-disable-next-line max-len
d="M15.707 4.293a1 1 0 010 1.414L11.414 10l4.293 4.293a1 1 0 11-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 11-1.414-1.414L8.586 10 4.293 5.707a1 1 0 111.414-1.414L10 8.586l4.293-4.293a1 1 0 011.414 0z"
clipRule="evenodd"
/>
</svg>
</button>
</div> </div>
)) ))
) : ( ) : (
+38 -7
View File
@@ -15,7 +15,7 @@ chrome.runtime.onMessage.addListener(function (request) {
ReloadSEQTAPages(); ReloadSEQTAPages();
} else if (request.type == "githubTab") { } else if (request.type == "githubTab") {
chrome.tabs.create({ chrome.tabs.create({
url: "github.com/SethBurkart123/BetterThanBetterSeqta", url: "github.com/SethBurkart123/EvenBetterSEQTA",
}); });
} else if (request.type == "setDefaultStorage") { } else if (request.type == "setDefaultStorage") {
console.log("setting default values"); console.log("setting default values");
@@ -102,7 +102,6 @@ chrome.runtime.onMessage.addListener(function (request, sender, sendResponse) {
console.log(TodayFormatted); console.log(TodayFormatted);
console.log(from); console.log(from);
// var url = `https://newsapi.org/v2/everything?sources=abc-news&from=${TodayFormatted}&sortBy=popularity&apiKey=17c0da766ba347c89d094449504e3080`;
var url = `https://newsapi.org/v2/everything?domains=abc.net.au&from=${from}&apiKey=17c0da766ba347c89d094449504e3080`; var url = `https://newsapi.org/v2/everything?domains=abc.net.au&from=${from}&apiKey=17c0da766ba347c89d094449504e3080`;
GetNews(url, sendResponse); GetNews(url, sendResponse);
@@ -168,7 +167,7 @@ const DefaultValues = {
enabled: false, enabled: false,
}, },
{ {
Name: "educationperfect", name: "educationperfect",
enabled: true, enabled: true,
}, },
], ],
@@ -217,13 +216,45 @@ function UpdateCurrentValues(details) {
}); });
} }
function migrateOldStorage() {
chrome.storage.local.get(null, function (items) {
let shouldUpdate = false; // Flag to check if there is anything to update
// Check for the old "Name" field and convert it to "name"
if (items.shortcuts && items.shortcuts.length > 0 && "Name" in items.shortcuts[0]) {
shouldUpdate = true;
items.shortcuts = items.shortcuts.map((shortcut) => {
return {
name: shortcut.Name, // Convert "Name" to "name"
enabled: shortcut.enabled // Keep the "enabled" field as is
};
});
}
// Check for "educationperfect" and convert it to "Education Perfect"
if (items.shortcuts && items.shortcuts.length > 0) {
for (let shortcut of items.shortcuts) {
if (shortcut.name === "educationperfect") {
shouldUpdate = true;
shortcut.name = "Education Perfect"; // Convert to "Education Perfect"
}
}
}
// If there's something to update, set the new values in storage
if (shouldUpdate) {
chrome.storage.local.set({ shortcuts: items.shortcuts }, function() {
console.log("Migration completed.");
});
}
});
}
chrome.runtime.onInstalled.addListener(function (event) { chrome.runtime.onInstalled.addListener(function (event) {
chrome.storage.local.remove(["justupdated"]); chrome.storage.local.remove(["justupdated"]);
UpdateCurrentValues(); UpdateCurrentValues();
if ( if ( event.reason == "install" ) {
/*chrome.runtime.getManifest().version > event.previousVersion || */ event.reason ==
"install"
) {
chrome.storage.local.set({ justupdated: true }); chrome.storage.local.set({ justupdated: true });
migrateOldStorage();
} }
}); });