Merge pull request 'Adjusted project to be compatible with the latest moonlight refactoring' (#1) from feat/AdjustToParentRefactor into v2.1

Reviewed-on: #1

Hosts/MoonlightServers.Api.Host/MoonlightServers.Api.Host.csproj

@@ -8,15 +8,14 @@
 
     <ItemGroup>
 
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.3"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.5"/>
 
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.3">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
 
         <PackageReference Include="SimplePlugin" Version="1.0.2"/>
-
         <PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/>
     </ItemGroup>
 

Hosts/MoonlightServers.Frontend.Host/MoonlightServers.Frontend.Host.csproj

@@ -8,8 +8,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.5"/>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.3" PrivateAssets="all"/>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.5" PrivateAssets="all"/>
         <PackageReference Include="SimplePlugin" Version="1.0.2"/>
         <PackageReference Include="SimplePlugin.Abstractions" Version="1.0.2"/>
     </ItemGroup>

Hosts/MoonlightServers.Frontend.Host/Styles/styles.css

@@ -5,7 +5,7 @@
 @import "../bin/ShadcnBlazor/default-theme.css";
 @import "./theme.css";
 
-@source "../bin/Moonlight.Frontend/*.map";
+@source "../bin/**/*.map";
 
 @source "../../../MoonlightServers.Api/**/*.razor";
 @source "../../../MoonlightServers.Api/**/*.cs";

MoonlightServers.Api/Admin/Nodes/CrudController.cs

@@ -3,8 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Hybrid;
-using Moonlight.Shared.Http.Requests;
+using Moonlight.Shared.Shared;
-using Moonlight.Shared.Http.Responses;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 using MoonlightServers.Api.Infrastructure.Implementations.NodeToken;

MoonlightServers.Api/Admin/Templates/CrudController.cs

@@ -1,8 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Moonlight.Shared.Http.Requests;
+using Moonlight.Shared.Shared;
-using Moonlight.Shared.Http.Responses;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 using MoonlightServers.Api.Infrastructure.Database.Json;

MoonlightServers.Api/Admin/Templates/DockerImagesController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Moonlight.Shared.Http.Responses;
+using Moonlight.Shared.Shared;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 using MoonlightServers.Shared;

MoonlightServers.Api/Admin/Templates/VariablesController.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Moonlight.Shared.Http.Responses;
+using Moonlight.Shared.Shared;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 using MoonlightServers.Shared;

MoonlightServers.Api/Infrastructure/Database/DataContext.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using Moonlight.Api.Configuration;
+using Moonlight.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Database.Entities;
 
 namespace MoonlightServers.Api.Infrastructure.Database;

MoonlightServers.Api/MoonlightServers.Api.csproj

@@ -23,8 +23,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.3" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.3" />
         <PackageReference Include="Moonlight.Api" Version="2.1.0">
             <ExcludeAssets>content;contentfiles</ExcludeAssets>
         </PackageReference>

MoonlightServers.Api/Startup.cs

@@ -8,8 +8,8 @@ using MoonlightServers.Api.Admin.Templates;
 using MoonlightServers.Api.Infrastructure.Configuration;
 using MoonlightServers.Api.Infrastructure.Database;
 using MoonlightServers.Api.Infrastructure.Implementations.NodeToken;
+using MoonlightServers.Shared;
 using SimplePlugin.Abstractions;
-using SerializationContext = MoonlightServers.Shared.SerializationContext;
 
 namespace MoonlightServers.Api;
 

MoonlightServers.Frontend/Admin/Nodes/Create.razor

@@ -1,7 +1,7 @@
 @page "/admin/servers/nodes/create"
 
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Nodes
 @using ShadcnBlazor.Buttons

MoonlightServers.Frontend/Admin/Nodes/Edit.razor

@@ -2,7 +2,7 @@
 
 @using System.Net
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Nodes
 @using ShadcnBlazor.Buttons

MoonlightServers.Frontend/Admin/Nodes/Overview.razor

@@ -1,13 +1,11 @@
 @using LucideBlazor
-@using Moonlight.Shared.Http.Requests
+@using Moonlight.Shared.Shared
-@using Moonlight.Shared.Http.Responses
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Nodes
 @using ShadcnBlazor.DataGrids
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Dropdowns
 @using ShadcnBlazor.Extras.AlertDialogs
-@using ShadcnBlazor.Extras.Dialogs
 @using ShadcnBlazor.Extras.Toasts
 @using ShadcnBlazor.Tabels
 

MoonlightServers.Frontend/Admin/Templates/Create.razor

@@ -1,7 +1,7 @@
 @page "/admin/servers/templates/create"
 
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Buttons
@@ -10,7 +10,6 @@
 @using ShadcnBlazor.Extras.Toasts
 @using ShadcnBlazor.Fields
 @using ShadcnBlazor.Inputs
-@using ShadcnBlazor.Tab
 
 @inject HttpClient HttpClient
 @inject NavigationManager Navigation

MoonlightServers.Frontend/Admin/Templates/CreateDockerImageDialog.razor

@@ -1,4 +1,4 @@
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Dialogs

MoonlightServers.Frontend/Admin/Templates/CreateVariableDialog.razor

@@ -1,4 +1,4 @@
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Dialogs

MoonlightServers.Frontend/Admin/Templates/DockerImageListEditor.razor

@@ -1,6 +1,6 @@
 @using System.Text.Json
 @using LucideBlazor
-@using Moonlight.Shared.Http.Responses
+@using Moonlight.Shared.Shared
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Extras.Common
@@ -206,7 +206,7 @@
             try
             {
                 var problemDetails = await response.Content.ReadFromJsonAsync<ProblemDetails>(
-                    Moonlight.Shared.Http.SerializationContext.Default.Options
+                    Moonlight.Shared.SerializationContext.Default.Options
                 );
 
                 if (problemDetails == null)

MoonlightServers.Frontend/Admin/Templates/Overview.razor

@@ -1,6 +1,5 @@
 @using LucideBlazor
-@using Moonlight.Shared.Http.Requests
+@using Moonlight.Shared.Shared
-@using Moonlight.Shared.Http.Responses
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.DataGrids

MoonlightServers.Frontend/Admin/Templates/Update.razor

@@ -1,9 +1,8 @@
 @page "/admin/servers/templates/{Id:int}"
 
 @using System.Net
-@using System.Text.Json
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Buttons

MoonlightServers.Frontend/Admin/Templates/VariableEditor.razor

@@ -1,5 +1,5 @@
 @using LucideBlazor
-@using Moonlight.Frontend.Helpers
+@using Moonlight.Frontend.Infrastructure.Helpers
 @using MoonlightServers.Shared
 @using MoonlightServers.Shared.Admin.Templates
 @using ShadcnBlazor.Accordions

MoonlightServers.Frontend/Admin/Templates/VariableListEditor.razor

@@ -1,12 +1,9 @@
 @using LucideBlazor
-@using Moonlight.Shared.Http.Responses
+@using Moonlight.Shared.Shared
 @using MoonlightServers.Shared.Admin.Templates
-@using ShadcnBlazor.Accordions
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Extras.Common
 @using ShadcnBlazor.Extras.Dialogs
-@using ShadcnBlazor.Fields
-@using ShadcnBlazor.Inputs
 
 @inject HttpClient HttpClient
 @inject DialogService DialogService

MoonlightServers.Frontend/Infrastructure/PermissionProvider.cs

@@ -1,6 +1,6 @@
 using LucideBlazor;
-using Moonlight.Frontend.Interfaces;
+using Moonlight.Frontend.Admin.Users.Shared;
-using Moonlight.Frontend.Models;
+using Moonlight.Frontend.Infrastructure.Hooks;
 using MoonlightServers.Shared;
 
 namespace MoonlightServers.Frontend.Infrastructure;

MoonlightServers.Frontend/Infrastructure/SidebarProvider.cs

@@ -1,6 +1,6 @@
 using LucideBlazor;
-using Moonlight.Frontend.Interfaces;
+using Moonlight.Frontend.Infrastructure.Hooks;
-using Moonlight.Frontend.Models;
+using Moonlight.Frontend.Infrastructure.Models;
 using MoonlightServers.Shared;
 
 namespace MoonlightServers.Frontend.Infrastructure;

MoonlightServers.Frontend/Startup.cs

@@ -1,8 +1,8 @@
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Moonlight.Frontend;
-using Moonlight.Frontend.Configuration;
+using Moonlight.Frontend.Infrastructure.Configuration;
-using Moonlight.Frontend.Interfaces;
+using Moonlight.Frontend.Infrastructure.Hooks;
 using MoonlightServers.Frontend.Infrastructure;
 using SimplePlugin.Abstractions;
 

MoonlightServers.Shared/SerializationContext.cs

@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Moonlight.Shared.Http.Responses;
+using Moonlight.Shared.Shared;
 using MoonlightServers.Shared.Admin.Nodes;
 using MoonlightServers.Shared.Admin.Templates;
 
@@ -21,19 +21,18 @@ namespace MoonlightServers.Shared;
 [JsonSerializable(typeof(DetailedTemplateDto))]
 [JsonSerializable(typeof(PagedData<TemplateDto>))]
 
- [JsonSerializable(typeof(VariableDto))]
+// - Template - Variables
- [JsonSerializable(typeof(PagedData<VariableDto>))]
+[JsonSerializable(typeof(VariableDto))]
- [JsonSerializable(typeof(CreateVariableDto))]
+[JsonSerializable(typeof(PagedData<VariableDto>))]
- [JsonSerializable(typeof(UpdateVariableDto))]
+[JsonSerializable(typeof(CreateVariableDto))]
+[JsonSerializable(typeof(UpdateVariableDto))]
 
+// - Template - Docker Image
 [JsonSerializable(typeof(DockerImageDto))]
 [JsonSerializable(typeof(PagedData<DockerImageDto>))]
 [JsonSerializable(typeof(CreateDockerImageDto))]
 [JsonSerializable(typeof(UpdateDockerImageDto))]
-
-
 [JsonSourceGenerationOptions(JsonSerializerDefaults.Web)]
 public partial class SerializationContext : JsonSerializerContext
 {
-    
 }

MoonlightServers.slnx

@@ -7,7 +7,9 @@
     <Project Path="Hosts\MoonlightServers.Api.Host\MoonlightServers.Api.Host.csproj" />
     <Project Path="Hosts\MoonlightServers.Frontend.Host\MoonlightServers.Frontend.Host.csproj" />
   </Folder>
+  <Folder Name="/Panel/">
     <Project Path="MoonlightServers.Api\MoonlightServers.Api.csproj" />
     <Project Path="MoonlightServers.Frontend\MoonlightServers.Frontend.csproj" />
     <Project Path="MoonlightServers.Shared\MoonlightServers.Shared.csproj" />
+  </Folder>
 </Solution>