Ehrenamt/ff-admin
2
0
Fork 0
Code Issues 13 Pull requests Projects Releases 30 Packages Wiki Activity Actions

Merge branch 'develop' into milestone/ff-admin-unit

Browse source 
# Conflicts:
#	src/components/Modal.vue
#	src/components/TextCopy.vue
This commit is contained in:
Julian Krauser 2025-07-23 10:45:04 +02:00
commit fed08e0232
11 changed files with 264 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/views/admin/management/version/VersionDisplay.vue
View file

@ -11,7 +11,7 @@
</small>
</h1>
<p>
V{{ clientVersion }} ({{
v{{ clientVersion }} ({{
new Date(clientVersionRelease).toLocaleDateString("de", {
month: "2-digit",
day: "2-digit",
@ -23,19 +23,7 @@
</p>
</div>
<div class="grow flex flex-col gap-4 overflow-y-scroll">
<div v-for="version in newerClientVersions">
<p>
<span class="font-semibold text-lg">V{{ version.title }}</span> vom
{{
new Date(version.isoDate).toLocaleDateString("de", {
month: "2-digit",
day: "2-digit",
year: "numeric",
})
}}
</p>
<div class="flex flex-col" v-html="version['content:encoded']"></div>
</div>
<VersionItem v-for="version in newerClientVersions" :key="version.title" :version="version" />
<div v-if="newerClientVersions.length == 0" class="flex items-center justify-center">
<p>Der Client ist auf der neuesten Version.</p>
</div>
@ -50,7 +38,7 @@
</small>
</h1>
<p>
V{{ serverVersion }} ({{
v{{ serverVersion }} ({{
new Date(serverVersionRelease).toLocaleDateString("de", {
month: "2-digit",
day: "2-digit",
@ -61,20 +49,8 @@
}})
</p>
</div>
<div class="grow flex flex-col gap-2 overflow-y-scroll">
<div v-for="version in newerServerVersions">
<p>
<span class="font-semibold text-lg">V{{ version.title }}</span> vom
{{
new Date(version.isoDate).toLocaleDateString("de", {
month: "2-digit",
day: "2-digit",
year: "numeric",
})
}}
</p>
<div class="flex flex-col" v-html="version['content:encoded']"></div>
</div>
<div class="grow flex flex-col gap-4 overflow-y-scroll">
<VersionItem v-for="version in newerServerVersions" :key="version.title" :version="version" />
<div v-if="newerServerVersions.length == 0" class="flex items-center justify-center">
<p>Der Server ist auf der neuesten Version.</p>
</div>
@ -90,6 +66,7 @@ import { defineComponent } from "vue";
import MainTemplate from "@/templates/Main.vue";
import clientPackage from "../../../../../package.json";
import type { Releases } from "@/viewmodels/version.models";
import VersionItem from "@/components/admin/management/version/VersionItem.vue";
</script>
<script lang="ts">
@ -113,11 +90,11 @@ export default defineComponent({
},
serverVersionRelease() {
if (!this.serverRss) return "";
return this.serverRss.items.find((i) => i.title == this.serverVersion)?.isoDate ?? "";
return this.serverRss.items.find((i) => i.title == `v${this.serverVersion}`)?.isoDate ?? "";
},
clientVersionRelease() {
if (!this.clientRss) return "";
return this.clientRss.items.find((i) => i.title == this.clientVersion)?.isoDate ?? "";
return this.clientRss.items.find((i) => i.title == `v${this.clientVersion}`)?.isoDate ?? "";
},
},
mounted() {