From bf46dca2e54691d8d8b87c1980b26083306f9535 Mon Sep 17 00:00:00 2001 From: Allllen4a Date: Thu, 30 May 2024 01:01:12 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=B7?= =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20=D0=BF=D0=B0=D0=BF=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ClientWebApp/Models/ErrorViewModel.cs | 9 +++ .../ClientWebApp/Views/Home/Enter.cshtml | 30 ++++---- .../Views/Home/FormationOrder.cshtml | 1 - .../ClientWebApp/Views/Home/Index.cshtml | 8 ++ .../ClientWebApp/Views/Home/Order.cshtml | 53 +++++++++++++ .../ClientWebApp/Views/Home/Procedure.cshtml | 51 ++++++++++++ .../Home/{Evaluation.cshtml => Rating.cshtml} | 0 .../ClientWebApp/Views/Home/Register.cshtml | 25 ++++++ .../ClientWebApp/Views/Home/Report.cshtml | 45 +++++++++++ .../Views/Home/ServiceList.cshtml | 52 +++++++++++++ .../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/Error.cshtml | 25 ++++++ .../ClientWebApp/Views/Shared/_Layout.cshtml | 70 +++++++++++++++++ .../Views/Shared/_Layout.cshtml.css | 48 ++++++++++++ .../Shared/_ValidationScriptsPartial.cshtml | 2 + .../ClientWebApp/Views/_ViewImports.cshtml | 3 + .../ClientWebApp/Views/_ViewStart.cshtml | 3 + .../ClientWebApp/WorkerWebApp.csproj | 2 - .../Controllers/HomeController.cs | 2 +- .../Models/ErrorViewModel.cs | 9 +++ .../StorekeeperWebApp.csproj | 25 +++++- .../Views/Cosmetic/Create.cshtml | 17 ++++ .../Views/Cosmetic/Update.cshtml | 18 +++++ .../Views/Home/Cosmetic.cshtml | 53 +++++++++++++ .../StaffMemberWebApp/Views/Home/Enter.cshtml | 19 +++++ .../StaffMemberWebApp/Views/Home/Index.cshtml | 8 ++ .../Views/Home/LaborCosts.cshtml | 51 ++++++++++++ .../Views/Home/ListCosmetics.cshtml | 52 +++++++++++++ .../Views/Home/Register.cshtml | 25 ++++++ .../Views/Home/Report.cshtml | 48 ++++++++++++ .../Views/Home/Service.cshtml | 55 +++++++++++++ .../Views/LaborCosts/Create.cshtml | 15 ++++ .../Views/LaborCosts/Update.cshtml | 16 ++++ .../Views/Service/Bind.cshtml | 52 +++++++++++++ .../Views/Service/Create.cshtml | 24 ++++++ .../Views/Service/Update.cshtml | 36 +++++++++ .../Views/Shared/Error.cshtml | 25 ++++++ .../Views/Shared/_Layout.cshtml | 70 +++++++++++++++++ .../Views/Shared/_Layout.cshtml.css | 48 ++++++++++++ .../Shared/_ValidationScriptsPartial.cshtml | 2 + .../Views/_ViewImports.cshtml | 3 + .../StaffMemberWebApp/Views/_ViewStart.cshtml | 3 + 47 files changed, 1396 insertions(+), 22 deletions(-) create mode 100644 BeautySalonView/ClientWebApp/Models/ErrorViewModel.cs create mode 100644 BeautySalonView/ClientWebApp/Views/Home/Index.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Home/Order.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Home/Procedure.cshtml rename BeautySalonView/ClientWebApp/Views/Home/{Evaluation.cshtml => Rating.cshtml} (100%) create mode 100644 BeautySalonView/ClientWebApp/Views/Home/Register.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Home/Report.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Home/ServiceList.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 create mode 100644 BeautySalonView/ClientWebApp/Views/Shared/Error.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml.css create mode 100644 BeautySalonView/ClientWebApp/Views/Shared/_ValidationScriptsPartial.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/_ViewImports.cshtml create mode 100644 BeautySalonView/ClientWebApp/Views/_ViewStart.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Models/ErrorViewModel.cs create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Cosmetic/Create.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Cosmetic/Update.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Home/Cosmetic.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Home/Enter.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Home/Index.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Home/LaborCosts.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Home/ListCosmetics.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Home/Register.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Home/Report.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Home/Service.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/LaborCosts/Create.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/LaborCosts/Update.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Service/Bind.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Service/Create.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Service/Update.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Shared/Error.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Shared/_Layout.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Shared/_Layout.cshtml.css create mode 100644 BeautySalonView/StaffMemberWebApp/Views/Shared/_ValidationScriptsPartial.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/_ViewImports.cshtml create mode 100644 BeautySalonView/StaffMemberWebApp/Views/_ViewStart.cshtml diff --git a/BeautySalonView/ClientWebApp/Models/ErrorViewModel.cs b/BeautySalonView/ClientWebApp/Models/ErrorViewModel.cs new file mode 100644 index 0000000..5a48625 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Models/ErrorViewModel.cs @@ -0,0 +1,9 @@ +namespace BeutySalonClientApp.Models +{ + public class ErrorViewModel + { + public string? RequestId { get; set; } + + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + } +} \ No newline at end of file diff --git a/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml index 106d3d5..57576f8 100644 --- a/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml +++ b/BeautySalonView/ClientWebApp/Views/Home/Enter.cshtml @@ -1,21 +1,19 @@ @{ - ViewData["Title"] = "Enter"; + ViewData["Title"] = "Вход"; } -
-

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

