From 7084c231877b9ce65bc915f695a3fe0e1366e438 Mon Sep 17 00:00:00 2001
From: Paul Tirk <paultirk@paultirk.com>
Date: Thu, 21 Mar 2024 20:22:49 +0000
Subject: [PATCH 1/7] move feed item list header actually into header

Signed-off-by: Paul Tirk <paultirk@paultirk.com>
---
 src/components/ContentTemplate.vue            | 21 +++++--------------
 .../feed-display/FeedItemDisplayList.vue      | 13 +++++++++++-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/ContentTemplate.vue b/src/components/ContentTemplate.vue
index 57a1ce618d..ddfe200de1 100644
--- a/src/components/ContentTemplate.vue
+++ b/src/components/ContentTemplate.vue
@@ -3,14 +3,14 @@
 		@update:showDetails="unselectItem()">
 		<template #list>
 			<NcAppContentList>
-				<div class="header">
-					<slot name="header" />
-				</div>
-
 				<FeedItemDisplayList :items="items"
 					:fetch-key="fetchKey"
 					:config="config"
-					@load-more="emit('load-more')" />
+					@load-more="emit('load-more')">
+					<template #header>
+						<slot name="header" />
+					</template>
+				</FeedItemDisplayList>
 			</NcAppContentList>
 		</template>
 
@@ -92,14 +92,3 @@ function unselectItem() {
 }
 
 </script>
-
-<style scoped>
-
-.header {
-	padding-left: 50px;
-	position: absolute;
-	top: 1em;
-	font-weight: 700;
-}
-
-</style>
diff --git a/src/components/feed-display/FeedItemDisplayList.vue b/src/components/feed-display/FeedItemDisplayList.vue
index 6ff4d9d664..65bd6cf13c 100644
--- a/src/components/feed-display/FeedItemDisplayList.vue
+++ b/src/components/feed-display/FeedItemDisplayList.vue
@@ -1,6 +1,10 @@
 <template>
 	<div class="feed-item-display-list">
 		<div class="header">
+			<div class="header-content">
+				<slot name="header" />
+			</div>
+
 			<NcActions class="filter-container" :force-menu="true">
 				<template #icon>
 					<FilterIcon />
