From ad215334b339ea6b9e87337ac48d5d40ee1f3f8b Mon Sep 17 00:00:00 2001 From: Sergey Kozyrev Date: Thu, 4 Apr 2024 19:29:47 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=BE=D0=B2=D0=B8=20=D0=B0=D0=BF=D1=82?= =?UTF-8?q?=D0=B5=D1=87=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SewingDressesClientApp/APIClient.cs | 68 +-- .../Controllers/HomeController.cs | 17 +- .../SewingDressesClientApp.csproj | 10 + .../Views/Home/Index.cshtml | 2 +- .../Views/Shared/_Layout.cshtml | 2 +- .../SewingDressesClientApp/appsettings.json | 2 +- .../Implements/OrderStorage.cs | 8 +- .../Controllers/ClientController.cs | 114 +++-- SewingDresses/SewingDressesRestApi/Program.cs | 1 - .../SewingDressesView/ClientsForm.Designer.cs | 90 ++++ .../SewingDressesView/ClientsForm.cs | 83 ++++ .../SewingDressesView/ClientsForm.resx | 120 +++++ .../SewingDressesView/MainForm.Designer.cs | 409 +++++++++--------- SewingDresses/SewingDressesView/MainForm.cs | 334 +++++++------- .../SewingDressesView/OrderForm.Designer.cs | 293 +++++++------ SewingDresses/SewingDressesView/OrderForm.cs | 211 ++++----- SewingDresses/SewingDressesView/Program.cs | 3 + 17 files changed, 1059 insertions(+), 708 deletions(-) create mode 100644 SewingDresses/SewingDressesView/ClientsForm.Designer.cs create mode 100644 SewingDresses/SewingDressesView/ClientsForm.cs create mode 100644 SewingDresses/SewingDressesView/ClientsForm.resx diff --git a/SewingDresses/SewingDressesClientApp/APIClient.cs b/SewingDresses/SewingDressesClientApp/APIClient.cs index 74e0f82..6a5721f 100644 --- a/SewingDresses/SewingDressesClientApp/APIClient.cs +++ b/SewingDresses/SewingDressesClientApp/APIClient.cs @@ -6,37 +6,39 @@ namespace SewingDressesClientApp { public static class APIClient { - private static readonly HttpClient _client = new(); - public static ClientViewModel? Client { get; set; } = null; - public static void Connect(IConfiguration configuration) - { - _client.BaseAddress = new Uri(configuration["IPAddress"]!); - _client.DefaultRequestHeaders.Accept.Clear(); - _client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); - } - public static T? GetRequest(string requestUrl) - { - var response = _client.GetAsync(requestUrl); - var result = response.Result.Content.ReadAsStringAsync().Result; - if (response.Result.IsSuccessStatusCode) - { - return JsonConvert.DeserializeObject(result); - } - else - { - throw new Exception(result); - } - } - public static void PostRequest(string requestUrl, T model) - { - var json = JsonConvert.SerializeObject(model); - var data = new StringContent(json, Encoding.UTF8, "application/json"); - var response = _client.PostAsync(requestUrl, data); - var result = response.Result.Content.ReadAsStringAsync().Result; - if (!response.Result.IsSuccessStatusCode) - { - throw new Exception(result); - } - } - } + private static readonly HttpClient _client = new(); + public static ClientViewModel? Client { get; set; } = null; + public static void Connect(IConfiguration configuration) + { + _client.BaseAddress = new Uri(configuration["IPAddress"]); + _client.DefaultRequestHeaders.Accept.Clear(); + _client.DefaultRequestHeaders.Accept.Add(new + MediaTypeWithQualityHeaderValue("application/json")); + } + public static T? GetRequest(string requestUrl) + { + var response = _client.GetAsync(requestUrl); + var result = response.Result.Content.ReadAsStringAsync().Result; + if (response.Result.IsSuccessStatusCode) + { + return JsonConvert.DeserializeObject(result); + } + else + { + throw new Exception(result); + } + } + public static void PostRequest(string requestUrl, T model) + { + var json = JsonConvert.SerializeObject(model); + var data = new StringContent(json, Encoding.UTF8, + "application/json"); + var response = _client.PostAsync(requestUrl, data); + var result = response.Result.Content.ReadAsStringAsync().Result; + if (!response.Result.IsSuccessStatusCode) + { + throw new Exception(result); + } + } + } } diff --git a/SewingDresses/SewingDressesClientApp/Controllers/HomeController.cs b/SewingDresses/SewingDressesClientApp/Controllers/HomeController.cs index e2e565a..9997cb8 100644 --- a/SewingDresses/SewingDressesClientApp/Controllers/HomeController.cs +++ b/SewingDresses/SewingDressesClientApp/Controllers/HomeController.cs @@ -17,17 +17,16 @@ namespace SewingDressesClientApp.Controllers { if (APIClient.Client == null) { - return View("Enter"); + return Redirect("~/Home/Enter"); } - return - View(APIClient.GetRequest>($"api/main/getorders?clientId={APIClient.Client.Id}")); + return View(APIClient.GetRequest>($"api/main/getorders?clientId={APIClient.Client.Id}")); } [HttpGet] public IActionResult Privacy() { if (APIClient.Client == null) { - return View("Enter"); + return Redirect("~/Home/Enter"); } return View(APIClient.Client); } @@ -78,8 +77,7 @@ namespace SewingDressesClientApp.Controllers { throw new Exception("Введите логин и пароль"); } - APIClient.Client = - APIClient.GetRequest($"api/client/login?login={login}&password={password}"); + APIClient.Client = APIClient.GetRequest($"api/client/login?login={login}&password={password}"); if (APIClient.Client == null) { throw new Exception("Неверный логин/пароль"); @@ -112,8 +110,7 @@ namespace SewingDressesClientApp.Controllers [HttpGet] public IActionResult Create() { - ViewBag.IceCreams = - APIClient.GetRequest>("api/main/getdresslist"); + ViewBag.Dresses = APIClient.GetRequest>("api/main/getdresslist"); return View(); } [HttpPost] @@ -140,9 +137,7 @@ namespace SewingDressesClientApp.Controllers [HttpPost] public double Calc(int count, int dress) { - var _dress = - APIClient.GetRequest($"api/main/getdress?dressid={dress}" - ); + var _dress = APIClient.GetRequest($"api/main/getdress?dressid={dress}"); return Math.Round(count * (_dress?.Price ?? 1), 2); } } diff --git a/SewingDresses/SewingDressesClientApp/SewingDressesClientApp.csproj b/SewingDresses/SewingDressesClientApp/SewingDressesClientApp.csproj index a5c72d4..2d13b51 100644 --- a/SewingDresses/SewingDressesClientApp/SewingDressesClientApp.csproj +++ b/SewingDresses/SewingDressesClientApp/SewingDressesClientApp.csproj @@ -13,6 +13,16 @@ + + + + Never + + + Never + + + diff --git a/SewingDresses/SewingDressesClientApp/Views/Home/Index.cshtml b/SewingDresses/SewingDressesClientApp/Views/Home/Index.cshtml index c24cff6..f9abfc7 100644 --- a/SewingDresses/SewingDressesClientApp/Views/Home/Index.cshtml +++ b/SewingDresses/SewingDressesClientApp/Views/Home/Index.cshtml @@ -29,7 +29,7 @@ Номер - Изделие + Платье Дата создания diff --git a/SewingDresses/SewingDressesClientApp/Views/Shared/_Layout.cshtml b/SewingDresses/SewingDressesClientApp/Views/Shared/_Layout.cshtml index 4e72d75..213634e 100644 --- a/SewingDresses/SewingDressesClientApp/Views/Shared/_Layout.cshtml +++ b/SewingDresses/SewingDressesClientApp/Views/Shared/_Layout.cshtml @@ -12,7 +12,7 @@