From e1abf80e6288d3710441301c8ecd8f0e27e9c1ac Mon Sep 17 00:00:00 2001
From: bekodeg <andermag102@yandex.ru>
Date: Wed, 14 Feb 2024 11:18:54 +0400
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=B3=20=D0=B7=D0=BD=D0=B0=D0=B5?=
 =?UTF-8?q?=D1=82,=20=D1=87=D1=82=D0=BE=20=D1=8F=20=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=8E=20=D0=BD=D0=B5=20=D1=82=D0=B0=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SushiBar/SushiBar/Forms/FormComponentsLogic.cs |  1 -
 SushiBar/SushiBar/Forms/FormMain.Designer.cs   |  3 ---
 SushiBar/SushiBar/Forms/FormMainLogic.cs       |  1 -
 SushiBar/SushiBar/Forms/FormSushiLogic.cs      |  1 -
 SushiBar/SushiBar/Forms/FormSushisLogic.cs     |  7 -------
 SushiBar/SushiBar/Program.cs                   | 12 +++++-------
 SushiBar/SushiBar/nlog.config                  | 10 ++++------
 7 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/SushiBar/SushiBar/Forms/FormComponentsLogic.cs b/SushiBar/SushiBar/Forms/FormComponentsLogic.cs
index 73c5f5b..7943174 100644
--- a/SushiBar/SushiBar/Forms/FormComponentsLogic.cs
+++ b/SushiBar/SushiBar/Forms/FormComponentsLogic.cs
@@ -1,7 +1,6 @@
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
-using SushiView;
 
 namespace SushiBar.Forms
 {
diff --git a/SushiBar/SushiBar/Forms/FormMain.Designer.cs b/SushiBar/SushiBar/Forms/FormMain.Designer.cs
index 1de243a..2a6b24a 100644
--- a/SushiBar/SushiBar/Forms/FormMain.Designer.cs
+++ b/SushiBar/SushiBar/Forms/FormMain.Designer.cs
@@ -159,14 +159,11 @@
 
         private DataGridView dataGridView;
         private MenuStrip menuStrip1;
-        private ToolStripMenuItem SushiToolStripMenuItem;
         private Button buttonCreateOrder;
         private Button buttonTakeOrderInWork;
         private Button buttonOrderReady;
         private Button buttonIssuedOrder;
         private Button buttonRef;
-        private ToolStripMenuItem сушиToolStripMenuItem;
-        private ToolStripMenuItem компонентыToolStripMenuItem;
         private ToolStripMenuItem ToolStripMenuItem;
         private ToolStripMenuItem sushiToolStripMenuItem;
         private ToolStripMenuItem componentsToolStripMenuItem;
diff --git a/SushiBar/SushiBar/Forms/FormMainLogic.cs b/SushiBar/SushiBar/Forms/FormMainLogic.cs
index bc3e58a..a617c62 100644
--- a/SushiBar/SushiBar/Forms/FormMainLogic.cs
+++ b/SushiBar/SushiBar/Forms/FormMainLogic.cs
@@ -2,7 +2,6 @@
 using SushiBarBusinessLogic.BusinessLogics;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
-using SushiView;
 using System.Windows.Forms;
 
 namespace SushiBar.Forms
diff --git a/SushiBar/SushiBar/Forms/FormSushiLogic.cs b/SushiBar/SushiBar/Forms/FormSushiLogic.cs
index a7d0cf2..a87d886 100644
--- a/SushiBar/SushiBar/Forms/FormSushiLogic.cs
+++ b/SushiBar/SushiBar/Forms/FormSushiLogic.cs
@@ -3,7 +3,6 @@ using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.SearchModels;
 using SushiBarDataModels.Models;
-using SushiView;
 
 namespace SushiBar.Forms
 {
diff --git a/SushiBar/SushiBar/Forms/FormSushisLogic.cs b/SushiBar/SushiBar/Forms/FormSushisLogic.cs
index 1b789c3..7e0904e 100644
--- a/SushiBar/SushiBar/Forms/FormSushisLogic.cs
+++ b/SushiBar/SushiBar/Forms/FormSushisLogic.cs
@@ -1,13 +1,6 @@
 using Microsoft.Extensions.Logging;
 using SushiBarContracts.BindingModels;
 using SushiBarContracts.BusinessLogicsContracts;
-using SushiView;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace SushiBar.Forms
 {
diff --git a/SushiBar/SushiBar/Program.cs b/SushiBar/SushiBar/Program.cs
index 74ce596..0627eda 100644
--- a/SushiBar/SushiBar/Program.cs
+++ b/SushiBar/SushiBar/Program.cs
@@ -1,20 +1,20 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
+using SushiBar.Forms;
 using SushiBarBusinessLogic.BusinessLogics;
 using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.StoragesContracts;
 using SushiBarListImplement.Implements;
-using SushiBar.Forms;
 
-namespace SushiView
+namespace SushiBar
 {
     internal static class Program
     {
         private static ServiceProvider? _serviceProvider;
         public static ServiceProvider? ServiceProvider => _serviceProvider;
         /// <summary>
-        ///  The main entry point for the application.
+        /// The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
@@ -25,9 +25,6 @@ namespace SushiView
             var services = new ServiceCollection();
             ConfigureServices(services);
             _serviceProvider = services.BuildServiceProvider();
-
-            ILogger logger = _serviceProvider.GetService<ILogger>();
-
             Application.Run(_serviceProvider.GetRequiredService<FormMain>());
         }
         private static void ConfigureServices(ServiceCollection services)
@@ -51,6 +48,7 @@ namespace SushiView
             services.AddTransient<FormCreateOrder>();
             services.AddTransient<FormSushi>();
             services.AddTransient<FormSushiComponent>();
+            services.AddTransient<FormSushis>();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SushiBar/SushiBar/nlog.config b/SushiBar/SushiBar/nlog.config
index af70d20..aad59db 100644
--- a/SushiBar/SushiBar/nlog.config
+++ b/SushiBar/SushiBar/nlog.config
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <configuration>
 	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        autoReload="true" internalLogLevel="Info">
-
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ autoReload="true" internalLogLevel="Info">
 		<targets>
-			<target xsi:type="File" name="tofile" fileName="${basedir}/log-${shortdate}.log" />
+			<target xsi:type="File" name="tofile" fileName="carlog-${shortdate}.log" />
 		</targets>
-
 		<rules>
 			<logger name="*" minlevel="Debug" writeTo="tofile" />
 		</rules>