🔀 #2846 from LSS-Manager/dev

🔀🔖 4.7.12
LSS-Manager · Jan 28, 2024 · 21c75f8 · 21c75f8
2 parents 034335d + 9649c04
commit 21c75f8
Show file tree

Hide file tree

Showing 100 changed files with 2,662 additions and 2,282 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -79,7 +79,7 @@ jobs:
               run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
             - name: '[💽] restore cache'
-              uses: actions/cache@v3
+              uses: actions/cache@v4
               id: yarn_cache
               with:
                   path: |
@@ -203,7 +203,7 @@ jobs:
             - name: '[☁️] upload artifact'
               id: artifact
               if: ${{ success() || failure() }}
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: LSSM_V4-${{ github.sha }}
                   path: dist.zip

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -32,11 +32,11 @@ jobs:
 
             # Initializes the CodeQL tools for scanning.
             - name: '[⚙️] Initialize CodeQL'
-              uses: github/codeql-action/init@v2
+              uses: github/codeql-action/init@v3
               with:
                   languages: ${{ matrix.language }}
 
             - name: '[🛡️] Perform CodeQL Analysis'
-              uses: github/codeql-action/analyze@v2
+              uses: github/codeql-action/analyze@v3
               with:
                   category: '/language:${{matrix.language}}'
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,7 +17,7 @@ jobs:
               run: sudo apt-get install -y unzip rsync
 
             - name: '[⬇️] Download artifact'
-              uses: actions/download-artifact@v3
+              uses: actions/download-artifact@v4
               with:
                   name: LSSM_V4-${{ github.sha }}
 

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,6 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 yarn="$(find ./.yarn/releases/ -name 'yarn-*.cjs')"
 echo "$yarn"
 "$yarn" pre-commit
diff --git a/docs/.vuepress/package.json b/docs/.vuepress/package.json
@@ -9,12 +9,12 @@
 		"@vuepress/plugin-register-components": "2.0.0-rc.0",
 		"@vuepress/plugin-search": "2.0.0-rc.0",
 		"cloc": "2.11.0",
-		"moment": "2.29.4",
+		"moment": "2.30.1",
 		"showdown": "2.1.0",
-		"simple-git": "3.21.0",
-		"vue": "3.3.11",
+		"simple-git": "3.22.0",
+		"vue": "3.4.15",
 		"vuepress": "2.0.0-rc.0",
 		"vuepress-plugin-clipboard": "2.1.5",
-		"vuepress-plugin-sitemap2": "2.0.0-rc.2"
+		"vuepress-plugin-sitemap2": "2.0.0-rc.13"
 	}
 }
