22 changed files with 1023 additions and 150 deletions
--- a/CarRepairShop/CarRepairShop.sln
+++ b/CarRepairShop/CarRepairShop.sln
@ -17,14 +17,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopFileImplement"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopDatabaseImplement", "CarRepairShopDatabaseImplement\CarRepairShopDatabaseImplement.csproj", "{F1BAC88A-6D0D-4276-92C4-757F48D0D80F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopRestApi", "CarRepairShopRestApi\CarRepairShopRestApi.csproj", "{747BCB1C-6E82-4E5B-A03E-B1E66CF9182E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShowClientApp", "CarRepairShowClientApp\CarRepairShowClientApp.csproj", "{952D7FD8-9A39-4D35-A5EE-F16C7E6D2DBE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShowClientApp", "CarRepairShowClientApp\CarRepairShowClientApp.csproj", "{952D7FD8-9A39-4D35-A5EE-F16C7E6D2DBE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{747BCB1C-6E82-4E5B-A03E-B1E66CF9182E} = {747BCB1C-6E82-4E5B-A03E-B1E66CF9182E}
+		{B576EFBD-68F1-4474-9E4A-E26D0C6FC84C} = {B576EFBD-68F1-4474-9E4A-E26D0C6FC84C}
 		{FA47DABA-C657-4049-B02A-6AB850A6D29E} = {FA47DABA-C657-4049-B02A-6AB850A6D29E}
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopRestApi", "CarRepairShopRestApi\CarRepairShopRestApi.csproj", "{B576EFBD-68F1-4474-9E4A-E26D0C6FC84C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -59,14 +59,14 @@ Global
 		{F1BAC88A-6D0D-4276-92C4-757F48D0D80F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F1BAC88A-6D0D-4276-92C4-757F48D0D80F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1BAC88A-6D0D-4276-92C4-757F48D0D80F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{747BCB1C-6E82-4E5B-A03E-B1E66CF9182E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{747BCB1C-6E82-4E5B-A03E-B1E66CF9182E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{747BCB1C-6E82-4E5B-A03E-B1E66CF9182E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{747BCB1C-6E82-4E5B-A03E-B1E66CF9182E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{952D7FD8-9A39-4D35-A5EE-F16C7E6D2DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{952D7FD8-9A39-4D35-A5EE-F16C7E6D2DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{952D7FD8-9A39-4D35-A5EE-F16C7E6D2DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{952D7FD8-9A39-4D35-A5EE-F16C7E6D2DBE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B576EFBD-68F1-4474-9E4A-E26D0C6FC84C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B576EFBD-68F1-4474-9E4A-E26D0C6FC84C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B576EFBD-68F1-4474-9E4A-E26D0C6FC84C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B576EFBD-68F1-4474-9E4A-E26D0C6FC84C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/CarRepairShop/CarRepairShop/FormMain.Designer.cs
+++ b/CarRepairShop/CarRepairShop/FormMain.Designer.cs
@ -53,7 +53,7 @@
            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчётыToolStripMenuItem });
            menuStrip.Location = new Point(0, 0);
            menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(1082, 28);
+            menuStrip.Size = new Size(1286, 28);
            menuStrip.TabIndex = 0;
            menuStrip.Text = "Меню справочников";
            // 
@ -67,21 +67,21 @@
            // компонентыToolStripMenuItem
            // 
            компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-            компонентыToolStripMenuItem.Size = new Size(224, 26);
+            компонентыToolStripMenuItem.Size = new Size(182, 26);
            компонентыToolStripMenuItem.Text = "Компоненты";
            компонентыToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
            // 
            // ремонтToolStripMenuItem
            // 
            ремонтToolStripMenuItem.Name = "ремонтToolStripMenuItem";
-            ремонтToolStripMenuItem.Size = new Size(224, 26);
+            ремонтToolStripMenuItem.Size = new Size(182, 26);
            ремонтToolStripMenuItem.Text = "Ремонт";
            ремонтToolStripMenuItem.Click += RepairToolStripMenuItem_Click;
            // 
            // клиентыToolStripMenuItem
            // 
            клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-            клиентыToolStripMenuItem.Size = new Size(224, 26);
+            клиентыToolStripMenuItem.Size = new Size(182, 26);
            клиентыToolStripMenuItem.Text = "Клиенты";
            клиентыToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
            // 
@ -122,12 +122,12 @@
            dataGridView.Name = "dataGridView";
            dataGridView.RowHeadersWidth = 51;
            dataGridView.RowTemplate.Height = 29;
-            dataGridView.Size = new Size(839, 368);
+            dataGridView.Size = new Size(1004, 368);
            dataGridView.TabIndex = 1;
            // 
            // buttonCreateOrder
            // 
-            buttonCreateOrder.Location = new Point(858, 63);
+            buttonCreateOrder.Location = new Point(1042, 65);
            buttonCreateOrder.Name = "buttonCreateOrder";
            buttonCreateOrder.Size = new Size(212, 29);
            buttonCreateOrder.TabIndex = 2;
@ -137,7 +137,7 @@
            // 
            // buttonTakeOrderInWork
            // 
-            buttonTakeOrderInWork.Location = new Point(858, 131);
+            buttonTakeOrderInWork.Location = new Point(1042, 125);
            buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
            buttonTakeOrderInWork.Size = new Size(212, 29);
            buttonTakeOrderInWork.TabIndex = 3;
@ -147,7 +147,7 @@
            // 
            // buttonOrderReady
            // 
-            buttonOrderReady.Location = new Point(858, 197);
+            buttonOrderReady.Location = new Point(1042, 190);
            buttonOrderReady.Name = "buttonOrderReady";
            buttonOrderReady.Size = new Size(212, 29);
            buttonOrderReady.TabIndex = 4;
@ -157,7 +157,7 @@
            // 
            // buttonIssuedOrder
            // 
-            buttonIssuedOrder.Location = new Point(858, 263);
+            buttonIssuedOrder.Location = new Point(1042, 259);
            buttonIssuedOrder.Name = "buttonIssuedOrder";
            buttonIssuedOrder.Size = new Size(212, 29);
            buttonIssuedOrder.TabIndex = 5;
@ -167,7 +167,7 @@
            // 
            // buttonRefresh
            // 
-            buttonRefresh.Location = new Point(858, 331);
+            buttonRefresh.Location = new Point(1042, 324);
            buttonRefresh.Name = "buttonRefresh";
            buttonRefresh.Size = new Size(212, 29);
            buttonRefresh.TabIndex = 6;
@ -179,7 +179,7 @@
            // 
            AutoScaleDimensions = new SizeF(8F, 20F);
            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1082, 403);
+            ClientSize = new Size(1286, 403);
            Controls.Add(buttonRefresh);
            Controls.Add(buttonIssuedOrder);
            Controls.Add(buttonOrderReady);
--- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240407151705_InitialCreate.Designer.cs
+++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240407151705_InitialCreate.Designer.cs
@ -0,0 +1,214 @@
+// <auto-generated />
+using System;
+using CarRepairShopDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace CarRepairShopDatabaseImplement.Migrations
+{
+    [DbContext(typeof(RepairsShopDatabase))]
+    [Migration("20240407151705_InitialCreate")]
+    partial class InitialCreate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.16")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("RepairId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("RepairId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Repair", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.Property<string>("RepairName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Repairs");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.RepairComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RepairId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("RepairId");
+
+                    b.ToTable("RepairComponents");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("CarRepairShopDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair")
+                        .WithMany("Orders")
+                        .HasForeignKey("RepairId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Repair");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.RepairComponent", b =>
+                {
+                    b.HasOne("CarRepairShopDatabaseImplement.Models.Component", "Component")
+                        .WithMany("RepairComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair")
+                        .WithMany("Components")
+                        .HasForeignKey("RepairId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Repair");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("RepairComponents");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Repair", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240407151705_InitialCreate.cs
+++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240407151705_InitialCreate.cs
@ -0,0 +1,155 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CarRepairShopDatabaseImplement.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialCreate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Clients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    ClientFIO = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Email = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Password = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Clients", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Components",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    ComponentName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Cost = table.Column<double>(type: "float", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Components", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Repairs",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    RepairName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Price = table.Column<double>(type: "float", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Repairs", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Orders",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Count = table.Column<int>(type: "int", nullable: false),
+                    Sum = table.Column<double>(type: "float", nullable: false),
+                    Status = table.Column<int>(type: "int", nullable: false),
+                    DateCreate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    DateImplement = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    RepairId = table.Column<int>(type: "int", nullable: false),
+                    ClientId = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Orders", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Orders_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_Orders_Repairs_RepairId",
+                        column: x => x.RepairId,
+                        principalTable: "Repairs",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "RepairComponents",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    RepairId = table.Column<int>(type: "int", nullable: false),
+                    ComponentId = table.Column<int>(type: "int", nullable: false),
+                    Count = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_RepairComponents", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_RepairComponents_Components_ComponentId",
+                        column: x => x.ComponentId,
+                        principalTable: "Components",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_RepairComponents_Repairs_RepairId",
+                        column: x => x.RepairId,
+                        principalTable: "Repairs",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_ClientId",
+                table: "Orders",
+                column: "ClientId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Orders_RepairId",
+                table: "Orders",
+                column: "RepairId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RepairComponents_ComponentId",
+                table: "RepairComponents",
+                column: "ComponentId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_RepairComponents_RepairId",
+                table: "RepairComponents",
+                column: "RepairId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Orders");
+
+            migrationBuilder.DropTable(
+                name: "RepairComponents");
+
+            migrationBuilder.DropTable(
+                name: "Clients");
+
+            migrationBuilder.DropTable(
+                name: "Components");
+
+            migrationBuilder.DropTable(
+                name: "Repairs");
+        }
+    }
+}
--- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/RepairsShopDatabaseModelSnapshot.cs
+++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/RepairsShopDatabaseModelSnapshot.cs
@ -0,0 +1,211 @@
+// <auto-generated />
+using System;
+using CarRepairShopDatabaseImplement;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace CarRepairShopDatabaseImplement.Migrations
+{
+    [DbContext(typeof(RepairsShopDatabase))]
+    partial class RepairsShopDatabaseModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.16")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Client", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClientFIO")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Email")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Password")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Clients");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Component", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ComponentName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<double>("Cost")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Components");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Order", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateCreate")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime?>("DateImplement")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("RepairId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<double>("Sum")
+                        .HasColumnType("float");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ClientId");
+
+                    b.HasIndex("RepairId");
+
+                    b.ToTable("Orders");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Repair", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<double>("Price")
+                        .HasColumnType("float");
+
+                    b.Property<string>("RepairName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Repairs");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.RepairComponent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("ComponentId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("Count")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RepairId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ComponentId");
+
+                    b.HasIndex("RepairId");
+
+                    b.ToTable("RepairComponents");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Order", b =>
+                {
+                    b.HasOne("CarRepairShopDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Orders")
+                        .HasForeignKey("ClientId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair")
+                        .WithMany("Orders")
+                        .HasForeignKey("RepairId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Client");
+
+                    b.Navigation("Repair");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.RepairComponent", b =>
+                {
+                    b.HasOne("CarRepairShopDatabaseImplement.Models.Component", "Component")
+                        .WithMany("RepairComponents")
+                        .HasForeignKey("ComponentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair")
+                        .WithMany("Components")
+                        .HasForeignKey("RepairId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Component");
+
+                    b.Navigation("Repair");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Client", b =>
+                {
+                    b.Navigation("Orders");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Component", b =>
+                {
+                    b.Navigation("RepairComponents");
+                });
+
+            modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Repair", b =>
+                {
+                    b.Navigation("Components");
+
+                    b.Navigation("Orders");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
--- a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Order.cs
+++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Order.cs
@ -19,11 +19,10 @@ namespace CarRepairShopDatabaseImplement.Models
        public DateTime? DateImplement { get; private set; }
        [Required]
        public int RepairId { get; private set; }
-        public virtual Repair? Repairs { get; private set; }
+        public virtual Repair? Repair { get; private set; }
        [Required]
        public int ClientId { get; private set; }
        public virtual Client? Client { get; private set; }
-        public virtual Repair? Repair { get; set; }

        public static Order? Create(OrderBindingModel model)
        {
--- a/CarRepairShop/CarRepairShopRestApi/CarRepairShopRestApi.csproj
+++ b/CarRepairShop/CarRepairShopRestApi/CarRepairShopRestApi.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
@ -6,16 +6,6 @@
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>

-  <ItemGroup>
-    <Content Remove="log4net.config" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="log4net.config">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
--- a/CarRepairShop/CarRepairShopRestApi/Controllers/ClientController.cs
+++ b/CarRepairShop/CarRepairShopRestApi/Controllers/ClientController.cs
@ -63,4 +63,3 @@ namespace CarRepairShopRestApi.Controllers
        }
    }
 }
-
--- a/CarRepairShop/CarRepairShopRestApi/Controllers/MainController.cs
+++ b/CarRepairShop/CarRepairShopRestApi/Controllers/MainController.cs
@ -2,8 +2,6 @@
 using CarRepairShopContracts.BusinessLogicsContracts;
 using CarRepairShopContracts.SearchModels;
 using CarRepairShopContracts.ViewModels;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;

 namespace CarRepairShopRestApi.Controllers
@ -23,7 +21,7 @@ namespace CarRepairShopRestApi.Controllers
            _repair = repair;
        }
        [HttpGet]
-        public List<RepairViewModel>? GetProductList()
+        public List<RepairViewModel>? GetRepairList()
        {
            try
            {
@ -36,20 +34,18 @@ namespace CarRepairShopRestApi.Controllers
            }
        }
        [HttpGet]
-        public RepairViewModel? GetProduct(int productId)
+        public RepairViewModel? GetRepair(int repairId)
        {
            try
            {
                return _repair.ReadElement(new RepairSearchModel
                {
-                    Id =
-               productId
+                    Id = repairId
                });
            }
            catch (Exception ex)
            {
-                _logger.LogError(ex, "Ошибка получения продукта по id={Id}",
-               productId);
+                _logger.LogError(ex, "Ошибка получения продукта по id={Id}", repairId);
                throw;
            }
        }
@ -65,7 +61,7 @@ namespace CarRepairShopRestApi.Controllers
            }
            catch (Exception ex)
            {
-                _logger.LogError(ex, "Ошибка получения списка заказов клиента id ={ Id}", clientId);
+                _logger.LogError(ex, "Ошибка получения списка заказов клиента id ={ Id} ", clientId);
            throw;
            }
        }
@ -83,4 +79,5 @@ namespace CarRepairShopRestApi.Controllers
            }
        }
    }
+
 }