-
+

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

+
-
-
Логин:
-
-
-
-
Пароль:
-
-
-
-
-
-
+
+ + +
+
+ + +
+
\ No newline at end of file diff --git a/BeautySalonView/ClientWebApp/Views/Home/FormationOrder.cshtml b/BeautySalonView/ClientWebApp/Views/Home/FormationOrder.cshtml index 50b840b..ba03400 100644 --- a/BeautySalonView/ClientWebApp/Views/Home/FormationOrder.cshtml +++ b/BeautySalonView/ClientWebApp/Views/Home/FormationOrder.cshtml @@ -36,7 +36,6 @@ @foreach (var item in Model) { - } diff --git a/BeautySalonView/ClientWebApp/Views/Home/Index.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Index.cshtml new file mode 100644 index 0000000..445ad23 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Home/Index.cshtml @@ -0,0 +1,8 @@ +@{ + ViewData["Title"] = "HomePage"; +} +

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

+ +
+

Logo

+
\ No newline at end of file diff --git a/BeautySalonView/ClientWebApp/Views/Home/Order.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Order.cshtml new file mode 100644 index 0000000..b571e83 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Home/Order.cshtml @@ -0,0 +1,53 @@ +@using BeautySalonContracts.ViewModels + +@{ + ViewData["Title"] = "Заказы"; +} + +

Заказы

+ +
+
+ + Создать + + + Обновить + + +
+
+
+ + / @ViewBag.NumberOfPages +
+ + Перейти + +
+
+
+ + + + + + + + + + @foreach (var item in ViewBag.Order) + { + + + + + + } + +
Номер заказаДата заказаСумма заказа
@item.Id@item.OrderDate@item.OrderAmount
+
+ + diff --git a/BeautySalonView/ClientWebApp/Views/Home/Procedure.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Procedure.cshtml new file mode 100644 index 0000000..29d8192 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Home/Procedure.cshtml @@ -0,0 +1,51 @@ +@using BeautySalonContracts.ViewModels + +@{ + ViewData["Title"] = "Процедуры"; +} + +

Процедуры

+ +
+
+ + Создать + + + Обновить + + +
+
+
+ + / @ViewBag.NumberOfPages +
+ + Перейти + +
+
+
+ + + + + + + + + @foreach (var item in ViewBag.Procedure) + { + + + + + } + +
Наименование процедурыЦена процедуры
@item.ProcedureName@item.ProcedurePrice
+
+ + diff --git a/BeautySalonView/ClientWebApp/Views/Home/Evaluation.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Rating.cshtml similarity index 100% rename from BeautySalonView/ClientWebApp/Views/Home/Evaluation.cshtml rename to BeautySalonView/ClientWebApp/Views/Home/Rating.cshtml 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/Home/Report.cshtml b/BeautySalonView/ClientWebApp/Views/Home/Report.cshtml new file mode 100644 index 0000000..8071daf --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Home/Report.cshtml @@ -0,0 +1,45 @@ +@{ + ViewData["Title"] = "Report"; +} + +

