From fe1119ee93a376b30afa47fcbd910ddfadc26b7f Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Tue, 16 Jul 2024 15:42:19 +0200
Subject: [PATCH] chore(lint): autofix vue/block-order

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 .../renderer/AuthenticationApp.vue            | 100 +++++++++---------
 src/help/renderer/HelpApp.vue                 |  70 ++++++------
 src/shared/globals/OC/OcDialogsAdapter.vue    |  22 ++--
 src/talk/renderer/DesktopHeader.vue           |  50 ++++-----
 src/talk/renderer/Viewer/ViewerApp.vue        |  52 ++++-----
 .../renderer/Viewer/ViewerHandlerImages.vue   |  12 +--
 .../renderer/Viewer/ViewerHandlerVideos.vue   |  12 +--
 src/talk/renderer/components/UiMenu.vue       |   6 +-
 src/talk/renderer/components/UiMenuItem.vue   |  30 +++---
 .../renderer/components/UiMenuSeparator.vue   |   4 +-
 src/upgrade/renderer/UpgradeApp.vue           |  24 ++---
 11 files changed, 191 insertions(+), 191 deletions(-)

diff --git a/src/authentication/renderer/AuthenticationApp.vue b/src/authentication/renderer/AuthenticationApp.vue
index 9e21722e..da5e2f22 100644
--- a/src/authentication/renderer/AuthenticationApp.vue
+++ b/src/authentication/renderer/AuthenticationApp.vue
@@ -3,56 +3,6 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
-<template>
-	<div class="wrapper">
-		<div class="spacer">
-			<div class="logo" />
-		</div>
-		<div class="login-box">
-			<form @submit.prevent="login">
-				<fieldset :disabled="state === 'loading'">
-					<h2 class="login-box__header">
-						{{ t('talk_desktop', 'Log in to Nextcloud') }}
-					</h2>
-					<NcTextField :label="t('talk_desktop', 'Nextcloud server address')"
-						label-visible
-						:value.sync="rawServerUrl"
-						placeholder="https://try.nextcloud.com"
-						inputmode="url"
-						:success="state === 'success'"
-						:error="state === 'error'"
-						:helper-text="stateText" />
-					<NcButton v-if="state !== 'loading'"
-						class="submit-button"
-						type="primary"
-						native-type="submit"
-						wide>
-						<template #icon>
-							<MdiArrowRight :size="20" />
-						</template>
-						{{ t('talk_desktop', 'Log in') }}
-					</NcButton>
-					<NcButton v-else-if="state ==='loading'"
-						class="submit-button"
-						type="primary"
-						native-type="submit"
-						wide>
-						<template #icon>
-							<NcLoadingIcon appearance="light" />
-						</template>
-						{{ t('talk_desktop', 'Logging in …') }}
-					</NcButton>
-				</fieldset>
-			</form>
-		</div>
-		<div class="spacer">
-			<footer class="footer">
-				Nextcloud Talk Desktop {{ version }}
-			</footer>
-		</div>
-	</div>
-</template>
-
 <script setup>
 import { computed, ref } from 'vue'
 import MdiArrowRight from 'vue-material-design-icons/ArrowRight.vue'
@@ -188,6 +138,56 @@ async function login() {
 }
 </script>
 