--- a/CarRepairShop/CarRepairShopRestApi/Program.cs
+++ b/CarRepairShop/CarRepairShopRestApi/Program.cs
@ -2,13 +2,13 @@ using CarRepairShopBusinessLogic.BusinessLogics;
 using CarRepairShopContracts.BusinessLogicsContracts;
 using CarRepairShopContracts.StoragesContracts;
 using CarRepairShopDatabaseImplement.Implements;
-
 using Microsoft.OpenApi.Models;
+
 var builder = WebApplication.CreateBuilder(args);
 builder.Logging.SetMinimumLevel(LogLevel.Trace);
 builder.Logging.AddLog4Net("log4net.config");
 // Add services to the container.
-builder.Services.AddTransient<ClientStorage, ClientStorage>();
+builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IRepairStorage, RepairStorage>();
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
@ -22,7 +22,7 @@ builder.Services.AddSwaggerGen(c =>
 {
    c.SwaggerDoc("v1", new OpenApiInfo
    {
-        Title = "IceCreamShopRestApi",
+        Title = "CarRepairShopRestApi",
        Version
    = "v1"
    });
@ -33,9 +33,9 @@ if (app.Environment.IsDevelopment())
 {
    app.UseSwagger();
    app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json",
-   "IceCreamShopRestApi v1"));
+   "CarRepairShopRestApi v1"));
 }
 app.UseHttpsRedirection();
 app.UseAuthorization();
 app.MapControllers();
-app.Run();
+app.Run();
--- a/CarRepairShop/CarRepairShopRestApi/Properties/launchSettings.json
+++ b/CarRepairShop/CarRepairShopRestApi/Properties/launchSettings.json
@ -4,8 +4,8 @@
    "windowsAuthentication": false,
    "anonymousAuthentication": true,
    "iisExpress": {
-      "applicationUrl": "http://localhost:35194",
-      "sslPort": 44389
+      "applicationUrl": "http://localhost:39213",
+      "sslPort": 44361
    }
  },
  "profiles": {
@ -14,7 +14,7 @@
      "dotnetRunMessages": true,
      "launchBrowser": true,
      "launchUrl": "swagger",
-      "applicationUrl": "https://localhost:7136;http://localhost:5119",
+      "applicationUrl": "https://localhost:7189;http://localhost:5174",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
--- a/CarRepairShop/CarRepairShopRestApi/log4net.config
+++ b/CarRepairShop/CarRepairShopRestApi/log4net.config
@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <log4net>
-  <appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
-    <file value="c:/temp/CarRepairShopRestApi.log" />
-    <appendToFile value="true" />
-    <maximumFileSize value="100KB" />
-    <maxSizeRollBackups value="2" />
-    <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%date %5level %logger.%method [%line] - MESSAGE: %message%newline %exception" />
-    </layout>
-  </appender>
-  <root>
-    <level value="TRACE" />
-    <appender-ref ref="RollingFile" />
-  </root>
+	<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
+		<file value="c:/temp/CarRepairShopRestApi.log" />
+		<appendToFile value="true" />
+		<maximumFileSize value="100KB" />
+		<maxSizeRollBackups value="2" />
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date %5level %logger.%method [%line] - MESSAGE: %message%newline %exception" />
+		</layout>
+	</appender>
+	<root>
+		<level value="TRACE" />
+		<appender-ref ref="RollingFile" />
+	</root>
 </log4net>
--- a/CarRepairShop/CarRepairShowClientApp/APIClient.cs
+++ b/CarRepairShop/CarRepairShowClientApp/APIClient.cs
@ -32,8 +32,7 @@ namespace CarRepairShowClientApp
        public static void PostRequest<T>(string requestUrl, T model)
        {
            var json = JsonConvert.SerializeObject(model);
-            var data = new StringContent(json, Encoding.UTF8,
-           "application/json");
+            var data = new StringContent(json, Encoding.UTF8, "application/json");
            var response = _client.PostAsync(requestUrl, data);
            var result = response.Result.Content.ReadAsStringAsync().Result;
            if (!response.Result.IsSuccessStatusCode)
@ -42,5 +41,4 @@ namespace CarRepairShowClientApp
            }
        }
    }
