From c78f75a33275142dad225dd98313d5f79da7e86b Mon Sep 17 00:00:00 2001 From: estrogen elf <87099578+BlossomiShymae@users.noreply.github.com> Date: Sun, 22 Jun 2025 19:10:36 -0500 Subject: [PATCH] refactor: datamodels and service name --- Needlework.Net/{Models => DataModels}/GithubRelease.cs | 2 +- Needlework.Net/{Models => DataModels}/HextechDocsPost.cs | 2 +- Needlework.Net/Program.cs | 2 +- Needlework.Net/Services/GithubService.cs | 2 +- .../{HextechDocsPostService.cs => HextechDocsService.cs} | 6 +++--- .../ViewModels/Pages/Home/HextechDocsPostViewModel.cs | 2 +- Needlework.Net/ViewModels/Pages/Home/HomeViewModel.cs | 8 ++++---- 7 files changed, 12 insertions(+), 12 deletions(-) rename Needlework.Net/{Models => DataModels}/GithubRelease.cs (90%) rename Needlework.Net/{Models => DataModels}/HextechDocsPost.cs (87%) rename Needlework.Net/Services/{HextechDocsPostService.cs => HextechDocsService.cs} (92%) diff --git a/Needlework.Net/Models/GithubRelease.cs b/Needlework.Net/DataModels/GithubRelease.cs similarity index 90% rename from Needlework.Net/Models/GithubRelease.cs rename to Needlework.Net/DataModels/GithubRelease.cs index 6f8c93d..5c42346 100644 --- a/Needlework.Net/Models/GithubRelease.cs +++ b/Needlework.Net/DataModels/GithubRelease.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Needlework.Net.Models +namespace Needlework.Net.DataModels { public class GithubRelease { diff --git a/Needlework.Net/Models/HextechDocsPost.cs b/Needlework.Net/DataModels/HextechDocsPost.cs similarity index 87% rename from Needlework.Net/Models/HextechDocsPost.cs rename to Needlework.Net/DataModels/HextechDocsPost.cs index 2b464b0..1663b90 100644 --- a/Needlework.Net/Models/HextechDocsPost.cs +++ b/Needlework.Net/DataModels/HextechDocsPost.cs @@ -1,4 +1,4 @@ -namespace Needlework.Net.Models +namespace Needlework.Net.DataModels { public class HextechDocsPost { diff --git a/Needlework.Net/Program.cs b/Needlework.Net/Program.cs index 5c3a514..1e4e510 100644 --- a/Needlework.Net/Program.cs +++ b/Needlework.Net/Program.cs @@ -111,7 +111,7 @@ class Program builder.AddSingleton(); builder.AddSingleton(); builder.AddSingleton(); - builder.AddSingleton(); + builder.AddSingleton(); builder.AddSingleton(); builder.AddSingleton((_) => { diff --git a/Needlework.Net/Services/GithubService.cs b/Needlework.Net/Services/GithubService.cs index 080e930..0c4269a 100644 --- a/Needlework.Net/Services/GithubService.cs +++ b/Needlework.Net/Services/GithubService.cs @@ -2,8 +2,8 @@ using Flurl.Http; using Flurl.Http.Configuration; using Needlework.Net.Constants; +using Needlework.Net.DataModels; using Needlework.Net.Extensions; -using Needlework.Net.Models; using System; using System.Reactive.Linq; using System.Threading.Tasks; diff --git a/Needlework.Net/Services/HextechDocsPostService.cs b/Needlework.Net/Services/HextechDocsService.cs similarity index 92% rename from Needlework.Net/Services/HextechDocsPostService.cs rename to Needlework.Net/Services/HextechDocsService.cs index 5955672..4791e85 100644 --- a/Needlework.Net/Services/HextechDocsPostService.cs +++ b/Needlework.Net/Services/HextechDocsService.cs @@ -1,7 +1,7 @@ using Akavache; using AngleSharp; +using Needlework.Net.DataModels; using Needlework.Net.Extensions; -using Needlework.Net.Models; using System; using System.Collections.Generic; using System.Reactive.Linq; @@ -9,13 +9,13 @@ using System.Threading.Tasks; namespace Needlework.Net.Services { - public class HextechDocsPostService : IEnableLogger + public class HextechDocsService : IEnableLogger { private readonly IBrowsingContext _context = BrowsingContext.New(Configuration.Default.WithDefaultLoader()); private readonly IBlobCache _blobCache; - public HextechDocsPostService(IBlobCache blobCache) + public HextechDocsService(IBlobCache blobCache) { _blobCache = blobCache; } diff --git a/Needlework.Net/ViewModels/Pages/Home/HextechDocsPostViewModel.cs b/Needlework.Net/ViewModels/Pages/Home/HextechDocsPostViewModel.cs index ff0e674..68b859d 100644 --- a/Needlework.Net/ViewModels/Pages/Home/HextechDocsPostViewModel.cs +++ b/Needlework.Net/ViewModels/Pages/Home/HextechDocsPostViewModel.cs @@ -1,5 +1,5 @@ using CommunityToolkit.Mvvm.ComponentModel; -using Needlework.Net.Models; +using Needlework.Net.DataModels; namespace Needlework.Net.ViewModels.Pages.Home { diff --git a/Needlework.Net/ViewModels/Pages/Home/HomeViewModel.cs b/Needlework.Net/ViewModels/Pages/Home/HomeViewModel.cs index f51a0fb..28f7b69 100644 --- a/Needlework.Net/ViewModels/Pages/Home/HomeViewModel.cs +++ b/Needlework.Net/ViewModels/Pages/Home/HomeViewModel.cs @@ -17,13 +17,13 @@ namespace Needlework.Net.ViewModels.Pages.Home; public partial class HomeViewModel : PageBase, IEnableLogger { - private readonly HextechDocsPostService _hextechDocsPostService; + private readonly HextechDocsService _hextechDocsService; private readonly IDisposable _carouselNextDisposable; - public HomeViewModel(HextechDocsPostService hextechDocsPostService) : base("Home", "fa-solid fa-house", int.MinValue) + public HomeViewModel(HextechDocsService hextechDocsService) : base("Home", "fa-solid fa-house", int.MinValue) { - _hextechDocsPostService = hextechDocsPostService; + _hextechDocsService = hextechDocsService; _carouselNextDisposable = Observable.Timer(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5)) .Select(time => Unit.Default) @@ -63,7 +63,7 @@ public partial class HomeViewModel : PageBase, IEnableLogger { try { - var posts = await _hextechDocsPostService.GetPostsAsync(); + var posts = await _hextechDocsService.GetPostsAsync(); var hextechDocsPosts = posts.Select(post => new HextechDocsPostViewModel(post)).ToList(); Dispatcher.UIThread.Invoke(() => {