Отчет по услугам

+ +
+
+

Дата начала:

+ +
+
+

Дата конца:

+ +
+ + +
+ +

+ За период с  + ... +  по  + ... +

+
+ + + + + + + + + + + +
Номер заказаДатаУслугиОценки
+
+ + diff --git a/BeautySalonView/ClientWebApp/Views/Home/ServiceList.cshtml b/BeautySalonView/ClientWebApp/Views/Home/ServiceList.cshtml new file mode 100644 index 0000000..45ff04c --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Home/ServiceList.cshtml @@ -0,0 +1,52 @@ +@{ + ViewData["Title"] = "Список услуг по заказам"; +} + +

Список услуг по заказам

+ +@{ + if (ViewBag.IsAllowed == false) + { +

Авторизируйтесь

+ return; + } + +
+ + +
+ +

Выбранные заказы:

+
+ + + + + + + + + + + + + + + +
ДатаСумма
Не выбрано
+
+ +

Добавить заказ:

+
+ + +
+ + +} 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/Error.cshtml b/BeautySalonView/ClientWebApp/Views/Shared/Error.cshtml new file mode 100644 index 0000000..a1e0478 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Shared/Error.cshtml @@ -0,0 +1,25 @@ +@model ErrorViewModel +@{ + ViewData["Title"] = "Error"; +} + +

Error.

+

An error occurred while processing your request.

+ +@if (Model.ShowRequestId) +{ +

+ Request ID: @Model.RequestId +

+} + +

Development Mode

+

+ Swapping to Development environment will display more detailed information about the error that occurred. +

+

+ The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app. +

