From 78ddde117f811bfb1cc4bd7f93cbedb6c0e04b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?10=D0=93=20=D0=95=D0=B3=D0=BE=D1=80=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 1 May 2023 16:55:27 +0400 Subject: [PATCH] big fixes with repository lab5 --- SecuritySystem/SecuritySystem.sln | 25 +++--- .../BusinessLogics/ClientLogic.cs | 2 +- .../Views/_ViewImports.cshtml | 3 - .../APIClient.cs | 4 +- .../Controllers/HomeController.cs | 12 +-- .../Models/ErrorViewModel.cs | 2 +- .../Program.cs | 4 +- .../Properties/launchSettings.json | 28 +++++++ .../SecuritySystemClientApp.csproj | 5 -- .../Views/Home/Create.cshtml | 10 +-- .../Views/Home/Enter.cshtml | 0 .../Views/Home/Index.cshtml | 4 +- .../Views/Home/Privacy.cshtml | 0 .../Views/Home/Register.cshtml | 0 .../Views/Shared/Error.cshtml | 0 .../Views/Shared/_Layout.cshtml | 8 +- .../Views/Shared/_Layout.cshtml.css | 0 .../Shared/_ValidationScriptsPartial.cshtml | 0 .../Views/_ViewImports.cshtml | 3 + .../Views/_ViewStart.cshtml | 0 .../appsettings.Development.json | 0 SecuritySystemClientApp/appsettings.json | 11 +++ .../wwwroot/css/site.css | 0 SecuritySystemClientApp/wwwroot/favicon.ico | Bin 0 -> 5430 bytes .../wwwroot/js/site.js | 0 .../wwwroot/lib/bootstrap/LICENSE | 0 .../lib/bootstrap/dist/css/bootstrap-grid.css | 0 .../bootstrap/dist/css/bootstrap-grid.css.map | 0 .../bootstrap/dist/css/bootstrap-grid.min.css | 0 .../dist/css/bootstrap-grid.min.css.map | 0 .../bootstrap/dist/css/bootstrap-grid.rtl.css | 0 .../dist/css/bootstrap-grid.rtl.css.map | 0 .../dist/css/bootstrap-grid.rtl.min.css | 0 .../dist/css/bootstrap-grid.rtl.min.css.map | 0 .../bootstrap/dist/css/bootstrap-reboot.css | 0 .../dist/css/bootstrap-reboot.css.map | 0 .../dist/css/bootstrap-reboot.min.css | 0 .../dist/css/bootstrap-reboot.min.css.map | 0 .../dist/css/bootstrap-reboot.rtl.css | 0 .../dist/css/bootstrap-reboot.rtl.css.map | 0 .../dist/css/bootstrap-reboot.rtl.min.css | 0 .../dist/css/bootstrap-reboot.rtl.min.css.map | 0 .../dist/css/bootstrap-utilities.css | 0 .../dist/css/bootstrap-utilities.css.map | 0 .../dist/css/bootstrap-utilities.min.css | 0 .../dist/css/bootstrap-utilities.min.css.map | 0 .../dist/css/bootstrap-utilities.rtl.css | 0 .../dist/css/bootstrap-utilities.rtl.css.map | 0 .../dist/css/bootstrap-utilities.rtl.min.css | 0 .../css/bootstrap-utilities.rtl.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.css | 0 .../lib/bootstrap/dist/css/bootstrap.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.min.css | 0 .../bootstrap/dist/css/bootstrap.min.css.map | 0 .../lib/bootstrap/dist/css/bootstrap.rtl.css | 0 .../bootstrap/dist/css/bootstrap.rtl.css.map | 0 .../bootstrap/dist/css/bootstrap.rtl.min.css | 0 .../dist/css/bootstrap.rtl.min.css.map | 0 .../lib/bootstrap/dist/js/bootstrap.bundle.js | 0 .../bootstrap/dist/js/bootstrap.bundle.js.map | 0 .../bootstrap/dist/js/bootstrap.bundle.min.js | 0 .../dist/js/bootstrap.bundle.min.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.esm.js | 0 .../bootstrap/dist/js/bootstrap.esm.js.map | 0 .../bootstrap/dist/js/bootstrap.esm.min.js | 0 .../dist/js/bootstrap.esm.min.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.js | 0 .../lib/bootstrap/dist/js/bootstrap.js.map | 0 .../lib/bootstrap/dist/js/bootstrap.min.js | 0 .../bootstrap/dist/js/bootstrap.min.js.map | 0 .../jquery-validation-unobtrusive/LICENSE.txt | 0 .../jquery.validate.unobtrusive.js | 0 .../jquery.validate.unobtrusive.min.js | 0 .../wwwroot/lib/jquery-validation/LICENSE.md | 0 .../dist/additional-methods.js | 0 .../dist/additional-methods.min.js | 0 .../jquery-validation/dist/jquery.validate.js | 0 .../dist/jquery.validate.min.js | 0 .../wwwroot/lib/jquery/LICENSE.txt | 0 .../wwwroot/lib/jquery/dist/jquery.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.js | 0 .../wwwroot/lib/jquery/dist/jquery.min.map | 0 .../StorageContracts/IClientStorage.cs | 2 +- .../Implements/ClientStorage.cs | 2 +- .../Controllers/ClientController.cs | 64 +++++++++++++++ .../Controllers/MainController.cs | 75 ++++++++++++++++++ SecuritySystemRestApi/Program.cs | 44 ++++++++++ .../Properties/launchSettings.json | 8 +- .../SecuritySystemRestApi.csproj | 20 +++++ .../appsettings.Development.json | 8 ++ .../appsettings.json | 0 SecuritySystemRestApi/log4net.config | 16 ++++ 92 files changed, 309 insertions(+), 51 deletions(-) delete mode 100644 SecuritySystemClientAPI/Views/_ViewImports.cshtml rename {SecuritySystemClientAPI => SecuritySystemClientApp}/APIClient.cs (94%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Controllers/HomeController.cs (90%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Models/ErrorViewModel.cs (78%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Program.cs (89%) create mode 100644 SecuritySystemClientApp/Properties/launchSettings.json rename SecuritySystemClientAPI/SecuritySystemClientAPI.csproj => SecuritySystemClientApp/SecuritySystemClientApp.csproj (75%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/Home/Create.cshtml (74%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/Home/Enter.cshtml (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/Home/Index.cshtml (91%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/Home/Privacy.cshtml (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/Home/Register.cshtml (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/Shared/Error.cshtml (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/Shared/_Layout.cshtml (86%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/Shared/_Layout.cshtml.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/Shared/_ValidationScriptsPartial.cshtml (100%) create mode 100644 SecuritySystemClientApp/Views/_ViewImports.cshtml rename {SecuritySystemClientAPI => SecuritySystemClientApp}/Views/_ViewStart.cshtml (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/appsettings.Development.json (100%) create mode 100644 SecuritySystemClientApp/appsettings.json rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/css/site.css (100%) create mode 100644 SecuritySystemClientApp/wwwroot/favicon.ico rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/js/site.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/LICENSE (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.rtl.min.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.min.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap-utilities.rtl.min.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/css/bootstrap.rtl.min.css.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.js.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.esm.min.js.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery-validation/LICENSE.md (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery-validation/dist/additional-methods.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery-validation/dist/additional-methods.min.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery-validation/dist/jquery.validate.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery/LICENSE.txt (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery/dist/jquery.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery/dist/jquery.min.js (100%) rename {SecuritySystemClientAPI => SecuritySystemClientApp}/wwwroot/lib/jquery/dist/jquery.min.map (100%) create mode 100644 SecuritySystemRestApi/Controllers/ClientController.cs create mode 100644 SecuritySystemRestApi/Controllers/MainController.cs create mode 100644 SecuritySystemRestApi/Program.cs rename {SecuritySystemClientAPI => SecuritySystemRestApi}/Properties/launchSettings.json (78%) create mode 100644 SecuritySystemRestApi/SecuritySystemRestApi.csproj create mode 100644 SecuritySystemRestApi/appsettings.Development.json rename {SecuritySystemClientAPI => SecuritySystemRestApi}/appsettings.json (100%) create mode 100644 SecuritySystemRestApi/log4net.config diff --git a/SecuritySystem/SecuritySystem.sln b/SecuritySystem/SecuritySystem.sln index 9c1dc76..ec26ab8 100644 --- a/SecuritySystem/SecuritySystem.sln +++ b/SecuritySystem/SecuritySystem.sln @@ -21,14 +21,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecuritySystemDatabaseImple {D12D1329-4362-472B-B6E6-D62B0FF00C63} = {D12D1329-4362-472B-B6E6-D62B0FF00C63} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecuritySystemClientApp", "..\..\PIbd-22_Kalyshev_Y_V_BlacksmithWorkshop_Base\BlacksmithWorkshop\BlacksmithWorkshopClientApp\SecuritySystemClientApp.csproj", "{8D616ABB-7ADE-47B8-9338-E7AAE084945B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecuritySystemClientApp", "..\SecuritySystemClientApp\SecuritySystemClientApp.csproj", "{E2624D4E-771E-4F6D-A638-AD322C64C20B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecuritySystemRestApi", "..\..\PIbd-22_Kalyshev_Y_V_BlacksmithWorkshop_Base\BlacksmithWorkshop\BlacksmithWorkshopRestApi\SecuritySystemRestApi.csproj", "{2974E9EB-F123-4C5E-8D40-DC17692AC07B}" - ProjectSection(ProjectDependencies) = postProject - {AB7134B4-1BEF-44FC-91DF-76D99BD7C065} = {AB7134B4-1BEF-44FC-91DF-76D99BD7C065} - {C1C491F5-4CB7-4B6B-92CE-41688769709A} = {C1C491F5-4CB7-4B6B-92CE-41688769709A} - {EF5F4167-954D-4414-8F76-372410029641} = {EF5F4167-954D-4414-8F76-372410029641} - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecuritySystemRestApi", "..\SecuritySystemRestApi\SecuritySystemRestApi.csproj", "{E8B437F4-DFC7-4875-AC0C-F458B85FB253}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -64,14 +59,14 @@ Global {AB7134B4-1BEF-44FC-91DF-76D99BD7C065}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB7134B4-1BEF-44FC-91DF-76D99BD7C065}.Release|Any CPU.ActiveCfg = Release|Any CPU {AB7134B4-1BEF-44FC-91DF-76D99BD7C065}.Release|Any CPU.Build.0 = Release|Any CPU - {8D616ABB-7ADE-47B8-9338-E7AAE084945B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8D616ABB-7ADE-47B8-9338-E7AAE084945B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D616ABB-7ADE-47B8-9338-E7AAE084945B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8D616ABB-7ADE-47B8-9338-E7AAE084945B}.Release|Any CPU.Build.0 = Release|Any CPU - {2974E9EB-F123-4C5E-8D40-DC17692AC07B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2974E9EB-F123-4C5E-8D40-DC17692AC07B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2974E9EB-F123-4C5E-8D40-DC17692AC07B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2974E9EB-F123-4C5E-8D40-DC17692AC07B}.Release|Any CPU.Build.0 = Release|Any CPU + {E2624D4E-771E-4F6D-A638-AD322C64C20B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E2624D4E-771E-4F6D-A638-AD322C64C20B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E2624D4E-771E-4F6D-A638-AD322C64C20B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E2624D4E-771E-4F6D-A638-AD322C64C20B}.Release|Any CPU.Build.0 = Release|Any CPU + {E8B437F4-DFC7-4875-AC0C-F458B85FB253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E8B437F4-DFC7-4875-AC0C-F458B85FB253}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E8B437F4-DFC7-4875-AC0C-F458B85FB253}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E8B437F4-DFC7-4875-AC0C-F458B85FB253}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SecuritySystemBusinessLogic/BusinessLogics/ClientLogic.cs b/SecuritySystemBusinessLogic/BusinessLogics/ClientLogic.cs index 0bf885b..bbe887a 100644 --- a/SecuritySystemBusinessLogic/BusinessLogics/ClientLogic.cs +++ b/SecuritySystemBusinessLogic/BusinessLogics/ClientLogic.cs @@ -1,7 +1,7 @@ using SecuritySystemContracts.BindingModels; using SecuritySystemContracts.BusinessLogicsContracts; using SecuritySystemContracts.SearchModels; -using SecuritySystemContracts.StorageContracts; +using SecuritySystemContracts.StoragesContracts; using SecuritySystemContracts.ViewModels; using SecuritySystemDataModels.Models; using Microsoft.Extensions.Logging; diff --git a/SecuritySystemClientAPI/Views/_ViewImports.cshtml b/SecuritySystemClientAPI/Views/_ViewImports.cshtml deleted file mode 100644 index 6422c0a..0000000 --- a/SecuritySystemClientAPI/Views/_ViewImports.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@using BlacksmithWorkshopClientApp -@using BlacksmithWorkshopClientApp.Models -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/SecuritySystemClientAPI/APIClient.cs b/SecuritySystemClientApp/APIClient.cs similarity index 94% rename from SecuritySystemClientAPI/APIClient.cs rename to SecuritySystemClientApp/APIClient.cs index 046d2e9..c481c30 100644 --- a/SecuritySystemClientAPI/APIClient.cs +++ b/SecuritySystemClientApp/APIClient.cs @@ -1,9 +1,9 @@ -using BlacksmithWorkshopContracts.ViewModels; +using SecuritySystemContracts.ViewModels; using Newtonsoft.Json; using System.Net.Http.Headers; using System.Text; -namespace BlacksmithWorkshopClientApp +namespace SecuritySystemClientApp { public class APIClient { diff --git a/SecuritySystemClientAPI/Controllers/HomeController.cs b/SecuritySystemClientApp/Controllers/HomeController.cs similarity index 90% rename from SecuritySystemClientAPI/Controllers/HomeController.cs rename to SecuritySystemClientApp/Controllers/HomeController.cs index e710fb6..be0ebb1 100644 --- a/SecuritySystemClientAPI/Controllers/HomeController.cs +++ b/SecuritySystemClientApp/Controllers/HomeController.cs @@ -102,11 +102,11 @@ namespace SecuritySystemClientApp.Controllers [HttpGet] public IActionResult Create() { - ViewBag.Manufactures = APIClient.GetRequest>("api/main/getmanufacturelist"); + ViewBag.Secures = APIClient.GetRequest>("api/main/getSecurelist"); return View(); } [HttpPost] - public void Create(int manufacture, int count) + public void Create(int Secure, int count) { if (APIClient.Client == null) { @@ -119,17 +119,17 @@ namespace SecuritySystemClientApp.Controllers APIClient.PostRequest("api/main/createorder", new OrderBindingModel { ClientId = APIClient.Client.Id, - ManufactureId = manufacture, + SecureId = Secure, Count = count, - Sum = Calc(count, manufacture) + Sum = Calc(count, Secure) }); Response.Redirect("Index"); } [HttpPost] - public double Calc(int count, int manufacture) + public double Calc(int count, int Secure) { - var prod = APIClient.GetRequest($"api/main/getmanufacture?manufactureId={manufacture}"); + var prod = APIClient.GetRequest($"api/main/getSecure?SecureId={Secure}"); return count * (prod?.Price ?? 1); } } diff --git a/SecuritySystemClientAPI/Models/ErrorViewModel.cs b/SecuritySystemClientApp/Models/ErrorViewModel.cs similarity index 78% rename from SecuritySystemClientAPI/Models/ErrorViewModel.cs rename to SecuritySystemClientApp/Models/ErrorViewModel.cs index 11605f2..38bf127 100644 --- a/SecuritySystemClientAPI/Models/ErrorViewModel.cs +++ b/SecuritySystemClientApp/Models/ErrorViewModel.cs @@ -1,4 +1,4 @@ -namespace BlacksmithWorkshopClientApp.Models +namespace SecuritySystemClientApp.Models { public class ErrorViewModel { diff --git a/SecuritySystemClientAPI/Program.cs b/SecuritySystemClientApp/Program.cs similarity index 89% rename from SecuritySystemClientAPI/Program.cs rename to SecuritySystemClientApp/Program.cs index 0727468..2393eed 100644 --- a/SecuritySystemClientAPI/Program.cs +++ b/SecuritySystemClientApp/Program.cs @@ -1,10 +1,12 @@ +using SecuritySystemClientApp; + var builder = WebApplication.CreateBuilder(args); // Add services to the container. builder.Services.AddControllersWithViews(); var app = builder.Build(); - +APIClient.Connect(builder.Configuration); // Configure the HTTP request pipeline. if (!app.Environment.IsDevelopment()) { diff --git a/SecuritySystemClientApp/Properties/launchSettings.json b/SecuritySystemClientApp/Properties/launchSettings.json new file mode 100644 index 0000000..9bd3271 --- /dev/null +++ b/SecuritySystemClientApp/Properties/launchSettings.json @@ -0,0 +1,28 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:27418", + "sslPort": 44380 + } + }, + "profiles": { + "SecuritySystemClientApp": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:7277;http://localhost:5118", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/SecuritySystemClientAPI/SecuritySystemClientAPI.csproj b/SecuritySystemClientApp/SecuritySystemClientApp.csproj similarity index 75% rename from SecuritySystemClientAPI/SecuritySystemClientAPI.csproj rename to SecuritySystemClientApp/SecuritySystemClientApp.csproj index 88ebf4b..a80c4c9 100644 --- a/SecuritySystemClientAPI/SecuritySystemClientAPI.csproj +++ b/SecuritySystemClientApp/SecuritySystemClientApp.csproj @@ -8,15 +8,10 @@ - - - - - diff --git a/SecuritySystemClientAPI/Views/Home/Create.cshtml b/SecuritySystemClientApp/Views/Home/Create.cshtml similarity index 74% rename from SecuritySystemClientAPI/Views/Home/Create.cshtml rename to SecuritySystemClientApp/Views/Home/Create.cshtml index c3e80c7..d9292b0 100644 --- a/SecuritySystemClientAPI/Views/Home/Create.cshtml +++ b/SecuritySystemClientApp/Views/Home/Create.cshtml @@ -8,7 +8,7 @@
Изделие:
- +
@@ -26,7 +26,7 @@ diff --git a/SecuritySystemClientAPI/Views/Shared/_Layout.cshtml.css b/SecuritySystemClientApp/Views/Shared/_Layout.cshtml.css similarity index 100% rename from SecuritySystemClientAPI/Views/Shared/_Layout.cshtml.css rename to SecuritySystemClientApp/Views/Shared/_Layout.cshtml.css diff --git a/SecuritySystemClientAPI/Views/Shared/_ValidationScriptsPartial.cshtml b/SecuritySystemClientApp/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from SecuritySystemClientAPI/Views/Shared/_ValidationScriptsPartial.cshtml rename to SecuritySystemClientApp/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/SecuritySystemClientApp/Views/_ViewImports.cshtml b/SecuritySystemClientApp/Views/_ViewImports.cshtml new file mode 100644 index 0000000..0950c72 --- /dev/null +++ b/SecuritySystemClientApp/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using SecuritySystemClientApp +@using SecuritySystemClientApp.Models +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/SecuritySystemClientAPI/Views/_ViewStart.cshtml b/SecuritySystemClientApp/Views/_ViewStart.cshtml similarity index 100% rename from SecuritySystemClientAPI/Views/_ViewStart.cshtml rename to SecuritySystemClientApp/Views/_ViewStart.cshtml diff --git a/SecuritySystemClientAPI/appsettings.Development.json b/SecuritySystemClientApp/appsettings.Development.json similarity index 100% rename from SecuritySystemClientAPI/appsettings.Development.json rename to SecuritySystemClientApp/appsettings.Development.json diff --git a/SecuritySystemClientApp/appsettings.json b/SecuritySystemClientApp/appsettings.json new file mode 100644 index 0000000..3418633 --- /dev/null +++ b/SecuritySystemClientApp/appsettings.json @@ -0,0 +1,11 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*", + + "IPAddress": "https://localhost:7116/" +} diff --git a/SecuritySystemClientAPI/wwwroot/css/site.css b/SecuritySystemClientApp/wwwroot/css/site.css similarity index 100% rename from SecuritySystemClientAPI/wwwroot/css/site.css rename to SecuritySystemClientApp/wwwroot/css/site.css diff --git a/SecuritySystemClientApp/wwwroot/favicon.ico b/SecuritySystemClientApp/wwwroot/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..63e859b476eff5055e0e557aaa151ca8223fbeef GIT binary patch literal 5430 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 logger) + { + _logger = logger; + _logic = logic; + } + [HttpGet] + public ClientViewModel? Login(string login, string password) + { + try + { + return _logic.ReadElement(new ClientSearchModel + { + Email = login, + Password = password + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка входа в систему"); + throw; + } + } + [HttpPost] + public void Register(ClientBindingModel model) + { + try + { + _logic.Create(model); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка регистрации"); + throw; + } + } + [HttpPost] + public void UpdateData(ClientBindingModel model) + { + try + { + _logic.Update(model); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка обновления данных"); + throw; + } + } + } +} diff --git a/SecuritySystemRestApi/Controllers/MainController.cs b/SecuritySystemRestApi/Controllers/MainController.cs new file mode 100644 index 0000000..6567dce --- /dev/null +++ b/SecuritySystemRestApi/Controllers/MainController.cs @@ -0,0 +1,75 @@ +using SecuritySystemContracts.BindingModels; +using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.SearchModels; +using SecuritySystemContracts.ViewModels; +using Microsoft.AspNetCore.Mvc; + +namespace SecuritySystemRestApi.Controllers +{ + [Route("api/[controller]/[action]")] + [ApiController] + public class MainController : Controller + { + private readonly ILogger _logger; + private readonly IOrderLogic _order; + private readonly ISecureLogic _Secure; + public MainController(ILogger logger, IOrderLogic order, ISecureLogic Secure) + { + _logger = logger; + _order = order; + _Secure = Secure; + } + [HttpGet] + public List? GetSecureList() + { + try + { + return _Secure.ReadList(null); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения списка продуктов"); + throw; + } + } + [HttpGet] + public SecureViewModel? GetSecure(int SecureId) + { + try + { + return _Secure.ReadElement(new SecureSearchModel { Id = SecureId }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения продукта по id={Id}", SecureId); + throw; + } + } + [HttpGet] + public List? GetOrders(int clientId) + { + try + { + return _order.ReadList(new OrderSearchModel { ClientId = clientId }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения списка заказов клиента id={Id}", clientId); + throw; + } + } + [HttpPost] + public void CreateOrder(OrderBindingModel model) + { + try + { + _order.CreateOrder(model); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания заказа"); + throw; + } + } + } +} diff --git a/SecuritySystemRestApi/Program.cs b/SecuritySystemRestApi/Program.cs new file mode 100644 index 0000000..92655ba --- /dev/null +++ b/SecuritySystemRestApi/Program.cs @@ -0,0 +1,44 @@ +using SecuritySystemBusinessLogic.BusinessLogics; +using SecuritySystemContracts.BusinessLogicsContracts; +using SecuritySystemContracts.StoragesContracts; +using SecuritySystemDatabaseImplement.Implements; +using Microsoft.OpenApi.Models; + +var builder = WebApplication.CreateBuilder(args); + +builder.Logging.SetMinimumLevel(LogLevel.Trace); +builder.Logging.AddLog4Net("log4net.config"); + +// Add services to the container. +builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddTransient(); + +builder.Services.AddTransient(); +builder.Services.AddTransient(); +builder.Services.AddTransient(); + +builder.Services.AddControllers(); +// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle +builder.Services.AddEndpointsApiExplorer(); +builder.Services.AddSwaggerGen(c => +{ + c.SwaggerDoc("v1", new OpenApiInfo { Title = "SecuritySystemRestApi", Version = "v1" }); +}); + +var app = builder.Build(); + +// Configure the HTTP request pipeline. +if (app.Environment.IsDevelopment()) +{ + app.UseSwagger(); + app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "AbstractShopRestApi v1")); +} + +app.UseHttpsRedirection(); + +app.UseAuthorization(); + +app.MapControllers(); + +app.Run(); diff --git a/SecuritySystemClientAPI/Properties/launchSettings.json b/SecuritySystemRestApi/Properties/launchSettings.json similarity index 78% rename from SecuritySystemClientAPI/Properties/launchSettings.json rename to SecuritySystemRestApi/Properties/launchSettings.json index 4aa3a92..83d8dbd 100644 --- a/SecuritySystemClientAPI/Properties/launchSettings.json +++ b/SecuritySystemRestApi/Properties/launchSettings.json @@ -4,17 +4,17 @@ "windowsAuthentication": false, "anonymousAuthentication": true, "iisExpress": { - "applicationUrl": "http://localhost:14404", - "sslPort": 44320 + "applicationUrl": "http://localhost:57787", + "sslPort": 44379 } }, "profiles": { - "SecuritySystemClientAPI": { + "SecuritySystemRestApi": { "commandName": "Project", "dotnetRunMessages": true, "launchBrowser": true, "launchUrl": "swagger", - "applicationUrl": "https://localhost:7062;http://localhost:5062", + "applicationUrl": "https://localhost:7116;http://localhost:5263", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/SecuritySystemRestApi/SecuritySystemRestApi.csproj b/SecuritySystemRestApi/SecuritySystemRestApi.csproj new file mode 100644 index 0000000..03cf1e3 --- /dev/null +++ b/SecuritySystemRestApi/SecuritySystemRestApi.csproj @@ -0,0 +1,20 @@ + + + + net6.0 + enable + enable + + + + + + + + + + + + + + diff --git a/SecuritySystemRestApi/appsettings.Development.json b/SecuritySystemRestApi/appsettings.Development.json new file mode 100644 index 0000000..0c208ae --- /dev/null +++ b/SecuritySystemRestApi/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/SecuritySystemClientAPI/appsettings.json b/SecuritySystemRestApi/appsettings.json similarity index 100% rename from SecuritySystemClientAPI/appsettings.json rename to SecuritySystemRestApi/appsettings.json diff --git a/SecuritySystemRestApi/log4net.config b/SecuritySystemRestApi/log4net.config new file mode 100644 index 0000000..43b77f9 --- /dev/null +++ b/SecuritySystemRestApi/log4net.config @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file