Merge branch 'uzl'

YorikHansen · Aug 29, 2024 · 084d278 · 084d278
2 parents e2fef6a + d86052f
commit 084d278
Show file tree

Hide file tree

Showing 9 changed files with 305 additions and 236 deletions.
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "1.39.2"
+    ".": "1.40.0"
 }
diff --git a/.yarn/releases/yarn-4.4.0.cjs → .yarn/releases/yarn-4.4.1.cjs b/.yarn/releases/yarn-4.4.0.cjs → .yarn/releases/yarn-4.4.1.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,4 +1,4 @@
 defaultSemverRangePrefix: ''
 nmHoistingLimits: workspaces
 nodeLinker: node-modules
-yarnPath: .yarn/releases/yarn-4.4.0.cjs
+yarnPath: .yarn/releases/yarn-4.4.1.cjs
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## [1.40.0](https://github.com/YorikHansen/better-moodle/compare/1.39.2...1.40.0) (2024-08-29)
+
+### 1-Year Anniversary of Better-Moodle 🎉
+
+Hello, dear Better-Moodle user,
+
+Thank you so much for using Better-Moodle!
+Today, exactly one year ago, Better-Moodle was released for the first time.
+Since then, Better-Moodle has grown a lot and has become a quite userscript for Moodle at Universität zu Lübeck and in Kiel.
+I am very grateful for all the feedback and support I have received from you, and I am also looking forward to the future of Better-Moodle.
+At the moment, I am working on a complete rewrite as the current code is pretty messy and hard to maintain, meanwhile Yorik, a good friend, maintains and extends the current version.
+
+BTW: Did you know, that Better-Moodle now does have an official logo? Check it out in GitHub and in the Better-Moodle settings dialog.  
+Did you also know that Better-Moodle does have a Mascot called Moothel?
+Moothel is a super cute mammoth 🦣 and he even has his own homepage!
+Feel free to visit him at [moothel.pet](https://moothel.pet) and say hi!
+
+Thank you all for your loving support!  
+Jan <3
+
+### Features
+
+* **readme:** add Better-Moodle logo and link to moothel homepage https://moothel.pet ([6fe4eeb](https://github.com/YorikHansen/better-moodle/commit/6fe4eeba54dcc42ac3f82e4daf3c7dd6a18638af))
+* **settings:** add Better-Moodle logo in background ([0a36266](https://github.com/YorikHansen/better-moodle/commit/0a36266be5c079b864dd0e79d186d6cdfed85d7d))
+
 ## [1.39.2](https://github.com/YorikHansen/better-moodle/compare/1.39.1...1.39.2) (2024-08-08)
 
 

diff --git a/README.md b/README.md
@@ -15,20 +15,14 @@
 -   [Better-Moodle ohne Userscript-Manager nutzen \[UzL\]][use-without-userscript-manager]
 -   [Verlauf der GitHub Stars](#verlauf-der-github-stars)
 
-Better-Moodle ist ein Userscript, um das Design vom [Informatik Moodle der Uni Kiel][kiel-moodle] zu verbessern und zusätzliche, coole Features hinzuzufügen. Es basiert auf [Better-Moodle der UzL][better-moodle-uzl] von [Jan](https://github.com/jxn-30).
+[//]: # 'TODO: More english translations'
 
-Wenn du dir spezielle Kiel-spezifische Features wünscht, kannst du gerne ein Issue oder einen Pull-Request öffnen. Richte dich ansonsten direkt an [Better-Moodle der UzL][better-moodle-uzl].
+|                                                                                                                                                                                                                                                                                                                   |                                              |
+|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------------------------------------:|
+| Better-Moodle ist ein Userscript, um das Design vom [Informatik Moodle der Uni Kiel][kiel-moodle] zu verbessern und zusätzliche, coole Features hinzuzufügen. Es basiert auf [Better-Moodle der UzL][better-moodle-uzl] von [Jan](https://github.com/jxn-30).<br>Wenn du dir spezielle Kiel-spezifische Features wünscht, kannst du gerne ein Issue oder einen Pull-Request öffnen. Richte dich ansonsten direkt an [Better-Moodle der UzL][better-moodle-uzl].<br><br> 🇬🇧 Better-Moodle is an userscript to improve the design of the [Kiel Universities computer science Moodle][kiel-moodle] and add additional, cool features. It's based on [Better-Moodle of the UzL][better-moodle-uzl] by [Jan](https://github.com/jxn-30).<br>If you have any Kiel specific feature requests, feel free to open an issue or a pull request. Otherwise, please refer to the original [Better-Moodle of the UzL][better-moodle-uzl] for general feature requests. | ![The Better-Moodle logo](./img/moothel.png) |
+| Better-Moodle Maskottchen Moothel / Better-Moodle Mascot Moothel: [moothel.pet](https://moothel.pet)                                                                                                                                                                                                              |              Better-Moodle Logo              |
 
-
-<details>
-
-<summary>🇬🇧 Introduction</summary>
-
-🇬🇧 Better-Moodle is an userscript to improve the design of the [Kiel Universities computer science Moodle][kiel-moodle] and add additional, cool features. It's based on [Better-Moodle of the UzL][better-moodle-uzl] by [Jan](https://github.com/jxn-30).
-
-If you have any Kiel specific feature requests, feel free to open an issue or a pull request. Otherwise, please refer to the original [Better-Moodle of the UzL][better-moodle-uzl] for general feature requests.
-
-</details>
+_Bilder in dieser Beschreibung enthalten teilweise verschwommene Elemente, um den Datenschutz zu wahren._
 
 > **🇬🇧 English Version**
 >

diff --git a/img/moothel.png b/img/moothel.png
diff --git a/package.json b/package.json
@@ -1,22 +1,22 @@
 {
     "name": "uzl-better-moodle",
     "description": "Improves the new weird Moodle 4 UI on UzL-Moodle",
-    "version": "1.39.2",
-    "packageManager": "yarn@4.4.0",
+    "version": "1.40.0",
+    "packageManager": "yarn@4.4.1",
     "type": "module",
     "private": true,
     "scripts": {
         "lint:fix": "yarn eslint . --exit-on-fatal-error --report-unused-disable-directives --cache --cache-strategy content --fix",
         "prettier:write": "prettier --write --cache --cache-strategy content ."
     },
     "devDependencies": {
-        "@eslint/js": "9.8.0",
-        "@types/eslint": "9.6.0",
+        "@eslint/js": "9.9.1",
+        "@types/eslint": "9.6.1",
         "@types/tampermonkey": "5.0.3",
-        "darkreader": "4.9.87",
-        "eslint": "9.8.0",
+        "darkreader": "4.9.89",
+        "eslint": "9.9.1",
         "eslint-config-prettier": "9.1.0",
-        "eslint-plugin-userscripts": "0.5.4",
+        "eslint-plugin-userscripts": "0.5.5",
         "globals": "15.9.0",
         "prettier": "3.3.3",
         "userscript-meta": "1.0.1"

diff --git a/redesign.user.js b/redesign.user.js
@@ -2,14 +2,14 @@
 // @name            🎓️ CAU: better-moodle
 // @namespace       https://better-moodle.yorik.dev
 // @                x-release-please-start-version
-// @version         1.39.2
+// @version         1.40.0
 // @                x-release-please-end
 // @author          Jan (jxn_30), Yorik (YorikHansen)
+// @description     Improves Moodle by cool features and design improvements.
 // @description:de  Verbessert Moodle durch coole Features und Designverbesserungen.
-// @description:en  Improves Moodle by cool features and design improvements.
 // @homepage        https://github.com/YorikHansen/better-moodle
 // @homepageURL     https://github.com/YorikHansen/better-moodle
-// @icon            https://www.uni-kiel.de/favicon.ico
+// @icon            https://raw.githubusercontent.com/jxn-30/better-moodle/main/img/moothel.png
 // @updateURL       https://github.com/YorikHansen/better-moodle/releases/latest/download/better-moodle.meta.js
 // @downloadURL     https://github.com/YorikHansen/better-moodle/releases/latest/download/better-moodle.user.js
 // @match           https://elearn.informatik.uni-kiel.de/*
@@ -27,7 +27,7 @@
 // @connect         api.pirateweather.net
 // @connect         weather.visualcrossing.com
 // @connect         wttr.in
-// @require         https://unpkg.com/darkreader@4.9.87/darkreader.js#sha512=db6998940ba007c1cb2a05707928d0bb871078563194cb2825a4cb13f8f0d39550737a9496e5febf9ec23c53355eca144ccc999faa3c175ac8ffba48f1664aa2
+// @require         https://unpkg.com/darkreader@4.9.89/darkreader.js#sha512=15732894c8596b9ecd7360f88b3c41e84a04915f4dcc344eb008f10f9c3c419f6659223caa69db8df13c6dbf7a07d934f3f53afbff34b11b0cd1ed8614a79d0f
 // @connect         cloud.rz.uni-kiel.de
 // @connect         www.uni-kiel.de
 // ==/UserScript==
@@ -270,7 +270,13 @@ Das hilft, ihn schneller und effizienter zu beheben.
 
 ## Ich habe eine tolle Idee für ein neues Feature!
 
-Erstelle gerne ein Issue auf [GitHub]({{githubIssueFeature}}), reiche dort eine Contribution ein oder schreibe eine Mail an Yorik: [{{mailAdress}}]({{mailLinkFeature}})`,
+Erstelle gerne ein Issue auf [GitHub]({{githubIssueFeature}}), reiche dort eine Contribution ein oder schreibe eine Mail an Yorik: [{{mailAdress}}]({{mailLinkFeature}})
+
+## Wer ist denn dieses süße Mammut 🦣 da im Hintergrund der Einstellungen?
+
+Gut, dass du fragst! Das ist eine Zeichnung von Moothel, dem Better-Moodle Maskottchen. Um genau zu sein ist das sogar das Better-Moodle Logo!
+
+Übrigens: Moothel hat auch eine eigene Homepage: [moothel.pet](https://moothel.pet).`,
                 mails: {
                     help: {
                         subject: 'Ich benötige bitte Hilfe',
@@ -947,7 +953,13 @@ This helps to fix it faster and more efficiently.
 
 ## I have a great idea for a new feature!
 
-Feel free to create an issue on [GitHub]({{githubIssueFeature}}), submit a contribution there or write an email to Yorik: [{{mailAdress}}]({{mailLinkFeature}})`,
+Feel free to create an issue on [GitHub]({{githubIssueFeature}}), submit a contribution there or write an email to Yorik: [{{mailAdress}}]({{mailLinkFeature}})
+
+## Who is that cute mammoth 🦣 in the background of the settings?
+
+I'm glad you asked! That's a drawing of Moothel, the Better Moodle mascot. In fact, it's the Better Moodle logo!
+
+By the way: Moothel also has his own homepage: [moothel.pet](https://moothel.pet).`,
                 mails: {
                     help: {
                         subject: 'I need help please',
@@ -2026,7 +2038,7 @@ const addMarqueeItems = (() => {
 })();
 
 // that is the contact mail of Yorik
-const cntctAdr = 'bettermoodle@yorik.dev';
+const cntctAdr = 'yorik@better-moodle.dev';
 
 const getEmail = (subject = '', body = '') => {
     const url = new URL(`mailto:${cntctAdr}`);
@@ -8050,6 +8062,30 @@ ready(() => {
             }
             // endregion
 
+            // region moothel background image
+            const moothelImg = document.createElement('img');
+            moothelImg.src = rawGithubPath('img/moothel.png');
+            moothelImg.id = PREFIX('moothel');
+            modal.header[0].before(moothelImg);
+            GM_addStyle(css`
+                #${moothelImg.id} {
+                    position: absolute;
+                    width: 90%;
+                    height: 90%;
+                    opacity: 0.1;
+                    top: 5%;
+                    left: 5%;
+                    object-fit: contain;
+                }
+
+                @media (prefers-contrast: more) {
+                    #${moothelImg.id} {
+                        display: none;
+                    }
+                }
+            `);
+            // endregion
+
             const footerBtnGroup = document.createElement('div');
             footerBtnGroup.classList.add('btn-group', 'mr-auto');
 

diff --git a/yarn.lock b/yarn.lock
@@ -23,14 +23,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/config-array@npm:^0.17.1":
-  version: 0.17.1
-  resolution: "@eslint/config-array@npm:0.17.1"
+"@eslint/config-array@npm:^0.18.0":
+  version: 0.18.0
+  resolution: "@eslint/config-array@npm:0.18.0"
   dependencies:
     "@eslint/object-schema": "npm:^2.1.4"
     debug: "npm:^4.3.1"
     minimatch: "npm:^3.1.2"
-  checksum: 10c0/b986a0a96f2b42467578968ce3d4ae3b9284e587f8490f2dcdc44ff1b8d30580c62b221da6e58d07b09e156c3050e2dc38267f9370521d9cafc099c4e30154ef
+  checksum: 10c0/0234aeb3e6b052ad2402a647d0b4f8a6aa71524bafe1adad0b8db1dfe94d7f5f26d67c80f79bb37ac61361a1d4b14bb8fb475efe501de37263cf55eabb79868f
   languageName: node
   linkType: hard
 
@@ -51,10 +51,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.8.0":
-  version: 9.8.0
-  resolution: "@eslint/js@npm:9.8.0"
-  checksum: 10c0/42edaae6b020436410454579509dcb6a8cd5b260e9f18e037fd803ae28d35eb13663d4019f0ab8ba686a19d3c4a43b0e11394c148e23345377ab694da0e83262
+"@eslint/js@npm:9.9.1":
+  version: 9.9.1
+  resolution: "@eslint/js@npm:9.9.1"
+  checksum: 10c0/a3a91de2ce78469f7c4eee78c1eba77360706e1d0fa0ace2e19102079bcf237b851217c85ea501dc92c4c3719d60d9df966977abc8554d4c38e3638c1f53dcb2
   languageName: node
   linkType: hard
 
@@ -106,13 +106,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:9.6.0":
-  version: 9.6.0
-  resolution: "@types/eslint@npm:9.6.0"
+"@types/eslint@npm:9.6.1":
+  version: 9.6.1
+  resolution: "@types/eslint@npm:9.6.1"
   dependencies:
     "@types/estree": "npm:*"
     "@types/json-schema": "npm:*"
-  checksum: 10c0/69301356bc73b85e381ae00931291de2e96d1cc49a112c592c74ee32b2f85412203dea6a333b4315fd9839bb14f364f265cbfe7743fc5a78492ee0326dd6a2c1
+  checksum: 10c0/69ba24fee600d1e4c5abe0df086c1a4d798abf13792d8cfab912d76817fe1a894359a1518557d21237fbaf6eda93c5ab9309143dee4c59ef54336d1b3570420e
   languageName: node
   linkType: hard
 
@@ -258,10 +258,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"darkreader@npm:4.9.87":
-  version: 4.9.87
-  resolution: "darkreader@npm:4.9.87"
-  checksum: 10c0/bb375305f770373228136ee3f29e3deb8ec7f269f4ca0cf4ac5f45ebdcf519ccdc8b0973af3d22931e39e0add085867a74be539b7f70e71e8f8163e86e084d79
+"darkreader@npm:4.9.89":
+  version: 4.9.89
+  resolution: "darkreader@npm:4.9.89"
+  dependencies:
+    malevic: "npm:0.20.2"
+  checksum: 10c0/76a58711d7d3fa40fd0ad055fb8f6f531178661dbec5f5d9899c06487e9f545ca4b1a32915426a740b7d050a43afc002f090d9abda5ffe7a9fccde3b2917fbf3
   languageName: node
   linkType: hard
 
@@ -302,14 +304,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-userscripts@npm:0.5.4":
-  version: 0.5.4
-  resolution: "eslint-plugin-userscripts@npm:0.5.4"
+"eslint-plugin-userscripts@npm:0.5.5":
+  version: 0.5.5
+  resolution: "eslint-plugin-userscripts@npm:0.5.5"
   dependencies:
     semver: "npm:^7.3.8"
   peerDependencies:
     eslint: ">=8.40.0 <11"
-  checksum: 10c0/94dcde848d59b90cadbc92466fb38ee07122bb45d70555cbc49a72561a594c5ca4905a9e173145b375421afe33206b022d41a5367999cdb360b3e9aa730db8cf
+  checksum: 10c0/6ad14e35bc7d0a6647cbf28d44dbcbc03cee5e8c06da3d21e3bf42147ee3bf21170e96bf3a6f7fb63f97f52963800424c2c641c68bd0b1dd9669d6deec2ee514
   languageName: node
   linkType: hard
 
@@ -337,15 +339,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:9.8.0":
-  version: 9.8.0
-  resolution: "eslint@npm:9.8.0"
+"eslint@npm:9.9.1":
+  version: 9.9.1
+  resolution: "eslint@npm:9.9.1"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.11.0"
-    "@eslint/config-array": "npm:^0.17.1"
+    "@eslint/config-array": "npm:^0.18.0"
     "@eslint/eslintrc": "npm:^3.1.0"
-    "@eslint/js": "npm:9.8.0"
+    "@eslint/js": "npm:9.9.1"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.3.0"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -375,9 +377,14 @@ __metadata:
     optionator: "npm:^0.9.3"
     strip-ansi: "npm:^6.0.1"
     text-table: "npm:^0.2.0"
+  peerDependencies:
+    jiti: "*"
+  peerDependenciesMeta:
+    jiti:
+      optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/a2ee0cce1147565d011fe185733af482f34d5466f5df5f390d0ea2ecf78097883cf568ed6c771d687138609c63cd55cd1e3ff12de7393c03f54fcffcdd0f225d
+  checksum: 10c0/5e71efda7c0a14ee95436d5cdfed04ee61dfb1d89d7a32b50a424de2e680af82849628ea6581950c2e0726491f786a3cfd0032ce013c1c5093786e475cfdfb33
   languageName: node
   linkType: hard
 
@@ -521,9 +528,9 @@ __metadata:
   linkType: hard
 
 "ignore@npm:^5.2.0":
-  version: 5.3.1
-  resolution: "ignore@npm:5.3.1"
-  checksum: 10c0/703f7f45ffb2a27fb2c5a8db0c32e7dee66b33a225d28e8db4e1be6474795f606686a6e3bcc50e1aa12f2042db4c9d4a7d60af3250511de74620fbed052ea4cd
+  version: 5.3.2
+  resolution: "ignore@npm:5.3.2"
+  checksum: 10c0/f9f652c957983634ded1e7f02da3b559a0d4cc210fca3792cb67f1b153623c9c42efdc1c4121af171e295444459fc4a9201101fb041b1104a3c000bccb188337
   languageName: node
   linkType: hard
 
@@ -641,6 +648,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"malevic@npm:0.20.2":
+  version: 0.20.2
+  resolution: "malevic@npm:0.20.2"
+  checksum: 10c0/cff8b3b724a5ac8e6688930997420374a06c1a34cac610a79e76ca53b654970f147ec55e5e2757cd3713940a56a1f7bfb82d64884fd26c88c79fec76a46c2ddf
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
@@ -858,13 +872,13 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "uzl-better-moodle@workspace:."
   dependencies:
-    "@eslint/js": "npm:9.8.0"
-    "@types/eslint": "npm:9.6.0"
+    "@eslint/js": "npm:9.9.1"
+    "@types/eslint": "npm:9.6.1"
     "@types/tampermonkey": "npm:5.0.3"
-    darkreader: "npm:4.9.87"
-    eslint: "npm:9.8.0"
+    darkreader: "npm:4.9.89"
+    eslint: "npm:9.9.1"
     eslint-config-prettier: "npm:9.1.0"
-    eslint-plugin-userscripts: "npm:0.5.4"
+    eslint-plugin-userscripts: "npm:0.5.5"
     globals: "npm:15.9.0"
     prettier: "npm:3.3.3"
     userscript-meta: "npm:1.0.1"