Restructure

ParagRaut · Nov 15, 2021 · dc5736a · dc5736a
1 parent 7d810ca
commit dc5736a
Show file tree

Hide file tree

Showing 13 changed files with 21 additions and 20 deletions.
diff --git a/src/Client/Pages/GarfieldComicsViewer.razor b/src/Client/Pages/GarfieldComicsViewer.razor
@@ -51,7 +51,7 @@
     {
         _isLoading = true;
         _fileResult = await Http.GetStringAsync("Comics/garfield");
-        _imageList.Add(_fileResult);
+        _imageList?.Add(_fileResult);
         _isLoading = false;
     }
 

diff --git a/...CalvinAndHobbes/CalvinAndHobbesService.cs → ...CalvinAndHobbes/CalvinAndHobbesService.cs b/...CalvinAndHobbes/CalvinAndHobbesService.cs → ...CalvinAndHobbes/CalvinAndHobbesService.cs
@@ -1,6 +1,6 @@
 using HtmlAgilityPack;
 
-namespace ComicsApp.Server.ComicsService.ComicSources.CalvinAndHobbes;
+namespace ComicsApp.Server.ComicsService.CalvinAndHobbes;
 
 public static class CalvinAndHobbesService
 {

diff --git a/...r/ComicsService/ComicSources/ComicEnum.cs → src/Server/ComicsService/ComicEnum.cs b/...r/ComicsService/ComicSources/ComicEnum.cs → src/Server/ComicsService/ComicEnum.cs
@@ -1,4 +1,5 @@
-namespace ComicsApp.Server.ComicsService.ComicSources;
+namespace ComicsApp.Server.ComicsService;
+
 public enum ComicEnum
 {
     Garfield,

diff --git a/...ce/ComicSources/Dilbert/DilbertService.cs → ...r/ComicsService/Dilbert/DilbertService.cs b/...ce/ComicSources/Dilbert/DilbertService.cs → ...r/ComicsService/Dilbert/DilbertService.cs
@@ -1,6 +1,6 @@
 using HtmlAgilityPack;
 
-namespace ComicsApp.Server.ComicsService.ComicSources.Dilbert;
+namespace ComicsApp.Server.ComicsService.Dilbert;
 
 public static class DilbertService
 {

diff --git a/.../ComicSources/Garfield/GarfieldService.cs → ...ComicsService/Garfield/GarfieldService.cs b/.../ComicSources/Garfield/GarfieldService.cs → ...ComicsService/Garfield/GarfieldService.cs
@@ -1,6 +1,6 @@
 using HtmlAgilityPack;
 
-namespace ComicsApp.Server.ComicsService.ComicSources.Garfield;
+namespace ComicsApp.Server.ComicsService.Garfield;
 
 public static class GarfieldService
 {

diff --git a/...vice/ComicSources/XKCD/Generated/IXKCD.cs → ...ver/ComicsService/XKCD/Generated/IXKCD.cs b/...vice/ComicSources/XKCD/Generated/IXKCD.cs → ...ver/ComicsService/XKCD/Generated/IXKCD.cs
@@ -4,7 +4,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace ComicsApp.Server.ComicsService.ComicSources.XKCD.Generated;
+namespace ComicsApp.Server.ComicsService.XKCD.Generated;
 
 using Microsoft.Rest;
 using Models;

diff --git a/...micSources/XKCD/Generated/Models/Comic.cs → ...icsService/XKCD/Generated/Models/Comic.cs b/...micSources/XKCD/Generated/Models/Comic.cs → ...icsService/XKCD/Generated/Models/Comic.cs
@@ -4,7 +4,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace ComicsApp.Server.ComicsService.ComicSources.XKCD.Generated.Models;
+namespace ComicsApp.Server.ComicsService.XKCD.Generated.Models;
 
 using Newtonsoft.Json;
 using System.Linq;

diff --git a/...rvice/ComicSources/XKCD/Generated/XKCD.cs → ...rver/ComicsService/XKCD/Generated/XKCD.cs b/...rvice/ComicSources/XKCD/Generated/XKCD.cs → ...rver/ComicsService/XKCD/Generated/XKCD.cs
@@ -4,7 +4,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace ComicsApp.Server.ComicsService.ComicSources.XKCD.Generated;
+namespace ComicsApp.Server.ComicsService.XKCD.Generated;
 
 using Microsoft.Rest;
 using Microsoft.Rest.Serialization;

diff --git a/...cSources/XKCD/Generated/XKCDExtensions.cs → ...sService/XKCD/Generated/XKCDExtensions.cs b/...cSources/XKCD/Generated/XKCDExtensions.cs → ...sService/XKCD/Generated/XKCDExtensions.cs
@@ -4,7 +4,7 @@
 // regenerated.
 // </auto-generated>
 
-namespace ComicsApp.Server.ComicsService.ComicSources.XKCD.Generated;
+namespace ComicsApp.Server.ComicsService.XKCD.Generated;
 
 using Models;
 using System.Threading;

diff --git a/...Service/ComicSources/XKCD/IXKCDService.cs → ...Server/ComicsService/XKCD/IXKCDService.cs b/...Service/ComicSources/XKCD/IXKCDService.cs → ...Server/ComicsService/XKCD/IXKCDService.cs
@@ -1,4 +1,4 @@
-namespace ComicsApp.Server.ComicsService.ComicSources.XKCD
+namespace ComicsApp.Server.ComicsService.XKCD
 {
     public interface IXKCDService
     {

diff --git a/...sService/ComicSources/XKCD/XKCDService.cs → src/Server/ComicsService/XKCD/XKCDService.cs b/...sService/ComicSources/XKCD/XKCDService.cs → src/Server/ComicsService/XKCD/XKCDService.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics;
-using ComicsApp.Server.ComicsService.ComicSources.XKCD.Generated;
-using ComicsApp.Server.ComicsService.ComicSources.XKCD.Generated.Models;
+using ComicsApp.Server.ComicsService.XKCD.Generated;
+using ComicsApp.Server.ComicsService.XKCD.Generated.Models;
 
-namespace ComicsApp.Server.ComicsService.ComicSources.XKCD;
+namespace ComicsApp.Server.ComicsService.XKCD;
 
 public class XKCDService : IXKCDService
 {

diff --git a/src/Server/Controllers/ComicsController.cs b/src/Server/Controllers/ComicsController.cs
@@ -1,8 +1,8 @@
-using ComicsApp.Server.ComicsService.ComicSources;
-using ComicsApp.Server.ComicsService.ComicSources.CalvinAndHobbes;
-using ComicsApp.Server.ComicsService.ComicSources.Dilbert;
-using ComicsApp.Server.ComicsService.ComicSources.Garfield;
-using ComicsApp.Server.ComicsService.ComicSources.XKCD;
+using ComicsApp.Server.ComicsService;
+using ComicsApp.Server.ComicsService.CalvinAndHobbes;
+using ComicsApp.Server.ComicsService.Dilbert;
+using ComicsApp.Server.ComicsService.Garfield;
+using ComicsApp.Server.ComicsService.XKCD;
 using Microsoft.AspNetCore.Mvc;
 
 namespace ComicsApp.Server.Controllers;

diff --git a/src/Server/Program.cs b/src/Server/Program.cs
@@ -1,5 +1,5 @@
-using ComicsApp.Server.ComicsService.ComicSources.XKCD;
-using ComicsApp.Server.ComicsService.ComicSources.XKCD.Generated;
+using ComicsApp.Server.ComicsService.XKCD;
+using ComicsApp.Server.ComicsService.XKCD.Generated;
 
 var builder = WebApplication.CreateBuilder(args);