From 981bab3fe46e09dc8adb9233d03fb46eec7627f7 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sat, 13 Sep 2025 17:33:48 +0200
Subject: [PATCH 1/9] reduce dom depth for sidebar

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/components/SideBar/SideBarTabActivity.vue |  14 +--
 src/components/SideBar/SideBarTabComments.vue |  48 ++++----
 .../SideBar/SideBarTabConfiguration.vue       | 114 +++++++++--------
 .../SideBar/SideBarTabDatePolls.vue           |  18 ++-
 src/components/SideBar/SideBarTabOptions.vue  | 116 +++++++++---------
 src/components/SideBar/SideBarTabShare.vue    |  19 +--
 .../SideBar/SideBarTabSharePollGroup.vue      |  18 +--
 7 files changed, 156 insertions(+), 191 deletions(-)

diff --git a/src/components/SideBar/SideBarTabActivity.vue b/src/components/SideBar/SideBarTabActivity.vue
index 0225d8b6bb..f2565f7520 100644
--- a/src/components/SideBar/SideBarTabActivity.vue
+++ b/src/components/SideBar/SideBarTabActivity.vue
@@ -38,12 +38,10 @@ onUnmounted(() => {
 </script>
 
 <template>
-	<div class="comments">
-		<Activities v-if="!showEmptyContent" />
-		<NcEmptyContent v-else v-bind="emptyContentProps">
-			<template #icon>
-				<ActivityIcon />
-			</template>
-		</NcEmptyContent>
-	</div>
+	<Activities v-if="!showEmptyContent" />
+	<NcEmptyContent v-else v-bind="emptyContentProps">
+		<template #icon>
+			<ActivityIcon />
+		</template>
+	</NcEmptyContent>
 </template>
diff --git a/src/components/SideBar/SideBarTabComments.vue b/src/components/SideBar/SideBarTabComments.vue
index b28abcd451..cc9d53c2d2 100644
--- a/src/components/SideBar/SideBarTabComments.vue
+++ b/src/components/SideBar/SideBarTabComments.vue
@@ -53,31 +53,27 @@ watch(
 </script>
 
 <template>
-	<div class="comments">
-		<ConfigBox
-			v-if="pollStore.permissions.edit"
-			:name="t('polls', 'Configuration')">
-			<template #icon>
-				<PollConfigIcon />
-			</template>
-			<ConfigAllowComment @change="pollStore.write" />
-			<ConfigForceConfidentialComments @change="pollStore.write" />
-			<CardDiv v-if="!pollStore.configuration.allowComment" type="warning">
-				{{
-					t(
-						'polls',
-						'Comments are disabled, except for owner and delegated poll administration.',
-					)
-				}}
-			</CardDiv>
-		</ConfigBox>
+	<ConfigBox v-if="pollStore.permissions.edit" :name="t('polls', 'Configuration')">
+		<template #icon>
+			<PollConfigIcon />
+		</template>
+		<ConfigAllowComment @change="pollStore.write" />
+		<ConfigForceConfidentialComments @change="pollStore.write" />
+		<CardDiv v-if="!pollStore.configuration.allowComment" type="warning">
+			{{
+				t(
+					'polls',
+					'Comments are disabled, except for owner and delegated poll administration.',
+				)
+			}}
+		</CardDiv>
+	</ConfigBox>
 
-		<CommentAdd v-if="pollStore.permissions.comment" />
-		<Comments v-if="!showEmptyContent" />
-		<NcEmptyContent v-else v-bind="emptyContentProps">
-			<template #icon>
-				<CommentsIcon />
-			</template>
-		</NcEmptyContent>
-	</div>
+	<CommentAdd v-if="pollStore.permissions.comment" />
+	<Comments v-if="!showEmptyContent" />
+	<NcEmptyContent v-else v-bind="emptyContentProps">
+		<template #icon>
+			<CommentsIcon />
+		</template>
+	</NcEmptyContent>
 </template>
diff --git a/src/components/SideBar/SideBarTabConfiguration.vue b/src/components/SideBar/SideBarTabConfiguration.vue
index 6820076b90..5fa005110f 100644
--- a/src/components/SideBar/SideBarTabConfiguration.vue
+++ b/src/components/SideBar/SideBarTabConfiguration.vue
@@ -38,71 +38,67 @@ const votesStore = useVotesStore()
 </script>
 
 <template>
-	<div>
-		<CardDiv v-if="!pollStore.currentUserStatus.isOwner" type="success">
-			{{ t('polls', 'You have been granted administrative rights.') }}
-		</CardDiv>
+	<CardDiv v-if="!pollStore.currentUserStatus.isOwner" type="success">
+		{{ t('polls', 'You have been granted administrative rights.') }}
+	</CardDiv>
 
-		<CardDiv v-if="votesStore.hasVotes" type="warning">
-			{{ t('polls', 'Changes may affect existing votes.') }}
-		</CardDiv>
+	<CardDiv v-if="votesStore.hasVotes" type="warning">
+		{{ t('polls', 'Changes may affect existing votes.') }}
+	</CardDiv>
 
-		<ConfigBox :name="t('polls', 'Title')">
-			<template #icon>
-				<SpeakerIcon />
-			</template>
-			<ConfigTitle @change="pollStore.write" />
-		</ConfigBox>
+	<ConfigBox :name="t('polls', 'Title')">
+		<template #icon>
+			<SpeakerIcon />
+		</template>
+		<ConfigTitle @change="pollStore.write" />
+	</ConfigBox>
 
-		<ConfigBox :name="t('polls', 'Description')">
-			<template #icon>
-				<DescriptionIcon />
-			</template>
-			<ConfigDescription @change="pollStore.write" />
-		</ConfigBox>
+	<ConfigBox :name="t('polls', 'Description')">
+		<template #icon>
+			<DescriptionIcon />
+		</template>
+		<ConfigDescription @change="pollStore.write" />
+	</ConfigBox>
 
-		<ConfigBox :name="t('polls', 'Poll configuration')">
-			<template #icon>
-				<PollConfigIcon />
-			</template>
-			<ConfigAllowMayBe @change="pollStore.write" />
-			<ConfigUseNo @change="pollStore.write" />
-			<ConfigAnonymous @change="pollStore.write" />
+	<ConfigBox :name="t('polls', 'Poll configuration')">
+		<template #icon>
+			<PollConfigIcon />
+		</template>
+		<ConfigAllowMayBe @change="pollStore.write" />
+		<ConfigUseNo @change="pollStore.write" />
+		<ConfigAnonymous @change="pollStore.write" />
 
-			<ConfigVoteLimit @change="pollStore.write" />
-			<ConfigOptionLimit @change="pollStore.write" />
-		</ConfigBox>
+		<ConfigVoteLimit @change="pollStore.write" />
+		<ConfigOptionLimit @change="pollStore.write" />
+	</ConfigBox>
 
-		<ConfigBox :name="t('polls', 'Poll closing status')">
-			<template #icon>
-				<LockedIcon v-if="pollStore.isClosed" />
-				<UnlockedIcon v-else />
-			</template>
-			<ConfigClosing @change="pollStore.write" />
-			<ConfigAutoReminder
-				v-if="
-					pollStore.type === 'datePoll' || pollStore.configuration.expire
-				"
-				@change="pollStore.write" />
-		</ConfigBox>
+	<ConfigBox :name="t('polls', 'Poll closing status')">
+		<template #icon>
+			<LockedIcon v-if="pollStore.isClosed" />
+			<UnlockedIcon v-else />
+		</template>
+		<ConfigClosing @change="pollStore.write" />
+		<ConfigAutoReminder
+			v-if="pollStore.type === 'datePoll' || pollStore.configuration.expire"
+			@change="pollStore.write" />
+	</ConfigBox>
 
-		<ConfigBox :name="t('polls', 'Result display')">
-			<template #icon>
-				<ShowResultsIcon
-					v-if="pollStore.configuration.showResults === 'always'" />
-				<HideResultsUntilClosedIcon
-					v-if="pollStore.configuration.showResults === 'closed'" />
-				<ShowResultsNeverIcon
-					v-if="pollStore.configuration.showResults === 'never'" />
-			</template>
-			<ConfigShowResults @change="pollStore.write" />
-		</ConfigBox>
+	<ConfigBox :name="t('polls', 'Result display')">
+		<template #icon>
+			<ShowResultsIcon
+				v-if="pollStore.configuration.showResults === 'always'" />
+			<HideResultsUntilClosedIcon
+				v-if="pollStore.configuration.showResults === 'closed'" />
+			<ShowResultsNeverIcon
+				v-if="pollStore.configuration.showResults === 'never'" />
+		</template>
+		<ConfigShowResults @change="pollStore.write" />
+	</ConfigBox>
 
-		<ConfigBox :name="t('polls', 'Deletion and owner')">
-			<template #icon>
-				<DeletePollIcon />
-			</template>
-			<ConfigDangerArea />
-		</ConfigBox>
-	</div>
+	<ConfigBox :name="t('polls', 'Deletion and owner')">
+		<template #icon>
+			<DeletePollIcon />
+		</template>
+		<ConfigDangerArea />
+	</ConfigBox>
 </template>
diff --git a/src/components/SideBar/SideBarTabDatePolls.vue b/src/components/SideBar/SideBarTabDatePolls.vue
index f733d869d7..4363169ecd 100644
--- a/src/components/SideBar/SideBarTabDatePolls.vue
+++ b/src/components/SideBar/SideBarTabDatePolls.vue
@@ -14,16 +14,14 @@ const comboStore = useComboStore()
 </script>
 
 <template>
-	<div class="side-bar-tab-polls">
-		<div
-			v-for="poll in pollsStore.datePolls"
-			:key="poll.id"
-			:class="['poll-item', { listed: comboStore.pollIsListed(poll.id) }]"
-			@click="comboStore.togglePollItem(poll.id)">
-			<UserItem :user="poll.owner" condensed />
-			<div class="poll-title-box">
-				{{ poll.configuration.title }}
-			</div>
+	<div
+		v-for="poll in pollsStore.datePolls"
+		:key="poll.id"
+		:class="['poll-item', { listed: comboStore.pollIsListed(poll.id) }]"
+		@click="comboStore.togglePollItem(poll.id)">
+		<UserItem :user="poll.owner" condensed />
+		<div class="poll-title-box">
+			{{ poll.configuration.title }}
 		</div>
 	</div>
 </template>
diff --git a/src/components/SideBar/SideBarTabOptions.vue b/src/components/SideBar/SideBarTabOptions.vue
index bcdf422b38..01cbe1c6af 100644
--- a/src/components/SideBar/SideBarTabOptions.vue
+++ b/src/components/SideBar/SideBarTabOptions.vue
@@ -57,67 +57,65 @@ onUnmounted(() => {
 </script>
 
 <template>
-	<div class="side-bar-tab-options">
-		<ConfigBox
-			v-if="!pollStore.currentUserStatus.isOwner"
-			v-bind="configBoxProps.delegatedAdminHint" />
-		<ConfigBox v-bind="configBoxProps.allowProposals">
-			<template #icon>
-				<AddDateIcon />
-			</template>
-			<ConfigProposals />
-		</ConfigBox>
-
-		<ConfigBox
-			v-if="
-				pollStore.type === 'datePoll'
-				&& optionsStore.options.length
-				&& !pollStore.isClosed
-			"
-			v-bind="configBoxProps.shiftDate">
-			<template #icon>
-				<ShiftDateIcon />
-			</template>
-			<OptionsDateShift />
-		</ConfigBox>
-
-		<ConfigBox
-			v-if="pollStore.type === 'datePoll'"
-			v-bind="configBoxProps.dateOptions">
-			<template #icon>
-				<DateOptionsIcon />
-			</template>
-
-			<OptionsDate />
-
-			<template v-if="!pollStore.isClosed" #actions>
-				<ActionAddOption :caption="t('polls', 'Add a date')" />
-			</template>
-		</ConfigBox>
-
-		<ConfigBox
-			v-if="pollStore.type === 'textPoll'"
-			v-bind="configBoxProps.textOptions">
+	<ConfigBox
+		v-if="!pollStore.currentUserStatus.isOwner"
+		v-bind="configBoxProps.delegatedAdminHint" />
+	<ConfigBox v-bind="configBoxProps.allowProposals">
+		<template #icon>
+			<AddDateIcon />
+		</template>
+		<ConfigProposals />
+	</ConfigBox>
+
+	<ConfigBox
+		v-if="
+			pollStore.type === 'datePoll'
+			&& optionsStore.options.length
+			&& !pollStore.isClosed
+		"
+		v-bind="configBoxProps.shiftDate">
+		<template #icon>
+			<ShiftDateIcon />
+		</template>
+		<OptionsDateShift />
+	</ConfigBox>
+
+	<ConfigBox
+		v-if="pollStore.type === 'datePoll'"
+		v-bind="configBoxProps.dateOptions">
+		<template #icon>
+			<DateOptionsIcon />
+		</template>
+
+		<OptionsDate />
+
+		<template v-if="!pollStore.isClosed" #actions>
+			<ActionAddOption :caption="t('polls', 'Add a date')" />
+		</template>
+	</ConfigBox>
+
+	<ConfigBox
+		v-if="pollStore.type === 'textPoll'"
+		v-bind="configBoxProps.textOptions">
+		<template #icon>
+			<TextOptionsIcon />
+		</template>
+
+		<OptionsTextAdd v-if="!pollStore.isClosed" />
+
+		<OptionsText v-if="optionsStore.options.length" />
+
+		<NcEmptyContent
+			v-else
+			:name="t('polls', 'No vote options')"
+			:description="t('polls', 'Add some!')">
 			<template #icon>
 				<TextOptionsIcon />
 			</template>
+		</NcEmptyContent>
 
-			<OptionsTextAdd v-if="!pollStore.isClosed" />
-
-			<OptionsText v-if="optionsStore.options.length" />
-
-			<NcEmptyContent
-				v-else
-				:name="t('polls', 'No vote options')"
-				:description="t('polls', 'Add some!')">
-				<template #icon>
-					<TextOptionsIcon />
-				</template>
-			</NcEmptyContent>
-
-			<template #actions>
-				<OptionsTextAddBulk v-if="!pollStore.isClosed" />
-			</template>
-		</ConfigBox>
-	</div>
+		<template #actions>
+			<OptionsTextAddBulk v-if="!pollStore.isClosed" />
+		</template>
+	</ConfigBox>
 </template>
diff --git a/src/components/SideBar/SideBarTabShare.vue b/src/components/SideBar/SideBarTabShare.vue
index 1771dd3da7..a319385757 100644
--- a/src/components/SideBar/SideBarTabShare.vue
+++ b/src/components/SideBar/SideBarTabShare.vue
@@ -31,23 +31,14 @@ onBeforeRouteLeave(() => {
 </script>
 
 <template>
-	<div class="sidebar-share">
-		<SharesListUnsent
-			v-if="sessionStore.appPermissions.addShares"
-			class="shares unsent" />
-		<SharesList class="shares effective" />
-		<SharesListLocked
-			v-if="sessionStore.appPermissions.addShares"
-			class="shares" />
-	</div>
+	<SharesListUnsent
+		v-if="sessionStore.appPermissions.addShares"
+		class="shares unsent" />
+	<SharesList class="shares effective" />
+	<SharesListLocked v-if="sessionStore.appPermissions.addShares" class="shares" />
 </template>
 
 <style lang="scss">
-.sidebar-share {
-	display: flex;
-	flex-direction: column;
-}
-
 .shares-list {
 	display: flex;
 	flex-flow: column;
diff --git a/src/components/SideBar/SideBarTabSharePollGroup.vue b/src/components/SideBar/SideBarTabSharePollGroup.vue
index 618ae8bed3..88f1684744 100644
--- a/src/components/SideBar/SideBarTabSharePollGroup.vue
+++ b/src/components/SideBar/SideBarTabSharePollGroup.vue
@@ -28,25 +28,13 @@ onBeforeRouteUpdate(async () => {
 </script>
 
 <template>
-	<div class="sidebar-share">
-		<div>
-			{{
-				t(
-					'polls',
-					'Shares for a poll group grant voting access to the polls contained in the poll group.',
-				)
-			}}
-		</div>
-		<SharesList class="shares effective" :info="infoText" />
+	<div>
+		{{ infoText }}
 	</div>
+	<SharesList class="shares effective" :info="infoText" />
 </template>
 
 <style lang="scss">
-.sidebar-share {
-	display: flex;
-	flex-direction: column;
-}
-
 .shares-list {
 	display: flex;
 	flex-flow: column;

From 6f05823f9d5f4fd98e0a5d603339f94079b78da0 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sat, 13 Sep 2025 17:46:53 +0200
Subject: [PATCH 2/9] don't use index.ts for imports

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/components/Actions/index.ts               | 12 ----------
 .../Actions/modules/ActionSendConfirmed.vue   |  2 +-
 src/components/Activity/ActivityItem.vue      |  3 ++-
 src/components/Base/index.ts                  | 18 ---------------
 src/components/Base/modules/InputDiv.vue      |  2 +-
 src/components/Base/modules/QrModal.vue       |  2 +-
 src/components/Calendar/CalendarPeek.vue      |  2 +-
 src/components/Public/PublicRegisterModal.vue |  3 ++-
 src/components/Shares/SharesListUnsent.vue    |  2 +-
 src/components/SideBar/index.ts               | 11 ----------
 src/components/User/UserMenu.vue              |  5 ++++-
 src/components/User/UserSearch.vue            |  2 +-
 src/components/VoteTable/VoteMenu.vue         |  5 ++++-
 src/composables/context.ts                    |  2 +-
 src/composables/usePollWatcher.ts             |  2 +-
 src/helpers/index.ts                          | 22 -------------------
 src/router.ts                                 |  3 ++-
 src/stores/appSettings.ts                     |  2 +-
 src/stores/combo.ts                           |  3 ++-
 src/stores/comments.ts                        |  3 ++-
 src/stores/options.ts                         |  2 +-
 src/stores/poll.ts                            |  4 ++--
 src/stores/pollGroups.ts                      |  2 +-
 src/stores/polls.ts                           |  2 +-
 src/stores/preferences.ts                     |  2 +-
 src/stores/session.ts                         |  2 +-
 src/stores/shares.ts                          |  2 +-
 src/stores/subscription.ts                    |  2 +-
 src/stores/votes.ts                           |  3 ++-
 src/views/Combo.vue                           |  2 +-
 src/views/Dashboard.vue                       |  2 +-
 31 files changed, 40 insertions(+), 91 deletions(-)
 delete mode 100644 src/components/Actions/index.ts
 delete mode 100644 src/components/Base/index.ts
 delete mode 100644 src/components/SideBar/index.ts
 delete mode 100644 src/helpers/index.ts

diff --git a/src/components/Actions/index.ts b/src/components/Actions/index.ts
deleted file mode 100644
index 495e321820..0000000000
--- a/src/components/Actions/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2023 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-export { default as ActionDelete } from './modules/ActionDelete.vue'
-export { default as ActionDeleteOrphanedVotes } from './modules/ActionDeleteOrphanedVotes.vue'
-export { default as ActionOpenOptionsSidebar } from './modules/ActionOpenOptionsSidebar.vue'
-export { default as ActionOpenSharesSidebar } from './modules/ActionOpenSharesSidebar.vue'
-export { default as ActionRegister } from './modules/ActionRegister.vue'
-export { default as ActionSendConfirmed } from './modules/ActionSendConfirmed.vue'
-export { default as ActionSwitchSafeTable } from './modules/ActionSwitchSafeTable.vue'
-export { default as ActionToggleSidebar } from './modules/ActionToggleSidebar.vue'
diff --git a/src/components/Actions/modules/ActionSendConfirmed.vue b/src/components/Actions/modules/ActionSendConfirmed.vue
index e8115253ac..63267d9762 100644
--- a/src/components/Actions/modules/ActionSendConfirmed.vue
+++ b/src/components/Actions/modules/ActionSendConfirmed.vue
@@ -14,7 +14,7 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 import EmailCheckIcon from 'vue-material-design-icons/EmailCheckOutline.vue' // view-comfy-outline
 
 import { PollsAPI } from '../../../Api'
-import { Logger } from '../../../helpers'
+import { Logger } from '../../../helpers/modules/logger'
 import { Confirmations } from '../../../Api/modules/polls'
 
 const route = useRoute()
diff --git a/src/components/Activity/ActivityItem.vue b/src/components/Activity/ActivityItem.vue
index dc3eab3152..6b80ceca9c 100644
--- a/src/components/Activity/ActivityItem.vue
+++ b/src/components/Activity/ActivityItem.vue
@@ -10,7 +10,8 @@ import { DateTime } from 'luxon'
 import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
 import NcRichText from '@nextcloud/vue/components/NcRichText'
 
-import { GuestBubble, SimpleLink } from '../../helpers'
+import { GuestBubble } from '../../helpers/modules/GuestBubble'
+import { SimpleLink } from '../../helpers/modules/SimpleLink'
 
 const props = defineProps({
 	activity: {
diff --git a/src/components/Base/index.ts b/src/components/Base/index.ts
deleted file mode 100644
index ca24d3f625..0000000000
--- a/src/components/Base/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2023 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-export { default as BadgeDiv } from './modules/BadgeDiv.vue'
-export { default as CardDiv } from './modules/CardDiv.vue'
-export { default as ConfigBox } from './modules/ConfigBox.vue'
-export { default as DateBox } from './modules/DateBox.vue'
-export { default as DateTimePicker } from './modules/DateTimePicker.vue'
-export { default as FlexSettings } from './modules/FlexSettings.vue'
-export { default as FlexSpacer } from './modules/FlexSpacer.vue'
-export { default as HeaderBar } from './modules/HeaderBar.vue'
-export { default as InputDiv } from './modules/InputDiv.vue'
-export { default as IntersectionObserver } from './modules/IntersectionObserver.vue'
-export { default as LoadingOverlay } from './modules/LoadingOverlay.vue'
-export { default as QrModal } from './modules/QrModal.vue'
-export { default as RadioGroupDiv } from './modules/RadioGroupDiv.vue'
-export { default as Collapsible } from './modules/Collapsible.vue'
diff --git a/src/components/Base/modules/InputDiv.vue b/src/components/Base/modules/InputDiv.vue
index 98f8577301..20519d4cb0 100644
--- a/src/components/Base/modules/InputDiv.vue
+++ b/src/components/Base/modules/InputDiv.vue
@@ -13,7 +13,7 @@ import AlertIcon from 'vue-material-design-icons/AlertCircleOutline.vue'
 import ChevronLeftIcon from 'vue-material-design-icons/ChevronLeft.vue'
 import ChevronRightIcon from 'vue-material-design-icons/ChevronRight.vue'
 import Spinner from '../../AppIcons/Spinner.vue'
-import { Logger } from '../../../helpers'
+import { Logger } from '../../../helpers/modules/logger'
 
 import { SignalingType } from '../../../Types'
 import NcButton from '@nextcloud/vue/components/NcButton'
diff --git a/src/components/Base/modules/QrModal.vue b/src/components/Base/modules/QrModal.vue
index 95cf1caabe..f65d9bbc4d 100644
--- a/src/components/Base/modules/QrModal.vue
+++ b/src/components/Base/modules/QrModal.vue
@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 import QRCode from 'qrcode'
-import { Logger } from '../../../helpers'
+import { Logger } from '../../../helpers/modules/logger'
 import { onMounted, ref } from 'vue'
 
 import type { AxiosError } from '@nextcloud/axios'
diff --git a/src/components/Calendar/CalendarPeek.vue b/src/components/Calendar/CalendarPeek.vue
index 78337fe9af..8f071bda00 100644
--- a/src/components/Calendar/CalendarPeek.vue
+++ b/src/components/Calendar/CalendarPeek.vue
@@ -16,7 +16,7 @@ import CalendarIcon from 'vue-material-design-icons/CalendarOutline.vue'
 
 import CalendarInfo from './CalendarInfo.vue'
 import { CalendarAPI } from '../../Api'
-import { Logger } from '../../helpers'
+import { Logger } from '../../helpers/modules/logger'
 
 import { usePollStore } from '../../stores/poll'
 
diff --git a/src/components/Public/PublicRegisterModal.vue b/src/components/Public/PublicRegisterModal.vue
index a82414c37f..7b4f591a73 100644
--- a/src/components/Public/PublicRegisterModal.vue
+++ b/src/components/Public/PublicRegisterModal.vue
@@ -15,7 +15,8 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
 import NcButton from '@nextcloud/vue/components/NcButton'
 
 import InputDiv from '../Base/modules/InputDiv.vue'
-import { SimpleLink, setCookie } from '../../helpers'
+import { SimpleLink } from '../../helpers/modules/SimpleLink'
+import { setCookie } from '../../helpers/modules/cookieHelper'
 import { ValidatorAPI, PublicAPI } from '../../Api'
 import { useSessionStore } from '../../stores/session'
 import { usePollStore } from '../../stores/poll'
diff --git a/src/components/Shares/SharesListUnsent.vue b/src/components/Shares/SharesListUnsent.vue
index 39fd11b26c..c86f140030 100644
--- a/src/components/Shares/SharesListUnsent.vue
+++ b/src/components/Shares/SharesListUnsent.vue
@@ -14,7 +14,7 @@ import ShareItem from './ShareItem.vue'
 import BulkMailIcon from 'vue-material-design-icons/EmailMultipleOutline.vue'
 
 import ConfigBox from '../Base/modules/ConfigBox.vue'
-import { Logger } from '../../helpers'
+import { Logger } from '../../helpers/modules/logger'
 import { usePollStore } from '../../stores/poll'
 import { useSharesStore } from '../../stores/shares'
 
diff --git a/src/components/SideBar/index.ts b/src/components/SideBar/index.ts
deleted file mode 100644
index 1474bf2b14..0000000000
--- a/src/components/SideBar/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2024 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-export { default as SideBarTabActivity } from './SideBarTabActivity.vue'
-export { default as SideBarTabConfiguration } from './SideBarTabConfiguration.vue'
-export { default as SideBarTabComments } from './SideBarTabComments.vue'
-export { default as SideBarTabDatePolls } from './SideBarTabDatePolls.vue'
-export { default as SideBarTabOptions } from './SideBarTabOptions.vue'
-export { default as SideBarTabPollGroupShare } from './SideBarTabSharePollGroup.vue'
-export { default as SideBarTabShare } from './SideBarTabShare.vue'
diff --git a/src/components/User/UserMenu.vue b/src/components/User/UserMenu.vue
index 25aebd13e6..ce6ffa1311 100644
--- a/src/components/User/UserMenu.vue
+++ b/src/components/User/UserMenu.vue
@@ -39,7 +39,10 @@ import { useSessionStore } from '../../stores/session'
 import { useSubscriptionStore } from '../../stores/subscription'
 import { useVotesStore } from '../../stores/votes'
 
-import { deleteCookieByValue, findCookieByValue } from '../../helpers'
+import {
+	deleteCookieByValue,
+	findCookieByValue,
+} from '../../helpers/modules/cookieHelper'
 
 import { Event } from '../../Types'
 import type { StatusResults } from '../../Types'
diff --git a/src/components/User/UserSearch.vue b/src/components/User/UserSearch.vue
index eb87ba7a06..e6413b882f 100644
--- a/src/components/User/UserSearch.vue
+++ b/src/components/User/UserSearch.vue
@@ -11,7 +11,7 @@ import { t } from '@nextcloud/l10n'
 import NcSelectUsers from '@nextcloud/vue/components/NcSelectUsers'
 
 import { AppSettingsAPI } from '../../Api'
-import { Logger } from '../../helpers'
+import { Logger } from '../../helpers/modules/logger'
 import { ISearchType, User } from '../../Types'
 import type { AxiosError } from '@nextcloud/axios'
 
diff --git a/src/components/VoteTable/VoteMenu.vue b/src/components/VoteTable/VoteMenu.vue
index 1bb558169d..c0084c7866 100644
--- a/src/components/VoteTable/VoteMenu.vue
+++ b/src/components/VoteTable/VoteMenu.vue
@@ -31,7 +31,10 @@ import { useSessionStore } from '../../stores/session'
 import { useSubscriptionStore } from '../../stores/subscription'
 import { useVotesStore } from '../../stores/votes'
 import { StatusResults } from '../../Types'
-import { deleteCookieByValue, findCookieByValue } from '../../helpers'
+import {
+	deleteCookieByValue,
+	findCookieByValue,
+} from '../../helpers/modules/cookieHelper'
 
 interface Props {
 	noMenuIcon: boolean
diff --git a/src/composables/context.ts b/src/composables/context.ts
index d98d61d00a..b03b348a0e 100644
--- a/src/composables/context.ts
+++ b/src/composables/context.ts
@@ -6,7 +6,7 @@
 import { RouteLocationNormalized } from 'vue-router'
 import { useSessionStore } from '../stores/session'
 import { usePreferencesStore } from '../stores/preferences'
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 import { Settings } from 'luxon'
 
 /**
diff --git a/src/composables/usePollWatcher.ts b/src/composables/usePollWatcher.ts
index 5c99587dca..f0bd99c22b 100644
--- a/src/composables/usePollWatcher.ts
+++ b/src/composables/usePollWatcher.ts
@@ -9,7 +9,7 @@ import { generateUrl } from '@nextcloud/router'
 
 // eslint-disable-next-line import/default
 import PollWatcherWorker from '../workers/pollWatcher.worker?worker'
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 
 import { useCommentsStore } from '../stores/comments'
 import { useOptionsStore } from '../stores/options'
diff --git a/src/helpers/index.ts b/src/helpers/index.ts
deleted file mode 100644
index f75dbb676c..0000000000
--- a/src/helpers/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2024 Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-export { Logger } from './modules/logger'
-export {
-	getCookieValue,
-	findCookie,
-	setCookie,
-	deleteCookie,
-	deleteCookieByValue,
-	findCookieByValue,
-} from './modules/cookieHelper'
-export {
-	uniqueArrayOfObjects,
-	uniqueOptions,
-	uniqueParticipants,
-} from './modules/arrayHelper'
-export { groupComments } from './modules/comments'
-export { SimpleLink } from './modules/SimpleLink'
-export { GuestBubble } from './modules/GuestBubble'
-export { StoreHelper } from './modules/StoreHelper'
diff --git a/src/router.ts b/src/router.ts
index 131d19a756..0a737f624c 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -11,7 +11,8 @@ import {
 
 import { getCurrentUser } from '@nextcloud/auth'
 import { generateUrl } from '@nextcloud/router'
-import { getCookieValue, Logger, setCookie } from './helpers'
+import { getCookieValue, setCookie } from './helpers/modules/cookieHelper'
+import { Logger } from './helpers/modules/logger'
 import { loadContext } from './composables/context'
 
 import Navigation from './views/Navigation.vue'
diff --git a/src/stores/appSettings.ts b/src/stores/appSettings.ts
index eab5d34906..733dd82783 100644
--- a/src/stores/appSettings.ts
+++ b/src/stores/appSettings.ts
@@ -6,7 +6,7 @@
 import { defineStore } from 'pinia'
 
 import { AppSettingsAPI } from '../Api'
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 
 import type { AxiosError } from '@nextcloud/axios'
 import type { AppSettingsStore } from './appSettings.types'
diff --git a/src/stores/combo.ts b/src/stores/combo.ts
index 20c07969a1..13842fcc39 100644
--- a/src/stores/combo.ts
+++ b/src/stores/combo.ts
@@ -7,7 +7,8 @@ import { defineStore } from 'pinia'
 import sortBy from 'lodash/sortBy'
 
 import { VotesAPI, OptionsAPI, PollsAPI } from '../Api'
-import { Logger, uniqueOptions, uniqueParticipants } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
+import { uniqueOptions, uniqueParticipants } from '../helpers/modules/arrayHelper'
 
 import { usePreferencesStore } from './preferences'
 import { usePollsStore } from './polls'
diff --git a/src/stores/comments.ts b/src/stores/comments.ts
index b71a3cf857..cad4c48929 100644
--- a/src/stores/comments.ts
+++ b/src/stores/comments.ts
@@ -6,7 +6,8 @@
 import { defineStore } from 'pinia'
 
 import { CommentsAPI, PublicAPI } from '../Api'
-import { groupComments, Logger } from '../helpers'
+import { groupComments } from '../helpers/modules/comments'
+import { Logger } from '../helpers/modules/logger'
 
 import { useSessionStore } from './session'
 
diff --git a/src/stores/options.ts b/src/stores/options.ts
index d7433934fa..19083f9501 100644
--- a/src/stores/options.ts
+++ b/src/stores/options.ts
@@ -7,7 +7,7 @@ import { defineStore } from 'pinia'
 import orderBy from 'lodash/orderBy'
 
 import { PublicAPI, OptionsAPI } from '../Api'
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 
 import { usePollStore } from './poll'
 import { useSessionStore } from './session'
diff --git a/src/stores/poll.ts b/src/stores/poll.ts
index 3bd49b6b71..3a18a48300 100644
--- a/src/stores/poll.ts
+++ b/src/stores/poll.ts
@@ -14,7 +14,7 @@ import { t } from '@nextcloud/l10n'
 import { showError } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 import { PublicAPI, PollsAPI } from '../Api'
 import { createDefault, Event } from '../Types'
 
@@ -222,7 +222,7 @@ export const usePollStore = defineStore('poll', {
 		proposalsExpireRelative(state): string {
 			return DateTime.fromSeconds(
 				state.configuration.proposalsExpire,
-			).toRelative()
+			).toRelative() as string
 		},
 
 		isClosed(state): boolean {
diff --git a/src/stores/pollGroups.ts b/src/stores/pollGroups.ts
index 1be3c1ee36..611f0211cf 100644
--- a/src/stores/pollGroups.ts
+++ b/src/stores/pollGroups.ts
@@ -14,7 +14,7 @@ import { usePollsStore } from './polls'
 
 import { PollGroupsAPI } from '../Api'
 
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 
 import type { AxiosError } from '@nextcloud/axios'
 import type { Poll } from './poll.types'
diff --git a/src/stores/polls.ts b/src/stores/polls.ts
index be7b1ebf28..5ecd47174f 100644
--- a/src/stores/polls.ts
+++ b/src/stores/polls.ts
@@ -8,7 +8,7 @@ import orderBy from 'lodash/orderBy'
 import { DateTime } from 'luxon'
 import { t } from '@nextcloud/l10n'
 
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 import { PollsAPI } from '../Api'
 
 import { useSessionStore } from './session'
diff --git a/src/stores/preferences.ts b/src/stores/preferences.ts
index 44022e5d9a..62429312a4 100644
--- a/src/stores/preferences.ts
+++ b/src/stores/preferences.ts
@@ -6,7 +6,7 @@
 import { defineStore } from 'pinia'
 
 import { CalendarAPI, UserSettingsAPI } from '../Api'
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 
 import type { AxiosError } from '@nextcloud/axios'
 import type { PreferencesStore, Calendar } from './preferences.types'
diff --git a/src/stores/session.ts b/src/stores/session.ts
index e10df3e239..2599f6cd47 100644
--- a/src/stores/session.ts
+++ b/src/stores/session.ts
@@ -9,7 +9,7 @@ import { RouteLocationNormalized } from 'vue-router'
 import { getCurrentUser } from '@nextcloud/auth'
 import { t } from '@nextcloud/l10n'
 
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 import { PublicAPI, SessionAPI } from '../Api'
 
 import { useSubscriptionStore } from './subscription'
diff --git a/src/stores/shares.ts b/src/stores/shares.ts
index 25cf40935b..a2e60b798c 100644
--- a/src/stores/shares.ts
+++ b/src/stores/shares.ts
@@ -5,7 +5,7 @@
 
 import { defineStore } from 'pinia'
 
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 import { SharesAPI } from '../Api'
 
 import { usePollGroupsStore } from './pollGroups'
diff --git a/src/stores/subscription.ts b/src/stores/subscription.ts
index f353abf532..f0918309a4 100644
--- a/src/stores/subscription.ts
+++ b/src/stores/subscription.ts
@@ -7,7 +7,7 @@ import { ref } from 'vue'
 import { defineStore } from 'pinia'
 
 import { PublicAPI, PollsAPI } from '../Api'
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 
 import { useSessionStore } from './session'
 
diff --git a/src/stores/votes.ts b/src/stores/votes.ts
index 5e90fd05bc..26f36ebb58 100644
--- a/src/stores/votes.ts
+++ b/src/stores/votes.ts
@@ -5,7 +5,8 @@
 
 import { defineStore } from 'pinia'
 import { PublicAPI, VotesAPI } from '../Api'
-import { Logger, StoreHelper } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
+import { StoreHelper } from '../helpers/modules/StoreHelper'
 
 import { usePollStore } from './poll'
 import { useSessionStore } from './session'
diff --git a/src/views/Combo.vue b/src/views/Combo.vue
index 06ac3c3b3d..41172186b3 100644
--- a/src/views/Combo.vue
+++ b/src/views/Combo.vue
@@ -12,7 +12,7 @@ import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
 
 import ComboTable from '../components/Combo/ComboTable.vue'
 import LoadingOverlay from '../components/Base/modules/LoadingOverlay.vue'
-import { ActionToggleSidebar } from '../components/Actions'
+import ActionToggleSidebar from '../components/Actions/modules/ActionToggleSidebar.vue'
 import HeaderBar from '../components/Base/modules/HeaderBar.vue'
 import { useComboStore } from '../stores/combo'
 import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index d096acc9d9..01b7a8e0aa 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -15,7 +15,7 @@ import TextPollIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue
 import DatePollIcon from 'vue-material-design-icons/CalendarBlankOutline.vue'
 
 import PollsAppIcon from '../components/AppIcons/PollsAppIcon.vue'
-import { Logger } from '../helpers'
+import { Logger } from '../helpers/modules/logger'
 import { usePollsStore } from '../stores/polls'
 
 const dashboardWidgetProperties = {

From 797a09b10ec9ea99ee87b396c85026733748407e Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sat, 13 Sep 2025 17:55:14 +0200
Subject: [PATCH 3/9] change name (strange translation of 'name' to surname')

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

diff --git a/src/components/PollGroup/PollGroupEditDlg.vue b/src/components/PollGroup/PollGroupEditDlg.vue
index 400261dfd2..cb2fbe8485 100644
--- a/src/components/PollGroup/PollGroupEditDlg.vue
+++ b/src/components/PollGroup/PollGroupEditDlg.vue
@@ -53,7 +53,7 @@ async function updatePollGroup() {
 
 <template>
 	<div class="edit-poll-group">
-		<ConfigBox :name="t('polls', 'Name')">
+		<ConfigBox :name="t('polls', 'Title')">
 			<template #icon>
 				<SpeakerIcon />
 			</template>

From 94b3e678715f202532ca589a1da9fc6b2c991413 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sat, 13 Sep 2025 18:01:12 +0200
Subject: [PATCH 4/9] another removed dom container

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/components/PollGroup/PollGroupEditDlg.vue | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/components/PollGroup/PollGroupEditDlg.vue b/src/components/PollGroup/PollGroupEditDlg.vue
index cb2fbe8485..57743d57f0 100644
--- a/src/components/PollGroup/PollGroupEditDlg.vue
+++ b/src/components/PollGroup/PollGroupEditDlg.vue
@@ -52,29 +52,27 @@ async function updatePollGroup() {
 </script>
 
 <template>
-	<div class="edit-poll-group">
-		<ConfigBox :name="t('polls', 'Title')">
-			<template #icon>
-				<SpeakerIcon />
-			</template>
+	<ConfigBox :name="t('polls', 'Title')">
+		<template #icon>
+			<SpeakerIcon />
+		</template>
 
-			<ConfigTitlePollGroup @change="updatePollGroup" />
-		</ConfigBox>
+		<ConfigTitlePollGroup @change="updatePollGroup" />
+	</ConfigBox>
 
-		<ConfigBox :name="t('polls', 'Extended title')">
-			<template #icon>
-				<SpeakerBigIcon />
-			</template>
-			<ConfigTitleExtPollGroup @change="updatePollGroup" />
-		</ConfigBox>
+	<ConfigBox :name="t('polls', 'Extended title')">
+		<template #icon>
+			<SpeakerBigIcon />
+		</template>
+		<ConfigTitleExtPollGroup @change="updatePollGroup" />
+	</ConfigBox>
 
-		<ConfigBox :name="t('polls', 'Description')">
-			<template #icon>
-				<DescriptionIcon />
-			</template>
-			<ConfigDescriptionPollGroup @change="updatePollGroup" />
-		</ConfigBox>
-	</div>
+	<ConfigBox :name="t('polls', 'Description')">
+		<template #icon>
+			<DescriptionIcon />
+		</template>
+		<ConfigDescriptionPollGroup @change="updatePollGroup" />
+	</ConfigBox>
 </template>
 
 <style lang="scss">

From ef5fdb53d2f160ef933fc06a2175dc53f37dac07 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sat, 13 Sep 2025 19:06:26 +0200
Subject: [PATCH 5/9] empty userSearch after selected option

Signed-off-by: dartcafe <github@dartcafe.de>
---
 lib/Service/ShareService.php       | 18 +++++++++++-------
 src/components/User/UserSearch.vue |  3 ---
 src/stores/shares.ts               | 24 ++++++++++++++----------
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/lib/Service/ShareService.php b/lib/Service/ShareService.php
index 0e54fb0eea..3cc72e7f16 100644
--- a/lib/Service/ShareService.php
+++ b/lib/Service/ShareService.php
@@ -640,13 +640,17 @@ public function add(
 			$preventInvitation = true;
 		}
 
-		$share = $this->createNewShare(
-			pollOrPollGroupId: $pollOrPollGroupId,
-			userGroup: $shareUser,
-			preventInvitation: $preventInvitation,
-			timeZone: '',
-			purpose: $purpose
-		);
+		try {
+			$share = $this->createNewShare(
+				pollOrPollGroupId: $pollOrPollGroupId,
+				userGroup: $shareUser,
+				preventInvitation: $preventInvitation,
+				timeZone: '',
+				purpose: $purpose
+			);
+		} catch (ShareAlreadyExistsException $e) {
+			$share = $e->getShare();
+		}
 
 		// TODO: extend event for pollGroups
 		if ($share->getPollId()) {
diff --git a/src/components/User/UserSearch.vue b/src/components/User/UserSearch.vue
index e6413b882f..5e81426b8c 100644
--- a/src/components/User/UserSearch.vue
+++ b/src/components/User/UserSearch.vue
@@ -24,8 +24,6 @@ interface Props {
 
 const emit = defineEmits(['userSelected'])
 
-const model = defineModel<User | undefined>()
-
 const {
 	placeholder = t('polls', 'Type to start searching …'),
 	ariaLabel = t('polls', 'Select users'),
@@ -79,7 +77,6 @@ const selectProps = {
 <template>
 	<NcSelectUsers
 		id="ajax"
-		v-model="model"
 		v-bind="selectProps"
 		:options="users"
 		@option:selected="optionSelected"
diff --git a/src/stores/shares.ts b/src/stores/shares.ts
index a2e60b798c..773ff0abe7 100644
--- a/src/stores/shares.ts
+++ b/src/stores/shares.ts
@@ -120,7 +120,7 @@ export const useSharesStore = defineStore('shares', {
 					user,
 					purpose,
 				)
-				this.shares.push(response.data.share)
+				this.pushOrUpdate(response.data)
 			} catch (error) {
 				this.handleError(error, 'Error adding user share', {
 					purpose,
@@ -136,7 +136,7 @@ export const useSharesStore = defineStore('shares', {
 				const response = await SharesAPI.addPublicShare(
 					sessionStore.currentPollId,
 				)
-				this.shares.push(response.data.share)
+				this.pushOrUpdate(response.data)
 			} catch (error) {
 				this.handleError(error, 'Error adding public share', {
 					pollId: sessionStore.currentPollId,
@@ -144,10 +144,14 @@ export const useSharesStore = defineStore('shares', {
 			}
 		},
 
-		update(payload: { share: Share }): void {
+		pushOrUpdate(payload: { share: Share }): void {
 			const foundIndex = this.shares.findIndex(
 				(share: Share) => share.id === payload.share.id,
 			)
+			if (foundIndex === -1) {
+				this.shares.push(payload.share)
+				return
+			}
 			Object.assign(this.shares[foundIndex], payload.share)
 		},
 
@@ -159,7 +163,7 @@ export const useSharesStore = defineStore('shares', {
 					payload.share.token,
 					setTo,
 				)
-				this.update(response.data)
+				this.pushOrUpdate(response.data)
 			} catch (error) {
 				this.handleError(error, `Error switching type to ${setTo}`, payload)
 			}
@@ -174,7 +178,7 @@ export const useSharesStore = defineStore('shares', {
 					payload.share.token,
 					payload.value,
 				)
-				this.update(response.data)
+				this.pushOrUpdate(response.data)
 			} catch (error) {
 				this.handleError(
 					error,
@@ -190,7 +194,7 @@ export const useSharesStore = defineStore('shares', {
 					payload.token,
 					payload.label,
 				)
-				this.update(response.data)
+				this.pushOrUpdate(response.data)
 			} catch (error) {
 				this.handleError(error, 'Error writing label', payload)
 			}
@@ -230,7 +234,7 @@ export const useSharesStore = defineStore('shares', {
 		async lock(payload: { share: Share }): Promise<void> {
 			try {
 				const response = await SharesAPI.lockShare(payload.share.token)
-				this.update(response.data)
+				this.pushOrUpdate(response.data)
 			} catch (error) {
 				this.handleError(error, 'Error locking share', payload)
 			}
@@ -239,7 +243,7 @@ export const useSharesStore = defineStore('shares', {
 		async unlock(payload: { share: Share }): Promise<void> {
 			try {
 				const response = await SharesAPI.unlockShare(payload.share.token)
-				this.update(response.data)
+				this.pushOrUpdate(response.data)
 			} catch (error) {
 				this.handleError(error, 'Error unlocking share', payload)
 			}
@@ -248,7 +252,7 @@ export const useSharesStore = defineStore('shares', {
 		async delete(payload: { share: Share }): Promise<void> {
 			try {
 				const response = await SharesAPI.deleteShare(payload.share.token)
-				this.update(response.data)
+				this.pushOrUpdate(response.data)
 			} catch (error) {
 				this.handleError(error, 'Error deleting share', payload)
 			}
@@ -256,7 +260,7 @@ export const useSharesStore = defineStore('shares', {
 		async restore(payload: { share: Share }): Promise<void> {
 			try {
 				const response = await SharesAPI.restoreShare(payload.share.token)
-				this.update(response.data)
+				this.pushOrUpdate(response.data)
 			} catch (error) {
 				this.handleError(error, 'Error restoring share', payload)
 			}

From 960da08a686656731169752b65296a31d8c08e74 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sat, 13 Sep 2025 23:56:45 +0200
Subject: [PATCH 6/9] refactor shares lists

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/components/Shares/ShareItem.vue           | 56 +++++++++----------
 src/components/Shares/ShareItemAllUsers.vue   |  4 +-
 src/components/Shares/SharePublicAdd.vue      |  3 +-
 src/components/Shares/SharesList.vue          | 48 ++++++++--------
 src/components/Shares/SharesListLocked.vue    |  3 +-
 src/components/Shares/SharesListPollGroup.vue |  7 ++-
 src/components/Shares/SharesListUnsent.vue    |  3 +-
 src/components/SideBar/SideBarTabShare.vue    | 40 +------------
 .../SideBar/SideBarTabSharePollGroup.vue      | 34 +----------
 src/components/User/UserItem.vue              |  8 ++-
 10 files changed, 72 insertions(+), 134 deletions(-)

diff --git a/src/components/Shares/ShareItem.vue b/src/components/Shares/ShareItem.vue
index 0650fffb6b..cf69f5fcd6 100644
--- a/src/components/Shares/ShareItem.vue
+++ b/src/components/Shares/ShareItem.vue
@@ -17,7 +17,7 @@ import type { Share } from '../../stores/shares.types'
 
 const emit = defineEmits(['showQrCode'])
 
-const { share } = defineProps<{ share: Share }>()
+const { share, tag = 'div' } = defineProps<{ share: Share; tag?: string }>()
 
 const label = ref({
 	inputValue: '',
@@ -46,34 +46,34 @@ onMounted(() => {
 </script>
 
 <template>
-	<div :class="{ deleted: share.deleted }">
-		<UserItem
-			v-bind="userItemProps"
-			:delegated-from-group="!share.pollId"
-			:deleted-state="share.deleted"
-			:locked-state="share.locked">
-			<template #status>
-				<div v-if="share.voted">
-					<VotedIcon
-						class="vote-status voted"
-						:name="t('polls', 'Has voted')" />
-				</div>
-				<div
-					v-else-if="
-						share.groupId || ['public', 'group'].includes(share.type)
-					">
-					<div class="vote-status empty" />
-				</div>
-				<div v-else>
-					<UnvotedIcon
-						class="vote-status unvoted"
-						:name="t('polls', 'Has not voted')" />
-				</div>
-			</template>
+	<UserItem
+		v-bind="userItemProps"
+		:class="{ deleted: share.deleted }"
+		:tag="tag"
+		:delegated-from-group="!share.pollId"
+		:deleted-state="share.deleted"
+		:locked-state="share.locked">
+		<template #status>
+			<div v-if="share.voted">
+				<VotedIcon
+					class="vote-status voted"
+					:name="t('polls', 'Has voted')" />
+			</div>
+			<div
+				v-else-if="
+					share.groupId || ['public', 'group'].includes(share.type)
+				">
+				<div class="vote-status empty" />
+			</div>
+			<div v-else>
+				<UnvotedIcon
+					class="vote-status unvoted"
+					:name="t('polls', 'Has not voted')" />
+			</div>
+		</template>
 
-			<ShareMenu :share="share" @show-qr-code="emit('showQrCode')" />
-		</UserItem>
-	</div>
+		<ShareMenu :share="share" @show-qr-code="emit('showQrCode')" />
+	</UserItem>
 </template>
 
 <style lang="scss">
diff --git a/src/components/Shares/ShareItemAllUsers.vue b/src/components/Shares/ShareItemAllUsers.vue
index 2a7a23bd5b..9604edf20b 100644
--- a/src/components/Shares/ShareItemAllUsers.vue
+++ b/src/components/Shares/ShareItemAllUsers.vue
@@ -13,6 +13,8 @@ import UserItem from '../User/UserItem.vue'
 import { usePollStore } from '../../stores/poll'
 import { VirtualUserItemType } from '../../Types'
 
+const { tag = 'div' } = defineProps<{ tag?: string }>()
+
 const pollStore = usePollStore()
 
 const userItemProps = computed<{
@@ -42,7 +44,7 @@ const pollAccess = computed({
 </script>
 
 <template>
-	<UserItem v-bind="userItemProps">
+	<UserItem :tag="tag" v-bind="userItemProps">
 		<template #status>
 			<div class="vote-status" />
 		</template>
diff --git a/src/components/Shares/SharePublicAdd.vue b/src/components/Shares/SharePublicAdd.vue
index e1d7e08124..73eeff1116 100644
--- a/src/components/Shares/SharePublicAdd.vue
+++ b/src/components/Shares/SharePublicAdd.vue
@@ -17,6 +17,7 @@ import { useSharesStore } from '../../stores/shares'
 
 import type { VirtualUserItemType } from '../../Types'
 
+const { tag = 'div' } = defineProps<{ tag?: string }>()
 const sharesStore = useSharesStore()
 
 const userItemProps: {
@@ -40,7 +41,7 @@ async function addPublicShare() {
 </script>
 
 <template>
-	<UserItem v-bind="userItemProps" class="add-public">
+	<UserItem :tag="tag" v-bind="userItemProps" class="add-public">
 		<template #status>
 			<div class="vote-status" />
 		</template>
diff --git a/src/components/Shares/SharesList.vue b/src/components/Shares/SharesList.vue
index 808428036f..79999b5e11 100644
--- a/src/components/Shares/SharesList.vue
+++ b/src/components/Shares/SharesList.vue
@@ -70,24 +70,28 @@ async function addShare(user: User) {
 			:placeholder="t('polls', 'Type to add an individual share')"
 			@user-selected="(user: User) => addShare(user)" />
 
-		<ShareItemAllUsers v-if="sessionStore.appPermissions.allAccess" />
-
-		<SharePublicAdd
-			v-if="
-				sessionStore.appPermissions.publicShares
-				&& sessionStore.appPermissions.addShares
-				&& sessionStore.appPermissions.addSharesExternal
-			" />
-
-		<div v-if="sharesStore.active.length" class="shares-list shared">
-			<TransitionGroup tag="div" name="list" :css="false">
-				<ShareItem
-					v-for="share in sharesStore.active"
-					:key="share.id"
-					:share="share"
-					@show-qr-code="openQrModal(share)" />
-			</TransitionGroup>
-		</div>
+		<!-- <template v-if="sharesStore.active.length"> -->
+		<TransitionGroup tag="ul" name="list">
+			<ShareItemAllUsers
+				v-if="sessionStore.appPermissions.allAccess"
+				tag="li" />
+
+			<SharePublicAdd
+				v-if="
+					sessionStore.appPermissions.publicShares
+					&& sessionStore.appPermissions.addShares
+					&& sessionStore.appPermissions.addSharesExternal
+				"
+				tag="li" />
+
+			<ShareItem
+				v-for="share in sharesStore.active"
+				:key="share.id"
+				:share="share"
+				tag="li"
+				@show-qr-code="openQrModal(share)" />
+		</TransitionGroup>
+		<!-- </template> -->
 
 		<NcModal v-if="qrModal" size="small" @close="qrModal = false">
 			<QrModal
@@ -102,11 +106,3 @@ async function addShare(user: User) {
 		</NcModal>
 	</ConfigBox>
 </template>
-
-<style lang="scss">
-.shares-list.shared {
-	border-top: 1px solid var(--color-border);
-	padding-top: 24px;
-	margin-top: 16px;
-}
-</style>
diff --git a/src/components/Shares/SharesListLocked.vue b/src/components/Shares/SharesListLocked.vue
index dfe71dfad1..2e91bff7da 100644
--- a/src/components/Shares/SharesListLocked.vue
+++ b/src/components/Shares/SharesListLocked.vue
@@ -24,10 +24,11 @@ const configBoxProps = {
 		<template #icon>
 			<LockedIcon />
 		</template>
-		<TransitionGroup tag="div" name="list" :css="false" class="shares-list">
+		<TransitionGroup tag="ul" name="list">
 			<ShareItem
 				v-for="share in sharesStore.locked"
 				:key="share.id"
+				tag="li"
 				:share="share" />
 		</TransitionGroup>
 	</ConfigBox>
diff --git a/src/components/Shares/SharesListPollGroup.vue b/src/components/Shares/SharesListPollGroup.vue
index 289e2a8853..411cd58933 100644
--- a/src/components/Shares/SharesListPollGroup.vue
+++ b/src/components/Shares/SharesListPollGroup.vue
@@ -49,14 +49,15 @@ async function addShare(user: User) {
 			:search-types="[0]"
 			@user-selected="(user: User) => addShare(user)" />
 
-		<div v-if="sharesStore.shares" class="shares-list shared">
-			<TransitionGroup tag="div" name="list" :css="false">
+		<template v-if="sharesStore.shares">
+			<TransitionGroup tag="ul" name="list">
 				<ShareItem
 					v-for="share in sharesStore.active"
 					:key="share.id"
+					tag="li"
 					:share="share" />
 			</TransitionGroup>
-		</div>
+		</template>
 	</ConfigBox>
 </template>
 
diff --git a/src/components/Shares/SharesListUnsent.vue b/src/components/Shares/SharesListUnsent.vue
index c86f140030..f5b43b2235 100644
--- a/src/components/Shares/SharesListUnsent.vue
+++ b/src/components/Shares/SharesListUnsent.vue
@@ -72,10 +72,11 @@ async function sendAllInvitations() {
 				</template>
 			</NcButton>
 		</template>
-		<TransitionGroup tag="div" name="list" :css="false" class="shares-list">
+		<TransitionGroup tag="ul" name="list">
 			<ShareItem
 				v-for="share in sharesStore.unsentInvitations"
 				:key="share.id"
+				tag="li"
 				:share="share" />
 		</TransitionGroup>
 	</ConfigBox>
diff --git a/src/components/SideBar/SideBarTabShare.vue b/src/components/SideBar/SideBarTabShare.vue
index a319385757..04951a45c7 100644
--- a/src/components/SideBar/SideBarTabShare.vue
+++ b/src/components/SideBar/SideBarTabShare.vue
@@ -31,41 +31,7 @@ onBeforeRouteLeave(() => {
 </script>
 
 <template>
-	<SharesListUnsent
-		v-if="sessionStore.appPermissions.addShares"
-		class="shares unsent" />
-	<SharesList class="shares effective" />
-	<SharesListLocked v-if="sessionStore.appPermissions.addShares" class="shares" />
+	<SharesListUnsent v-if="sessionStore.appPermissions.addShares" />
+	<SharesList />
+	<SharesListLocked v-if="sessionStore.appPermissions.addShares" />
 </template>
-
-<style lang="scss">
-.shares-list {
-	display: flex;
-	flex-flow: column;
-	justify-content: flex-start;
-	padding-top: 8px;
-
-	> li {
-		display: flex;
-		align-items: stretch;
-		margin: 4px 0;
-	}
-}
-
-.share-item {
-	display: flex;
-	flex: 1;
-	align-items: center;
-	max-width: 100%;
-}
-
-.share-item__description {
-	flex: 1;
-	min-width: 50px;
-	color: var(--color-text-maxcontrast);
-	padding-inline-start: 8px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-</style>
diff --git a/src/components/SideBar/SideBarTabSharePollGroup.vue b/src/components/SideBar/SideBarTabSharePollGroup.vue
index 88f1684744..e4583c9a2c 100644
--- a/src/components/SideBar/SideBarTabSharePollGroup.vue
+++ b/src/components/SideBar/SideBarTabSharePollGroup.vue
@@ -31,37 +31,5 @@ onBeforeRouteUpdate(async () => {
 	<div>
 		{{ infoText }}
 	</div>
-	<SharesList class="shares effective" :info="infoText" />
+	<SharesList :info="infoText" />
 </template>
-
-<style lang="scss">
-.shares-list {
-	display: flex;
-	flex-flow: column;
-	justify-content: flex-start;
-	padding-top: 8px;
-
-	> li {
-		display: flex;
-		align-items: stretch;
-		margin: 4px 0;
-	}
-}
-
-.share-item {
-	display: flex;
-	flex: 1;
-	align-items: center;
-	max-width: 100%;
-}
-
-.share-item__description {
-	flex: 1;
-	min-width: 50px;
-	color: var(--color-text-maxcontrast);
-	padding-inline-start: 8px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-</style>
diff --git a/src/components/User/UserItem.vue b/src/components/User/UserItem.vue
index dbb7fdf8a4..2c08888b76 100644
--- a/src/components/User/UserItem.vue
+++ b/src/components/User/UserItem.vue
@@ -40,6 +40,7 @@ interface Props {
 	description?: string
 	label?: string
 	type?: UserType | VirtualUserItemType
+	tag?: string
 	user?: User
 	showTypeIcon?: boolean
 	iconSize?: number
@@ -61,6 +62,7 @@ const {
 	resolveInfo = false,
 	description,
 	label = '',
+	tag = 'div',
 	type = '',
 	user = {
 		id: '',
@@ -212,7 +214,7 @@ function showMenu() {
 }
 const componentClass = computed(() => [
 	'user-item',
-	typeComputed,
+	typeComputed.value,
 	{
 		disabled,
 		condensed,
@@ -221,7 +223,7 @@ const componentClass = computed(() => [
 </script>
 
 <template>
-	<div :class="componentClass">
+	<component :is="tag" :class="componentClass">
 		<div class="avatar-wrapper">
 			<NcAvatar
 				v-bind="avatarProps"
@@ -289,7 +291,7 @@ const componentClass = computed(() => [
 		</div>
 
 		<slot />
-	</div>
+	</component>
 </template>
 
 <style lang="scss">

From 88ed58e09866bd140ca5220cb04e671f7e4d69f8 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sun, 14 Sep 2025 09:09:14 +0200
Subject: [PATCH 7/9] refactor options list

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/components/Options/OptionItem.vue        | 12 +++--
 src/components/Options/OptionsDate.vue       | 47 +++++++-------------
 src/components/Options/OptionsText.vue       | 32 +++++++------
 src/components/SideBar/SideBarTabOptions.vue | 12 ++++-
 4 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/src/components/Options/OptionItem.vue b/src/components/Options/OptionItem.vue
index e66c49a6fb..f830e4770d 100644
--- a/src/components/Options/OptionItem.vue
+++ b/src/components/Options/OptionItem.vue
@@ -17,9 +17,15 @@ interface Props {
 	option: Option
 	draggable?: boolean
 	showOwner?: boolean
+	tag?: string
 }
 
-const { option, draggable = false, showOwner = false } = defineProps<Props>()
+const {
+	option,
+	draggable = false,
+	showOwner = false,
+	tag = 'div',
+} = defineProps<Props>()
 
 const containerClass = {
 	'option-item': true,
@@ -31,7 +37,7 @@ const pollStore = usePollStore()
 </script>
 
 <template>
-	<div :class="containerClass">
+	<component :is="tag" :class="containerClass">
 		<DragIcon v-if="draggable" class="grid-area-drag-icon" />
 
 		<OptionItemOwner
@@ -55,7 +61,7 @@ const pollStore = usePollStore()
 			:duration="Duration.fromMillis(option.duration * 1000)" />
 
 		<slot name="actions" />
-	</div>
+	</component>
 </template>
 
 <style lang="scss">
diff --git a/src/components/Options/OptionsDate.vue b/src/components/Options/OptionsDate.vue
index 9195896285..157b32b807 100644
--- a/src/components/Options/OptionsDate.vue
+++ b/src/components/Options/OptionsDate.vue
@@ -6,10 +6,6 @@
 <script setup lang="ts">
 import { t } from '@nextcloud/l10n'
 
-import NcEmptyContent from '@nextcloud/vue/components/NcEmptyContent'
-
-import DatePollIcon from 'vue-material-design-icons/CalendarBlankOutline.vue'
-
 import OptionItem from './OptionItem.vue'
 import OptionMenu from './OptionMenu.vue'
 
@@ -19,37 +15,24 @@ import { useOptionsStore } from '../../stores/options'
 const pollStore = usePollStore()
 const optionsStore = useOptionsStore()
 
-const cssVar = {
+const componentStyle = {
 	'--content-deleted': `" (${t('polls', 'deleted')})"`,
 }
 </script>
 
 <template>
-	<div
-		v-if="optionsStore.options.length"
-		:style="cssVar"
-		class="options-list date">
-		<TransitionGroup name="list">
-			<OptionItem
-				v-for="option in optionsStore.sortedOptions"
-				:key="option.id"
-				:option="option"
-				show-owner>
-				<template #actions>
-					<OptionMenu
-						v-if="pollStore.permissions.edit || option.isOwner"
-						:option="option" />
-				</template>
-			</OptionItem>
-		</TransitionGroup>
-	</div>
-
-	<NcEmptyContent
-		v-else
-		:name="t('polls', 'No vote options')"
-		:description="t('polls', 'Add some!')">
-		<template #icon>
-			<DatePollIcon />
-		</template>
-	</NcEmptyContent>
+	<TransitionGroup tag="ul" name="list" :style="componentStyle">
+		<OptionItem
+			v-for="option in optionsStore.sortedOptions"
+			:key="option.id"
+			:option="option"
+			tag="li"
+			show-owner>
+			<template #actions>
+				<OptionMenu
+					v-if="pollStore.permissions.edit || option.isOwner"
+					:option="option" />
+			</template>
+		</OptionItem>
+	</TransitionGroup>
 </template>
diff --git a/src/components/Options/OptionsText.vue b/src/components/Options/OptionsText.vue
index 2d0190dd21..5670fa4c11 100644
--- a/src/components/Options/OptionsText.vue
+++ b/src/components/Options/OptionsText.vue
@@ -32,7 +32,7 @@ useSortable(useTemplateRef<HTMLElement>('list'), optionsStore.options, {
 	},
 })
 
-const cssVar = {
+const componentStyle = {
 	'--content-deleted': `" (${t('polls', 'deleted')})"`,
 }
 
@@ -48,24 +48,22 @@ function onSort(event: { oldIndex: number; newIndex: number }) {
 </script>
 
 <template>
-	<div ref="list" :style="cssVar">
-		<div
+	<TransitionGroup ref="list" tag="ul" :style="componentStyle">
+		<OptionItem
 			v-for="option in optionsStore.options"
 			:key="option.id"
-			class="sortable">
-			<OptionItem
-				:key="option.id"
-				:option="option"
-				:draggable="true"
-				show-owner>
-				<template #actions>
-					<OptionMenu
-						v-if="pollStore.permissions.edit || option.isOwner"
-						:option="option" />
-				</template>
-			</OptionItem>
-		</div>
-	</div>
+			class="sortable"
+			:option="option"
+			:draggable="true"
+			tag="li"
+			show-owner>
+			<template #actions>
+				<OptionMenu
+					v-if="pollStore.permissions.edit || option.isOwner"
+					:option="option" />
+			</template>
+		</OptionItem>
+	</TransitionGroup>
 </template>
 
 <style lang="scss">
diff --git a/src/components/SideBar/SideBarTabOptions.vue b/src/components/SideBar/SideBarTabOptions.vue
index 01cbe1c6af..09a78992c4 100644
--- a/src/components/SideBar/SideBarTabOptions.vue
+++ b/src/components/SideBar/SideBarTabOptions.vue
@@ -20,6 +20,7 @@ import AddDateIcon from 'vue-material-design-icons/CalendarPlusOutline.vue'
 import DateOptionsIcon from 'vue-material-design-icons/CalendarMonthOutline.vue'
 import ShiftDateIcon from 'vue-material-design-icons/CalendarStartOutline.vue'
 import TextOptionsIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
+import DatePollIcon from 'vue-material-design-icons/CalendarBlankOutline.vue'
 import OptionsTextAddBulk from '../Options/OptionsTextAddBulk.vue'
 import ActionAddOption from '../Actions/modules/ActionAddOption.vue'
 import { Event } from '../../Types'
@@ -87,7 +88,16 @@ onUnmounted(() => {
 			<DateOptionsIcon />
 		</template>
 
-		<OptionsDate />
+		<OptionsDate v-if="optionsStore.options.length" />
+
+		<NcEmptyContent
+			v-else
+			:name="t('polls', 'No vote options')"
+			:description="t('polls', 'Add some!')">
+			<template #icon>
+				<DatePollIcon />
+			</template>
+		</NcEmptyContent>
 
 		<template v-if="!pollStore.isClosed" #actions>
 			<ActionAddOption :caption="t('polls', 'Add a date')" />

From d6875881750df197b1e45b667439b6e014d8d557 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sun, 14 Sep 2025 11:17:00 +0200
Subject: [PATCH 8/9] some visual adjustments

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/assets/scss/vars.scss                     |  2 ++
 src/components/Base/modules/BadgeDiv.vue      |  4 ++--
 src/components/Base/modules/BadgeSmallDiv.vue | 12 +++++-----
 src/components/Base/modules/InputDiv.vue      |  4 ++--
 src/components/Base/modules/StickyDiv.vue     | 14 +++++------
 src/components/Calendar/CalendarInfo.vue      |  2 +-
 src/components/Options/OptionItem.vue         |  2 +-
 src/components/Poll/PollInfoLine.vue          |  2 +-
 src/components/PollList/PollItem.vue          |  2 +-
 src/components/VoteTable/VoteTable.vue        | 24 +++++--------------
 10 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/src/assets/scss/vars.scss b/src/assets/scss/vars.scss
index a3f77dbb8c..4cc3b1de8b 100644
--- a/src/assets/scss/vars.scss
+++ b/src/assets/scss/vars.scss
@@ -6,6 +6,8 @@
 :root,
 [data-theme-light] {
 	--cap-width: 49rem;
+	--shadow-height: 0.7rem;
+	--shadow-height-inverted: -0.7rem;
 	--color-polls-foreground-yes: #2d7b41;
 	--color-polls-foreground-no: #db0606;
 	--color-polls-foreground-maybe: #a37200;
diff --git a/src/components/Base/modules/BadgeDiv.vue b/src/components/Base/modules/BadgeDiv.vue
index 6286dcef78..b67665ad6e 100644
--- a/src/components/Base/modules/BadgeDiv.vue
+++ b/src/components/Base/modules/BadgeDiv.vue
@@ -39,13 +39,13 @@ const { tag = 'span' } = defineProps<{ tag?: string }>()
 	}
 
 	&.error {
-		border-color: var(--color-error);
+		border-color: var(--color-border-error-);
 		background-color: var(--color-error);
 		color: var(--color-primary-element-text) !important;
 	}
 
 	&.success {
-		border-color: var(--color-success);
+		border-color: var(--color-border-success);
 		background-color: var(--color-success);
 		color: var(--color-primary-element-text) !important;
 	}
diff --git a/src/components/Base/modules/BadgeSmallDiv.vue b/src/components/Base/modules/BadgeSmallDiv.vue
index 67ee95d75a..cb23d2e51e 100644
--- a/src/components/Base/modules/BadgeSmallDiv.vue
+++ b/src/components/Base/modules/BadgeSmallDiv.vue
@@ -42,18 +42,18 @@ const { tag = 'span' } = defineProps<{ tag?: string }>()
 	}
 
 	&.error {
-		background-color: rgba(var(--color-error-rgb), 0.2);
-		border-color: var(--color-error);
+		background-color: var(--color-error);
+		border-color: var(--color-border-error);
 	}
 
 	&.success {
-		background-color: rgba(var(--color-success-rgb), 0.2);
-		border-color: var(--color-success);
+		background-color: var(--color-success);
+		border-color: var(--color-border-success);
 	}
 
 	&.warning {
-		background-color: rgba(var(--color-warning-rgb), 0.2) !important;
-		border-color: var(--color-warning);
+		background-color: var(--color-warning);
+		border-color: var(--color-element-warning);
 	}
 }
 </style>
diff --git a/src/components/Base/modules/InputDiv.vue b/src/components/Base/modules/InputDiv.vue
index 20519d4cb0..2a3400efbc 100644
--- a/src/components/Base/modules/InputDiv.vue
+++ b/src/components/Base/modules/InputDiv.vue
@@ -285,11 +285,11 @@ const inputClass = computed(() => [
 		}
 
 		&.error {
-			border-color: var(--color-error);
+			border-color: var(--color-border-error);
 		}
 
 		&.success {
-			border-color: var(--color-success);
+			border-color: var(--color-border-success);
 		}
 	}
 
diff --git a/src/components/Base/modules/StickyDiv.vue b/src/components/Base/modules/StickyDiv.vue
index f3e8b7d331..6f054e3d67 100644
--- a/src/components/Base/modules/StickyDiv.vue
+++ b/src/components/Base/modules/StickyDiv.vue
@@ -63,19 +63,17 @@ const stickyClass = computed(() => ({
 		<div class="top"></div>
 		<div class="top-right-corner"></div>
 
-		<div class="right"></div>
-
-		<div class="bottom-right-corner"></div>
-		<div class="bottom"></div>
-		<div class="bottom-left-corner"></div>
-
 		<div class="left"></div>
-
-		<div class="stage outer" :style="style">
+		<div class="stage center" :style="style">
 			<slot name="default">
 				<div class="inner"></div>
 			</slot>
 		</div>
+		<div class="right"></div>
+
+		<div class="bottom-right-corner"></div>
+		<div class="bottom"></div>
+		<div class="bottom-left-corner"></div>
 	</div>
 </template>
 
diff --git a/src/components/Calendar/CalendarInfo.vue b/src/components/Calendar/CalendarInfo.vue
index 9e2737f30e..f30f5e9e5f 100644
--- a/src/components/Calendar/CalendarInfo.vue
+++ b/src/components/Calendar/CalendarInfo.vue
@@ -122,7 +122,7 @@ const conflictLevel = computed(() => {
 	}
 
 	&.conflict-no {
-		border-inline-start: 4px solid var(--color-success);
+		border-inline-start: 4px solid var(--color-border-success);
 	}
 
 	&.cancelled {
diff --git a/src/components/Options/OptionItem.vue b/src/components/Options/OptionItem.vue
index f830e4770d..24603ad864 100644
--- a/src/components/Options/OptionItem.vue
+++ b/src/components/Options/OptionItem.vue
@@ -76,7 +76,7 @@ const pollStore = usePollStore()
 	.confirmed & {
 		background-color: var(--color-polls-background-yes);
 		border-radius: var(--border-radius-container);
-		border: 2px solid var(--color-success-text);
+		border: 2px solid var(--color-border-success);
 	}
 
 	.list-view .confirmed & {
diff --git a/src/components/Poll/PollInfoLine.vue b/src/components/Poll/PollInfoLine.vue
index 49912f6875..596dfa96d2 100644
--- a/src/components/Poll/PollInfoLine.vue
+++ b/src/components/Poll/PollInfoLine.vue
@@ -181,7 +181,7 @@ const timeExpirationRelative = computed(() => {
 	.closed,
 	.archived {
 		.sub-text {
-			color: var(--color-error);
+			color: var(--color-error-text);
 			font-weight: 700;
 		}
 	}
diff --git a/src/components/PollList/PollItem.vue b/src/components/PollList/PollItem.vue
index 7e86e15c77..76e1896da7 100644
--- a/src/components/PollList/PollItem.vue
+++ b/src/components/PollList/PollItem.vue
@@ -243,7 +243,7 @@ const descriptionLine = computed(() => {
 				<template #icon>
 					<ParticipatedIcon
 						:size="16"
-						style="color: var(--color-success-text)" />
+						style="color: var(--color-element-success)" />
 				</template>
 			</BadgeSmallDiv>
 
diff --git a/src/components/VoteTable/VoteTable.vue b/src/components/VoteTable/VoteTable.vue
index 3cf396e397..fefe9326f5 100644
--- a/src/components/VoteTable/VoteTable.vue
+++ b/src/components/VoteTable/VoteTable.vue
@@ -139,7 +139,6 @@ function isVotable(participant: User, option: Option) {
 			</div>
 			<StickyDiv
 				:id="`option-item-${option.id}`"
-				class="option-item"
 				:class="{
 					confirmed: option.confirmed && pollStore.status.isExpired,
 				}"
@@ -192,7 +191,9 @@ function isVotable(participant: User, option: Option) {
 	grid-auto-flow: column;
 	overflow: scroll;
 	margin: auto;
-
+	& > div {
+		border-inline-start: 1px solid var(--color-border);
+	}
 	.vote-cell {
 		padding: 0.4rem;
 		display: flex;
@@ -201,7 +202,7 @@ function isVotable(participant: User, option: Option) {
 
 	.participant {
 		grid-column: 1;
-		padding: 0.8rem 0.1rem 0.1rem 0.1rem;
+		place-self: center;
 		inset-inline-start: 0;
 		background-color: var(--color-main-background);
 
@@ -209,11 +210,6 @@ function isVotable(participant: User, option: Option) {
 			visibility: hidden;
 		}
 
-		&.sticky-left {
-			inset-inline-start: -8px;
-			padding-inline-start: 8px;
-		}
-
 		&:hover {
 			background: var(--color-background-hover);
 
@@ -267,7 +263,6 @@ function isVotable(participant: User, option: Option) {
 
 		.option-menu-grid {
 			grid-row: 1;
-			border-inline-start: 1px solid var(--color-border);
 			background-color: var(--color-main-background);
 
 			.calendar-peek {
@@ -277,28 +272,21 @@ function isVotable(participant: User, option: Option) {
 
 		.option-item {
 			grid-row: 2;
-			border-inline-start: 1px solid var(--color-border);
 		}
 
 		.counter {
 			grid-row: 3;
-			border-inline-start: 1px solid var(--color-border);
-		}
-
-		.vote-cell {
-			border-inline-start: 1px solid var(--color-border);
 		}
 
 		> .current-user {
-			margin-top: 1.5rem;
-			margin-bottom: 1.5rem;
+			padding-top: 1.5rem;
+			padding-bottom: 1.5rem;
 		}
 
 		.vote-column {
 			display: flex;
 			flex-direction: column;
 			flex: 1 0 11rem;
-			border-inline-start: 1px solid var(--color-border-dark);
 		}
 	}
 

From bb13e74659d862f4864012ddba95e71b7e01e2b0 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Sun, 14 Sep 2025 21:27:26 +0200
Subject: [PATCH 9/9] fix

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

diff --git a/src/components/Base/modules/StickyDiv.vue b/src/components/Base/modules/StickyDiv.vue
index 6f054e3d67..30bd36b80d 100644
--- a/src/components/Base/modules/StickyDiv.vue
+++ b/src/components/Base/modules/StickyDiv.vue
@@ -64,7 +64,7 @@ const stickyClass = computed(() => ({
 		<div class="top-right-corner"></div>
 
 		<div class="left"></div>
-		<div class="stage center" :style="style">
+		<div class="stage" :style="style">
 			<slot name="default">
 				<div class="inner"></div>
 			</slot>