From 7f4657ffc936fd3dbf63013a999d5af1a685dbdd Mon Sep 17 00:00:00 2001 From: mahula Date: Sat, 26 Oct 2024 12:56:20 +0200 Subject: [PATCH 01/14] dependabot: degroups webapp package updates for babel and nuxt --- .github/dependabot.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1f39fee52..9e5f10fe3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -103,10 +103,10 @@ updates: applies-to: version-updates patterns: - "apollo*" - babel: + @babel: applies-to: version-updates patterns: - - "*babel*" + - "@babel*" eslint: applies-to: version-updates patterns: @@ -119,10 +119,6 @@ updates: applies-to: version-updates patterns: - "*mapbox*" - nuxt: - applies-to: version-updates - patterns: - - "*nuxt*" sass: applies-to: version-updates patterns: From 2b281ccf97dd6ed74d04fac31bce79b054fb3579 Mon Sep 17 00:00:00 2001 From: mahula Date: Sat, 26 Oct 2024 13:09:29 +0200 Subject: [PATCH 02/14] remove unplanned changes --- webapp/components/Badges.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/webapp/components/Badges.vue b/webapp/components/Badges.vue index 2748c460d..936d13adb 100644 --- a/webapp/components/Badges.vue +++ b/webapp/components/Badges.vue @@ -17,8 +17,6 @@ export default { } -@use 'sass:math'; - diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue index 3d7d336ce..fee0d9140 100644 --- a/webapp/components/Logo/Logo.vue +++ b/webapp/components/Logo/Logo.vue @@ -113,6 +113,7 @@ export default { .ds-logo-svg { height: auto; fill: #000000; + max-width: 100%; } From 0ae48818059674d6d48a56f133fc23a6726d6164 Mon Sep 17 00:00:00 2001 From: Maximilian Harz Date: Tue, 29 Oct 2024 11:11:48 +0100 Subject: [PATCH 12/14] Fix linting --- webapp/components/HeaderMenu/HeaderMenu.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue index 1a8650957..a93aeca97 100644 --- a/webapp/components/HeaderMenu/HeaderMenu.vue +++ b/webapp/components/HeaderMenu/HeaderMenu.vue @@ -141,7 +141,12 @@ - + From b14d873c9f2ff69c2e7a960dd5e860306896df42 Mon Sep 17 00:00:00 2001 From: Maximilian Harz Date: Tue, 29 Oct 2024 11:12:20 +0100 Subject: [PATCH 13/14] Fix unrelated linting errors --- webapp/components/Group/GroupForm.vue | 4 ++-- webapp/components/Password/Strength.vue | 4 +--- .../_new/features/PageParamsLink/PageParamsLink.vue | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue index 248d9dc48..52437d644 100644 --- a/webapp/components/Group/GroupForm.vue +++ b/webapp/components/Group/GroupForm.vue @@ -272,8 +272,8 @@ export default { return isNestedValue ? this.formData.locationName.value : isDirectString - ? this.formData.locationName - : '' + ? this.formData.locationName + : '' }, locationNameLabelAddOnOldName() { return this.formLocationName !== '' ? ' — ' + this.formLocationName : '' diff --git a/webapp/components/Password/Strength.vue b/webapp/components/Password/Strength.vue index 05c93da25..7f01cbea9 100644 --- a/webapp/components/Password/Strength.vue +++ b/webapp/components/Password/Strength.vue @@ -97,9 +97,7 @@ export default { position: absolute; width: 0; border-radius: inherit; - transition: - width 0.5s ease-in-out, - background 0.25s; + transition: width 0.5s ease-in-out, background 0.25s; } .password-strength-meter-inner { diff --git a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue index cdc3d8ee0..5d7cdeea2 100644 --- a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue +++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue @@ -28,8 +28,8 @@ export default { return this.forceTargetBlank ? '_blank' : !this.pageParams.isInternalPage - ? this.pageParams.externalLink.target - : '' + ? this.pageParams.externalLink.target + : '' }, isInternalLink() { return !this.forceTargetBlank && this.pageParams.isInternalPage From 71b1992f803bcef7140a7756269e0cd497d614ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 30 Oct 2024 13:09:45 +0100 Subject: [PATCH 14/14] Fix linting --- webapp/components/Group/GroupForm.vue | 4 ++-- webapp/components/Password/Strength.vue | 4 +++- .../_new/features/PageParamsLink/PageParamsLink.vue | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue index 52437d644..248d9dc48 100644 --- a/webapp/components/Group/GroupForm.vue +++ b/webapp/components/Group/GroupForm.vue @@ -272,8 +272,8 @@ export default { return isNestedValue ? this.formData.locationName.value : isDirectString - ? this.formData.locationName - : '' + ? this.formData.locationName + : '' }, locationNameLabelAddOnOldName() { return this.formLocationName !== '' ? ' — ' + this.formLocationName : '' diff --git a/webapp/components/Password/Strength.vue b/webapp/components/Password/Strength.vue index 7f01cbea9..05c93da25 100644 --- a/webapp/components/Password/Strength.vue +++ b/webapp/components/Password/Strength.vue @@ -97,7 +97,9 @@ export default { position: absolute; width: 0; border-radius: inherit; - transition: width 0.5s ease-in-out, background 0.25s; + transition: + width 0.5s ease-in-out, + background 0.25s; } .password-strength-meter-inner { diff --git a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue index 5d7cdeea2..cdc3d8ee0 100644 --- a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue +++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue @@ -28,8 +28,8 @@ export default { return this.forceTargetBlank ? '_blank' : !this.pageParams.isInternalPage - ? this.pageParams.externalLink.target - : '' + ? this.pageParams.externalLink.target + : '' }, isInternalLink() { return !this.forceTargetBlank && this.pageParams.isInternalPage