From 69dfe4954d0e59917aa2d79f712936679c864e57 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Thu, 3 Oct 2024 09:40:25 +0200
Subject: [PATCH 1/7] repplace shareStore by sessionStore.share

Signed-off-by: dartcafe <github@dartcafe.de>
---
 lib/Controller/UserController.php             |   1 +
 src/components/Cards/modules/CardRegister.vue |   8 +-
 src/components/Poll/PollInformation.vue       |   8 +-
 src/components/Public/PublicRegisterModal.vue |  26 +--
 .../Subscription/ActionSubscription.vue       |   8 +-
 src/components/Subscription/Subscription.vue  |   8 +-
 .../User/ActionInputDisplayName.vue           |  12 +-
 .../User/ActionInputEmailAddress.vue          |  14 +-
 src/components/User/UserMenu.vue              |  40 ++--
 src/router.ts                                 |   4 +-
 src/stores/session.ts                         | 131 ++++++++++---
 src/stores/share.ts                           | 174 ------------------
 src/stores/shares.ts                          |  21 ++-
 13 files changed, 191 insertions(+), 264 deletions(-)
 delete mode 100644 src/stores/share.ts

diff --git a/lib/Controller/UserController.php b/lib/Controller/UserController.php
index 383e80eb0..430d54167 100644
--- a/lib/Controller/UserController.php
+++ b/lib/Controller/UserController.php
@@ -67,6 +67,7 @@ public function getSession(): JSONResponse {
 			'currentUser' => $this->acl->getCurrentUser(),
 			'appPermissions' => $this->acl->getPermissionsArray(),
 			'appSettings' => $this->acl->getAppSettings(),
+			'share' => null,
 		]);
 	}
 
diff --git a/src/components/Cards/modules/CardRegister.vue b/src/components/Cards/modules/CardRegister.vue
index 36f133186..fce6819a7 100644
--- a/src/components/Cards/modules/CardRegister.vue
+++ b/src/components/Cards/modules/CardRegister.vue
@@ -8,16 +8,16 @@
 	import { CardDiv } from '../../Base/index.js'
 	import ActionRegister from '../../Actions/modules/ActionRegister.vue'
 	import { t } from '@nextcloud/l10n'
-	import { useShareStore } from '../../../stores/share.ts'
+	import { useSessionStore } from '../../../stores/session.ts'
 
