Ref/remove-obsolete-html-tags

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()) {

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;

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()

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: {

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;
 	}

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>

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'
@@ -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);
 		}
 	}
 

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'

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" :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>
 

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 {

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'
 

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">
@@ -70,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 & {

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>

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">

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;
 		}
 	}