diff --git a/RBLNews.Maui/MauiProgram.cs b/RBLNews.Maui/MauiProgram.cs index 0656f53..ad070f6 100644 --- a/RBLNews.Maui/MauiProgram.cs +++ b/RBLNews.Maui/MauiProgram.cs @@ -1,4 +1,6 @@ -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Logging; +using RBLNews.Shared.Services; namespace RBLNews.Maui { @@ -17,6 +19,8 @@ namespace RBLNews.Maui builder.Services.AddMauiBlazorWebView(); builder.Services.AddBlazorBootstrap(); + builder.Services.AddSingleton(); + #if DEBUG builder.Services.AddBlazorWebViewDeveloperTools(); builder.Logging.AddDebug(); diff --git a/RBLNews.Shared/Components/Layout/MainLayout.razor b/RBLNews.Shared/Components/Layout/MainLayout.razor index 077613b..f5f946b 100644 --- a/RBLNews.Shared/Components/Layout/MainLayout.razor +++ b/RBLNews.Shared/Components/Layout/MainLayout.razor @@ -1,17 +1,15 @@ @inherits LayoutComponentBase -
- - @*
+
+ @*
*@
-@*
+@*
About
*@ -
@Body
diff --git a/RBLNews.Shared/Components/Layout/NavMenu.razor b/RBLNews.Shared/Components/Layout/NavMenu.razor index b5ac7b5..2c7be56 100644 --- a/RBLNews.Shared/Components/Layout/NavMenu.razor +++ b/RBLNews.Shared/Components/Layout/NavMenu.razor @@ -1,9 +1,18 @@ -
+@using RBLNews.Shared.Services + +@inject IFeedDataService feedDataService + +
- RBL News auf einen Blick! +
+
+

RBL News auf einen Blick!

+ Letztes Update @this.FeedDataService.Feeds?.LastUpdateDisplay +
+
-@* +@*
@@ -25,4 +34,11 @@
- *@ \ No newline at end of file + *@ + + + +@code { + [Inject] + private IFeedDataService FeedDataService { get; set; } +} \ No newline at end of file diff --git a/RBLNews.Shared/Components/Pages/Feeds.razor b/RBLNews.Shared/Components/Pages/Feeds.razor index 1ddfb86..a64cfc2 100644 --- a/RBLNews.Shared/Components/Pages/Feeds.razor +++ b/RBLNews.Shared/Components/Pages/Feeds.razor @@ -1,7 +1,11 @@ @page "/" @using RBLFeederCommon.Models.RssFeed @using RBLNews.Shared.Enums -@if (rssVM == null) +@using RBLNews.Shared.Services + +@inject IFeedDataService feedDataService + +@if (this.FeedDataService.Feeds == null) {
Lade Feeds ... @@ -11,35 +15,46 @@ else {
- @foreach (FeedGroupVM feedGrp in rssVM.FeedGroups) - { -

@feedGrp.PublishDate

- @foreach (FeedVM feed in feedGrp.Feeds) +
+ @foreach (FeedGroupVM feedGrp in this.FeedDataService.Feeds.FeedGroups) { -
- - - @feed.Title - @feed.Description - - - @GetRssSourceName((RssFeedSources)@feed.Source) | @feed.PubDate - - -
-
+

@feedGrp.PublishDateDisplay

+ @foreach (FeedVM feed in feedGrp.Feeds) + { +
+ + + @feed.Title + @feed.Description + +
    +
  • + @GetRssSourceName((RssFeedSources)@feed.Source) | @feed.PubDate +
    • +
+ +
+ +
+ + +
+
+ } } - } +
} @code { - private RssVM rssVM; HttpClient httpClient = new HttpClient(); + [Inject] + private IFeedDataService FeedDataService { get; set; } + protected async override Task OnInitializedAsync() { - rssVM = await httpClient.GetFromJsonAsync("https://rblnews.de/api/feeds"); + this.FeedDataService.LoadFeeds(); } private string GetRssSourceName(RssFeedSources source) diff --git a/RBLNews.Shared/Models/FeedGroupVM.cs b/RBLNews.Shared/Models/FeedGroupVM.cs index 195cb7f..cdd2684 100644 --- a/RBLNews.Shared/Models/FeedGroupVM.cs +++ b/RBLNews.Shared/Models/FeedGroupVM.cs @@ -4,9 +4,11 @@ namespace RBLFeederCommon.Models.RssFeed; public class FeedGroupVM { - [JsonProperty("pubDate")] - public DateTime PublishDate { get; set; } + public string PublishDateDisplay { get => PublishDate.ToString("dd.MM.yyyy"); } - [JsonProperty("news")] + [JsonProperty("pubDate")] + public DateTime PublishDate { get; set; } + + [JsonProperty("news")] public IList Feeds { get; set; } } \ No newline at end of file diff --git a/RBLNews.Shared/Models/RssVM.cs b/RBLNews.Shared/Models/RssVM.cs index a7757b7..ba2f9e9 100644 --- a/RBLNews.Shared/Models/RssVM.cs +++ b/RBLNews.Shared/Models/RssVM.cs @@ -2,13 +2,15 @@ namespace RBLFeederCommon.Models.RssFeed; -public class RssVM +public class RssVM { - [JsonProperty("lastUpdate")] - public DateTime LastUpdate { get; set; } + public string LastUpdateDisplay { get => this.LastUpdate.ToLocalTime().ToString("dd.MM.yyyy HH:mm"); } + + [JsonProperty("lastUpdate")] + public DateTime LastUpdate { get; set; } - [JsonProperty("description")] + [JsonProperty("description")] public string Description { get; set; } diff --git a/RBLNews.Shared/Services/FeedDataService.cs b/RBLNews.Shared/Services/FeedDataService.cs new file mode 100644 index 0000000..0144389 --- /dev/null +++ b/RBLNews.Shared/Services/FeedDataService.cs @@ -0,0 +1,30 @@ +using RBLFeederCommon.Models.RssFeed; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net.Http; +using System.Net.Http.Json; +using System.Text; +using System.Threading.Tasks; + +namespace RBLNews.Shared.Services +{ + public interface IFeedDataService + { + public RssVM? Feeds { get; } + Task LoadFeeds(); + } + + public class FeedDataService : IFeedDataService + { + private static HttpClient httpClient = new HttpClient(); + + private RssVM? feeds; + public RssVM? Feeds { get => this.feeds; } + + public async Task LoadFeeds() + { + feeds = await httpClient.GetFromJsonAsync("https://rblnews.de/api/feeds"); + } + } +} diff --git a/RBLNews.Shared/wwwroot/css/app.css b/RBLNews.Shared/wwwroot/css/app.css index 1e4c118..7a200fb 100644 --- a/RBLNews.Shared/wwwroot/css/app.css +++ b/RBLNews.Shared/wwwroot/css/app.css @@ -1,4 +1,9 @@ -/*html, body { +.top-row{ + height: 5.1rem !important; + color: aqua; +} + +/*html, body { font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; } diff --git a/RBLNews.Web/Program.cs b/RBLNews.Web/Program.cs index acf27fe..507527c 100644 --- a/RBLNews.Web/Program.cs +++ b/RBLNews.Web/Program.cs @@ -1,3 +1,4 @@ +using RBLNews.Shared.Services; using RBLNews.Web.Components; var builder = WebApplication.CreateBuilder(args); @@ -7,6 +8,8 @@ builder.Services.AddRazorComponents() .AddInteractiveServerComponents(); builder.Services.AddBlazorBootstrap(); +builder.Services.AddSingleton(); + var app = builder.Build(); // Configure the HTTP request pipeline.