From 3aee0598601392733d3332afe72541f467036ff5 Mon Sep 17 00:00:00 2001 From: Marcel Baumgartner Date: Mon, 12 Jun 2023 00:10:03 +0200 Subject: [PATCH] Added webspace delete --- Moonlight/App/Services/WebSpaceService.cs | 16 +++++++-- .../WebsiteControl/WebSpaceDashboard.razor | 7 +++- .../WebsiteControl/WebSpaceNavigation.razor | 32 ++++++++++++++---- .../wwwroot/assets/media/gif/loading.gif | Bin 0 -> 17490 bytes 4 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 Moonlight/wwwroot/assets/media/gif/loading.gif diff --git a/Moonlight/App/Services/WebSpaceService.cs b/Moonlight/App/Services/WebSpaceService.cs index 600cd39a..35a6b2d1 100644 --- a/Moonlight/App/Services/WebSpaceService.cs +++ b/Moonlight/App/Services/WebSpaceService.cs @@ -72,11 +72,21 @@ public class WebSpaceService public async Task Delete(WebSpace w) { - var website = EnsureData(w); + var webSpace = WebSpaceRepository + .Get() + .Include(x => x.Databases) + .Include(x => x.CloudPanel) + .Include(x => x.Owner) + .First(x => x.Id == w.Id); + + foreach (var database in webSpace.Databases.ToArray()) + { + await DeleteDatabase(webSpace, database); + } - await CloudPanelApiHelper.Delete(website.CloudPanel, $"site/{website.Domain}", null); + await CloudPanelApiHelper.Delete(webSpace.CloudPanel, $"site/{webSpace.Domain}", null); - WebSpaceRepository.Delete(website); + WebSpaceRepository.Delete(webSpace); } public async Task IsHostUp(CloudPanel cloudPanel) diff --git a/Moonlight/Shared/Components/WebsiteControl/WebSpaceDashboard.razor b/Moonlight/Shared/Components/WebsiteControl/WebSpaceDashboard.razor index 407f6bab..2ba67c0d 100644 --- a/Moonlight/Shared/Components/WebsiteControl/WebSpaceDashboard.razor +++ b/Moonlight/Shared/Components/WebsiteControl/WebSpaceDashboard.razor @@ -10,7 +10,12 @@
- Website screenshot +
+
+ Placeholder +
+
+
diff --git a/Moonlight/Shared/Components/WebsiteControl/WebSpaceNavigation.razor b/Moonlight/Shared/Components/WebsiteControl/WebSpaceNavigation.razor index e615e10e..92c0f2f8 100644 --- a/Moonlight/Shared/Components/WebsiteControl/WebSpaceNavigation.razor +++ b/Moonlight/Shared/Components/WebsiteControl/WebSpaceNavigation.razor @@ -1,9 +1,16 @@ @using Moonlight.App.Database.Entities +@using Moonlight.App.Services +@using Moonlight.App.Services.Interop + +@inject SmartTranslateService SmartTranslateService +@inject WebSpaceService WebSpaceService +@inject NavigationManager NavigationManager +@inject AlertService AlertService
-
-
+
+
@@ -14,13 +21,17 @@
@(WebSpace.CloudPanel.Name)
+ + +
-
-
-
-
+
+