diff --git a/Chrono/Build/Program.cs b/Chrono/Build/Program.cs index 9f57deb..605b262 100644 --- a/Chrono/Build/Program.cs +++ b/Chrono/Build/Program.cs @@ -1,10 +1,10 @@ using System.Text; using System.Text.RegularExpressions; -using Chrono.Model; +using Model; var repoRoot = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, "..", "..", "..", "..", "..")); var docsDir = Path.Combine(repoRoot, "chrono.docs"); -var webWwwRoot = Path.Combine(repoRoot, "Chrono", "Web", "wwwroot"); +var webWwwRoot = Path.Combine(repoRoot, "Chrono", "Standalone", "wwwroot"); var generatedFile = Path.Combine(repoRoot, "Chrono", "Shared", "Generated", "Cards.g.cs"); Console.WriteLine($"Repo root: {repoRoot}"); @@ -91,7 +91,7 @@ using var writer = new StreamWriter(generatedFile, false, Encoding.UTF8); writer.WriteLine("// "); writer.WriteLine("#nullable enable"); writer.WriteLine(); -writer.WriteLine("namespace Chrono.Model;"); +writer.WriteLine("namespace Model;"); writer.WriteLine(); writer.WriteLine("public static class CardDatabase"); writer.WriteLine("{"); @@ -175,7 +175,7 @@ using var deckWriter = new StreamWriter(deckGeneratedFile, false, Encoding.UTF8) deckWriter.WriteLine("// "); deckWriter.WriteLine("#nullable enable"); deckWriter.WriteLine(); -deckWriter.WriteLine("namespace Chrono.Model;"); +deckWriter.WriteLine("namespace Model;"); deckWriter.WriteLine(); deckWriter.WriteLine("public static class DeckDatabase"); deckWriter.WriteLine("{"); @@ -251,7 +251,7 @@ using var docWriter = new StreamWriter(docGeneratedFile, false, Encoding.UTF8); docWriter.WriteLine("// "); docWriter.WriteLine("#nullable enable"); docWriter.WriteLine(); -docWriter.WriteLine("namespace Chrono.Model;"); +docWriter.WriteLine("namespace Model;"); docWriter.WriteLine(); docWriter.WriteLine("public static class DocDatabase"); docWriter.WriteLine("{"); diff --git a/Chrono/Chrono.sln b/Chrono/Chrono.sln index 63fd9e4..aa62017 100644 --- a/Chrono/Chrono.sln +++ b/Chrono/Chrono.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "Web\Web.csproj", "{18981096-443A-44BF-AE56-6499C2B03AEF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Standalone", "Standalone\Standalone.csproj", "{18981096-443A-44BF-AE56-6499C2B03AEF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build", "Build\Build.csproj", "{36E3775C-0E28-4EAE-AE92-4FB493E3787F}" EndProject @@ -10,10 +10,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deploy", "Deploy\Deploy.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{90F32056-6983-4224-8A8C-E797C71633F3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{BFB7B73F-EFDD-4DE8-89F2-E1CBE1B55C27}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloud", "Cloud\Cloud.csproj", "{BFB7B73F-EFDD-4DE8-89F2-E1CBE1B55C27}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\Shared.csproj", "{30D8468D-01E1-4D8A-99AF-EE4A75A5E956}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markdown", "Markdown\Markdown.csproj", "{BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "md", "md", "{A4C572E4-E709-4553-B42F-709BFFFE0A7E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{92ED656F-1D94-4348-97AD-B76094B14A8E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -108,8 +114,28 @@ Global {30D8468D-01E1-4D8A-99AF-EE4A75A5E956}.Release|x64.Build.0 = Release|Any CPU {30D8468D-01E1-4D8A-99AF-EE4A75A5E956}.Release|x86.ActiveCfg = Release|Any CPU {30D8468D-01E1-4D8A-99AF-EE4A75A5E956}.Release|x86.Build.0 = Release|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Debug|x64.ActiveCfg = Debug|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Debug|x64.Build.0 = Debug|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Debug|x86.ActiveCfg = Debug|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Debug|x86.Build.0 = Debug|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Release|Any CPU.Build.0 = Release|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Release|x64.ActiveCfg = Release|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Release|x64.Build.0 = Release|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Release|x86.ActiveCfg = Release|Any CPU + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {BA7A908C-FEF7-4AC7-ABCE-437259A6C34C} = {A4C572E4-E709-4553-B42F-709BFFFE0A7E} + {36E3775C-0E28-4EAE-AE92-4FB493E3787F} = {92ED656F-1D94-4348-97AD-B76094B14A8E} + {90F32056-6983-4224-8A8C-E797C71633F3} = {92ED656F-1D94-4348-97AD-B76094B14A8E} + {30D8468D-01E1-4D8A-99AF-EE4A75A5E956} = {92ED656F-1D94-4348-97AD-B76094B14A8E} + {3358AF7A-603B-4BAC-A7F5-07978FB87843} = {92ED656F-1D94-4348-97AD-B76094B14A8E} + {E5E9A799-76C8-43B3-B9C2-3CAEC2B5E1DD} = {92ED656F-1D94-4348-97AD-B76094B14A8E} + EndGlobalSection EndGlobal diff --git a/Chrono/Server/AppDbContext.cs b/Chrono/Cloud/AppDbContext.cs similarity index 91% rename from Chrono/Server/AppDbContext.cs rename to Chrono/Cloud/AppDbContext.cs index 56f0387..f9015e9 100644 --- a/Chrono/Server/AppDbContext.cs +++ b/Chrono/Cloud/AppDbContext.cs @@ -1,8 +1,9 @@ -using Chrono.Model; +using Model; using Microsoft.EntityFrameworkCore; -using Server.Models; +using Cloud.Models; +using Model; -namespace Server; +namespace Cloud; public class AppDbContext : DbContext { diff --git a/Chrono/Server/AppDbContextFactory.cs b/Chrono/Cloud/AppDbContextFactory.cs similarity index 96% rename from Chrono/Server/AppDbContextFactory.cs rename to Chrono/Cloud/AppDbContextFactory.cs index 2930580..78dafe0 100644 --- a/Chrono/Server/AppDbContextFactory.cs +++ b/Chrono/Cloud/AppDbContextFactory.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Design; -namespace Server; +namespace Cloud; public class AppDbContextFactory : IDesignTimeDbContextFactory { diff --git a/Chrono/Server/Server.csproj b/Chrono/Cloud/Cloud.csproj similarity index 80% rename from Chrono/Server/Server.csproj rename to Chrono/Cloud/Cloud.csproj index a9f65f0..f5d257e 100644 --- a/Chrono/Server/Server.csproj +++ b/Chrono/Cloud/Cloud.csproj @@ -16,13 +16,20 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all + + + + + + net10.0 enable enable + Cloud diff --git a/Chrono/Server/Components/App.razor b/Chrono/Cloud/Components/App.razor similarity index 95% rename from Chrono/Server/Components/App.razor rename to Chrono/Cloud/Components/App.razor index d0350bd..0003945 100644 --- a/Chrono/Server/Components/App.razor +++ b/Chrono/Cloud/Components/App.razor @@ -13,7 +13,7 @@ - + diff --git a/Chrono/Server/Components/CardDialog.razor b/Chrono/Cloud/Components/CardDialog.razor similarity index 100% rename from Chrono/Server/Components/CardDialog.razor rename to Chrono/Cloud/Components/CardDialog.razor diff --git a/Chrono/Server/Components/CardDialog.razor.css b/Chrono/Cloud/Components/CardDialog.razor.css similarity index 100% rename from Chrono/Server/Components/CardDialog.razor.css rename to Chrono/Cloud/Components/CardDialog.razor.css diff --git a/Chrono/Shared/Layout/MainLayout.razor b/Chrono/Cloud/Components/Layout/MainLayout.razor similarity index 92% rename from Chrono/Shared/Layout/MainLayout.razor rename to Chrono/Cloud/Components/Layout/MainLayout.razor index 47a4427..56f22af 100644 --- a/Chrono/Shared/Layout/MainLayout.razor +++ b/Chrono/Cloud/Components/Layout/MainLayout.razor @@ -1,4 +1,3 @@ -@namespace Shared.Layout @inherits LayoutComponentBase