From 569850d666a6c2efab33f54294940ebaf5f64c11 Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Wed, 23 Aug 2023 10:11:39 +0200
Subject: [PATCH] Reorganize components

---
 src/components/{ => Discover}/AddRss.vue      |  0
 src/components/{ => Discover}/Search.vue      |  4 +-
 src/components/{ => Discover}/TopItem.vue     |  0
 src/components/{ => Discover}/TopList.vue     |  0
 src/components/Feed/Banner.vue                | 74 +++++++++++++++++++
 .../{FeedListItem.vue => Sidebar/Item.vue}    |  2 +-
 src/views/Discover.vue                        |  6 +-
 src/views/Feed.vue                            | 29 ++------
 src/views/Index.vue                           |  6 +-
 9 files changed, 91 insertions(+), 30 deletions(-)
 rename src/components/{ => Discover}/AddRss.vue (100%)
 rename src/components/{ => Discover}/Search.vue (92%)
 rename src/components/{ => Discover}/TopItem.vue (100%)
 rename src/components/{ => Discover}/TopList.vue (100%)
 create mode 100644 src/components/Feed/Banner.vue
 rename src/components/{FeedListItem.vue => Sidebar/Item.vue} (98%)

diff --git a/src/components/AddRss.vue b/src/components/Discover/AddRss.vue
similarity index 100%
rename from src/components/AddRss.vue
rename to src/components/Discover/AddRss.vue
diff --git a/src/components/Search.vue b/src/components/Discover/Search.vue
similarity index 92%
rename from src/components/Search.vue
rename to src/components/Discover/Search.vue
index 4521f9c..14ca612 100644
--- a/src/components/Search.vue
+++ b/src/components/Discover/Search.vue
@@ -20,8 +20,8 @@
 <script>
 import { NcAvatar, NcListItem } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