diff --git a/docs/de_DE/metadata.md b/docs/de_DE/metadata.md
@@ -34,7 +34,7 @@ Bei jedem Aufruf der Hauptseite des Spiels werden die Telemetrie-Daten (falls ak
 Ist bereits ein Datensatz für den Nutzer vorhanden, so wird dieser überschrieben, ein Verlauf der Einzeldaten wird nicht gespeichert.
 Hat ein Datensatz für mehr als 6 Monate keine Aktualisierung erhalten, so wird dieser automatisch gelöscht.
 
-# Veröffentlichung von Statistiken
+## Veröffentlichung von Statistiken
 
 Folgende Statistiken der Telemetrie können durch das LSSM-Team veröffentlicht werden:
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "lss-manager-v4",
-    "version": "4.7.11+20231212.0145",
+    "version": "4.7.12+20240126.0629",
     "license": "CC-BY-NC-SA-4.0",
     "scripts": {
         "quickbuild": "./build/build.sh --quick",
@@ -11,33 +11,33 @@
         "eslint:fix": "./build/build.sh --eslint",
         "check-tsc": "./build/build.sh --tsc",
         "pre-commit": "./build/build.sh --pre-commit",
-        "prepare": "husky install",
-        "postinstall": "husky install"
+        "prepare": "husky",
+        "postinstall": "husky"
     },
     "dependencies": {
         "@fortawesome/fontawesome-free": "6.5.1",
         "@fortawesome/fontawesome-svg-core": "6.5.1",
         "@fortawesome/free-regular-svg-icons": "6.5.1",
         "@fortawesome/free-solid-svg-icons": "6.5.1",
         "@fortawesome/vue-fontawesome": "2.0.10",
-        "acorn": "8.11.2",
-        "acorn-walk": "8.3.1",
+        "acorn": "8.11.3",
+        "acorn-walk": "8.3.2",
         "broadcast-channel": "4.20.2",
         "emoji-toolkit": "8.0.0",
         "he": "1.2.0",
-        "highcharts": "11.2.0",
+        "highcharts": "11.3.0",
         "highcharts-vue": "1.4.3",
         "leaflet.heat": "0.2.0",
         "localforage": "1.10.0",
         "lodash": "4.17.21",
         "mini-svg-data-uri": "1.4.4",
-        "moment": "2.29.4",
+        "moment": "2.30.1",
         "pinia": "2.1.7",
         "qrcode": "1.5.3",
         "semver": "7.5.4",
         "showdown": "2.1.0",
         "ua-parser-js": "1.0.37",
-        "vue": "2.7.15",
+        "vue": "2.7.16",
         "vue-i18n": "8.28.2",
         "vue-i18n-composable": "2.0.0",
         "vue-js-modal": "2.0.1",
@@ -54,7 +54,7 @@
         "@types/js-yaml": "4.0.9",
         "@types/leaflet": "1.9.8",
         "@types/lodash": "4.14.202",
-        "@types/node": "20.10.4",
+        "@types/node": "20.11.6",
         "@types/pdfmake": "0.2.8",
         "@types/prettier": "2.7.3",
         "@types/qrcode": "1.5.5",
@@ -65,39 +65,39 @@
         "@types/ua-parser-js": "0.7.39",
         "@types/vue-select": "3.16.8",
         "@types/webpack-env": "1.18.4",
-        "@typescript-eslint/eslint-plugin": "6.13.2",
-        "@typescript-eslint/parser": "6.13.2",
+        "@typescript-eslint/eslint-plugin": "6.19.1",
+        "@typescript-eslint/parser": "6.19.1",
         "all-contributors-cli": "6.26.1",
         "copy-dir": "1.3.0",
-        "css-loader": "6.8.1",
-        "eslint": "8.55.0",
+        "css-loader": "6.9.1",
+        "eslint": "8.56.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-import-resolver-typescript": "3.6.1",
         "eslint-plugin-compat": "4.2.0",
-        "eslint-plugin-import": "2.29.0",
-        "eslint-plugin-jsdoc": "46.9.0",
+        "eslint-plugin-import": "2.29.1",
+        "eslint-plugin-jsdoc": "48.0.3",
         "eslint-plugin-markdownlint": "0.5.0",
-        "eslint-plugin-prettier": "5.0.1",
-        "eslint-plugin-regexp": "2.1.2",
+        "eslint-plugin-prettier": "5.1.3",
+        "eslint-plugin-regexp": "2.2.0",
         "eslint-plugin-tsdoc": "0.2.17",
-        "eslint-plugin-unicorn": "49.0.0",
-        "eslint-plugin-vue": "9.19.2",
-        "html-loader": "4.2.0",
-        "husky": "8.0.3",
+        "eslint-plugin-unicorn": "50.0.1",
+        "eslint-plugin-vue": "9.20.1",
+        "html-loader": "5.0.0",
+        "husky": "9.0.2",
         "js-yaml": "4.1.0",
-        "moment-timezone": "0.5.43",
-        "prettier": "3.1.1",
-        "sass": "1.69.5",
-        "sass-loader": "13.3.2",
+        "moment-timezone": "0.5.44",
+        "prettier": "3.2.4",
+        "sass": "1.70.0",
+        "sass-loader": "14.0.0",
         "simpleheat": "0.4.0",
-        "terser": "5.26.0",
+        "terser": "5.27.0",
         "ts-loader": "9.5.1",
         "ts-node": "10.9.1",
         "typescript": "5.3.3",
         "url-loader": "4.1.1",
         "util": "0.12.5",
         "vue-loader": "15.10.1",
-        "vue-template-compiler": "2.7.15",
+        "vue-template-compiler": "2.7.16",
         "webpack": "5.89.0"
     },
     "engines": {

diff --git a/src/LSSMV4.vue b/src/LSSMV4.vue
@@ -4,9 +4,9 @@
         <notifications
             v-for="group in notificationStore.groups"
             :key="group"
-            :group="group.replace(' ', '_')"
+            :group="group"
             :position="group"
-            :class="group.replace('_', ' ')"
+            :class="group"
         >
             <template slot="body" slot-scope="props">
                 <div

diff --git a/src/components/EnhancedTable.vue b/src/components/EnhancedTable.vue
@@ -58,7 +58,9 @@
 </template>
 
 <script setup lang="ts" generic="ColumnKey extends string = string">
-import { computed, nextTick, onMounted, ref } from 'vue';
+import type Vue from 'vue';
+// eslint-disable-next-line no-duplicate-imports
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
 import { faSlidersH } from '@fortawesome/free-solid-svg-icons/faSlidersH';
 import { faSort } from '@fortawesome/free-solid-svg-icons/faSort';
@@ -79,6 +81,8 @@ const scrolledOver = ref<boolean>(false);
 const showHead = ref<boolean>(true);
 
 const tableRight = ref<string>('0px');
+const headHeight = ref<string>('0px');
+const scrollParentTop = ref<string>('0px');
 
 const props = withDefaults(
     defineProps<{
@@ -137,14 +141,30 @@ const $emit = defineEmits<{
 const updateSearch = () =>
     $emit('search', searchField.value?.value.trim() ?? '');
 
-onMounted(() => {
-    document.addEventListener('scroll', () => {
+watch(table, (t, old) => {
+    if (old || !t) return;
+    const scrollParent = (window[PREFIX] as Vue).$utils.getScrollParent(t);
+    if (!scrollParent) return;
+    scrollParent.addEventListener('scroll', () => {
         const clientRect = table.value?.getBoundingClientRect();
+        const parentRect = scrollParent.getBoundingClientRect();
+        const headRect = head.value?.getBoundingClientRect();
+
+        const unFixedHeadHeight = head.value?.classList.contains('fixed')
+            ? parseFloat(headHeight.value)
+            : headRect?.height ?? 0;
+
+        const top = parentRect.top - unFixedHeadHeight;
+
         scrolledOver.value =
-            (clientRect?.top ?? 0) < 0 && (clientRect?.bottom ?? 0) > 0;
+            (clientRect?.top ?? 0) <= top && (clientRect?.bottom ?? 0) > top;
         tableRight.value = `${clientRect?.right ?? 0}px`;
+        headHeight.value = `${unFixedHeadHeight}px`;
+        scrollParentTop.value = `${parentRect.top}px`;
     });
+});
 
+onMounted(() => {
     if (!props.sort) $emit('sort', props.columns[0].key);
 
     nextTick(() => $emit('mounted'));
@@ -153,9 +173,12 @@ onMounted(() => {
 
 <style scoped lang="sass">
 $table-right: v-bind(tableRight)
-$right-end: calc(100vw - $table-right + 1rem)
-$btn-width: 34px
+$head-height: v-bind(headHeight)
+$scroll-parent-top: v-bind(scrollParentTop)
 $padding: .5rem
+$btn-width: 40px
+$right-end: calc(100vw - $table-right + $padding)
+$fixed-top: calc($scroll-parent-top + $padding)
 
 thead
     position: sticky
@@ -174,19 +197,24 @@ thead
         padding: $padding
         border-radius: 15px
         position: fixed
-        top: 1rem
+        top: $fixed-top
         z-index: 1
-        right: calc($right-end + $btn-width)
+        right: calc($right-end + $btn-width + $padding)
 
         &:not(.shown)
             display: none
 
+        ~ table
+            margin-top: $head-height
+
     > *
         margin-left: 1rem
 
 .toggle-head-btn
+    min-width: $btn-width
+    max-width: $btn-width
     position: fixed
-    top: 1rem + $padding
+    top: $fixed-top
     z-index: 1
     right: $right-end
 </style>
diff --git a/src/generated/browsers.json b/src/generated/browsers.json
@@ -1,8 +1,8 @@
 {
     "chrome": {
         "download": "https://chrome.com",
-        "latest": 120,
-        "supported": 114
+        "latest": 121,
+        "supported": 115
     },
     "edge": {
         "download": "https://microsoft.com/edge",
@@ -11,12 +11,12 @@
     },
     "firefox": {
         "download": "https://firefox.com",
-        "latest": 120,
-        "supported": 114
+        "latest": 122,
+        "supported": 116
     },
     "opera": {
         "download": "https://opera.com",
-        "latest": 104,
-        "supported": 98
+        "latest": 106,
+        "supported": 100
     }
 }