Restructuing

2026-07-05 16:30:58 -04:00
parent 678e20d402
commit 7b0f2ce1a5
767 changed files with 354 additions and 76 deletions
@@ -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("// <auto-generated/>");
 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("// <auto-generated/>");
 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("// <auto-generated/>");
 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("{");
@@ -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
@@ -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
 {
@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;

-namespace Server;
+namespace Cloud;

 public class AppDbContextFactory : IDesignTimeDbContextFactory<AppDbContext>
 {
@@ -16,13 +16,20 @@
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
            <PrivateAssets>all</PrivateAssets>
        </PackageReference>
+        <PackageReference Include="MudBlazor" Version="9.6.0" />
        <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.2"/>
    </ItemGroup>

+    <ItemGroup>
+      <AdditionalFiles Include="Components\Layout\MainLayout.razor" />
+      <AdditionalFiles Include="Components\Layout\NavMenu.razor" />
+    </ItemGroup>
+
    <PropertyGroup>
        <TargetFramework>net10.0</TargetFramework>
        <Nullable>enable</Nullable>
        <ImplicitUsings>enable</ImplicitUsings>
+        <RootNamespace>Cloud</RootNamespace>
    </PropertyGroup>

 </Project>
@@ -13,7 +13,7 @@
    <link href="/lib/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
    <link href="/_content/Telerik.UI.for.Blazor/css/kendo-theme-bootstrap/all.css" rel="stylesheet"/>
    <link href="/css/app.css" rel="stylesheet"/>
-    <link href="/Server.styles.css" rel="stylesheet"/>
+    <link href="/Cloud.styles.css" rel="stylesheet"/>
    <script defer src="/_content/Telerik.UI.for.Blazor/js/telerik-blazor.js"></script>
    <script src="/js/passkey.js"></script>
    <link href="/favicon.png" rel="icon" type="image/png"/>
@@ -1,4 +1,3 @@
-@namespace Shared.Layout
@inherits LayoutComponentBase
 <div class="page">
    <div class="sidebar">
@@ -1,5 +1,3 @@
-@namespace Shared.Layout
-
 <div class="top-row ps-3 navbar navbar-dark">
    <div class="container-fluid">
        <a class="navbar-brand" href="">
@@ -1,6 +1,6 @@
@page "/cards"
+@using Model
@using Shared.Services
-@inject HttpClient Http
@inject AnalyticsService AnalyticsService

 <PageTitle>Chrono CCG - Card Gallery</PageTitle>
@@ -1,9 +1,9 @@
@page "/deck-builder"
@page "/deck-builder/{Id:guid}"
+@using Model
@rendermode InteractiveServer
-@using Chrono.Model
-@inject AppDbContext Db
@inject NavigationManager Nav
+@inject AppDbContext Db

 <PageTitle>@(Id == null ? "New Deck" : "Edit Deck") - Chrono CCG</PageTitle>

@@ -1,5 +1,6 @@
@page "/my-decks"
@rendermode InteractiveServer
+@using Cloud.Models
@using Microsoft.EntityFrameworkCore
@inject AppDbContext Db
@inject NavigationManager Nav
@@ -2,18 +2,18 @@
@using System.Net.Http.Json
@using Microsoft.AspNetCore.Authorization
@using Microsoft.AspNetCore.Components.Authorization
-@using Chrono.Model
+@using Model
@using Microsoft.AspNetCore.Components.Forms
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using static Microsoft.AspNetCore.Components.Web.RenderMode
@using Microsoft.JSInterop
-@using Shared.Layout
@using Shared.Pages
@using Shared.Components
-@using Server.Components
-@using Server.Models
+@using Cloud.Components
+@using Cloud.Models
@using Telerik.Blazor
@using Telerik.Blazor.Components
@using Telerik.DataSource
+@using Cloud.Components.Layout
@@ -6,9 +6,9 @@ using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Server.Models;
+using Cloud.Models;

-namespace Server.Controllers;
+namespace Cloud.Controllers;

 [AllowAnonymous]
 [ApiController]
@@ -1,9 +1,9 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Server.Models;
+using Cloud.Models;

-namespace Server.Controllers;
+namespace Cloud.Controllers;

 [Authorize]
 [ApiController]
@@ -1,8 +1,8 @@
-using Chrono.Model;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Model;

-namespace Server.Controllers;
+namespace Cloud.Controllers;

 [Authorize]
 [ApiController]
@@ -4,11 +4,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Server;
+using Cloud;

 #nullable disable

-namespace Server.Migrations
+namespace Cloud.Migrations
 {
    [DbContext(typeof(AppDbContext))]
    [Migration("20260618210058_InitialCreate")]
@@ -2,7 +2,7 @@

 #nullable disable

-namespace Server.Migrations
+namespace Cloud.Migrations
 {
    /// <inheritdoc />
    public partial class InitialCreate : Migration
@@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Server;
+using Cloud;

 #nullable disable

-namespace Server.Migrations
+namespace Cloud.Migrations
 {
    [DbContext(typeof(AppDbContext))]
    [Migration("20260703051336_AddUserDecks")]
@@ -39,7 +39,7 @@ namespace Server.Migrations
                    b.ToTable("CardNotes");
                });

-            modelBuilder.Entity("Server.Models.UserDeck", b =>
+            modelBuilder.Entity("Cloud.Models.UserDeck", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;

 #nullable disable

-namespace Server.Migrations
+namespace Cloud.Migrations
 {
    /// <inheritdoc />
    public partial class AddUserDecks : Migration
@@ -5,11 +5,11 @@ using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Server;
+using Cloud;

 #nullable disable

-namespace Server.Migrations
+namespace Cloud.Migrations
 {
    [DbContext(typeof(AppDbContext))]
    [Migration("20260703120000_AddPasskeyCredentials")]
@@ -39,7 +39,7 @@ namespace Server.Migrations
                    b.ToTable("CardNotes");
                });

-            modelBuilder.Entity("Server.Models.PasskeyCredential", b =>
+            modelBuilder.Entity("Cloud.Models.PasskeyCredential", b =>
                {
                    b.Property<int>("Id")
                        .ValueGeneratedOnAdd()
@@ -73,7 +73,7 @@ namespace Server.Migrations
                    b.ToTable("PasskeyCredentials");
                });

-            modelBuilder.Entity("Server.Models.UserDeck", b =>
+            modelBuilder.Entity("Cloud.Models.UserDeck", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
@@ -4,7 +4,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;

 #nullable disable

-namespace Server.Migrations
+namespace Cloud.Migrations
 {
    /// <inheritdoc />
    public partial class AddPasskeyCredentials : Migration
@@ -4,11 +4,10 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-using Server;

 #nullable disable

-namespace Server.Migrations
+namespace Cloud.Migrations
 {
    [DbContext(typeof(AppDbContext))]
    partial class AppDbContextModelSnapshot : ModelSnapshot
@@ -36,7 +35,7 @@ namespace Server.Migrations
                    b.ToTable("CardNotes");
                });

-            modelBuilder.Entity("Server.Models.PasskeyCredential", b =>
+            modelBuilder.Entity("Cloud.Models.PasskeyCredential", b =>
                {
                    b.Property<int>("Id")
                        .ValueGeneratedOnAdd()
@@ -70,7 +69,7 @@ namespace Server.Migrations
                    b.ToTable("PasskeyCredentials");
                });

-            modelBuilder.Entity("Server.Models.UserDeck", b =>
+            modelBuilder.Entity("Cloud.Models.UserDeck", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
@@ -1,4 +1,4 @@
-namespace Server.Models;
+namespace Cloud.Models;

 public class PasskeyCredential
 {
@@ -1,4 +1,4 @@
-namespace Server.Models;
+namespace Cloud.Models;

 public class UserDeck
 {
@@ -1,8 +1,8 @@
 using Fido2NetLib;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.EntityFrameworkCore;
-using Server;
-using Server.Components;
+using Cloud;
+using Cloud.Components;
 using Shared.Pages;
 using Shared.Services;

--- a/Show More
+++ b/Show More