diff --git a/fxl.codes.kisekae.blazor/Components/Pages/Home.razor b/fxl.codes.kisekae.blazor/Components/Pages/Home.razor index dfcdf75..7e9f85c 100644 --- a/fxl.codes.kisekae.blazor/Components/Pages/Home.razor +++ b/fxl.codes.kisekae.blazor/Components/Pages/Home.razor @@ -1,6 +1,6 @@ @page "/" -Home +Kisekae

Hello, world!

diff --git a/fxl.codes.kisekae.blazor/Program.cs b/fxl.codes.kisekae.blazor/Program.cs index 95d3410..775f4bb 100644 --- a/fxl.codes.kisekae.blazor/Program.cs +++ b/fxl.codes.kisekae.blazor/Program.cs @@ -1,10 +1,13 @@ using fxl.codes.kisekae.blazor.Components; +using fxl.codes.kisekae.data; +using Microsoft.EntityFrameworkCore; var builder = WebApplication.CreateBuilder(args); // Add services to the container. builder.Services.AddRazorComponents() .AddInteractiveServerComponents(); +builder.Services.AddDbContextFactory(options => { options.UseNpgsql(builder.Configuration.GetConnectionString("kisekae")); }); var app = builder.Build(); diff --git a/fxl.codes.kisekae.blazor/appsettings.json b/fxl.codes.kisekae.blazor/appsettings.json index 10f68b8..1242a8a 100644 --- a/fxl.codes.kisekae.blazor/appsettings.json +++ b/fxl.codes.kisekae.blazor/appsettings.json @@ -5,5 +5,8 @@ "Microsoft.AspNetCore": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*", + "ConnectionStrings": { + "kisekae": "" + } } diff --git a/fxl.codes.kisekae.blazor/fxl.codes.kisekae.blazor.csproj b/fxl.codes.kisekae.blazor/fxl.codes.kisekae.blazor.csproj index c150414..45cdade 100644 --- a/fxl.codes.kisekae.blazor/fxl.codes.kisekae.blazor.csproj +++ b/fxl.codes.kisekae.blazor/fxl.codes.kisekae.blazor.csproj @@ -6,4 +6,18 @@ enable + + + + + + + + + + + + + + diff --git a/fxl.codes.kisekae/Entities/Action.cs b/fxl.codes.kisekae.data/Entities/Action.cs similarity index 73% rename from fxl.codes.kisekae/Entities/Action.cs rename to fxl.codes.kisekae.data/Entities/Action.cs index 28f474f..10d86e7 100644 --- a/fxl.codes.kisekae/Entities/Action.cs +++ b/fxl.codes.kisekae.data/Entities/Action.cs @@ -1,4 +1,4 @@ -namespace fxl.codes.kisekae.Entities +namespace fxl.codes.kisekae.data.Entities { public class Action { diff --git a/fxl.codes.kisekae/Entities/Cel.cs b/fxl.codes.kisekae.data/Entities/Cel.cs similarity index 83% rename from fxl.codes.kisekae/Entities/Cel.cs rename to fxl.codes.kisekae.data/Entities/Cel.cs index 7c71600..9e211fb 100644 --- a/fxl.codes.kisekae/Entities/Cel.cs +++ b/fxl.codes.kisekae.data/Entities/Cel.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace fxl.codes.kisekae.Entities +namespace fxl.codes.kisekae.data.Entities { public class Cel { diff --git a/fxl.codes.kisekae/Entities/CelConfig.cs b/fxl.codes.kisekae.data/Entities/CelConfig.cs similarity index 89% rename from fxl.codes.kisekae/Entities/CelConfig.cs rename to fxl.codes.kisekae.data/Entities/CelConfig.cs index df49408..bcd15d0 100644 --- a/fxl.codes.kisekae/Entities/CelConfig.cs +++ b/fxl.codes.kisekae.data/Entities/CelConfig.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace fxl.codes.kisekae.Entities +namespace fxl.codes.kisekae.data.Entities { public class CelConfig { diff --git a/fxl.codes.kisekae/Entities/CelPosition.cs b/fxl.codes.kisekae.data/Entities/CelPosition.cs similarity index 81% rename from fxl.codes.kisekae/Entities/CelPosition.cs rename to fxl.codes.kisekae.data/Entities/CelPosition.cs index cb55295..2ddccb9 100644 --- a/fxl.codes.kisekae/Entities/CelPosition.cs +++ b/fxl.codes.kisekae.data/Entities/CelPosition.cs @@ -1,4 +1,4 @@ -namespace fxl.codes.kisekae.Entities +namespace fxl.codes.kisekae.data.Entities { public class CelPosition { diff --git a/fxl.codes.kisekae/Entities/Configuration.cs b/fxl.codes.kisekae.data/Entities/Configuration.cs similarity index 86% rename from fxl.codes.kisekae/Entities/Configuration.cs rename to fxl.codes.kisekae.data/Entities/Configuration.cs index 78f5563..dc78582 100644 --- a/fxl.codes.kisekae/Entities/Configuration.cs +++ b/fxl.codes.kisekae.data/Entities/Configuration.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace fxl.codes.kisekae.Entities +namespace fxl.codes.kisekae.data.Entities { public class Configuration { diff --git a/fxl.codes.kisekae/Entities/Kisekae.cs b/fxl.codes.kisekae.data/Entities/Kisekae.cs similarity index 83% rename from fxl.codes.kisekae/Entities/Kisekae.cs rename to fxl.codes.kisekae.data/Entities/Kisekae.cs index 3c061b0..7db4884 100644 --- a/fxl.codes.kisekae/Entities/Kisekae.cs +++ b/fxl.codes.kisekae.data/Entities/Kisekae.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace fxl.codes.kisekae.Entities +namespace fxl.codes.kisekae.data.Entities { public class Kisekae { diff --git a/fxl.codes.kisekae/Entities/Palette.cs b/fxl.codes.kisekae.data/Entities/Palette.cs similarity index 79% rename from fxl.codes.kisekae/Entities/Palette.cs rename to fxl.codes.kisekae.data/Entities/Palette.cs index 6d6da47..a53f807 100644 --- a/fxl.codes.kisekae/Entities/Palette.cs +++ b/fxl.codes.kisekae.data/Entities/Palette.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; - -namespace fxl.codes.kisekae.Entities +namespace fxl.codes.kisekae.data.Entities { public class Palette { diff --git a/fxl.codes.kisekae/Entities/PaletteColor.cs b/fxl.codes.kisekae.data/Entities/PaletteColor.cs similarity index 82% rename from fxl.codes.kisekae/Entities/PaletteColor.cs rename to fxl.codes.kisekae.data/Entities/PaletteColor.cs index 4aa28ba..6096be9 100644 --- a/fxl.codes.kisekae/Entities/PaletteColor.cs +++ b/fxl.codes.kisekae.data/Entities/PaletteColor.cs @@ -1,4 +1,4 @@ -namespace fxl.codes.kisekae.Entities +namespace fxl.codes.kisekae.data.Entities { public class PaletteColor { diff --git a/fxl.codes.kisekae/Entities/Render.cs b/fxl.codes.kisekae.data/Entities/Render.cs similarity index 73% rename from fxl.codes.kisekae/Entities/Render.cs rename to fxl.codes.kisekae.data/Entities/Render.cs index 39ad0cf..174e75b 100644 --- a/fxl.codes.kisekae/Entities/Render.cs +++ b/fxl.codes.kisekae.data/Entities/Render.cs @@ -1,4 +1,4 @@ -namespace fxl.codes.kisekae.Entities +namespace fxl.codes.kisekae.data.Entities { public class Render { diff --git a/fxl.codes.kisekae/KisekaeContext.cs b/fxl.codes.kisekae.data/KisekaeContext.cs similarity index 91% rename from fxl.codes.kisekae/KisekaeContext.cs rename to fxl.codes.kisekae.data/KisekaeContext.cs index 1a369f5..384aa91 100644 --- a/fxl.codes.kisekae/KisekaeContext.cs +++ b/fxl.codes.kisekae.data/KisekaeContext.cs @@ -1,7 +1,7 @@ -using fxl.codes.kisekae.Entities; +using fxl.codes.kisekae.data.Entities; using Microsoft.EntityFrameworkCore; -namespace fxl.codes.kisekae +namespace fxl.codes.kisekae.data { public class KisekaeContext : DbContext { diff --git a/fxl.codes.kisekae/Migrations/20240212041548_init.Designer.cs b/fxl.codes.kisekae.data/Migrations/20240212041548_init.Designer.cs similarity index 99% rename from fxl.codes.kisekae/Migrations/20240212041548_init.Designer.cs rename to fxl.codes.kisekae.data/Migrations/20240212041548_init.Designer.cs index df77ea4..b72b8e1 100644 --- a/fxl.codes.kisekae/Migrations/20240212041548_init.Designer.cs +++ b/fxl.codes.kisekae.data/Migrations/20240212041548_init.Designer.cs @@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; using fxl.codes.kisekae; +using fxl.codes.kisekae.data; #nullable disable diff --git a/fxl.codes.kisekae/Migrations/20240212041548_init.cs b/fxl.codes.kisekae.data/Migrations/20240212041548_init.cs similarity index 100% rename from fxl.codes.kisekae/Migrations/20240212041548_init.cs rename to fxl.codes.kisekae.data/Migrations/20240212041548_init.cs diff --git a/fxl.codes.kisekae/Migrations/KisekaeContextModelSnapshot.cs b/fxl.codes.kisekae.data/Migrations/KisekaeContextModelSnapshot.cs similarity index 99% rename from fxl.codes.kisekae/Migrations/KisekaeContextModelSnapshot.cs rename to fxl.codes.kisekae.data/Migrations/KisekaeContextModelSnapshot.cs index 4e26424..e884ede 100644 --- a/fxl.codes.kisekae/Migrations/KisekaeContextModelSnapshot.cs +++ b/fxl.codes.kisekae.data/Migrations/KisekaeContextModelSnapshot.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; using fxl.codes.kisekae; +using fxl.codes.kisekae.data; #nullable disable diff --git a/fxl.codes.kisekae.data/fxl.codes.kisekae.data.csproj b/fxl.codes.kisekae.data/fxl.codes.kisekae.data.csproj new file mode 100644 index 0000000..7201e52 --- /dev/null +++ b/fxl.codes.kisekae.data/fxl.codes.kisekae.data.csproj @@ -0,0 +1,15 @@ + + + + net8.0 + enable + enable + + + + + + + + + diff --git a/fxl.codes.kisekae.sln b/fxl.codes.kisekae.sln index 587aaa5..7a6e8df 100644 --- a/fxl.codes.kisekae.sln +++ b/fxl.codes.kisekae.sln @@ -4,6 +4,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fxl.codes.kisekae", "fxl.co EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fxl.codes.kisekae.blazor", "fxl.codes.kisekae.blazor\fxl.codes.kisekae.blazor.csproj", "{57F7E699-41A9-4312-9877-DEAC8C2E1F2E}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fxl.codes.kisekae.data", "fxl.codes.kisekae.data\fxl.codes.kisekae.data.csproj", "{A977AF77-5A7F-4DDA-8113-3367EE9920BB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -18,5 +20,9 @@ Global {57F7E699-41A9-4312-9877-DEAC8C2E1F2E}.Debug|Any CPU.Build.0 = Debug|Any CPU {57F7E699-41A9-4312-9877-DEAC8C2E1F2E}.Release|Any CPU.ActiveCfg = Release|Any CPU {57F7E699-41A9-4312-9877-DEAC8C2E1F2E}.Release|Any CPU.Build.0 = Release|Any CPU + {A977AF77-5A7F-4DDA-8113-3367EE9920BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A977AF77-5A7F-4DDA-8113-3367EE9920BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A977AF77-5A7F-4DDA-8113-3367EE9920BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A977AF77-5A7F-4DDA-8113-3367EE9920BB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/fxl.codes.kisekae/Models/CelModel.cs b/fxl.codes.kisekae/Models/CelModel.cs index 64792eb..34d2efe 100644 --- a/fxl.codes.kisekae/Models/CelModel.cs +++ b/fxl.codes.kisekae/Models/CelModel.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using fxl.codes.kisekae.Entities; +using fxl.codes.kisekae.data.Entities; namespace fxl.codes.kisekae.Models { diff --git a/fxl.codes.kisekae/Models/KisekaeModel.cs b/fxl.codes.kisekae/Models/KisekaeModel.cs index 6819681..8c8e43f 100644 --- a/fxl.codes.kisekae/Models/KisekaeModel.cs +++ b/fxl.codes.kisekae/Models/KisekaeModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using fxl.codes.kisekae.Entities; +using fxl.codes.kisekae.data.Entities; namespace fxl.codes.kisekae.Models { diff --git a/fxl.codes.kisekae/Models/PlaysetModel.cs b/fxl.codes.kisekae/Models/PlaysetModel.cs index 927db1a..596b1a5 100644 --- a/fxl.codes.kisekae/Models/PlaysetModel.cs +++ b/fxl.codes.kisekae/Models/PlaysetModel.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Text.Json.Serialization; -using fxl.codes.kisekae.Entities; +using fxl.codes.kisekae.data.Entities; namespace fxl.codes.kisekae.Models; diff --git a/fxl.codes.kisekae/Program.cs b/fxl.codes.kisekae/Program.cs index 9d3ed31..2646cc8 100644 --- a/fxl.codes.kisekae/Program.cs +++ b/fxl.codes.kisekae/Program.cs @@ -1,4 +1,4 @@ -using fxl.codes.kisekae; +using fxl.codes.kisekae.data; using fxl.codes.kisekae.Services; using Microsoft.AspNetCore.Builder; using Microsoft.EntityFrameworkCore; diff --git a/fxl.codes.kisekae/Services/ConfigurationReaderService.cs b/fxl.codes.kisekae/Services/ConfigurationReaderService.cs index 3da54df..828dd8a 100644 --- a/fxl.codes.kisekae/Services/ConfigurationReaderService.cs +++ b/fxl.codes.kisekae/Services/ConfigurationReaderService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Text.RegularExpressions; -using fxl.codes.kisekae.Entities; +using fxl.codes.kisekae.data.Entities; using Microsoft.Extensions.Logging; namespace fxl.codes.kisekae.Services; diff --git a/fxl.codes.kisekae/Services/DatabaseService.cs b/fxl.codes.kisekae/Services/DatabaseService.cs index a7c20b5..5e806d4 100644 --- a/fxl.codes.kisekae/Services/DatabaseService.cs +++ b/fxl.codes.kisekae/Services/DatabaseService.cs @@ -6,12 +6,13 @@ using System.Linq; using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -using fxl.codes.kisekae.Entities; +using fxl.codes.kisekae.data; +using fxl.codes.kisekae.data.Entities; using Microsoft.AspNetCore.Http; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Logging; using SixLabors.ImageSharp; -using Configuration = fxl.codes.kisekae.Entities.Configuration; +using Configuration = fxl.codes.kisekae.data.Entities.Configuration; namespace fxl.codes.kisekae.Services; diff --git a/fxl.codes.kisekae/Services/FileParserService.cs b/fxl.codes.kisekae/Services/FileParserService.cs index cb4baa4..60d0acd 100644 --- a/fxl.codes.kisekae/Services/FileParserService.cs +++ b/fxl.codes.kisekae/Services/FileParserService.cs @@ -6,7 +6,7 @@ using System.IO.IsolatedStorage; using System.Linq; using System.Reflection; using System.Threading.Tasks; -using fxl.codes.kisekae.Entities; +using fxl.codes.kisekae.data.Entities; using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using SixLabors.ImageSharp; diff --git a/fxl.codes.kisekae/Views/Home/Index.cshtml b/fxl.codes.kisekae/Views/Home/Index.cshtml index 1963eb1..03e2a15 100644 --- a/fxl.codes.kisekae/Views/Home/Index.cshtml +++ b/fxl.codes.kisekae/Views/Home/Index.cshtml @@ -1,4 +1,5 @@ -@model IEnumerable +@using Microsoft.AspNetCore.Mvc.TagHelpers +@model IEnumerable @{ ViewData["Title"] = "Select"; diff --git a/fxl.codes.kisekae/fxl.codes.kisekae.csproj b/fxl.codes.kisekae/fxl.codes.kisekae.csproj index 3029d0c..b99718e 100644 --- a/fxl.codes.kisekae/fxl.codes.kisekae.csproj +++ b/fxl.codes.kisekae/fxl.codes.kisekae.csproj @@ -30,4 +30,8 @@ + + + +