@@ -206,8 +210,15 @@ export default Vue.extend({
 	}
 
 	.header {
-		justify-content: right;
 		display: flex;
+		align-items: center;
+		justify-content: right;
+	}
+
+	.header-content {
+		flex-grow: 1;
+		padding-left: 50px;
+		font-weight: 700;
 	}
 
 	.filter-container {

From a25138ab8d235251e201e4eafefbc5eb9c709e07 Mon Sep 17 00:00:00 2001
From: Paul Tirk <paultirk@paultirk.com>
Date: Thu, 21 Mar 2024 20:22:49 +0000
Subject: [PATCH 2/7] grow main container of feed item row

Signed-off-by: Paul Tirk <paultirk@paultirk.com>
---
 src/components/feed-display/FeedItemRow.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/feed-display/FeedItemRow.vue b/src/components/feed-display/FeedItemRow.vue
index f699f2e732..baa9e78edd 100644
--- a/src/components/feed-display/FeedItemRow.vue
+++ b/src/components/feed-display/FeedItemRow.vue
@@ -190,6 +190,7 @@ export default Vue.extend({
 	.feed-item-row .main-container {
 		flex-grow: 1;
 		min-width: 0;
+		flex-grow: 1;
 	}
 
 	.feed-item-row .title-container {

From acd80fab539c7c21aebdfd5b3e3306bad45b5230 Mon Sep 17 00:00:00 2001
From: Paul Tirk <paultirk@paultirk.com>
Date: Fri, 22 Mar 2024 12:04:15 +0100
Subject: [PATCH 3/7] reset content scroll position when changing feed item

Signed-off-by: Paul Tirk <paultirk@paultirk.com>
---
 src/components/ContentTemplate.vue            | 35 ++++++++++++++-----
 .../feed-display/FeedItemDisplay.vue          |  2 --
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/components/ContentTemplate.vue b/src/components/ContentTemplate.vue
index ddfe200de1..25d1c1f43e 100644
--- a/src/components/ContentTemplate.vue
+++ b/src/components/ContentTemplate.vue
@@ -14,15 +14,17 @@
 			</NcAppContentList>
 		</template>
 
-		<NcAppContentDetails>
-			<FeedItemDisplay v-if="selectedFeedItem" :item="selectedFeedItem" />
-			<NcEmptyContent v-else
-				:title="t('news', 'No article selected')"
-				:description="t('news', 'Please select an article from the list...')">
-				<template #icon>
-					<TextIcon />
-				</template>
-			</NcEmptyContent>
+		<NcAppContentDetails class="feed-item-content">
+			<div ref="contentElement" class="feed-item-content-wrapper">
+				<FeedItemDisplay v-if="selectedFeedItem" :item="selectedFeedItem" />
+				<NcEmptyContent v-else
+					:title="t('news', 'No article selected')"
+					:description="t('news', 'Please select an article from the list...')">
+					<template #icon>
+						<TextIcon />
+					</template>
+				</NcEmptyContent>
+			</div>
 		</NcAppContentDetails>
 	</NcAppContent>
 </template>
@@ -68,6 +70,8 @@ const emit = defineEmits<{(event: 'load-more'): void}>()
 
 const showDetails = ref(false)
 
+const contentElement = ref()
+
 const selectedFeedItem = computed(() => {
 	return itemStore.getters.selected(itemStore.state)
 })
@@ -75,6 +79,7 @@ const selectedFeedItem = computed(() => {
 watch(selectedFeedItem, (newSelectedFeedItem) => {
 	if (newSelectedFeedItem) {
 		showDetails.value = true
+		contentElement.value?.scrollTo(0, 0)
 	} else {
 		showDetails.value = false
 	}
@@ -92,3 +97,15 @@ function unselectItem() {
 }
 
 </script>
+
+<style>
+.feed-item-content {
+	overflow:hidden;
+	height: 100%
+}
+
+.feed-item-content-wrapper {
+	height: 100%;
+	overflow-y: scroll;
+}
+</style>
diff --git a/src/components/feed-display/FeedItemDisplay.vue b/src/components/feed-display/FeedItemDisplay.vue
index cb9becdbc3..1126a05777 100644
--- a/src/components/feed-display/FeedItemDisplay.vue
+++ b/src/components/feed-display/FeedItemDisplay.vue
@@ -200,7 +200,6 @@ export default Vue.extend({
 
 <style>
 	.feed-item-display {
-		max-height: 100%;
 		overflow-y: hidden;
 		display: flex;
 		flex-direction: column;
@@ -208,7 +207,6 @@ export default Vue.extend({
 
 	.article {
 		padding: 0 50px 50px 50px;
-		overflow-y: scroll;
 		height: 100%;
 		max-width: 1024px;
 		margin-left: auto;

From 476728dc7128786fe04b1eb432ff540ea4793aa6 Mon Sep 17 00:00:00 2001
From: Paul Tirk <paultirk@paultirk.com>
Date: Fri, 22 Mar 2024 12:05:33 +0100
Subject: [PATCH 4/7] improve typing of feed item display list config

Signed-off-by: Paul Tirk <paultirk@paultirk.com>
---
 src/components/ContentTemplate.vue                  |  4 ++--
 src/components/feed-display/FeedItemDisplayList.vue | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/ContentTemplate.vue b/src/components/ContentTemplate.vue
index 25d1c1f43e..08b4f1a1a7 100644
--- a/src/components/ContentTemplate.vue
+++ b/src/components/ContentTemplate.vue
@@ -49,7 +49,7 @@ import TextIcon from 'vue-material-design-icons/Text.vue'
 
 import { FeedItem } from '../types/FeedItem'
 
-import FeedItemDisplayList from './feed-display/FeedItemDisplayList.vue'
+import FeedItemDisplayList, { Config } from './feed-display/FeedItemDisplayList.vue'
 import FeedItemDisplay from './feed-display/FeedItemDisplay.vue'
 
 defineProps({
@@ -62,7 +62,7 @@ defineProps({
 		required: true,
 	},
 	config: {
-		type: Object,
+		type: Object as PropType<Config>,
 	},
 })
 
diff --git a/src/components/feed-display/FeedItemDisplayList.vue b/src/components/feed-display/FeedItemDisplayList.vue
index 65bd6cf13c..28134220c6 100644
--- a/src/components/feed-display/FeedItemDisplayList.vue
+++ b/src/components/feed-display/FeedItemDisplayList.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue'
+import Vue, { type PropType } from 'vue'
 import _ from 'lodash'
 
 import FilterIcon from 'vue-material-design-icons/Filter.vue'
@@ -66,6 +66,11 @@ const DEFAULT_DISPLAY_LIST_CONFIG = {
 	unreadFilter: true,
 }
 
+export type Config = {
+	unreadFilter: boolean;
+	starFlter: boolean;
+}
+
 export default Vue.extend({
 	components: {
 		VirtualScroll,
@@ -88,7 +93,7 @@ export default Vue.extend({
 			required: true,
 		},
 		config: {
-			type: Object,
+			type: Object as PropType<Config>,
 			default: () => {
 				return DEFAULT_DISPLAY_LIST_CONFIG
 			},
@@ -136,7 +141,7 @@ export default Vue.extend({
 		unreadFilter(item: FeedItem): boolean {
 			return item.unread
 		},
-		toggleFilter(filter: () => boolean) {
+		toggleFilter(filter: (item: FeedItem) => boolean) {
 			if (this.filter === filter) {
 				this.filter = this.noFilter
 				if (filter === this.unreadFilter) {

From 3fb66e719c8439f114fd9dfd0ef921ea0dee6278 Mon Sep 17 00:00:00 2001
From: Paul Tirk <paultirk@paultirk.com>
Date: Mon, 1 Apr 2024 21:02:22 +0000
Subject: [PATCH 5/7] fix link to feed in article header

Signed-off-by: Paul Tirk <paultirk@paultirk.com>
---
 src/components/feed-display/FeedItemDisplay.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/feed-display/FeedItemDisplay.vue b/src/components/feed-display/FeedItemDisplay.vue
index 1126a05777..0831214212 100644
--- a/src/components/feed-display/FeedItemDisplay.vue
+++ b/src/components/feed-display/FeedItemDisplay.vue
@@ -34,8 +34,7 @@
 					{{ t('news', 'by') }} {{ item.author }}
 				</span>
 				<span v-if="!item.sharedBy" class="source">{{ t('news', 'from') }}
-					<!-- TODO: Fix link to feed -->
-					<a :href="`#/items/feeds/${item.feedId}/`">
+					<a :href="`#/feed/${item.feedId}/`">
 						{{ getFeed(item.feedId).title }}
 						<img v-if="getFeed(item.feedId).faviconLink"
 							:src="getFeed(item.feedId).faviconLink"

From 8bc76b2529c380d8c0f76bdfcf01a40ed70a2fa7 Mon Sep 17 00:00:00 2001
From: Paul Tirk <paultirk@paultirk.com>
Date: Fri, 3 May 2024 09:05:47 +0200
Subject: [PATCH 6/7] add changelog entries

Signed-off-by: Paul Tirk <paultirk@paultirk.com>
---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e283aa6d47..ae86b8e0ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,11 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the
 # Unreleased
 ## [25.x.x]
 ### Changed
+- Improve layout of feed item row (#2569)
 
 ### Fixed
-
+- Reset content scroll position when feed item is changed (#2569)
+- Fix link to feed in article header (#2569)
 
 # Releases
 ## [25.0.0-alpha5] - 2024-04-01

From dfa8de391b57b3e93d1bdf0e4e7bd57a3d121153 Mon Sep 17 00:00:00 2001
From: Benjamin Brahmer <info@b-brahmer.de>
Date: Tue, 7 May 2024 13:49:12 +0200
Subject: [PATCH 7/7] update authors

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
---
 AUTHORS.md | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 2fc07430db..3b3a41db7e 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -22,6 +22,7 @@
 * [Bernhard Posselt](mailto:bep@foryouandyourcustomers.com)
 * [Thomas Müller](mailto:thomas.mueller@tmit.eu)
 * [Hoàng Đức Hiếu](mailto:hdhoang@zahe.me)
+* [IgorA100](mailto:igora100@gmail.com)
 * [Marco Nassabain](mailto:marco.nassabain@etu.unistra.fr)
 * [rakekniven](mailto:mark.ziegler@rakekniven.de)
 * [Daniel Opitz](mailto:git@copynpaste.de)
@@ -40,6 +41,7 @@
 * [Xéfir Destiny](mailto:xefir@crystalyx.net)
 * [devlinjunker](mailto:devlin.junker@gmail.com)
 * [hydrian](mailto:ben.tyger@tygerclan.net)
+* [mortee](mailto:mortee@kavemalna.hu)
 * [Daniel Opitz](mailto:danopz@users.noreply.github.com)
 * [Daniel Rheinbay](mailto:danielrheinbay@gmail.com)
 * [Lars Bensmann](mailto:lars@almosthappy.de)
@@ -52,7 +54,6 @@
 * [Christoph Stenglein](mailto:christoph@christophstenglein.com)
 * [Daniel Kesselberg](mailto:mail@danielkesselberg.de)
 * [ELHADDAD Hamza](mailto:elhaddadhamza49@gmail.com)
-* [IgorA100](mailto:igora100@gmail.com)
 * [Jakob Sack](mailto:mail@jakobsack.de)
 * [ManuelSailer](mailto:github.com@manuel-sailer.de)
 * [Qingping Hou](mailto:dave2008713@gmail.com)
@@ -75,9 +76,11 @@
 * [Loki3000](mailto:github@labcms.ru)
 * [Maik Kulbe](mailto:info@linux-web-development.de)
 * [Manuel Sailer](mailto:github.com@manuel-sailer.de)
+* [Martin Vuille](mailto:jpmv27@yahoo.com)
 * [Michael Gapczynski](mailto:mtgap@owncloud.com)
 * [Nikita Chernyi](mailto:rakshazi@users.noreply.github.com)
 * [Peter Hedlund](mailto:peter@peterandlinda.com)
+* [Petra Mirelli](mailto:80395360+iNtEgraIR2021@users.noreply.github.com)
 * [Simon Spannagel](mailto:simonspa@kth.se)
 * [bbBowser](mailto:carspi@mail.de)
 * [benediktb](mailto:benedikt@blablub.de)
@@ -85,6 +88,7 @@
 * [davidak](mailto:git@davidak.de)
 * [hooger](mailto:horvathg.1988@gmail.com)
 * [lsmooth](mailto:ls@lsmooth.de)
+* [mortee](mailto:mortee.github@kavemalna.hu)
 * [s17t.net](mailto:mail+github@s17t.net)
 * [Accalia](mailto:Accalia@Elementia.me)
 * [Accalia Elementia](mailto:accalia@elementia.me)
@@ -109,6 +113,7 @@
 * [Chris Aumann](mailto:me@chr4.org)
 * [Chris Danser](mailto:skiingwiz@gmail.com)
 * [Chris Noxz](mailto:chris@noxz.tech)
+* [Christof Dorner](mailto:christof@chdorner.com)
 * [Christoph Wurst](mailto:ChristophWurst@users.noreply.github.com)
 * [Clemens](mailto:clemens@clemensknost.de)
 * [Colin W](mailto:cwmke@users.noreply.github.com)
@@ -138,10 +143,12 @@
 * [Hendrik Leppelsack](mailto:hendrik@leppelsack.de)
 * [Jasper Knockaert](mailto:jasper@knockaert.nl)
 * [Jimmy Boucher](mailto:75694650+jboucher614@users.noreply.github.com)
+* [Josh](mailto:josh.t.richards@gmail.com)
 * [Kevin Decherf](mailto:kevin@kdecherf.com)
 * [Kuba Orlik](mailto:kontakt@kuba-orlik.name)
 * [Maceček Richard](mailto:46937538+macecekrichard@users.noreply.github.com)
 * [Marc Cousin](mailto:marc.cousin@people-doc.com)
+* [Marcus Nitzschke](mailto:mail@kendix.org)
 * [Martin Ferretti](mailto:ferrettimartin@protonmail.com)
 * [Matthias](mailto:matthias.baier@mabaart.de)
 * [Matthias Blümel](mailto:user@inanna.local)
@@ -196,6 +203,7 @@
 * [markusj](mailto:markusj@users.noreply.github.com)
 * [mnassabain](mailto:34754819+mnassabain@users.noreply.github.com)
 * [mormegil](mailto:mormegil@centrum.cz)
+* [nextcloud-command](mailto:nextcloud-command@users.noreply.github.com)
 * [nextcloud486153](mailto:78801830+nextcloud486153@users.noreply.github.com)
 * [nexus-uw](mailto:you@example.com)
 * [repat](mailto:repat@repat.de)