From 77856cbe26b90e0ebc4b6025bb90f871e3a281b4 Mon Sep 17 00:00:00 2001 From: daniel-c-harvey Date: Sat, 30 Aug 2025 22:14:46 -0400 Subject: [PATCH] Unnesting the Blazor and moving the database to root --- DeepDrftHome.sln | 4 +- .../DeepDrftWeb.Client.csproj | 2 +- .../Layout/MainLayout.razor | 0 .../Layout/NavMenu.razor | 0 .../Pages/Counter.razor | 0 .../Pages/Home.razor | 0 .../Pages/Weather.razor | 0 .../Program.cs | 0 .../Routes.razor | 0 .../_Imports.razor | 0 .../wwwroot/appsettings.Development.json | 0 .../wwwroot/appsettings.json | 0 .../{DeepDrftWeb => }/Components/App.razor | 0 .../Components/Pages/Error.razor | 0 .../Components/_Imports.razor | 0 .../Controllers/TrackController.cs | 0 .../Data/Configurations/TrackConfiguration.cs | 0 .../{DeepDrftWeb => }/Data/DeepDrftContext.cs | 0 .../Data/DeepDrftContextFactory.cs | 0 .../20250831000622_Initial.Designer.cs | 0 .../Data/Migrations/20250831000622_Initial.cs | 0 .../DeepDrftContextModelSnapshot.cs | 0 .../Data/Repositories/TrackRepository.cs | 0 .../{DeepDrftWeb => }/DeepDrftWeb.csproj | 2 +- DeepDrftWeb/DeepDrftWeb.sln | 50 ------------------ DeepDrftWeb/{DeepDrftWeb => }/Program.cs | 0 .../Services/TrackService.cs | 0 DeepDrftWeb/{DeepDrftWeb => }/Startup.cs | 0 .../appsettings.Development.json | 0 .../{DeepDrftWeb => }/appsettings.json | 2 +- .../{DeepDrftWeb => }/wwwroot/favicon.ico | Bin 31 files changed, 5 insertions(+), 55 deletions(-) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/DeepDrftWeb.Client.csproj (87%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/Layout/MainLayout.razor (100%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/Layout/NavMenu.razor (100%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/Pages/Counter.razor (100%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/Pages/Home.razor (100%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/Pages/Weather.razor (100%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/Program.cs (100%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/Routes.razor (100%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/_Imports.razor (100%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/wwwroot/appsettings.Development.json (100%) rename {DeepDrftWeb/DeepDrftWeb.Client => DeepDrftWeb.Client}/wwwroot/appsettings.json (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Components/App.razor (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Components/Pages/Error.razor (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Components/_Imports.razor (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Controllers/TrackController.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Data/Configurations/TrackConfiguration.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Data/DeepDrftContext.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Data/DeepDrftContextFactory.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Data/Migrations/20250831000622_Initial.Designer.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Data/Migrations/20250831000622_Initial.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Data/Migrations/DeepDrftContextModelSnapshot.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Data/Repositories/TrackRepository.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/DeepDrftWeb.csproj (94%) delete mode 100644 DeepDrftWeb/DeepDrftWeb.sln rename DeepDrftWeb/{DeepDrftWeb => }/Program.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Services/TrackService.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/Startup.cs (100%) rename DeepDrftWeb/{DeepDrftWeb => }/appsettings.Development.json (100%) rename DeepDrftWeb/{DeepDrftWeb => }/appsettings.json (76%) rename DeepDrftWeb/{DeepDrftWeb => }/wwwroot/favicon.ico (100%) diff --git a/DeepDrftHome.sln b/DeepDrftHome.sln index 50f7194..0b4febc 100644 --- a/DeepDrftHome.sln +++ b/DeepDrftHome.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftWeb", "DeepDrftWeb\DeepDrftWeb\DeepDrftWeb.csproj", "{7E629215-7EF7-465D-B7F2-2CED53C4BFEC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftWeb", "DeepDrftWeb\DeepDrftWeb.csproj", "{7E629215-7EF7-465D-B7F2-2CED53C4BFEC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftWeb.Client", "DeepDrftWeb\DeepDrftWeb.Client\DeepDrftWeb.Client.csproj", "{E76D21B4-308B-487B-B8D6-59D6AE49F1F7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftWeb.Client", "DeepDrftWeb.Client\DeepDrftWeb.Client.csproj", "{E76D21B4-308B-487B-B8D6-59D6AE49F1F7}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepDrftModels", "DeepDrftModels\DeepDrftModels.csproj", "{10CE5160-16C3-4CB1-9E2E-52467BA80B4B}" EndProject diff --git a/DeepDrftWeb/DeepDrftWeb.Client/DeepDrftWeb.Client.csproj b/DeepDrftWeb.Client/DeepDrftWeb.Client.csproj similarity index 87% rename from DeepDrftWeb/DeepDrftWeb.Client/DeepDrftWeb.Client.csproj rename to DeepDrftWeb.Client/DeepDrftWeb.Client.csproj index 1ade0cb..0dddea3 100644 --- a/DeepDrftWeb/DeepDrftWeb.Client/DeepDrftWeb.Client.csproj +++ b/DeepDrftWeb.Client/DeepDrftWeb.Client.csproj @@ -14,7 +14,7 @@ - + diff --git a/DeepDrftWeb/DeepDrftWeb.Client/Layout/MainLayout.razor b/DeepDrftWeb.Client/Layout/MainLayout.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/Layout/MainLayout.razor rename to DeepDrftWeb.Client/Layout/MainLayout.razor diff --git a/DeepDrftWeb/DeepDrftWeb.Client/Layout/NavMenu.razor b/DeepDrftWeb.Client/Layout/NavMenu.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/Layout/NavMenu.razor rename to DeepDrftWeb.Client/Layout/NavMenu.razor diff --git a/DeepDrftWeb/DeepDrftWeb.Client/Pages/Counter.razor b/DeepDrftWeb.Client/Pages/Counter.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/Pages/Counter.razor rename to DeepDrftWeb.Client/Pages/Counter.razor diff --git a/DeepDrftWeb/DeepDrftWeb.Client/Pages/Home.razor b/DeepDrftWeb.Client/Pages/Home.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/Pages/Home.razor rename to DeepDrftWeb.Client/Pages/Home.razor diff --git a/DeepDrftWeb/DeepDrftWeb.Client/Pages/Weather.razor b/DeepDrftWeb.Client/Pages/Weather.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/Pages/Weather.razor rename to DeepDrftWeb.Client/Pages/Weather.razor diff --git a/DeepDrftWeb/DeepDrftWeb.Client/Program.cs b/DeepDrftWeb.Client/Program.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/Program.cs rename to DeepDrftWeb.Client/Program.cs diff --git a/DeepDrftWeb/DeepDrftWeb.Client/Routes.razor b/DeepDrftWeb.Client/Routes.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/Routes.razor rename to DeepDrftWeb.Client/Routes.razor diff --git a/DeepDrftWeb/DeepDrftWeb.Client/_Imports.razor b/DeepDrftWeb.Client/_Imports.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/_Imports.razor rename to DeepDrftWeb.Client/_Imports.razor diff --git a/DeepDrftWeb/DeepDrftWeb.Client/wwwroot/appsettings.Development.json b/DeepDrftWeb.Client/wwwroot/appsettings.Development.json similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/wwwroot/appsettings.Development.json rename to DeepDrftWeb.Client/wwwroot/appsettings.Development.json diff --git a/DeepDrftWeb/DeepDrftWeb.Client/wwwroot/appsettings.json b/DeepDrftWeb.Client/wwwroot/appsettings.json similarity index 100% rename from DeepDrftWeb/DeepDrftWeb.Client/wwwroot/appsettings.json rename to DeepDrftWeb.Client/wwwroot/appsettings.json diff --git a/DeepDrftWeb/DeepDrftWeb/Components/App.razor b/DeepDrftWeb/Components/App.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Components/App.razor rename to DeepDrftWeb/Components/App.razor diff --git a/DeepDrftWeb/DeepDrftWeb/Components/Pages/Error.razor b/DeepDrftWeb/Components/Pages/Error.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Components/Pages/Error.razor rename to DeepDrftWeb/Components/Pages/Error.razor diff --git a/DeepDrftWeb/DeepDrftWeb/Components/_Imports.razor b/DeepDrftWeb/Components/_Imports.razor similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Components/_Imports.razor rename to DeepDrftWeb/Components/_Imports.razor diff --git a/DeepDrftWeb/DeepDrftWeb/Controllers/TrackController.cs b/DeepDrftWeb/Controllers/TrackController.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Controllers/TrackController.cs rename to DeepDrftWeb/Controllers/TrackController.cs diff --git a/DeepDrftWeb/DeepDrftWeb/Data/Configurations/TrackConfiguration.cs b/DeepDrftWeb/Data/Configurations/TrackConfiguration.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Data/Configurations/TrackConfiguration.cs rename to DeepDrftWeb/Data/Configurations/TrackConfiguration.cs diff --git a/DeepDrftWeb/DeepDrftWeb/Data/DeepDrftContext.cs b/DeepDrftWeb/Data/DeepDrftContext.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Data/DeepDrftContext.cs rename to DeepDrftWeb/Data/DeepDrftContext.cs diff --git a/DeepDrftWeb/DeepDrftWeb/Data/DeepDrftContextFactory.cs b/DeepDrftWeb/Data/DeepDrftContextFactory.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Data/DeepDrftContextFactory.cs rename to DeepDrftWeb/Data/DeepDrftContextFactory.cs diff --git a/DeepDrftWeb/DeepDrftWeb/Data/Migrations/20250831000622_Initial.Designer.cs b/DeepDrftWeb/Data/Migrations/20250831000622_Initial.Designer.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Data/Migrations/20250831000622_Initial.Designer.cs rename to DeepDrftWeb/Data/Migrations/20250831000622_Initial.Designer.cs diff --git a/DeepDrftWeb/DeepDrftWeb/Data/Migrations/20250831000622_Initial.cs b/DeepDrftWeb/Data/Migrations/20250831000622_Initial.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Data/Migrations/20250831000622_Initial.cs rename to DeepDrftWeb/Data/Migrations/20250831000622_Initial.cs diff --git a/DeepDrftWeb/DeepDrftWeb/Data/Migrations/DeepDrftContextModelSnapshot.cs b/DeepDrftWeb/Data/Migrations/DeepDrftContextModelSnapshot.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Data/Migrations/DeepDrftContextModelSnapshot.cs rename to DeepDrftWeb/Data/Migrations/DeepDrftContextModelSnapshot.cs diff --git a/DeepDrftWeb/DeepDrftWeb/Data/Repositories/TrackRepository.cs b/DeepDrftWeb/Data/Repositories/TrackRepository.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Data/Repositories/TrackRepository.cs rename to DeepDrftWeb/Data/Repositories/TrackRepository.cs diff --git a/DeepDrftWeb/DeepDrftWeb/DeepDrftWeb.csproj b/DeepDrftWeb/DeepDrftWeb.csproj similarity index 94% rename from DeepDrftWeb/DeepDrftWeb/DeepDrftWeb.csproj rename to DeepDrftWeb/DeepDrftWeb.csproj index aa3f22a..9985ab1 100644 --- a/DeepDrftWeb/DeepDrftWeb/DeepDrftWeb.csproj +++ b/DeepDrftWeb/DeepDrftWeb.csproj @@ -19,7 +19,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/DeepDrftWeb/DeepDrftWeb.sln b/DeepDrftWeb/DeepDrftWeb.sln deleted file mode 100644 index b7a11bc..0000000 --- a/DeepDrftWeb/DeepDrftWeb.sln +++ /dev/null @@ -1,50 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.0.0 -MinimumVisualStudioVersion = 16.0.0.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeepDrftWeb", "DeepDrftWeb\DeepDrftWeb.csproj", "{76E9ECCD-3DAE-4C67-AAC3-101A21E22184}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeepDrftWeb.Client", "DeepDrftWeb.Client\DeepDrftWeb.Client.csproj", "{DA187C08-E74D-4F28-8FF2-CD74C5473F9C}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Debug|x64.ActiveCfg = Debug|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Debug|x64.Build.0 = Debug|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Debug|x86.ActiveCfg = Debug|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Debug|x86.Build.0 = Debug|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Release|Any CPU.Build.0 = Release|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Release|x64.ActiveCfg = Release|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Release|x64.Build.0 = Release|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Release|x86.ActiveCfg = Release|Any CPU - {DA187C08-E74D-4F28-8FF2-CD74C5473F9C}.Release|x86.Build.0 = Release|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Debug|Any CPU.Build.0 = Debug|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Debug|x64.ActiveCfg = Debug|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Debug|x64.Build.0 = Debug|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Debug|x86.ActiveCfg = Debug|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Debug|x86.Build.0 = Debug|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Release|Any CPU.ActiveCfg = Release|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Release|Any CPU.Build.0 = Release|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Release|x64.ActiveCfg = Release|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Release|x64.Build.0 = Release|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Release|x86.ActiveCfg = Release|Any CPU - {76E9ECCD-3DAE-4C67-AAC3-101A21E22184}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E25814BD-2D52-4BA2-B9BD-0B80E2221977} - EndGlobalSection -EndGlobal diff --git a/DeepDrftWeb/DeepDrftWeb/Program.cs b/DeepDrftWeb/Program.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Program.cs rename to DeepDrftWeb/Program.cs diff --git a/DeepDrftWeb/DeepDrftWeb/Services/TrackService.cs b/DeepDrftWeb/Services/TrackService.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Services/TrackService.cs rename to DeepDrftWeb/Services/TrackService.cs diff --git a/DeepDrftWeb/DeepDrftWeb/Startup.cs b/DeepDrftWeb/Startup.cs similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/Startup.cs rename to DeepDrftWeb/Startup.cs diff --git a/DeepDrftWeb/DeepDrftWeb/appsettings.Development.json b/DeepDrftWeb/appsettings.Development.json similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/appsettings.Development.json rename to DeepDrftWeb/appsettings.Development.json diff --git a/DeepDrftWeb/DeepDrftWeb/appsettings.json b/DeepDrftWeb/appsettings.json similarity index 76% rename from DeepDrftWeb/DeepDrftWeb/appsettings.json rename to DeepDrftWeb/appsettings.json index 658116a..1619551 100644 --- a/DeepDrftWeb/DeepDrftWeb/appsettings.json +++ b/DeepDrftWeb/appsettings.json @@ -7,6 +7,6 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "DefaultConnection": "Data Source=deepdrft.db" + "DefaultConnection": "Data Source=../deepdrft.db" } } diff --git a/DeepDrftWeb/DeepDrftWeb/wwwroot/favicon.ico b/DeepDrftWeb/wwwroot/favicon.ico similarity index 100% rename from DeepDrftWeb/DeepDrftWeb/wwwroot/favicon.ico rename to DeepDrftWeb/wwwroot/favicon.ico