From 641591bf4f1bf1f7cf96b70d4a1491a1b789d0f2 Mon Sep 17 00:00:00 2001 From: bekodeg Date: Mon, 5 Feb 2024 16:40:47 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/ComponentBindingModel.cs | 4 ++-- .../BindingModels/OrderBindingModel.cs | 6 +++--- .../BindingModels/ProductBindingModel.cs | 4 ++-- .../BusinessLogicsContracts/IComponentLogic.cs | 8 ++++---- .../BusinessLogicsContracts/IOrderLogic.cs | 8 ++++---- .../BusinessLogicsContracts/IProductLogic.cs | 8 ++++---- .../SearchModels/ComponentSearchModel.cs | 2 +- .../SearchModels/OrderSearchModel.cs | 2 +- .../SearchModels/ProductSearchModel.cs | 2 +- .../StoragesContracts/IComponentStorage.cs | 8 ++++---- .../StoragesContracts/IOrderStorage.cs | 8 ++++---- .../StoragesContracts/IProductStorage.cs | 8 ++++---- .../ViewModels/ComponentViewModel.cs | 4 ++-- .../ViewModels/OrderViewModel.cs | 6 +++--- .../ViewModels/ProductViewModel.cs | 4 ++-- SushiBar/AbstractSushiBarDataModels/Enums/OrderStatus.cs | 2 +- SushiBar/AbstractSushiBarDataModels/IId.cs | 2 +- .../AbstractSushiBarDataModels/Models/IComponentModel.cs | 2 +- SushiBar/AbstractSushiBarDataModels/Models/IOrderModel.cs | 4 ++-- .../AbstractSushiBarDataModels/Models/IProductModel.cs | 2 +- SushiBar/SushiBar.sln | 4 ++-- 21 files changed, 49 insertions(+), 49 deletions(-) diff --git a/SushiBar/AbstractSushiBarContracts/BindingModels/ComponentBindingModel.cs b/SushiBar/AbstractSushiBarContracts/BindingModels/ComponentBindingModel.cs index 8edc388..3df23d5 100644 --- a/SushiBar/AbstractSushiBarContracts/BindingModels/ComponentBindingModel.cs +++ b/SushiBar/AbstractSushiBarContracts/BindingModels/ComponentBindingModel.cs @@ -1,6 +1,6 @@ -using AbstractSushiBarDataModels.Models; +using SushiBarDataModels.Models; -namespace AbstractSushiBarContracts.BindingModels +namespace SushiBarContracts.BindingModels { public class ComponentBindingModel : IComponentModel { diff --git a/SushiBar/AbstractSushiBarContracts/BindingModels/OrderBindingModel.cs b/SushiBar/AbstractSushiBarContracts/BindingModels/OrderBindingModel.cs index d37e083..2625c77 100644 --- a/SushiBar/AbstractSushiBarContracts/BindingModels/OrderBindingModel.cs +++ b/SushiBar/AbstractSushiBarContracts/BindingModels/OrderBindingModel.cs @@ -1,7 +1,7 @@ -using AbstractSushiBarDataModels.Enums; -using AbstractSushiBarDataModels.Models; +using SushiBarDataModels.Enums; +using SushiBarDataModels.Models; -namespace AbstractSushiBarContracts.BindingModels +namespace SushiBarContracts.BindingModels { public class OrderBindingModel : IOrderModel { diff --git a/SushiBar/AbstractSushiBarContracts/BindingModels/ProductBindingModel.cs b/SushiBar/AbstractSushiBarContracts/BindingModels/ProductBindingModel.cs index 24e59f7..13c12c0 100644 --- a/SushiBar/AbstractSushiBarContracts/BindingModels/ProductBindingModel.cs +++ b/SushiBar/AbstractSushiBarContracts/BindingModels/ProductBindingModel.cs @@ -1,6 +1,6 @@ -using AbstractSushiBarDataModels.Models; +using SushiBarDataModels.Models; -namespace AbstractSushiBarContracts.BindingModels +namespace SushiBarContracts.BindingModels { public class ProductBindingModel : IProductModel { diff --git a/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IComponentLogic.cs b/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IComponentLogic.cs index 731a5d3..d75c9f1 100644 --- a/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IComponentLogic.cs +++ b/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IComponentLogic.cs @@ -1,8 +1,8 @@ -using AbstractSushiBarContracts.BindingModels; -using AbstractSushiBarContracts.SearchModels; -using AbstractSushiBarContracts.ViewModels; +using SushiBarContracts.BindingModels; +using SushiBarContracts.SearchModels; +using SushiBarContracts.ViewModels; -namespace AbstractSushiBarContracts.BusinessLogicsContracts +namespace SushiBarContracts.BusinessLogicsContracts { public interface IComponentLogic { diff --git a/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IOrderLogic.cs b/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IOrderLogic.cs index 0ff7296..be0cb58 100644 --- a/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IOrderLogic.cs +++ b/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -1,8 +1,8 @@ -using AbstractSushiBarContracts.BindingModels; -using AbstractSushiBarContracts.SearchModels; -using AbstractSushiBarContracts.ViewModels; +using SushiBarContracts.BindingModels; +using SushiBarContracts.SearchModels; +using SushiBarContracts.ViewModels; -namespace AbstractSushiBarContracts.BusinessLogicsContracts +namespace SushiBarContracts.BusinessLogicsContracts { public interface IOrderLogic { diff --git a/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IProductLogic.cs b/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IProductLogic.cs index 0483b5e..96217a1 100644 --- a/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IProductLogic.cs +++ b/SushiBar/AbstractSushiBarContracts/BusinessLogicsContracts/IProductLogic.cs @@ -1,8 +1,8 @@ -using AbstractSushiBarContracts.BindingModels; -using AbstractSushiBarContracts.SearchModels; -using AbstractSushiBarContracts.ViewModels; +using SushiBarContracts.BindingModels; +using SushiBarContracts.SearchModels; +using SushiBarContracts.ViewModels; -namespace AbstractSushiBarContracts.BusinessLogicsContracts +namespace SushiBarContracts.BusinessLogicsContracts { public interface IProductLogic { diff --git a/SushiBar/AbstractSushiBarContracts/SearchModels/ComponentSearchModel.cs b/SushiBar/AbstractSushiBarContracts/SearchModels/ComponentSearchModel.cs index 524a085..3e9c31b 100644 --- a/SushiBar/AbstractSushiBarContracts/SearchModels/ComponentSearchModel.cs +++ b/SushiBar/AbstractSushiBarContracts/SearchModels/ComponentSearchModel.cs @@ -1,4 +1,4 @@ -namespace AbstractSushiBarContracts.SearchModels +namespace SushiBarContracts.SearchModels { public class ComponentSearchModel { diff --git a/SushiBar/AbstractSushiBarContracts/SearchModels/OrderSearchModel.cs b/SushiBar/AbstractSushiBarContracts/SearchModels/OrderSearchModel.cs index 21fd7e3..becbcd5 100644 --- a/SushiBar/AbstractSushiBarContracts/SearchModels/OrderSearchModel.cs +++ b/SushiBar/AbstractSushiBarContracts/SearchModels/OrderSearchModel.cs @@ -1,4 +1,4 @@ -namespace AbstractSushiBarContracts.SearchModels +namespace SushiBarContracts.SearchModels { public class OrderSearchModel { diff --git a/SushiBar/AbstractSushiBarContracts/SearchModels/ProductSearchModel.cs b/SushiBar/AbstractSushiBarContracts/SearchModels/ProductSearchModel.cs index c68c49d..86bc1d7 100644 --- a/SushiBar/AbstractSushiBarContracts/SearchModels/ProductSearchModel.cs +++ b/SushiBar/AbstractSushiBarContracts/SearchModels/ProductSearchModel.cs @@ -1,4 +1,4 @@ -namespace AbstractSushiBarContracts.SearchModels +namespace SushiBarContracts.SearchModels { public class ProductSearchModel { diff --git a/SushiBar/AbstractSushiBarContracts/StoragesContracts/IComponentStorage.cs b/SushiBar/AbstractSushiBarContracts/StoragesContracts/IComponentStorage.cs index e516ea7..2f18178 100644 --- a/SushiBar/AbstractSushiBarContracts/StoragesContracts/IComponentStorage.cs +++ b/SushiBar/AbstractSushiBarContracts/StoragesContracts/IComponentStorage.cs @@ -1,8 +1,8 @@ -using AbstractSushiBarContracts.BindingModels; -using AbstractSushiBarContracts.SearchModels; -using AbstractSushiBarContracts.ViewModels; +using SushiBarContracts.BindingModels; +using SushiBarContracts.SearchModels; +using SushiBarContracts.ViewModels; -namespace AbstractSushiBarContracts.StoragesContracts +namespace SushiBarContracts.StoragesContracts { public interface IComponentStorage { diff --git a/SushiBar/AbstractSushiBarContracts/StoragesContracts/IOrderStorage.cs b/SushiBar/AbstractSushiBarContracts/StoragesContracts/IOrderStorage.cs index 7f4d1eb..f337dbf 100644 --- a/SushiBar/AbstractSushiBarContracts/StoragesContracts/IOrderStorage.cs +++ b/SushiBar/AbstractSushiBarContracts/StoragesContracts/IOrderStorage.cs @@ -1,8 +1,8 @@ -using AbstractSushiBarContracts.BindingModels; -using AbstractSushiBarContracts.SearchModels; -using AbstractSushiBarContracts.ViewModels; +using SushiBarContracts.BindingModels; +using SushiBarContracts.SearchModels; +using SushiBarContracts.ViewModels; -namespace AbstractSushiBarContracts.StoragesContracts +namespace SushiBarContracts.StoragesContracts { public interface IOrderStorage { diff --git a/SushiBar/AbstractSushiBarContracts/StoragesContracts/IProductStorage.cs b/SushiBar/AbstractSushiBarContracts/StoragesContracts/IProductStorage.cs index e93bd8e..16e3db4 100644 --- a/SushiBar/AbstractSushiBarContracts/StoragesContracts/IProductStorage.cs +++ b/SushiBar/AbstractSushiBarContracts/StoragesContracts/IProductStorage.cs @@ -1,8 +1,8 @@ -using AbstractSushiBarContracts.BindingModels; -using AbstractSushiBarContracts.SearchModels; -using AbstractSushiBarContracts.ViewModels; +using SushiBarContracts.BindingModels; +using SushiBarContracts.SearchModels; +using SushiBarContracts.ViewModels; -namespace AbstractSushiBarContracts.StoragesContracts +namespace SushiBarContracts.StoragesContracts { public interface IProductStorage { diff --git a/SushiBar/AbstractSushiBarContracts/ViewModels/ComponentViewModel.cs b/SushiBar/AbstractSushiBarContracts/ViewModels/ComponentViewModel.cs index bc11a92..f879afc 100644 --- a/SushiBar/AbstractSushiBarContracts/ViewModels/ComponentViewModel.cs +++ b/SushiBar/AbstractSushiBarContracts/ViewModels/ComponentViewModel.cs @@ -1,7 +1,7 @@ -using AbstractSushiBarDataModels.Models; +using SushiBarDataModels.Models; using System.ComponentModel; -namespace AbstractSushiBarContracts.ViewModels +namespace SushiBarContracts.ViewModels { public class ComponentViewModel : IComponentModel { diff --git a/SushiBar/AbstractSushiBarContracts/ViewModels/OrderViewModel.cs b/SushiBar/AbstractSushiBarContracts/ViewModels/OrderViewModel.cs index f6318af..9988699 100644 --- a/SushiBar/AbstractSushiBarContracts/ViewModels/OrderViewModel.cs +++ b/SushiBar/AbstractSushiBarContracts/ViewModels/OrderViewModel.cs @@ -1,8 +1,8 @@ -using AbstractSushiBarDataModels.Enums; -using AbstractSushiBarDataModels.Models; +using SushiBarDataModels.Enums; +using SushiBarDataModels.Models; using System.ComponentModel; -namespace AbstractSushiBarContracts.ViewModels +namespace SushiBarContracts.ViewModels { public class OrderViewModel : IOrderModel { diff --git a/SushiBar/AbstractSushiBarContracts/ViewModels/ProductViewModel.cs b/SushiBar/AbstractSushiBarContracts/ViewModels/ProductViewModel.cs index 55dbbbf..67b02e2 100644 --- a/SushiBar/AbstractSushiBarContracts/ViewModels/ProductViewModel.cs +++ b/SushiBar/AbstractSushiBarContracts/ViewModels/ProductViewModel.cs @@ -1,7 +1,7 @@ -using AbstractSushiBarDataModels.Models; +using SushiBarDataModels.Models; using System.ComponentModel; -namespace AbstractSushiBarContracts.ViewModels +namespace SushiBarContracts.ViewModels { public class ProductViewModel : IProductModel { diff --git a/SushiBar/AbstractSushiBarDataModels/Enums/OrderStatus.cs b/SushiBar/AbstractSushiBarDataModels/Enums/OrderStatus.cs index 32b3cf1..64556e2 100644 --- a/SushiBar/AbstractSushiBarDataModels/Enums/OrderStatus.cs +++ b/SushiBar/AbstractSushiBarDataModels/Enums/OrderStatus.cs @@ -1,4 +1,4 @@ -namespace AbstractSushiBarDataModels.Enums +namespace SushiBarDataModels.Enums { public enum OrderStatus { diff --git a/SushiBar/AbstractSushiBarDataModels/IId.cs b/SushiBar/AbstractSushiBarDataModels/IId.cs index 758b3fd..2b4af59 100644 --- a/SushiBar/AbstractSushiBarDataModels/IId.cs +++ b/SushiBar/AbstractSushiBarDataModels/IId.cs @@ -1,4 +1,4 @@ -namespace AbstractSushiBarDataModels +namespace SushiBarDataModels { public interface IId { diff --git a/SushiBar/AbstractSushiBarDataModels/Models/IComponentModel.cs b/SushiBar/AbstractSushiBarDataModels/Models/IComponentModel.cs index 136d0b8..93c68db 100644 --- a/SushiBar/AbstractSushiBarDataModels/Models/IComponentModel.cs +++ b/SushiBar/AbstractSushiBarDataModels/Models/IComponentModel.cs @@ -1,4 +1,4 @@ -namespace AbstractSushiBarDataModels.Models +namespace SushiBarDataModels.Models { public interface IComponentModel : IId { diff --git a/SushiBar/AbstractSushiBarDataModels/Models/IOrderModel.cs b/SushiBar/AbstractSushiBarDataModels/Models/IOrderModel.cs index 047d1e1..501a9dc 100644 --- a/SushiBar/AbstractSushiBarDataModels/Models/IOrderModel.cs +++ b/SushiBar/AbstractSushiBarDataModels/Models/IOrderModel.cs @@ -1,6 +1,6 @@ -using AbstractSushiBarDataModels.Enums; +using SushiBarDataModels.Enums; -namespace AbstractSushiBarDataModels.Models +namespace SushiBarDataModels.Models { public interface IOrderModel : IId { diff --git a/SushiBar/AbstractSushiBarDataModels/Models/IProductModel.cs b/SushiBar/AbstractSushiBarDataModels/Models/IProductModel.cs index a921f17..a28a0bc 100644 --- a/SushiBar/AbstractSushiBarDataModels/Models/IProductModel.cs +++ b/SushiBar/AbstractSushiBarDataModels/Models/IProductModel.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace AbstractSushiBarDataModels.Models +namespace SushiBarDataModels.Models { public interface IProductModel : IId { diff --git a/SushiBar/SushiBar.sln b/SushiBar/SushiBar.sln index 1b8646d..7bfc06a 100644 --- a/SushiBar/SushiBar.sln +++ b/SushiBar/SushiBar.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 17.7.34031.279 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBar", "SushiBar\SushiBar.csproj", "{B9AC543F-20EE-47B1-9BC4-3F5DADAD931C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbstractSushiBarDataModels", "AbstractSushiBarDataModels\AbstractSushiBarDataModels.csproj", "{6F64D0ED-EAFC-495F-AFAC-FFC9CD4C53BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SushiBarDataModels", "AbstractSushiBarDataModels\SushiBarDataModels.csproj", "{6F64D0ED-EAFC-495F-AFAC-FFC9CD4C53BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbstractSushiBarContracts", "AbstractSushiBarContracts\AbstractSushiBarContracts.csproj", "{E02D432A-1BC9-4C65-B8D3-57EC53336DD3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SushiBarContracts", "AbstractSushiBarContracts\SushiBarContracts.csproj", "{E02D432A-1BC9-4C65-B8D3-57EC53336DD3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution