From b65a2539c54625b154bf2e7d318095782999e9b8 Mon Sep 17 00:00:00 2001 From: Allllen4a Date: Wed, 1 May 2024 18:15:54 +0400 Subject: [PATCH] =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20=D0=BA=D0=BB?= =?UTF-8?q?=D0=B8=D0=B5=D0=BD=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeautySalonView/ClientWebApp/APIClient.cs | 68 ++++++++++++++++ .../ClientWebApp/Views/Home/Enter.cshtml | 19 +++++ .../ClientWebApp/Views/Home/Evaluation.cshtml | 2 +- .../Views/Home/FormationOrder.cshtml | 3 +- .../ClientWebApp/Views/Home/Index.cshtml | 8 +- .../ClientWebApp/Views/Home/Privacy.cshtml | 6 -- .../ClientWebApp/Views/Home/Register.cshtml | 25 ++++++ .../ClientWebApp/Views/Order/Create.cshtml | 75 ++++++++++++++++++ .../ClientWebApp/Views/Order/Update.cshtml | 77 +++++++++++++++++++ .../Views/Procedure/Create.cshtml | 49 ++++++++++++ .../Views/Procedure/Update.cshtml | 51 ++++++++++++ .../ClientWebApp/Views/Rating/Create.cshtml | 25 ++++++ .../ClientWebApp/Views/Rating/Update.cshtml | 38 +++++++++ .../ClientWebApp/Views/Shared/_Layout.cshtml | 33 ++++++-- BeautySalonView/ClientWebApp/appsettings.json | 3 +- 15 files changed, 463 insertions(+), 19 deletions(-) create mode 100644 BeautySalonView/ClientWebApp/APIClient.cs create mode 100644 BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml delete mode 100644 BeautySalonView/ClientWebApp/Views/Home/Privacy.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Home/Register.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Order/Create.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Order/Update.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Procedure/Create.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Procedure/Update.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Rating/Create.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Rating/Update.cshtml diff --git a/BeautySalonView/ClientWebApp/APIClient.cs b/BeautySalonView/ClientWebApp/APIClient.cs new file mode 100644 index 0000000..f46ca64 --- /dev/null +++ b/BeautySalonView/ClientWebApp/APIClient.cs @@ -0,0 +1,68 @@ +using BeautySalonContracts.ViewModels; +using Newtonsoft.Json; +using System.Net.Http.Headers; +using System.Text; + +namespace BeutySalonClientApp +{ + public 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; + Console.WriteLine(requestUrl); + 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); + } + } + + public static O? PostRequestWithResult(string requestUrl, I 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) + { + return JsonConvert.DeserializeObject(result); + } + else + { + return default; + } + } + } +} diff --git a/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml new file mode 100644 index 0000000..57576f8 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml @@ -0,0 +1,19 @@ +@{ + ViewData["Title"] = "Вход"; +} + +

Вход в приложение