diff --git a/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml b/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml new file mode 100644 index 0000000..c28d453 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml @@ -0,0 +1,70 @@ + + + + + + @ViewData["Title"] - BeutySalonClientApp + + + + + +
+ +
+
+
+ @RenderBody() +
+
+ + + + + + @await RenderSectionAsync("Scripts", required: false) + + diff --git a/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml.css b/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml.css new file mode 100644 index 0000000..a72cbea --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Shared/_Layout.cshtml.css @@ -0,0 +1,48 @@ +/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification +for details on configuring this project to bundle and minify static web assets. */ + +a.navbar-brand { + white-space: normal; + text-align: center; + word-break: break-all; +} + +a { + color: #0077cc; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.nav-pills .nav-link.active, .nav-pills .show > .nav-link { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.border-top { + border-top: 1px solid #e5e5e5; +} +.border-bottom { + border-bottom: 1px solid #e5e5e5; +} + +.box-shadow { + box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); +} + +button.accept-policy { + font-size: 1rem; + line-height: inherit; +} + +.footer { + position: absolute; + bottom: 0; + width: 100%; + white-space: nowrap; + line-height: 60px; +} diff --git a/BeautySalonView/ClientWebApp/Views/Shared/_ValidationScriptsPartial.cshtml b/BeautySalonView/ClientWebApp/Views/Shared/_ValidationScriptsPartial.cshtml new file mode 100644 index 0000000..5a16d80 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/Shared/_ValidationScriptsPartial.cshtml @@ -0,0 +1,2 @@ + + diff --git a/BeautySalonView/ClientWebApp/Views/_ViewImports.cshtml b/BeautySalonView/ClientWebApp/Views/_ViewImports.cshtml new file mode 100644 index 0000000..4090c0b --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using BeutySalonClientApp +@using BeutySalonClientApp.Models +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/BeautySalonView/ClientWebApp/Views/_ViewStart.cshtml b/BeautySalonView/ClientWebApp/Views/_ViewStart.cshtml new file mode 100644 index 0000000..a5f1004 --- /dev/null +++ b/BeautySalonView/ClientWebApp/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +} diff --git a/BeautySalonView/ClientWebApp/WorkerWebApp.csproj b/BeautySalonView/ClientWebApp/WorkerWebApp.csproj index 9000dc2..fa176ff 100644 --- a/BeautySalonView/ClientWebApp/WorkerWebApp.csproj +++ b/BeautySalonView/ClientWebApp/WorkerWebApp.csproj @@ -16,8 +16,6 @@ - - diff --git a/BeautySalonView/StaffMemberWebApp/Controllers/HomeController.cs b/BeautySalonView/StaffMemberWebApp/Controllers/HomeController.cs index fd137a1..ade95da 100644 --- a/BeautySalonView/StaffMemberWebApp/Controllers/HomeController.cs +++ b/BeautySalonView/StaffMemberWebApp/Controllers/HomeController.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Mvc; using StorekeeperWebApp.Models; using System.Diagnostics; -namespace SStorekeeperWebApp.Controllers +namespace StorekeeperWebApp.Controllers { public class HomeController : Controller { diff --git a/BeautySalonView/StaffMemberWebApp/Models/ErrorViewModel.cs b/BeautySalonView/StaffMemberWebApp/Models/ErrorViewModel.cs new file mode 100644 index 0000000..2390e8e --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Models/ErrorViewModel.cs @@ -0,0 +1,9 @@ +namespace BeutySalonStaffMemberApp.Models +{ + public class ErrorViewModel + { + public string? RequestId { get; set; } + + public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); + } +} \ No newline at end of file diff --git a/BeautySalonView/StaffMemberWebApp/StorekeeperWebApp.csproj b/BeautySalonView/StaffMemberWebApp/StorekeeperWebApp.csproj index 23a0a35..9227e4c 100644 --- a/BeautySalonView/StaffMemberWebApp/StorekeeperWebApp.csproj +++ b/BeautySalonView/StaffMemberWebApp/StorekeeperWebApp.csproj @@ -16,8 +16,29 @@ - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BeautySalonView/StaffMemberWebApp/Views/Cosmetic/Create.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Cosmetic/Create.cshtml new file mode 100644 index 0000000..5674a93 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Cosmetic/Create.cshtml @@ -0,0 +1,17 @@ +@{ + ViewData["Title"] = "Косметика"; +} + +

Создать косметику

+ +
+

Бренд:

+ +

Наименование косметики:

+ +

Стоимость:

+ + +
diff --git a/BeautySalonView/StaffMemberWebApp/Views/Cosmetic/Update.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Cosmetic/Update.cshtml new file mode 100644 index 0000000..a0a2756 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Cosmetic/Update.cshtml @@ -0,0 +1,18 @@ +@{ + ViewData["Title"] = "Косметика"; +} + +

Обновить косметику

+ +
+ +

Бренд:

+ +

Наименование косметики:

+ +

Стоимость:

+ + +
\ No newline at end of file diff --git a/BeautySalonView/StaffMemberWebApp/Views/Home/Cosmetic.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Home/Cosmetic.cshtml new file mode 100644 index 0000000..a7ac323 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Home/Cosmetic.cshtml @@ -0,0 +1,53 @@ +@using BeautySalonContracts.ViewModels + +@{ + ViewData["Title"] = "Косметика"; +} + +

Косметика

+ +
+
+ + Создать + + + +
+
+
+ + / @ViewBag.NumberOfPages +
+ + Перейти + +
+
+
+ + + + + + + + + + @foreach (var item in ViewBag.Cosmetic) + { + + + + + + } + +
БрендНаименование косметикиСтоимость
@item.Brand@item.CosmeticName@item.CosmeticPrice
+
+ + \ No newline at end of file diff --git a/BeautySalonView/StaffMemberWebApp/Views/Home/Enter.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Home/Enter.cshtml new file mode 100644 index 0000000..57576f8 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Home/Enter.cshtml @@ -0,0 +1,19 @@ +@{ + ViewData["Title"] = "Вход"; +} + +

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

+ +
+
+ + +
+
+ + +
+ +
\ No newline at end of file diff --git a/BeautySalonView/StaffMemberWebApp/Views/Home/Index.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Home/Index.cshtml new file mode 100644 index 0000000..29418f1 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Home/Index.cshtml @@ -0,0 +1,8 @@ +@{ + ViewData["Title"] = "HomePage"; +} +

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

+ +
+

Logo

+
\ No newline at end of file diff --git a/BeautySalonView/StaffMemberWebApp/Views/Home/LaborCosts.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Home/LaborCosts.cshtml new file mode 100644 index 0000000..880e0d2 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Home/LaborCosts.cshtml @@ -0,0 +1,51 @@ +@using BeautySalonContracts.ViewModels + +@{ + ViewData["Title"] = "Трудозатраты"; +} + +

Трудозатраты

+ +
+
+ + Создать + + + Обновить + + +
+
+
+ + / @ViewBag.NumberOfPages +
+ + Перейти + +
+
+
+ + + + + + + + + @foreach (var item in ViewBag.LaborCosts) + { + + + + + } + +
Количество часовКоличество специалистов
@item.NumberHours@item.NumberSpecialists
+
+ + diff --git a/BeautySalonView/StaffMemberWebApp/Views/Home/ListCosmetics.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Home/ListCosmetics.cshtml new file mode 100644 index 0000000..cfa9a27 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Home/ListCosmetics.cshtml @@ -0,0 +1,52 @@ +@{ + ViewData["Title"] = "Список косметики по процедурам"; +} + +

Список косметики по процедурам

+ +@{ + if (ViewBag.IsAllowed == false) + { +

Авторизируйтесь

+ return; + } + +
+ + +
+ +

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

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

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

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

Регистрация

+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
diff --git a/BeautySalonView/StaffMemberWebApp/Views/Home/Report.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Home/Report.cshtml new file mode 100644 index 0000000..64adb4c --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Home/Report.cshtml @@ -0,0 +1,48 @@ +@{ + ViewData["Title"] = "Report"; +} + +

Отчет по услугам

+ +
+
+

Дата начала:

+ +
+
+

Дата конца:

+ +
+ + +
+ +

+ За период с  + ... +  по  + ... +

+
+ + + + + + + + + + + + + + +
Дата созданияУслугаСтоимостьБренд косметикиНаименованиеСтоимость косметикиПроцедуры
+
+ + diff --git a/BeautySalonView/StaffMemberWebApp/Views/Home/Service.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Home/Service.cshtml new file mode 100644 index 0000000..28cdbd8 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Home/Service.cshtml @@ -0,0 +1,55 @@ +@using BeautySalonContracts.ViewModels + +@{ + ViewData["Title"] = "Услуга"; +} + +

Услуги

+ +
+
+ + Создать + + + Обновить + + + Связать с косметикой + + +
+
+
+ + / @ViewBag.NumberOfPages +
+ + Перейти + +
+
+
+ + + + + + + + + + @foreach (var item in ViewBag.Service) + { + + + + + + } + +
НаименованиеСтоимостьДата создания
@item.ServiceName@item.ServicePrice@item.DateCreate
+
+ \ No newline at end of file diff --git a/BeautySalonView/StaffMemberWebApp/Views/LaborCosts/Create.cshtml b/BeautySalonView/StaffMemberWebApp/Views/LaborCosts/Create.cshtml new file mode 100644 index 0000000..94c11ae --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/LaborCosts/Create.cshtml @@ -0,0 +1,15 @@ +@{ + ViewData["Title"] = "Трудозатраты"; +} + +

Создать трудозатрату

+ +
+

Количество часов:

+ +

Количество специалистов:

+ + +
diff --git a/BeautySalonView/StaffMemberWebApp/Views/LaborCosts/Update.cshtml b/BeautySalonView/StaffMemberWebApp/Views/LaborCosts/Update.cshtml new file mode 100644 index 0000000..1881fb4 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/LaborCosts/Update.cshtml @@ -0,0 +1,16 @@ +@{ + ViewData["Title"] = "Трудозатраты"; +} + +

Обновить трудозатраты

+ +
+ +

Количество часов:

+ +

Количество специалистов:

+ + +
diff --git a/BeautySalonView/StaffMemberWebApp/Views/Service/Bind.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Service/Bind.cshtml new file mode 100644 index 0000000..c93e2a3 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Service/Bind.cshtml @@ -0,0 +1,52 @@ +@{ + ViewData["Title"] = "Binding"; +} + +

Связать услугу с косметикой

+ +

+ Id услуги:  + @ViewBag.ServiceId +

+

+ Наименование услуги:  + +

+

Привязанная косметика:

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

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

+

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

+ +

Количество:

+ + + + + + diff --git a/BeautySalonView/StaffMemberWebApp/Views/Service/Create.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Service/Create.cshtml new file mode 100644 index 0000000..0c70bda --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Service/Create.cshtml @@ -0,0 +1,24 @@ +@{ + ViewData["Title"] = "Услуги"; +} + +

Создать услугу

+ +
+

Наименование услуги:

+ +

Стоимость услуги:

+ +

Выбрать трудозатрату для привязки:

+ + +
diff --git a/BeautySalonView/StaffMemberWebApp/Views/Service/Update.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Service/Update.cshtml new file mode 100644 index 0000000..bb82de3 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Service/Update.cshtml @@ -0,0 +1,36 @@ +@{ + ViewData["Title"] = "Услуга"; +} + +

Обновить услугу

+ +
+ +

Наименование услуги:

+ +

Стоимость услуги:

+ +

Трудозатраты:

+ + +
+ diff --git a/BeautySalonView/StaffMemberWebApp/Views/Shared/Error.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Shared/Error.cshtml new file mode 100644 index 0000000..a1e0478 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Shared/Error.cshtml @@ -0,0 +1,25 @@ +@model ErrorViewModel +@{ + ViewData["Title"] = "Error"; +} + +

Error.

+

An error occurred while processing your request.

+ +@if (Model.ShowRequestId) +{ +

+ Request ID: @Model.RequestId +

+} + +

Development Mode

+

+ Swapping to Development environment will display more detailed information about the error that occurred. +

+

+ The Development environment shouldn't be enabled for deployed applications. + It can result in displaying sensitive information from exceptions to end users. + For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development + and restarting the app. +

diff --git a/BeautySalonView/StaffMemberWebApp/Views/Shared/_Layout.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Shared/_Layout.cshtml new file mode 100644 index 0000000..5f32ec4 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Shared/_Layout.cshtml @@ -0,0 +1,70 @@ + + + + + + @ViewData["Title"] - BeutySalonStaffMemberApp + + + + + +
+ +
+
+
+ @RenderBody() +
+
+ + + + + + @await RenderSectionAsync("Scripts", required: false) + + diff --git a/BeautySalonView/StaffMemberWebApp/Views/Shared/_Layout.cshtml.css b/BeautySalonView/StaffMemberWebApp/Views/Shared/_Layout.cshtml.css new file mode 100644 index 0000000..a72cbea --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Shared/_Layout.cshtml.css @@ -0,0 +1,48 @@ +/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification +for details on configuring this project to bundle and minify static web assets. */ + +a.navbar-brand { + white-space: normal; + text-align: center; + word-break: break-all; +} + +a { + color: #0077cc; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.nav-pills .nav-link.active, .nav-pills .show > .nav-link { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} + +.border-top { + border-top: 1px solid #e5e5e5; +} +.border-bottom { + border-bottom: 1px solid #e5e5e5; +} + +.box-shadow { + box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); +} + +button.accept-policy { + font-size: 1rem; + line-height: inherit; +} + +.footer { + position: absolute; + bottom: 0; + width: 100%; + white-space: nowrap; + line-height: 60px; +} diff --git a/BeautySalonView/StaffMemberWebApp/Views/Shared/_ValidationScriptsPartial.cshtml b/BeautySalonView/StaffMemberWebApp/Views/Shared/_ValidationScriptsPartial.cshtml new file mode 100644 index 0000000..5a16d80 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/Shared/_ValidationScriptsPartial.cshtml @@ -0,0 +1,2 @@ + + diff --git a/BeautySalonView/StaffMemberWebApp/Views/_ViewImports.cshtml b/BeautySalonView/StaffMemberWebApp/Views/_ViewImports.cshtml new file mode 100644 index 0000000..15ad9c7 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/_ViewImports.cshtml @@ -0,0 +1,3 @@ +@using BeutySalonStaffMemberApp +@using BeutySalonStaffMemberApp.Models +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/BeautySalonView/StaffMemberWebApp/Views/_ViewStart.cshtml b/BeautySalonView/StaffMemberWebApp/Views/_ViewStart.cshtml new file mode 100644 index 0000000..a5f1004 --- /dev/null +++ b/BeautySalonView/StaffMemberWebApp/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +}