Restructured the rest of the features to their own environment

Moonlight/Core/Actions/Dummy/DummyActions.cs

@@ -1,5 +1,5 @@
-using Moonlight.Core.Database.Entities.Store;
-using Moonlight.Core.Models.Abstractions.Services;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 namespace Moonlight.Core.Actions.Dummy;
 

Moonlight/Core/Actions/Dummy/DummyServiceDefinition.cs

@@ -1,7 +1,7 @@
 using Moonlight.Core.Actions.Dummy.Layouts;
 using Moonlight.Core.Actions.Dummy.Pages;
 using Moonlight.Core.Helpers;
-using Moonlight.Core.Models.Abstractions.Services;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 namespace Moonlight.Core.Actions.Dummy;
 

Moonlight/Core/Configuration/ConfigV1.cs

@@ -1,6 +1,8 @@
 using System.ComponentModel;
 using Moonlight.Core.Helpers;
+using Moonlight.Features.Advertisement.Configuration;
 using Moonlight.Features.StoreSystem.Configuration;
+using Moonlight.Features.Theming.Configuration;
 using Newtonsoft.Json;
 
 namespace Moonlight.Core.Configuration;
@@ -20,17 +22,6 @@ public class ConfigV1
     [JsonProperty("Theme")] public ThemeData Theme { get; set; } = new();
     [JsonProperty("Advertisement")] public AdvertisementData Advertisement { get; set; } = new();
     
-    public class AdvertisementData
-    {
-        [JsonProperty("PreventAdBlockers")]
-        [Description("This prevents users from using ad blockers while using moonlight. (Note: The detection might not always work)")]
-        public bool PreventAdBlockers { get; set; }
-    }
-    public class ThemeData
-    {
-        [JsonProperty("EnableDefault")] public bool EnableDefault { get; set; } = true;
-    }
-    
     public class SecurityData
     {
         [JsonProperty("Token")]

Moonlight/Core/Database/DataContext.cs

@@ -1,9 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Services;
 using Moonlight.Features.Community.Entities;
+using Moonlight.Features.ServiceManagement.Entities;
 using Moonlight.Features.StoreSystem.Entities;
+using Moonlight.Features.Theming.Entities;
 using Moonlight.Features.Ticketing.Entities;
 
 namespace Moonlight.Core.Database;

Moonlight/Core/Database/Entities/Store/ServiceShare.cs

@@ -1,7 +0,0 @@
-namespace Moonlight.Core.Database.Entities.Store;
-
-public class ServiceShare
-{
-    public int Id { get; set; }
-    public User User { get; set; }
-}

Moonlight/Core/Database/Entities/User.cs

@@ -1,5 +1,4 @@
-using Moonlight.Core.Database.Entities.Store;
-using Moonlight.Features.StoreSystem.Entities;
+using Moonlight.Features.StoreSystem.Entities;
 
 namespace Moonlight.Core.Database.Entities;
 

Moonlight/Core/Event/Args/TransactionCreatedEventArgs.cs

@@ -1,5 +1,4 @@
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Features.StoreSystem.Entities;
 
 namespace Moonlight.Core.Event.Args;

Moonlight/Core/Event/Events.cs

@@ -1,7 +1,7 @@
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Event.Args;
 using Moonlight.Features.Community.Entities;
+using Moonlight.Features.ServiceManagement.Entities;
 using Moonlight.Features.Ticketing.Entities;
 
 namespace Moonlight.Core.Event;

Moonlight/Core/Http/Controllers/Api/AssetProxyController.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Moonlight.Core.Helpers;
-using Moonlight.Core.Services.Sys;
+using Moonlight.Features.Theming.Services;
 
 namespace Moonlight.Core.Http.Controllers.Api;
 
@@ -8,9 +8,9 @@ namespace Moonlight.Core.Http.Controllers.Api;
 [Route("api/assetproxy")]
 public class AssetProxyController : Controller
 {
-    private readonly MoonlightThemeService ThemeService;
+    private readonly ThemeService ThemeService;
 
-    public AssetProxyController(MoonlightThemeService themeService)
+    public AssetProxyController(ThemeService themeService)
     {
         ThemeService = themeService;
     }

Moonlight/Core/Plugins/Contexts/PluginContext.cs

@@ -1,4 +1,4 @@
-using Moonlight.Core.Models.Abstractions.Services;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 namespace Moonlight.Core.Plugins.Contexts;
 

Moonlight/Core/Services/Background/AutoMailSendService.cs

@@ -1,7 +1,7 @@
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Event;
 using Moonlight.Core.Event.Args;
+using Moonlight.Features.ServiceManagement.Entities;
 
 namespace Moonlight.Core.Services.Background;
 

Moonlight/Core/Services/IdentityService.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Exceptions;
 using Moonlight.Core.Helpers;
 using Moonlight.Core.Models.Abstractions;

Moonlight/Core/Services/MoonlightService.cs

@@ -2,8 +2,9 @@
 using Moonlight.Core.Event;
 using Moonlight.Core.Extensions;
 using Moonlight.Core.Helpers;
+using Moonlight.Features.Theming.Services;
 
-namespace Moonlight.Core.Services.Sys;
+namespace Moonlight.Core.Services;
 
 public class MoonlightService // This service can be used to perform strictly panel specific actions
 {
@@ -12,7 +13,7 @@ public class MoonlightService // This service can be used to perform strictly pa
     
     public WebApplication Application { get; set; } // Do NOT modify using a plugin
     public string LogPath { get; set; } // Do NOT modify using a plugin
-    public MoonlightThemeService Theme => ServiceProvider.GetRequiredService<MoonlightThemeService>();
+    public ThemeService Theme => ServiceProvider.GetRequiredService<ThemeService>();
     
     public MoonlightService(ConfigService configService, IServiceProvider serviceProvider)
     {

Moonlight/Core/Services/PluginService.cs

@@ -1,8 +1,8 @@
 using System.Reflection;
 using Moonlight.Core.Helpers;
-using Moonlight.Core.Models.Abstractions.Services;
 using Moonlight.Core.Plugins;
 using Moonlight.Core.Plugins.Contexts;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 namespace Moonlight.Core.Services;
 

Moonlight/Core/Services/Users/UserDeleteService.cs

@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Repositories;
-using Moonlight.Core.Services.ServiceManage;
 using Moonlight.Features.Community.Entities;
 using Moonlight.Features.Community.Services;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Services;
 using Moonlight.Features.StoreSystem.Entities;
 using Moonlight.Features.Ticketing.Entities;
 

Moonlight/Core/UI/Layouts/MainLayout.razor

@@ -1,10 +1,12 @@
-@using Moonlight.Shared.Components.Auth
-@using Moonlight.Core.Models.Abstractions
+@using Moonlight.Core.Models.Abstractions
 @using Moonlight.Core.Models.Enums
 @using Moonlight.Core.Services
 @using Moonlight.Core.Services.Interop
 @using Moonlight.Core.Services.Utils
 @using Moonlight.Core.Event
+@using Moonlight.Core.UI.Components.Auth
+@using Moonlight.Features.Advertisement.Services
+@using Moonlight.Features.Advertisement.UI.Components
 
 @inherits LayoutComponentBase
 @implements IDisposable

Moonlight/Core/UI/Views/Account/Payments.razor

@@ -1,6 +1,5 @@
 @page "/account/payments"
 @using BlazorTable
-@using Moonlight.Core.Database.Entities.Store
 @using Moonlight.Core.Exceptions
 @using Moonlight.Core.Helpers
 @using Moonlight.Core.Models.Abstractions

Moonlight/Core/UI/Views/Admin/Services/Index.razor

@@ -1,10 +1,10 @@
 @page "/admin/services"
 @using Microsoft.EntityFrameworkCore
 @using BlazorTable
-@using Moonlight.Core.Database.Entities.Store
 @using Moonlight.Core.Extensions.Attributes
 @using Moonlight.Core.Models.Enums
 @using Moonlight.Core.Repositories
+@using Moonlight.Features.ServiceManagement.Entities
 
 @attribute [RequirePermission(Permission.AdminServices)]
 

Moonlight/Core/UI/Views/Admin/Services/View.razor

@@ -1,12 +1,12 @@
 @page "/admin/services/view/{Id:int}/{Route?}"
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.Core.Database.Entities.Store
 @using Moonlight.Core.Extensions.Attributes
-@using Moonlight.Core.Models.Abstractions.Services
 @using Moonlight.Core.Models.Enums
 @using Moonlight.Core.Repositories
 @using Moonlight.Core.Services
-@using Moonlight.Core.Services.ServiceManage
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Models.Abstractions
+@using Moonlight.Features.ServiceManagement.Services
 
 @attribute [RequirePermission(Permission.AdminServices)]
 

Moonlight/Core/UI/Views/Admin/Sys/Diagnose.razor

@@ -1,8 +1,8 @@
 @page "/admin/sys/diagnose"
 @using Moonlight.Core.Extensions.Attributes
 @using Moonlight.Core.Models.Enums
+@using Moonlight.Core.Services
 @using Moonlight.Core.Services.Interop
-@using Moonlight.Core.Services.Sys
 
 @attribute [RequirePermission(Permission.AdminRoot)]
 

Moonlight/Core/UI/Views/Admin/Sys/Index.razor

@@ -1,7 +1,7 @@
 @page "/admin/sys"
 @using Moonlight.Core.Extensions.Attributes
 @using Moonlight.Core.Models.Enums
-@using Moonlight.Core.Services.Sys
+@using Moonlight.Core.Services
 
 @attribute [RequirePermission(Permission.AdminRoot)]
 

Moonlight/Core/UI/Views/Admin/Users/View.razor

@@ -3,7 +3,6 @@
 @using Mappy.Net
 @using BlazorTable
 @using Moonlight.Core.Database.Entities
-@using Moonlight.Core.Database.Entities.Store
 @using Moonlight.Core.Extensions.Attributes
 @using Moonlight.Core.Helpers
 @using Moonlight.Core.Models.Enums
@@ -12,6 +11,7 @@
 @using Moonlight.Core.Services
 @using Moonlight.Core.Services.Interop
 @using Moonlight.Core.Services.Users
+@using Moonlight.Features.ServiceManagement.Entities
 @using Moonlight.Features.StoreSystem.Entities
 
 @attribute [RequirePermission(Permission.AdminUsers)]

Moonlight/Core/UI/Views/Index.razor

@@ -1,4 +1,5 @@
 @page "/"
+
 @using Moonlight.Core.Services
 
 @inject IdentityService IdentityService

Moonlight/Features/Advertisement/Configuration/AdvertisementData.cs

@@ -0,0 +1,11 @@
+using System.ComponentModel;
+using Newtonsoft.Json;
+
+namespace Moonlight.Features.Advertisement.Configuration;
+
+public class AdvertisementData
+{
+    [JsonProperty("PreventAdBlockers")]
+    [Description("This prevents users from using ad blockers while using moonlight. (Note: The detection might not always work)")]
+    public bool PreventAdBlockers { get; set; }
+}

Moonlight/Features/Advertisement/Services/AdBlockService.cs

@@ -1,7 +1,7 @@
 using Microsoft.JSInterop;
 using Moonlight.Core.Helpers;
 
-namespace Moonlight.Core.Services.Interop;
+namespace Moonlight.Features.Advertisement.Services;
 
 public class AdBlockService
 {

Moonlight/Features/Community/Services/PostService.cs

@@ -1,7 +1,6 @@
 using System.Text.RegularExpressions;
 using Microsoft.EntityFrameworkCore;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Enums;
 using Moonlight.Core.Event;
 using Moonlight.Core.Exceptions;
 using Moonlight.Core.Extensions;

Moonlight/Features/Community/UI/Components/CreatePostModal.razor

@@ -1,5 +1,4 @@
-@using Moonlight.Core.Database.Enums
-@using Moonlight.Core.Services
+@using Moonlight.Core.Services
 @using Moonlight.Core.Services.Interop
 @using Moonlight.Features.Community.Entities.Enums
 @using Moonlight.Features.Community.Models.Forms

Moonlight/Features/Community/UI/Views/Projects.razor

@@ -1,7 +1,6 @@
 @page "/community/projects"
 
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.Core.Database.Enums
 @using Moonlight.Core.Repositories
 @using Moonlight.Features.Community.Entities
 @using Moonlight.Features.Community.Entities.Enums

Moonlight/Features/ServiceManagement/Entities/Enums/ServiceType.cs

@@ -1,4 +1,4 @@
-namespace Moonlight.Core.Database.Enums;
+namespace Moonlight.Features.ServiceManagement.Entities.Enums;
 
 public enum ServiceType
 {

Moonlight/Features/ServiceManagement/Entities/Service.cs

@@ -1,6 +1,7 @@
-using Moonlight.Features.StoreSystem.Entities;
+using Moonlight.Core.Database.Entities;
+using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.Core.Database.Entities.Store;
+namespace Moonlight.Features.ServiceManagement.Entities;
 
 public class Service
 {

Moonlight/Features/ServiceManagement/Entities/ServiceShare.cs

@@ -0,0 +1,9 @@
+using Moonlight.Core.Database.Entities;
+
+namespace Moonlight.Features.ServiceManagement.Entities;
+
+public class ServiceShare
+{
+    public int Id { get; set; }
+    public User User { get; set; }
+}

Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceActions.cs

@@ -1,6 +1,6 @@
-using Moonlight.Core.Database.Entities.Store;
+using Moonlight.Features.ServiceManagement.Entities;
 
-namespace Moonlight.Core.Models.Abstractions.Services;
+namespace Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 public abstract class ServiceActions
 {

Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceDefinition.cs

@@ -1,4 +1,4 @@
-namespace Moonlight.Core.Models.Abstractions.Services;
+namespace Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 public abstract class ServiceDefinition
 {

Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceUiPage.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace Moonlight.Core.Models.Abstractions.Services;
+namespace Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 public class ServiceUiPage
 {

Moonlight/Features/ServiceManagement/Models/Abstractions/ServiceViewContext.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Components;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Helpers;
+using Moonlight.Features.ServiceManagement.Entities;
 using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.Core.Models.Abstractions.Services;
+namespace Moonlight.Features.ServiceManagement.Models.Abstractions;
 
 public class ServiceViewContext
 {

Moonlight/Features/ServiceManagement/Models/Forms/AddUserToServiceForm.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Core.Models.Forms.Services;
+namespace Moonlight.Features.ServiceManagement.Models.Forms;
 
 public class AddUserToServiceForm
 {

Moonlight/Features/ServiceManagement/Services/ServiceAdminService.cs

@@ -1,11 +1,11 @@
 using Microsoft.EntityFrameworkCore;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Exceptions;
 using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
 using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.Core.Services.ServiceManage;
+namespace Moonlight.Features.ServiceManagement.Services;
 
 public class ServiceAdminService
 {

Moonlight/Features/ServiceManagement/Services/ServiceDefinitionService.cs

@@ -1,11 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using Moonlight.Core.Database.Entities.Store;
-using Moonlight.Core.Database.Enums;
-using Moonlight.Core.Models.Abstractions.Services;
 using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
+using Moonlight.Features.ServiceManagement.Models.Abstractions;
 using Moonlight.Features.StoreSystem.Entities;
 
-namespace Moonlight.Core.Services.ServiceManage;
+namespace Moonlight.Features.ServiceManagement.Services;
 
 public class ServiceDefinitionService
 {

Moonlight/Features/ServiceManagement/Services/ServiceManageService.cs

@@ -1,11 +1,11 @@
 using Microsoft.EntityFrameworkCore;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Models.Abstractions;
 using Moonlight.Core.Models.Enums;
 using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
 
-namespace Moonlight.Core.Services.ServiceManage;
+namespace Moonlight.Features.ServiceManagement.Services;
 
 public class ServiceManageService
 {

Moonlight/Features/ServiceManagement/Services/ServiceService.cs

@@ -1,10 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Exceptions;
 using Moonlight.Core.Repositories;
+using Moonlight.Features.ServiceManagement.Entities;
 
-namespace Moonlight.Core.Services.ServiceManage;
+namespace Moonlight.Features.ServiceManagement.Services;
 
 public class ServiceService // This service is used for managing services and create the connection to the actual logic behind a service type
 {

Moonlight/Features/ServiceManagement/UI/Components/ManageServiceShareModal.razor

@@ -1,8 +1,8 @@
 @using BlazorTable
 @using Moonlight.Core.Database.Entities
-@using Moonlight.Core.Database.Entities.Store
-@using Moonlight.Core.Models.Forms.Services
-@using Moonlight.Core.Services.ServiceManage
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Models.Forms
+@using Moonlight.Features.ServiceManagement.Services
 
 @inject ServiceService ServiceService
 

Moonlight/Features/ServiceManagement/UI/Components/ServiceItem.razor

@@ -1,10 +1,9 @@
-@using Moonlight.Shared.Components.Modals
-@using Moonlight.Core.Database.Entities.Store
-@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Exceptions
 @using Moonlight.Core.Helpers
 @using Moonlight.Core.Services
 @using Moonlight.Core.Services.Interop
-@using Moonlight.Core.Services.ServiceManage
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Services
 @using Moonlight.Features.StoreSystem.Services
 
 @inject ConfigService ConfigService

Moonlight/Features/ServiceManagement/UI/Views/Index.razor

@@ -1,9 +1,10 @@
 @page "/services"
-@using Moonlight.Shared.Components.Service
-@using Moonlight.Core.Database.Entities.Store
+
 @using Moonlight.Core.Helpers
 @using Moonlight.Core.Services
-@using Moonlight.Core.Services.ServiceManage
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Services
+@using Moonlight.Features.ServiceManagement.UI.Components
 
 @inject ServiceService ServiceService
 @inject IdentityService IdentityService

Moonlight/Features/ServiceManagement/UI/Views/View.razor

@@ -1,11 +1,11 @@
 @page "/service/{Id:int}/{Route?}"
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.Core.Database.Entities.Store
-@using Moonlight.Core.Models.Abstractions.Services
 @using Moonlight.Core.Models.Enums
 @using Moonlight.Core.Repositories
 @using Moonlight.Core.Services
-@using Moonlight.Core.Services.ServiceManage
+@using Moonlight.Features.ServiceManagement.Entities
+@using Moonlight.Features.ServiceManagement.Models.Abstractions
+@using Moonlight.Features.ServiceManagement.Services
 
 @inject Repository<Service> ServiceRepository
 @inject ServiceService ServiceService

Moonlight/Features/StoreSystem/Entities/Product.cs

@@ -1,4 +1,4 @@
-using Moonlight.Core.Database.Enums;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
 
 namespace Moonlight.Features.StoreSystem.Entities;
 

Moonlight/Features/StoreSystem/Models/Forms/AddProductForm.cs

@@ -1,8 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using Moonlight.Core.Database.Entities.Store;
-using Moonlight.Core.Database.Enums;
 using Moonlight.Core.Extensions.Attributes;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
 using Moonlight.Features.StoreSystem.Entities;
 
 namespace Moonlight.Features.StoreSystem.Models.Forms;

Moonlight/Features/StoreSystem/Models/Forms/EditProductForm.cs

@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Moonlight.Core.Database.Entities.Store;
-using Moonlight.Core.Database.Enums;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
 using Moonlight.Features.StoreSystem.Entities;
 
 namespace Moonlight.Features.StoreSystem.Models.Forms;

Moonlight/Features/StoreSystem/Services/StoreAdminService.cs

@@ -1,8 +1,8 @@
-using Moonlight.Core.Database.Entities.Store;
-using Moonlight.Core.Database.Enums;
-using Moonlight.Core.Exceptions;
+using Moonlight.Core.Exceptions;
 using Moonlight.Core.Repositories;
-using Moonlight.Core.Services.ServiceManage;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
+using Moonlight.Features.ServiceManagement.Services;
 using Moonlight.Features.StoreSystem.Entities;
 using Newtonsoft.Json;
 

Moonlight/Features/StoreSystem/Services/StoreGiftService.cs

@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Exceptions;
 using Moonlight.Core.Repositories;
 using Moonlight.Features.StoreSystem.Entities;

Moonlight/Features/StoreSystem/Services/StoreOrderService.cs

@@ -1,11 +1,11 @@
 using Microsoft.EntityFrameworkCore;
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Event;
 using Moonlight.Core.Exceptions;
 using Moonlight.Core.Extensions;
 using Moonlight.Core.Repositories;
-using Moonlight.Core.Services.ServiceManage;
+using Moonlight.Features.ServiceManagement.Entities;
+using Moonlight.Features.ServiceManagement.Services;
 using Moonlight.Features.StoreSystem.Entities;
 
 namespace Moonlight.Features.StoreSystem.Services;

Moonlight/Features/StoreSystem/Services/TransactionService.cs

@@ -1,5 +1,4 @@
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
 using Moonlight.Core.Event;
 using Moonlight.Core.Extensions;
 using Moonlight.Core.Repositories;

Moonlight/Features/StoreSystem/UI/Components/StoreModals.razor

@@ -1,8 +1,7 @@
 @using Mappy.Net
-@using Moonlight.Core.Database.Entities.Store
-@using Moonlight.Core.Database.Enums
 @using Moonlight.Core.Repositories
 @using Moonlight.Core.Services.Interop
+@using Moonlight.Features.ServiceManagement.Entities.Enums
 @using Moonlight.Features.StoreSystem.Entities
 @using Moonlight.Features.StoreSystem.Models.Forms
 @using Moonlight.Features.StoreSystem.Services

Moonlight/Features/StoreSystem/UI/Views/Admin/Expired.razor

@@ -2,11 +2,11 @@
 
 @using BlazorTable
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.Core.Database.Entities.Store
 @using Moonlight.Core.Extensions.Attributes
 @using Moonlight.Core.Helpers
 @using Moonlight.Core.Models.Enums
 @using Moonlight.Core.Repositories
+@using Moonlight.Features.ServiceManagement.Entities
 @using Moonlight.Features.StoreSystem.UI.Components
 
 @attribute [RequirePermission(Permission.AdminStore)]

Moonlight/Features/Theming/Configuration/ThemeData.cs

@@ -0,0 +1,8 @@
+using Newtonsoft.Json;
+
+namespace Moonlight.Features.Theming.Configuration;
+
+public class ThemeData
+{
+    [JsonProperty("EnableDefault")] public bool EnableDefault { get; set; } = true;
+}

Moonlight/Features/Theming/Entities/Theme.cs

@@ -1,4 +1,4 @@
-namespace Moonlight.Core.Database.Entities;
+namespace Moonlight.Features.Theming.Entities;
 
 public class Theme
 {

Moonlight/Features/Theming/Models/Abstractions/ApplicationTheme.cs

@@ -1,4 +1,4 @@
-namespace Moonlight.Core.Models.Abstractions;
+namespace Moonlight.Features.Theming.Models.Abstractions;
 
 public class ApplicationTheme
 {

Moonlight/Features/Theming/Models/Forms/AddThemeForm.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Core.Models.Forms.Admin.Sys.Themes;
+namespace Moonlight.Features.Theming.Models.Forms;
 
 public class AddThemeForm
 {

Moonlight/Features/Theming/Models/Forms/EditThemeForm.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
-namespace Moonlight.Core.Models.Forms.Admin.Sys.Themes;
+namespace Moonlight.Features.Theming.Models.Forms;
 
 public class EditThemeForm
 {

Moonlight/Features/Theming/Models/ThemeExport.cs

@@ -1,4 +1,4 @@
-namespace Moonlight.Core.Models.Json.Theme;
+namespace Moonlight.Features.Theming.Models;
 
 public class ThemeExport
 {

Moonlight/Features/Theming/Models/ThemeImport.cs

@@ -1,4 +1,4 @@
-namespace Moonlight.Core.Models.Json.Theme;
+namespace Moonlight.Features.Theming.Models;
 
 public class ThemeImport
 {

Moonlight/Features/Theming/Services/ThemeService.cs

@@ -1,16 +1,18 @@
 using Mappy.Net;
-using Moonlight.Core.Database.Entities;
 using Moonlight.Core.Models.Abstractions;
 using Moonlight.Core.Repositories;
+using Moonlight.Core.Services;
+using Moonlight.Features.Theming.Entities;
+using Moonlight.Features.Theming.Models.Abstractions;
 
-namespace Moonlight.Core.Services.Sys;
+namespace Moonlight.Features.Theming.Services;
 
-public class MoonlightThemeService
+public class ThemeService
 {
     private readonly IServiceProvider ServiceProvider;
     private readonly ConfigService ConfigService;
 
-    public MoonlightThemeService(IServiceProvider serviceProvider, ConfigService configService)
+    public ThemeService(IServiceProvider serviceProvider, ConfigService configService)
     {
         ServiceProvider = serviceProvider;
         ConfigService = configService;

Moonlight/Features/Theming/UI/Views/Admin/Themes.razor

@@ -1,15 +1,16 @@
 @page "/admin/sys/themes"
+
 @using BlazorTable
 @using Mappy.Net
 @using Microsoft.AspNetCore.Components.Forms
-@using Moonlight.Core.Database.Entities
 @using Moonlight.Core.Exceptions
 @using Moonlight.Core.Extensions.Attributes
 @using Moonlight.Core.Models.Enums
-@using Moonlight.Core.Models.Forms.Admin.Sys.Themes
-@using Moonlight.Core.Models.Json.Theme
 @using Moonlight.Core.Repositories
 @using Moonlight.Core.Services.Interop
+@using Moonlight.Features.Theming.Entities
+@using Moonlight.Features.Theming.Models
+@using Moonlight.Features.Theming.Models.Forms
 @using Newtonsoft.Json
 
 @attribute [RequirePermission(Permission.AdminRoot)]

Moonlight/Features/Ticketing/Entities/Ticket.cs

@@ -1,5 +1,5 @@
 using Moonlight.Core.Database.Entities;
-using Moonlight.Core.Database.Entities.Store;
+using Moonlight.Features.ServiceManagement.Entities;
 using Moonlight.Features.Ticketing.Entities.Enums;
 
 namespace Moonlight.Features.Ticketing.Entities;

Moonlight/Features/Ticketing/Models/Forms/CreateTicketForm.cs

@@ -1,5 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Moonlight.Core.Database.Entities.Store;
+using Moonlight.Features.ServiceManagement.Entities;
 
 namespace Moonlight.Features.Ticketing.Models.Forms;
 

Moonlight/Features/Ticketing/Services/TicketCreateService.cs

@@ -1,8 +1,8 @@
-using Moonlight.Core.Database.Entities.Store;
-using Moonlight.Core.Event;
+using Moonlight.Core.Event;
 using Moonlight.Core.Extensions;
 using Moonlight.Core.Repositories;
 using Moonlight.Core.Services;
+using Moonlight.Features.ServiceManagement.Entities;
 using Moonlight.Features.Ticketing.Entities;
 using Moonlight.Features.Ticketing.Entities.Enums;
 

Moonlight/Features/Ticketing/UI/Components/TicketPopupCreate.razor

@@ -1,7 +1,7 @@
-@using Moonlight.Core.Database.Entities.Store
-@using Moonlight.Core.Exceptions
+@using Moonlight.Core.Exceptions
 @using Moonlight.Core.Repositories
 @using Moonlight.Core.Services
+@using Moonlight.Features.ServiceManagement.Entities
 @using Moonlight.Features.Ticketing.Models.Forms
 @using Moonlight.Features.Ticketing.Services
 

Moonlight/Features/Ticketing/UI/Views/Admin/Index.razor

@@ -2,7 +2,6 @@
 
 @using BlazorTable
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.Core.Database.Enums
 @using Moonlight.Core.Event
 @using Moonlight.Core.Event.Args
 @using Moonlight.Core.Extensions.Attributes

Moonlight/Features/Ticketing/UI/Views/Admin/View.razor

@@ -2,7 +2,6 @@
 
 @using System.Text.RegularExpressions
 @using Microsoft.EntityFrameworkCore
-@using Moonlight.Core.Database.Enums
 @using Moonlight.Core.Extensions.Attributes
 @using Moonlight.Core.Helpers
 @using Moonlight.Core.Models.Enums
@@ -11,6 +10,7 @@
 @using Moonlight.Features.Ticketing.Entities
 @using Moonlight.Features.Ticketing.Entities.Enums
 @using Moonlight.Features.Ticketing.Services
+@using Moonlight.Features.Ticketing.UI.Components
 
 @attribute [RequirePermission(Permission.AdminTickets)]
 

Moonlight/Moonlight.csproj

@@ -19,7 +19,6 @@
       <Folder Include="Core\Http\Requests\" />
       <Folder Include="Core\Http\Resources\" />
       <Folder Include="Core\UI\Components\" />
-      <Folder Include="Core\UI\Views\" />
       <Folder Include="Features\Dummy\Configuration\" />
       <Folder Include="Features\Dummy\Entities\" />
       <Folder Include="Features\Dummy\Exceptions\" />
@@ -34,21 +33,7 @@
       <Folder Include="Features\Dummy\Services\" />
       <Folder Include="Features\Dummy\UI\Components\" />
       <Folder Include="Features\Dummy\UI\Views\" />
-      <Folder Include="Features\StoreSystem\Exceptions\" />
-      <Folder Include="Features\StoreSystem\Extensions\" />
       <Folder Include="Features\StoreSystem\Helpers\" />
-      <Folder Include="Features\StoreSystem\Http\Controllers\" />
-      <Folder Include="Features\StoreSystem\Http\Middleware\" />
-      <Folder Include="Features\StoreSystem\Http\Requests\" />
-      <Folder Include="Features\StoreSystem\Http\Resources\" />
-      <Folder Include="Features\Ticketing\Configuration\" />
-      <Folder Include="Features\Ticketing\Exceptions\" />
-      <Folder Include="Features\Ticketing\Extensions\" />
-      <Folder Include="Features\Ticketing\Helpers\" />
-      <Folder Include="Features\Ticketing\Http\Controllers\" />
-      <Folder Include="Features\Ticketing\Http\Middleware\" />
-      <Folder Include="Features\Ticketing\Http\Requests\" />
-      <Folder Include="Features\Ticketing\Http\Resources\" />
       <Folder Include="Features\Ticketing\Models\Abstractions\" />
     </ItemGroup>
 
@@ -78,10 +63,16 @@
     </ItemGroup>
 
     <ItemGroup>
+      <AdditionalFiles Include="Core\UI\Components\Alerts\NotFoundAlert.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Alerts\RestartAlert.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\ChangePassword.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\Login.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\MailVerify.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\PasswordReset.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Auth\Register.razor" />
       <AdditionalFiles Include="Core\UI\Components\Forms\AutoCrud.razor" />
       <AdditionalFiles Include="Core\UI\Components\Forms\AutoForm.razor" />
       <AdditionalFiles Include="Core\UI\Components\Forms\AutoProperty.razor" />
-      <AdditionalFiles Include="Core\UI\Components\Forms\ChatFileSelect.razor" />
       <AdditionalFiles Include="Core\UI\Components\Forms\ConfirmButton.razor" />
       <AdditionalFiles Include="Core\UI\Components\Forms\DynamicTypedAutoForm.razor" />
       <AdditionalFiles Include="Core\UI\Components\Forms\SmartCustomFileSelect.razor" />
@@ -92,6 +83,9 @@
       <AdditionalFiles Include="Core\UI\Components\Forms\SmartSelect.razor" />
       <AdditionalFiles Include="Core\UI\Components\Forms\TextEditor.razor" />
       <AdditionalFiles Include="Core\UI\Components\Forms\WButton.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Navigations\AccountNavigation.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Navigations\AdminSysNavigation.razor" />
+      <AdditionalFiles Include="Core\UI\Components\Navigations\AdminUsersNavigation.razor" />
       <AdditionalFiles Include="Core\UI\Components\Partials\ConnectionIndicator.razor" />
       <AdditionalFiles Include="Core\UI\Components\Partials\LazyLoader.razor" />
       <AdditionalFiles Include="Core\UI\Components\Partials\PageHeader.razor" />
@@ -103,6 +97,18 @@
       <AdditionalFiles Include="Core\UI\Layouts\DefaultLayout.razor" />
       <AdditionalFiles Include="Core\UI\Layouts\MainLayout.razor" />
       <AdditionalFiles Include="Core\UI\Layouts\OverlayLayout.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Account\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Account\Payments.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Account\Security.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Services\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Services\View.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Sys\Diagnose.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Sys\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Sys\Settings.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Users\Index.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Users\Sessions.razor" />
+      <AdditionalFiles Include="Core\UI\Views\Admin\Users\View.razor" />
     </ItemGroup>
 
     <ItemGroup>
@@ -123,5 +129,24 @@
       <_ContentIncludedByDefault Remove="Shared\Layouts\DefaultLayout.razor" />
       <_ContentIncludedByDefault Remove="Shared\Layouts\MainLayout.razor" />
       <_ContentIncludedByDefault Remove="Shared\Layouts\OverlayLayout.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\ChangePassword.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\Login.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\MailVerify.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\PasswordReset.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Auth\Register.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Alerts\NotFoundAlert.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Alerts\RestartAlert.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Navigations\AccountNavigation.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Navigations\AdminSysNavigation.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Components\Navigations\AdminUsersNavigation.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Index.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Services\Index.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Services\View.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Sys\Diagnose.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Sys\Index.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Sys\Settings.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Users\Index.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Users\Sessions.razor" />
+      <_ContentIncludedByDefault Remove="Shared\Views\Admin\Users\View.razor" />
     </ItemGroup>
 </Project>

Moonlight/Pages/_Host.cshtml

@@ -1,13 +1,13 @@
 @page "/"
 @using Microsoft.AspNetCore.Components.Web
-@using Moonlight.Core.Services.Sys
+@using Moonlight.Features.Theming.Services
 @namespace Moonlight.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
-@inject MoonlightThemeService MoonlightThemeService
+@inject ThemeService ThemeService
 
 @{
-    var themes = await MoonlightThemeService.GetEnabled();
+    var themes = await ThemeService.GetEnabled();
 }
 
 <!DOCTYPE html>

Moonlight/Program.cs

@@ -2,7 +2,6 @@ using BlazorTable;
 using Moonlight.Core.Database;
 using Moonlight.Core.Actions.Dummy;
 using Moonlight.Core.Database;
-using Moonlight.Core.Database.Enums;
 using Moonlight.Core.Extensions;
 using Moonlight.Core.Helpers;
 using Moonlight.Core.Helpers.LogMigrator;
@@ -10,12 +9,14 @@ using Moonlight.Core.Repositories;
 using Moonlight.Core.Services;
 using Moonlight.Core.Services.Background;
 using Moonlight.Core.Services.Interop;
-using Moonlight.Core.Services.ServiceManage;
-using Moonlight.Core.Services.Sys;
 using Moonlight.Core.Services.Users;
 using Moonlight.Core.Services.Utils;
+using Moonlight.Features.Advertisement.Services;
 using Moonlight.Features.Community.Services;
+using Moonlight.Features.ServiceManagement.Entities.Enums;
+using Moonlight.Features.ServiceManagement.Services;
 using Moonlight.Features.StoreSystem.Services;
+using Moonlight.Features.Theming.Services;
 using Moonlight.Features.Ticketing.Services;
 using Serilog;
 
@@ -105,7 +106,7 @@ builder.Services.AddSingleton<SessionService>();
 builder.Services.AddSingleton<BucketService>();
 builder.Services.AddSingleton<MailService>();
 builder.Services.AddSingleton<MoonlightService>();
-builder.Services.AddSingleton<MoonlightThemeService>();
+builder.Services.AddSingleton<ThemeService>();
 
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();

Moonlight/_Imports.razor

@@ -4,5 +4,5 @@
 
 @using Moonlight.Core.UI.Components.Partials
 @using Moonlight.Core.UI.Components.Forms
-@using Moonlight.Shared.Components.Navigations
-@using Moonlight.Shared.Components.Alerts
+@using Moonlight.Core.UI.Components.Navigations
+@using Moonlight.Core.UI.Components.Alerts