+<template>
+	<div class="wrapper">
+		<div class="spacer">
+			<div class="logo" />
+		</div>
+		<div class="login-box">
+			<form @submit.prevent="login">
+				<fieldset :disabled="state === 'loading'">
+					<h2 class="login-box__header">
+						{{ t('talk_desktop', 'Log in to Nextcloud') }}
+					</h2>
+					<NcTextField :label="t('talk_desktop', 'Nextcloud server address')"
+						label-visible
+						:value.sync="rawServerUrl"
+						placeholder="https://try.nextcloud.com"
+						inputmode="url"
+						:success="state === 'success'"
+						:error="state === 'error'"
+						:helper-text="stateText" />
+					<NcButton v-if="state !== 'loading'"
+						class="submit-button"
+						type="primary"
+						native-type="submit"
+						wide>
+						<template #icon>
+							<MdiArrowRight :size="20" />
+						</template>
+						{{ t('talk_desktop', 'Log in') }}
+					</NcButton>
+					<NcButton v-else-if="state ==='loading'"
+						class="submit-button"
+						type="primary"
+						native-type="submit"
+						wide>
+						<template #icon>
+							<NcLoadingIcon appearance="light" />
+						</template>
+						{{ t('talk_desktop', 'Logging in …') }}
+					</NcButton>
+				</fieldset>
+			</form>
+		</div>
+		<div class="spacer">
+			<footer class="footer">
+				Nextcloud Talk Desktop {{ version }}
+			</footer>
+		</div>
+	</div>
+</template>
+
 <style scoped>
 .wrapper {
 	height: 100vh;
diff --git a/src/help/renderer/HelpApp.vue b/src/help/renderer/HelpApp.vue
index fa740060..0e527ce6 100644
--- a/src/help/renderer/HelpApp.vue
+++ b/src/help/renderer/HelpApp.vue
@@ -3,41 +3,6 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
-<template>
-	<div class="about">
-		<h2>{{ t('talk_desktop', 'About') }}</h2>
-		<p>{{ packageInfo.productName }} - {{ packageInfo.description }}</p>
-		<ul class="about__list">
-			<li>
-				{{ t('talk_desktop', 'Privacy and Legal Policy') }}: <a class="link" href="https://nextcloud.com/privacy/" target="_blank">https://nextcloud.com/privacy/</a>
-			</li>
-			<li>
-				{{ t('talk_desktop', 'License') }}: <a class="link" href="https://www.gnu.org/licenses/agpl-3.0.txt" target="_blank">{{ packageInfo.license }}</a>
-			</li>
-			<li>
-				{{ t('talk_desktop', 'Issues') }}: <a :href="packageInfo.bugs" class="link" target="_blank">{{ packageInfo.bugs }}</a>
-			</li>
-			<li>
-				{{ t('talk_desktop', 'Source Code') }}: <a :href="packageInfo.repository" class="link" target="_blank">{{ packageInfo.repository }}</a>
-			</li>
-		</ul>
-		<NcTextArea :aria-label="t('talk_desktop', 'System report')"
-			:value="report"
-			rows="11"
-			readonly
-			class="about__report"
-			@focus="$event.target.setSelectionRange(0, -1)" />
-		<p>
-			<NcButton type="secondary" wide @click="close">
-				<template #icon>
-					<MdiWindowClose />
-				</template>
-				{{ t('talk_desktop', 'Close') }}
-			</NcButton>
-		</p>
-	</div>
-</template>
-
 <script setup>
 import { onBeforeUnmount, onMounted } from 'vue'
 
@@ -94,6 +59,41 @@ onBeforeUnmount(() => {
 })
 </script>
 
+<template>
+	<div class="about">
+		<h2>{{ t('talk_desktop', 'About') }}</h2>
+		<p>{{ packageInfo.productName }} - {{ packageInfo.description }}</p>
+		<ul class="about__list">
+			<li>
+				{{ t('talk_desktop', 'Privacy and Legal Policy') }}: <a class="link" href="https://nextcloud.com/privacy/" target="_blank">https://nextcloud.com/privacy/</a>
+			</li>
+			<li>
+				{{ t('talk_desktop', 'License') }}: <a class="link" href="https://www.gnu.org/licenses/agpl-3.0.txt" target="_blank">{{ packageInfo.license }}</a>
+			</li>
+			<li>
+				{{ t('talk_desktop', 'Issues') }}: <a :href="packageInfo.bugs" class="link" target="_blank">{{ packageInfo.bugs }}</a>
+			</li>
+			<li>
+				{{ t('talk_desktop', 'Source Code') }}: <a :href="packageInfo.repository" class="link" target="_blank">{{ packageInfo.repository }}</a>
+			</li>
+		</ul>
+		<NcTextArea :aria-label="t('talk_desktop', 'System report')"
+			:value="report"
+			rows="11"
+			readonly
+			class="about__report"
+			@focus="$event.target.setSelectionRange(0, -1)" />
+		<p>
+			<NcButton type="secondary" wide @click="close">
+				<template #icon>
+					<MdiWindowClose />
+				</template>
+				{{ t('talk_desktop', 'Close') }}
+			</NcButton>
+		</p>
+	</div>
+</template>
+
 <style scoped>
 .about {
 	height: 100%;
diff --git a/src/shared/globals/OC/OcDialogsAdapter.vue b/src/shared/globals/OC/OcDialogsAdapter.vue
index 6da874cc..ab4b83a5 100644
--- a/src/shared/globals/OC/OcDialogsAdapter.vue
+++ b/src/shared/globals/OC/OcDialogsAdapter.vue
@@ -3,17 +3,6 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
-<template>
-	<div>
-		<NcDialog v-for="dialog in dialogs"
-			:key="dialog.id"
-			:name="dialog.name"
-			:message="dialog.message"
-			:buttons="dialog.buttons"
-			@update:open="deleteDialog(dialog.id)" />
-	</div>
-</template>
-
 <script setup>
 import { del, ref, set } from 'vue'
 import { translate as t } from '@nextcloud/l10n'
@@ -182,3 +171,14 @@ defineExpose({
 	prompt,
 })
 </script>
+
+<template>
+	<div>
+		<NcDialog v-for="dialog in dialogs"
+			:key="dialog.id"
+			:name="dialog.name"
+			:message="dialog.message"
+			:buttons="dialog.buttons"
+			@update:open="deleteDialog(dialog.id)" />
+	</div>
+</template>
diff --git a/src/talk/renderer/DesktopHeader.vue b/src/talk/renderer/DesktopHeader.vue
index 0d065070..628687ba 100644
--- a/src/talk/renderer/DesktopHeader.vue
+++ b/src/talk/renderer/DesktopHeader.vue
@@ -3,31 +3,6 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
-<template>
-	<header id="header" class="header">
-		<div class="header__inner">
-			<div v-if="!OS.isMac"
-				class="header__title-wrapper"
-				role="button"
-				tabindex="0"
-				@click="pushToRoot">
-				<span class="header__title">Nextcloud Talk</span>
-				<span class="header__preview-badge">Preview</span>
-			</div>
-
-			<div class="spacer" />
-
-			<div class="header__item" data-theme-dark>
-				<MainMenu />
-			</div>
-
-			<div class="header__item">
-				<UserMenu :user="user" @logout="logout" />
-			</div>
-		</div>
-	</header>
-</template>
-
 <script setup>
 import MainMenu from './components/MainMenu.vue'
 import UserMenu from './components/UserMenu.vue'
@@ -75,6 +50,31 @@ onUnmounted(() => {
 })
 </script>
 
+<template>
+	<header id="header" class="header">
+		<div class="header__inner">
+			<div v-if="!OS.isMac"
+				class="header__title-wrapper"
+				role="button"
+				tabindex="0"
+				@click="pushToRoot">
+				<span class="header__title">Nextcloud Talk</span>
+				<span class="header__preview-badge">Preview</span>
+			</div>
+
+			<div class="spacer" />
+
+			<div class="header__item" data-theme-dark>
+				<MainMenu />
+			</div>
+
+			<div class="header__item">
+				<UserMenu :user="user" @logout="logout" />
+			</div>
+		</div>
+	</header>
+</template>
+
 <style scoped>
 .header {
 	height: 50px;
diff --git a/src/talk/renderer/Viewer/ViewerApp.vue b/src/talk/renderer/Viewer/ViewerApp.vue
index 1af436ff..f888e58c 100644
--- a/src/talk/renderer/Viewer/ViewerApp.vue
+++ b/src/talk/renderer/Viewer/ViewerApp.vue
@@ -3,32 +3,6 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
-<template>
-	<NcModal v-if="file"
-		id="viewer"
-		:show.sync="isOpen"
-		class="viewer-modal"
-		:class="{ 'viewer-modal--open': isOpen }"
-		:name="file.basename"
-		size="full"
-		:close-button-contained="false"
-		dark
-		@close="close">
-		<component :is="viewComponent"
-			v-if="viewComponent"
-			:file="file" />
-
-		<template #actions>
-			<NcActionLink :href="link">
-				<template #icon>
-					<MdiOpenInNew />
-				</template>
-				{{ t('talk_desktop', 'Open in a Web-Browser') }}
-			</NcActionLink>
-		</template>
-	</NcModal>
-</template>
-
 <script setup>
 import { computed, ref } from 'vue'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
@@ -74,6 +48,32 @@ defineExpose({
 })
 </script>
 
+<template>
+	<NcModal v-if="file"
+		id="viewer"
+		:show.sync="isOpen"
+		class="viewer-modal"
+		:class="{ 'viewer-modal--open': isOpen }"
+		:name="file.basename"
+		size="full"
+		:close-button-contained="false"
+		dark
+		@close="close">
+		<component :is="viewComponent"
+			v-if="viewComponent"
+			:file="file" />
+
+		<template #actions>
+			<NcActionLink :href="link">
+				<template #icon>
+					<MdiOpenInNew />
+				</template>
+				{{ t('talk_desktop', 'Open in a Web-Browser') }}
+			</NcActionLink>
+		</template>
+	</NcModal>
+</template>
+
 <style>
 .header {
 	transition: background-color 250ms; /* Same as NcModal transition timing */
diff --git a/src/talk/renderer/Viewer/ViewerHandlerImages.vue b/src/talk/renderer/Viewer/ViewerHandlerImages.vue
index 098d70f2..e33b16ce 100644
--- a/src/talk/renderer/Viewer/ViewerHandlerImages.vue
+++ b/src/talk/renderer/Viewer/ViewerHandlerImages.vue
@@ -3,12 +3,6 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
-<template>
-	<div class="media-wrapper">
-		<img :src="src" :alt="file.basename">
-	</div>
-</template>
-
 <script setup>
 import { computed } from 'vue'
 import { generateUrl } from '@nextcloud/router'
@@ -37,6 +31,12 @@ const src = computed(() => {
 })
 </script>
 
+<template>
+	<div class="media-wrapper">
+		<img :src="src" :alt="file.basename">
+	</div>
+</template>
+
 <style scoped>
 .media-wrapper {
 	display: flex;
diff --git a/src/talk/renderer/Viewer/ViewerHandlerVideos.vue b/src/talk/renderer/Viewer/ViewerHandlerVideos.vue
index 10c25318..20ed49f8 100644
--- a/src/talk/renderer/Viewer/ViewerHandlerVideos.vue
+++ b/src/talk/renderer/Viewer/ViewerHandlerVideos.vue
@@ -3,12 +3,6 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
-<template>
-	<div class="media-wrapper">
-		<video :src="src" controls />
-	</div>
-</template>
-
 <script setup>
 import { computed } from 'vue'
 import { generateRemoteUrl } from '@nextcloud/router'
@@ -30,6 +24,12 @@ const src = computed(() => {
 })
 </script>
 
+<template>
+	<div class="media-wrapper">
+		<video :src="src" controls />
+	</div>
+</template>
+
 <style scoped>
 .media-wrapper {
 	display: flex;
diff --git a/src/talk/renderer/components/UiMenu.vue b/src/talk/renderer/components/UiMenu.vue
index f8360984..325b7d67 100644
--- a/src/talk/renderer/components/UiMenu.vue
+++ b/src/talk/renderer/components/UiMenu.vue
@@ -3,6 +3,9 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
+<script setup>
+</script>
+
 <template>
 	<nav class="menu">
 		<ul class="menu__inner">
@@ -11,9 +14,6 @@
 	</nav>
 </template>
 
-<script setup>
-</script>
-
 <style scoped>
 .menu {
 }
diff --git a/src/talk/renderer/components/UiMenuItem.vue b/src/talk/renderer/components/UiMenuItem.vue
index 68953160..965e98a1 100644
--- a/src/talk/renderer/components/UiMenuItem.vue
+++ b/src/talk/renderer/components/UiMenuItem.vue
@@ -3,6 +3,21 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
+<script>
+export default {
+	inheritAttrs: false,
+}
+</script>
+
+<script setup>
+defineProps({
+	tag: {
+		type: [String, Object, Function],
+		default: 'button',
+	},
+})
+</script>
+
 <template>
 	<li class="menu-item">
 		<component :is="tag" class="menu-item__action unstyled-action" v-bind="$attrs">
@@ -21,21 +36,6 @@
 	</li>
 </template>
 
-<script>
-export default {
-	inheritAttrs: false,
-}
-</script>
-
-<script setup>
-defineProps({
-	tag: {
-		type: [String, Object, Function],
-		default: 'button',
-	},
-})
-</script>
-
 <style scoped>
 .unstyled-action {
 	border: none;
diff --git a/src/talk/renderer/components/UiMenuSeparator.vue b/src/talk/renderer/components/UiMenuSeparator.vue
index 1c8f7230..1458e747 100644
--- a/src/talk/renderer/components/UiMenuSeparator.vue
+++ b/src/talk/renderer/components/UiMenuSeparator.vue
@@ -3,12 +3,12 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
+<script setup></script>
+
 <template>
 	<li class="menu-item-separator" />
 </template>
 
-<script setup></script>
-
 <style scoped lang="scss">
 .menu-item-separator {
 	border-top: 1px solid var(--color-border-dark);
diff --git a/src/upgrade/renderer/UpgradeApp.vue b/src/upgrade/renderer/UpgradeApp.vue
index 49541267..ecb4ee8c 100644
--- a/src/upgrade/renderer/UpgradeApp.vue
+++ b/src/upgrade/renderer/UpgradeApp.vue
@@ -3,6 +3,18 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 
+<script setup>
+import MdiUpdate from 'vue-material-design-icons/Update.vue'
+import MdiWeb from 'vue-material-design-icons/Web.vue'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import { translate as t } from '@nextcloud/l10n'
+import { generateUrl } from '@nextcloud/router'
+
+const packageInfo = window.TALK_DESKTOP.packageInfo
+
+const browserLink = generateUrl('apps/spreed')
+</script>
+
 <template>
 	<div class="upgrade">
 		<h2>{{ t('talk_desktop', 'Upgrade required') }}</h2>
@@ -27,18 +39,6 @@
 	</div>
 </template>
 
-<script setup>
-import MdiUpdate from 'vue-material-design-icons/Update.vue'
-import MdiWeb from 'vue-material-design-icons/Web.vue'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import { translate as t } from '@nextcloud/l10n'
-import { generateUrl } from '@nextcloud/router'
-
-const packageInfo = window.TALK_DESKTOP.packageInfo
-
-const browserLink = generateUrl('apps/spreed')
-</script>
-
 <style scoped>
 .upgrade {
 	display: flex;