From 8af1497695077c119501c59b0e995c44f2b2722b Mon Sep 17 00:00:00 2001 From: Max Holleman Date: Fri, 26 May 2023 14:43:10 +0200 Subject: [PATCH] Fanciefied UI --- WebSharpRSS/MainLayout.razor | 5 +++-- WebSharpRSS/Models/FeedItemData.cs | 13 ++++++++++++- WebSharpRSS/Pages/Read.razor | 26 ++++++++++++++------------ 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/WebSharpRSS/MainLayout.razor b/WebSharpRSS/MainLayout.razor index 580c5e7..c0ee7ee 100644 --- a/WebSharpRSS/MainLayout.razor +++ b/WebSharpRSS/MainLayout.razor @@ -5,8 +5,9 @@ - - + + + SharpRSS diff --git a/WebSharpRSS/Models/FeedItemData.cs b/WebSharpRSS/Models/FeedItemData.cs index 282b13e..a1234ee 100644 --- a/WebSharpRSS/Models/FeedItemData.cs +++ b/WebSharpRSS/Models/FeedItemData.cs @@ -9,9 +9,20 @@ namespace WebSharpRSS.Models public FeedItemData() { if (Link == null) return; + //FaviconUrl = new Uri(Link).AbsoluteUri; //FaviconUrl = string.Format(Caretaker.Settings["Paths"].GetString("FaviconResolveUrl"), Link.Remove(Link.IndexOf("http", StringComparison.Ordinal), Link.IndexOf("://", StringComparison.Ordinal) + 3)); } public static FeedItemData? FromModel(FeedItemModel model) => Utilities.ConvertFrom(model); - public string FaviconUrl { get; set; } = string.Empty; + public string? FaviconUrl + { + get + { + if (Link == null) return null; + Uri uri = new Uri(Link); + return string.Format(Caretaker.Settings["Paths"].GetString("FaviconResolveUrl"), uri.Host); + } + } + + public string? Icon { get; set; } } } diff --git a/WebSharpRSS/Pages/Read.razor b/WebSharpRSS/Pages/Read.razor index 61849fb..0b56627 100644 --- a/WebSharpRSS/Pages/Read.razor +++ b/WebSharpRSS/Pages/Read.razor @@ -23,21 +23,23 @@ { foreach (var feedItemData in items) { - - + +
- @*@if (feedItemData.Icon != null) - { - - } - @if (feedItemData.FaviconUrl != null) - { - - }*@ - @feedItemData.Title + @if (feedItemData.FaviconUrl != null) + { + + } +
+ @((MarkupString)feedItemData.Title) +
+ @*@feedItemData.Title*@
- @feedItemData.Description +
+ @((MarkupString)feedItemData.Description) +
+ @*@feedItemData.Description*@ @feedItemData.PublishingDate.ToString()