3.11.4

QkeleQ10 · Jun 18, 2024 · 1ba801c · 1ba801c
1 parent a8e557f
commit 1ba801c
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 8 deletions.
diff --git a/manifest-firefox.json b/manifest-firefox.json
@@ -3,7 +3,7 @@
     "manifest_version": 3,
     "name": "__MSG_appName__",
     "description": "__MSG_appDesc__",
-    "version": "3.11.3",
+    "version": "3.11.4",
     "default_locale": "nl",
     "icons": {
         "16": "icons/[email protected]",

diff --git a/manifest.json b/manifest.json
@@ -3,7 +3,7 @@
     "manifest_version": 3,
     "name": "__MSG_appName__",
     "description": "__MSG_appDesc__",
-    "version": "3.11.3",
+    "version": "3.11.4",
     "default_locale": "nl",
     "icons": {
         "16": "icons/[email protected]",

diff --git a/popup/dist/assets/index-Bcqs9ZUh.js → popup/dist/assets/index-CFAfwAOA.js b/popup/dist/assets/index-Bcqs9ZUh.js → popup/dist/assets/index-CFAfwAOA.js
diff --git a/popup/dist/index.html b/popup/dist/index.html
@@ -7,7 +7,7 @@
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="icon" href="./favicon.ico">
   <title>Study Tools-configuratiepaneel</title>
-  <script type="module" crossorigin src="./assets/index-Bcqs9ZUh.js"></script>
+  <script type="module" crossorigin src="./assets/index-CFAfwAOA.js"></script>
   <link rel="stylesheet" crossorigin href="./assets/index-BmeHimE9.css">
 </head>
 

diff --git a/popup/dist/settings.js b/popup/dist/settings.js
@@ -377,6 +377,15 @@ export default [
                     { settingId: 'beta-options', operator: 'equal', value: true }
                 ],
             },
+            {
+                id: "custom-css",
+                title: "Aangepaste CSS",
+                type: "TextInput",
+                default: '',
+                conditions: [
+                    { settingId: 'beta-options', operator: 'equal', value: true }
+                ],
+            },
             // TODO: setting to disable color adaptation for dark theme
         ]
     },

diff --git a/popup/public/settings.js b/popup/public/settings.js
@@ -377,6 +377,15 @@ export default [
                     { settingId: 'beta-options', operator: 'equal', value: true }
                 ],
             },
+            {
+                id: "custom-css",
+                title: "Aangepaste CSS",
+                type: "TextInput",
+                default: '',
+                conditions: [
+                    { settingId: 'beta-options', operator: 'equal', value: true }
+                ],
+            },
             // TODO: setting to disable color adaptation for dark theme
         ]
     },

diff --git a/src/magister/scripts/gamification.js b/src/magister/scripts/gamification.js
@@ -442,8 +442,8 @@ async function themeContest() {
                     })
                     textarea.addEventListener('paste', (event) => {
                         try {
-                            let obj = JSON.parse(atob((event.clipboardData || window.clipboardData).getData("text")) || JSON.stringify((event.clipboardData || window.clipboardData).getData("text")) || (event.clipboardData || window.clipboardData).getData("text"))
-                            if (obj.title !== 'Magister Theme Contest!') {
+                            let obj = JSON.parse((event.clipboardData || window.clipboardData).getData("text"))
+                            if (obj.title !== 'Magister Theme Contest') {
                                 throw new Error('invalid')
                             }
                             setTimeout(() => textarea.value = JSON.stringify(obj, null, 4), 0)
@@ -456,8 +456,8 @@ async function themeContest() {
 
                 } else {
                     user = await MagisterApi.accountInfo(true)
-                    navigator.clipboard.writeText(btoa(`Magister Theme Contest!/${user.name.firstname} ${user.name.lastname}/${window.location.hostname.split('.')[0]}/${JSON.stringify(pick(syncedStorage, 'ptheme', 'pagecolor', 'wallpaper', 'sidecolor', 'decoration', 'decoration-size', 'appbarcolor', 'shape', 'custom-css'))}`))
-                    notify('dialog', "Je thema is nu gekopieerd naar je klembord. Stuur hem ergens in het Discord-kanaal!")
+                    navigator.clipboard.writeText(btoa(JSON.stringify({ title: 'Magister Theme Contest', name: `${user.name.firstname} ${user.name.lastname}`, school: window.location.hostname.split('.')[0], options: pick(syncedStorage, 'ptheme', 'pagecolor', 'wallpaper', 'sidecolor', 'decoration', 'decoration-size', 'appbarcolor', 'shape', 'custom-css') })))
+                    notify('dialog', "Je inzending is nu gekopieerd naar je klembord. Typ '/winactie' in Discord en volg de aanwijzingen.")
                 }
             })
         }