From e46925718dc5f77fa58ebaafba1e52cb6b0324c6 Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Fri, 7 Jul 2023 16:35:14 +0200
Subject: [PATCH] Before Vuex

---
 src/components/AddRss.vue | 25 +++++++++++++++++++++++++
 src/components/Top.vue    |  2 --
 src/views/Discover.vue    | 15 ++++-----------
 src/views/Index.vue       | 15 +++++++++------
 4 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 src/components/AddRss.vue

diff --git a/src/components/AddRss.vue b/src/components/AddRss.vue
new file mode 100644
index 0000000..3782b7e
--- /dev/null
+++ b/src/components/AddRss.vue
@@ -0,0 +1,25 @@
+<template>
+	<ul>
+		<NcAppNavigationNewItem :title="t('', 'Add a RSS link')">
+			<template #icon>
+				<Plus size="20" />
+			</template>
+		</NcAppNavigationNewItem>
+	</ul>
+</template>
+
+<script>
+import { NcAppNavigationNewItem } from '@nextcloud/vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+
+export default {
+	name: 'AddRss',
+	components: {
+		NcAppNavigationNewItem,
+		Plus,
+	},
+	methods: {
+
+	},
+}
+</script>
diff --git a/src/components/Top.vue b/src/components/Top.vue
index 2683be1..20a8c2c 100644
--- a/src/components/Top.vue
+++ b/src/components/Top.vue
@@ -37,8 +37,6 @@ export default {
 			showMore: true,
 		}
 	},
-	computed: {
-	},
 	async mounted() {
 		await this.fetch(10)
 	},
diff --git a/src/views/Discover.vue b/src/views/Discover.vue
index 1e8ac64..edd09cf 100644
--- a/src/views/Discover.vue
+++ b/src/views/Discover.vue
@@ -6,29 +6,22 @@
 			</NcTextField>
 		</p>
 		<Top v-if="!search" />
-		<ul v-if="!search">
-			<NcAppNavigationNewItem :title="t('', 'Add a RSS link')">
-				<template #icon>
-					<Plus size="20" />
-				</template>
-			</NcAppNavigationNewItem>
-		</ul>
+		<AddRss v-if="!search" />
 	</div>
 </template>
 
 <script>
-import { NcAppNavigationNewItem, NcTextField } from '@nextcloud/vue'
+import AddRss from '../components/AddRss.vue'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
-import Plus from 'vue-material-design-icons/Plus.vue'
+import { NcTextField } from '@nextcloud/vue'
 import Top from '../components/Top.vue'
 
 export default {
 	name: 'Discover',
 	components: {
+		AddRss,
 		Magnify,
-		NcAppNavigationNewItem,
 		NcTextField,
-		Plus,
 		Top,
 	},
 	data() {
diff --git a/src/views/Index.vue b/src/views/Index.vue
index d34f40f..b7d53d9 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -11,7 +11,7 @@
 				</router-link>
 				<NcLoadingIcon v-if="loading" />
 				<ul v-if="!loading">
-					<NcAppNavigationItem v-for="subscription in subscriptions"
+					<NcAppNavigationItem v-for="subscription in sortedSubscriptions"
 						:key="subscription.id"
 						:loading="subscription.loading"
 						:title="subscription.title ?? subscription.url">
@@ -59,6 +59,14 @@ export default {
 			loading: true,
 		}
 	},
+	computed: {
+		sortedSubscriptions() {
+			return this.subscriptions.concat().sort((a, b) => {
+				if (a.title && b.title) return a.title.localeCompare(b.title)
+				return a.id - b.id
+			})
+		},
+	},
 	async mounted() {
 		try {
 			const metrics = await axios.get(generateUrl('/apps/gpoddersync/personal_settings/metrics'))
@@ -87,11 +95,6 @@ export default {
 			} else {
 				this.subscriptions[subscriptionId] = subscription
 			}
-
-			this.subscriptions.sort((a, b) => {
-				if (a.title && b.title) return a.title.localeCompare(b.title)
-				return a.id - b.id
-			})
 		},
 		async updateSubscriptionMeta(subscription) {
 			try {