-
 }
--- a/CarRepairShop/CarRepairShowClientApp/Controllers/HomeController.cs
+++ b/CarRepairShop/CarRepairShowClientApp/Controllers/HomeController.cs
@ -1,4 +1,6 @@
-using CarRepairShowClientApp.Models;
+using CarRepairShopContracts.BindingModels;
+using CarRepairShopContracts.ViewModels;
+using CarRepairShowClientApp.Models;
 using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;

@ -7,26 +9,140 @@ namespace CarRepairShowClientApp.Controllers
    public class HomeController : Controller
    {
        private readonly ILogger<HomeController> _logger;
-
        public HomeController(ILogger<HomeController> logger)
        {
            _logger = logger;
        }
-
        public IActionResult Index()
        {
-            return View();
+            if (APIClient.Client == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            return
+            View(APIClient.GetRequest<List<OrderViewModel>>($"api/main/getorders?clientId={APIClient.Client.Id}"));
        }
-
+        [HttpGet]
        public IActionResult Privacy()
        {
-            return View();
+            if (APIClient.Client == null)
+            {
+                return Redirect("~/Home/Enter");
+            }
+            return View(APIClient.Client);
        }
-
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+        [HttpPost]
+        public void Privacy(string login, string password, string fio)
+        {
+            if (APIClient.Client == null)
+            {
+                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+            }
+            if (string.IsNullOrEmpty(login) ||
+            string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
+            {
+                throw new Exception("Введите логин, пароль и ФИО");
+            }
+            APIClient.PostRequest("api/client/updatedata", new
+            ClientBindingModel
+            {
+                Id = APIClient.Client.Id,
+                ClientFIO = fio,
+                Email = login,
+                Password = password
+            });
+            APIClient.Client.ClientFIO = fio;
+            APIClient.Client.Email = login;
+            APIClient.Client.Password = password;
+            Response.Redirect("Index");
+        }
+        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None,
+        NoStore = true)]
        public IActionResult Error()
        {
-            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+            return View(new ErrorViewModel
+            {
+                RequestId =
+            Activity.Current?.Id ?? HttpContext.TraceIdentifier
+            });
+        }
+        [HttpGet]
+        public IActionResult Enter()
+        {
+            return View();
+        }
+        [HttpPost]
+        public void Enter(string login, string password)
+        {
+            if (string.IsNullOrEmpty(login) ||
+            string.IsNullOrEmpty(password))
+            {
+                throw new Exception("Введите логин и пароль");
+            }
+            APIClient.Client = APIClient.GetRequest<ClientViewModel>($"api/client/login?login={login}&password={password}");
+            if (APIClient.Client == null)
+            {
+                throw new Exception("Неверный логин/пароль");
+            }
+            Response.Redirect("Index");
+        }
+        [HttpGet]
+        public IActionResult Register()
+        {
+            return View();
+        }
+        [HttpPost]
+        public void Register(string login, string password, string fio)
+        {
+            if (string.IsNullOrEmpty(login) ||
+            string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
+            {
+                throw new Exception("Введите логин, пароль и ФИО");
+            }
+            APIClient.PostRequest("api/client/register", new
+            ClientBindingModel
+            {
+                ClientFIO = fio,
+                Email = login,
+                Password = password
+            });
+            Response.Redirect("Enter");
+            return;
+        }
+        [HttpGet]
+        public IActionResult Create()
+        {
+            ViewBag.Products =
+            APIClient.GetRequest<List<RepairViewModel>>("api/main/getproductlist");
+            return View();
+        }
+        [HttpPost]
+        public void Create(int repair, int count)
+        {
+            if (APIClient.Client == null)
+            {
+                throw new Exception("Вы как суда попали? Суда вход только авторизованным");
+            }
+            if (count <= 0)
+            {
+                throw new Exception("Количество и сумма должны быть больше 0");
+            }
+            APIClient.PostRequest("api/main/createorder", new
+            OrderBindingModel
+            {
+                ClientId = APIClient.Client.Id,
+                RepairId = repair,
+                Count = count,
+                Sum = Calc(count, repair)
+            });
+            Response.Redirect("Index");
+        }
+        [HttpPost]
+        public double Calc(int count, int repair)
+        {
+            var rep = APIClient.GetRequest<RepairViewModel>($"api/main/getproduct?productId={repair}"
+            );
+            return count * (rep?.Price ?? 1);
        }
    }
 }
