From 0107d5b518f586bc2172b4e89f0cab7619e76670 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Tue, 21 Feb 2023 07:52:11 +0300 Subject: Add decription to figure model --- Migrations/20230201062503_Init.Designer.cs | 79 ---------------------------- Migrations/20230201062503_Init.cs | 63 ----------------------- Migrations/20230221044417_Init.Designer.cs | 83 ++++++++++++++++++++++++++++++ Migrations/20230221044417_Init.cs | 64 +++++++++++++++++++++++ Migrations/DataContextModelSnapshot.cs | 4 ++ Models/Figure.cs | 11 ++-- Models/SeedData.cs | 12 ++--- Program.cs | 10 ++-- Views/Home/_Projects.cshtml | 5 +- 9 files changed, 171 insertions(+), 160 deletions(-) delete mode 100644 Migrations/20230201062503_Init.Designer.cs delete mode 100644 Migrations/20230201062503_Init.cs create mode 100644 Migrations/20230221044417_Init.Designer.cs create mode 100644 Migrations/20230221044417_Init.cs diff --git a/Migrations/20230201062503_Init.Designer.cs b/Migrations/20230201062503_Init.Designer.cs deleted file mode 100644 index 18bb01e..0000000 --- a/Migrations/20230201062503_Init.Designer.cs +++ /dev/null @@ -1,79 +0,0 @@ -// -using System; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -using MyDarling.Models; - -#nullable disable - -namespace MyDarling.Migrations -{ - [DbContext(typeof(DataContext))] - [Migration("20230201062503_Init")] - partial class Init - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); - - modelBuilder.Entity("MyDarling.Models.Figure", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("INTEGER"); - - b.Property("FilePath") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("UnderwearBundleId") - .HasColumnType("INTEGER"); - - b.HasKey("Id"); - - b.HasIndex("UnderwearBundleId"); - - b.ToTable("Figures"); - }); - - modelBuilder.Entity("MyDarling.Models.UnderwearBundle", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("INTEGER"); - - b.Property("Description") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("Name") - .IsRequired() - .HasColumnType("TEXT"); - - b.Property("Price") - .HasColumnType("TEXT"); - - b.HasKey("Id"); - - b.ToTable("UnderwearBundles"); - }); - - modelBuilder.Entity("MyDarling.Models.Figure", b => - { - b.HasOne("MyDarling.Models.UnderwearBundle", null) - .WithMany("Figures") - .HasForeignKey("UnderwearBundleId"); - }); - - modelBuilder.Entity("MyDarling.Models.UnderwearBundle", b => - { - b.Navigation("Figures"); - }); -#pragma warning restore 612, 618 - } - } -} diff --git a/Migrations/20230201062503_Init.cs b/Migrations/20230201062503_Init.cs deleted file mode 100644 index fe709a8..0000000 --- a/Migrations/20230201062503_Init.cs +++ /dev/null @@ -1,63 +0,0 @@ -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable - -namespace MyDarling.Migrations -{ - /// - public partial class Init : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "UnderwearBundles", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - Name = table.Column(type: "TEXT", nullable: false), - Description = table.Column(type: "TEXT", nullable: false), - Price = table.Column(type: "TEXT", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_UnderwearBundles", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Figures", - columns: table => new - { - Id = table.Column(type: "INTEGER", nullable: false) - .Annotation("Sqlite:Autoincrement", true), - FilePath = table.Column(type: "TEXT", nullable: false), - UnderwearBundleId = table.Column(type: "INTEGER", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Figures", x => x.Id); - table.ForeignKey( - name: "FK_Figures_UnderwearBundles_UnderwearBundleId", - column: x => x.UnderwearBundleId, - principalTable: "UnderwearBundles", - principalColumn: "Id"); - }); - - migrationBuilder.CreateIndex( - name: "IX_Figures_UnderwearBundleId", - table: "Figures", - column: "UnderwearBundleId"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Figures"); - - migrationBuilder.DropTable( - name: "UnderwearBundles"); - } - } -} diff --git a/Migrations/20230221044417_Init.Designer.cs b/Migrations/20230221044417_Init.Designer.cs new file mode 100644 index 0000000..658e6b7 --- /dev/null +++ b/Migrations/20230221044417_Init.Designer.cs @@ -0,0 +1,83 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using MyDarling.Models; + +#nullable disable + +namespace MyDarling.Migrations +{ + [DbContext(typeof(DataContext))] + [Migration("20230221044417_Init")] + partial class Init + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); + + modelBuilder.Entity("MyDarling.Models.Figure", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("FilePath") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("UnderwearBundleId") + .HasColumnType("INTEGER"); + + b.HasKey("Id"); + + b.HasIndex("UnderwearBundleId"); + + b.ToTable("Figures"); + }); + + modelBuilder.Entity("MyDarling.Models.UnderwearBundle", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("INTEGER"); + + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Name") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Price") + .HasColumnType("TEXT"); + + b.HasKey("Id"); + + b.ToTable("UnderwearBundles"); + }); + + modelBuilder.Entity("MyDarling.Models.Figure", b => + { + b.HasOne("MyDarling.Models.UnderwearBundle", null) + .WithMany("Figures") + .HasForeignKey("UnderwearBundleId"); + }); + + modelBuilder.Entity("MyDarling.Models.UnderwearBundle", b => + { + b.Navigation("Figures"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Migrations/20230221044417_Init.cs b/Migrations/20230221044417_Init.cs new file mode 100644 index 0000000..788d447 --- /dev/null +++ b/Migrations/20230221044417_Init.cs @@ -0,0 +1,64 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace MyDarling.Migrations +{ + /// + public partial class Init : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "UnderwearBundles", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Name = table.Column(type: "TEXT", nullable: false), + Description = table.Column(type: "TEXT", nullable: false), + Price = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_UnderwearBundles", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "Figures", + columns: table => new + { + Id = table.Column(type: "INTEGER", nullable: false) + .Annotation("Sqlite:Autoincrement", true), + Description = table.Column(type: "TEXT", nullable: false), + FilePath = table.Column(type: "TEXT", nullable: false), + UnderwearBundleId = table.Column(type: "INTEGER", nullable: true) + }, + constraints: table => + { + table.PrimaryKey("PK_Figures", x => x.Id); + table.ForeignKey( + name: "FK_Figures_UnderwearBundles_UnderwearBundleId", + column: x => x.UnderwearBundleId, + principalTable: "UnderwearBundles", + principalColumn: "Id"); + }); + + migrationBuilder.CreateIndex( + name: "IX_Figures_UnderwearBundleId", + table: "Figures", + column: "UnderwearBundleId"); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Figures"); + + migrationBuilder.DropTable( + name: "UnderwearBundles"); + } + } +} diff --git a/Migrations/DataContextModelSnapshot.cs b/Migrations/DataContextModelSnapshot.cs index bff1af3..b2177d7 100644 --- a/Migrations/DataContextModelSnapshot.cs +++ b/Migrations/DataContextModelSnapshot.cs @@ -23,6 +23,10 @@ namespace MyDarling.Migrations .ValueGeneratedOnAdd() .HasColumnType("INTEGER"); + b.Property("Description") + .IsRequired() + .HasColumnType("TEXT"); + b.Property("FilePath") .IsRequired() .HasColumnType("TEXT"); diff --git a/Models/Figure.cs b/Models/Figure.cs index 7ac5b5f..f63d842 100644 --- a/Models/Figure.cs +++ b/Models/Figure.cs @@ -1,8 +1,9 @@ namespace MyDarling.Models { - public class Figure - { - public int Id { get; set; } - public string FilePath { get; set; } = string.Empty; - } + public class Figure + { + public int Id { get; set; } + public string Description { get; set; } = string.Empty; + public string FilePath { get; set; } = string.Empty; + } } \ No newline at end of file diff --git a/Models/SeedData.cs b/Models/SeedData.cs index c7b8692..da8263f 100644 --- a/Models/SeedData.cs +++ b/Models/SeedData.cs @@ -12,10 +12,12 @@ namespace MyDarling.Models { new Figure() { + Description = @"Комплект из бежевого эластичного кружева с голубой отделкой.", FilePath = "/content/0/img/IMG_4896.JPG" }, new Figure() { + Description = @"В комплект входит бра, 2 трусиков (на высокой посадке и стандартной на регуляции) и чокер. Низ можно сделать на выбор стринги/бразильянки.", FilePath = "/content/0/img/IMG_4902.JPG" } }; @@ -24,10 +26,12 @@ namespace MyDarling.Models { new Figure() { + Description = @"Базовый сет из мягкой эластичной сетки.", FilePath = "/content/1/img/IMG_4897.JPG" }, new Figure() { + Description = @"В комплект входит лиф на косточках и 2 трусиков – бразильянки на высокой посадке и стринги на стандартной посадке с регуляцией. Доступен в цветах: желтый, черный, бежевый молочный.", FilePath = "/content/1/img/IMG_4898.JPG" } }; @@ -40,9 +44,7 @@ namespace MyDarling.Models { Name = "Alice", Figures = aliceFigures, - Description = @"Комплект из бежевого эластичного кружева с голубой отделкой. - В комплект входит бра, 2 трусиков (на высокой посадке и стандартной на регуляции) и чокер. - Низ можно сделать на выбор стринги/бразильянки.", + Description = @"Комплект из бежевого эластичного кружева с голубой отделкой.", Price = 3000 }; @@ -50,9 +52,7 @@ namespace MyDarling.Models { Name = "Nikki", Figures = nikkiFigures, - Description = @"Базовый сет из мягкой эластичной сетки. - В комплект входит лиф на косточках и 2 трусиков – бразильянки на высокой посадке и стринги на стандартной посадке с регуляцией. - Доступен в цветах: желтый, черный, бежевый молочный.", + Description = @"Базовый сет из мягкой эластичной сетки.", Price = 3800 }; diff --git a/Program.cs b/Program.cs index 5309b9f..4079b2b 100644 --- a/Program.cs +++ b/Program.cs @@ -5,10 +5,10 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.AddDbContext(opts => { - opts.UseSqlite(builder.Configuration["ConnectionStrings:MyDarlingDb"]); - opts.EnableSensitiveDataLogging(true); + opts.UseSqlite(builder.Configuration["ConnectionStrings:MyDarlingDb"]); + opts.EnableSensitiveDataLogging(true); }); -// builder.Services.AddSingleton(); + builder.Services.AddControllersWithViews(); var app = builder.Build(); @@ -17,7 +17,7 @@ app.UseStaticFiles(); app.MapControllers(); app.MapDefaultControllerRoute(); -// var context = app.Services.CreateScope().ServiceProvider.GetRequiredService(); -// SeedData.SeedDatabase(context); +var context = app.Services.CreateScope().ServiceProvider.GetRequiredService(); +SeedData.SeedDatabase(context); app.Run(); \ No newline at end of file diff --git a/Views/Home/_Projects.cshtml b/Views/Home/_Projects.cshtml index 0603c06..2cb439d 100644 --- a/Views/Home/_Projects.cshtml +++ b/Views/Home/_Projects.cshtml @@ -9,11 +9,12 @@
@bundle.Name @for (int i = 1; i < @bundle.Figures.Count(); i++) { - + }
-- cgit v1.2.3