-	const shareStore = useShareStore()
+	const sessionStore = useSessionStore()
 	const cardType = 'info'
 
 	const registrationInvitationText = computed(() => {
-		if (shareStore.publicPollEmail === 'mandatory') {
+		if (sessionStore.share.publicPollEmail === 'mandatory') {
 			return t('polls', 'To participate, register with your email address and a name.')
 		}
-		if (shareStore.publicPollEmail === 'optional') {
+		if (sessionStore.share.publicPollEmail === 'optional') {
 			return t('polls', 'To participate, register a name and optionally with your email address.')
 		}
 		return t('polls', 'To participate, register with a name.')
diff --git a/src/components/Poll/PollInformation.vue b/src/components/Poll/PollInformation.vue
index d143bd7be..a77deca77 100644
--- a/src/components/Poll/PollInformation.vue
+++ b/src/components/Poll/PollInformation.vue
@@ -10,7 +10,7 @@
 	import { NcUserBubble } from '@nextcloud/vue'
 
 	import { BadgeDiv } from '../Base/index.js'
-	import { useShareStore } from '../../stores/share.ts'
+	import { useSessionStore } from '../../stores/session.ts'
 	import { usePollStore, AccessType } from '../../stores/poll.ts'
 	import { useSubscriptionStore } from '../../stores/subscription.ts'
 	import { useOptionsStore } from '../../stores/options.ts'
@@ -36,7 +36,7 @@
 	import { MaybeIcon } from '../AppIcons/index.js'
 
 	const pollStore = usePollStore()
-	const shareStore = useShareStore()
+	const sessionStore = useSessionStore()
 	const subscriptionStore = useSubscriptionStore()
 	const optionsStore = useOptionsStore()
 	const votesStore = useVotesStore()
@@ -173,11 +173,11 @@
 			</template>
 			{{ n('polls', 'Only %n vote per option.', 'Only %n votes per option.', pollStore.configuration.maxVotesPerOption) }}
 		</BadgeDiv>
-		<BadgeDiv v-if="$route.name === 'publicVote' && shareStore.user.emailAddress">
+		<BadgeDiv v-if="$route.name === 'publicVote' && sessionStore.share.user.emailAddress">
 			<template #icon>
 				<EmailIcon />
 			</template>
-			{{ shareStore.user.emailAddress }}
+			{{ sessionStore.share.user.emailAddress }}
 		</BadgeDiv>
 		<BadgeDiv v-if="subscriptionStore.subscribed">
 			<template #icon>
diff --git a/src/components/Public/PublicRegisterModal.vue b/src/components/Public/PublicRegisterModal.vue
index bce4a1685..545f473d1 100644
--- a/src/components/Public/PublicRegisterModal.vue
+++ b/src/components/Public/PublicRegisterModal.vue
@@ -14,7 +14,6 @@
 	import { SimpleLink, setCookie } from '../../helpers/index.ts'
 	import { ValidatorAPI, PublicAPI } from '../../Api/index.js'
 	import { t } from '@nextcloud/l10n'
-	import { useShareStore } from '../../stores/share.ts'
 	import { SignalingType, UserType } from '../../Types'
 	import { useSessionStore } from '../../stores/session.ts'
 	import { usePollStore } from '../../stores/poll.ts'
@@ -25,7 +24,6 @@
 
 	const emit = defineEmits(['close'])
 
-	const shareStore = useShareStore()
 	const sessionStore = useSessionStore()
 	const pollStore = usePollStore()
 
@@ -40,10 +38,16 @@
 	const emailAddress = ref('')
 	const saveCookie = ref(true)
 
-	const registrationIsValid = computed(() => checkStatus.value.userName === SignalingType.Valid && (checkStatus.value.email === SignalingType.Valid || (emailAddress.value.length === 0 && shareStore.publicPollEmail !== 'mandatory')))
+	const registrationIsValid = computed(() => checkStatus.value.userName === SignalingType.Valid 
+		&& (checkStatus.value.email === SignalingType.Valid
+			|| (emailAddress.value.length === 0
+				&& sessionStore.share.publicPollEmail !== 'mandatory'
+			)
+		)
+	)
 	const disableSubmit = computed(() => !registrationIsValid.value || checkStatus.value.userName === SignalingType.Checking || sendRegistration.value)
-	const emailGeneratedStatus = computed(() => checkStatus.value.email === SignalingType.Empty ? shareStore.publicPollEmail : checkStatus.value.email)
-	const offerCookies = computed(() => shareStore.user.type === UserType.Public)
+	const emailGeneratedStatus = computed(() => checkStatus.value.email === SignalingType.Empty ? sessionStore.share.publicPollEmail : checkStatus.value.email)
+	const offerCookies = computed(() => sessionStore.share.user.type === UserType.Public)
 	const status = computed(() => registrationIsValid.value)
 
 	const privacyRich = computed(() => {
@@ -82,7 +86,7 @@
 		if (emailGeneratedStatus.value === 'checking') return t('polls', 'Checking email address …')
 		if (emailGeneratedStatus.value === 'mandatory') return t('polls', 'An email address is required.')
 		if (emailGeneratedStatus.value === 'invalid') return t('polls', 'Invalid email address.')
-		if (shareStore.user.type === 'public') {
+		if (sessionStore.share.user.type === 'public') {
 			if (emailGeneratedStatus.value === 'valid') return t('polls', 'You will receive your personal link after clicking "OK".')
 			return t('polls', 'Enter your email address to get your personal access link.')
 		}
@@ -93,12 +97,12 @@
 		if (route.name === 'publicVote' && route.query.name) {
 			userName.value = route.query.name.toString()
 		} else {
-			userName.value = shareStore.user.displayName
+			userName.value = sessionStore.share.user.displayName
 		}
 		if (route.name === 'publicVote' && route.query.email) {
 			emailAddress.value = route.query.email.toString()
 		} else {
-			emailAddress.value = shareStore.user.emailAddress
+			emailAddress.value = sessionStore.share.user.emailAddress
 		}
 	})
 
@@ -206,7 +210,7 @@
 
 			routeToPersonalShare(response.data.share.token)
 
-			if (shareStore.user.emailAddress && !shareStore.invitationSent) {
+			if (sessionStore.share.user.emailAddress && !sessionStore.share.invitationSent) {
 				showError(t('polls', 'Email could not be sent to {emailAddress}', { emailAddress: this.shareStore.user.emailAddress }))
 			}
 		} catch (error) {
@@ -233,11 +237,11 @@
 					@input="validatePublicUsername()"
 					@submit="submitRegistration()" />
 
-				<InputDiv v-if="shareStore.publicPollEmail !== 'disabled'"
+				<InputDiv v-if="sessionStore.share.publicPollEmail !== 'disabled'"
 					v-model="emailAddress"
 					class="section__email"
 					:signaling-class="checkStatus.email"
-					:placeholder="shareStore.publicPollEmail === 'mandatory' ? t('polls', 'Email address (mandatory)') : t('polls', 'Email address (optional)')"
+					:placeholder="sessionStore.share.publicPollEmail === 'mandatory' ? t('polls', 'Email address (mandatory)') : t('polls', 'Email address (optional)')"
 					:helper-text="emailAddressHint"
 					type="email"
 					inputmode="email"
diff --git a/src/components/Subscription/ActionSubscription.vue b/src/components/Subscription/ActionSubscription.vue
index 7773a94e9..3e903822b 100644
--- a/src/components/Subscription/ActionSubscription.vue
+++ b/src/components/Subscription/ActionSubscription.vue
@@ -8,13 +8,13 @@
 	import { NcActions, NcActionCheckbox } from '@nextcloud/vue'
 	import { t } from '@nextcloud/l10n'
 	import { useSubscriptionStore } from '../../stores/subscription.ts'
-	import { useShareStore } from '../../stores/share.ts'
+	import { useSessionStore } from '../../stores/session.ts'
 
 	const subscriptionStore = useSubscriptionStore()
-	const shareStore = useShareStore()
+	const sessionStore = useSessionStore()
 
-	const label = computed(() => shareStore.user.emailAddress
-		? t('polls', 'Receive notification email on activity to {emailAddress}', { emailAddress: shareStore.user.emailAddress })
+	const label = computed(() => sessionStore.share.user.emailAddress
+		? t('polls', 'Receive notification email on activity to {emailAddress}', { emailAddress: sessionStore.share.user.emailAddress })
 		: t('polls', 'Receive notification email on activity'))
 
 </script>
diff --git a/src/components/Subscription/Subscription.vue b/src/components/Subscription/Subscription.vue
index 3342253d5..573043473 100644
--- a/src/components/Subscription/Subscription.vue
+++ b/src/components/Subscription/Subscription.vue
@@ -8,13 +8,13 @@
 	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
 	import { t } from '@nextcloud/l10n'
 	import { useSubscriptionStore } from '../../stores/subscription.ts'
-	import { useShareStore } from '../../stores/share.ts'
+	import { useSessionStore } from '../../stores/session.ts'
 
-	const shareStore = useShareStore()
+	const sessionStore = useSessionStore()
 	const subscriptionStore = useSubscriptionStore()
 
-	const label = computed(() => shareStore.user.emailAddress
-		? t('polls', 'Receive notification email on activity to {emailAddress}', { emailAddress: shareStore.user.emailAddress })
+	const label = computed(() => sessionStore.share.user.emailAddress
+		? t('polls', 'Receive notification email on activity to {emailAddress}', { emailAddress: sessionStore.share.user.emailAddress })
 		: t('polls', 'Receive notification email on activity')
 	)
 
diff --git a/src/components/User/ActionInputDisplayName.vue b/src/components/User/ActionInputDisplayName.vue
index ab27b2d26..2a9ef4299 100644
--- a/src/components/User/ActionInputDisplayName.vue
+++ b/src/components/User/ActionInputDisplayName.vue
@@ -11,7 +11,6 @@
 	import { ValidatorAPI } from '../../Api/index.js'
 	import { t } from '@nextcloud/l10n'
 	import { useSessionStore } from '../../stores/session.ts'
-	import { useShareStore } from '../../stores/share.ts'
 	import { ref } from 'vue'
 	import { StatusResults } from '../../Types/index.ts'
 
@@ -24,7 +23,6 @@
 	}
 
 	const sessionStore = useSessionStore()
-	const shareStore = useShareStore()
 
 	const inputProps = ref<InputProps>({
 		success: false,
@@ -42,18 +40,18 @@
 	}
 
 	const validate = debounce(async function () {
-		if (shareStore.displayName.length < 1) {
+		if (sessionStore.share.displayName.length < 1) {
 			setStatus(StatusResults.Unchanged)
 			return
 		}
 
-		if (shareStore.displayName === sessionStore.currentUser.displayName) {
+		if (sessionStore.share.displayName === sessionStore.currentUser.displayName) {
 			setStatus(StatusResults.Error)
 			return
 		}
 
 		try {
-			await ValidatorAPI.validateName(sessionStore.route.params.token, shareStore.displayName)
+			await ValidatorAPI.validateName(sessionStore.route.params.token, sessionStore.share.displayName)
 			setStatus(StatusResults.Success)
 		} catch {
 			setStatus(StatusResults.Error)
@@ -62,7 +60,7 @@
 
 	async function submit() {
 		try {
-			await shareStore.updateDisplayName({ displayName: shareStore.displayName })
+			await sessionStore.updateDisplayName({ displayName: sessionStore.share.displayName })
 			showSuccess(t('polls', 'Name changed.'))
 			setStatus(StatusResults.Unchanged)
 		} catch {
@@ -76,7 +74,7 @@
 <template>
 	<NcActionInput v-if="sessionStore.route.name === 'publicVote'"
 		v-bind="inputProps"
-		v-model="shareStore.displayName"
+		v-model="sessionStore.share.displayName"
 		@update:value-value="validate"
 		@submit="submit">
 		<template #icon>
diff --git a/src/components/User/ActionInputEmailAddress.vue b/src/components/User/ActionInputEmailAddress.vue
index c9cc4d16d..55dcd46c6 100644
--- a/src/components/User/ActionInputEmailAddress.vue
+++ b/src/components/User/ActionInputEmailAddress.vue
@@ -11,7 +11,6 @@
 	import { ValidatorAPI } from '../../Api/index.js'
 	import { t } from '@nextcloud/l10n'
 	import { useSessionStore } from '../../stores/session.ts'
-	import { useShareStore } from '../../stores/share.ts'
 	import { ref } from 'vue'
 	import { StatusResults } from '../../Types/index.ts'
 
@@ -24,7 +23,6 @@
 	}
 
 	const sessionStore = useSessionStore()
-	const shareStore = useShareStore()
 
 	const inputProps = ref<InputProps>({
 		success: false,
@@ -42,13 +40,13 @@
 
 
 	const validate = debounce(async function () {
-		if (shareStore.emailAddress === sessionStore.currentUser.emailAddress) {
+		if (sessionStore.share.emailAddress === sessionStore.currentUser.emailAddress) {
 			setStatus(StatusResults.Unchanged)
 			return
 		}
 
 		try {
-			await ValidatorAPI.validateEmailAddress(shareStore.emailAddress)
+			await ValidatorAPI.validateEmailAddress(sessionStore.share.emailAddress)
 			setStatus(StatusResults.Success)
 		} catch {
 			setStatus(StatusResults.Error)
@@ -57,11 +55,11 @@
 
 	async function submit() {
 		try {
-			await shareStore.updateEmailAddress({ emailAddress: shareStore.emailAddress })
-			showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress: shareStore.emailAddress }))
+			await sessionStore.updateEmailAddress({ emailAddress: sessionStore.share.emailAddress })
+			showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress: sessionStore.share.emailAddress }))
 			setStatus(StatusResults.Unchanged)
 		} catch {
-			showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress: shareStore.emailAddress }))
+			showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress: sessionStore.share.emailAddress }))
 			setStatus(StatusResults.Error)
 		}
 	}
@@ -70,7 +68,7 @@
 <template>
 	<NcActionInput v-if="sessionStore.route.name === 'publicVote'"
 		v-bind="inputProps"
-		v-model="shareStore.emailAddress"
+		v-model="sessionStore.share.emailAddress"
 		@update:model-value="validate"
 		@submit="submit">
 		<template #icon>
diff --git a/src/components/User/UserMenu.vue b/src/components/User/UserMenu.vue
index 495ad67fa..886b9ec0f 100644
--- a/src/components/User/UserMenu.vue
+++ b/src/components/User/UserMenu.vue
@@ -14,14 +14,13 @@
 
 	import { PollsAPI, ValidatorAPI } from '../../Api/index.js'
 	import { usePollStore } from '../../stores/poll.ts'
-	import { useShareStore } from '../../stores/share.ts'
+	import { useSessionStore } from '../../stores/session.ts'
 	import { useSubscriptionStore } from '../../stores/subscription.ts'
 	import { useVotesStore } from '../../stores/votes.ts'
 
 	import { StatusResults } from '../../Types/index.ts'
 
 	import { deleteCookieByValue, findCookieByValue } from '../../helpers/index.ts'
-	import { useSessionStore } from '../../stores/session.ts'
 
 	import SettingsIcon from 'vue-material-design-icons/Cog.vue'
 	import SendLinkPerEmailIcon from 'vue-material-design-icons/LinkVariant.vue'
@@ -43,7 +42,6 @@
 
 	const pollStore = usePollStore()
 	const sessionStore = useSessionStore()
-	const shareStore = useShareStore()
 	const subscriptionStore = useSubscriptionStore()
 	const votesStore = useVotesStore()
 	const router = useRouter()
@@ -67,19 +65,19 @@
 
 	async function deleteEmailAddress() {
 		try {
-			await shareStore.deleteEmailAddress()
+			await sessionStore.deleteEmailAddress()
 			showSuccess(t('polls', 'Email address deleted.'))
 		} catch {
-			showError(t('polls', 'Error deleting email address {emailAddress}', { emailAddress: shareStore.user.emailAddress }))
+			showError(t('polls', 'Error deleting email address {emailAddress}', { emailAddress: sessionStore.share.user.emailAddress }))
 		}
 	}
 
 	async function resendInvitation() {
 		try {
-			const response = await shareStore.resendInvitation()
-			showSuccess(t('polls', 'Invitation resent to {emailAddress}', { emailAddress: response.data.shareStore.user.emailAddress }))
+			const response = await sessionStore.resendInvitation()
+			showSuccess(t('polls', 'Invitation resent to {emailAddress}', { emailAddress: response.data.share.user.emailAddress }))
 		} catch {
-			showError(t('polls', 'Mail could not be resent to {emailAddress}', { emailAddress: shareStore.user.emailAddress }))
+			showError(t('polls', 'Mail could not be resent to {emailAddress}', { emailAddress: sessionStore.share.user.emailAddress }))
 		}
 	}
 
@@ -127,18 +125,18 @@
 	})
 
 	const validateDisplayName = debounce(async function () {
-		if (shareStore.displayName.length < 1) {
+		if (sessionStore.share.displayName.length < 1) {
 			setDisplayNameStatus(StatusResults.Error)
 			return
 		}
 
-		if (shareStore.displayName === sessionStore.currentUser.displayName) {
+		if (sessionStore.share.displayName === sessionStore.currentUser.displayName) {
 			setDisplayNameStatus(StatusResults.Unchanged)
 			return
 		}
 
 		try {
-			await ValidatorAPI.validateName(sessionStore.route.params.token, shareStore.displayName)
+			await ValidatorAPI.validateName(sessionStore.route.params.token, sessionStore.share.displayName)
 			setDisplayNameStatus(StatusResults.Success)
 		} catch {
 			setDisplayNameStatus(StatusResults.Error)
@@ -153,7 +151,7 @@
 
 	async function submitDisplayName() {
 		try {
-			await shareStore.updateDisplayName({ displayName: shareStore.displayName })
+			await sessionStore.updateDisplayName({ displayName: sessionStore.share.displayName })
 			showSuccess(t('polls', 'Name changed.'))
 			setDisplayNameStatus(StatusResults.Unchanged)
 		} catch {
@@ -171,13 +169,13 @@
 	})
 
 	const validateEMail = debounce(async function () {
-		if (shareStore.emailAddress === sessionStore.currentUser.emailAddress) {
+		if (sessionStore.share.emailAddress === sessionStore.currentUser.emailAddress) {
 			setEMailStatus(StatusResults.Unchanged)
 			return
 		}
 
 		try {
-			await ValidatorAPI.validateEmailAddress(shareStore.emailAddress)
+			await ValidatorAPI.validateEmailAddress(sessionStore.share.emailAddress)
 			setEMailStatus(StatusResults.Success)
 		} catch {
 			setEMailStatus(StatusResults.Error)
@@ -192,11 +190,11 @@
 
 	async function submitEmail() {
 		try {
-			await shareStore.updateEmailAddress({ emailAddress: shareStore.emailAddress })
-			showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress: shareStore.emailAddress }))
+			await sessionStore.updateEmailAddress({ emailAddress: sessionStore.share.emailAddress })
+			showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress: sessionStore.share.emailAddress }))
 			setEMailStatus(StatusResults.Unchanged)
 		} catch {
-			showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress: shareStore.emailAddress }))
+			showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress: sessionStore.share.emailAddress }))
 			setEMailStatus(StatusResults.Error)
 		}
 	}
@@ -222,7 +220,7 @@
 
 		<NcActionInput v-if="sessionStore.share?.type === 'external'"
 			v-bind="displayNameInputProps"
-			v-model="shareStore.displayName"
+			v-model="sessionStore.share.displayName"
 			@update:value-value="validateDisplayName"
 			@submit="submitDisplayName">
 			<template #icon>
@@ -233,7 +231,7 @@
 
 		<NcActionInput v-if="sessionStore.share?.type === 'external'"
 			v-bind="eMailInputProps"
-			v-model="shareStore.emailAddress"
+			v-model="sessionStore.share.emailAddress"
 			@update:model-value="validateEMail"
 			@submit="submitEmail">
 			<template #icon>
@@ -245,7 +243,7 @@
 		<NcActionButton v-if="sessionStore.share?.type === 'external'"
 			:name="t('polls', 'Get your personal link per mail')"
 			:aria-label="t('polls', 'Get your personal link per mail')"
-			:disabled="!shareStore.user.emailAddress"
+			:disabled="!sessionStore.share.user.emailAddress"
 			@click="resendInvitation()">
 			<template #icon>
 				<SendLinkPerEmailIcon />
@@ -259,7 +257,7 @@
 			{{ t('polls', 'Subscribe to notifications') }}
 		</NcActionCheckbox>
 
-		<NcActionButton v-if="sessionStore.share?.type === 'external' && shareStore.user.emailAddress"
+		<NcActionButton v-if="sessionStore.share?.type === 'external' && sessionStore.share.user.emailAddress"
 			:name="t('polls', 'Remove Email Address')"
 			:aria-label="t('polls', 'Remove Email Address')"
 			@click="deleteEmailAddress">
diff --git a/src/router.ts b/src/router.ts
index 24d147b7a..d5d0f3af8 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -21,7 +21,6 @@ import Combo from './views/Combo.vue'
 import { usePollStore } from './stores/poll.ts'
 import { FilterType } from './stores/polls.ts'
 import { useSessionStore } from './stores/session.ts'
-import { useShareStore } from './stores/share.ts'
 
 async function validateToken(to: RouteLocationNormalized) {
 
@@ -194,7 +193,6 @@ const router = createRouter({
 
 router.beforeEach(async (to: RouteLocationNormalized) => {
 	const sessionStore = useSessionStore()
-	const shareStore = useShareStore()
 	const pollStore = usePollStore()
 	sessionStore.setRouter(to)
 	try {
@@ -206,7 +204,7 @@ router.beforeEach(async (to: RouteLocationNormalized) => {
 
 	try {
 		if (to.meta.publicPage) {
-			await shareStore.load()
+			await sessionStore.loadShare()
 		}
 
 		if (to.meta.votePage) {
diff --git a/src/stores/session.ts b/src/stores/session.ts
index 8cfe341ea..6b7a5f058 100644
--- a/src/stores/session.ts
+++ b/src/stores/session.ts
@@ -6,12 +6,18 @@
 import { defineStore } from 'pinia'
 import { getCurrentUser } from '@nextcloud/auth'
 import { PublicAPI, SessionAPI } from '../Api/index.js'
-import { User, AppPermissions, UserType } from '../Types/index.ts'
+import { User, AppPermissions } from '../Types/index.ts'
 import { AppSettings, UpdateType } from './appSettings.ts'
 import { usePreferencesStore, ViewMode, SessionSettings } from './preferences.ts'
 import { FilterType } from './polls.ts'
-import { Share } from './share.ts'
+import { Share } from './shares.ts'
 import { RouteLocationNormalized } from 'vue-router'
+import { Logger } from '../helpers/index.ts'
+import { usePollStore } from './poll.ts'
+import { useOptionsStore } from './options.ts'
+import { useVotesStore } from './votes.ts'
+import { useCommentsStore } from './comments.ts'
+import { useSubscriptionStore } from './subscription.ts'
 
 export type Route = {
 	currentRoute: string
@@ -30,10 +36,10 @@ export type UserStatus = {
 }
 
 export type Session = {
-	token: string
+	token: string | null
 	appPermissions: AppPermissions
 	appSettings: AppSettings
-	currentUser: User
+	currentUser: User |null
 	sessionSettings: SessionSettings
 	viewModes: ViewMode[]
 	route: Route
@@ -44,24 +50,6 @@ export type Session = {
 const mobileBreakpoint = 480
 export const useSessionStore = defineStore('session', {
 	state: (): Session => ({
-		token: '',
-		currentUser: {
-			userId: '',
-			displayName: '',
-			emailAddress: '',
-			subName: '',
-			subtitle: '',
-			isNoUser: true,
-			desc: '',
-			type: UserType.User,
-			id: '',
-			user: '',
-			organisation: '', 
-			languageCode: '',
-			localeCode: '',
-			timeZone: '',
-			categories: []
-		},
 		appPermissions: {
 			allAccess: false,
 			publicShares: false,
@@ -122,6 +110,8 @@ export const useSessionStore = defineStore('session', {
 			isLoggedin: !!getCurrentUser(),
 			isAdmin: !!getCurrentUser()?.isAdmin,
 		},
+		token: null,
+		currentUser: null,
 		share: null,
 	}),
 
@@ -193,5 +183,102 @@ export const useSessionStore = defineStore('session', {
 			this.route.path = payload.path
 			this.route.params = payload.params
 		},
+
+		// Share store
+		async loadShare(): Promise<void> {
+			if (this.route.name !== 'publicVote') {
+				this.share = null
+				return
+			}
+
+			try {
+				const response = await PublicAPI.getShare(this.route.params.token)
+				this.share = response.data.share
+				return response.data
+			} catch (error) {
+				if (error?.code === 'ERR_CANCELED') return
+				Logger.error('Error retrieving share', { error })
+				throw error
+			}
+		},
+
+		async updateEmailAddress(payload: { emailAddress: string }): Promise<void> {
+			const pollStore = usePollStore()
+
+			if (this.route.name !== 'publicVote') {
+				return
+			}
+
+			try {
+				const response = await PublicAPI.setEmailAddress(this.route.params.token, payload.emailAddress)
+				this.share = response.data.share
+				pollStore.load()
+
+			} catch (error) {
+				if (error?.code === 'ERR_CANCELED') return
+				Logger.error('Error writing email address', { error, payload })
+				throw error
+			}
+		},
+
+		async updateDisplayName(payload: { displayName: string }): Promise<void> {
+			const pollStore = usePollStore()
+			const commentsStore = useCommentsStore()
+			const votesStore = useVotesStore()
+			const optionsStore = useOptionsStore()
+
+			if (this.route.name !== 'publicVote') {
+				return
+			}
+
+			try {
+				const response = await PublicAPI.setDisplayName(this.route.params.token, payload.displayName)
+				this.share = response.data.share
+				pollStore.load()
+				commentsStore.load()
+				votesStore.load()
+				optionsStore.load()
+
+			} catch (error) {
+				if (error?.code === 'ERR_CANCELED') return
+				Logger.error('Error changing name', { error, payload })
+				throw error
+			}
+		},
+
+		async deleteEmailAddress(): Promise<void>{
+			const pollStore = usePollStore()
+			const subscriptionStore = useSubscriptionStore()
+
+			if (this.route.name !== 'publicVote') {
+				return
+			}
+
+			try {
+				const response = await PublicAPI.deleteEmailAddress(this.route.params.token)
+				this.share = response.data.share
+				subscriptionStore.$state.subscribed = false
+				subscriptionStore.write()
+				pollStore.load()
+			} catch (error) {
+				if (error?.code === 'ERR_CANCELED') return
+				Logger.error('Error writing email address', { error })
+				throw error
+			}
+		},
+
+		async resendInvitation() {
+			if (this.route.name !== 'publicVote') {
+				return
+			}
+
+			try {
+				return await PublicAPI.resendInvitation(this.route.params.token)
+			} catch (error) {
+				if (error?.code === 'ERR_CANCELED') return
+				Logger.error('Error sending invitation', { error, token: this.route.params.token })
+				throw error
+			}
+		},
 	},
 })
diff --git a/src/stores/share.ts b/src/stores/share.ts
deleted file mode 100644
index ad56e352c..000000000
--- a/src/stores/share.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2024 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-import { defineStore } from 'pinia'
-import { PublicAPI } from '../Api/index.js'
-import { Logger } from '../helpers/index.ts'
-import { usePollStore } from './poll.ts'
-import { useCommentsStore } from './comments.ts'
-import { useVotesStore } from './votes.ts'
-import { useOptionsStore } from './options.ts'
-import { useSubscriptionStore } from './subscription.ts'
-import { User, UserType } from '../Types/index.ts'
-import { useSessionStore } from './session.ts'
-
-export type Share = {
-	displayName: string
-	id: string | null
-	invitationSent: boolean
-	locked: boolean
-	pollId: number | null
-	token: string
-	type: UserType
-	emailAddress: string
-	userId: string
-	publicPollEmail: string
-	user: User
-	reminderSent: boolean
-	label: string
-	URL: string
-	voted: boolean
-	deleted: boolean
-}
-
-export const useShareStore = defineStore('share', {
-	state: (): Share => ({
-		displayName: '',
-		id: null,
-		invitationSent: false,
-		locked: false,
-		pollId: null,
-		token: '',
-		type: UserType.None,
-		emailAddress: '',
-		userId: '',
-		publicPollEmail: 'optional',
-		user: {
-			userId: '',
-			displayName: '',
-			emailAddress: '',
-			subName: '',
-			subtitle: '',
-			isNoUser: true,
-			desc: '',
-			type: UserType.None,
-			id: '',
-			user: '',
-			organisation: '', 
-			languageCode: '',
-			localeCode: '',
-			timeZone: '',
-			categories: []
-		},
-		reminderSent: false,
-		label: '',
-		URL: '',
-		voted: false,
-		deleted: false,
-	}),
-
-	actions: {
-		async load(): Promise<void> {
-			const sessionStore = useSessionStore()
-			if (sessionStore.route.name !== 'publicVote') {
-				this.$reset()
-				return
-			}
-	
-			try {
-				const response = await PublicAPI.getShare(sessionStore.route.params.token)
-				this.$patch(response.data.share)
-				return response.data
-			} catch (error) {
-				if (error?.code === 'ERR_CANCELED') return
-				Logger.error('Error retrieving share', { error })
-				throw error
-			}
-		},
-	
-		async updateEmailAddress(payload: { emailAddress: string }): Promise<void> {
-			const pollStore = usePollStore()
-			const sessionStore = useSessionStore()
-
-			if (sessionStore.route.name !== 'publicVote') {
-				return
-			}
-	
-			try {
-				const response = await PublicAPI.setEmailAddress(sessionStore.route.params.token, payload.emailAddress)
-				this.$patch(response.data.share)
-				pollStore.load()
-
-			} catch (error) {
-				if (error?.code === 'ERR_CANCELED') return
-				Logger.error('Error writing email address', { error, payload })
-				throw error
-			}
-		},
-	
-		async updateDisplayName(payload: { displayName: string }): Promise<void> {
-			const pollStore = usePollStore()
-			const commentsStore = useCommentsStore()
-			const votesStore = useVotesStore()
-			const optionsStore = useOptionsStore()
-			const sessionStore = useSessionStore()
-
-			if (sessionStore.route.name !== 'publicVote') {
-				return
-			}
-	
-			try {
-				const response = await PublicAPI.setDisplayName(sessionStore.route.params.token, payload.displayName)
-				this.$patch(response.data.share)
-				pollStore.load()
-				commentsStore.load()
-				votesStore.load()
-				optionsStore.load()
-
-			} catch (error) {
-				if (error?.code === 'ERR_CANCELED') return
-				Logger.error('Error changing name', { error, payload })
-				throw error
-			}
-		},
-	
-		async deleteEmailAddress(): Promise<void>{
-			const pollStore = usePollStore()
-			const subscriptionStore = useSubscriptionStore()
-			const sessionStore = useSessionStore()
-
-			if (sessionStore.route.name !== 'publicVote') {
-				return
-			}
-	
-			try {
-				const response = await PublicAPI.deleteEmailAddress(sessionStore.route.params.token)
-				this.$patch(response.data.share)
-				subscriptionStore.$state.subscribed = false
-				subscriptionStore.write()
-				pollStore.load()
-			} catch (error) {
-				if (error?.code === 'ERR_CANCELED') return
-				Logger.error('Error writing email address', { error })
-				throw error
-			}
-		},
-	
-		async resendInvitation() {
-			const sessionStore = useSessionStore()
-			if (sessionStore.route.name !== 'publicVote') {
-				return
-			}
-	
-			try {
-				return await PublicAPI.resendInvitation(sessionStore.route.params.token)
-			} catch (error) {
-				if (error?.code === 'ERR_CANCELED') return
-				Logger.error('Error sending invitation', { error, token: sessionStore.route.params.token })
-				throw error
-			}
-		},
-	},
-})
diff --git a/src/stores/shares.ts b/src/stores/shares.ts
index cf33a66a6..16f3c2e1e 100644
--- a/src/stores/shares.ts
+++ b/src/stores/shares.ts
@@ -6,10 +6,27 @@
 import { defineStore } from 'pinia'
 import { SharesAPI } from '../Api/index.js'
 import { Logger } from '../helpers/index.ts'
-import { Share } from './share.ts'
 import { useSessionStore } from './session.ts'
-import { UserType } from '../Types/index.ts'
+import { User, UserType } from '../Types/index.ts'
 
+export type Share = {
+	displayName: string
+	id: string | null
+	invitationSent: boolean
+	locked: boolean
+	pollId: number | null
+	token: string
+	type: UserType
+	emailAddress: string
+	userId: string
+	publicPollEmail: string
+	user: User
+	reminderSent: boolean
+	label: string
+	URL: string
+	voted: boolean
+	deleted: boolean
+}
 
 export type Shares = {
 	list: Share[]

From 1e23227bdaf7e7f4a7bc96c72a492620d55acd37 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Thu, 3 Oct 2024 10:05:40 +0200
Subject: [PATCH 2/7] seperate ShareType from UserType and use user props from
 user

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/Types/index.ts                            |  3 +-
 src/components/Poll/PollInformation.vue       |  4 +--
 src/components/Public/PublicRegisterModal.vue | 23 ++++++++------
 src/components/Shares/ShareItem.vue           | 19 ++++++------
 .../User/ActionInputDisplayName.vue           | 10 +++---
 .../User/ActionInputEmailAddress.vue          | 12 +++----
 src/components/User/UserMenu.vue              | 23 +++++++-------
 src/stores/shares.ts                          | 31 +++++++++++++------
 8 files changed, 69 insertions(+), 56 deletions(-)

diff --git a/src/Types/index.ts b/src/Types/index.ts
index 30aef003f..4cbe4efbb 100644
--- a/src/Types/index.ts
+++ b/src/Types/index.ts
@@ -10,8 +10,7 @@ export { Comment, Comments, CommentsGrouped } from '../stores/comments.ts'
 export { Poll, PollType, AccessType, ShowResults, AllowProposals, PollConfiguration, PollStatus, PollPermissions, CurrentUserStatus } from '../stores/poll.ts'
 export { SortType, FilterType, PollCategory, Meta, PollList } from '../stores/polls.ts'
 export { Option, OptionVotes, Sequence, Shift, SimpleOption, Options } from '../stores/options.ts'
-export { Share } from '../stores/share.ts'
-export { Shares } from '../stores/shares.ts'
+export { Share, Shares, ShareType } from '../stores/shares.ts'
 export { Route, UserStatus, Session } from '../stores/session.ts'
 export { UserPreferences, SessionSettings, Calendar, Preferences, ViewMode } from '../stores/preferences.ts'
 export { Answer, AnswerSymbol, Vote, Votes } from '../stores/votes.ts'
diff --git a/src/components/Poll/PollInformation.vue b/src/components/Poll/PollInformation.vue
index a77deca77..0dab9251a 100644
--- a/src/components/Poll/PollInformation.vue
+++ b/src/components/Poll/PollInformation.vue
@@ -173,11 +173,11 @@
 			</template>
 			{{ n('polls', 'Only %n vote per option.', 'Only %n votes per option.', pollStore.configuration.maxVotesPerOption) }}
 		</BadgeDiv>
-		<BadgeDiv v-if="$route.name === 'publicVote' && sessionStore.share.user.emailAddress">
+		<BadgeDiv v-if="$route.name === 'publicVote' && sessionStore.currentUser.emailAddress">
 			<template #icon>
 				<EmailIcon />
 			</template>
-			{{ sessionStore.share.user.emailAddress }}
+			{{ sessionStore.currentUser.emailAddress }}
 		</BadgeDiv>
 		<BadgeDiv v-if="subscriptionStore.subscribed">
 			<template #icon>
diff --git a/src/components/Public/PublicRegisterModal.vue b/src/components/Public/PublicRegisterModal.vue
index 545f473d1..ed18e0d59 100644
--- a/src/components/Public/PublicRegisterModal.vue
+++ b/src/components/Public/PublicRegisterModal.vue
@@ -14,7 +14,7 @@
 	import { SimpleLink, setCookie } from '../../helpers/index.ts'
 	import { ValidatorAPI, PublicAPI } from '../../Api/index.js'
 	import { t } from '@nextcloud/l10n'
-	import { SignalingType, UserType } from '../../Types'
+	import { SignalingType, ShareType } from '../../Types'
 	import { useSessionStore } from '../../stores/session.ts'
 	import { usePollStore } from '../../stores/poll.ts'
 	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
@@ -46,8 +46,11 @@
 		)
 	)
 	const disableSubmit = computed(() => !registrationIsValid.value || checkStatus.value.userName === SignalingType.Checking || sendRegistration.value)
-	const emailGeneratedStatus = computed(() => checkStatus.value.email === SignalingType.Empty ? sessionStore.share.publicPollEmail : checkStatus.value.email)
-	const offerCookies = computed(() => sessionStore.share.user.type === UserType.Public)
+	const emailGeneratedStatus = computed(() => checkStatus.value.email === SignalingType.Empty 
+		? sessionStore.share.publicPollEmail 
+		: checkStatus.value.email
+	)
+	const offerCookies = computed(() => sessionStore.share.type === ShareType.Public)
 	const status = computed(() => registrationIsValid.value)
 
 	const privacyRich = computed(() => {
@@ -75,9 +78,9 @@
 	})
 
 	const userNameHint = computed(() => {
-		if (checkStatus.value.userName === 'checking') return t('polls', 'Checking name …')
-		if (checkStatus.value.userName === 'empty') return t('polls', 'A name is required.')
-		if (checkStatus.value.userName === 'invalid') return t('polls', 'The name {username} is invalid or reserved.', { username: userName.value })
+		if (checkStatus.value.userName === SignalingType.Checking) return t('polls', 'Checking name …')
+		if (checkStatus.value.userName === SignalingType.Empty) return t('polls', 'A name is required.')
+		if (checkStatus.value.userName === SignalingType.InValid) return t('polls', 'The name {username} is invalid or reserved.', { username: userName.value })
 		return ''
 	})
 
@@ -86,7 +89,7 @@
 		if (emailGeneratedStatus.value === 'checking') return t('polls', 'Checking email address …')
 		if (emailGeneratedStatus.value === 'mandatory') return t('polls', 'An email address is required.')
 		if (emailGeneratedStatus.value === 'invalid') return t('polls', 'Invalid email address.')
-		if (sessionStore.share.user.type === 'public') {
+		if (sessionStore.share.type === ShareType.Public) {
 			if (emailGeneratedStatus.value === 'valid') return t('polls', 'You will receive your personal link after clicking "OK".')
 			return t('polls', 'Enter your email address to get your personal access link.')
 		}
@@ -97,12 +100,12 @@
 		if (route.name === 'publicVote' && route.query.name) {
 			userName.value = route.query.name.toString()
 		} else {
-			userName.value = sessionStore.share.user.displayName
+			userName.value = sessionStore.currentUser.displayName
 		}
 		if (route.name === 'publicVote' && route.query.email) {
 			emailAddress.value = route.query.email.toString()
 		} else {
-			emailAddress.value = sessionStore.share.user.emailAddress
+			emailAddress.value = sessionStore.currentUser.emailAddress
 		}
 	})
 
@@ -210,7 +213,7 @@
 
 			routeToPersonalShare(response.data.share.token)
 
-			if (sessionStore.share.user.emailAddress && !sessionStore.share.invitationSent) {
+			if (sessionStore.currentUser.emailAddress && !sessionStore.share.invitationSent) {
 				showError(t('polls', 'Email could not be sent to {emailAddress}', { emailAddress: this.shareStore.user.emailAddress }))
 			}
 		} catch (error) {
diff --git a/src/components/Shares/ShareItem.vue b/src/components/Shares/ShareItem.vue
index b26113106..2facd5cc4 100644
--- a/src/components/Shares/ShareItem.vue
+++ b/src/components/Shares/ShareItem.vue
@@ -12,8 +12,7 @@
 	import { Logger } from '../../helpers/index.ts'
 	import UserItem from '../User/UserItem.vue'
 
-	import { useSharesStore } from '../../stores/shares.ts'
-	import { Share, UserType } from '../../Types/index.ts'
+	import { useSharesStore, Share, ShareType } from '../../stores/shares.ts'
 
 	import VotedIcon from 'vue-material-design-icons/CheckboxMarked.vue'
 	import UnvotedIcon from 'vue-material-design-icons/MinusBox.vue'
@@ -51,10 +50,10 @@
 		},
 	})
 
-	const isActivePublicShare = computed(() => !props.share.deleted && props.share.user.type === UserType.Public)
-	const activateResendInvitation = computed(() => !props.share.deleted && (props.share.user.emailAddress || props.share.user.type === UserType.Group))
-	const activateResolveGroup = computed(() => !props.share.deleted && [UserType.ContactGroup, UserType.Circle].includes(props.share.user.type))
-	const activateSwitchAdmin = computed(() => !props.share.deleted && (props.share.user.type === UserType.User || props.share.user.type === UserType.Admin))
+	const isActivePublicShare = computed(() => !props.share.deleted && props.share.type === ShareType.Public)
+	const activateResendInvitation = computed(() => !props.share.deleted && (props.share.user.emailAddress || props.share.type === ShareType.Group))
+	const activateResolveGroup = computed(() => !props.share.deleted && [ShareType.ContactGroup, ShareType.Circle].includes(props.share.type))
+	const activateSwitchAdmin = computed(() => !props.share.deleted && (props.share.type === ShareType.User || props.share.type === ShareType.Admin))
 	const activateCopyLink = computed(() => !props.share.deleted)
 	const activateShowQr = computed(() => !props.share.deleted && !!props.share.URL)
 	const userItemProps = computed(() => ({
@@ -146,7 +145,7 @@
 				<div v-if="share.voted">
 					<VotedIcon class="vote-status voted" :name="t('polls', 'Has voted')" />
 				</div>
-				<div v-else-if="[UserType.Public, UserType.Group].includes(share.user.type)">
+				<div v-else-if="[ShareType.Public, ShareType.Group].includes(share.type)">
 					<div class="vote-status empty" />
 				</div>
 				<div v-else>
@@ -184,11 +183,11 @@
 				</NcActionButton>
 
 				<NcActionButton v-if="activateSwitchAdmin"
-					:name="share.user.type === UserType.User ? t('polls', 'Grant poll admin access') : t('polls', 'Withdraw poll admin access')"
-					:aria-label="share.user.type === UserType.User ? t('polls', 'Grant poll admin access') : t('polls', 'Withdraw poll admin access')"
+					:name="share.type === ShareType.User ? t('polls', 'Grant poll admin access') : t('polls', 'Withdraw poll admin access')"
+					:aria-label="share.type === ShareType.User ? t('polls', 'Grant poll admin access') : t('polls', 'Withdraw poll admin access')"
 					@click="sharesStore.switchAdmin({ share: share })">
 					<template #icon>
-						<GrantAdminIcon v-if="share.user.type === UserType.User" />
+						<GrantAdminIcon v-if="share.type === ShareType.User" />
 						<WithdrawAdminIcon v-else />
 					</template>
 				</NcActionButton>
diff --git a/src/components/User/ActionInputDisplayName.vue b/src/components/User/ActionInputDisplayName.vue
index 2a9ef4299..7ec798135 100644
--- a/src/components/User/ActionInputDisplayName.vue
+++ b/src/components/User/ActionInputDisplayName.vue
@@ -40,18 +40,18 @@
 	}
 
 	const validate = debounce(async function () {
-		if (sessionStore.share.displayName.length < 1) {
+		if (sessionStore.share.user.displayName.length < 1) {
 			setStatus(StatusResults.Unchanged)
 			return
 		}
 
-		if (sessionStore.share.displayName === sessionStore.currentUser.displayName) {
+		if (sessionStore.share.user.displayName === sessionStore.currentUser.displayName) {
 			setStatus(StatusResults.Error)
 			return
 		}
 
 		try {
-			await ValidatorAPI.validateName(sessionStore.route.params.token, sessionStore.share.displayName)
+			await ValidatorAPI.validateName(sessionStore.route.params.token, sessionStore.share.user.displayName)
 			setStatus(StatusResults.Success)
 		} catch {
 			setStatus(StatusResults.Error)
@@ -60,7 +60,7 @@
 
 	async function submit() {
 		try {
-			await sessionStore.updateDisplayName({ displayName: sessionStore.share.displayName })
+			await sessionStore.updateDisplayName({ displayName: sessionStore.share.user.displayName })
 			showSuccess(t('polls', 'Name changed.'))
 			setStatus(StatusResults.Unchanged)
 		} catch {
@@ -74,7 +74,7 @@
 <template>
 	<NcActionInput v-if="sessionStore.route.name === 'publicVote'"
 		v-bind="inputProps"
-		v-model="sessionStore.share.displayName"
+		v-model="sessionStore.share.user.displayName"
 		@update:value-value="validate"
 		@submit="submit">
 		<template #icon>
diff --git a/src/components/User/ActionInputEmailAddress.vue b/src/components/User/ActionInputEmailAddress.vue
index 55dcd46c6..15f60cf50 100644
--- a/src/components/User/ActionInputEmailAddress.vue
+++ b/src/components/User/ActionInputEmailAddress.vue
@@ -40,13 +40,13 @@
 
 
 	const validate = debounce(async function () {
-		if (sessionStore.share.emailAddress === sessionStore.currentUser.emailAddress) {
+		if (sessionStore.share.user.emailAddress === sessionStore.currentUser.emailAddress) {
 			setStatus(StatusResults.Unchanged)
 			return
 		}
 
 		try {
-			await ValidatorAPI.validateEmailAddress(sessionStore.share.emailAddress)
+			await ValidatorAPI.validateEmailAddress(sessionStore.share.user.emailAddress)
 			setStatus(StatusResults.Success)
 		} catch {
 			setStatus(StatusResults.Error)
@@ -55,11 +55,11 @@
 
 	async function submit() {
 		try {
-			await sessionStore.updateEmailAddress({ emailAddress: sessionStore.share.emailAddress })
-			showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress: sessionStore.share.emailAddress }))
+			await sessionStore.updateEmailAddress({ emailAddress: sessionStore.share.user.emailAddress })
+			showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress: sessionStore.share.user.emailAddress }))
 			setStatus(StatusResults.Unchanged)
 		} catch {
-			showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress: sessionStore.share.emailAddress }))
+			showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress: sessionStore.share.user.emailAddress }))
 			setStatus(StatusResults.Error)
 		}
 	}
@@ -68,7 +68,7 @@
 <template>
 	<NcActionInput v-if="sessionStore.route.name === 'publicVote'"
 		v-bind="inputProps"
-		v-model="sessionStore.share.emailAddress"
+		v-model="sessionStore.share.user.emailAddress"
 		@update:model-value="validate"
 		@submit="submit">
 		<template #icon>
diff --git a/src/components/User/UserMenu.vue b/src/components/User/UserMenu.vue
index 886b9ec0f..f11951b95 100644
--- a/src/components/User/UserMenu.vue
+++ b/src/components/User/UserMenu.vue
@@ -31,7 +31,6 @@
 	import LogoutIcon from 'vue-material-design-icons/Logout.vue'
 	import EditEmailIcon from 'vue-material-design-icons/EmailEditOutline.vue'
 
-
 	type InputProps = {
 		success: boolean
 		error: boolean
@@ -125,18 +124,18 @@
 	})
 
 	const validateDisplayName = debounce(async function () {
-		if (sessionStore.share.displayName.length < 1) {
+		if (sessionStore.share.user.displayName.length < 1) {
 			setDisplayNameStatus(StatusResults.Error)
 			return
 		}
 
-		if (sessionStore.share.displayName === sessionStore.currentUser.displayName) {
+		if (sessionStore.share.user.displayName === sessionStore.currentUser.displayName) {
 			setDisplayNameStatus(StatusResults.Unchanged)
 			return
 		}
 
 		try {
-			await ValidatorAPI.validateName(sessionStore.route.params.token, sessionStore.share.displayName)
+			await ValidatorAPI.validateName(sessionStore.route.params.token, sessionStore.share.user.displayName)
 			setDisplayNameStatus(StatusResults.Success)
 		} catch {
 			setDisplayNameStatus(StatusResults.Error)
@@ -151,7 +150,7 @@
 
 	async function submitDisplayName() {
 		try {
-			await sessionStore.updateDisplayName({ displayName: sessionStore.share.displayName })
+			await sessionStore.updateDisplayName({ displayName: sessionStore.share.user.displayName })
 			showSuccess(t('polls', 'Name changed.'))
 			setDisplayNameStatus(StatusResults.Unchanged)
 		} catch {
@@ -169,13 +168,13 @@
 	})
 
 	const validateEMail = debounce(async function () {
-		if (sessionStore.share.emailAddress === sessionStore.currentUser.emailAddress) {
+		if (sessionStore.share.user.emailAddress === sessionStore.currentUser.emailAddress) {
 			setEMailStatus(StatusResults.Unchanged)
 			return
 		}
 
 		try {
-			await ValidatorAPI.validateEmailAddress(sessionStore.share.emailAddress)
+			await ValidatorAPI.validateEmailAddress(sessionStore.share.user.emailAddress)
 			setEMailStatus(StatusResults.Success)
 		} catch {
 			setEMailStatus(StatusResults.Error)
@@ -190,11 +189,11 @@
 
 	async function submitEmail() {
 		try {
-			await sessionStore.updateEmailAddress({ emailAddress: sessionStore.share.emailAddress })
-			showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress: sessionStore.share.emailAddress }))
+			await sessionStore.updateEmailAddress({ emailAddress: sessionStore.share.user.emailAddress })
+			showSuccess(t('polls', 'Email address {emailAddress} saved.', { emailAddress: sessionStore.share.user.emailAddress }))
 			setEMailStatus(StatusResults.Unchanged)
 		} catch {
-			showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress: sessionStore.share.emailAddress }))
+			showError(t('polls', 'Error saving email address {emailAddress}', { emailAddress: sessionStore.share.user.emailAddress }))
 			setEMailStatus(StatusResults.Error)
 		}
 	}
@@ -220,7 +219,7 @@
 
 		<NcActionInput v-if="sessionStore.share?.type === 'external'"
 			v-bind="displayNameInputProps"
-			v-model="sessionStore.share.displayName"
+			v-model="sessionStore.share.user.displayName"
 			@update:value-value="validateDisplayName"
 			@submit="submitDisplayName">
 			<template #icon>
@@ -231,7 +230,7 @@
 
 		<NcActionInput v-if="sessionStore.share?.type === 'external'"
 			v-bind="eMailInputProps"
-			v-model="sessionStore.share.emailAddress"
+			v-model="sessionStore.share.user.emailAddress"
 			@update:model-value="validateEMail"
 			@submit="submitEmail">
 			<template #icon>
diff --git a/src/stores/shares.ts b/src/stores/shares.ts
index 16f3c2e1e..8d5f2d657 100644
--- a/src/stores/shares.ts
+++ b/src/stores/shares.ts
@@ -7,7 +7,20 @@ import { defineStore } from 'pinia'
 import { SharesAPI } from '../Api/index.js'
 import { Logger } from '../helpers/index.ts'
 import { useSessionStore } from './session.ts'
-import { User, UserType } from '../Types/index.ts'
+import { User } from '../Types/index.ts'
+
+export enum ShareType {
+	Email = 'email',
+	External = 'external',
+	Contact = 'contact',
+	User = 'user',
+	Group = 'group',
+	Admin = 'admin',
+	Public = 'public',
+	Circle = 'circle',
+	ContactGroup = 'contactGroup',
+	None = '',
+}
 
 export type Share = {
 	displayName: string
@@ -16,7 +29,7 @@ export type Share = {
 	locked: boolean
 	pollId: number | null
 	token: string
-	type: UserType
+	type: ShareType
 	emailAddress: string
 	userId: string
 	publicPollEmail: string
@@ -40,22 +53,22 @@ export const useSharesStore = defineStore('shares', {
 	getters: {
 		active: (state) => {
 			// share types, which will be active, after the user gets his invitation
-			const invitationTypes = [UserType.Email, UserType.External, UserType.Contact]
+			const invitationTypes = [ShareType.Email, ShareType.External, ShareType.Contact]
 
 			// sharetype which are active without sending an invitation
-			const directShareTypes = [UserType.User, UserType.Group, UserType.Admin, UserType.Public]
+			const directShareTypes = [ShareType.User, ShareType.Group, ShareType.Admin, ShareType.Public]
 			return state.list.filter((share) => (!share.locked
-				&& (directShareTypes.includes(share.user.type)
-					|| (invitationTypes.includes(share.user.type) && (share.user.type === UserType.External || share.invitationSent || share.voted))
+				&& (directShareTypes.includes(share.type)
+					|| (invitationTypes.includes(share.type) && (share.type === ShareType.External || share.invitationSent || share.voted))
 				)
 			))
 		},
 	
 		locked: (state) => state.list.filter((share) => (!!share.locked)),
 		unsentInvitations: (state) => state.list.filter((share) =>
-			(share.user.emailAddress || share.user.type === UserType.Group || share.user.type === UserType.ContactGroup || share.user.type === UserType.Circle)
+			(share.user.emailAddress || share.type === ShareType.Group || share.type === ShareType.ContactGroup || share.type === ShareType.Circle)
 			&& !share.invitationSent && !share.locked && !share.voted),
-		public: (state) => state.list.filter((share) => share.user.type === UserType.Public),
+		public: (state) => state.list.filter((share) => share.type === ShareType.Public),
 		hasShares: (state) => state.list.length > 0,
 		hasLocked() {
 			return this.locked.length > 0
@@ -94,7 +107,7 @@ export const useSharesStore = defineStore('shares', {
 		},
 	
 		async switchAdmin(payload: { share: Share }): Promise<void>{
-			const setTo = payload.share.user.type === UserType.User ? UserType.Admin : UserType.User
+			const setTo = payload.share.type === ShareType.User ? ShareType.Admin : ShareType.User
 	
 			try {
 				const response = await SharesAPI.switchAdmin(payload.share.token, setTo)

From 7d2568400b674371b7481c85b90a22220ee32378 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 7 Oct 2024 10:37:15 +0200
Subject: [PATCH 3/7] use user.id instead of userId

Signed-off-by: dartcafe <github@dartcafe.de>
---
 lib/Db/Share.php                           |  3 ---
 src/Types/index.ts                         |  2 --
 src/components/Combo/ComboTable.vue        |  2 +-
 src/components/Combo/VoteColumn.vue        |  2 +-
 src/components/Combo/VoteItem.vue          |  2 +-
 src/components/Comments/CommentItem.vue    |  8 ++++----
 src/components/Export/ExportPoll.vue       |  6 +++---
 src/components/Options/OptionItemOwner.vue |  2 +-
 src/components/Poll/PollInformation.vue    |  2 +-
 src/components/User/UserItem.vue           |  8 ++++----
 src/components/VoteTable/VoteColumn.vue    |  7 ++++---
 src/components/VoteTable/VoteItem.vue      | 18 +++++++++---------
 src/components/VoteTable/VoteTable.vue     | 14 +++++++-------
 src/helpers/modules/arrayHelper.ts         |  2 +-
 src/stores/activity.ts                     |  2 +-
 src/stores/combo.ts                        |  2 +-
 src/stores/poll.ts                         |  8 +++-----
 src/stores/votes.ts                        |  8 ++++----
 18 files changed, 46 insertions(+), 52 deletions(-)

diff --git a/lib/Db/Share.php b/lib/Db/Share.php
index 33d8cb9ee..50bea4da0 100644
--- a/lib/Db/Share.php
+++ b/lib/Db/Share.php
@@ -145,12 +145,9 @@ public function jsonSerialize(): array {
 			'token' => $this->getToken(),
 			'type' => $this->getType(),
 			'pollId' => $this->getPollId(),
-			'userId' => $this->getUserId(),
-			'emailAddress' => $this->getEmailAddress(),
 			'invitationSent' => boolval($this->getInvitationSent()),
 			'reminderSent' => boolval($this->getReminderSent()),
 			'locked' => boolval($this->getDeleted() ? 0 : $this->getLocked()),
-			'displayName' => $this->getDisplayName(),
 			'label' => $this->getLabel(),
 			'URL' => $this->getURL(),
 			'publicPollEmail' => $this->getPublicPollEmail(),
diff --git a/src/Types/index.ts b/src/Types/index.ts
index 4cbe4efbb..ae49fb13b 100644
--- a/src/Types/index.ts
+++ b/src/Types/index.ts
@@ -78,7 +78,6 @@ export type AppPermissions = {
 }
 
 export type User = {
-	userId: string
 	displayName: string
 	emailAddress: string
 	subName: string
@@ -87,7 +86,6 @@ export type User = {
 	desc: string
 	type: UserType
 	id: string
-	user: string
 	organisation: string
 	languageCode: string
 	localeCode: string
diff --git a/src/components/Combo/ComboTable.vue b/src/components/Combo/ComboTable.vue
index d1778e3d1..1a4b20a4b 100644
--- a/src/components/Combo/ComboTable.vue
+++ b/src/components/Combo/ComboTable.vue
@@ -29,7 +29,7 @@
 				:title="poll.configuration.title"
 				class="poll-group">
 				<div v-for="(participant) in comboStore.participantsInPoll(poll.id)"
-					:key="`${participant.userId}_${participant.pollId}`"
+					:key="`${participant.user.id}_${participant.pollId}`"
 					class="participant">
 					<UserItem v-bind="participant" condensed />
 				</div>
diff --git a/src/components/Combo/VoteColumn.vue b/src/components/Combo/VoteColumn.vue
index e8c2cd1d5..024d25b2e 100644
--- a/src/components/Combo/VoteColumn.vue
+++ b/src/components/Combo/VoteColumn.vue
@@ -12,7 +12,7 @@
 			:title="poll.configuration.title"
 			class="poll-group">
 			<VoteItem v-for="(participant) in comboStore.participantsInPoll(poll.id)"
-				:key="`${participant.userId}_${participant.pollId}`"
+				:key="`${participant.user.id}_${participant.pollId}`"
 				:poll="poll"
 				:user="participant.user"
 				:option="option" />
diff --git a/src/components/Combo/VoteItem.vue b/src/components/Combo/VoteItem.vue
index f3f5fa58f..a09a073d4 100644
--- a/src/components/Combo/VoteItem.vue
+++ b/src/components/Combo/VoteItem.vue
@@ -27,7 +27,7 @@
 	})
 
 	const answer = computed(() => comboStore.getVote({
-		userId: props.user.userId,
+		userId: props.user.id,
 		optionText: props.option.text,
 		pollId: props.poll.id,
 	}).answer)
diff --git a/src/components/Comments/CommentItem.vue b/src/components/Comments/CommentItem.vue
index be9da77fa..a53b0ed63 100644
--- a/src/components/Comments/CommentItem.vue
+++ b/src/components/Comments/CommentItem.vue
@@ -32,7 +32,7 @@
 
 	const dateCommentedRelative = computed(() => moment.unix(props.comment.timestamp).fromNow())
 
-	const isCurrentUser = computed(() => sessionStore.currentUser.userId === props.comment.user.userId)
+	const isCurrentUser = computed(() => sessionStore.currentUser.id === props.comment.user.id)
 
 	function linkify(subComment: string) {
 		return linkifyStr(subComment)
@@ -57,7 +57,7 @@
 </script>
 
 <template>
-	<div :class="['comment-item', {currentuser: isCurrentUser}]">
+	<div :class="['comment-item', {'current-user': isCurrentUser}]">
 		<UserItem :user="comment.user" hide-names />
 		<div class="comment-item__content">
 			<span class="comment-item__user">{{ comment.user.displayName }}</span>
@@ -69,7 +69,7 @@
 				<span v-html="linkify(subComment.comment)" />
 				<!-- eslint-enable vue/no-v-html -->
 
-				<ActionDelete v-if="(comment.user.userId === sessionStore.currentUser.userId || pollStore.currentUserStatus.isOwner)"
+				<ActionDelete v-if="(comment.user.id === sessionStore.currentUser.id || pollStore.currentUserStatus.isOwner)"
 					:name="subComment.deleted ? t('polls', 'Restore comment') : t('polls', 'Delete comment')"
 					:restore="!!subComment.deleted"
 					:timeout="0"
@@ -146,7 +146,7 @@
 	.alternativestyle {
 		.comment-item {
 		flex-direction: row-reverse;
-			&.currentuser {
+			&.current-user {
 				flex-direction: row;
 			}
 		}
diff --git a/src/components/Export/ExportPoll.vue b/src/components/Export/ExportPoll.vue
index 6b3e180f8..b357719d0 100644
--- a/src/components/Export/ExportPoll.vue
+++ b/src/components/Export/ExportPoll.vue
@@ -145,11 +145,11 @@
 
 				optionsStore.list.forEach((option) => {
 					if (style === 'symbols') {
-						votesLine.push(votesStore.getVote({ userId: participant.userId, option }).answerSymbol ?? '❌')
+						votesLine.push(votesStore.getVote({ userId: participant.id, option }).answerSymbol ?? '❌')
 					} else if (style === 'raw') {
-						votesLine.push(votesStore.getVote({ userId: participant.userId, option }).answer)
+						votesLine.push(votesStore.getVote({ userId: participant.id, option }).answer)
 					} else {
-						votesLine.push(votesStore.getVote({ userId: participant.userId, option }).answerTranslated ?? t('polls', 'No'))
+						votesLine.push(votesStore.getVote({ userId: participant.id, option }).answerTranslated ?? t('polls', 'No'))
 					}
 				})
 
diff --git a/src/components/Options/OptionItemOwner.vue b/src/components/Options/OptionItemOwner.vue
index b93eb9f5c..66375e71a 100644
--- a/src/components/Options/OptionItemOwner.vue
+++ b/src/components/Options/OptionItemOwner.vue
@@ -27,7 +27,7 @@
 		},
 	})
 
-	const showDelete = computed(() => !pollStore.permissions.edit && sessionStore.currentUser.userId === props.option.owner?.userId)
+	const showDelete = computed(() => !pollStore.permissions.edit && sessionStore.currentUser.id === props.option.owner?.id)
 
 </script>
 
diff --git a/src/components/Poll/PollInformation.vue b/src/components/Poll/PollInformation.vue
index 0dab9251a..0c6039056 100644
--- a/src/components/Poll/PollInformation.vue
+++ b/src/components/Poll/PollInformation.vue
@@ -84,7 +84,7 @@
 			<template #icon>
 				<OwnerIcon />
 			</template>
-			{{ t('polls', 'Poll owner:') }} <NcUserBubble v-if="pollStore.owner.userId" :user="pollStore.owner.userId" :display-name="pollStore.owner.displayName" />
+			{{ t('polls', 'Poll owner:') }} <NcUserBubble v-if="pollStore.owner.id" :user="pollStore.owner.id" :display-name="pollStore.owner.displayName" />
 		</BadgeDiv>
 		<BadgeDiv>
 			<template #icon>
diff --git a/src/components/User/UserItem.vue b/src/components/User/UserItem.vue
index c7d6728c1..d6155f37f 100644
--- a/src/components/User/UserItem.vue
+++ b/src/components/User/UserItem.vue
@@ -168,19 +168,19 @@
 		if (props.label !== '') return props.label
 		if (typeComputed.value === UserType.Public) return publicShareLabel.value
 		if (typeComputed.value === VirtualUserItemType.Deleted) return t('polls', 'Deleted participant')
-		return props.user.displayName ?? props.user.userId
+		return props.user.displayName ?? props.user.id
 	})
 
 	const avatarUserId = computed(() => {
 		if (isGuestComputed.value) return props.user.displayName
-		return props.user.userId
+		return props.user.id
 	})
 
 	const publicShareDescription = computed(() => {
 		if (props.label === '') {
-			return t('polls', 'Token: {token}', { token: props.user.userId })
+			return t('polls', 'Token: {token}', { token: props.user.id })
 		}
-		return t('polls', 'Public link: {token}', { token: props.user.userId })
+		return t('polls', 'Public link: {token}', { token: props.user.id })
 	})
 
 	const publicShareLabel = computed(() => {
diff --git a/src/components/VoteTable/VoteColumn.vue b/src/components/VoteTable/VoteColumn.vue
index 396a093e1..98c8e817d 100644
--- a/src/components/VoteTable/VoteColumn.vue
+++ b/src/components/VoteTable/VoteColumn.vue
@@ -19,6 +19,7 @@
 	import { usePreferencesStore } from '../../stores/preferences.ts'
 	import { useOptionsStore, Option } from '../../stores/options.ts'
 	import { BoxType } from '../../Types/index.ts'
+	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const pollStore = usePollStore()
 	const preferencesStore = usePreferencesStore()
@@ -68,8 +69,8 @@
 		</div>
 
 		<VoteItem v-for="(participant) in pollStore.safeParticipants"
-			:key="participant.userId"
-			:user-id="participant.userId"
+			:key="participant.id"
+			:user="participant"
 			:option="option" />
 
 		<OptionItemOwner v-if="optionsStore.proposalsExist"
@@ -82,7 +83,7 @@
 		<div v-if="pollStore.permissions.edit && pollStore.isClosed" class="action confirm">
 			<NcButton :title="confirmButtonCaption"
 				:aria-label="confirmButtonCaption"
-				type="tertiary"
+				:type=ButtonType.Tertiary
 				@click="optionsStore.confirm({option: props.option})">
 				<template #icon>
 					<UnconfirmIcon v-if="option.confirmed" :size="20" />
diff --git a/src/components/VoteTable/VoteItem.vue b/src/components/VoteTable/VoteItem.vue
index b36b5d1f5..b9f2e842d 100644
--- a/src/components/VoteTable/VoteItem.vue
+++ b/src/components/VoteTable/VoteItem.vue
@@ -11,14 +11,14 @@
 	import { useSessionStore } from '../../stores/session.ts'
 	import { usePollStore } from '../../stores/poll.ts'
 	import { useVotesStore } from '../../stores/votes.ts'
-	import { Option } from '../../Types/index.ts'
+	import { Option, User } from '../../Types/index.ts'
 
 	import { t } from '@nextcloud/l10n'
 	import VoteIndicator from './VoteIndicator.vue'
 
 	export interface Props {
 		option?: Option
-		userId: string
+		user: User
 	}
 
 	const pollStore = usePollStore()
@@ -27,7 +27,7 @@
 
 	const props = withDefaults(defineProps<Props>(), {
 		option: undefined,
-		userId: '',
+		user: undefined,
 	})
 
 	const isVotable = computed(() => isActive.value
@@ -37,11 +37,11 @@
 
 	const isActive = computed(() => isCurrentUser.value && pollStore.permissions.vote)
 
-	const isCurrentUser = computed(() => sessionStore.currentUser.userId === props.userId)
+	const isCurrentUser = computed(() => sessionStore.currentUser.id === props.user.id)
 
 	const answer = computed(() => votesStore.getVote({
 		option: props.option,
-		userId: props.userId,
+		userId: props.user.id,
 	}).answer)
 
 	const iconAnswer = computed(() => {
@@ -62,7 +62,7 @@
 
 	})
 
-	const isValidUser = computed(() => (props.userId !== '' && props.userId !== null))
+	const isValidUser = computed(() => (props.user.id !== '' && props.user.id !== null))
 
 	/**
 	 *
@@ -82,7 +82,7 @@
 </script>
 
 <template>
-	<div class="vote-item" :class="[answer, { active: isVotable }, {currentuser: isCurrentUser}]">
+	<div class="vote-item" :class="[answer, { active: isVotable }, {'current-user': isCurrentUser}]">
 		<VoteIndicator :answer="iconAnswer"
 			:active="isVotable"
 			@click="setVote()" />
@@ -129,7 +129,7 @@
 			background-color: var(--color-polls-background-maybe);
 		}
 
-		&.currentuser {
+		&.current-user {
 			background-color: transparent !important;
 			.locked & {
 				background-color: var(--color-polls-background-no) !important;
@@ -138,7 +138,7 @@
 	}
 
 	.locked {
-		.vote-item.currentuser {
+		.vote-item.current-user {
 			background-color: var(--color-polls-background-no) !important;
 		}
 	}
diff --git a/src/components/VoteTable/VoteTable.vue b/src/components/VoteTable/VoteTable.vue
index 2f4d5b47d..e9af9516d 100644
--- a/src/components/VoteTable/VoteTable.vue
+++ b/src/components/VoteTable/VoteTable.vue
@@ -37,14 +37,14 @@
 			</div>
 
 			<div v-for="(participant) in pollStore.safeParticipants"
-				:key="participant.userId"
-				:class="['participant', {currentuser: (participant.userId === sessionStore.currentUser.userId) }]">
+				:key="participant.user.id"
+				:class="['participant', {'current-user': (participant.user.id === sessionStore.currentUser.id) }]">
 				<UserItem :user="participant" condensed />
 
 				<ActionDelete v-if="pollStore.permissions.edit"
 					class="user-actions"
 					:name="t('polls', 'Delete votes')"
-					@delete="removeUser(participant.userId)" />
+					@delete="removeUser(participant.user.id)" />
 			</div>
 
 			<div v-if="optionsStore.proposalsExist" class="owner" />
@@ -77,7 +77,7 @@
 		line-height: 1.5em;
 		padding: 6px;
 		border-radius: 12px;
-		&.currentuser {
+		&.current-user {
 			order:5;
 		}
 	}
@@ -218,7 +218,7 @@
 		}
 
 		.participant, .vote-item {
-			&.currentuser {
+			&.current-user {
 				margin-bottom: 30px;
 			}
 		}
@@ -253,7 +253,7 @@
 			border-top: none;
 		}
 
-		.participant:not(.currentuser), .vote-item:not(.currentuser) {
+		.participant:not(.current-user), .vote-item:not(.current-user) {
 			display: none;
 		}
 
@@ -302,7 +302,7 @@
 			padding: 8px 4px;
 		}
 
-		.vote-item.currentuser {
+		.vote-item.current-user {
 			border: none;
 		}
 
diff --git a/src/helpers/modules/arrayHelper.ts b/src/helpers/modules/arrayHelper.ts
index 9605634af..0b65e1271 100644
--- a/src/helpers/modules/arrayHelper.ts
+++ b/src/helpers/modules/arrayHelper.ts
@@ -15,7 +15,7 @@ const uniqueOptions = (options: Option[]) =>
 
 const uniqueParticipants = (votes: Vote[]): Participant[] => {
 	const participants: Participant[] = votes.map((vote) => ({
-		userId: vote.user.userId,
+		userId: vote.user.id,
 		displayName: vote.user.displayName,
 		isNoUser: vote.user.isNoUser,
 		user: vote.user,
diff --git a/src/stores/activity.ts b/src/stores/activity.ts
index 87990db53..1b44dab65 100644
--- a/src/stores/activity.ts
+++ b/src/stores/activity.ts
@@ -46,7 +46,7 @@ export const useActivityStore = defineStore('activity', {
 		},
 		
 		deleteActivities(payload: { userId: string }) {
-			this.list = this.list.filter((vote: Vote) => vote.user.userId !== payload.userId)
+			this.list = this.list.filter((vote: Vote) => vote.user.id !== payload.userId)
 		},
 		
 	},
diff --git a/src/stores/combo.ts b/src/stores/combo.ts
index b7bfd407c..c2653eed4 100644
--- a/src/stores/combo.ts
+++ b/src/stores/combo.ts
@@ -42,7 +42,7 @@ export const useComboStore = defineStore('combo', {
 	
 		getVote: (state) => (payload: { userId: string; optionText: string, pollId: number }) => {
 			const found = state.votes.find((vote: Vote) => (
-				vote.user.userId === payload.userId
+				vote.user.id === payload.userId
 				&& vote.optionText === payload.optionText
 				&& vote.pollId === payload.pollId))
 			if (found === undefined) {
diff --git a/src/stores/poll.ts b/src/stores/poll.ts
index 6e26e6726..c370497b0 100644
--- a/src/stores/poll.ts
+++ b/src/stores/poll.ts
@@ -145,7 +145,6 @@ export const usePollStore = defineStore('poll', {
 			maxVotesPerUser: 0,
 		},
 		owner: {
-			userId: '',
 			displayName: '',
 			emailAddress: '',
 			subName: '',
@@ -154,7 +153,6 @@ export const usePollStore = defineStore('poll', {
 			desc: '',
 			type: UserType.User,
 			id: '',
-			user: '',
 			organisation: '',
 			languageCode: '',
 			localeCode: '',
@@ -242,9 +240,9 @@ export const usePollStore = defineStore('poll', {
 			const participants = this.participantsVoted
 	
 			// add current user, if not among participants and voting is allowed
-			if (!participants.find((participant: User) => participant.userId === sessionStore.currentUser.userId) && sessionStore.currentUser.userId && state.permissions.vote) {
+			if (!participants.find((participant: User) => participant.id === sessionStore.currentUser.id) && sessionStore.currentUser.id && state.permissions.vote) {
 				participants.push({
-					userId: sessionStore.currentUser.userId,
+					id: sessionStore.currentUser.id,
 					displayName: sessionStore.currentUser.displayName,
 					isNoUser: sessionStore.currentUser.isNoUser,
 				})
@@ -257,7 +255,7 @@ export const usePollStore = defineStore('poll', {
 			const sessionStore = useSessionStore()
 			if (this.getSafeTable) {
 				return [{
-					userId: sessionStore.currentUser.userId,
+					id: sessionStore.currentUser.id,
 					displayName: sessionStore.currentUser.displayName,
 					isNoUser: sessionStore.currentUser.isNoUser,
 				}]
diff --git a/src/stores/votes.ts b/src/stores/votes.ts
index 998adb20b..374e73d52 100644
--- a/src/stores/votes.ts
+++ b/src/stores/votes.ts
@@ -56,7 +56,7 @@ export const useVotesStore = defineStore('votes', {
 		},
 
 		getVote(payload: { userId: string; option: { text: string } }) {
-			const found = this.list.find((vote: Vote) => (vote.user.userId === payload.userId
+			const found = this.list.find((vote: Vote) => (vote.user.id === payload.userId
 					&& vote.optionText === payload.option.text))
 			if (found === undefined) {
 				return {
@@ -108,7 +108,7 @@ export const useVotesStore = defineStore('votes', {
 		setItem(payload: { option: Option; vote: Vote }) {
 			const index = this.list.findIndex((vote: Vote) =>
 				vote.pollId === payload.option.pollId
-				&& vote.user.userId === payload.vote.user.userId
+				&& vote.user.id === payload.vote.user.id
 				&& vote.optionText === payload.option.text)
 			if (index > -1) {
 				this.list[index] = Object.assign(this.list[index], payload.vote)
@@ -154,7 +154,7 @@ export const useVotesStore = defineStore('votes', {
 				} else {
 					response = await VotesAPI.removeUser(sessionStore.route.params.id)
 				}
-				this.list = this.list.filter((vote: Vote) => vote.user.userId !== response.data.deleted)
+				this.list = this.list.filter((vote: Vote) => vote.user.id !== response.data.deleted)
 
 			} catch (error) {
 				if (error?.code === 'ERR_CANCELED') return
@@ -167,7 +167,7 @@ export const useVotesStore = defineStore('votes', {
 			const sessionStore = useSessionStore()
 			try {
 				await VotesAPI.removeUser(sessionStore.route.params.id, payload.userId)
-				this.list = this.list.filter((vote: Vote) => vote.user.userId !== payload.userId)
+				this.list = this.list.filter((vote: Vote) => vote.user.id !== payload.userId)
 			} catch (error) {
 				if (error?.code === 'ERR_CANCELED') return
 				Logger.error('Error deleting votes', { error, payload })

From bab0d07897e470bd4445351e0aeb8d81531c6230 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 7 Oct 2024 10:45:03 +0200
Subject: [PATCH 4/7] deps update

Signed-off-by: dartcafe <github@dartcafe.de>
---
 package-lock.json | 555 +++++++++++++++++++++++-----------------------
 1 file changed, 274 insertions(+), 281 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 591cd1844..22c46817d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -70,14 +70,14 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz",
-      "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
+      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/highlight": "^7.24.7",
+        "@babel/highlight": "^7.25.7",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -85,9 +85,9 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
-      "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.7.tgz",
+      "integrity": "sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -96,23 +96,23 @@
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
-      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.7.tgz",
+      "integrity": "sha512-yJ474Zv3cwiSOO9nXJuqzvwEeM+chDuQ8GJirw+pZ91sCGCyOZ3dJkVE09fTV0VEVzXyLWhh3G/AolYTPX7Mow==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.0",
-        "@babel/helper-compilation-targets": "^7.25.2",
-        "@babel/helper-module-transforms": "^7.25.2",
-        "@babel/helpers": "^7.25.0",
-        "@babel/parser": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.2",
-        "@babel/types": "^7.25.2",
+        "@babel/code-frame": "^7.25.7",
+        "@babel/generator": "^7.25.7",
+        "@babel/helper-compilation-targets": "^7.25.7",
+        "@babel/helper-module-transforms": "^7.25.7",
+        "@babel/helpers": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/template": "^7.25.7",
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -128,9 +128,9 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.25.1",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.1.tgz",
-      "integrity": "sha512-Y956ghgTT4j7rKesabkh5WeqgSFZVFwaPR0IWFm7KFHFmmJ4afbG49SmfW4S+GyRPx0Dy5jxEWA5t0rpxfElWg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.25.7.tgz",
+      "integrity": "sha512-B+BO9x86VYsQHimucBAL1fxTJKF4wyKY6ZVzee9QgzdZOUfs3BaR6AQrgoGrRI+7IFS1wUz/VyQ+SoBcSpdPbw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -148,33 +148,33 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
-      "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
+      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/types": "^7.25.6",
+        "@babel/types": "^7.25.7",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
-        "jsesc": "^2.5.1"
+        "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz",
-      "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
+      "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/compat-data": "^7.25.2",
-        "@babel/helper-validator-option": "^7.24.8",
-        "browserslist": "^4.23.1",
+        "@babel/compat-data": "^7.25.7",
+        "@babel/helper-validator-option": "^7.25.7",
+        "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
       },
@@ -183,32 +183,32 @@
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz",
-      "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
+      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz",
-      "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
+      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.7",
-        "@babel/helper-simple-access": "^7.24.7",
-        "@babel/helper-validator-identifier": "^7.24.7",
-        "@babel/traverse": "^7.25.2"
+        "@babel/helper-module-imports": "^7.25.7",
+        "@babel/helper-simple-access": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
+        "@babel/traverse": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -218,42 +218,42 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz",
-      "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
+      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/traverse": "^7.24.7",
-        "@babel/types": "^7.24.7"
+        "@babel/traverse": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz",
-      "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
+      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz",
-      "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
+      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.24.8",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz",
-      "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
+      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -262,29 +262,29 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
-      "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.7.tgz",
+      "integrity": "sha512-Sv6pASx7Esm38KQpF/U/OXLwPPrdGHNKoeblRxgZRLXnAtnkEe4ptJPDtAZM7fBLadbc1Q07kQpSiGQ0Jg6tRA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6"
+        "@babel/template": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz",
-      "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
+      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -294,12 +294,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
-      "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.7.tgz",
+      "integrity": "sha512-aZn7ETtQsjjGG5HruveUK06cU3Hljuhd9Iojm4M8WWv3wLE6OkE5PWbDUkItmMgegmccaITudyuW5RPYrYlgWw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.25.6"
+        "@babel/types": "^7.25.7"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -309,9 +309,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz",
-      "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
+      "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
       "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -321,34 +321,34 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz",
-      "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
+      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/parser": "^7.25.0",
-        "@babel/types": "^7.25.0"
+        "@babel/code-frame": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/types": "^7.25.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
-      "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
+      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/generator": "^7.25.6",
-        "@babel/parser": "^7.25.6",
-        "@babel/template": "^7.25.0",
-        "@babel/types": "^7.25.6",
+        "@babel/code-frame": "^7.25.7",
+        "@babel/generator": "^7.25.7",
+        "@babel/parser": "^7.25.7",
+        "@babel/template": "^7.25.7",
+        "@babel/types": "^7.25.7",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -357,13 +357,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.6",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
-      "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
+      "version": "7.25.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.7.tgz",
+      "integrity": "sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.24.8",
-        "@babel/helper-validator-identifier": "^7.24.7",
+        "@babel/helper-string-parser": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1975,9 +1975,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
-      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
+      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
       "cpu": [
         "arm"
       ],
@@ -1989,9 +1989,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
-      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
+      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
       "cpu": [
         "arm64"
       ],
@@ -2003,9 +2003,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
-      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
+      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
       "cpu": [
         "arm64"
       ],
@@ -2017,9 +2017,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
-      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
+      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
       "cpu": [
         "x64"
       ],
@@ -2031,9 +2031,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
-      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
+      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
       "cpu": [
         "arm"
       ],
@@ -2045,9 +2045,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
-      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
+      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
       "cpu": [
         "arm"
       ],
@@ -2059,9 +2059,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
-      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
+      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
       "cpu": [
         "arm64"
       ],
@@ -2073,9 +2073,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
-      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
+      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
       "cpu": [
         "arm64"
       ],
@@ -2087,9 +2087,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
-      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
+      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
       "cpu": [
         "ppc64"
       ],
@@ -2101,9 +2101,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
-      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
+      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
       "cpu": [
         "riscv64"
       ],
@@ -2115,9 +2115,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
-      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
+      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
       "cpu": [
         "s390x"
       ],
@@ -2129,9 +2129,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
-      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
+      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
       "cpu": [
         "x64"
       ],
@@ -2143,9 +2143,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
-      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
+      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
       "cpu": [
         "x64"
       ],
@@ -2157,9 +2157,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
-      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
+      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
       "cpu": [
         "arm64"
       ],
@@ -2171,9 +2171,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
-      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
+      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
       "cpu": [
         "ia32"
       ],
@@ -2185,9 +2185,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
-      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
+      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
       "cpu": [
         "x64"
       ],
@@ -2345,47 +2345,47 @@
       }
     },
     "node_modules/@shikijs/core": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.20.0.tgz",
-      "integrity": "sha512-KlO3iE0THzSdYkzDFugt8SHe6FR3qNYTkmpbdW1d6xo8juQkMjybxAw/cBi2npL2eb2F4PbbnSs5Z9tDusfvyg==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-1.21.0.tgz",
+      "integrity": "sha512-zAPMJdiGuqXpZQ+pWNezQAk5xhzRXBNiECFPcJLtUdsFM3f//G95Z15EHTnHchYycU8kIIysqGgxp8OVSj1SPQ==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@shikijs/engine-javascript": "1.20.0",
-        "@shikijs/engine-oniguruma": "1.20.0",
-        "@shikijs/types": "1.20.0",
+        "@shikijs/engine-javascript": "1.21.0",
+        "@shikijs/engine-oniguruma": "1.21.0",
+        "@shikijs/types": "1.21.0",
         "@shikijs/vscode-textmate": "^9.2.2",
         "@types/hast": "^3.0.4",
         "hast-util-to-html": "^9.0.3"
       }
     },
     "node_modules/@shikijs/engine-javascript": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.20.0.tgz",
-      "integrity": "sha512-ZUMo758uduM0Tfgzi/kd+0IKMbNdumCxxWjY36uf1DIs2Qyg9HIq3vA1Wfa/vc6HE7tHWFpANRi3mv7UzJ68MQ==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-1.21.0.tgz",
+      "integrity": "sha512-jxQHNtVP17edFW4/0vICqAVLDAxmyV31MQJL4U/Kg+heQALeKYVOWo0sMmEZ18FqBt+9UCdyqGKYE7bLRtk9mg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@shikijs/types": "1.20.0",
+        "@shikijs/types": "1.21.0",
         "@shikijs/vscode-textmate": "^9.2.2",
         "oniguruma-to-js": "0.4.3"
       }
     },
     "node_modules/@shikijs/engine-oniguruma": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.20.0.tgz",
-      "integrity": "sha512-MQ40WkVTZk7by33ces4PGK6XNFSo6PYvKTSAr2kTWdRNhFmOcnaX+1XzvFwB26eySXR7U74t91czZ1qJkEgxTA==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-1.21.0.tgz",
+      "integrity": "sha512-AIZ76XocENCrtYzVU7S4GY/HL+tgHGbVU+qhiDyNw1qgCA5OSi4B4+HY4BtAoJSMGuD/L5hfTzoRVbzEm2WTvg==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@shikijs/types": "1.20.0",
+        "@shikijs/types": "1.21.0",
         "@shikijs/vscode-textmate": "^9.2.2"
       }
     },
     "node_modules/@shikijs/types": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.20.0.tgz",
-      "integrity": "sha512-y+EaDvU2K6/GaXOKXxJaGnr1XtmZMF7MfS0pSEDdxEq66gCtKsLwQvVwoQFdp7R7dLlNAro3ijEE19sMZ0pzqg==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-1.21.0.tgz",
+      "integrity": "sha512-tzndANDhi5DUndBtpojEq/42+dpUF2wS7wdCDQaFtIXm3Rd1QkrcVgSSRLOvEwexekihOXfbYJINW37g96tJRw==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
@@ -2488,9 +2488,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.16.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.9.tgz",
-      "integrity": "sha512-rkvIVJxsOfBejxK7I0FO5sa2WxFmJCzoDwcd88+fq/CUfynNywTo/1/T6hyFz22CyztsnLS9nVlHOnTI36RH5w==",
+      "version": "20.16.10",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.10.tgz",
+      "integrity": "sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -2807,39 +2807,39 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.9.tgz",
-      "integrity": "sha512-KE1sCdwqSKq0CQ/ltg3XnlMTKeinjegIkuFsuq9DKvNPmqLGdmI51ChZdGBBRXIvEYTLm8X/JxOuBQ1HqF/+PA==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.10.tgz",
+      "integrity": "sha512-iXWlk+Cg/ag7gLvY0SfVucU8Kh2CjysYZjhhP70w9qI4MvSox4frrP+vDGvtQuzIcgD8+sxM6lZvCtdxGunTAA==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.9",
+        "@vue/shared": "3.5.10",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.0"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.9.tgz",
-      "integrity": "sha512-gEAURwPo902AsJF50vl59VaWR+Cx6cX9SoqLYHu1jq9hDbmQlXvpZyYNIIbxa2JTJ+FD/oBQweVUwuTQv79KTg==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.10.tgz",
+      "integrity": "sha512-DyxHC6qPcktwYGKOIy3XqnHRrrXyWR2u91AjP+nLkADko380srsC2DC3s7Y1Rk6YfOlxOlvEQKa9XXmLI+W4ZA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.9",
-        "@vue/shared": "3.5.9"
+        "@vue/compiler-core": "3.5.10",
+        "@vue/shared": "3.5.10"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.9.tgz",
-      "integrity": "sha512-kp9qawcTXakYm0TN6YAwH24IurSywoXh4fWhRbLu0at4UVyo994bhEzJlQn82eiyqtut4GjkQodSfn8drFbpZQ==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.10.tgz",
+      "integrity": "sha512-to8E1BgpakV7224ZCm8gz1ZRSyjNCAWEplwFMWKlzCdP9DkMKhRRwt0WkCjY7jkzi/Vz3xgbpeig5Pnbly4Tow==",
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.9",
-        "@vue/compiler-dom": "3.5.9",
-        "@vue/compiler-ssr": "3.5.9",
-        "@vue/shared": "3.5.9",
+        "@vue/compiler-core": "3.5.10",
+        "@vue/compiler-dom": "3.5.10",
+        "@vue/compiler-ssr": "3.5.10",
+        "@vue/shared": "3.5.10",
         "estree-walker": "^2.0.2",
         "magic-string": "^0.30.11",
         "postcss": "^8.4.47",
@@ -2847,13 +2847,13 @@
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.9.tgz",
-      "integrity": "sha512-fb1g2mQv32QzIei76rlXRTz08Grw+ZzBXSQfHo4StGFutm/flyebw3dGJkexKwcU3GjX9s5fIGjEv/cjO8j8Yw==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.10.tgz",
+      "integrity": "sha512-hxP4Y3KImqdtyUKXDRSxKSRkSm1H9fCvhojEYrnaoWhE4w/y8vwWhnosJoPPe2AXm5sU7CSbYYAgkt2ZPhDz+A==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.9",
-        "@vue/shared": "3.5.9"
+        "@vue/compiler-dom": "3.5.10",
+        "@vue/shared": "3.5.10"
       }
     },
     "node_modules/@vue/devtools-api": {
@@ -2915,53 +2915,53 @@
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.9.tgz",
-      "integrity": "sha512-88ApgNZ6yPYpyYkTfXzcbWk6O8+LrPRIpa/U4AdeTzpfRUO+EUt5jemnTBVSlAUNmlYY96xa5feUNEq+BouLog==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.10.tgz",
+      "integrity": "sha512-kW08v06F6xPSHhid9DJ9YjOGmwNDOsJJQk0ax21wKaUYzzuJGEuoKNU2Ujux8FLMrP7CFJJKsHhXN9l2WOVi2g==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.9"
+        "@vue/shared": "3.5.10"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.9.tgz",
-      "integrity": "sha512-YAeP0zNkjSl5mEc1NxOg9qoAhLNbREElHAhfYbMXT57oF0ixehEEJWBhg2uvVxslCGh23JhpEAyMvJrJHW9WGg==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.10.tgz",
+      "integrity": "sha512-9Q86I5Qq3swSkFfzrZ+iqEy7Vla325M7S7xc1NwKnRm/qoi1Dauz0rT6mTMmscqx4qz0EDJ1wjB+A36k7rl8mA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.9",
-        "@vue/shared": "3.5.9"
+        "@vue/reactivity": "3.5.10",
+        "@vue/shared": "3.5.10"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.9.tgz",
-      "integrity": "sha512-5Oq/5oenpB9lw94moKvOHqBDEaMSyDmcu2HS8AtAT6/pwdo/t9fR9aVtLh6FzYGGqZR9yRfoHAN6P7goblq1aA==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.10.tgz",
+      "integrity": "sha512-t3x7ht5qF8ZRi1H4fZqFzyY2j+GTMTDxRheT+i8M9Ph0oepUxoadmbwlFwMoW7RYCpNQLpP2Yx3feKs+fyBdpA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.9",
-        "@vue/runtime-core": "3.5.9",
-        "@vue/shared": "3.5.9",
+        "@vue/reactivity": "3.5.10",
+        "@vue/runtime-core": "3.5.10",
+        "@vue/shared": "3.5.10",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.9.tgz",
-      "integrity": "sha512-tbuUsZfMWGazR9LXLNiiDSTwkO8K9sLyR70diY+FbQmKmh7236PPz4jkTxymelV8D89IJUGtbfe4VdmpHkmuxg==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.10.tgz",
+      "integrity": "sha512-IVE97tt2kGKwHNq9yVO0xdh1IvYfZCShvDSy46JIh5OQxP1/EXSpoDqetVmyIzL7CYOWnnmMkVqd7YK2QSWkdw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.9",
-        "@vue/shared": "3.5.9"
+        "@vue/compiler-ssr": "3.5.10",
+        "@vue/shared": "3.5.10"
       },
       "peerDependencies": {
-        "vue": "3.5.9"
+        "vue": "3.5.10"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.9.tgz",
-      "integrity": "sha512-8wiT/m0mnsLhTME0mPgc57jv+4TipRBSAAmheUdYgiOaO6AobZPNOmm87ub4np65VVDgLcWxc+Edc++5Wyz1uA==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.10.tgz",
+      "integrity": "sha512-VkkBhU97Ki+XJ0xvl4C9YJsIZ2uIlQ7HqPpZOS3m9VCvmROPaChZU6DexdMJqvz9tbgG+4EtFVrSuailUq5KGQ==",
       "license": "MIT"
     },
     "node_modules/@vue/tsconfig": {
@@ -3816,9 +3816,9 @@
       "license": "MIT"
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001664",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
-      "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
+      "version": "1.0.30001666",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001666.tgz",
+      "integrity": "sha512-gD14ICmoV5ZZM1OdzPWmpx+q4GyefaK06zi8hmfHV5xe4/2nOQX3+Dw5o+fSqOws2xVwL9j+anOPFwHzdEdV4g==",
       "dev": true,
       "funding": [
         {
@@ -4654,9 +4654,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.29",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
-      "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
+      "version": "1.5.31",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.31.tgz",
+      "integrity": "sha512-QcDoBbQeYt0+3CWcK/rEbuHvwpbT/8SV9T3OSgs6cX1FlcUAkgrkqbg9zLnDrMM/rLamzQwal4LYFCiWk861Tg==",
       "dev": true,
       "license": "ISC"
     },
@@ -7564,9 +7564,9 @@
       }
     },
     "node_modules/jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -7574,7 +7574,7 @@
         "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
     "node_modules/json-buffer": {
@@ -9475,9 +9475,9 @@
       }
     },
     "node_modules/pinia": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.2.2.tgz",
-      "integrity": "sha512-ja2XqFWZC36mupU4z1ZzxeTApV7DOw44cV4dhQ9sGwun+N89v/XP7+j7q6TanS1u1tdbK4r+1BUx7heMaIdagA==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.2.4.tgz",
+      "integrity": "sha512-K7ZhpMY9iJ9ShTC0cR2+PnxdQRuwVIsXDO/WIEV/RnMC/vmSoKDTKW/exNQYPI+4ij10UjXqdNiEHwn47McANQ==",
       "license": "MIT",
       "dependencies": {
         "@vue/devtools-api": "^6.6.3",
@@ -9957,24 +9957,24 @@
       "license": "MIT"
     },
     "node_modules/regex": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/regex/-/regex-4.3.2.tgz",
-      "integrity": "sha512-kK/AA3A9K6q2js89+VMymcboLOlF5lZRCYJv3gzszXFHBr6kO6qLGzbm+UIugBEV8SMMKCTR59txoY6ctRHYVw==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/regex/-/regex-4.3.3.tgz",
+      "integrity": "sha512-r/AadFO7owAq1QJVeZ/nq9jNS1vyZt+6t1p/E59B56Rn2GCya+gr1KSyOzNL/er+r+B7phv5jG2xU2Nz1YkmJg==",
       "license": "MIT",
       "peer": true
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz",
+      "integrity": "sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==",
       "dev": true,
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10232,13 +10232,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
-      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
+      "version": "4.24.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
+      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.5"
+        "@types/estree": "1.0.6"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -10248,22 +10248,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.22.4",
-        "@rollup/rollup-android-arm64": "4.22.4",
-        "@rollup/rollup-darwin-arm64": "4.22.4",
-        "@rollup/rollup-darwin-x64": "4.22.4",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
-        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
-        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
-        "@rollup/rollup-linux-arm64-musl": "4.22.4",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
-        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
-        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
-        "@rollup/rollup-linux-x64-gnu": "4.22.4",
-        "@rollup/rollup-linux-x64-musl": "4.22.4",
-        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
-        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
-        "@rollup/rollup-win32-x64-msvc": "4.22.4",
+        "@rollup/rollup-android-arm-eabi": "4.24.0",
+        "@rollup/rollup-android-arm64": "4.24.0",
+        "@rollup/rollup-darwin-arm64": "4.24.0",
+        "@rollup/rollup-darwin-x64": "4.24.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
+        "@rollup/rollup-linux-arm64-musl": "4.24.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-gnu": "4.24.0",
+        "@rollup/rollup-linux-x64-musl": "4.24.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
+        "@rollup/rollup-win32-x64-msvc": "4.24.0",
         "fsevents": "~2.3.2"
       }
     },
@@ -10379,13 +10379,6 @@
         "rollup": "^3.0.0 || ^4.0.0"
       }
     },
-    "node_modules/rollup/node_modules/@types/estree": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -10471,9 +10464,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.79.3",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.3.tgz",
-      "integrity": "sha512-m7dZxh0W9EZ3cw50Me5GOuYm/tVAJAn91SUnohLRo9cXBixGUOdvmryN+dXpwR831bhoY3Zv7rEFt85PUwTmzA==",
+      "version": "1.79.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.79.4.tgz",
+      "integrity": "sha512-K0QDSNPXgyqO4GZq2HO5Q70TLxTH6cIT59RdoCHMivrC8rqzaTw5ab9prjz9KUN1El4FLXrBXJhik61JR4HcGg==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -10595,16 +10588,16 @@
       }
     },
     "node_modules/shiki": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.20.0.tgz",
-      "integrity": "sha512-MZJJ1PCFsQB1Piq+25wiz0a75yUv8Q3/fzy7SzRx5ONdjdtGdyiKwYn8vb/FnK5kjS0voWGnPpjG16POauUR+g==",
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-1.21.0.tgz",
+      "integrity": "sha512-apCH5BoWTrmHDPGgg3RF8+HAAbEL/CdbYr8rMw7eIrdhCkZHdVGat5mMNlRtd1erNG01VPMIKHNQ0Pj2HMAiog==",
       "license": "MIT",
       "peer": true,
       "dependencies": {
-        "@shikijs/core": "1.20.0",
-        "@shikijs/engine-javascript": "1.20.0",
-        "@shikijs/engine-oniguruma": "1.20.0",
-        "@shikijs/types": "1.20.0",
+        "@shikijs/core": "1.21.0",
+        "@shikijs/engine-javascript": "1.21.0",
+        "@shikijs/engine-oniguruma": "1.21.0",
+        "@shikijs/types": "1.21.0",
         "@shikijs/vscode-textmate": "^9.2.2",
         "@types/hast": "^3.0.4"
       }
@@ -12065,9 +12058,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "dev": true,
       "funding": [
         {
@@ -12085,8 +12078,8 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -12274,9 +12267,9 @@
       }
     },
     "node_modules/vite-plugin-css-injected-by-js": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/vite-plugin-css-injected-by-js/-/vite-plugin-css-injected-by-js-3.5.1.tgz",
-      "integrity": "sha512-9ioqwDuEBxW55gNoWFEDhfLTrVKXEEZgl5adhWmmqa88EQGKfTmexy4v1Rh0pAS6RhKQs2bUYQArprB32JpUZQ==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/vite-plugin-css-injected-by-js/-/vite-plugin-css-injected-by-js-3.5.2.tgz",
+      "integrity": "sha512-2MpU/Y+SCZyWUB6ua3HbJCrgnF0KACAsmzOQt1UvRVJCGF6S8xdA3ZUhWcWdM9ivG4I5az8PnQmwwrkC2CAQrQ==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -12766,16 +12759,16 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.9",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.9.tgz",
-      "integrity": "sha512-nHzQhZ5cjFKynAY2beAm7XtJ5C13VKAFTLTgRYXy+Id1KEKBeiK6hO2RcW1hUjdbHMadz1YzxyHgQigOC54wug==",
+      "version": "3.5.10",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.10.tgz",
+      "integrity": "sha512-Vy2kmJwHPlouC/tSnIgXVg03SG+9wSqT1xu1Vehc+ChsXsRd7jLkKgMltVEFOzUdBr3uFwBCG+41LJtfAcBRng==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.9",
-        "@vue/compiler-sfc": "3.5.9",
-        "@vue/runtime-dom": "3.5.9",
-        "@vue/server-renderer": "3.5.9",
-        "@vue/shared": "3.5.9"
+        "@vue/compiler-dom": "3.5.10",
+        "@vue/compiler-sfc": "3.5.10",
+        "@vue/runtime-dom": "3.5.10",
+        "@vue/server-renderer": "3.5.10",
+        "@vue/shared": "3.5.10"
       },
       "peerDependencies": {
         "typescript": "*"

From 3e5705d790b8bfaaea9bf11ad1b0ffda794478dc Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 7 Oct 2024 14:42:03 +0200
Subject: [PATCH 5/7] switch to individual imports for @nextcloud/vue

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/App.vue                                              | 2 +-
 src/components/Actions/modules/ActionChangeView.vue      | 3 +--
 src/components/Actions/modules/ActionDelete.vue          | 4 ++--
 .../Actions/modules/ActionDeleteOrphanedVotes.vue        | 3 +--
 .../Actions/modules/ActionOpenOptionsSidebar.vue         | 3 +--
 .../Actions/modules/ActionOpenSharesSidebar.vue          | 3 +--
 src/components/Actions/modules/ActionRegister.vue        | 6 ++++--
 src/components/Actions/modules/ActionSendConfirmed.vue   | 4 ++--
 src/components/Actions/modules/ActionSortOptions.vue     | 3 +--
 src/components/Actions/modules/ActionSwitchSafeTable.vue | 3 +--
 src/components/Actions/modules/ActionToggleSidebar.vue   | 3 +--
 src/components/Activity/ActivityItem.vue                 | 3 ++-
 src/components/Base/modules/CardDiv.vue                  | 2 +-
 src/components/Base/modules/RadioGroupDiv.vue            | 2 +-
 src/components/Calendar/CalendarPeek.vue                 | 2 +-
 src/components/Configuration/ConfigAllowComment.vue      | 2 +-
 src/components/Configuration/ConfigAllowMayBe.vue        | 2 +-
 src/components/Configuration/ConfigAnonymous.vue         | 2 +-
 src/components/Configuration/ConfigAutoReminder.vue      | 6 +++++-
 src/components/Configuration/ConfigClosing.vue           | 4 +++-
 src/components/Configuration/ConfigOptionLimit.vue       | 2 +-
 src/components/Configuration/ConfigProposals.vue         | 3 ++-
 src/components/Configuration/ConfigUseNo.vue             | 2 +-
 src/components/Configuration/ConfigVoteLimit.vue         | 2 +-
 src/components/Create/CreateDlg.vue                      | 4 ++--
 src/components/Export/ExportPoll.vue                     | 3 ++-
 src/components/Navigation/PollNavigationItems.vue        | 3 ++-
 src/components/Options/OptionCloneDate.vue               | 4 ++--
 src/components/Options/OptionsDate.vue                   | 5 ++++-
 src/components/Options/OptionsDateAdd.vue                | 7 ++++---
 src/components/Options/OptionsDateShift.vue              | 5 +++--
 src/components/Options/OptionsText.vue                   | 4 +++-
 src/components/Options/OptionsTextAddBulk.vue            | 6 ++++--
 src/components/Poll/PollHeaderButtons.vue                | 5 +++--
 src/components/Poll/PollInformation.vue                  | 2 +-
 src/components/PollList/PollItem.vue                     | 4 ++--
 src/components/Public/PublicRegisterModal.vue            | 5 +++--
 .../Settings/AdminSettings/AdminActivities.vue           | 2 +-
 .../Settings/AdminSettings/AdminArchivePolls.vue         | 2 +-
 src/components/Settings/AdminSettings/AdminCombo.vue     | 3 ++-
 src/components/Settings/AdminSettings/AdminEmail.vue     | 2 +-
 src/components/Settings/AdminSettings/AdminJobs.vue      | 3 +--
 .../Settings/AdminSettings/AdminPollCreation.vue         | 3 ++-
 .../Settings/AdminSettings/AdminPollDownload.vue         | 3 ++-
 .../Settings/AdminSettings/AdminPollsInNavigation.vue    | 3 +--
 .../Settings/AdminSettings/AdminShareOpenPoll.vue        | 3 ++-
 .../Settings/AdminSettings/AdminSharePublicCreate.vue    | 3 ++-
 .../Settings/AdminSettings/AdminSharePublicShowLogin.vue | 2 +-
 .../Settings/AdminSettings/AdminShowMailAddresses.vue    | 3 ++-
 .../Settings/UserSettings/CalendarSettings.vue           | 2 +-
 src/components/Settings/UserSettings/FeatureSettings.vue | 2 +-
 src/components/Settings/UserSettings/StyleSettings.vue   | 2 +-
 src/components/Settings/UserSettingsDlg.vue              | 3 ++-
 src/components/Shares/ShareItem.vue                      | 6 +++++-
 src/components/Shares/ShareItemAllUsers.vue              | 2 +-
 src/components/Shares/SharePublicAdd.vue                 | 3 ++-
 src/components/Shares/SharesList.vue                     | 2 +-
 src/components/Shares/SharesListUnsent.vue               | 5 +++--
 src/components/SideBar/SideBarTabActivity.vue            | 2 +-
 src/components/SideBar/SideBarTabComments.vue            | 2 +-
 src/components/SideBar/SideBarTabConfiguration.vue       | 4 ++--
 src/components/Subscription/ActionSubscription.vue       | 3 ++-
 src/components/Subscription/Subscription.vue             | 2 +-
 src/components/User/ActionInputDisplayName.vue           | 2 +-
 src/components/User/ActionInputEmailAddress.vue          | 2 +-
 src/components/User/UserItem.vue                         | 2 +-
 src/components/User/UserMenu.vue                         | 6 +++++-
 src/components/User/UserSearch.vue                       | 2 +-
 src/components/VoteTable/VoteColumn.vue                  | 3 +--
 src/views/AdminSettingsPage.vue                          | 2 +-
 src/views/Administration.vue                             | 9 +++++++--
 src/views/Combo.vue                                      | 3 ++-
 src/views/Dashboard.vue                                  | 2 +-
 src/views/Navigation.vue                                 | 5 ++++-
 src/views/NotFound.vue                                   | 3 ++-
 src/views/PollList.vue                                   | 7 ++++++-
 src/views/SideBar.vue                                    | 3 ++-
 src/views/SideBarCombo.vue                               | 3 ++-
 src/views/UserSettingsPage.vue                           | 2 +-
 src/views/Vote.vue                                       | 3 ++-
 80 files changed, 154 insertions(+), 105 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4f1ccbd4f..bbfa03bd8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 	import { ref, computed, onMounted, onUnmounted } from 'vue'
-	import { NcContent } from '@nextcloud/vue'
+	import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
 	import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 	import '@nextcloud/dialogs/style.css'
 	import './assets/scss/colors.scss'
diff --git a/src/components/Actions/modules/ActionChangeView.vue b/src/components/Actions/modules/ActionChangeView.vue
index 7716b69ee..59fa4c920 100644
--- a/src/components/Actions/modules/ActionChangeView.vue
+++ b/src/components/Actions/modules/ActionChangeView.vue
@@ -5,14 +5,13 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { emit } from '@nextcloud/event-bus'
 	import ListViewIcon from 'vue-material-design-icons/ViewListOutline.vue' // view-sequential-outline
 	import TableViewIcon from 'vue-material-design-icons/Table.vue' // view-comfy-outline
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore, PollType, } from '../../../stores/poll.ts'
 	import { usePreferencesStore, ViewMode } from '../../../stores/preferences.ts'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const pollStore = usePollStore()
 	const preferencesStore = usePreferencesStore()
diff --git a/src/components/Actions/modules/ActionDelete.vue b/src/components/Actions/modules/ActionDelete.vue
index de53d9bd6..1f4cdc33e 100644
--- a/src/components/Actions/modules/ActionDelete.vue
+++ b/src/components/Actions/modules/ActionDelete.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 	import { ref, computed } from 'vue'
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 	import RestoreIcon from 'vue-material-design-icons/Recycle.vue'
 	import LockIcon from 'vue-material-design-icons/Lock.vue'
@@ -97,7 +97,7 @@
 <template>
 	<div class="">
 		<NcButton :name="computedTitle"
-			type="tertiary"
+			:type="ButtonType.Tertiary"
 			:aria-label="computedTitle">
 			<template #icon>
 				<RestoreIcon v-if="restore"
diff --git a/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue b/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue
index 98974a538..f7012fe86 100644
--- a/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue
+++ b/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue
@@ -4,10 +4,9 @@
 -->
 
 <script setup lang="ts">
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { t } from '@nextcloud/l10n'
 	import { useVotesStore } from '../../../stores/votes.ts'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js';
 
 	const votesStore = useVotesStore()
 	const caption = t('polls', 'Delete orphaned')
diff --git a/src/components/Actions/modules/ActionOpenOptionsSidebar.vue b/src/components/Actions/modules/ActionOpenOptionsSidebar.vue
index ee0828e1d..c2ea25a7b 100644
--- a/src/components/Actions/modules/ActionOpenOptionsSidebar.vue
+++ b/src/components/Actions/modules/ActionOpenOptionsSidebar.vue
@@ -4,10 +4,9 @@
 -->
 
 <script setup lang="ts">
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { emit } from '@nextcloud/event-bus'
 	import { t } from '@nextcloud/l10n'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js';
 
 	const caption = t('polls', 'Add some!')
 
diff --git a/src/components/Actions/modules/ActionOpenSharesSidebar.vue b/src/components/Actions/modules/ActionOpenSharesSidebar.vue
index 05f9865e2..b43218801 100644
--- a/src/components/Actions/modules/ActionOpenSharesSidebar.vue
+++ b/src/components/Actions/modules/ActionOpenSharesSidebar.vue
@@ -4,10 +4,9 @@
 -->
 
 <script setup lang="ts">
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { emit } from '@nextcloud/event-bus'
 	import { t } from '@nextcloud/l10n'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js';
 
 	const caption = t('polls', 'Edit access')
 
diff --git a/src/components/Actions/modules/ActionRegister.vue b/src/components/Actions/modules/ActionRegister.vue
index 7841f43cf..f7a5ba29c 100644
--- a/src/components/Actions/modules/ActionRegister.vue
+++ b/src/components/Actions/modules/ActionRegister.vue
@@ -4,11 +4,13 @@
 -->
 
 <script setup lang="ts">
+	// '@nextcloud/vue/dist/Components/.js'
+	// /dist/Components/.js
 	import { ref } from 'vue'
-	import { NcModal, NcButton } from '@nextcloud/vue'
+	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import PublicRegisterModal from '../../Public/PublicRegisterModal.vue'
 	import { t } from '@nextcloud/l10n'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js';
 
 	const caption = t('polls', 'Register')
 	const showRegistration = ref(false)
diff --git a/src/components/Actions/modules/ActionSendConfirmed.vue b/src/components/Actions/modules/ActionSendConfirmed.vue
index b49fb0637..a0da56df0 100644
--- a/src/components/Actions/modules/ActionSendConfirmed.vue
+++ b/src/components/Actions/modules/ActionSendConfirmed.vue
@@ -6,13 +6,13 @@
 <script setup lang="ts">
 	import { useRoute } from 'vue-router'
 	import { ref } from 'vue'
-	import { NcButton, NcModal } from '@nextcloud/vue'
+	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import EmailCheckIcon from 'vue-material-design-icons/EmailCheck.vue' // view-comfy-outline
 	import { PollsAPI } from '../../../Api/index.js'
 	import { Logger } from '../../../helpers/index.ts'
 	import { t, n } from '@nextcloud/l10n'
 	import { StatusResults } from '../../../Types/index.ts'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const route = useRoute()
 	const showModal = ref(false)
diff --git a/src/components/Actions/modules/ActionSortOptions.vue b/src/components/Actions/modules/ActionSortOptions.vue
index 41f12d7f9..ed477e42a 100644
--- a/src/components/Actions/modules/ActionSortOptions.vue
+++ b/src/components/Actions/modules/ActionSortOptions.vue
@@ -5,14 +5,13 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import { NcButton } from '@nextcloud/vue'
 	import SortByOriginalOrderIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
 	import SortByRankIcon from 'vue-material-design-icons/FormatListNumbered.vue'
 	import SortByDateOptionIcon from 'vue-material-design-icons/SortClockAscendingOutline.vue'
 	import { t } from '@nextcloud/l10n'
 	import { useOptionsStore } from '../../../stores/options.ts'
 	import { usePollStore, PollType } from '../../../stores/poll.ts'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const pollStore = usePollStore()
 	const optionsStore = useOptionsStore()
diff --git a/src/components/Actions/modules/ActionSwitchSafeTable.vue b/src/components/Actions/modules/ActionSwitchSafeTable.vue
index 9c5545c96..400d02036 100644
--- a/src/components/Actions/modules/ActionSwitchSafeTable.vue
+++ b/src/components/Actions/modules/ActionSwitchSafeTable.vue
@@ -4,10 +4,9 @@
 -->
 
 <script setup lang="ts">
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../../stores/poll.ts'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js';
 
 	const pollStore = usePollStore()
 	const caption = t('polls', 'Reveal them')
diff --git a/src/components/Actions/modules/ActionToggleSidebar.vue b/src/components/Actions/modules/ActionToggleSidebar.vue
index bba6423ce..1b02acbe4 100644
--- a/src/components/Actions/modules/ActionToggleSidebar.vue
+++ b/src/components/Actions/modules/ActionToggleSidebar.vue
@@ -4,11 +4,10 @@
 -->
 
 <script setup lang="ts">
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { emit } from '@nextcloud/event-bus'
 	import SidebarIcon from 'vue-material-design-icons/TextAccount.vue' // view-comfy-outline
 	import { t } from '@nextcloud/l10n'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js';
 
 	const caption = t('polls', 'Toggle Sidebar')
 	function clickAction() {
diff --git a/src/components/Activity/ActivityItem.vue b/src/components/Activity/ActivityItem.vue
index d628e49c1..ec75d00ba 100644
--- a/src/components/Activity/ActivityItem.vue
+++ b/src/components/Activity/ActivityItem.vue
@@ -6,7 +6,8 @@
 <script setup lang="ts">
 	import { computed } from 'vue'
 	import moment from '@nextcloud/moment'
-	import { NcUserBubble, NcRichText } from '@nextcloud/vue'
+	import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
+	import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js'
 	import { GuestBubble, SimpleLink } from '../../helpers/index.ts'
 
 	const props = defineProps({
diff --git a/src/components/Base/modules/CardDiv.vue b/src/components/Base/modules/CardDiv.vue
index 213f97356..3300ffedd 100644
--- a/src/components/Base/modules/CardDiv.vue
+++ b/src/components/Base/modules/CardDiv.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup lang="ts">
-	import { NcNoteCard } from '@nextcloud/vue'
+	import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 </script>
 
 <template>
diff --git a/src/components/Base/modules/RadioGroupDiv.vue b/src/components/Base/modules/RadioGroupDiv.vue
index d2e473540..fb337f010 100644
--- a/src/components/Base/modules/RadioGroupDiv.vue
+++ b/src/components/Base/modules/RadioGroupDiv.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 	import { computed, PropType } from 'vue'
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 
 	export type CheckboxOption = {
 		value: string
diff --git a/src/components/Calendar/CalendarPeek.vue b/src/components/Calendar/CalendarPeek.vue
index 4a19be535..4df914cb7 100644
--- a/src/components/Calendar/CalendarPeek.vue
+++ b/src/components/Calendar/CalendarPeek.vue
@@ -7,7 +7,7 @@
 
 	import { computed, onMounted, ref, PropType } from 'vue'
 	import orderBy from 'lodash/orderBy'
-	import { NcPopover } from '@nextcloud/vue'
+	import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
 	import moment from '@nextcloud/moment'
 	import CalendarInfo from './CalendarInfo.vue'
 	import { CalendarAPI } from '../../Api/index.js'
diff --git a/src/components/Configuration/ConfigAllowComment.vue b/src/components/Configuration/ConfigAllowComment.vue
index 5123e841f..37770a316 100644
--- a/src/components/Configuration/ConfigAllowComment.vue
+++ b/src/components/Configuration/ConfigAllowComment.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup lang="ts">
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
 
diff --git a/src/components/Configuration/ConfigAllowMayBe.vue b/src/components/Configuration/ConfigAllowMayBe.vue
index eaafd7cb8..fa4267b1f 100644
--- a/src/components/Configuration/ConfigAllowMayBe.vue
+++ b/src/components/Configuration/ConfigAllowMayBe.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup lang="ts">
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
 
diff --git a/src/components/Configuration/ConfigAnonymous.vue b/src/components/Configuration/ConfigAnonymous.vue
index 05db8fb84..2f3829810 100644
--- a/src/components/Configuration/ConfigAnonymous.vue
+++ b/src/components/Configuration/ConfigAnonymous.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup lang="ts">
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
 
diff --git a/src/components/Configuration/ConfigAutoReminder.vue b/src/components/Configuration/ConfigAutoReminder.vue
index 6805b94e0..ba51d3f31 100644
--- a/src/components/Configuration/ConfigAutoReminder.vue
+++ b/src/components/Configuration/ConfigAutoReminder.vue
@@ -4,7 +4,11 @@
 -->
 
 <script setup lang="ts">
-	import { NcActions, NcActionButton, NcPopover, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+
 	import InformationIcon from 'vue-material-design-icons/InformationVariant.vue'
 	import AutoReminderInformation from './AutoReminderInformation.vue'
 	import { t } from '@nextcloud/l10n'
diff --git a/src/components/Configuration/ConfigClosing.vue b/src/components/Configuration/ConfigClosing.vue
index 7694aa6e7..fce87d3ba 100644
--- a/src/components/Configuration/ConfigClosing.vue
+++ b/src/components/Configuration/ConfigClosing.vue
@@ -6,7 +6,9 @@
 <script setup lang="ts">
 	import { computed } from 'vue'
 	import moment from '@nextcloud/moment'
-	import { NcButton, NcDateTimePicker, NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+	import NcDateTimePicker from '@nextcloud/vue/dist/Components/NcDateTimePicker.js'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import OpenPollIcon from 'vue-material-design-icons/LockOpenVariant.vue'
 	import ClosePollIcon from 'vue-material-design-icons/Lock.vue'
 	import { t } from '@nextcloud/l10n'
diff --git a/src/components/Configuration/ConfigOptionLimit.vue b/src/components/Configuration/ConfigOptionLimit.vue
index 0ea22c2db..410af6b54 100644
--- a/src/components/Configuration/ConfigOptionLimit.vue
+++ b/src/components/Configuration/ConfigOptionLimit.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { InputDiv } from '../Base/index.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
diff --git a/src/components/Configuration/ConfigProposals.vue b/src/components/Configuration/ConfigProposals.vue
index 7572eb54b..454ad792a 100644
--- a/src/components/Configuration/ConfigProposals.vue
+++ b/src/components/Configuration/ConfigProposals.vue
@@ -6,7 +6,8 @@
 <script setup lang="ts">
 	import { computed } from 'vue'
 	import moment from '@nextcloud/moment'
-	import { NcCheckboxRadioSwitch, NcDateTimePicker } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcDateTimePicker from '@nextcloud/vue/dist/Components/NcDateTimePicker.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore, AllowProposals } from '../../stores/poll.ts'
 
diff --git a/src/components/Configuration/ConfigUseNo.vue b/src/components/Configuration/ConfigUseNo.vue
index 95144a371..7017feef8 100644
--- a/src/components/Configuration/ConfigUseNo.vue
+++ b/src/components/Configuration/ConfigUseNo.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup lang="ts">
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
 
diff --git a/src/components/Configuration/ConfigVoteLimit.vue b/src/components/Configuration/ConfigVoteLimit.vue
index fd056d399..86743d67b 100644
--- a/src/components/Configuration/ConfigVoteLimit.vue
+++ b/src/components/Configuration/ConfigVoteLimit.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { InputDiv } from '../Base/index.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
diff --git a/src/components/Create/CreateDlg.vue b/src/components/Create/CreateDlg.vue
index 18cd75a4e..6a0cea3b4 100644
--- a/src/components/Create/CreateDlg.vue
+++ b/src/components/Create/CreateDlg.vue
@@ -7,7 +7,7 @@
 	import { ref, computed } from 'vue'
 	import { useRouter } from 'vue-router'
 	import { showSuccess, showError } from '@nextcloud/dialogs'
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { ConfigBox, RadioGroupDiv, InputDiv } from '../Base/index.js'
 	import SpeakerIcon from 'vue-material-design-icons/Bullhorn.vue'
 	import CheckIcon from 'vue-material-design-icons/Check.vue'
@@ -74,7 +74,7 @@
 				</template>
 			</NcButton>
 			<NcButton :disabled="titleEmpty"
-				type="primary"
+				:type="ButtonType.Primary"
 				@click="confirm">
 				<template #default>
 					{{ t('polls', 'Apply') }}
diff --git a/src/components/Export/ExportPoll.vue b/src/components/Export/ExportPoll.vue
index b357719d0..8fa7d3915 100644
--- a/src/components/Export/ExportPoll.vue
+++ b/src/components/Export/ExportPoll.vue
@@ -10,7 +10,8 @@
 	import { saveAs } from 'file-saver'
 	import DOMPurify from 'dompurify'
 	import { t } from '@nextcloud/l10n'
-	import { NcActions, NcActionButton } from '@nextcloud/vue'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 	import { showError } from '@nextcloud/dialogs'
 
 	import { usePollStore, PollType } from '../../stores/poll.ts'
diff --git a/src/components/Navigation/PollNavigationItems.vue b/src/components/Navigation/PollNavigationItems.vue
index e4a4e34f8..2f49b73b5 100644
--- a/src/components/Navigation/PollNavigationItems.vue
+++ b/src/components/Navigation/PollNavigationItems.vue
@@ -5,7 +5,8 @@
 
 <script setup lang="ts">
 	import { PropType } from 'vue'
-	import { NcActionButton, NcAppNavigationItem } from '@nextcloud/vue'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+	import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
 	import { t } from '@nextcloud/l10n'
 
 	import { useSessionStore } from '../../stores/session.ts'
diff --git a/src/components/Options/OptionCloneDate.vue b/src/components/Options/OptionCloneDate.vue
index 66e4b6d07..872002901 100644
--- a/src/components/Options/OptionCloneDate.vue
+++ b/src/components/Options/OptionCloneDate.vue
@@ -6,12 +6,12 @@
 <script setup lang="ts">
 	import { computed, ref, PropType } from 'vue'
 	import moment from '@nextcloud/moment'
-	import { NcButton, NcSelect } from '@nextcloud/vue'
+	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { InputDiv } from '../Base/index.js'
 	import { t } from '@nextcloud/l10n'
 	import { useOptionsStore, Option, Sequence } from '../../stores/options.ts'
 	import { dateUnits, DateUnitValue } from '../../constants/dateUnits.ts'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const optionsStore = useOptionsStore()
 
diff --git a/src/components/Options/OptionsDate.vue b/src/components/Options/OptionsDate.vue
index baefed8ab..4594e12e4 100644
--- a/src/components/Options/OptionsDate.vue
+++ b/src/components/Options/OptionsDate.vue
@@ -5,7 +5,10 @@
 
 <script setup lang="ts">
 	import { ref } from 'vue'
-	import { NcActions, NcActionButton, NcEmptyContent, NcModal } from '@nextcloud/vue'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 	import { t } from '@nextcloud/l10n'
 
 	import OptionCloneDate from './OptionCloneDate.vue'
diff --git a/src/components/Options/OptionsDateAdd.vue b/src/components/Options/OptionsDateAdd.vue
index ee9fdbf7f..54431aeda 100644
--- a/src/components/Options/OptionsDateAdd.vue
+++ b/src/components/Options/OptionsDateAdd.vue
@@ -8,14 +8,15 @@
 	import { showError, showSuccess } from '@nextcloud/dialogs'
 	import { t } from '@nextcloud/l10n'
 	import moment from '@nextcloud/moment'
-	import { NcButton, NcCheckboxRadioSwitch, NcDateTimePicker } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcDateTimePicker from '@nextcloud/vue/dist/Components/NcDateTimePicker.js'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	import { useOptionsStore } from '../../stores/options.ts'
 
 	import { FlexSpacer } from '../Base/index.js'
 	import AddDateIcon from 'vue-material-design-icons/CalendarPlus.vue'
 	import CheckIcon from 'vue-material-design-icons/Check.vue'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const optionsStore = useOptionsStore()
 	const props = defineProps({
@@ -283,7 +284,7 @@
 					{{ dateOption.text }}
 				</div>
 				<FlexSpacer />
-				<NcButton v-if="dateOption.option.duration >= 0 && !added" type="primary" @click="addOption">
+				<NcButton v-if="dateOption.option.duration >= 0 && !added" :type="ButtonType.Primary" @click="addOption">
 					{{ t('polls', 'Add') }}
 				</NcButton>
 				<CheckIcon v-if="added"
diff --git a/src/components/Options/OptionsDateShift.vue b/src/components/Options/OptionsDateShift.vue
index 16bca14ac..7e6039bad 100644
--- a/src/components/Options/OptionsDateShift.vue
+++ b/src/components/Options/OptionsDateShift.vue
@@ -6,7 +6,8 @@
 <script setup lang="ts">
 	import { ref } from 'vue'
 	import { t } from '@nextcloud/l10n'
-	import { NcButton, NcSelect } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 
 	import { InputDiv } from '../Base/index.js'
 	import { dateUnits, DateUnitValue } from '../../constants/dateUnits.ts'
@@ -42,7 +43,7 @@
 				label="name" />
 			<NcButton class="submit"
 				:aria-label="t('polls', 'Submit')"
-				type="tertiary"
+				:type="ButtonType.Tertiary"
 				@click="shiftDates(shift)">
 				<template #icon>
 					<SubmitIcon />
diff --git a/src/components/Options/OptionsText.vue b/src/components/Options/OptionsText.vue
index eaa35bb18..da110f513 100644
--- a/src/components/Options/OptionsText.vue
+++ b/src/components/Options/OptionsText.vue
@@ -5,7 +5,9 @@
 
 <script setup lang="ts">
 	import { t } from '@nextcloud/l10n'
-	import { NcActions, NcActionButton, NcEmptyContent } from '@nextcloud/vue'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 	import { Sortable } from "sortablejs-vue3"
 
 	import OptionItem from './OptionItem.vue'
diff --git a/src/components/Options/OptionsTextAddBulk.vue b/src/components/Options/OptionsTextAddBulk.vue
index f9f5761ca..6187e9878 100644
--- a/src/components/Options/OptionsTextAddBulk.vue
+++ b/src/components/Options/OptionsTextAddBulk.vue
@@ -7,12 +7,14 @@
 	import { ref } from 'vue'
 	import { showError, showSuccess } from '@nextcloud/dialogs'
 	import { t } from '@nextcloud/l10n'
-	import { NcActions, NcActionButton, NcButton, NcModal } from '@nextcloud/vue'
+	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	import { useOptionsStore } from '../../stores/options.ts'
 
 	import PasteIcon from 'vue-material-design-icons/ClipboardTextMultiple.vue'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const optionsStore = useOptionsStore()
 
diff --git a/src/components/Poll/PollHeaderButtons.vue b/src/components/Poll/PollHeaderButtons.vue
index b2261fa5f..f2a772750 100644
--- a/src/components/Poll/PollHeaderButtons.vue
+++ b/src/components/Poll/PollHeaderButtons.vue
@@ -9,7 +9,8 @@
 	import { usePollStore } from '../../stores/poll.ts'
 	import { useSessionStore } from '../../stores/session.ts'
 
-	import { NcButton, NcPopover } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+	import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
 	import { t } from '@nextcloud/l10n'
 
 	import { ActionToggleSidebar } from '../Actions/index.js'
@@ -39,7 +40,7 @@
 			<template #trigger>
 				<NcButton :title="caption"
 					:aria-label="caption"
-					type="tertiary">
+					:type="ButtonType.Tertiary">
 					<template #icon>
 						<PollInformationIcon />
 					</template>
diff --git a/src/components/Poll/PollInformation.vue b/src/components/Poll/PollInformation.vue
index 0c6039056..bd47c4990 100644
--- a/src/components/Poll/PollInformation.vue
+++ b/src/components/Poll/PollInformation.vue
@@ -7,7 +7,7 @@
 	import { computed } from 'vue'
 	import moment from '@nextcloud/moment'
 	import { t, n } from '@nextcloud/l10n'
-	import { NcUserBubble } from '@nextcloud/vue'
+	import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
 
 	import { BadgeDiv } from '../Base/index.js'
 	import { useSessionStore } from '../../stores/session.ts'
diff --git a/src/components/PollList/PollItem.vue b/src/components/PollList/PollItem.vue
index a1cfdbb31..c09fe46d1 100644
--- a/src/components/PollList/PollItem.vue
+++ b/src/components/PollList/PollItem.vue
@@ -24,9 +24,9 @@
 	import ArchivedPollIcon from 'vue-material-design-icons/Archive.vue'
 
 	export interface Props {
-		header: boolean
+		header?: boolean
 		poll?: Poll
-		noLink: boolean
+		noLink?: boolean
 	}
 
 
diff --git a/src/components/Public/PublicRegisterModal.vue b/src/components/Public/PublicRegisterModal.vue
index ed18e0d59..a76c9c0cc 100644
--- a/src/components/Public/PublicRegisterModal.vue
+++ b/src/components/Public/PublicRegisterModal.vue
@@ -9,7 +9,9 @@
 	import { debounce } from 'lodash'
 	import { showError } from '@nextcloud/dialogs'
 	import { generateUrl } from '@nextcloud/router'
-	import { NcButton, NcCheckboxRadioSwitch, NcRichText } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { InputDiv } from '../Base/index.js'
 	import { SimpleLink, setCookie } from '../../helpers/index.ts'
 	import { ValidatorAPI, PublicAPI } from '../../Api/index.js'
@@ -17,7 +19,6 @@
 	import { SignalingType, ShareType } from '../../Types'
 	import { useSessionStore } from '../../stores/session.ts'
 	import { usePollStore } from '../../stores/poll.ts'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const route = useRoute()
 	const router = useRouter()
diff --git a/src/components/Settings/AdminSettings/AdminActivities.vue b/src/components/Settings/AdminSettings/AdminActivities.vue
index 33f3d396d..ca755fa4f 100644
--- a/src/components/Settings/AdminSettings/AdminActivities.vue
+++ b/src/components/Settings/AdminSettings/AdminActivities.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup>
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
diff --git a/src/components/Settings/AdminSettings/AdminArchivePolls.vue b/src/components/Settings/AdminSettings/AdminArchivePolls.vue
index 537c9552f..c0ca6fb57 100644
--- a/src/components/Settings/AdminSettings/AdminArchivePolls.vue
+++ b/src/components/Settings/AdminSettings/AdminArchivePolls.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup>
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { InputDiv } from '../../Base/index.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
diff --git a/src/components/Settings/AdminSettings/AdminCombo.vue b/src/components/Settings/AdminSettings/AdminCombo.vue
index 1a27344d4..49756ab3c 100644
--- a/src/components/Settings/AdminSettings/AdminCombo.vue
+++ b/src/components/Settings/AdminSettings/AdminCombo.vue
@@ -4,7 +4,8 @@
 -->
 
 <script setup>
-	import { NcCheckboxRadioSwitch, NcSelect } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
diff --git a/src/components/Settings/AdminSettings/AdminEmail.vue b/src/components/Settings/AdminSettings/AdminEmail.vue
index 8f9a66f55..1b076d095 100644
--- a/src/components/Settings/AdminSettings/AdminEmail.vue
+++ b/src/components/Settings/AdminSettings/AdminEmail.vue
@@ -5,7 +5,7 @@
 
 <script setup>
 	import { computed, ref } from 'vue'
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { marked } from 'marked'
 	import { gfmHeadingId } from 'marked-gfm-heading-id'
 	import DOMPurify from 'dompurify'
diff --git a/src/components/Settings/AdminSettings/AdminJobs.vue b/src/components/Settings/AdminSettings/AdminJobs.vue
index de0decd12..7ce7eda23 100644
--- a/src/components/Settings/AdminSettings/AdminJobs.vue
+++ b/src/components/Settings/AdminSettings/AdminJobs.vue
@@ -4,11 +4,10 @@
 -->
 
 <script setup>
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { AdminAPI } from '../../../Api/index.js'
 	import { Logger } from '../../../helpers/index.ts'
 	import { t } from '@nextcloud/l10n'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js';
 
 	const autoreminder = {
 		text: t('polls', 'Run autoreminder'),
diff --git a/src/components/Settings/AdminSettings/AdminPollCreation.vue b/src/components/Settings/AdminSettings/AdminPollCreation.vue
index 052aa5680..97506b2c0 100644
--- a/src/components/Settings/AdminSettings/AdminPollCreation.vue
+++ b/src/components/Settings/AdminSettings/AdminPollCreation.vue
@@ -4,7 +4,8 @@
 -->
 
 <script setup>
-	import { NcCheckboxRadioSwitch, NcSelect } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
diff --git a/src/components/Settings/AdminSettings/AdminPollDownload.vue b/src/components/Settings/AdminSettings/AdminPollDownload.vue
index 61125b25d..1dc69f154 100644
--- a/src/components/Settings/AdminSettings/AdminPollDownload.vue
+++ b/src/components/Settings/AdminSettings/AdminPollDownload.vue
@@ -4,7 +4,8 @@
 -->
 
 <script setup>
-	import { NcCheckboxRadioSwitch, NcSelect } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
diff --git a/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue b/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue
index 6d96f7c28..22f992d1f 100644
--- a/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue
+++ b/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue
@@ -4,8 +4,7 @@
 -->
 
 <script setup>
-
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
diff --git a/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue b/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue
index 2ad9b8e1b..b3d937fe9 100644
--- a/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue
+++ b/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue
@@ -5,7 +5,8 @@
 
 <script setup>
 
-	import { NcCheckboxRadioSwitch, NcSelect } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
diff --git a/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue b/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue
index 720dd3fd0..844b42555 100644
--- a/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue
+++ b/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue
@@ -4,7 +4,8 @@
 -->
 
 <script setup>
-	import { NcCheckboxRadioSwitch, NcSelect } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
diff --git a/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue b/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue
index 0dd60575e..eae55aabe 100644
--- a/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue
+++ b/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup>
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue b/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue
index ab8f304f2..e4b61a52c 100644
--- a/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue
+++ b/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue
@@ -4,7 +4,8 @@
 -->
 
 <script setup>
-	import { NcCheckboxRadioSwitch, NcSelect } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
diff --git a/src/components/Settings/UserSettings/CalendarSettings.vue b/src/components/Settings/UserSettings/CalendarSettings.vue
index c5c82f9eb..a030ff364 100644
--- a/src/components/Settings/UserSettings/CalendarSettings.vue
+++ b/src/components/Settings/UserSettings/CalendarSettings.vue
@@ -5,7 +5,7 @@
 
 <script setup>
 	import { computed } from 'vue'
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { InputDiv } from '../../Base/index.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePreferencesStore } from '../../../stores/preferences.ts'
diff --git a/src/components/Settings/UserSettings/FeatureSettings.vue b/src/components/Settings/UserSettings/FeatureSettings.vue
index f7df77cf5..e33313cfe 100644
--- a/src/components/Settings/UserSettings/FeatureSettings.vue
+++ b/src/components/Settings/UserSettings/FeatureSettings.vue
@@ -6,7 +6,7 @@
 <script setup>
 	import { computed } from 'vue'
 	import { InputDiv } from '../../Base/index.js'
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePreferencesStore, ViewMode } from '../../../stores/preferences.ts'
 
diff --git a/src/components/Settings/UserSettings/StyleSettings.vue b/src/components/Settings/UserSettings/StyleSettings.vue
index cbbc34fcc..dc1b3ee9c 100644
--- a/src/components/Settings/UserSettings/StyleSettings.vue
+++ b/src/components/Settings/UserSettings/StyleSettings.vue
@@ -4,7 +4,7 @@
 -->
 
 <script setup>
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePreferencesStore } from '../../../stores/preferences.ts'
 	const preferencesStore = usePreferencesStore()
diff --git a/src/components/Settings/UserSettingsDlg.vue b/src/components/Settings/UserSettingsDlg.vue
index 098f99aa6..20269ec63 100644
--- a/src/components/Settings/UserSettingsDlg.vue
+++ b/src/components/Settings/UserSettingsDlg.vue
@@ -4,7 +4,8 @@
 -->
 <script setup>
 	import { ref, onMounted, onUnmounted } from 'vue'
-	import { NcAppSettingsDialog, NcAppSettingsSection } from '@nextcloud/vue'
+	import NcAppSettingsDialog from '@nextcloud/vue/dist/Components/NcAppSettingsDialog.js'
+	import NcAppSettingsSection from '@nextcloud/vue/dist/Components/NcAppSettingsSection.js'
 	import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 	import { CalendarSettings, FeatureSettings, StyleSettings, PerformanceSettings } from './UserSettings/index.js'
 	import { t } from '@nextcloud/l10n'
diff --git a/src/components/Shares/ShareItem.vue b/src/components/Shares/ShareItem.vue
index 2facd5cc4..851e62f99 100644
--- a/src/components/Shares/ShareItem.vue
+++ b/src/components/Shares/ShareItem.vue
@@ -7,7 +7,11 @@
 	import { ref, computed, onMounted, PropType } from 'vue'
 	import { showSuccess, showError } from '@nextcloud/dialogs'
 	import { t } from '@nextcloud/l10n'
-	import { NcActions, NcActionButton, NcActionCaption, NcActionInput, NcActionRadio } from '@nextcloud/vue'
+	import NcActionCaption from '@nextcloud/vue/dist/Components/NcActionCaption.js'
+	import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
+	import NcActionRadio from '@nextcloud/vue/dist/Components/NcActionRadio.js'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 
 	import { Logger } from '../../helpers/index.ts'
 	import UserItem from '../User/UserItem.vue'
diff --git a/src/components/Shares/ShareItemAllUsers.vue b/src/components/Shares/ShareItemAllUsers.vue
index ff39b5593..64ba58c7b 100644
--- a/src/components/Shares/ShareItemAllUsers.vue
+++ b/src/components/Shares/ShareItemAllUsers.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import UserItem from '../User/UserItem.vue'
 	import { usePollStore, AccessType } from '../../stores/poll.ts'
diff --git a/src/components/Shares/SharePublicAdd.vue b/src/components/Shares/SharePublicAdd.vue
index 0faf87ba6..7ef2eec6d 100644
--- a/src/components/Shares/SharePublicAdd.vue
+++ b/src/components/Shares/SharePublicAdd.vue
@@ -5,7 +5,8 @@
 
 <script setup lang="ts">
 	import { showError } from '@nextcloud/dialogs'
-	import { NcActions, NcActionButton } from '@nextcloud/vue'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 	import PlusIcon from 'vue-material-design-icons/Plus.vue'
 	import { t } from '@nextcloud/l10n'
 	import UserItem from '../User/UserItem.vue'
diff --git a/src/components/Shares/SharesList.vue b/src/components/Shares/SharesList.vue
index 18521999f..858605d10 100644
--- a/src/components/Shares/SharesList.vue
+++ b/src/components/Shares/SharesList.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 	import { ref } from 'vue'
 	import { t } from '@nextcloud/l10n'
-	import { NcModal } from '@nextcloud/vue'
+	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 
 	import { usePollStore } from '../../stores/poll.ts'
 	import { useSharesStore } from '../../stores/shares.ts'
diff --git a/src/components/Shares/SharesListUnsent.vue b/src/components/Shares/SharesListUnsent.vue
index 212a6bea5..e82518ca4 100644
--- a/src/components/Shares/SharesListUnsent.vue
+++ b/src/components/Shares/SharesListUnsent.vue
@@ -5,7 +5,8 @@
 
 <script setup lang="ts">
 	import { showSuccess, showError } from '@nextcloud/dialogs'
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	import { ConfigBox } from '../Base/index.js'
 	import EmailAlertIcon from 'vue-material-design-icons/EmailAlert.vue'
 	import ShareItem from './ShareItem.vue'
@@ -43,7 +44,7 @@
 		<template #actions>
 			<NcButton :title="t('polls', 'Resolve and send all invitations')"
 				:aria-label="t('polls', 'Resolve and send all invitations')"
-				type="tertiary"
+				:type="ButtonType.Tertiary"
 				@click="sendAllInvitations()">
 				<template #icon>
 					<BulkMailIcon />
diff --git a/src/components/SideBar/SideBarTabActivity.vue b/src/components/SideBar/SideBarTabActivity.vue
index 2b92a5310..14d5f217e 100644
--- a/src/components/SideBar/SideBarTabActivity.vue
+++ b/src/components/SideBar/SideBarTabActivity.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 	import { computed, onMounted, onUnmounted } from 'vue'
 	import Activities from '../Activity/Activities.vue'
-	import { NcEmptyContent } from '@nextcloud/vue'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
 	import { t } from '@nextcloud/l10n'
 	import { useActivityStore } from '../../stores/activity.ts'
diff --git a/src/components/SideBar/SideBarTabComments.vue b/src/components/SideBar/SideBarTabComments.vue
index 01d433767..dfa6524b2 100644
--- a/src/components/SideBar/SideBarTabComments.vue
+++ b/src/components/SideBar/SideBarTabComments.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 	import { computed, onMounted, onUnmounted } from 'vue'
-	import { NcEmptyContent } from '@nextcloud/vue'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 	import { t } from '@nextcloud/l10n'
 
diff --git a/src/components/SideBar/SideBarTabConfiguration.vue b/src/components/SideBar/SideBarTabConfiguration.vue
index 0fc914aa9..7bf3e92a5 100644
--- a/src/components/SideBar/SideBarTabConfiguration.vue
+++ b/src/components/SideBar/SideBarTabConfiguration.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 	import { showError } from '@nextcloud/dialogs'
-	import { NcButton } from '@nextcloud/vue'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { t } from '@nextcloud/l10n'
 
 	import { PollType, ShowResults, usePollStore } from '../../stores/poll.ts'
@@ -131,7 +131,7 @@
 				</template>
 			</NcButton>
 
-			<NcButton v-if="pollStore.status.deleted" type="error" @click="deletePoll()">
+			<NcButton v-if="pollStore.status.deleted" :type="ButtonType.Error" @click="deletePoll()">
 				<template #icon>
 					<DeletePollIcon />
 				</template>
diff --git a/src/components/Subscription/ActionSubscription.vue b/src/components/Subscription/ActionSubscription.vue
index 3e903822b..6b67095f5 100644
--- a/src/components/Subscription/ActionSubscription.vue
+++ b/src/components/Subscription/ActionSubscription.vue
@@ -5,7 +5,8 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import { NcActions, NcActionCheckbox } from '@nextcloud/vue'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
 	import { t } from '@nextcloud/l10n'
 	import { useSubscriptionStore } from '../../stores/subscription.ts'
 	import { useSessionStore } from '../../stores/session.ts'
diff --git a/src/components/Subscription/Subscription.vue b/src/components/Subscription/Subscription.vue
index 573043473..8645ba6c7 100644
--- a/src/components/Subscription/Subscription.vue
+++ b/src/components/Subscription/Subscription.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { useSubscriptionStore } from '../../stores/subscription.ts'
 	import { useSessionStore } from '../../stores/session.ts'
diff --git a/src/components/User/ActionInputDisplayName.vue b/src/components/User/ActionInputDisplayName.vue
index 7ec798135..e1943b765 100644
--- a/src/components/User/ActionInputDisplayName.vue
+++ b/src/components/User/ActionInputDisplayName.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 	import { debounce } from 'lodash'
 	import { showSuccess, showError } from '@nextcloud/dialogs'
-	import { NcActionInput } from '@nextcloud/vue'
+	import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
 	import EditAccountIcon from 'vue-material-design-icons/AccountEdit.vue'
 	import { ValidatorAPI } from '../../Api/index.js'
 	import { t } from '@nextcloud/l10n'
diff --git a/src/components/User/ActionInputEmailAddress.vue b/src/components/User/ActionInputEmailAddress.vue
index 15f60cf50..839c19342 100644
--- a/src/components/User/ActionInputEmailAddress.vue
+++ b/src/components/User/ActionInputEmailAddress.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 	import { debounce } from 'lodash'
 	import { showSuccess, showError } from '@nextcloud/dialogs'
-	import { NcActionInput } from '@nextcloud/vue'
+	import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
 	import EditEmailIcon from 'vue-material-design-icons/EmailEditOutline.vue'
 	import { ValidatorAPI } from '../../Api/index.js'
 	import { t } from '@nextcloud/l10n'
diff --git a/src/components/User/UserItem.vue b/src/components/User/UserItem.vue
index d6155f37f..faee29ec7 100644
--- a/src/components/User/UserItem.vue
+++ b/src/components/User/UserItem.vue
@@ -7,7 +7,7 @@
 	import { computed, type PropType } from 'vue'
 	import { useRoute } from 'vue-router'
 	import { getCurrentUser } from '@nextcloud/auth'
-	import { NcAvatar } from '@nextcloud/vue'
+	import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
 	import AdminIcon from 'vue-material-design-icons/ShieldCrown.vue'
 	import LinkIcon from 'vue-material-design-icons/LinkVariant.vue'
 	import ContactIcon from 'vue-material-design-icons/CardAccountDetails.vue'
diff --git a/src/components/User/UserMenu.vue b/src/components/User/UserMenu.vue
index f11951b95..db21d94b4 100644
--- a/src/components/User/UserMenu.vue
+++ b/src/components/User/UserMenu.vue
@@ -9,7 +9,11 @@
 	import { debounce } from 'lodash'
 
 	import { showSuccess, showError } from '@nextcloud/dialogs'
-	import { NcActions, NcActionButton, NcActionCheckbox, NcActionInput, NcActionSeparator } from '@nextcloud/vue'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+	import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
+	import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
+	import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator.js'
 	import { t } from '@nextcloud/l10n'
 
 	import { PollsAPI, ValidatorAPI } from '../../Api/index.js'
diff --git a/src/components/User/UserSearch.vue b/src/components/User/UserSearch.vue
index deeaa01d7..59e2adb84 100644
--- a/src/components/User/UserSearch.vue
+++ b/src/components/User/UserSearch.vue
@@ -7,7 +7,7 @@
 	import { ref } from 'vue'
 	import { debounce } from 'lodash'
 	import { showError } from '@nextcloud/dialogs'
-	import { NcSelect } from '@nextcloud/vue'
+	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 	import { AppSettingsAPI } from '../../Api/index.js'
 	import { Logger } from '../../helpers/index.ts'
 	import { t } from '@nextcloud/l10n'
diff --git a/src/components/VoteTable/VoteColumn.vue b/src/components/VoteTable/VoteColumn.vue
index 98c8e817d..e6c2da636 100644
--- a/src/components/VoteTable/VoteColumn.vue
+++ b/src/components/VoteTable/VoteColumn.vue
@@ -5,7 +5,6 @@
 
 <script setup lang="ts">
 	import { computed, PropType } from 'vue'
-	import { NcButton } from '@nextcloud/vue'
 	import Counter from '../Options/Counter.vue'
 	import OptionItem from '../Options/OptionItem.vue'
 	import VoteItem from './VoteItem.vue'
@@ -19,7 +18,7 @@
 	import { usePreferencesStore } from '../../stores/preferences.ts'
 	import { useOptionsStore, Option } from '../../stores/options.ts'
 	import { BoxType } from '../../Types/index.ts'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const pollStore = usePollStore()
 	const preferencesStore = usePreferencesStore()
diff --git a/src/views/AdminSettingsPage.vue b/src/views/AdminSettingsPage.vue
index 78c2157ab..d4ed62f19 100644
--- a/src/views/AdminSettingsPage.vue
+++ b/src/views/AdminSettingsPage.vue
@@ -11,8 +11,8 @@
 		AdminShareOpenPoll, AdminSharePublicCreate, AdminSharePublicShowLogin,
 		AdminShowMailAddresses
 	} from '../components/Settings/AdminSettings/index.js'
+	import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
 	import { FlexSettings } from '../components/Base/index.js'
-	import { NcSettingsSection } from '@nextcloud/vue'
 	import '../assets/scss/markdown.scss'
 	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../stores/appSettings.ts'
diff --git a/src/views/Administration.vue b/src/views/Administration.vue
index 9894ced38..beecfc3e7 100644
--- a/src/views/Administration.vue
+++ b/src/views/Administration.vue
@@ -6,7 +6,13 @@
 <script setup lang="ts">
 	import { computed, onMounted, ref } from 'vue'
 	import { showError } from '@nextcloud/dialogs'
-	import { NcActions, NcActionButton, NcAppContent, NcButton, NcEmptyContent, NcLoadingIcon, NcModal } from '@nextcloud/vue'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+	import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
+	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { sortBy } from 'lodash'
 	import { HeaderBar } from '../components/Base/index.js'
 	import { PollsAppIcon } from '../components/AppIcons/index.js'
@@ -18,7 +24,6 @@
 	import { t } from '@nextcloud/l10n'
 	import { usePollsAdminStore } from '../stores/pollsAdmin.ts'
 	import { SortType, Poll, StatusResults } from '../Types/index.ts'
-	import { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const pollsAdminStore = usePollsAdminStore()
 
diff --git a/src/views/Combo.vue b/src/views/Combo.vue
index 1066775f7..616570aea 100644
--- a/src/views/Combo.vue
+++ b/src/views/Combo.vue
@@ -5,7 +5,8 @@
 
 <script setup lang="ts">
 	import { ref, onMounted } from 'vue'
-	import { NcAppContent, NcEmptyContent } from '@nextcloud/vue'
+	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import ComboTable from '../components/Combo/ComboTable.vue'
 	import { ActionToggleSidebar } from '../components/Actions/index.js'
 	import { HeaderBar } from '../components/Base/index.js'
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 711023008..9d2ce3ac8 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -8,7 +8,7 @@
 	import { showError } from '@nextcloud/dialogs'
 	import { t } from '@nextcloud/l10n'
 	import { generateUrl } from '@nextcloud/router'
-	import { NcDashboardWidget } from '@nextcloud/vue'
+	import NcDashboardWidget from '@nextcloud/vue/dist/Components/NcDashboardWidget.js'
 	import { usePollsStore } from '../stores/polls.ts'
 	import { PollType } from '../Types/index.ts'
 	import { Logger } from '../helpers/index.ts'
diff --git a/src/views/Navigation.vue b/src/views/Navigation.vue
index 2620164f5..c9e7bcb61 100644
--- a/src/views/Navigation.vue
+++ b/src/views/Navigation.vue
@@ -5,7 +5,10 @@
 
 <script setup>
 	import { ref, computed, onMounted } from 'vue'
-	import { NcAppNavigation, NcAppNavigationNew, NcAppNavigationItem, NcCounterBubble } from '@nextcloud/vue'
+	import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
+	import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew.js'
+	import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
+	import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
 	import { getCurrentUser } from '@nextcloud/auth'
 	import { showError } from '@nextcloud/dialogs'
 	import { emit } from '@nextcloud/event-bus'
diff --git a/src/views/NotFound.vue b/src/views/NotFound.vue
index ba96016db..a1645e1af 100644
--- a/src/views/NotFound.vue
+++ b/src/views/NotFound.vue
@@ -4,7 +4,8 @@
 -->
 
 <script setup>
-	import { NcAppContent, NcEmptyContent } from '@nextcloud/vue'
+	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import SearchIcon from 'vue-material-design-icons/Magnify.vue'
 	import { t } from '@nextcloud/l10n'
 
diff --git a/src/views/PollList.vue b/src/views/PollList.vue
index e35a74c60..3eb7f7e03 100644
--- a/src/views/PollList.vue
+++ b/src/views/PollList.vue
@@ -7,7 +7,12 @@
 	import { computed, onMounted, watch } from 'vue'
 	import { showError } from '@nextcloud/dialogs'
 	import { Logger } from '../helpers/index.ts'
-	import { NcActions, NcActionButton, NcAppContent, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
+	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+	import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
+	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+
 	import { HeaderBar, IntersectionObserver } from '../components/Base/index.js'
 	import DeletePollIcon from 'vue-material-design-icons/Delete.vue'
 	import ClonePollIcon from 'vue-material-design-icons/ContentCopy.vue'
diff --git a/src/views/SideBar.vue b/src/views/SideBar.vue
index ee5135992..93203f6cc 100644
--- a/src/views/SideBar.vue
+++ b/src/views/SideBar.vue
@@ -5,7 +5,8 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, onUnmounted } from 'vue'
-	import { NcAppSidebar, NcAppSidebarTab } from '@nextcloud/vue'
+	import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
+	import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
 	import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 	import SidebarConfigurationIcon from 'vue-material-design-icons/Wrench.vue'
 	import SidebarOptionsIcon from 'vue-material-design-icons/FormatListChecks.vue'
diff --git a/src/views/SideBarCombo.vue b/src/views/SideBarCombo.vue
index 63eefa12a..272637a7f 100644
--- a/src/views/SideBarCombo.vue
+++ b/src/views/SideBarCombo.vue
@@ -4,7 +4,8 @@
 -->
 
 <script setup lang="ts">
-	import { NcAppSidebar, NcAppSidebarTab } from '@nextcloud/vue'
+	import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
+	import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
 	import { emit } from '@nextcloud/event-bus'
 	import { PollsAppIcon } from '../components/AppIcons/index.js'
 	import { SideBarTabDatePolls } from '../components/SideBar/index.js'
diff --git a/src/views/UserSettingsPage.vue b/src/views/UserSettingsPage.vue
index d48c13b36..3ba3cd4d3 100644
--- a/src/views/UserSettingsPage.vue
+++ b/src/views/UserSettingsPage.vue
@@ -6,7 +6,7 @@
 <script setup lang="ts">
 
 	import { onMounted } from 'vue'
-	import { NcSettingsSection } from '@nextcloud/vue'
+	import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
 	import { FlexSettings } from '../components/Base/index.js'
 	import { CalendarSettings, FeatureSettings, StyleSettings, PerformanceSettings } from '../components/Settings/UserSettings/index.js'
 	import { t } from '@nextcloud/l10n'
diff --git a/src/views/Vote.vue b/src/views/Vote.vue
index 94cbd294c..34369cad4 100644
--- a/src/views/Vote.vue
+++ b/src/views/Vote.vue
@@ -5,7 +5,8 @@
 
 <script setup lang="ts">
 	import { ref, computed, onMounted, onUnmounted } from 'vue'
-	import { NcAppContent, NcEmptyContent } from '@nextcloud/vue'
+	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 	import { t } from '@nextcloud/l10n'
 

From 26f578d9f48ad47136260aaa99c3b87f32f85409 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 7 Oct 2024 15:22:27 +0200
Subject: [PATCH 6/7] sorting imports

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/App.vue                                   | 18 +++++----
 .../Actions/modules/ActionChangeView.vue      |  7 +++-
 .../Actions/modules/ActionDelete.vue          |  4 +-
 .../modules/ActionDeleteOrphanedVotes.vue     |  4 +-
 .../modules/ActionOpenOptionsSidebar.vue      |  3 +-
 .../modules/ActionOpenSharesSidebar.vue       |  3 +-
 .../Actions/modules/ActionRegister.vue        |  8 ++--
 .../Actions/modules/ActionSendConfirmed.vue   |  5 ++-
 .../Actions/modules/ActionSortOptions.vue     |  7 +++-
 .../Actions/modules/ActionSwitchSafeTable.vue |  3 +-
 .../Actions/modules/ActionToggleSidebar.vue   |  6 ++-
 src/components/Activity/ActivityItem.vue      |  2 +
 src/components/Base/modules/RadioGroupDiv.vue |  1 +
 src/components/Calendar/CalendarPeek.vue      |  9 +++--
 .../Configuration/ConfigAllowComment.vue      |  3 +-
 .../Configuration/ConfigAllowMayBe.vue        |  3 +-
 .../Configuration/ConfigAnonymous.vue         |  3 +-
 .../Configuration/ConfigAutoReminder.vue      |  4 +-
 .../Configuration/ConfigClosing.vue           |  5 ++-
 .../Configuration/ConfigOptionLimit.vue       |  5 ++-
 .../Configuration/ConfigProposals.vue         |  4 +-
 src/components/Configuration/ConfigUseNo.vue  |  4 +-
 .../Configuration/ConfigVoteLimit.vue         |  5 ++-
 src/components/Create/CreateDlg.vue           |  8 +++-
 src/components/Export/ExportPoll.vue          | 17 +++++----
 .../Navigation/PollNavigationItems.vue        |  9 +++--
 src/components/Options/OptionCloneDate.vue    |  4 +-
 src/components/Options/OptionsDate.vue        | 19 +++++-----
 src/components/Options/OptionsDateAdd.vue     |  7 ++--
 src/components/Options/OptionsDateShift.vue   |  5 ++-
 src/components/Options/OptionsText.vue        | 16 ++++----
 src/components/Options/OptionsTextAddBulk.vue |  4 +-
 src/components/Poll/PollHeaderButtons.vue     | 11 +++---
 src/components/Poll/PollInformation.vue       | 16 ++++----
 src/components/Public/PublicRegisterModal.vue |  4 +-
 .../AdminSettings/AdminActivities.vue         |  4 +-
 .../AdminSettings/AdminArchivePolls.vue       |  4 +-
 .../Settings/AdminSettings/AdminCombo.vue     |  4 +-
 .../Settings/AdminSettings/AdminEmail.vue     |  4 +-
 .../Settings/AdminSettings/AdminJobs.vue      |  6 ++-
 .../AdminSettings/AdminPollCreation.vue       |  4 +-
 .../AdminSettings/AdminPollDownload.vue       |  4 +-
 .../AdminSettings/AdminPollsInNavigation.vue  |  4 +-
 .../AdminSettings/AdminShareOpenPoll.vue      |  5 ++-
 .../AdminSettings/AdminSharePublicCreate.vue  |  4 +-
 .../AdminSharePublicShowLogin.vue             |  5 ++-
 .../AdminSettings/AdminShowMailAddresses.vue  |  4 +-
 .../UserSettings/CalendarSettings.vue         |  4 +-
 .../Settings/UserSettings/FeatureSettings.vue |  4 +-
 .../Settings/UserSettings/StyleSettings.vue   |  4 +-
 src/components/Settings/UserSettingsDlg.vue   |  6 ++-
 src/components/Shares/ShareItem.vue           | 11 +++---
 src/components/Shares/ShareItemAllUsers.vue   |  6 ++-
 src/components/Shares/SharePublicAdd.vue      |  7 +++-
 src/components/Shares/SharesList.vue          | 12 +++---
 src/components/Shares/SharesListUnsent.vue    |  6 ++-
 src/components/SideBar/SideBarTabActivity.vue |  9 +++--
 src/components/SideBar/SideBarTabComments.vue | 10 +++--
 .../SideBar/SideBarTabConfiguration.vue       | 37 ++++++++++---------
 .../Subscription/ActionSubscription.vue       |  4 +-
 src/components/Subscription/Subscription.vue  |  4 +-
 .../User/ActionInputDisplayName.vue           |  8 ++--
 .../User/ActionInputEmailAddress.vue          |  8 ++--
 src/components/User/UserItem.vue              |  4 +-
 src/components/User/UserMenu.vue              | 22 +++++------
 src/components/User/UserSearch.vue            |  4 +-
 src/components/VoteTable/VoteColumn.vue       | 13 ++++---
 src/views/AdminSettingsPage.vue               | 10 +++--
 src/views/Administration.vue                  | 11 ++++--
 src/views/Combo.vue                           |  6 ++-
 src/views/Dashboard.vue                       | 10 +++--
 src/views/Navigation.vue                      | 20 +++++-----
 src/views/NotFound.vue                        |  4 +-
 src/views/PollList.vue                        | 10 +++--
 src/views/SideBar.vue                         |  7 +++-
 src/views/SideBarCombo.vue                    |  6 ++-
 src/views/UserSettingsPage.vue                |  4 +-
 src/views/Vote.vue                            | 25 ++++++-------
 78 files changed, 364 insertions(+), 220 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index bbfa03bd8..05100c64c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,20 +5,24 @@
 
 <script setup lang="ts">
 	import { ref, computed, onMounted, onUnmounted } from 'vue'
-	import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
+	import { debounce } from 'lodash'
 	import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+
+	import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
+
+	import UserSettingsDlg from './components/Settings/UserSettingsDlg.vue'
+	import LoadingOverlay from './components/Base/modules/LoadingOverlay.vue'
+
+	import { useSessionStore } from './stores/session.ts'
+	import { usePollStore } from './stores/poll.ts'
+	import { showSuccess } from '@nextcloud/dialogs'
+
 	import '@nextcloud/dialogs/style.css'
 	import './assets/scss/colors.scss'
 	import './assets/scss/hacks.scss'
 	import './assets/scss/print.scss'
 	import './assets/scss/transitions.scss'
 	import './assets/scss/markdown.scss'
-	import UserSettingsDlg from './components/Settings/UserSettingsDlg.vue'
-	import LoadingOverlay from './components/Base/modules/LoadingOverlay.vue'
-	import { useSessionStore } from './stores/session.ts'
-	import { usePollStore } from './stores/poll.ts'
-	import { showSuccess } from '@nextcloud/dialogs'
-	import { debounce } from 'lodash'
 
 	const sessionStore = useSessionStore()
 	const pollStore = usePollStore()
diff --git a/src/components/Actions/modules/ActionChangeView.vue b/src/components/Actions/modules/ActionChangeView.vue
index 59fa4c920..e4e4c4ea1 100644
--- a/src/components/Actions/modules/ActionChangeView.vue
+++ b/src/components/Actions/modules/ActionChangeView.vue
@@ -5,11 +5,14 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { emit } from '@nextcloud/event-bus'
+	import { t } from '@nextcloud/l10n'
+
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	import ListViewIcon from 'vue-material-design-icons/ViewListOutline.vue' // view-sequential-outline
 	import TableViewIcon from 'vue-material-design-icons/Table.vue' // view-comfy-outline
-	import { t } from '@nextcloud/l10n'
+
 	import { usePollStore, PollType, } from '../../../stores/poll.ts'
 	import { usePreferencesStore, ViewMode } from '../../../stores/preferences.ts'
 
diff --git a/src/components/Actions/modules/ActionDelete.vue b/src/components/Actions/modules/ActionDelete.vue
index 1f4cdc33e..71c423040 100644
--- a/src/components/Actions/modules/ActionDelete.vue
+++ b/src/components/Actions/modules/ActionDelete.vue
@@ -5,12 +5,14 @@
 
 <script setup lang="ts">
 	import { ref, computed } from 'vue'
+	import { t, n } from '@nextcloud/l10n'
+
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 	import RestoreIcon from 'vue-material-design-icons/Recycle.vue'
 	import LockIcon from 'vue-material-design-icons/Lock.vue'
 	import UndoIcon from 'vue-material-design-icons/ArrowULeftTop.vue'
-	import { t, n } from '@nextcloud/l10n'
 
 	const props = defineProps({
 		timeout: {
diff --git a/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue b/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue
index f7012fe86..2bda60306 100644
--- a/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue
+++ b/src/components/Actions/modules/ActionDeleteOrphanedVotes.vue
@@ -4,8 +4,10 @@
 -->
 
 <script setup lang="ts">
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { t } from '@nextcloud/l10n'
+
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	import { useVotesStore } from '../../../stores/votes.ts'
 
 	const votesStore = useVotesStore()
diff --git a/src/components/Actions/modules/ActionOpenOptionsSidebar.vue b/src/components/Actions/modules/ActionOpenOptionsSidebar.vue
index c2ea25a7b..15e86da09 100644
--- a/src/components/Actions/modules/ActionOpenOptionsSidebar.vue
+++ b/src/components/Actions/modules/ActionOpenOptionsSidebar.vue
@@ -4,10 +4,11 @@
 -->
 
 <script setup lang="ts">
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { emit } from '@nextcloud/event-bus'
 	import { t } from '@nextcloud/l10n'
 
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	const caption = t('polls', 'Add some!')
 
 	function clickAction() {
diff --git a/src/components/Actions/modules/ActionOpenSharesSidebar.vue b/src/components/Actions/modules/ActionOpenSharesSidebar.vue
index b43218801..a52539900 100644
--- a/src/components/Actions/modules/ActionOpenSharesSidebar.vue
+++ b/src/components/Actions/modules/ActionOpenSharesSidebar.vue
@@ -4,9 +4,10 @@
 -->
 
 <script setup lang="ts">
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { emit } from '@nextcloud/event-bus'
 	import { t } from '@nextcloud/l10n'
+	
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const caption = t('polls', 'Edit access')
 
diff --git a/src/components/Actions/modules/ActionRegister.vue b/src/components/Actions/modules/ActionRegister.vue
index f7a5ba29c..5fe7dc74f 100644
--- a/src/components/Actions/modules/ActionRegister.vue
+++ b/src/components/Actions/modules/ActionRegister.vue
@@ -4,13 +4,13 @@
 -->
 
 <script setup lang="ts">
-	// '@nextcloud/vue/dist/Components/.js'
-	// /dist/Components/.js
 	import { ref } from 'vue'
-	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+	import { t } from '@nextcloud/l10n'
+
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+
 	import PublicRegisterModal from '../../Public/PublicRegisterModal.vue'
-	import { t } from '@nextcloud/l10n'
 
 	const caption = t('polls', 'Register')
 	const showRegistration = ref(false)
diff --git a/src/components/Actions/modules/ActionSendConfirmed.vue b/src/components/Actions/modules/ActionSendConfirmed.vue
index a0da56df0..760b5b89a 100644
--- a/src/components/Actions/modules/ActionSendConfirmed.vue
+++ b/src/components/Actions/modules/ActionSendConfirmed.vue
@@ -6,12 +6,15 @@
 <script setup lang="ts">
 	import { useRoute } from 'vue-router'
 	import { ref } from 'vue'
+	import { t, n } from '@nextcloud/l10n'
+
 	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	import EmailCheckIcon from 'vue-material-design-icons/EmailCheck.vue' // view-comfy-outline
+
 	import { PollsAPI } from '../../../Api/index.js'
 	import { Logger } from '../../../helpers/index.ts'
-	import { t, n } from '@nextcloud/l10n'
 	import { StatusResults } from '../../../Types/index.ts'
 
 	const route = useRoute()
diff --git a/src/components/Actions/modules/ActionSortOptions.vue b/src/components/Actions/modules/ActionSortOptions.vue
index ed477e42a..2dd6967d6 100644
--- a/src/components/Actions/modules/ActionSortOptions.vue
+++ b/src/components/Actions/modules/ActionSortOptions.vue
@@ -5,13 +5,16 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
+	import { t } from '@nextcloud/l10n'
+
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	import SortByOriginalOrderIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
 	import SortByRankIcon from 'vue-material-design-icons/FormatListNumbered.vue'
 	import SortByDateOptionIcon from 'vue-material-design-icons/SortClockAscendingOutline.vue'
-	import { t } from '@nextcloud/l10n'
+
 	import { useOptionsStore } from '../../../stores/options.ts'
 	import { usePollStore, PollType } from '../../../stores/poll.ts'
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const pollStore = usePollStore()
 	const optionsStore = useOptionsStore()
diff --git a/src/components/Actions/modules/ActionSwitchSafeTable.vue b/src/components/Actions/modules/ActionSwitchSafeTable.vue
index 400d02036..fe110b190 100644
--- a/src/components/Actions/modules/ActionSwitchSafeTable.vue
+++ b/src/components/Actions/modules/ActionSwitchSafeTable.vue
@@ -4,10 +4,11 @@
 -->
 
 <script setup lang="ts">
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../../stores/poll.ts'
 
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	const pollStore = usePollStore()
 	const caption = t('polls', 'Reveal them')
 
diff --git a/src/components/Actions/modules/ActionToggleSidebar.vue b/src/components/Actions/modules/ActionToggleSidebar.vue
index 1b02acbe4..ae93ea64d 100644
--- a/src/components/Actions/modules/ActionToggleSidebar.vue
+++ b/src/components/Actions/modules/ActionToggleSidebar.vue
@@ -4,11 +4,13 @@
 -->
 
 <script setup lang="ts">
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { emit } from '@nextcloud/event-bus'
-	import SidebarIcon from 'vue-material-design-icons/TextAccount.vue' // view-comfy-outline
 	import { t } from '@nextcloud/l10n'
 
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+	
+	import SidebarIcon from 'vue-material-design-icons/TextAccount.vue' // view-comfy-outline
+
 	const caption = t('polls', 'Toggle Sidebar')
 	function clickAction() {
 		emit('polls:sidebar:toggle', null)
diff --git a/src/components/Activity/ActivityItem.vue b/src/components/Activity/ActivityItem.vue
index ec75d00ba..dd7364ae4 100644
--- a/src/components/Activity/ActivityItem.vue
+++ b/src/components/Activity/ActivityItem.vue
@@ -6,8 +6,10 @@
 <script setup lang="ts">
 	import { computed } from 'vue'
 	import moment from '@nextcloud/moment'
+
 	import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
 	import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js'
+
 	import { GuestBubble, SimpleLink } from '../../helpers/index.ts'
 
 	const props = defineProps({
diff --git a/src/components/Base/modules/RadioGroupDiv.vue b/src/components/Base/modules/RadioGroupDiv.vue
index fb337f010..2f8d70749 100644
--- a/src/components/Base/modules/RadioGroupDiv.vue
+++ b/src/components/Base/modules/RadioGroupDiv.vue
@@ -5,6 +5,7 @@
 
 <script setup lang="ts">
 	import { computed, PropType } from 'vue'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 
 	export type CheckboxOption = {
diff --git a/src/components/Calendar/CalendarPeek.vue b/src/components/Calendar/CalendarPeek.vue
index 4df914cb7..cf7fa67b7 100644
--- a/src/components/Calendar/CalendarPeek.vue
+++ b/src/components/Calendar/CalendarPeek.vue
@@ -6,14 +6,17 @@
 <script setup lang="ts">
 
 	import { computed, onMounted, ref, PropType } from 'vue'
+	import { t } from '@nextcloud/l10n'
 	import orderBy from 'lodash/orderBy'
-	import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
 	import moment from '@nextcloud/moment'
+
+	import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
+
+	import { usePollStore } from '../../stores/poll.ts'
+
 	import CalendarInfo from './CalendarInfo.vue'
 	import { CalendarAPI } from '../../Api/index.js'
 	import { Logger } from '../../helpers/index.ts'
-	import { t } from '@nextcloud/l10n'
-	import { usePollStore } from '../../stores/poll.ts'
 	import { Option } from '../../Types/index.ts'
 
 	const pollStore = usePollStore()
diff --git a/src/components/Configuration/ConfigAllowComment.vue b/src/components/Configuration/ConfigAllowComment.vue
index 37770a316..796c3ac5c 100644
--- a/src/components/Configuration/ConfigAllowComment.vue
+++ b/src/components/Configuration/ConfigAllowComment.vue
@@ -4,10 +4,11 @@
 -->
 
 <script setup lang="ts">
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
 
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	const pollStore = usePollStore()
 </script>
 
diff --git a/src/components/Configuration/ConfigAllowMayBe.vue b/src/components/Configuration/ConfigAllowMayBe.vue
index fa4267b1f..e64ab129c 100644
--- a/src/components/Configuration/ConfigAllowMayBe.vue
+++ b/src/components/Configuration/ConfigAllowMayBe.vue
@@ -4,10 +4,11 @@
 -->
 
 <script setup lang="ts">
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
 
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	const pollStore = usePollStore()
 	const label = t('polls', 'Allow "Maybe" vote')
 </script>
diff --git a/src/components/Configuration/ConfigAnonymous.vue b/src/components/Configuration/ConfigAnonymous.vue
index 2f3829810..230261c2f 100644
--- a/src/components/Configuration/ConfigAnonymous.vue
+++ b/src/components/Configuration/ConfigAnonymous.vue
@@ -4,9 +4,10 @@
 -->
 
 <script setup lang="ts">
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
+	
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 
 	const pollStore = usePollStore()
 </script>
diff --git a/src/components/Configuration/ConfigAutoReminder.vue b/src/components/Configuration/ConfigAutoReminder.vue
index ba51d3f31..aa037648c 100644
--- a/src/components/Configuration/ConfigAutoReminder.vue
+++ b/src/components/Configuration/ConfigAutoReminder.vue
@@ -4,6 +4,8 @@
 -->
 
 <script setup lang="ts">
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
@@ -11,7 +13,7 @@
 
 	import InformationIcon from 'vue-material-design-icons/InformationVariant.vue'
 	import AutoReminderInformation from './AutoReminderInformation.vue'
-	import { t } from '@nextcloud/l10n'
+
 	import { usePollStore } from '../../stores/poll.ts'
 
 	const pollStore = usePollStore()
diff --git a/src/components/Configuration/ConfigClosing.vue b/src/components/Configuration/ConfigClosing.vue
index fce87d3ba..b5f818f9c 100644
--- a/src/components/Configuration/ConfigClosing.vue
+++ b/src/components/Configuration/ConfigClosing.vue
@@ -6,12 +6,15 @@
 <script setup lang="ts">
 	import { computed } from 'vue'
 	import moment from '@nextcloud/moment'
+	import { t } from '@nextcloud/l10n'
+
 	import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 	import NcDateTimePicker from '@nextcloud/vue/dist/Components/NcDateTimePicker.js'
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import OpenPollIcon from 'vue-material-design-icons/LockOpenVariant.vue'
 	import ClosePollIcon from 'vue-material-design-icons/Lock.vue'
-	import { t } from '@nextcloud/l10n'
+
 	import { usePollStore } from '../../stores/poll.ts'
 
 	const pollStore = usePollStore()
diff --git a/src/components/Configuration/ConfigOptionLimit.vue b/src/components/Configuration/ConfigOptionLimit.vue
index 410af6b54..5be104f5c 100644
--- a/src/components/Configuration/ConfigOptionLimit.vue
+++ b/src/components/Configuration/ConfigOptionLimit.vue
@@ -5,9 +5,12 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { InputDiv } from '../Base/index.js'
-	import { t } from '@nextcloud/l10n'
+
 	import { usePollStore } from '../../stores/poll.ts'
 
 	const pollStore = usePollStore()
diff --git a/src/components/Configuration/ConfigProposals.vue b/src/components/Configuration/ConfigProposals.vue
index 454ad792a..0e2ee116f 100644
--- a/src/components/Configuration/ConfigProposals.vue
+++ b/src/components/Configuration/ConfigProposals.vue
@@ -6,9 +6,11 @@
 <script setup lang="ts">
 	import { computed } from 'vue'
 	import moment from '@nextcloud/moment'
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcDateTimePicker from '@nextcloud/vue/dist/Components/NcDateTimePicker.js'
-	import { t } from '@nextcloud/l10n'
+
 	import { usePollStore, AllowProposals } from '../../stores/poll.ts'
 
 	const pollStore = usePollStore()
diff --git a/src/components/Configuration/ConfigUseNo.vue b/src/components/Configuration/ConfigUseNo.vue
index 7017feef8..165f2600e 100644
--- a/src/components/Configuration/ConfigUseNo.vue
+++ b/src/components/Configuration/ConfigUseNo.vue
@@ -4,8 +4,10 @@
 -->
 
 <script setup lang="ts">
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
+	
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	
 	import { usePollStore } from '../../stores/poll.ts'
 
 	const pollStore = usePollStore()
diff --git a/src/components/Configuration/ConfigVoteLimit.vue b/src/components/Configuration/ConfigVoteLimit.vue
index 86743d67b..b3ad9bdf0 100644
--- a/src/components/Configuration/ConfigVoteLimit.vue
+++ b/src/components/Configuration/ConfigVoteLimit.vue
@@ -5,9 +5,12 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { InputDiv } from '../Base/index.js'
-	import { t } from '@nextcloud/l10n'
+
 	import { usePollStore } from '../../stores/poll.ts'
 	import { useOptionsStore } from '../../stores/options.ts'
 
diff --git a/src/components/Create/CreateDlg.vue b/src/components/Create/CreateDlg.vue
index 6a0cea3b4..e1f74cfe5 100644
--- a/src/components/Create/CreateDlg.vue
+++ b/src/components/Create/CreateDlg.vue
@@ -7,11 +7,15 @@
 	import { ref, computed } from 'vue'
 	import { useRouter } from 'vue-router'
 	import { showSuccess, showError } from '@nextcloud/dialogs'
+	import { t } from '@nextcloud/l10n'
+
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
-	import { ConfigBox, RadioGroupDiv, InputDiv } from '../Base/index.js'
+
 	import SpeakerIcon from 'vue-material-design-icons/Bullhorn.vue'
 	import CheckIcon from 'vue-material-design-icons/Check.vue'
-	import { t } from '@nextcloud/l10n'
+
+	import { ConfigBox, RadioGroupDiv, InputDiv } from '../Base/index.js'
+
 	import { usePollStore, PollType } from '../../stores/poll.ts'
 
 	const pollStore = usePollStore()
diff --git a/src/components/Export/ExportPoll.vue b/src/components/Export/ExportPoll.vue
index 8fa7d3915..dd3c03bf6 100644
--- a/src/components/Export/ExportPoll.vue
+++ b/src/components/Export/ExportPoll.vue
@@ -7,18 +7,13 @@
 	import { ref, computed } from 'vue'
 	import { useRoute } from 'vue-router'
 	import { utils as xlsxUtils, write as xlsxWrite } from 'xlsx'
-	import { saveAs } from 'file-saver'
 	import DOMPurify from 'dompurify'
+	import { saveAs } from 'file-saver'
 	import { t } from '@nextcloud/l10n'
+	import { showError } from '@nextcloud/dialogs'
+	
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-	import { showError } from '@nextcloud/dialogs'
-
-	import { usePollStore, PollType } from '../../stores/poll.ts'
-	import { useVotesStore } from '../../stores/votes.ts'
-	import { useOptionsStore } from '../../stores/options.ts'
-
-	import { PollsAPI } from '../../Api/index.js'
 
 	import ExcelIcon from 'vue-material-design-icons/MicrosoftExcel.vue'
 	import FileTableIcon from 'vue-material-design-icons/FileTableOutline.vue'
@@ -26,6 +21,12 @@
 	import XmlIcon from 'vue-material-design-icons/Xml.vue'
 	import ExportIcon from 'vue-material-design-icons/FileDownloadOutline.vue'
 
+	import { PollsAPI } from '../../Api/index.js'
+	import { usePollStore, PollType } from '../../stores/poll.ts'
+	import { useVotesStore } from '../../stores/votes.ts'
+	import { useOptionsStore } from '../../stores/options.ts'
+
+
 	const route = useRoute()
 	const pollStore = usePollStore()
 	const votesStore = useVotesStore()
diff --git a/src/components/Navigation/PollNavigationItems.vue b/src/components/Navigation/PollNavigationItems.vue
index 2f49b73b5..7378f3ab1 100644
--- a/src/components/Navigation/PollNavigationItems.vue
+++ b/src/components/Navigation/PollNavigationItems.vue
@@ -5,12 +5,10 @@
 
 <script setup lang="ts">
 	import { PropType } from 'vue'
-	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-	import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
 	import { t } from '@nextcloud/l10n'
 
-	import { useSessionStore } from '../../stores/session.ts'
-	import { Poll, PollType } from '../../Types/index.ts'
+	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+	import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
 
 	import DeletePollIcon from 'vue-material-design-icons/Delete.vue'
 	import ClonePollIcon from 'vue-material-design-icons/ContentCopy.vue'
@@ -19,6 +17,9 @@
 	import TextPollIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
 	import DatePollIcon from 'vue-material-design-icons/CalendarBlank.vue'
 
+	import { useSessionStore } from '../../stores/session.ts'
+	import { Poll, PollType } from '../../Types/index.ts'
+
 	const sessionStore = useSessionStore()
 
 	const emit = defineEmits(['clonePoll', 'toggleArchive', 'deletePoll'])
diff --git a/src/components/Options/OptionCloneDate.vue b/src/components/Options/OptionCloneDate.vue
index 872002901..db2d0e432 100644
--- a/src/components/Options/OptionCloneDate.vue
+++ b/src/components/Options/OptionCloneDate.vue
@@ -6,10 +6,12 @@
 <script setup lang="ts">
 	import { computed, ref, PropType } from 'vue'
 	import moment from '@nextcloud/moment'
+	import { t } from '@nextcloud/l10n'
+
 	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	import { InputDiv } from '../Base/index.js'
-	import { t } from '@nextcloud/l10n'
 	import { useOptionsStore, Option, Sequence } from '../../stores/options.ts'
 	import { dateUnits, DateUnitValue } from '../../constants/dateUnits.ts'
 
diff --git a/src/components/Options/OptionsDate.vue b/src/components/Options/OptionsDate.vue
index 4594e12e4..0d8fecfa2 100644
--- a/src/components/Options/OptionsDate.vue
+++ b/src/components/Options/OptionsDate.vue
@@ -5,20 +5,12 @@
 
 <script setup lang="ts">
 	import { ref } from 'vue'
+	import { t } from '@nextcloud/l10n'
+
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
-	import { t } from '@nextcloud/l10n'
-
-	import OptionCloneDate from './OptionCloneDate.vue'
-	import OptionItem from './OptionItem.vue'
-	import OptionItemOwner from './OptionItemOwner.vue'
-
-	import { usePollStore, PollType } from '../../stores/poll.ts'
-	import { useOptionsStore, Option } from '../../stores/options.ts'
-
-	import { BoxType } from '../../Types/index.ts'
 
 	import CloneDateIcon from 'vue-material-design-icons/CalendarMultiple.vue'
 	import DatePollIcon from 'vue-material-design-icons/CalendarBlank.vue'
@@ -27,6 +19,13 @@
 	import ConfirmIcon from 'vue-material-design-icons/CheckboxBlankOutline.vue'
 	import UnconfirmIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
 
+	import OptionCloneDate from './OptionCloneDate.vue'
+	import OptionItem from './OptionItem.vue'
+	import OptionItemOwner from './OptionItemOwner.vue'
+	import { usePollStore, PollType } from '../../stores/poll.ts'
+	import { useOptionsStore, Option } from '../../stores/options.ts'
+	import { BoxType } from '../../Types/index.ts'
+
 	const pollStore = usePollStore()
 	const optionsStore = useOptionsStore()
 
diff --git a/src/components/Options/OptionsDateAdd.vue b/src/components/Options/OptionsDateAdd.vue
index 54431aeda..2e716f574 100644
--- a/src/components/Options/OptionsDateAdd.vue
+++ b/src/components/Options/OptionsDateAdd.vue
@@ -8,15 +8,16 @@
 	import { showError, showSuccess } from '@nextcloud/dialogs'
 	import { t } from '@nextcloud/l10n'
 	import moment from '@nextcloud/moment'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcDateTimePicker from '@nextcloud/vue/dist/Components/NcDateTimePicker.js'
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
-	import { useOptionsStore } from '../../stores/options.ts'
-
-	import { FlexSpacer } from '../Base/index.js'
 	import AddDateIcon from 'vue-material-design-icons/CalendarPlus.vue'
 	import CheckIcon from 'vue-material-design-icons/Check.vue'
+	
+	import { FlexSpacer } from '../Base/index.js'
+	import { useOptionsStore } from '../../stores/options.ts'
 
 	const optionsStore = useOptionsStore()
 	const props = defineProps({
diff --git a/src/components/Options/OptionsDateShift.vue b/src/components/Options/OptionsDateShift.vue
index 7e6039bad..f190e013a 100644
--- a/src/components/Options/OptionsDateShift.vue
+++ b/src/components/Options/OptionsDateShift.vue
@@ -6,15 +6,16 @@
 <script setup lang="ts">
 	import { ref } from 'vue'
 	import { t } from '@nextcloud/l10n'
+
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 
+	import SubmitIcon from 'vue-material-design-icons/ArrowRight.vue'
+
 	import { InputDiv } from '../Base/index.js'
 	import { dateUnits, DateUnitValue } from '../../constants/dateUnits.ts'
 	import { useOptionsStore, Shift } from '../../stores/options.ts'
 
-	import SubmitIcon from 'vue-material-design-icons/ArrowRight.vue'
-
 	const optionsStore = useOptionsStore()
 
 	const shift = ref<Shift>({
diff --git a/src/components/Options/OptionsText.vue b/src/components/Options/OptionsText.vue
index da110f513..9d24ec71b 100644
--- a/src/components/Options/OptionsText.vue
+++ b/src/components/Options/OptionsText.vue
@@ -5,17 +5,11 @@
 
 <script setup lang="ts">
 	import { t } from '@nextcloud/l10n'
+	import { Sortable } from "sortablejs-vue3"
+
 	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-	import { Sortable } from "sortablejs-vue3"
-
-	import OptionItem from './OptionItem.vue'
-	import OptionItemOwner from '../Options/OptionItemOwner.vue'
-	import OptionsTextAdd from './OptionsTextAdd.vue'
-
-	import { usePollStore } from '../../stores/poll.ts'
-	import { useOptionsStore } from '../../stores/options.ts'
 
 	import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 	import RestoreIcon from 'vue-material-design-icons/Recycle.vue'
@@ -23,6 +17,12 @@
 	import ConfirmIcon from 'vue-material-design-icons/CheckboxBlankOutline.vue'
 	import UnconfirmIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
 
+	import OptionItem from './OptionItem.vue'
+	import OptionItemOwner from '../Options/OptionItemOwner.vue'
+	import OptionsTextAdd from './OptionsTextAdd.vue'
+	import { usePollStore } from '../../stores/poll.ts'
+	import { useOptionsStore } from '../../stores/options.ts'
+
 	const pollStore = usePollStore()
 	const optionsStore = useOptionsStore()
 
diff --git a/src/components/Options/OptionsTextAddBulk.vue b/src/components/Options/OptionsTextAddBulk.vue
index 6187e9878..78b2c9051 100644
--- a/src/components/Options/OptionsTextAddBulk.vue
+++ b/src/components/Options/OptionsTextAddBulk.vue
@@ -7,14 +7,16 @@
 	import { ref } from 'vue'
 	import { showError, showSuccess } from '@nextcloud/dialogs'
 	import { t } from '@nextcloud/l10n'
+
 	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
+	import PasteIcon from 'vue-material-design-icons/ClipboardTextMultiple.vue'
+
 	import { useOptionsStore } from '../../stores/options.ts'
 
-	import PasteIcon from 'vue-material-design-icons/ClipboardTextMultiple.vue'
 
 	const optionsStore = useOptionsStore()
 
diff --git a/src/components/Poll/PollHeaderButtons.vue b/src/components/Poll/PollHeaderButtons.vue
index f2a772750..f8d5595e1 100644
--- a/src/components/Poll/PollHeaderButtons.vue
+++ b/src/components/Poll/PollHeaderButtons.vue
@@ -6,19 +6,20 @@
 <script setup lang="ts">
 	import { computed, onBeforeUnmount } from 'vue'
 	import { useRoute } from 'vue-router'
-	import { usePollStore } from '../../stores/poll.ts'
-	import { useSessionStore } from '../../stores/session.ts'
-
+	import { t } from '@nextcloud/l10n'
+	
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
-	import { t } from '@nextcloud/l10n'
 
+	import PollInformationIcon from 'vue-material-design-icons/InformationOutline.vue'
+	
 	import { ActionToggleSidebar } from '../Actions/index.js'
 	import PollInformation from '../Poll/PollInformation.vue'
 	import UserMenu from '../User/UserMenu.vue'
 	import ExportPoll from '../Export/ExportPoll.vue'
+	import { usePollStore } from '../../stores/poll.ts'
+	import { useSessionStore } from '../../stores/session.ts'
 
-	import PollInformationIcon from 'vue-material-design-icons/InformationOutline.vue'
 
 	const route = useRoute()
 	const pollStore = usePollStore()
diff --git a/src/components/Poll/PollInformation.vue b/src/components/Poll/PollInformation.vue
index bd47c4990..cafa35fde 100644
--- a/src/components/Poll/PollInformation.vue
+++ b/src/components/Poll/PollInformation.vue
@@ -7,14 +7,8 @@
 	import { computed } from 'vue'
 	import moment from '@nextcloud/moment'
 	import { t, n } from '@nextcloud/l10n'
-	import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
 
-	import { BadgeDiv } from '../Base/index.js'
-	import { useSessionStore } from '../../stores/session.ts'
-	import { usePollStore, AccessType } from '../../stores/poll.ts'
-	import { useSubscriptionStore } from '../../stores/subscription.ts'
-	import { useOptionsStore } from '../../stores/options.ts'
-	import { useVotesStore, Answer } from '../../stores/votes.ts'
+	import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble.js'
 
 	import OwnerIcon from 'vue-material-design-icons/Crown.vue'
 	import SubscribedIcon from 'vue-material-design-icons/Bell.vue'
@@ -33,8 +27,16 @@
 	import CheckIcon from 'vue-material-design-icons/Check.vue'
 	import CloseIcon from 'vue-material-design-icons/Close.vue'
 	import EmailIcon from 'vue-material-design-icons/Email.vue'
+
 	import { MaybeIcon } from '../AppIcons/index.js'
 
+	import { BadgeDiv } from '../Base/index.js'
+	import { useSessionStore } from '../../stores/session.ts'
+	import { usePollStore, AccessType } from '../../stores/poll.ts'
+	import { useSubscriptionStore } from '../../stores/subscription.ts'
+	import { useOptionsStore } from '../../stores/options.ts'
+	import { useVotesStore, Answer } from '../../stores/votes.ts'
+
 	const pollStore = usePollStore()
 	const sessionStore = useSessionStore()
 	const subscriptionStore = useSubscriptionStore()
diff --git a/src/components/Public/PublicRegisterModal.vue b/src/components/Public/PublicRegisterModal.vue
index a76c9c0cc..c760bdb57 100644
--- a/src/components/Public/PublicRegisterModal.vue
+++ b/src/components/Public/PublicRegisterModal.vue
@@ -9,13 +9,15 @@
 	import { debounce } from 'lodash'
 	import { showError } from '@nextcloud/dialogs'
 	import { generateUrl } from '@nextcloud/router'
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js'
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
 	import { InputDiv } from '../Base/index.js'
 	import { SimpleLink, setCookie } from '../../helpers/index.ts'
 	import { ValidatorAPI, PublicAPI } from '../../Api/index.js'
-	import { t } from '@nextcloud/l10n'
 	import { SignalingType, ShareType } from '../../Types'
 	import { useSessionStore } from '../../stores/session.ts'
 	import { usePollStore } from '../../stores/poll.ts'
diff --git a/src/components/Settings/AdminSettings/AdminActivities.vue b/src/components/Settings/AdminSettings/AdminActivities.vue
index ca755fa4f..d23c80ab2 100644
--- a/src/components/Settings/AdminSettings/AdminActivities.vue
+++ b/src/components/Settings/AdminSettings/AdminActivities.vue
@@ -4,8 +4,10 @@
 -->
 
 <script setup>
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
+
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminArchivePolls.vue b/src/components/Settings/AdminSettings/AdminArchivePolls.vue
index c0ca6fb57..84f270df3 100644
--- a/src/components/Settings/AdminSettings/AdminArchivePolls.vue
+++ b/src/components/Settings/AdminSettings/AdminArchivePolls.vue
@@ -4,9 +4,11 @@
 -->
 
 <script setup>
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { InputDiv } from '../../Base/index.js'
 	import { t } from '@nextcloud/l10n'
+	
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+	
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminCombo.vue b/src/components/Settings/AdminSettings/AdminCombo.vue
index 49756ab3c..c9b9b76a4 100644
--- a/src/components/Settings/AdminSettings/AdminCombo.vue
+++ b/src/components/Settings/AdminSettings/AdminCombo.vue
@@ -4,9 +4,11 @@
 -->
 
 <script setup>
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
-	import { t } from '@nextcloud/l10n'
+
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminEmail.vue b/src/components/Settings/AdminSettings/AdminEmail.vue
index 1b076d095..cd29a9901 100644
--- a/src/components/Settings/AdminSettings/AdminEmail.vue
+++ b/src/components/Settings/AdminSettings/AdminEmail.vue
@@ -5,12 +5,14 @@
 
 <script setup>
 	import { computed, ref } from 'vue'
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { marked } from 'marked'
 	import { gfmHeadingId } from 'marked-gfm-heading-id'
 	import DOMPurify from 'dompurify'
 	import LanguageMarkdownIcon from 'vue-material-design-icons/LanguageMarkdown.vue'
 	import { t } from '@nextcloud/l10n'
+
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminJobs.vue b/src/components/Settings/AdminSettings/AdminJobs.vue
index 7ce7eda23..6616dcc40 100644
--- a/src/components/Settings/AdminSettings/AdminJobs.vue
+++ b/src/components/Settings/AdminSettings/AdminJobs.vue
@@ -4,11 +4,13 @@
 -->
 
 <script setup>
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
-	import { AdminAPI } from '../../../Api/index.js'
 	import { Logger } from '../../../helpers/index.ts'
 	import { t } from '@nextcloud/l10n'
 
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+
+	import { AdminAPI } from '../../../Api/index.js'
+
 	const autoreminder = {
 		text: t('polls', 'Run autoreminder'),
 		disabled: false,
diff --git a/src/components/Settings/AdminSettings/AdminPollCreation.vue b/src/components/Settings/AdminSettings/AdminPollCreation.vue
index 97506b2c0..3d81cfdcf 100644
--- a/src/components/Settings/AdminSettings/AdminPollCreation.vue
+++ b/src/components/Settings/AdminSettings/AdminPollCreation.vue
@@ -4,9 +4,11 @@
 -->
 
 <script setup>
+	import { t } from '@nextcloud/l10n'
+	
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
-	import { t } from '@nextcloud/l10n'
+
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminPollDownload.vue b/src/components/Settings/AdminSettings/AdminPollDownload.vue
index 1dc69f154..76a14011f 100644
--- a/src/components/Settings/AdminSettings/AdminPollDownload.vue
+++ b/src/components/Settings/AdminSettings/AdminPollDownload.vue
@@ -4,9 +4,11 @@
 -->
 
 <script setup>
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
-	import { t } from '@nextcloud/l10n'
+
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue b/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue
index 22f992d1f..28356ee9d 100644
--- a/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue
+++ b/src/components/Settings/AdminSettings/AdminPollsInNavigation.vue
@@ -4,8 +4,10 @@
 -->
 
 <script setup>
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
+
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const { appSettingsStore } = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue b/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue
index b3d937fe9..ce5d8853c 100644
--- a/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue
+++ b/src/components/Settings/AdminSettings/AdminShareOpenPoll.vue
@@ -4,10 +4,11 @@
 -->
 
 <script setup>
-
+	import { t } from '@nextcloud/l10n'
+	
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
-	import { t } from '@nextcloud/l10n'
+	
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue b/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue
index 844b42555..ab8985f7d 100644
--- a/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue
+++ b/src/components/Settings/AdminSettings/AdminSharePublicCreate.vue
@@ -4,9 +4,11 @@
 -->
 
 <script setup>
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
-	import { t } from '@nextcloud/l10n'
+
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue b/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue
index eae55aabe..a58ef87de 100644
--- a/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue
+++ b/src/components/Settings/AdminSettings/AdminSharePublicShowLogin.vue
@@ -4,9 +4,12 @@
 -->
 
 <script setup>
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
+
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
+	
 	const appSettingsStore = useAppSettingsStore()
 </script>
 
diff --git a/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue b/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue
index e4b61a52c..482668dd7 100644
--- a/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue
+++ b/src/components/Settings/AdminSettings/AdminShowMailAddresses.vue
@@ -4,9 +4,11 @@
 -->
 
 <script setup>
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
-	import { t } from '@nextcloud/l10n'
+
 	import { useAppSettingsStore } from '../../../stores/appSettings.ts'
 
 	const appSettingsStore = useAppSettingsStore()
diff --git a/src/components/Settings/UserSettings/CalendarSettings.vue b/src/components/Settings/UserSettings/CalendarSettings.vue
index a030ff364..189e22d1d 100644
--- a/src/components/Settings/UserSettings/CalendarSettings.vue
+++ b/src/components/Settings/UserSettings/CalendarSettings.vue
@@ -5,9 +5,11 @@
 
 <script setup>
 	import { computed } from 'vue'
+	import { t } from '@nextcloud/l10n'
+
 	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { InputDiv } from '../../Base/index.js'
-	import { t } from '@nextcloud/l10n'
 	import { usePreferencesStore } from '../../../stores/preferences.ts'
 	const preferencesStore = usePreferencesStore()
 
diff --git a/src/components/Settings/UserSettings/FeatureSettings.vue b/src/components/Settings/UserSettings/FeatureSettings.vue
index e33313cfe..7ae1aae14 100644
--- a/src/components/Settings/UserSettings/FeatureSettings.vue
+++ b/src/components/Settings/UserSettings/FeatureSettings.vue
@@ -6,8 +6,10 @@
 <script setup>
 	import { computed } from 'vue'
 	import { InputDiv } from '../../Base/index.js'
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
+
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { usePreferencesStore, ViewMode } from '../../../stores/preferences.ts'
 
 	const preferencesStore = usePreferencesStore()
diff --git a/src/components/Settings/UserSettings/StyleSettings.vue b/src/components/Settings/UserSettings/StyleSettings.vue
index dc1b3ee9c..8900b2280 100644
--- a/src/components/Settings/UserSettings/StyleSettings.vue
+++ b/src/components/Settings/UserSettings/StyleSettings.vue
@@ -4,8 +4,10 @@
 -->
 
 <script setup>
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
+
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { usePreferencesStore } from '../../../stores/preferences.ts'
 	const preferencesStore = usePreferencesStore()
 </script>
diff --git a/src/components/Settings/UserSettingsDlg.vue b/src/components/Settings/UserSettingsDlg.vue
index 20269ec63..efdd51862 100644
--- a/src/components/Settings/UserSettingsDlg.vue
+++ b/src/components/Settings/UserSettingsDlg.vue
@@ -4,11 +4,13 @@
 -->
 <script setup>
 	import { ref, onMounted, onUnmounted } from 'vue'
+	import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+	import { t } from '@nextcloud/l10n'
+
 	import NcAppSettingsDialog from '@nextcloud/vue/dist/Components/NcAppSettingsDialog.js'
 	import NcAppSettingsSection from '@nextcloud/vue/dist/Components/NcAppSettingsSection.js'
-	import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+
 	import { CalendarSettings, FeatureSettings, StyleSettings, PerformanceSettings } from './UserSettings/index.js'
-	import { t } from '@nextcloud/l10n'
 	import { usePreferencesStore } from '../../stores/preferences.ts'
 
 	const preferencesStore = usePreferencesStore()
diff --git a/src/components/Shares/ShareItem.vue b/src/components/Shares/ShareItem.vue
index 851e62f99..b64a0cba9 100644
--- a/src/components/Shares/ShareItem.vue
+++ b/src/components/Shares/ShareItem.vue
@@ -7,17 +7,13 @@
 	import { ref, computed, onMounted, PropType } from 'vue'
 	import { showSuccess, showError } from '@nextcloud/dialogs'
 	import { t } from '@nextcloud/l10n'
+
 	import NcActionCaption from '@nextcloud/vue/dist/Components/NcActionCaption.js'
 	import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
 	import NcActionRadio from '@nextcloud/vue/dist/Components/NcActionRadio.js'
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 
-	import { Logger } from '../../helpers/index.ts'
-	import UserItem from '../User/UserItem.vue'
-
-	import { useSharesStore, Share, ShareType } from '../../stores/shares.ts'
-
 	import VotedIcon from 'vue-material-design-icons/CheckboxMarked.vue'
 	import UnvotedIcon from 'vue-material-design-icons/MinusBox.vue'
 	import ResolveGroupIcon from 'vue-material-design-icons/CallSplit.vue'
@@ -32,6 +28,11 @@
 	import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 	import RestoreIcon from 'vue-material-design-icons/Recycle.vue'
 
+	import { Logger } from '../../helpers/index.ts'
+	import UserItem from '../User/UserItem.vue'
+
+	import { useSharesStore, Share, ShareType } from '../../stores/shares.ts'
+
 	const sharesStore = useSharesStore()
 	const props = defineProps( {
 		share: {
diff --git a/src/components/Shares/ShareItemAllUsers.vue b/src/components/Shares/ShareItemAllUsers.vue
index 64ba58c7b..91157a914 100644
--- a/src/components/Shares/ShareItemAllUsers.vue
+++ b/src/components/Shares/ShareItemAllUsers.vue
@@ -5,11 +5,13 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
+
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import UserItem from '../User/UserItem.vue'
-	import { usePollStore, AccessType } from '../../stores/poll.ts'
 	import { VirtualUserItemType } from '../../Types/index.ts'
+	import { usePollStore, AccessType } from '../../stores/poll.ts'
 
 
 	const pollStore = usePollStore()
diff --git a/src/components/Shares/SharePublicAdd.vue b/src/components/Shares/SharePublicAdd.vue
index 7ef2eec6d..cf5522dce 100644
--- a/src/components/Shares/SharePublicAdd.vue
+++ b/src/components/Shares/SharePublicAdd.vue
@@ -5,13 +5,16 @@
 
 <script setup lang="ts">
 	import { showError } from '@nextcloud/dialogs'
+	import { t } from '@nextcloud/l10n'
+
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+
 	import PlusIcon from 'vue-material-design-icons/Plus.vue'
-	import { t } from '@nextcloud/l10n'
+
 	import UserItem from '../User/UserItem.vue'
-	import { useSharesStore } from '../../stores/shares.ts'
 	import { VirtualUserItemType } from '../../Types/index.ts'
+	import { useSharesStore } from '../../stores/shares.ts'
 
 	const sharesStore = useSharesStore()
 
diff --git a/src/components/Shares/SharesList.vue b/src/components/Shares/SharesList.vue
index 858605d10..0cdc2a9db 100644
--- a/src/components/Shares/SharesList.vue
+++ b/src/components/Shares/SharesList.vue
@@ -6,12 +6,10 @@
 <script setup lang="ts">
 	import { ref } from 'vue'
 	import { t } from '@nextcloud/l10n'
+
 	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 
-	import { usePollStore } from '../../stores/poll.ts'
-	import { useSharesStore } from '../../stores/shares.ts'
-	import { useSessionStore } from '../../stores/session.ts'
-	import { Share } from '../../Types/index.ts'
+	import ShareIcon from 'vue-material-design-icons/ShareVariant.vue'
 
 	import { ConfigBox, QrModal } from '../Base/index.js'
 	import ShareItem from './ShareItem.vue'
@@ -19,8 +17,10 @@
 	import SharePublicAdd from './SharePublicAdd.vue'
 	import ShareItemAllUsers from './ShareItemAllUsers.vue'
 	import MarkUpDescription from '../Poll/MarkUpDescription.vue'
-
-	import ShareIcon from 'vue-material-design-icons/ShareVariant.vue'
+	
+	import { usePollStore } from '../../stores/poll.ts'
+	import { useSharesStore, Share } from '../../stores/shares.ts'
+	import { useSessionStore } from '../../stores/session.ts'
 
 	const pollStore = usePollStore()
 	const sharesStore = useSharesStore()
diff --git a/src/components/Shares/SharesListUnsent.vue b/src/components/Shares/SharesListUnsent.vue
index e82518ca4..905ec0994 100644
--- a/src/components/Shares/SharesListUnsent.vue
+++ b/src/components/Shares/SharesListUnsent.vue
@@ -5,14 +5,16 @@
 
 <script setup lang="ts">
 	import { showSuccess, showError } from '@nextcloud/dialogs'
+	import { t } from '@nextcloud/l10n'
+	
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
-	import { ConfigBox } from '../Base/index.js'
 	import EmailAlertIcon from 'vue-material-design-icons/EmailAlert.vue'
 	import ShareItem from './ShareItem.vue'
 	import BulkMailIcon from 'vue-material-design-icons/EmailMultipleOutline.vue'
+
+	import { ConfigBox } from '../Base/index.js'
 	import { Logger } from '../../helpers/index.ts'
-	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../../stores/poll.ts'
 	import { useSharesStore } from '../../stores/shares.ts'
 
diff --git a/src/components/SideBar/SideBarTabActivity.vue b/src/components/SideBar/SideBarTabActivity.vue
index 14d5f217e..9e845762f 100644
--- a/src/components/SideBar/SideBarTabActivity.vue
+++ b/src/components/SideBar/SideBarTabActivity.vue
@@ -5,12 +5,15 @@
 
 <script setup lang="ts">
 	import { computed, onMounted, onUnmounted } from 'vue'
-	import Activities from '../Activity/Activities.vue'
+	import { t } from '@nextcloud/l10n'
+	import { subscribe, unsubscribe } from '@nextcloud/event-bus'
+
 	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+
 	import ActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
-	import { t } from '@nextcloud/l10n'
+
+	import Activities from '../Activity/Activities.vue'
 	import { useActivityStore } from '../../stores/activity.ts'
-	import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 
 	const activityStore = useActivityStore()
 	const emptyContentProps = {
diff --git a/src/components/SideBar/SideBarTabComments.vue b/src/components/SideBar/SideBarTabComments.vue
index dfa6524b2..e28a9f20c 100644
--- a/src/components/SideBar/SideBarTabComments.vue
+++ b/src/components/SideBar/SideBarTabComments.vue
@@ -5,17 +5,19 @@
 
 <script setup lang="ts">
 	import { computed, onMounted, onUnmounted } from 'vue'
-	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 	import { t } from '@nextcloud/l10n'
-
-	import { usePollStore } from '../../stores/poll.ts'
-	import { useCommentsStore } from '../../stores/comments.ts'
+	
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 
 	import CommentAdd from '../Comments/CommentAdd.vue'
 	import Comments from '../Comments/Comments.vue'
 	import CommentsIcon from 'vue-material-design-icons/CommentProcessing.vue'
 
+	import { usePollStore } from '../../stores/poll.ts'
+	import { useCommentsStore } from '../../stores/comments.ts'
+
+
 	const pollStore = usePollStore()
 	const commentsStore = useCommentsStore()
 
diff --git a/src/components/SideBar/SideBarTabConfiguration.vue b/src/components/SideBar/SideBarTabConfiguration.vue
index 7bf3e92a5..7b32e3782 100644
--- a/src/components/SideBar/SideBarTabConfiguration.vue
+++ b/src/components/SideBar/SideBarTabConfiguration.vue
@@ -5,12 +5,22 @@
 
 <script setup lang="ts">
 	import { showError } from '@nextcloud/dialogs'
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 	import { t } from '@nextcloud/l10n'
-
-	import { PollType, ShowResults, usePollStore } from '../../stores/poll.ts'
-	import { useVotesStore } from '../../stores/votes.ts'
-
+	
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+	
+	import SpeakerIcon from 'vue-material-design-icons/Bullhorn.vue'
+	import DeletePollIcon from 'vue-material-design-icons/Delete.vue'
+	import DescriptionIcon from 'vue-material-design-icons/TextBox.vue'
+	import PollConfigIcon from 'vue-material-design-icons/Wrench.vue'
+	import LockedIcon from 'vue-material-design-icons/Lock.vue'
+	import UnlockedIcon from 'vue-material-design-icons/LockOpenVariant.vue'
+	import ShowResultsIcon from 'vue-material-design-icons/Monitor.vue'
+	import HideResultsUntilClosedIcon from 'vue-material-design-icons/MonitorLock.vue'
+	import ShowResultsNeverIcon from 'vue-material-design-icons/MonitorOff.vue'
+	import RestorePollIcon from 'vue-material-design-icons/Recycle.vue'
+	import ArchivePollIcon from 'vue-material-design-icons/Archive.vue'
+	
 	import { ConfigBox, CardDiv } from '../Base/index.js'
 	import ConfigAllowComment from '../Configuration/ConfigAllowComment.vue'
 	import ConfigAllowMayBe from '../Configuration/ConfigAllowMayBe.vue'
@@ -24,21 +34,12 @@
 	import ConfigUseNo from '../Configuration/ConfigUseNo.vue'
 	import ConfigVoteLimit from '../Configuration/ConfigVoteLimit.vue'
 
-	import SpeakerIcon from 'vue-material-design-icons/Bullhorn.vue'
-	import DeletePollIcon from 'vue-material-design-icons/Delete.vue'
-	import DescriptionIcon from 'vue-material-design-icons/TextBox.vue'
-	import PollConfigIcon from 'vue-material-design-icons/Wrench.vue'
-	import LockedIcon from 'vue-material-design-icons/Lock.vue'
-	import UnlockedIcon from 'vue-material-design-icons/LockOpenVariant.vue'
-	import ShowResultsIcon from 'vue-material-design-icons/Monitor.vue'
-	import HideResultsUntilClosedIcon from 'vue-material-design-icons/MonitorLock.vue'
-	import ShowResultsNeverIcon from 'vue-material-design-icons/MonitorOff.vue'
-	import RestorePollIcon from 'vue-material-design-icons/Recycle.vue'
-	import ArchivePollIcon from 'vue-material-design-icons/Archive.vue'
-
+	import { usePollStore, PollType, ShowResults } from '../../stores/poll.ts'
+	import { useVotesStore } from '../../stores/votes.ts'
+	
 	const pollStore = usePollStore()
 	const votesStore = useVotesStore()
-
+	
 	/**
 	 *
 	 */
diff --git a/src/components/Subscription/ActionSubscription.vue b/src/components/Subscription/ActionSubscription.vue
index 6b67095f5..9bcc09b81 100644
--- a/src/components/Subscription/ActionSubscription.vue
+++ b/src/components/Subscription/ActionSubscription.vue
@@ -5,9 +5,11 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
+	import { t } from '@nextcloud/l10n'
+
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
-	import { t } from '@nextcloud/l10n'
+
 	import { useSubscriptionStore } from '../../stores/subscription.ts'
 	import { useSessionStore } from '../../stores/session.ts'
 
diff --git a/src/components/Subscription/Subscription.vue b/src/components/Subscription/Subscription.vue
index 8645ba6c7..43cc5cb6a 100644
--- a/src/components/Subscription/Subscription.vue
+++ b/src/components/Subscription/Subscription.vue
@@ -5,8 +5,10 @@
 
 <script setup lang="ts">
 	import { computed } from 'vue'
-	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 	import { t } from '@nextcloud/l10n'
+
+	import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+
 	import { useSubscriptionStore } from '../../stores/subscription.ts'
 	import { useSessionStore } from '../../stores/session.ts'
 
diff --git a/src/components/User/ActionInputDisplayName.vue b/src/components/User/ActionInputDisplayName.vue
index e1943b765..6b1c33772 100644
--- a/src/components/User/ActionInputDisplayName.vue
+++ b/src/components/User/ActionInputDisplayName.vue
@@ -4,15 +4,17 @@
 -->
 
 <script setup lang="ts">
+	import { ref } from 'vue'
 	import { debounce } from 'lodash'
 	import { showSuccess, showError } from '@nextcloud/dialogs'
+	import { t } from '@nextcloud/l10n'
+
 	import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
 	import EditAccountIcon from 'vue-material-design-icons/AccountEdit.vue'
+
 	import { ValidatorAPI } from '../../Api/index.js'
-	import { t } from '@nextcloud/l10n'
-	import { useSessionStore } from '../../stores/session.ts'
-	import { ref } from 'vue'
 	import { StatusResults } from '../../Types/index.ts'
+	import { useSessionStore } from '../../stores/session.ts'
 
 	type InputProps = {
 		success: boolean
diff --git a/src/components/User/ActionInputEmailAddress.vue b/src/components/User/ActionInputEmailAddress.vue
index 839c19342..925aeefbf 100644
--- a/src/components/User/ActionInputEmailAddress.vue
+++ b/src/components/User/ActionInputEmailAddress.vue
@@ -4,15 +4,17 @@
 -->
 
 <script setup lang="ts">
+	import { ref } from 'vue'
 	import { debounce } from 'lodash'
 	import { showSuccess, showError } from '@nextcloud/dialogs'
+	import { t } from '@nextcloud/l10n'
+
 	import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
 	import EditEmailIcon from 'vue-material-design-icons/EmailEditOutline.vue'
+
 	import { ValidatorAPI } from '../../Api/index.js'
-	import { t } from '@nextcloud/l10n'
-	import { useSessionStore } from '../../stores/session.ts'
-	import { ref } from 'vue'
 	import { StatusResults } from '../../Types/index.ts'
+	import { useSessionStore } from '../../stores/session.ts'
 
 	type InputProps = {
 		success: boolean
diff --git a/src/components/User/UserItem.vue b/src/components/User/UserItem.vue
index faee29ec7..15a6ed2ae 100644
--- a/src/components/User/UserItem.vue
+++ b/src/components/User/UserItem.vue
@@ -7,6 +7,8 @@
 	import { computed, type PropType } from 'vue'
 	import { useRoute } from 'vue-router'
 	import { getCurrentUser } from '@nextcloud/auth'
+	import { t } from '@nextcloud/l10n'
+
 	import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
 	import AdminIcon from 'vue-material-design-icons/ShieldCrown.vue'
 	import LinkIcon from 'vue-material-design-icons/LinkVariant.vue'
@@ -18,7 +20,7 @@
 	import CircleIcon from 'vue-material-design-icons/GoogleCirclesExtended.vue'
 	import DeletedUserIcon from 'vue-material-design-icons/AccountOff.vue'
 	import AnoymousIcon from 'vue-material-design-icons/Incognito.vue'
-	import { t } from '@nextcloud/l10n'
+
 	import { User, UserType, VirtualUserItemType } from '../../Types/index.ts'
 
 	const route = useRoute()
diff --git a/src/components/User/UserMenu.vue b/src/components/User/UserMenu.vue
index db21d94b4..180db52fa 100644
--- a/src/components/User/UserMenu.vue
+++ b/src/components/User/UserMenu.vue
@@ -7,14 +7,23 @@
 	import { ref } from 'vue'
 	import { useRouter } from 'vue-router'
 	import { debounce } from 'lodash'
-
 	import { showSuccess, showError } from '@nextcloud/dialogs'
+	import { t } from '@nextcloud/l10n'
+
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 	import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
 	import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput.js'
 	import NcActionSeparator from '@nextcloud/vue/dist/Components/NcActionSeparator.js'
-	import { t } from '@nextcloud/l10n'
+
+	import SettingsIcon from 'vue-material-design-icons/Cog.vue'
+	import SendLinkPerEmailIcon from 'vue-material-design-icons/LinkVariant.vue'
+	import DeleteIcon from 'vue-material-design-icons/Delete.vue'
+	import ClippyIcon from 'vue-material-design-icons/ClipboardArrowLeftOutline.vue'
+	import ResetVotesIcon from 'vue-material-design-icons/Undo.vue'
+	import EditAccountIcon from 'vue-material-design-icons/AccountEdit.vue'
+	import LogoutIcon from 'vue-material-design-icons/Logout.vue'
+	import EditEmailIcon from 'vue-material-design-icons/EmailEditOutline.vue'
 
 	import { PollsAPI, ValidatorAPI } from '../../Api/index.js'
 	import { usePollStore } from '../../stores/poll.ts'
@@ -26,15 +35,6 @@
 
 	import { deleteCookieByValue, findCookieByValue } from '../../helpers/index.ts'
 
-	import SettingsIcon from 'vue-material-design-icons/Cog.vue'
-	import SendLinkPerEmailIcon from 'vue-material-design-icons/LinkVariant.vue'
-	import DeleteIcon from 'vue-material-design-icons/Delete.vue'
-	import ClippyIcon from 'vue-material-design-icons/ClipboardArrowLeftOutline.vue'
-	import ResetVotesIcon from 'vue-material-design-icons/Undo.vue'
-	import EditAccountIcon from 'vue-material-design-icons/AccountEdit.vue'
-	import LogoutIcon from 'vue-material-design-icons/Logout.vue'
-	import EditEmailIcon from 'vue-material-design-icons/EmailEditOutline.vue'
-
 	type InputProps = {
 		success: boolean
 		error: boolean
diff --git a/src/components/User/UserSearch.vue b/src/components/User/UserSearch.vue
index 59e2adb84..7c8d7e23a 100644
--- a/src/components/User/UserSearch.vue
+++ b/src/components/User/UserSearch.vue
@@ -7,10 +7,12 @@
 	import { ref } from 'vue'
 	import { debounce } from 'lodash'
 	import { showError } from '@nextcloud/dialogs'
+	import { t } from '@nextcloud/l10n'
+
 	import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
+
 	import { AppSettingsAPI } from '../../Api/index.js'
 	import { Logger } from '../../helpers/index.ts'
-	import { t } from '@nextcloud/l10n'
 	import { useSharesStore } from '../../stores/shares.ts'
 
 	const sharesStore = useSharesStore()
diff --git a/src/components/VoteTable/VoteColumn.vue b/src/components/VoteTable/VoteColumn.vue
index e6c2da636..6c3c14ca2 100644
--- a/src/components/VoteTable/VoteColumn.vue
+++ b/src/components/VoteTable/VoteColumn.vue
@@ -5,20 +5,23 @@
 
 <script setup lang="ts">
 	import { computed, PropType } from 'vue'
+	import { t } from '@nextcloud/l10n'
+	import { getCurrentUser } from '@nextcloud/auth'
+	
+	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
+	
+	import UnconfirmIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
+	import ConfirmIcon from 'vue-material-design-icons/CheckboxBlankOutline.vue'
+
 	import Counter from '../Options/Counter.vue'
 	import OptionItem from '../Options/OptionItem.vue'
 	import VoteItem from './VoteItem.vue'
-	import UnconfirmIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
-	import ConfirmIcon from 'vue-material-design-icons/CheckboxBlankOutline.vue'
 	import CalendarPeek from '../Calendar/CalendarPeek.vue'
 	import OptionItemOwner from '../Options/OptionItemOwner.vue'
-	import { t } from '@nextcloud/l10n'
-	import { getCurrentUser } from '@nextcloud/auth'
 	import { usePollStore, PollType } from '../../stores/poll.ts'
 	import { usePreferencesStore } from '../../stores/preferences.ts'
 	import { useOptionsStore, Option } from '../../stores/options.ts'
 	import { BoxType } from '../../Types/index.ts'
-	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
 
 	const pollStore = usePollStore()
 	const preferencesStore = usePreferencesStore()
diff --git a/src/views/AdminSettingsPage.vue b/src/views/AdminSettingsPage.vue
index d4ed62f19..ffaf071f2 100644
--- a/src/views/AdminSettingsPage.vue
+++ b/src/views/AdminSettingsPage.vue
@@ -5,17 +5,19 @@
 
 <script setup>
 	import { onMounted } from 'vue'
+	import { t } from '@nextcloud/l10n'
+
+	import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
+
+	import { FlexSettings } from '../components/Base/index.js'
 	import {
 		AdminActivities, AdminArchivePolls, AdminCombo, AdminEmail, AdminJobs, AdminLegal, 
 		AdminPerformance, AdminPollCreation, AdminPollDownload, AdminPollsInNavigation,
 		AdminShareOpenPoll, AdminSharePublicCreate, AdminSharePublicShowLogin,
 		AdminShowMailAddresses
 	} from '../components/Settings/AdminSettings/index.js'
-	import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
-	import { FlexSettings } from '../components/Base/index.js'
-	import '../assets/scss/markdown.scss'
-	import { t } from '@nextcloud/l10n'
 	import { useAppSettingsStore } from '../stores/appSettings.ts'
+	import '../assets/scss/markdown.scss'
 
 	const appSettingsStore = useAppSettingsStore()
 
diff --git a/src/views/Administration.vue b/src/views/Administration.vue
index beecfc3e7..bea778a57 100644
--- a/src/views/Administration.vue
+++ b/src/views/Administration.vue
@@ -5,7 +5,10 @@
 
 <script setup lang="ts">
 	import { computed, onMounted, ref } from 'vue'
+	import { sortBy } from 'lodash'
 	import { showError } from '@nextcloud/dialogs'
+	import { t } from '@nextcloud/l10n'
+
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
@@ -13,15 +16,15 @@
 	import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 	import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 	import NcButton, { ButtonType } from '@nextcloud/vue/dist/Components/NcButton.js'
-	import { sortBy } from 'lodash'
-	import { HeaderBar } from '../components/Base/index.js'
-	import { PollsAppIcon } from '../components/AppIcons/index.js'
+
 	import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 	import ArchivePollIcon from 'vue-material-design-icons/Archive.vue'
 	import RestorePollIcon from 'vue-material-design-icons/Recycle.vue'
 	import PlusIcon from 'vue-material-design-icons/Plus.vue'
+
 	import PollItem from '../components/PollList/PollItem.vue'
-	import { t } from '@nextcloud/l10n'
+	import { HeaderBar } from '../components/Base/index.js'
+	import { PollsAppIcon } from '../components/AppIcons/index.js'
 	import { usePollsAdminStore } from '../stores/pollsAdmin.ts'
 	import { SortType, Poll, StatusResults } from '../Types/index.ts'
 
diff --git a/src/views/Combo.vue b/src/views/Combo.vue
index 616570aea..7147dcf5a 100644
--- a/src/views/Combo.vue
+++ b/src/views/Combo.vue
@@ -5,14 +5,16 @@
 
 <script setup lang="ts">
 	import { ref, onMounted } from 'vue'
+	import { t } from '@nextcloud/l10n'
+
 	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
 	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+
 	import ComboTable from '../components/Combo/ComboTable.vue'
+	import LoadingOverlay from '../components/Base/modules/LoadingOverlay.vue'
 	import { ActionToggleSidebar } from '../components/Actions/index.js'
 	import { HeaderBar } from '../components/Base/index.js'
 	import { PollsAppIcon } from '../components/AppIcons/index.js'
-	import LoadingOverlay from '../components/Base/modules/LoadingOverlay.vue'
-	import { t } from '@nextcloud/l10n'
 	import { useComboStore } from '../stores/combo.ts'
 
 	const comboStore = useComboStore()
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 9d2ce3ac8..b8c95b439 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -5,17 +5,19 @@
 
 <script setup>
 	import { onMounted } from 'vue'
+	import { generateUrl } from '@nextcloud/router'
 	import { showError } from '@nextcloud/dialogs'
 	import { t } from '@nextcloud/l10n'
-	import { generateUrl } from '@nextcloud/router'
+
 	import NcDashboardWidget from '@nextcloud/vue/dist/Components/NcDashboardWidget.js'
-	import { usePollsStore } from '../stores/polls.ts'
-	import { PollType } from '../Types/index.ts'
-	import { Logger } from '../helpers/index.ts'
 
 	import TextPollIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
 	import DatePollIcon from 'vue-material-design-icons/CalendarBlank.vue'
+
 	import { PollsAppIcon } from '../components/AppIcons/index.js'
+	import { Logger } from '../helpers/index.ts'
+	import { usePollsStore } from '../stores/polls.ts'
+	import { PollType } from '../Types/index.ts'
 
 	const dashboardWidgetProperties = {
 		emptyContentMessage: t('polls', 'No polls found for this category'),
diff --git a/src/views/Navigation.vue b/src/views/Navigation.vue
index c9e7bcb61..e7403d17e 100644
--- a/src/views/Navigation.vue
+++ b/src/views/Navigation.vue
@@ -5,19 +5,15 @@
 
 <script setup>
 	import { ref, computed, onMounted } from 'vue'
-	import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
-	import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew.js'
-	import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
-	import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
 	import { getCurrentUser } from '@nextcloud/auth'
 	import { showError } from '@nextcloud/dialogs'
 	import { emit } from '@nextcloud/event-bus'
-	import CreateDlg from '../components/Create/CreateDlg.vue'
 	import { t } from '@nextcloud/l10n'
-	import { FilterType, usePollsStore } from '../stores/polls.ts'
-	import { useSessionStore } from '../stores/session.ts'
-	import { usePollsAdminStore } from '../stores/pollsAdmin.ts'
-	import { Logger } from '../helpers/index.ts'
+
+	import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
+	import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew.js'
+	import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
+	import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
 
 	// Icons
 	import PollNavigationItems from '../components/Navigation/PollNavigationItems.vue'
@@ -34,6 +30,12 @@
 	import ArchivedPollsIcon from 'vue-material-design-icons/Archive.vue'
 	import GoToIcon from 'vue-material-design-icons/ArrowRight.vue'
 
+	import { Logger } from '../helpers/index.ts'
+	import CreateDlg from '../components/Create/CreateDlg.vue'
+	import { FilterType, usePollsStore } from '../stores/polls.ts'
+	import { usePollsAdminStore } from '../stores/pollsAdmin.ts'
+	import { useSessionStore } from '../stores/session.ts'
+
 	const iconSize = 20
 	const icons = [
 		{ id: FilterType.Relevant, iconComponent: RelevantIcon },
diff --git a/src/views/NotFound.vue b/src/views/NotFound.vue
index a1645e1af..a9c30e2ca 100644
--- a/src/views/NotFound.vue
+++ b/src/views/NotFound.vue
@@ -4,10 +4,12 @@
 -->
 
 <script setup>
+	import { t } from '@nextcloud/l10n'
+
 	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
 	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+	
 	import SearchIcon from 'vue-material-design-icons/Magnify.vue'
-	import { t } from '@nextcloud/l10n'
 
 	const emptyContentProps = {
 		name: t('polls', '404 - poll not found'),
diff --git a/src/views/PollList.vue b/src/views/PollList.vue
index 3eb7f7e03..e66103abc 100644
--- a/src/views/PollList.vue
+++ b/src/views/PollList.vue
@@ -5,25 +5,27 @@
 
 <script setup lang="ts">
 	import { computed, onMounted, watch } from 'vue'
+	import { useRouter, useRoute } from 'vue-router'
 	import { showError } from '@nextcloud/dialogs'
-	import { Logger } from '../helpers/index.ts'
+	import { t, n } from '@nextcloud/l10n'
+	
 	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
 	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import NcLoadingIcon from '@nextcloud/vue/dist/Components/NcLoadingIcon.js'
 	import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 	import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 
-	import { HeaderBar, IntersectionObserver } from '../components/Base/index.js'
 	import DeletePollIcon from 'vue-material-design-icons/Delete.vue'
 	import ClonePollIcon from 'vue-material-design-icons/ContentCopy.vue'
 	import ArchivePollIcon from 'vue-material-design-icons/Archive.vue'
 	import RestorePollIcon from 'vue-material-design-icons/Recycle.vue'
+
+	import { Logger } from '../helpers/index.ts'
+	import { HeaderBar, IntersectionObserver } from '../components/Base/index.js'
 	import { PollsAppIcon } from '../components/AppIcons/index.js'
 	import PollItem from '../components/PollList/PollItem.vue'
-	import { t, n } from '@nextcloud/l10n'
 	import { usePollsStore } from '../stores/polls.ts'
 	import { useSessionStore } from '../stores/session.ts'
-	import { useRouter, useRoute } from 'vue-router'
 
 	const pollsStore = usePollsStore()
 	const sessionStore = useSessionStore()
diff --git a/src/views/SideBar.vue b/src/views/SideBar.vue
index 93203f6cc..96f52bdda 100644
--- a/src/views/SideBar.vue
+++ b/src/views/SideBar.vue
@@ -5,16 +5,19 @@
 
 <script setup lang="ts">
 	import { ref, onMounted, onUnmounted } from 'vue'
+	import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
+	import { t } from '@nextcloud/l10n'
+
 	import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
 	import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
-	import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
+
 	import SidebarConfigurationIcon from 'vue-material-design-icons/Wrench.vue'
 	import SidebarOptionsIcon from 'vue-material-design-icons/FormatListChecks.vue'
 	import SidebarShareIcon from 'vue-material-design-icons/ShareVariant.vue'
 	import SidebarCommentsIcon from 'vue-material-design-icons/CommentProcessing.vue'
 	import SidebarActivityIcon from 'vue-material-design-icons/LightningBolt.vue'
+
 	import { SideBarTabConfiguration, SideBarTabComments, SideBarTabOptions, SideBarTabShare, SideBarTabActivity } from '../components/SideBar/index.js'
-	import { t } from '@nextcloud/l10n'
 	import { usePollStore } from '../stores/poll.ts'
 	import { useSessionStore } from '../stores/session.ts'
 
diff --git a/src/views/SideBarCombo.vue b/src/views/SideBarCombo.vue
index 272637a7f..554feeb70 100644
--- a/src/views/SideBarCombo.vue
+++ b/src/views/SideBarCombo.vue
@@ -4,12 +4,14 @@
 -->
 
 <script setup lang="ts">
+	import { emit } from '@nextcloud/event-bus'
+	import { t } from '@nextcloud/l10n'
+
 	import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
 	import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
-	import { emit } from '@nextcloud/event-bus'
+
 	import { PollsAppIcon } from '../components/AppIcons/index.js'
 	import { SideBarTabDatePolls } from '../components/SideBar/index.js'
-	import { t } from '@nextcloud/l10n'
 
 	function closeSideBar() {
 		emit('polls:sidebar:toggle', { open: false })
diff --git a/src/views/UserSettingsPage.vue b/src/views/UserSettingsPage.vue
index 3ba3cd4d3..8268a6bb9 100644
--- a/src/views/UserSettingsPage.vue
+++ b/src/views/UserSettingsPage.vue
@@ -6,10 +6,12 @@
 <script setup lang="ts">
 
 	import { onMounted } from 'vue'
+	import { t } from '@nextcloud/l10n'
+
 	import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
+
 	import { FlexSettings } from '../components/Base/index.js'
 	import { CalendarSettings, FeatureSettings, StyleSettings, PerformanceSettings } from '../components/Settings/UserSettings/index.js'
-	import { t } from '@nextcloud/l10n'
 	import { usePreferencesStore } from '../stores/preferences.ts'
 
 	const preferencesStore = usePreferencesStore()
diff --git a/src/views/Vote.vue b/src/views/Vote.vue
index 34369cad4..df04830aa 100644
--- a/src/views/Vote.vue
+++ b/src/views/Vote.vue
@@ -5,30 +5,29 @@
 
 <script setup lang="ts">
 	import { ref, computed, onMounted, onUnmounted } from 'vue'
-	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
-	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 	import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 	import { t } from '@nextcloud/l10n'
+	
+	import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
+	import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 
-	import { usePollStore, PollType } from '../stores/poll.ts'
-	import { useOptionsStore } from '../stores/options.ts'
-	import { usePreferencesStore } from '../stores/preferences.ts'
-
+	import DatePollIcon from 'vue-material-design-icons/CalendarBlank.vue'
+	import TextPollIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
+	
 	import { useHandleScroll } from '../composables/handleScroll.ts'
-
-	import { ActionOpenOptionsSidebar } from '../components/Actions/index.js'
-	import { HeaderBar } from '../components/Base/index.js'
-	import { CardAnonymousPollHint, CardHiddenParticipants } from '../components/Cards/index.js'
 	import MarkUpDescription from '../components/Poll/MarkUpDescription.vue'
 	import PollInfoLine from '../components/Poll/PollInfoLine.vue'
 	import PollHeaderButtons from '../components/Poll/PollHeaderButtons.vue'
 	import LoadingOverlay from '../components/Base/modules/LoadingOverlay.vue'
 	import VoteTable from '../components/VoteTable/VoteTable.vue'
 	import VoteInfoCards from '../components/Cards/VoteInfoCards.vue'
+	import { ActionOpenOptionsSidebar } from '../components/Actions/index.js'
+	import { HeaderBar } from '../components/Base/index.js'
+	import { CardAnonymousPollHint, CardHiddenParticipants } from '../components/Cards/index.js'
 
-	import DatePollIcon from 'vue-material-design-icons/CalendarBlank.vue'
-	import TextPollIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
-
+	import { usePollStore, PollType } from '../stores/poll.ts'
+	import { useOptionsStore } from '../stores/options.ts'
+	import { usePreferencesStore } from '../stores/preferences.ts'
 	
 	const pollStore = usePollStore()
 	const optionsStore = useOptionsStore()

From 57e128b10673d5443acbd189b9de5a83070e31c0 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 7 Oct 2024 15:23:01 +0200
Subject: [PATCH 7/7] fix safeTable

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/components/Actions/modules/ActionSwitchSafeTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Actions/modules/ActionSwitchSafeTable.vue b/src/components/Actions/modules/ActionSwitchSafeTable.vue
index fe110b190..a5fa43df3 100644
--- a/src/components/Actions/modules/ActionSwitchSafeTable.vue
+++ b/src/components/Actions/modules/ActionSwitchSafeTable.vue
@@ -18,7 +18,7 @@
 	<div class="action toggle-sidebar">
 		<NcButton :type="ButtonType.Primary"
 			:aria-label="caption"
-			@click="pollStore.switchSafeTable()">
+			@click="pollStore.revealParticipants = true">
 			{{ caption }}
 		</NcButton>
 	</div>