--- a/CarRepairShop/CarRepairShowClientApp/Program.cs
+++ b/CarRepairShop/CarRepairShowClientApp/Program.cs
@ -1,10 +1,10 @@
-var builder = WebApplication.CreateBuilder(args);
+using CarRepairShowClientApp;

+var builder = WebApplication.CreateBuilder(args);
 // Add services to the container.
 builder.Services.AddControllersWithViews();
-
 var app = builder.Build();
-
+APIClient.Connect(builder.Configuration);
 // Configure the HTTP request pipeline.
 if (!app.Environment.IsDevelopment())
 {
@ -12,16 +12,11 @@ if (!app.Environment.IsDevelopment())
    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
    app.UseHsts();
 }
-
 app.UseHttpsRedirection();
 app.UseStaticFiles();
-
 app.UseRouting();
-
 app.UseAuthorization();
-
 app.MapControllerRoute(
-    name: "default",
-    pattern: "{controller=Home}/{action=Index}/{id?}");
-
-app.Run();
+ name: "default",
+ pattern: "{controller=Home}/{action=Index}/{id?}");
+app.Run();
--- a/CarRepairShop/CarRepairShowClientApp/Views/Home/Create.cshtml
+++ b/CarRepairShop/CarRepairShowClientApp/Views/Home/Create.cshtml
@ -0,0 +1,57 @@
+@{
+	ViewData["Title"] = "Create";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Создание заказа</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Ремонт:</div>
+		<div class="col-8">
+			<select id="repair" name="repair" class="form-control" asp-items="@(new SelectList(@ViewBag.Repairs,"Id", "RepairName"))"></select>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-4">Количество:</div>
+		<div class="col-8">
+			<input type="text" name="count" id="count" />
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-4">Сумма:</div>
+		<div class="col-8">
+			<input type="text" id="sum" name="sum" readonly />
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4">
+			<input type="submit" value="Создать" class="btn
+btn-primary" />
+		</div>
+	</div>
+</form>
+<script>
+	$('#repair').on('change', function () {
+		check();
+	});
+	$('#count').on('change', function () {
+		check();
+	});
+
+	function check() {
+		var count = $('#count').val();
+		var repair = $('#repair').val();
+		if (count && repair) {
+			$.ajax({
+				method: "POST",
+				url: "/Home/Calc",
+				data: { count: count, repair: repair },
+				success: function (result) {
+					$("#sum").val(result);
+				}
+			});
+		};
+	}
+</script>
--- a/CarRepairShop/CarRepairShowClientApp/Views/Home/Enter.cshtml
+++ b/CarRepairShop/CarRepairShowClientApp/Views/Home/Enter.cshtml
@ -0,0 +1,20 @@
+@{
+	ViewData["Title"] = "Enter";
+}
+<div class="text-center">
+	<h2 class="display-4">Вход в приложение</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Логин:</div>
+		<div class="col-8"><input type="text" name="login" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Пароль:</div>
+		<div class="col-8"><input type="password" name="password" /></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4"><input type="submit" value="Вход" class="btn btnprimary" /></div>
+	</div>
+</form>
--- a/CarRepairShop/CarRepairShowClientApp/Views/Home/Index.cshtml
+++ b/CarRepairShop/CarRepairShowClientApp/Views/Home/Index.cshtml
@ -1,8 +1,75 @@
-@{
-    ViewData["Title"] = "Home Page";
+@using CarRepairShopContracts.ViewModels
+@model List<OrderViewModel>
+@{
+	ViewData["Title"] = "Home Page";
 }
-
 <div class="text-center">
-    <h1 class="display-4">Welcome</h1>
-    <p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
+	<h1 class="display-4">Заказы</h1>
 </div>
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+			<h3 class="display-4">Авторизируйтесь</h3>
+			return;
+		}
+		<p>
+			<a asp-action="Create">Создать заказ</a>
+		</p>
+		<table class="table">
+			<thead>
+				<tr>
+					<th>
+						Номер
+					</th>
+					<th>
+						Ремонт
+					</th>
+					<th>
+						Дата создания
+					</th>
+					<th>
+						Количество
+					</th>
+					<th>
+						Сумма
+					</th>
+					<th>
+						Статус
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				@foreach (var item in Model)
+				{
+					<tr>
+						<td>
+							@Html.DisplayFor(modelItem =>
+															item.Id)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem =>
+															item.RepairName)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem =>
+															item.DateCreate)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem =>
+															item.Count)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem =>
+															item.Sum)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem =>
+															item.Status)
+						</td>
+					</tr>
+				}
+			</tbody>
+		</table>
+	}
+</div>
--- a/CarRepairShop/CarRepairShowClientApp/Views/Home/Privacy.cshtml
+++ b/CarRepairShop/CarRepairShowClientApp/Views/Home/Privacy.cshtml
@ -1,6 +1,30 @@
-@{
-    ViewData["Title"] = "Privacy Policy";
+@using CarRepairShopContracts.ViewModels
+@model ClientViewModel
+@{
+ViewData["Title"] = "Privacy Policy";
 }
-<h1>@ViewData["Title"]</h1>
-
-<p>Use this page to detail your site's privacy policy.</p>
+<div class="text-center">
+<h2 class="display-4">Личные данные</h2>
+</div>
+<form method="post">
+<div class="row">
+<div class="col-4">Логин:</div>
+<div class="col-8"><input type="text" name="login"
+value="@Model.Email"/></div>
+</div>
+<div class="row">
+<div class="col-4">Пароль:</div>
+<div class="col-8"><input type="password" name="password"
+value="@Model.Password"/></div>
+</div>
+<div class="row">
+<div class="col-4">ФИО:</div>
+<div class="col-8"><input type="text" name="fio"
+value="@Model.ClientFIO"/></div>
+</div>
+<div class="row">
+<div class="col-8"></div>
+<div class="col-4"><input type="submit" value="Сохранить" class="btn
+btn-primary" /></div>
+</div>
+</form>
--- a/CarRepairShop/CarRepairShowClientApp/Views/Home/Register.cshtml
+++ b/CarRepairShop/CarRepairShowClientApp/Views/Home/Register.cshtml
@ -0,0 +1,28 @@
+@{
+	ViewData["Title"] = "Register";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Регистрация</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Логин:</div>
+		<div class="col-8"><input type="text" name="login" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">Пароль:</div>
+		<div class="col-8"><input type="password" name="password" /></div>
+	</div>
+	<div class="row">
+		<div class="col-4">ФИО:</div>
+		<div class="col-8"><input type="text" name="fio" /></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4">
+			<input type="submit" value="Регистрация"
+				   class="btn btn-primary" />
+		</div>
+	</div>
+</form>
--- a/CarRepairShop/CarRepairShowClientApp/Views/Shared/_Layout.cshtml
+++ b/CarRepairShop/CarRepairShowClientApp/Views/Shared/_Layout.cshtml
@ -1,49 +1,53 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - CarRepairShowClientApp</title>
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
-    <link rel="stylesheet" href="~/CarRepairShowClientApp.styles.css" asp-append-version="true" />
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<title>@ViewData["Title"] - RepairShopClientApp</title>
+	<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
+	<link rel="stylesheet" href="~/css/site.css" />
+	<script src="~/lib/jquery/dist/jquery.min.js"></script>
+	<script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
 </head>
 <body>
-    <header>
-        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
-            <div class="container-fluid">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">CarRepairShowClientApp</a>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
-                        aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">Home</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </nav>
-    </header>
-    <div class="container">
-        <main role="main" class="pb-3">
-            @RenderBody()
-        </main>
-    </div>
-
-    <footer class="border-top footer text-muted">
-        <div class="container">
-            &copy; 2024 - CarRepairShowClientApp - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>
-        </div>
-    </footer>
-    <script src="~/lib/jquery/dist/jquery.min.js"></script>
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="~/js/site.js" asp-append-version="true"></script>
-    @await RenderSectionAsync("Scripts", required: false)
+	<header>
+		<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bgwhite border-bottom box-shadow mb-3">
+			<div class="container">
+				<a class="navbar-brand" asp-area="" asp-controller="Home" aspaction="Index">Магазин ремонтов</a>
+				<button class="navbar-toggler" type="button" datatoggle="collapse" data-target=".navbar-collapse" ariacontrols="navbarSupportedContent"
+						aria-expanded="false" aria-label="Toggle navigation">
+					<span class="navbar-toggler-icon"></span>
+				</button>
+				<div class="navbar-collapse collapse d-sm-inline-flex flex-smrow-reverse">
+					<ul class="navbar-nav flex-grow-1">
+						<li class="nav-item">
+							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Index">Заказы</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Enter">Вход</a>
+						</li>
+						<li class="nav-item">
+							<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Register">Регистрация</a>
+						</li>
+					</ul>
+				</div>
+			</div>
+		</nav>
+	</header>
+	<div class="container">
+		<main role="main" class="pb-3">
+			@RenderBody()
+		</main>
+	</div>
+	<footer class="border-top footer text-muted">
+		<div class="container">
+			&copy; 2024 - Магазин ремонтов - <a asp-area="" aspcontroller="Home" asp-action="Privacy">Личные данные</a>
+		</div>
+	</footer>
+	<script src="~/js/site.js" asp-append-version="true"></script>
+	@RenderSection("Scripts", required: false)
 </body>
-</html>
+</html>
--- a/CarRepairShop/CarRepairShowClientApp/appsettings.json
+++ b/CarRepairShop/CarRepairShowClientApp/appsettings.json
@ -1,12 +1,11 @@
 {
-  {
-    "Logging": {
-      "LogLevel": {
-        "Default": "Information",
-        "Microsoft.AspNetCore": "Warning"
-      }
-    },
-    "AllowedHosts": "*",
-    "IPAddress": "http://localhost:5159/"
-  }
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "ipaddress": "http://localhost:5174/"
+}