любимые фиксы

SoftwareInstallation/SoftwareInstallationClientApp/Views/Home/Mails.cshtml

@@ -15,7 +15,7 @@
 	@{
 		if (Model == null)
 		{
-					<h3 class="display-4">Авторизируйтесь</h3>
+			<h3 class="display-4">Авторизируйтесь</h3>
 			return;
 		}
 

SoftwareInstallation/SoftwareInstallationClientApp/Views/Shared/_Layout.cshtml

@@ -28,6 +28,9 @@
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
                         </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Mails">Письма</a>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a>
                         </li>

SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20230423115628_init.Designer.cs

@@ -12,7 +12,7 @@ using SoftwareInstallationDatabaseImplement;
 namespace SoftwareInstallationDatabaseImplement.Migrations
 {
     [DbContext(typeof(SoftwareInstallationDatabase))]
-    [Migration("20230403203641_init")]
+    [Migration("20230423115628_init")]
     partial class init
     {
         /// <inheritdoc />
@@ -97,6 +97,36 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
                     b.ToTable("Implementers");
                 });
 
+            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.Property<string>("MessageId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Messages");
+                });
+
             modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -186,6 +216,15 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
                     b.ToTable("PackageComponents");
                 });
 
+            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.HasOne("SoftwareInstallationDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Messages")
+                        .HasForeignKey("ClientId");
+
+                    b.Navigation("Client");
+                });
+
             modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("SoftwareInstallationDatabaseImplement.Models.Client", "Client")
@@ -232,6 +271,8 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
 
             modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Client", b =>
                 {
+                    b.Navigation("Messages");
+
                     b.Navigation("Orders");
                 });
 

SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/20230423115628_init.cs

@@ -70,6 +70,27 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
                     table.PrimaryKey("PK_Packages", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "Messages",
+                columns: table => new
+                {
+                    MessageId = table.Column<string>(type: "nvarchar(450)", nullable: false),
+                    ClientId = table.Column<int>(type: "int", nullable: true),
+                    SenderName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    DateDelivery = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    Subject = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Body = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Messages", x => x.MessageId);
+                    table.ForeignKey(
+                        name: "FK_Messages_Clients_ClientId",
+                        column: x => x.ClientId,
+                        principalTable: "Clients",
+                        principalColumn: "Id");
+                });
+
             migrationBuilder.CreateTable(
                 name: "Orders",
                 columns: table => new
@@ -134,6 +155,11 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateIndex(
+                name: "IX_Messages_ClientId",
+                table: "Messages",
+                column: "ClientId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_ClientId",
                 table: "Orders",
@@ -163,6 +189,9 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
         /// <inheritdoc />
         protected override void Down(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropTable(
+                name: "Messages");
+
             migrationBuilder.DropTable(
                 name: "Orders");
 

SoftwareInstallation/SoftwareInstallationDatabaseImplement/Migrations/SoftwareInstallationDatabaseModelSnapshot.cs

@@ -94,6 +94,36 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
                     b.ToTable("Implementers");
                 });
 
+            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.Property<string>("MessageId")
+                        .HasColumnType("nvarchar(450)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int?>("ClientId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("DateDelivery")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("SenderName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("MessageId");
+
+                    b.HasIndex("ClientId");
+
+                    b.ToTable("Messages");
+                });
+
             modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Order", b =>
                 {
                     b.Property<int>("Id")
@@ -183,6 +213,15 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
                     b.ToTable("PackageComponents");
                 });
 
+            modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.MessageInfo", b =>
+                {
+                    b.HasOne("SoftwareInstallationDatabaseImplement.Models.Client", "Client")
+                        .WithMany("Messages")
+                        .HasForeignKey("ClientId");
+
+                    b.Navigation("Client");
+                });
+
             modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Order", b =>
                 {
                     b.HasOne("SoftwareInstallationDatabaseImplement.Models.Client", "Client")
@@ -229,6 +268,8 @@ namespace SoftwareInstallationDatabaseImplement.Migrations
 
             modelBuilder.Entity("SoftwareInstallationDatabaseImplement.Models.Client", b =>
                 {
+                    b.Navigation("Messages");
+
                     b.Navigation("Orders");
                 });
 

SoftwareInstallation/SoftwareInstallationDatabaseImplement/OrderStorage.cs

@@ -72,7 +72,8 @@ namespace SoftwareInstallationDatabaseImplement.Implements
 			return queryWhere
 					.Include(x => x.Client)
 					.Include(x => x.Implementer)
-					.Select(x => x.GetViewModel)
+                    .Include(x => x.Package)
+                    .Select(x => x.GetViewModel)
 					.ToList();
 		}
 

SoftwareInstallation/SoftwareInstallationRestApi/appsettings.json

@@ -11,6 +11,6 @@
   "SmtpClientPort": "587",
   "PopHost": "pop.mail.ru",
   "PopPort": "995",
-  "MailLogin": "ordersender228@mail.ru",
+  "MailLogin": "ilox_2018@mail.ru",
-  "MailPassword": "v8czsQ8zztJc5wEHxKPN"
+  "MailPassword": "5Q1HSfrrha0Mg1UAGUZ8"
 }

SoftwareInstallation/SoftwareInstallationView/App.config

@@ -5,7 +5,7 @@
 		<add key="SmtpClientPort" value="587" />
 		<add key="PopHost" value="pop.mail.ru" />
 		<add key="PopPort" value="995" />
-		<add key="MailLogin" value="ordersender228@mail.ru" />
+		<add key="MailLogin" value="ilox_2018@mail.ru" />
-		<add key="MailPassword" value="v8czsQ8zztJc5wEHxKPN" />
+		<add key="MailPassword" value="5Q1HSfrrha0Mg1UAGUZ8" />
 	</appSettings>
 </configuration>