+ +
+
+ + +
+
+ + +
+ +
\ No newline at end of file diff --git a/BeautySalonView/ClientWebApp/Views/Home/Evaluation.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Evaluation.cshtml index 01893b1..d219f55 100644 --- a/BeautySalonView/ClientWebApp/Views/Home/Evaluation.cshtml +++ b/BeautySalonView/ClientWebApp/Views/Home/Evaluation.cshtml @@ -29,7 +29,7 @@ - @foreach (var item in ViewBag.Evaluation) + @foreach (var item in ViewBag.Rating) { @item.PointsProcedure diff --git a/BeautySalonView/ClientWebApp/Views/Home/FormationOrder.cshtml b/BeautySalonView/ClientWebApp/Views/Home/FormationOrder.cshtml index 06e7953..ba03400 100644 --- a/BeautySalonView/ClientWebApp/Views/Home/FormationOrder.cshtml +++ b/BeautySalonView/ClientWebApp/Views/Home/FormationOrder.cshtml @@ -1,4 +1,5 @@ -@{ + +@{ ViewData["Title"] = "FormationDinner"; } diff --git a/BeautySalonView/ClientWebApp/Views/Home/Index.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Index.cshtml index d2d19bd..f2ce623 100644 --- a/BeautySalonView/ClientWebApp/Views/Home/Index.cshtml +++ b/BeautySalonView/ClientWebApp/Views/Home/Index.cshtml @@ -1,8 +1,8 @@ @{ - ViewData["Title"] = "Home Page"; + ViewData["Title"] = "HomePage"; } +

Мы Вас не ждали, зло пожаловать!

-

Welcome

-

Learn about building Web apps with ASP.NET Core.

-
+

Logo

+ \ No newline at end of file diff --git a/BeautySalonView/ClientWebApp/Views/Home/Privacy.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Privacy.cshtml deleted file mode 100644 index af4fb19..0000000 --- a/BeautySalonView/ClientWebApp/Views/Home/Privacy.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewData["Title"] = "Privacy Policy"; -} -

@ViewData["Title"]

- -

Use this page to detail your site's privacy policy.

diff --git a/BeautySalonView/ClientWebApp/Views/Home/Register.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Register.cshtml new file mode 100644 index 0000000..87f3b84 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Home/Register.cshtml @@ -0,0 +1,25 @@ +@{ + ViewData["Title"] = "Регистрация"; +} + +

Регистрация

+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
diff --git a/BeautySalonView/ClientWebApp/Views/Order/Create.cshtml b/BeautySalonView/ClientWebApp/Views/Order/Create.cshtml new file mode 100644 index 0000000..7cddaad --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Order/Create.cshtml @@ -0,0 +1,75 @@ +@{ + ViewData["Title"] = "Заказ"; +} + +

Создать заказ

+ +

Выбранные услуги:

+
+ + + + + + + + + + + + + + + + + +
НазваниеСтоимостьКоличество
Не выбрано
+
+ +

Добавить услугу:

+

Наименование:

+ +

Количество:

+ + + +

Выбранные процедуры:

+
+ + + + + + + + + + + + + + + + + +
НазваниеСтоимостьКоличество
Не выбрано
+
+ +

Привязать процедуру:

+

Наименование:

+ +

Количество:

+ + + +

Стоимость заказа:

+ + + + diff --git a/BeautySalonView/ClientWebApp/Views/Order/Update.cshtml b/BeautySalonView/ClientWebApp/Views/Order/Update.cshtml new file mode 100644 index 0000000..e3e7755 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Order/Update.cshtml @@ -0,0 +1,77 @@ +@{ + ViewData["Title"] = "Заказ"; +} + +

Обновить заказ

+ +

Выбранные услуги:

+
+ + + + + + + + + + + + + + + + + +
НазваниеСтоимостьКоличество
Не выбрано
+
+ +

Добавить услугу:

+

Наименование:

+ +

Количество:

+ + + +

Выбранные процедуры:

+
+ + + + + + + + + + + + + + + + + +
НазваниеСтоимостьКоличество
Не выбрано
+
+ +

Добавить процедуру:

+

Наименование:

+ +

Количество:

+ + + +

Стоимость заказа:

+ + + + + + diff --git a/BeautySalonView/ClientWebApp/Views/Procedure/Create.cshtml b/BeautySalonView/ClientWebApp/Views/Procedure/Create.cshtml new file mode 100644 index 0000000..31f95a2 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Procedure/Create.cshtml @@ -0,0 +1,49 @@ +@{ + ViewData["Title"] = "Процедура"; +} + +

Создать процедуру

+ +

Название процедуры:

+ + +

Выбранная косметика:

+
+ + + + + + + + + + + + + + + + + + + +
БрендНаименование косметикиСтоимостьКоличество
Не выбрано
+
+ +

Добавить косметику:

+

Наименование:

+ +

Количество:

+ + + +

Стоимость процедуры:

+ + + + diff --git a/BeautySalonView/ClientWebApp/Views/Procedure/Update.cshtml b/BeautySalonView/ClientWebApp/Views/Procedure/Update.cshtml new file mode 100644 index 0000000..9459926 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Procedure/Update.cshtml @@ -0,0 +1,51 @@ +@{ + ViewData["Title"] = "Процедура"; +} + +

Обновить процедуру

+ +

Название процедуры:

+ + +

Выбранная косметика:

+
+ + + + + + + + + + + + + + + + + + + +
БрендНаименование косметикиСтоимостьКоличество
Не выбрано
+
+ +

Добавить косметику:

+

Наименование:

+ +

Количество:

+ + + +

Стоимость процедуры:

+ + + + + + diff --git a/BeautySalonView/ClientWebApp/Views/Rating/Create.cshtml b/BeautySalonView/ClientWebApp/Views/Rating/Create.cshtml new file mode 100644 index 0000000..fab79d7 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Rating/Create.cshtml @@ -0,0 +1,25 @@ +@{ + ViewData["Title"] = "Оценка"; +} + +

Создать оценку

+ +
+

Баллы за процедуру:

+ +

Баллы за косметику:

+ +

Процедура:

+ + +
+ diff --git a/BeautySalonView/ClientWebApp/Views/Rating/Update.cshtml b/BeautySalonView/ClientWebApp/Views/Rating/Update.cshtml new file mode 100644 index 0000000..955aac5 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Rating/Update.cshtml @@ -0,0 +1,38 @@ +@{ + ViewData["Title"] = "Оценка"; +} + +

Обновить оценку

+ +
+ +

Баллы за процедуру:

+ +

Баллы за косметику:

+ +

Процедура:

+ + +
+ + \ No newline at end of file diff --git a/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml b/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml index a1a4eb5..c28d453 100644 --- a/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml +++ b/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml @@ -3,16 +3,22 @@ - @ViewData["Title"] - ClientWebApp + @ViewData["Title"] - BeutySalonClientApp - +