From a86dfad7ef5a00a8f942130ba61e71c7cd50602d Mon Sep 17 00:00:00 2001 From: Jake Mannens Date: Wed, 9 Aug 2023 16:07:56 +1000 Subject: Initial tag definition editing functionality --- HyperBooru.cs | 3 +- Migrations/20230809044429_Initial.Designer.cs | 206 +++++++++++++++++++++++++ Migrations/20230809044429_Initial.cs | 118 ++++++++++++++ Migrations/HyperBooruDbContextModelSnapshot.cs | 203 ++++++++++++++++++++++++ Pages/Shared/_Layout.cshtml | 2 +- Pages/TagDefinitions.cshtml | 104 +++++++++++++ Pages/TagDefinitions.cshtml.cs | 16 ++ Pages/TagDefinitions.cshtml.css | 16 ++ Pages/ViewMedia.cshtml | 21 ++- Server.csproj | 12 +- TagController.cs | 2 +- wwwroot/styles/global.css | 76 ++++++--- 12 files changed, 750 insertions(+), 29 deletions(-) create mode 100644 Migrations/20230809044429_Initial.Designer.cs create mode 100644 Migrations/20230809044429_Initial.cs create mode 100644 Migrations/HyperBooruDbContextModelSnapshot.cs create mode 100644 Pages/TagDefinitions.cshtml create mode 100644 Pages/TagDefinitions.cshtml.cs create mode 100644 Pages/TagDefinitions.cshtml.css diff --git a/HyperBooru.cs b/HyperBooru.cs index 9ccd323..e0e1b2d 100644 --- a/HyperBooru.cs +++ b/HyperBooru.cs @@ -1,3 +1,4 @@ +using Microsoft.EntityFrameworkCore; using System.Text.Json.Serialization; namespace HyperBooru; @@ -20,7 +21,7 @@ public class HyperBooru { using var scope = app.Services.CreateScope(); using var db = scope.ServiceProvider.GetRequiredService(); - db.Database.EnsureCreated(); + db.Database.Migrate(); #if DEBUG app.UseSwagger(); diff --git a/Migrations/20230809044429_Initial.Designer.cs b/Migrations/20230809044429_Initial.Designer.cs new file mode 100644 index 0000000..78a0ca3 --- /dev/null +++ b/Migrations/20230809044429_Initial.Designer.cs @@ -0,0 +1,206 @@ +// +using System; +using HyperBooru; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace HyperBooru.Migrations +{ + [DbContext(typeof(HyperBooruDbContext))] + [Migration("20230809044429_Initial")] + partial class Initial + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.10") + .HasAnnotation("Proxies:ChangeTracking", false) + .HasAnnotation("Proxies:CheckEquality", false) + .HasAnnotation("Proxies:LazyLoading", true); + + modelBuilder.Entity("HyperBooru.DbObject", b => + { + b.Property("ObjectId") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Discriminator") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Guid") + .HasColumnType("TEXT"); + + b.Property("ObjectType") + .HasColumnType("INTEGER"); + + b.HasKey("ObjectId"); + + b.HasIndex("Guid"); + + b.ToTable("Objects"); + + b.HasDiscriminator("Discriminator").HasValue("DbObject"); + + b.UseTphMappingStrategy(); + }); + + modelBuilder.Entity("HyperBooru.DbUploadedFile", b => + { + b.Property("UploadedFileId") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CreateTime") + .HasColumnType("TEXT"); + + b.Property("Filename") + .HasColumnType("TEXT"); + + b.Property("LastAccessTime") + .HasColumnType("TEXT"); + + b.Property("LastWriteTime") + .HasColumnType("TEXT"); + + b.Property("MediaObjectId") + .HasColumnType("INTEGER"); + + b.Property("OriginalChecksum") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UploadTime") + .HasColumnType("TEXT"); + + b.HasKey("UploadedFileId"); + + b.HasIndex("MediaObjectId"); + + b.ToTable("UploadedFiles"); + }); + + modelBuilder.Entity("HyperBooru.DbMedia", b => + { + b.HasBaseType("HyperBooru.DbObject"); + + b.Property("Checksum") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LongDescription") + .HasColumnType("TEXT"); + + b.Property("MimeType") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ShortDescription") + .HasColumnType("TEXT"); + + b.HasDiscriminator().HasValue("DbMedia"); + }); + + modelBuilder.Entity("HyperBooru.DbTag", b => + { + b.HasBaseType("HyperBooru.DbObject"); + + b.Property("CreateTime") + .HasColumnType("TEXT"); + + b.Property("TagDefinitionObjectId") + .HasColumnType("INTEGER"); + + b.Property("TargetObjectId") + .HasColumnType("INTEGER"); + + b.HasIndex("TagDefinitionObjectId"); + + b.HasIndex("TargetObjectId"); + + b.HasDiscriminator().HasValue("DbTag"); + }); + + modelBuilder.Entity("HyperBooru.DbTagDefinition", b => + { + b.HasBaseType("HyperBooru.DbObject"); + + b.Property("DbTagDefinitionObjectId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Namespace") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.HasIndex("DbTagDefinitionObjectId"); + + b.HasDiscriminator().HasValue("DbTagDefinition"); + }); + + modelBuilder.Entity("HyperBooru.DbUploadedFile", b => + { + b.HasOne("HyperBooru.DbMedia", "Media") + .WithMany("UploadedFiles") + .HasForeignKey("MediaObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Media"); + }); + + modelBuilder.Entity("HyperBooru.DbTag", b => + { + b.HasOne("HyperBooru.DbTagDefinition", "TagDefinition") + .WithMany() + .HasForeignKey("TagDefinitionObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HyperBooru.DbObject", "Target") + .WithMany("Tags") + .HasForeignKey("TargetObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("TagDefinition"); + + b.Navigation("Target"); + }); + + modelBuilder.Entity("HyperBooru.DbTagDefinition", b => + { + b.HasOne("HyperBooru.DbTagDefinition", null) + .WithMany("ImplicitTags") + .HasForeignKey("DbTagDefinitionObjectId"); + }); + + modelBuilder.Entity("HyperBooru.DbObject", b => + { + b.Navigation("Tags"); + }); + + modelBuilder.Entity("HyperBooru.DbMedia", b => + { + b.Navigation("UploadedFiles"); + }); + + modelBuilder.Entity("HyperBooru.DbTagDefinition", b => + { + b.Navigation("ImplicitTags"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/20230809044429_Initial.cs b/Migrations/20230809044429_Initial.cs new file mode 100644 index 0000000..0126c13 --- /dev/null +++ b/Migrations/20230809044429_Initial.cs @@ -0,0 +1,118 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace HyperBooru.Migrations +{ + /// + public partial class Initial : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Objects", + columns: table => new + { + ObjectId = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Guid = table.Column(type: "TEXT", nullable: false), + ObjectType = table.Column(type: "INTEGER", nullable: false), + Discriminator = table.Column(type: "TEXT", nullable: false), + Checksum = table.Column(type: "TEXT", nullable: true), + MimeType = table.Column(type: "TEXT", nullable: true), + ShortDescription = table.Column(type: "TEXT", nullable: true), + LongDescription = table.Column(type: "TEXT", nullable: true), + TagDefinitionObjectId = table.Column(type: "INTEGER", nullable: true), + CreateTime = table.Column(type: "TEXT", nullable: true), + TargetObjectId = table.Column(type: "INTEGER", nullable: true), + Source = table.Column(type: "INTEGER", nullable: true), + Namespace = table.Column(type: "TEXT", nullable: true), + Name = table.Column(type: "TEXT", nullable: true), + DbTagDefinitionObjectId = table.Column(type: "INTEGER", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Objects", x => x.ObjectId); + table.ForeignKey( + name: "FK_Objects_Objects_DbTagDefinitionObjectId", + column: x => x.DbTagDefinitionObjectId, + principalTable: "Objects", + principalColumn: "ObjectId"); + table.ForeignKey( + name: "FK_Objects_Objects_TagDefinitionObjectId", + column: x => x.TagDefinitionObjectId, + principalTable: "Objects", + principalColumn: "ObjectId", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_Objects_Objects_TargetObjectId", + column: x => x.TargetObjectId, + principalTable: "Objects", + principalColumn: "ObjectId", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateTable( + name: "UploadedFiles", + columns: table => new + { + UploadedFileId = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + OriginalChecksum = table.Column(type: "TEXT", nullable: false), + Filename = table.Column(type: "TEXT", nullable: true), + UploadTime = table.Column(type: "TEXT", nullable: false), + LastAccessTime = table.Column(type: "TEXT", nullable: true), + LastWriteTime = table.Column(type: "TEXT", nullable: true), + CreateTime = table.Column(type: "TEXT", nullable: true), + MediaObjectId = table.Column(type: "INTEGER", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_UploadedFiles", x => x.UploadedFileId); + table.ForeignKey( + name: "FK_UploadedFiles_Objects_MediaObjectId", + column: x => x.MediaObjectId, + principalTable: "Objects", + principalColumn: "ObjectId", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_Objects_DbTagDefinitionObjectId", + table: "Objects", + column: "DbTagDefinitionObjectId"); + + migrationBuilder.CreateIndex( + name: "IX_Objects_Guid", + table: "Objects", + column: "Guid"); + + migrationBuilder.CreateIndex( + name: "IX_Objects_TagDefinitionObjectId", + table: "Objects", + column: "TagDefinitionObjectId"); + + migrationBuilder.CreateIndex( + name: "IX_Objects_TargetObjectId", + table: "Objects", + column: "TargetObjectId"); + + migrationBuilder.CreateIndex( + name: "IX_UploadedFiles_MediaObjectId", + table: "UploadedFiles", + column: "MediaObjectId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "UploadedFiles"); + + migrationBuilder.DropTable( + name: "Objects"); + } + } +} diff --git a/Migrations/HyperBooruDbContextModelSnapshot.cs b/Migrations/HyperBooruDbContextModelSnapshot.cs new file mode 100644 index 0000000..566b66c --- /dev/null +++ b/Migrations/HyperBooruDbContextModelSnapshot.cs @@ -0,0 +1,203 @@ +// +using System; +using HyperBooru; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace HyperBooru.Migrations +{ + [DbContext(typeof(HyperBooruDbContext))] + partial class HyperBooruDbContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "7.0.10") + .HasAnnotation("Proxies:ChangeTracking", false) + .HasAnnotation("Proxies:CheckEquality", false) + .HasAnnotation("Proxies:LazyLoading", true); + + modelBuilder.Entity("HyperBooru.DbObject", b => + { + b.Property("ObjectId") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Discriminator") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Guid") + .HasColumnType("TEXT"); + + b.Property("ObjectType") + .HasColumnType("INTEGER"); + + b.HasKey("ObjectId"); + + b.HasIndex("Guid"); + + b.ToTable("Objects"); + + b.HasDiscriminator("Discriminator").HasValue("DbObject"); + + b.UseTphMappingStrategy(); + }); + + modelBuilder.Entity("HyperBooru.DbUploadedFile", b => + { + b.Property("UploadedFileId") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("CreateTime") + .HasColumnType("TEXT"); + + b.Property("Filename") + .HasColumnType("TEXT"); + + b.Property("LastAccessTime") + .HasColumnType("TEXT"); + + b.Property("LastWriteTime") + .HasColumnType("TEXT"); + + b.Property("MediaObjectId") + .HasColumnType("INTEGER"); + + b.Property("OriginalChecksum") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UploadTime") + .HasColumnType("TEXT"); + + b.HasKey("UploadedFileId"); + + b.HasIndex("MediaObjectId"); + + b.ToTable("UploadedFiles"); + }); + + modelBuilder.Entity("HyperBooru.DbMedia", b => + { + b.HasBaseType("HyperBooru.DbObject"); + + b.Property("Checksum") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("LongDescription") + .HasColumnType("TEXT"); + + b.Property("MimeType") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("ShortDescription") + .HasColumnType("TEXT"); + + b.HasDiscriminator().HasValue("DbMedia"); + }); + + modelBuilder.Entity("HyperBooru.DbTag", b => + { + b.HasBaseType("HyperBooru.DbObject"); + + b.Property("CreateTime") + .HasColumnType("TEXT"); + + b.Property("TagDefinitionObjectId") + .HasColumnType("INTEGER"); + + b.Property("TargetObjectId") + .HasColumnType("INTEGER"); + + b.HasIndex("TagDefinitionObjectId"); + + b.HasIndex("TargetObjectId"); + + b.HasDiscriminator().HasValue("DbTag"); + }); + + modelBuilder.Entity("HyperBooru.DbTagDefinition", b => + { + b.HasBaseType("HyperBooru.DbObject"); + + b.Property("DbTagDefinitionObjectId") + .HasColumnType("INTEGER"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Namespace") + .HasColumnType("TEXT"); + + b.Property("Source") + .HasColumnType("INTEGER"); + + b.HasIndex("DbTagDefinitionObjectId"); + + b.HasDiscriminator().HasValue("DbTagDefinition"); + }); + + modelBuilder.Entity("HyperBooru.DbUploadedFile", b => + { + b.HasOne("HyperBooru.DbMedia", "Media") + .WithMany("UploadedFiles") + .HasForeignKey("MediaObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Media"); + }); + + modelBuilder.Entity("HyperBooru.DbTag", b => + { + b.HasOne("HyperBooru.DbTagDefinition", "TagDefinition") + .WithMany() + .HasForeignKey("TagDefinitionObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("HyperBooru.DbObject", "Target") + .WithMany("Tags") + .HasForeignKey("TargetObjectId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("TagDefinition"); + + b.Navigation("Target"); + }); + + modelBuilder.Entity("HyperBooru.DbTagDefinition", b => + { + b.HasOne("HyperBooru.DbTagDefinition", null) + .WithMany("ImplicitTags") + .HasForeignKey("DbTagDefinitionObjectId"); + }); + + modelBuilder.Entity("HyperBooru.DbObject", b => + { + b.Navigation("Tags"); + }); + + modelBuilder.Entity("HyperBooru.DbMedia", b => + { + b.Navigation("UploadedFiles"); + }); + + modelBuilder.Entity("HyperBooru.DbTagDefinition", b => + { + b.Navigation("ImplicitTags"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Pages/Shared/_Layout.cshtml b/Pages/Shared/_Layout.cshtml index be445cc..9cdb952 100644 --- a/Pages/Shared/_Layout.cshtml +++ b/Pages/Shared/_Layout.cshtml @@ -16,7 +16,7 @@
@RenderBody() diff --git a/Pages/TagDefinitions.cshtml b/Pages/TagDefinitions.cshtml new file mode 100644 index 0000000..a05f5d5 --- /dev/null +++ b/Pages/TagDefinitions.cshtml @@ -0,0 +1,104 @@ +@page +@model HyperBooru.Pages.TagDefinitionsModel +@{ + ViewBag.Title = "Tag Definitions"; +} + + + + + + + + + + + + + + @foreach(var tagDef in Model.TagDefinitions) { + + + + + + + + } +
GuidSourceNamespaceName
@tagDef.Guid@tagDef.Source@tagDef.Namespace@tagDef.Name
+ +
+ +
+ +
+

Create a new tag definition

+
+
+ + + + +
+ + +
+
+
+ +
+

Are you sure you want to delete this tag definition?

+
+
+ + +
+
diff --git a/Pages/TagDefinitions.cshtml.cs b/Pages/TagDefinitions.cshtml.cs new file mode 100644 index 0000000..e2253d6 --- /dev/null +++ b/Pages/TagDefinitions.cshtml.cs @@ -0,0 +1,16 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace HyperBooru.Pages; + +public class TagDefinitionsModel : PageModel { + public IEnumerable TagDefinitions => + db.TagDefinitions; + + private HyperBooruDbContext db; + + public TagDefinitionsModel(HyperBooruDbContext db) => + this.db = db; + + public void OnGet() {} +} diff --git a/Pages/TagDefinitions.cshtml.css b/Pages/TagDefinitions.cshtml.css new file mode 100644 index 0000000..0a9e226 --- /dev/null +++ b/Pages/TagDefinitions.cshtml.css @@ -0,0 +1,16 @@ +form > input { + width: 100%; +} + +div.button-container { + display: flex; + justify-content: flex-end; +} + +table#tag-definitions td:first-child { + font-family: 'Lucida Console'; +} + +table#tag-definitions td > button { + margin-top: 0; +} \ No newline at end of file diff --git a/Pages/ViewMedia.cshtml b/Pages/ViewMedia.cshtml index 0f433df..3d0ce4a 100644 --- a/Pages/ViewMedia.cshtml +++ b/Pages/ViewMedia.cshtml @@ -17,6 +17,10 @@ } } + function showDeleteDialog(visible) { + document.getElementById('delete-dialog').classList.toggle('visible', visible); + } + function selectPane(tab) { var tabs = Array.from(document.querySelectorAll('div#metadata-header > a')); @@ -76,7 +80,7 @@ }
- +
@@ -85,7 +89,18 @@ Tag Name - +
+ +
- \ No newline at end of file + + +
+

Delete this media?

+
+
+ + +
+
diff --git a/Server.csproj b/Server.csproj index 12b3a92..3a582e2 100644 --- a/Server.csproj +++ b/Server.csproj @@ -9,10 +9,14 @@ - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/TagController.cs b/TagController.cs index b97b066..5c9fa39 100644 --- a/TagController.cs +++ b/TagController.cs @@ -3,7 +3,7 @@ namespace HyperBooru; [ApiController] -[Route("tag")] +[Route("/api/tag")] public class TagController : Controller { private HyperBooruDbContext db; diff --git a/wwwroot/styles/global.css b/wwwroot/styles/global.css index caf773a..2b007f8 100644 --- a/wwwroot/styles/global.css +++ b/wwwroot/styles/global.css @@ -1,6 +1,10 @@ :root { - --col-bg: #222; - --col-navbar-bg: magenta; + --col-accent-pri: #0aa; + --col-bg: #222; + --col-dialog-bg: #333; + --col-navbar-bg: var(--col-accent-pri); + --col-button-pri: var(--col-accent-pri); + --col-button-sec: #555; } body { @@ -15,30 +19,42 @@ a { text-decoration: none; } -input { +button, input[type=submit] { color: white; - box-sizing: border-box; - border: 1px solid #aaa; - background: rgba(0, 0, 0, 0.3); - border-radius: 5px; -} - -button { - background: #f0f; + background: var(--col-button-pri); border-radius: 10px; border: none; box-sizing: border-box; height: 30px; - margin-top: 10px; - padding: 0 7px 0 7px; + margin: 10px 5px 0 5px; + padding: 0 9px 0 9px; +} + +button.secondary { + background: var(--col-button-sec); +} + +button:hover, input[type=submit]:hover { + filter: grayscale(0.9) brightness(2.5); +} + +button:active, input[type=submit]:active { + filter: grayscale(0.9) brightness(3.5); } -button:hover { - background: #f8f; +input { + background: rgba(0, 0, 0, 0); + border-radius: 5px; + border: 1px solid #aaa; + box-sizing: border-box; + color: white; + height: 25px !important; + margin-bottom: 10px; } -button:active { - background: #fff; +/* necessary for use inside flex containers */ +hr { + width: 100%; } table.data-table { @@ -55,10 +71,32 @@ table.data-table > tbody > tr > td { padding: 4px; } -table.data-table > tbody > tr:nth-child(2n):not(:last-child) { +table.data-table > tbody > tr:nth-child(2n) { background: rgba(255, 255, 255, 0.2); } table.data-table > tbody > tr > td:not(:last-child) { border-right: 1px solid white; -} \ No newline at end of file +} + +div.dialog { + background: var(--col-dialog-bg); + border-radius: 20px; + box-shadow: 0px 5px 10px 10px rgb(0 0 0 / 25%); + display: flex; + flex-direction: column; + left: 50%; + opacity: 0; + padding: 20px; + position: absolute; + top: 50%; + transform: translate(-50%, -50%); + transition: visibility 0.1s, opacity 0.1s linear; + visibility: hidden; + width: 450px; +} + +div.dialog.visible { + opacity: 1; + visibility: visible; +} -- cgit v1.3