diff --git a/CarpentryWorkshop/CarpentryWorkshop.sln b/CarpentryWorkshop/CarpentryWorkshop.sln index 9efad08..cecbcc8 100644 --- a/CarpentryWorkshop/CarpentryWorkshop.sln +++ b/CarpentryWorkshop/CarpentryWorkshop.sln @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopDatabaseIm EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopRestApi", "CarpentryWorkshopRestApi\CarpentryWorkshopRestApi.csproj", "{5B3828AF-D9D0-475D-9860-DF7A7BF139D3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopClientApp", "..\..\..\..\Users\Leo\Desktop\123\pibd-21_spasskiy.a.d._carpentryworkshop28\CarpentryWorkshopClientApp\CarpentryWorkshopClientApp.csproj", "{A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopClientApp", "CarpentryWorkshopClientApp\CarpentryWorkshopClientApp.csproj", "{9F21487D-B5B2-43DD-952D-BAAD1A416353}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -59,10 +59,10 @@ Global {5B3828AF-D9D0-475D-9860-DF7A7BF139D3}.Debug|Any CPU.Build.0 = Debug|Any CPU {5B3828AF-D9D0-475D-9860-DF7A7BF139D3}.Release|Any CPU.ActiveCfg = Release|Any CPU {5B3828AF-D9D0-475D-9860-DF7A7BF139D3}.Release|Any CPU.Build.0 = Release|Any CPU - {A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3182B93-4DB6-4EBD-ACE5-43FDD59ED96D}.Release|Any CPU.Build.0 = Release|Any CPU + {9F21487D-B5B2-43DD-952D-BAAD1A416353}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9F21487D-B5B2-43DD-952D-BAAD1A416353}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9F21487D-B5B2-43DD-952D-BAAD1A416353}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9F21487D-B5B2-43DD-952D-BAAD1A416353}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CarpentryWorkshop/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj b/CarpentryWorkshop/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj index 3921372..6cf787f 100644 --- a/CarpentryWorkshop/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopBusinessLogic/CarpentryWorkshopBusinessLogic.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable diff --git a/CarpentryWorkshop/CarpentryWorkshopClientApp/CarpentryWorkshopClientApp.csproj b/CarpentryWorkshop/CarpentryWorkshopClientApp/CarpentryWorkshopClientApp.csproj index b81e4a3..76ce9c2 100644 --- a/CarpentryWorkshop/CarpentryWorkshopClientApp/CarpentryWorkshopClientApp.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopClientApp/CarpentryWorkshopClientApp.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/CarpentryWorkshop/CarpentryWorkshopClientApp/Program.cs b/CarpentryWorkshop/CarpentryWorkshopClientApp/Program.cs index 4cdf8f9..cef6f32 100644 --- a/CarpentryWorkshop/CarpentryWorkshopClientApp/Program.cs +++ b/CarpentryWorkshop/CarpentryWorkshopClientApp/Program.cs @@ -11,7 +11,6 @@ APIClient.Connect(builder.Configuration); if (!app.Environment.IsDevelopment()) { app.UseExceptionHandler("/Home/Error"); - // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. app.UseHsts(); } diff --git a/CarpentryWorkshop/CarpentryWorkshopClientApp/appsettings.json b/CarpentryWorkshop/CarpentryWorkshopClientApp/appsettings.json index 045b48e..e82ec88 100644 --- a/CarpentryWorkshop/CarpentryWorkshopClientApp/appsettings.json +++ b/CarpentryWorkshop/CarpentryWorkshopClientApp/appsettings.json @@ -7,5 +7,5 @@ }, "AllowedHosts": "*", - "IPAddress": "http://localhost:7177/" + "IPAddress": "http://localhost:5024/" } diff --git a/CarpentryWorkshop/CarpentryWorkshopContracts/CarpentryWorkshopContracts.csproj b/CarpentryWorkshop/CarpentryWorkshopContracts/CarpentryWorkshopContracts.csproj index 0b9dbf3..35e5221 100644 --- a/CarpentryWorkshop/CarpentryWorkshopContracts/CarpentryWorkshopContracts.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopContracts/CarpentryWorkshopContracts.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable diff --git a/CarpentryWorkshop/CarpentryWorkshopDataModels/CarpentryWorkshopDataModels.csproj b/CarpentryWorkshop/CarpentryWorkshopDataModels/CarpentryWorkshopDataModels.csproj index 132c02c..cfadb03 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDataModels/CarpentryWorkshopDataModels.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopDataModels/CarpentryWorkshopDataModels.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/CarpentryWorkshopDatabaseImplement.csproj b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/CarpentryWorkshopDatabaseImplement.csproj index 97fbf54..1ffdf41 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/CarpentryWorkshopDatabaseImplement.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/CarpentryWorkshopDatabaseImplement.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240415192521_InitialCreate.Designer.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240416072714_InitialCreate.Designer.cs similarity index 99% rename from CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240415192521_InitialCreate.Designer.cs rename to CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240416072714_InitialCreate.Designer.cs index f1e3933..7f314d6 100644 --- a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240415192521_InitialCreate.Designer.cs +++ b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240416072714_InitialCreate.Designer.cs @@ -12,7 +12,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace CarpentryWorkshopDatabaseImplement.Migrations { [DbContext(typeof(CarpentryWorkshopDatabase))] - [Migration("20240415192521_InitialCreate")] + [Migration("20240416072714_InitialCreate")] partial class InitialCreate { /// diff --git a/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240415192521_InitialCreate.cs b/CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240416072714_InitialCreate.cs similarity index 100% rename from CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240415192521_InitialCreate.cs rename to CarpentryWorkshop/CarpentryWorkshopDatabaseImplement/Migrations/20240416072714_InitialCreate.cs diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj b/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj index 319d159..3e364d0 100644 --- a/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/CarpentryWorkshop/CarpentryWorkshopListImplement/CarpentryWorkshopListImplement.csproj b/CarpentryWorkshop/CarpentryWorkshopListImplement/CarpentryWorkshopListImplement.csproj index f7e2631..af423c7 100644 --- a/CarpentryWorkshop/CarpentryWorkshopListImplement/CarpentryWorkshopListImplement.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopListImplement/CarpentryWorkshopListImplement.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable diff --git a/CarpentryWorkshop/CarpentryWorkshopRestApi/CarpentryWorkshopRestApi.csproj b/CarpentryWorkshop/CarpentryWorkshopRestApi/CarpentryWorkshopRestApi.csproj index 45fc09d..faca581 100644 --- a/CarpentryWorkshop/CarpentryWorkshopRestApi/CarpentryWorkshopRestApi.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopRestApi/CarpentryWorkshopRestApi.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 enable enable diff --git a/CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj b/CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj index 2f5db0a..b51aefe 100644 --- a/CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj +++ b/CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net7.0-windows7.0 enable true enable diff --git a/CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs b/CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs index cc8a5c2..f427b7c 100644 --- a/CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs +++ b/CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs @@ -52,7 +52,7 @@ menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(896, 24); + menuStrip1.Size = new Size(1174, 24); menuStrip1.TabIndex = 0; menuStrip1.Text = "menuStrip1"; // @@ -66,21 +66,21 @@ // КомпонентыToolStripMenuItem // КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; - КомпонентыToolStripMenuItem.Size = new Size(180, 22); + КомпонентыToolStripMenuItem.Size = new Size(145, 22); КомпонентыToolStripMenuItem.Text = "Компоненты"; КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // ИзделияToolStripMenuItem // ИзделияToolStripMenuItem.Name = "ИзделияToolStripMenuItem"; - ИзделияToolStripMenuItem.Size = new Size(180, 22); + ИзделияToolStripMenuItem.Size = new Size(145, 22); ИзделияToolStripMenuItem.Text = "Изделия"; ИзделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // // ClientsToolStripMenuItem // ClientsToolStripMenuItem.Name = "ClientsToolStripMenuItem"; - ClientsToolStripMenuItem.Size = new Size(180, 22); + ClientsToolStripMenuItem.Size = new Size(145, 22); ClientsToolStripMenuItem.Text = "Клиенты"; ClientsToolStripMenuItem.Click += clientsToolStripMenuItem_Click; // @@ -117,15 +117,15 @@ dataGridView.BackgroundColor = SystemColors.ButtonHighlight; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.EnableHeadersVisualStyles = false; - dataGridView.Location = new Point(1, 32); + dataGridView.Location = new Point(12, 32); dataGridView.MultiSelect = false; dataGridView.Name = "dataGridView"; - dataGridView.Size = new Size(755, 243); + dataGridView.Size = new Size(1022, 371); dataGridView.TabIndex = 1; // // ButtonCreateOrder // - ButtonCreateOrder.Location = new Point(762, 44); + ButtonCreateOrder.Location = new Point(1040, 32); ButtonCreateOrder.Name = "ButtonCreateOrder"; ButtonCreateOrder.Size = new Size(122, 23); ButtonCreateOrder.TabIndex = 2; @@ -135,7 +135,7 @@ // // ButtonTakeOrderInWork // - ButtonTakeOrderInWork.Location = new Point(762, 73); + ButtonTakeOrderInWork.Location = new Point(1040, 61); ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork"; ButtonTakeOrderInWork.Size = new Size(122, 42); ButtonTakeOrderInWork.TabIndex = 3; @@ -145,7 +145,7 @@ // // ButtonOrderReady // - ButtonOrderReady.Location = new Point(762, 121); + ButtonOrderReady.Location = new Point(1040, 109); ButtonOrderReady.Name = "ButtonOrderReady"; ButtonOrderReady.Size = new Size(122, 23); ButtonOrderReady.TabIndex = 4; @@ -155,7 +155,7 @@ // // ButtonIssuedOrder // - ButtonIssuedOrder.Location = new Point(762, 150); + ButtonIssuedOrder.Location = new Point(1040, 138); ButtonIssuedOrder.Name = "ButtonIssuedOrder"; ButtonIssuedOrder.Size = new Size(122, 23); ButtonIssuedOrder.TabIndex = 5; @@ -165,7 +165,7 @@ // // ButtonRef // - ButtonRef.Location = new Point(762, 179); + ButtonRef.Location = new Point(1040, 167); ButtonRef.Name = "ButtonRef"; ButtonRef.Size = new Size(122, 23); ButtonRef.TabIndex = 6; @@ -177,7 +177,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(896, 280); + ClientSize = new Size(1174, 415); Controls.Add(ButtonRef); Controls.Add(ButtonIssuedOrder); Controls.Add(ButtonOrderReady);