From a4b5895b167584e75dcdf861aad4c2ae49fe1c4d Mon Sep 17 00:00:00 2001 From: Allllen4a Date: Fri, 9 Feb 2024 20:25:51 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pizzeria/Pizzeria.sln | 18 +-- Pizzeria/PizzeriaView/Form1.Designer.cs | 39 ++++++ Pizzeria/PizzeriaView/Form1.cs | 10 ++ Pizzeria/PizzeriaView/Form1.resx | 120 ++++++++++++++++++ .../FormComponent.Designer.cs | 0 .../FormComponent.cs | 0 .../FormComponent.resx | 0 .../FormComponents.Designer.cs | 0 .../FormComponents.cs | 1 - .../FormComponents.resx | 0 .../FormCreateOrder.Designer.cs | 0 .../FormCreateOrder.cs | 0 .../FormCreateOrder.resx | 0 .../FormMain.Designer.cs | 2 +- .../{Pizzeria => PizzeriaView}/FormMain.cs | 5 +- .../{Pizzeria => PizzeriaView}/FormMain.resx | 0 .../FormPizza.Designer.cs | 0 .../{Pizzeria => PizzeriaView}/FormPizza.cs | 1 - .../{Pizzeria => PizzeriaView}/FormPizza.resx | 0 .../FormPizzaComponent.Designer.cs | 0 .../FormPizzaComponent.cs | 0 .../FormPizzaComponent.resx | 0 .../FormPizzas.Designer.cs | 0 .../{Pizzeria => PizzeriaView}/FormPizzas.cs | 1 - .../FormPizzas.resx | 0 .../PizzeriaView.csproj | 0 .../{Pizzeria => PizzeriaView}/Program.cs | 3 +- .../{Pizzeria => PizzeriaView}/nlog.config | 0 28 files changed, 182 insertions(+), 18 deletions(-) create mode 100644 Pizzeria/PizzeriaView/Form1.Designer.cs create mode 100644 Pizzeria/PizzeriaView/Form1.cs create mode 100644 Pizzeria/PizzeriaView/Form1.resx rename Pizzeria/{Pizzeria => PizzeriaView}/FormComponent.Designer.cs (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormComponent.cs (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormComponent.resx (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormComponents.Designer.cs (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormComponents.cs (99%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormComponents.resx (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormCreateOrder.Designer.cs (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormCreateOrder.cs (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormCreateOrder.resx (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormMain.Designer.cs (99%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormMain.cs (99%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormMain.resx (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormPizza.Designer.cs (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormPizza.cs (99%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormPizza.resx (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormPizzaComponent.Designer.cs (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormPizzaComponent.cs (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormPizzaComponent.resx (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormPizzas.Designer.cs (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormPizzas.cs (99%) rename Pizzeria/{Pizzeria => PizzeriaView}/FormPizzas.resx (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/PizzeriaView.csproj (100%) rename Pizzeria/{Pizzeria => PizzeriaView}/Program.cs (98%) rename Pizzeria/{Pizzeria => PizzeriaView}/nlog.config (100%) diff --git a/Pizzeria/Pizzeria.sln b/Pizzeria/Pizzeria.sln index 031e3eb..2370ae0 100644 --- a/Pizzeria/Pizzeria.sln +++ b/Pizzeria/Pizzeria.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.8.34322.80 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaView", "Pizzeria\PizzeriaView.csproj", "{72AA6ABF-D9EE-4A9D-8E2E-26802D7D2CF3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaBusinessLogic", "PizzeriaBusinessLogic\PizzeriaBusinessLogic.csproj", "{B9E1561D-35EA-4C83-9B09-6D5F6306D3BC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaBusinessLogic", "PizzeriaBusinessLogic\PizzeriaBusinessLogic.csproj", "{B9E1561D-35EA-4C83-9B09-6D5F6306D3BC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaContracts", "PizzeriaContracts\PizzeriaContracts.csproj", "{3888C0EA-7BF2-4E41-882F-FBB08D9E17E9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaContracts", "PizzeriaContracts\PizzeriaContracts.csproj", "{3888C0EA-7BF2-4E41-882F-FBB08D9E17E9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaDataModels", "PizzeriaDataModels\PizzeriaDataModels.csproj", "{42B0E1E3-0BCC-48BE-AE71-382ABBACBEA6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaDataModels", "PizzeriaDataModels\PizzeriaDataModels.csproj", "{42B0E1E3-0BCC-48BE-AE71-382ABBACBEA6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PizzeriaListImplement", "PizzeriaListImplement\PizzeriaListImplement.csproj", "{E219B355-7A12-4E5C-A09A-035A60B11A9D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaListImplement", "PizzeriaListImplement\PizzeriaListImplement.csproj", "{E219B355-7A12-4E5C-A09A-035A60B11A9D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PizzeriaView", "PizzeriaView\PizzeriaView.csproj", "{BE1F3CE5-00CC-4816-BB43-8F9BC6FA7DC1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,10 +19,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {72AA6ABF-D9EE-4A9D-8E2E-26802D7D2CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {72AA6ABF-D9EE-4A9D-8E2E-26802D7D2CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {72AA6ABF-D9EE-4A9D-8E2E-26802D7D2CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {72AA6ABF-D9EE-4A9D-8E2E-26802D7D2CF3}.Release|Any CPU.Build.0 = Release|Any CPU {B9E1561D-35EA-4C83-9B09-6D5F6306D3BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B9E1561D-35EA-4C83-9B09-6D5F6306D3BC}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9E1561D-35EA-4C83-9B09-6D5F6306D3BC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -39,6 +35,10 @@ Global {E219B355-7A12-4E5C-A09A-035A60B11A9D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E219B355-7A12-4E5C-A09A-035A60B11A9D}.Release|Any CPU.ActiveCfg = Release|Any CPU {E219B355-7A12-4E5C-A09A-035A60B11A9D}.Release|Any CPU.Build.0 = Release|Any CPU + {BE1F3CE5-00CC-4816-BB43-8F9BC6FA7DC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BE1F3CE5-00CC-4816-BB43-8F9BC6FA7DC1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BE1F3CE5-00CC-4816-BB43-8F9BC6FA7DC1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BE1F3CE5-00CC-4816-BB43-8F9BC6FA7DC1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Pizzeria/PizzeriaView/Form1.Designer.cs b/Pizzeria/PizzeriaView/Form1.Designer.cs new file mode 100644 index 0000000..6a6f0d1 --- /dev/null +++ b/Pizzeria/PizzeriaView/Form1.Designer.cs @@ -0,0 +1,39 @@ +namespace PizzeriaView +{ + partial class Form1 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Text = "Form1"; + } + + #endregion + } +} diff --git a/Pizzeria/PizzeriaView/Form1.cs b/Pizzeria/PizzeriaView/Form1.cs new file mode 100644 index 0000000..f9ed918 --- /dev/null +++ b/Pizzeria/PizzeriaView/Form1.cs @@ -0,0 +1,10 @@ +namespace PizzeriaView +{ + public partial class Form1 : Form + { + public Form1() + { + InitializeComponent(); + } + } +} diff --git a/Pizzeria/PizzeriaView/Form1.resx b/Pizzeria/PizzeriaView/Form1.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Pizzeria/PizzeriaView/Form1.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Pizzeria/Pizzeria/FormComponent.Designer.cs b/Pizzeria/PizzeriaView/FormComponent.Designer.cs similarity index 100% rename from Pizzeria/Pizzeria/FormComponent.Designer.cs rename to Pizzeria/PizzeriaView/FormComponent.Designer.cs diff --git a/Pizzeria/Pizzeria/FormComponent.cs b/Pizzeria/PizzeriaView/FormComponent.cs similarity index 100% rename from Pizzeria/Pizzeria/FormComponent.cs rename to Pizzeria/PizzeriaView/FormComponent.cs diff --git a/Pizzeria/Pizzeria/FormComponent.resx b/Pizzeria/PizzeriaView/FormComponent.resx similarity index 100% rename from Pizzeria/Pizzeria/FormComponent.resx rename to Pizzeria/PizzeriaView/FormComponent.resx diff --git a/Pizzeria/Pizzeria/FormComponents.Designer.cs b/Pizzeria/PizzeriaView/FormComponents.Designer.cs similarity index 100% rename from Pizzeria/Pizzeria/FormComponents.Designer.cs rename to Pizzeria/PizzeriaView/FormComponents.Designer.cs diff --git a/Pizzeria/Pizzeria/FormComponents.cs b/Pizzeria/PizzeriaView/FormComponents.cs similarity index 99% rename from Pizzeria/Pizzeria/FormComponents.cs rename to Pizzeria/PizzeriaView/FormComponents.cs index 643cba5..924e06e 100644 --- a/Pizzeria/Pizzeria/FormComponents.cs +++ b/Pizzeria/PizzeriaView/FormComponents.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.Logging; -using Pizzeria; using PizzeriaContracts.BindingModels; using PizzeriaContracts.BusinessLogicsContracts; using System; diff --git a/Pizzeria/Pizzeria/FormComponents.resx b/Pizzeria/PizzeriaView/FormComponents.resx similarity index 100% rename from Pizzeria/Pizzeria/FormComponents.resx rename to Pizzeria/PizzeriaView/FormComponents.resx diff --git a/Pizzeria/Pizzeria/FormCreateOrder.Designer.cs b/Pizzeria/PizzeriaView/FormCreateOrder.Designer.cs similarity index 100% rename from Pizzeria/Pizzeria/FormCreateOrder.Designer.cs rename to Pizzeria/PizzeriaView/FormCreateOrder.Designer.cs diff --git a/Pizzeria/Pizzeria/FormCreateOrder.cs b/Pizzeria/PizzeriaView/FormCreateOrder.cs similarity index 100% rename from Pizzeria/Pizzeria/FormCreateOrder.cs rename to Pizzeria/PizzeriaView/FormCreateOrder.cs diff --git a/Pizzeria/Pizzeria/FormCreateOrder.resx b/Pizzeria/PizzeriaView/FormCreateOrder.resx similarity index 100% rename from Pizzeria/Pizzeria/FormCreateOrder.resx rename to Pizzeria/PizzeriaView/FormCreateOrder.resx diff --git a/Pizzeria/Pizzeria/FormMain.Designer.cs b/Pizzeria/PizzeriaView/FormMain.Designer.cs similarity index 99% rename from Pizzeria/Pizzeria/FormMain.Designer.cs rename to Pizzeria/PizzeriaView/FormMain.Designer.cs index da05432..5bbfd06 100644 --- a/Pizzeria/Pizzeria/FormMain.Designer.cs +++ b/Pizzeria/PizzeriaView/FormMain.Designer.cs @@ -1,4 +1,4 @@ -namespace Pizzeria +namespace PizzeriaView { partial class FormMain { diff --git a/Pizzeria/Pizzeria/FormMain.cs b/Pizzeria/PizzeriaView/FormMain.cs similarity index 99% rename from Pizzeria/Pizzeria/FormMain.cs rename to Pizzeria/PizzeriaView/FormMain.cs index 6409068..82a23c3 100644 --- a/Pizzeria/Pizzeria/FormMain.cs +++ b/Pizzeria/PizzeriaView/FormMain.cs @@ -1,11 +1,10 @@ using Microsoft.Extensions.Logging; -using Pizzeria; +using PizzeriaView; using PizzeriaContracts.BindingModels; using PizzeriaContracts.BusinessLogicsContracts; -using PizzeriaView; using System.Windows.Forms; -namespace Pizzeria +namespace PizzeriaView { public partial class FormMain : Form { diff --git a/Pizzeria/Pizzeria/FormMain.resx b/Pizzeria/PizzeriaView/FormMain.resx similarity index 100% rename from Pizzeria/Pizzeria/FormMain.resx rename to Pizzeria/PizzeriaView/FormMain.resx diff --git a/Pizzeria/Pizzeria/FormPizza.Designer.cs b/Pizzeria/PizzeriaView/FormPizza.Designer.cs similarity index 100% rename from Pizzeria/Pizzeria/FormPizza.Designer.cs rename to Pizzeria/PizzeriaView/FormPizza.Designer.cs diff --git a/Pizzeria/Pizzeria/FormPizza.cs b/Pizzeria/PizzeriaView/FormPizza.cs similarity index 99% rename from Pizzeria/Pizzeria/FormPizza.cs rename to Pizzeria/PizzeriaView/FormPizza.cs index f28c3b4..fed76ca 100644 --- a/Pizzeria/Pizzeria/FormPizza.cs +++ b/Pizzeria/PizzeriaView/FormPizza.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.Logging; -using Pizzeria; using PizzeriaContracts.BindingModels; using PizzeriaContracts.BusinessLogicsContracts; using PizzeriaContracts.SearchModels; diff --git a/Pizzeria/Pizzeria/FormPizza.resx b/Pizzeria/PizzeriaView/FormPizza.resx similarity index 100% rename from Pizzeria/Pizzeria/FormPizza.resx rename to Pizzeria/PizzeriaView/FormPizza.resx diff --git a/Pizzeria/Pizzeria/FormPizzaComponent.Designer.cs b/Pizzeria/PizzeriaView/FormPizzaComponent.Designer.cs similarity index 100% rename from Pizzeria/Pizzeria/FormPizzaComponent.Designer.cs rename to Pizzeria/PizzeriaView/FormPizzaComponent.Designer.cs diff --git a/Pizzeria/Pizzeria/FormPizzaComponent.cs b/Pizzeria/PizzeriaView/FormPizzaComponent.cs similarity index 100% rename from Pizzeria/Pizzeria/FormPizzaComponent.cs rename to Pizzeria/PizzeriaView/FormPizzaComponent.cs diff --git a/Pizzeria/Pizzeria/FormPizzaComponent.resx b/Pizzeria/PizzeriaView/FormPizzaComponent.resx similarity index 100% rename from Pizzeria/Pizzeria/FormPizzaComponent.resx rename to Pizzeria/PizzeriaView/FormPizzaComponent.resx diff --git a/Pizzeria/Pizzeria/FormPizzas.Designer.cs b/Pizzeria/PizzeriaView/FormPizzas.Designer.cs similarity index 100% rename from Pizzeria/Pizzeria/FormPizzas.Designer.cs rename to Pizzeria/PizzeriaView/FormPizzas.Designer.cs diff --git a/Pizzeria/Pizzeria/FormPizzas.cs b/Pizzeria/PizzeriaView/FormPizzas.cs similarity index 99% rename from Pizzeria/Pizzeria/FormPizzas.cs rename to Pizzeria/PizzeriaView/FormPizzas.cs index 5e4bb25..3a8d55e 100644 --- a/Pizzeria/Pizzeria/FormPizzas.cs +++ b/Pizzeria/PizzeriaView/FormPizzas.cs @@ -1,5 +1,4 @@ using Microsoft.Extensions.Logging; -using Pizzeria; using PizzeriaContracts.BindingModels; using PizzeriaContracts.BusinessLogicsContracts; using System; diff --git a/Pizzeria/Pizzeria/FormPizzas.resx b/Pizzeria/PizzeriaView/FormPizzas.resx similarity index 100% rename from Pizzeria/Pizzeria/FormPizzas.resx rename to Pizzeria/PizzeriaView/FormPizzas.resx diff --git a/Pizzeria/Pizzeria/PizzeriaView.csproj b/Pizzeria/PizzeriaView/PizzeriaView.csproj similarity index 100% rename from Pizzeria/Pizzeria/PizzeriaView.csproj rename to Pizzeria/PizzeriaView/PizzeriaView.csproj diff --git a/Pizzeria/Pizzeria/Program.cs b/Pizzeria/PizzeriaView/Program.cs similarity index 98% rename from Pizzeria/Pizzeria/Program.cs rename to Pizzeria/PizzeriaView/Program.cs index f5d752b..8f0efd9 100644 --- a/Pizzeria/Pizzeria/Program.cs +++ b/Pizzeria/PizzeriaView/Program.cs @@ -5,10 +5,9 @@ using PizzeriaBusinessLogic.BusinessLogics; using PizzeriaContracts.BusinessLogicsContracts; using PizzeriaContracts.StoragesContracts; using PizzeriaListImplement.Implements; -using PizzeriaView; using System; -namespace Pizzeria +namespace PizzeriaView { internal static class Program { diff --git a/Pizzeria/Pizzeria/nlog.config b/Pizzeria/PizzeriaView/nlog.config similarity index 100% rename from Pizzeria/Pizzeria/nlog.config rename to Pizzeria/PizzeriaView/nlog.config