fixup! feat(Settings): redesign to new vue components

Signed-off-by: Grigory Vodyanov <scratchx@gmx.com>

Author: GVodyanov

src/components/AppNavigation/Settings.vue

@@ -4,86 +4,73 @@
 -->
 
 <template>
-	<NcAppNavigationItem
-		class="navigation-calendar-settings"
+	<NcAppNavigationItem class="navigation-calendar-settings"
 		:name="settingsTitle"
 		:pinned="true"
 		@click.prevent="onShowSettings">
 		<template #icon>
 			<CogIcon :size="20" decorative />
 		</template>
 		<template #extra>
-			<NcAppSettingsDialog
-				id="app-settings-modal"
+			<NcAppSettingsDialog id="app-settings-modal"
 				class="app-settings-modal"
 				:name="t('mail', 'Calendar settings')"
 				:legacy="false"
 				:show-navigation="true"
 				:additional-trap-elements="[]"
 				:open="showSettingsModal"
 				@update:open="(val) => showSettingsModal = val">
-				<NcAppSettingsSection
-					id="settings-modal-general"
+				<NcAppSettingsSection id="settings-modal-general"
 					:name="t('calendar', 'General')">
-					<SettingsTimezoneSelect
-						:is-disabled="loadingCalendars" />
+					<SettingsTimezoneSelect :is-disabled="loadingCalendars" />
 					<NcFormBox>
-						<NcFormBoxButton
-							target="_blank"
+						<NcFormBoxButton target="_blank"
 							:href="availabilitySettingsUrl">
 							{{ $t('calendar', 'Availability settings') }}
 						</NcFormBoxButton>
 					</NcFormBox>
-					<SettingsImportSection
-						:is-disabled="loadingCalendars" />
+					<SettingsImportSection :is-disabled="loadingCalendars" />
 					<NcFormGroup :label="t('calendar', 'CalDAV')" :description="t('calendar', 'Access Nextcloud calendars from other apps and devices')">
 						<NcFormBox>
 							<NcFormBoxCopyButton :label="t('calendar', 'CalDAV URL')" :value="primaryCalDAV" />
 							<NcFormBoxCopyButton :label="t('calendar', 'Server Address for iOS and macOS')" :value="appleCalDAV" />
 						</NcFormBox>
 					</NcFormGroup>
 				</NcAppSettingsSection>
-				<NcAppSettingsSection
-					id="settings-modal-appearance"
+				<NcAppSettingsSection id="settings-modal-appearance"
 					:name="t('calendar', 'Appearance')">
 					<NcFormBox>
-						<NcFormBoxSwitch
-							v-model="hasBirthdayCalendarBinding"
+						<NcFormBoxSwitch v-model="hasBirthdayCalendarBinding"
 							:disabled="isBirthdayCalendarDisabled"
 							@update:modelValue="toggleBirthdayEnabled">
 							{{ $t('calendar', 'Birthday calendar') }}
 						</NcFormBoxSwitch>
-						<NcFormBoxSwitch
-							v-model="showTasksBinding"
+						<NcFormBoxSwitch v-model="showTasksBinding"
 							:disabled="savingTasks"
 							@update:modelValue="toggleTasksEnabled">
 							{{ $t('calendar', 'Tasks in calendar') }}
 						</NcFormBoxSwitch>
-						<NcFormBoxSwitch
-							v-model="showWeekendsBinding"
+						<NcFormBoxSwitch v-model="showWeekendsBinding"
 							:disabled="savingWeekend"
 							@update:modelValue="toggleWeekendsEnabled">
 							{{ $t('calendar', 'Weekends') }}
 						</NcFormBoxSwitch>
-						<NcFormBoxSwitch
-							v-model="showWeekNumbersBinding"
+						<NcFormBoxSwitch v-model="showWeekNumbersBinding"
 							:disabled="savingWeekNumber"
 							@update:modelValue="toggleWeekNumberEnabled">
 							{{ $t('calendar', 'Week numbers') }}
 						</NcFormBoxSwitch>
 					</NcFormBox>
 
 					<NcFormBox>
-						<NcFormBoxSwitch
-							v-model="eventLimitBinding"
+						<NcFormBoxSwitch v-model="eventLimitBinding"
 							:disabled="savingEventLimit"
 							@update:modelValue="toggleEventLimitEnabled">
 							{{ $t('calendar', 'Limit number of events shown in Month view') }}
 						</NcFormBoxSwitch>
 					</NcFormBox>
 
-					<NcSelect
-						:id="slotDuration"
+					<NcSelect :id="slotDuration"
 						:options="slotDurationOptions"
 						:value="selectedDurationOption"
 						:disabled="savingSlotDuration"
@@ -93,11 +80,9 @@
 						label="label"
 						@option:selected="changeSlotDuration" />
 				</NcAppSettingsSection>
-				<NcAppSettingsSection
-					id="app-settings-modal-editing"
+				<NcAppSettingsSection id="app-settings-modal-editing"
 					:name="t('calendar', 'Editing')">
-					<NcSelect
-						:options="defaultReminderOptions"
+					<NcSelect :options="defaultReminderOptions"
 						:value="selectedDefaultReminderOption"
 						:disabled="savingDefaultReminder"
 						:clearable="false"
@@ -106,8 +91,7 @@
 						label="label"
 						@option:selected="changeDefaultReminder" />
 					<NcFormBox>
-						<NcFormBoxSwitch
-							v-model="simpleEventEditorBinding"
+						<NcFormBoxSwitch v-model="simpleEventEditorBinding"
 							:disabled="savingPopover"
 							:label="t('calendar', 'Simple event editor')"
 							@update:modelValue="togglePopoverEnabled">

src/components/AppNavigation/Settings/SettingsAttachmentsFolder.vue

@@ -4,8 +4,7 @@
 -->
 
 <template>
-	<NcFormBoxButton
-		:label="$t('calendar', 'Attachments folder')"
+	<NcFormBoxButton :label="$t('calendar', 'Attachments folder')"
 		:description="attachmentsFolder"
 		inverted-accent
 		@click="selectCalendarFolder">

src/components/AppNavigation/Settings/ShortcutOverview.vue

@@ -4,21 +4,18 @@
 -->
 <template>
 	<NcAppSettingsShortcutsSection>
-		<NcHotkeyList
-			v-for="category in shortcuts"
+		<NcHotkeyList v-for="category in shortcuts"
 			:key="category.categoryId"
 			:label="category.categoryLabel">
-			<NcHotkey
-				v-for="(shortcut, index) in category.shortcuts"
+			<NcHotkey v-for="(shortcut, index) in category.shortcuts"
 				:key="`${category.categoryId}-${index}`"
 				:hotkey="shortcut.or ? null : shortcut.keys[0]"
 				:label="shortcut.label">
 				<template v-if="shortcut.or" #hotkey>
 					<div class="shortcut-section-item__keys">
 						<div v-for="(key, keyIndex) in shortcut.keys" :key="keyIndex">
 							<NcKbd :symbol="key" />
-							<span
-								v-if="keyIndex !== (shortcut.keys.length - 1)">
+							<span v-if="keyIndex !== (shortcut.keys.length - 1)">
 								{{ $t('calendar', 'or') }}
 							</span>
 						</div>