-import { debounce } from '../utils/debounce.js'
-import { formatTimeAgo } from '../utils/time.js'
+import { debounce } from '../../utils/debounce.js'
+import { formatTimeAgo } from '../../utils/time.js'
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 
diff --git a/src/components/TopItem.vue b/src/components/Discover/TopItem.vue
similarity index 100%
rename from src/components/TopItem.vue
rename to src/components/Discover/TopItem.vue
diff --git a/src/components/TopList.vue b/src/components/Discover/TopList.vue
similarity index 100%
rename from src/components/TopList.vue
rename to src/components/Discover/TopList.vue
diff --git a/src/components/Feed/Banner.vue b/src/components/Feed/Banner.vue
new file mode 100644
index 0000000..4df3d3c
--- /dev/null
+++ b/src/components/Feed/Banner.vue
@@ -0,0 +1,74 @@
+<template>
+	<div class="header">
+		<img class="background" :src="imageUrl">
+		<div class="content">
+			<NcAvatar :display-name="author"
+				:is-no-user="true"
+				:url="imageUrl" />
+			<div class="infos">
+				<h1>{{ title }}</h1>
+				<a :href="link" target="_blank">
+					{{ author }}
+				</a>
+			</div>
+			<NcAppNavigationNew :text="t('Subscribe')">
+				<template #icon>
+					<Plus :size="20" />
+				</template>
+			</NcAppNavigationNew>
+		</div>
+	</div>
+</template>
+
+<script>
+import { NcAppNavigationNew, NcAvatar } from '@nextcloud/vue'
+import Plus from 'vue-material-design-icons/Plus.vue'
+
+export default {
+	name: 'Banner',
+	components: {
+		NcAvatar,
+		NcAppNavigationNew,
+		Plus,
+	},
+	props: {
+		author: {
+			type: String,
+			required: true,
+		},
+		imageUrl: {
+			type: String,
+			required: true,
+		},
+		link: {
+			type: String,
+			required: true,
+		},
+		title: {
+			type: String,
+			required: true,
+		},
+	},
+}
+</script>
+
+<style scoped>
+	.header {
+		overflow: hidden;
+		position: relative;
+	}
+
+	.background {
+		filter: blur(.5rem) brightness(50%);
+		opacity: 0.4;
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: auto;
+	}
+
+	.content {
+		position: relative;
+	}
+</style>
diff --git a/src/components/FeedListItem.vue b/src/components/Sidebar/Item.vue
similarity index 98%
rename from src/components/FeedListItem.vue
rename to src/components/Sidebar/Item.vue
index 86f3b3f..977fa42 100644
--- a/src/components/FeedListItem.vue
+++ b/src/components/Sidebar/Item.vue
@@ -29,7 +29,7 @@ import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 
 export default {
-	name: 'FeedListItem',
+	name: 'Item',
 	components: {
 		Alert,
 		Delete,
diff --git a/src/views/Discover.vue b/src/views/Discover.vue
index 946f00d..66ee503 100644
--- a/src/views/Discover.vue
+++ b/src/views/Discover.vue
@@ -12,11 +12,11 @@
 </template>
 
 <script>
-import AddRss from '../components/AddRss.vue'
+import AddRss from '../components/Discover/AddRss.vue'
 import Magnify from 'vue-material-design-icons/Magnify.vue'
 import { NcTextField } from '@nextcloud/vue'
-import Search from '../components/Search.vue'
-import TopList from '../components/TopList.vue'
+import Search from '../components/Discover/Search.vue'
+import TopList from '../components/Discover/TopList.vue'
 
 export default {
 	name: 'Discover',
diff --git a/src/views/Feed.vue b/src/views/Feed.vue
index 354857c..315fd21 100644
--- a/src/views/Feed.vue
+++ b/src/views/Feed.vue
@@ -6,29 +6,18 @@
 				<Alert />
 			</template>
 		</NcEmptyContent>
-		<div v-if="feed" class="header">
-			<NcAvatar :display-name="feed.author"
-				:is-no-user="true"
-				:url="feed.imageUrl" />
-			<div class="infos">
-				<h1>{{ feed.title }}</h1>
-				<a :href="feed.link" target="_blank">
-					{{ feed.author }}
-				</a>
-			</div>
-			<NcAppNavigationNew :text="t('Subscribe')">
-				<template #icon>
-					<Plus :size="20" />
-				</template>
-			</NcAppNavigationNew>
-		</div>
+		<Banner v-if="feed"
+			:author="feed.author"
+			:image-url="feed.imageUrl"
+			:link="feed.link"
+			:title="feed.title" />
 	</fragment>
 </template>
 
 <script>
-import { NcAppNavigationNew, NcAvatar, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
+import { NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
 import Alert from 'vue-material-design-icons/Alert.vue'
-import Plus from 'vue-material-design-icons/Plus.vue'
+import Banner from '../components/Feed/Banner.vue'
 import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 
@@ -36,11 +25,9 @@ export default {
 	name: 'Feed',
 	components: {
 		Alert,
-		NcAvatar,
-		NcAppNavigationNew,
+		Banner,
 		NcEmptyContent,
 		NcLoadingIcon,
-		Plus,
 	},
 	data() {
 		return {
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 205679c..c412ac8 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">
-					<FeedListItem v-for="subscriptionUrl of subscriptions"
+					<Item v-for="subscriptionUrl of subscriptions"
 						:key="subscriptionUrl"
 						:url="subscriptionUrl" />
 				</ul>
@@ -31,14 +31,14 @@ import {
 	NcAppNavigationNew,
 	NcLoadingIcon,
 } from '@nextcloud/vue'
-import FeedListItem from '../components/FeedListItem.vue'
+import Item from '../components/Sidebar/Item.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 import { showError } from '@nextcloud/dialogs'
 
 export default {
 	name: 'Index',
 	components: {
-		FeedListItem,
+		Item,
 		NcAppContent,
 		NcAppContentList,
 		NcAppNavigation,