From 2948322ba98e8dc878f18ec91def4cfa2ae3fa89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B0=D1=82=D1=8F=20=D0=98=D1=85=D0=BE=D0=BD=D0=BA?= =?UTF-8?q?=D0=B8=D0=BD=D0=B0?= Date: Sat, 8 Apr 2023 23:10:36 +0400 Subject: [PATCH] fix --- .../Controllers/HomeController.cs | 28 +++++++++ .../{Excursion => }/CreateExcursion.cshtml | 2 +- .../Views/Home/{Guide => }/CreateGuide.cshtml | 2 +- .../Views/Home/{Place => }/CreatePlace.cshtml | 2 +- .../Views/Home/{Tour => }/CreateTour.cshtml | 2 +- ...CreatePlace.cshtml => CreateTravel.cshtml} | 4 +- .../Views/Home/Enter.cshtml | 23 +++++++ .../Home/{Excursion => }/Excursion.cshtml | 2 +- .../Views/Home/{Guide => }/Guide.cshtml | 2 +- .../Views/Home/{Travel => }/Index.cshtml | 2 +- .../Views/Home/{Place => }/Place.cshtml | 2 +- .../Views/Home/Privacy.cshtml | 60 +++++++++++++++++++ .../Views/Home/Register.cshtml | 50 ++++++++++++++++ .../Views/Home/Report.cshtml | 6 +- .../Views/Home/{Tour => }/Tour.cshtml | 4 +- .../{Excursion => }/UpdateExcursion.cshtml | 2 +- .../Views/Home/{Place => }/UpdatePlace.cshtml | 4 +- ...UpdatePlace.cshtml => UpdateTravel.cshtml} | 2 +- .../Views/Home/User/Enter.cshtml | 21 ------- .../Views/Home/User/Privacy.cshtml | 24 -------- .../Views/Home/User/Register.cshtml | 42 ------------- 21 files changed, 180 insertions(+), 106 deletions(-) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Excursion => }/CreateExcursion.cshtml (98%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Guide => }/CreateGuide.cshtml (94%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Place => }/CreatePlace.cshtml (95%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Tour => }/CreateTour.cshtml (91%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Travel/CreatePlace.cshtml => CreateTravel.cshtml} (94%) create mode 100644 TravelCompany/TravelCompanyClientApp/Views/Home/Enter.cshtml rename TravelCompany/TravelCompanyClientApp/Views/Home/{Excursion => }/Excursion.cshtml (98%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Guide => }/Guide.cshtml (97%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Travel => }/Index.cshtml (98%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Place => }/Place.cshtml (97%) create mode 100644 TravelCompany/TravelCompanyClientApp/Views/Home/Privacy.cshtml create mode 100644 TravelCompany/TravelCompanyClientApp/Views/Home/Register.cshtml rename TravelCompany/TravelCompanyClientApp/Views/Home/{Tour => }/Tour.cshtml (94%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Excursion => }/UpdateExcursion.cshtml (97%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Place => }/UpdatePlace.cshtml (92%) rename TravelCompany/TravelCompanyClientApp/Views/Home/{Travel/UpdatePlace.cshtml => UpdateTravel.cshtml} (96%) delete mode 100644 TravelCompany/TravelCompanyClientApp/Views/Home/User/Enter.cshtml delete mode 100644 TravelCompany/TravelCompanyClientApp/Views/Home/User/Privacy.cshtml delete mode 100644 TravelCompany/TravelCompanyClientApp/Views/Home/User/Register.cshtml diff --git a/TravelCompany/TravelCompanyClientApp/Controllers/HomeController.cs b/TravelCompany/TravelCompanyClientApp/Controllers/HomeController.cs index 4958948..c63d7bc 100644 --- a/TravelCompany/TravelCompanyClientApp/Controllers/HomeController.cs +++ b/TravelCompany/TravelCompanyClientApp/Controllers/HomeController.cs @@ -22,6 +22,34 @@ namespace TravelCompanyClientApp.Controllers { return View(); } + public IActionResult Tour() + { + return View(); + } + public IActionResult Guide() + { + return View(); + } + public IActionResult Excursion() + { + return View(); + } + public IActionResult Place() + { + return View(); + } + public IActionResult Enter() + { + return View(); + } + public IActionResult Report() + { + return View(); + } + public IActionResult Register() + { + return View(); + } [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public IActionResult Error() diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Excursion/CreateExcursion.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/CreateExcursion.cshtml similarity index 98% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Excursion/CreateExcursion.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/CreateExcursion.cshtml index 1616379..352face 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Excursion/CreateExcursion.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/CreateExcursion.cshtml @@ -4,7 +4,7 @@

Создание экскурсии

-
+
Путешествия:
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Guide/CreateGuide.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/CreateGuide.cshtml similarity index 94% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Guide/CreateGuide.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/CreateGuide.cshtml index 95e16d2..f2ad3cf 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Guide/CreateGuide.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/CreateGuide.cshtml @@ -4,7 +4,7 @@

Создание гида

- +
Фамилия:
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Place/CreatePlace.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/CreatePlace.cshtml similarity index 95% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Place/CreatePlace.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/CreatePlace.cshtml index d954c0c..dc9f191 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Place/CreatePlace.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/CreatePlace.cshtml @@ -4,7 +4,7 @@

Создание места

- +
Экскурсия:
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Tour/CreateTour.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/CreateTour.cshtml similarity index 91% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Tour/CreateTour.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/CreateTour.cshtml index 040344a..eaebfdb 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Tour/CreateTour.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/CreateTour.cshtml @@ -4,7 +4,7 @@

Создание тура

- +
Название:
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Travel/CreatePlace.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/CreateTravel.cshtml similarity index 94% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Travel/CreatePlace.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/CreateTravel.cshtml index 76c328e..e25b806 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Travel/CreatePlace.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/CreateTravel.cshtml @@ -4,7 +4,7 @@

Создание путешествия

- +
Туры:
@@ -23,7 +23,7 @@
Дата начала:
-
+
Описание:
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Enter.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/Enter.cshtml new file mode 100644 index 0000000..b79e221 --- /dev/null +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/Enter.cshtml @@ -0,0 +1,23 @@ +@{ + ViewData["Title"] = "Enter"; +} + +
+

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

+
+ +
+
+
Логин:
+
+
+
+
+
Пароль:
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Excursion/Excursion.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/Excursion.cshtml similarity index 98% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Excursion/Excursion.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/Excursion.cshtml index aad16f9..18effd1 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Excursion/Excursion.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/Excursion.cshtml @@ -11,7 +11,7 @@
-
+
@{ if (Model == null) { diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Guide/Guide.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/Guide.cshtml similarity index 97% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Guide/Guide.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/Guide.cshtml index e0e3ef2..8edd5cf 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Guide/Guide.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/Guide.cshtml @@ -11,7 +11,7 @@
-
+
@{ if (Model == null) { diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Travel/Index.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/Index.cshtml similarity index 98% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Travel/Index.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/Index.cshtml index 774ac27..43502ea 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Travel/Index.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/Index.cshtml @@ -11,7 +11,7 @@
-
+
@{ if (Model == null) { diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Place/Place.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/Place.cshtml similarity index 97% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Place/Place.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/Place.cshtml index 3fc5615..ca0db11 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Place/Place.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/Place.cshtml @@ -11,7 +11,7 @@
-
+
@{ if (Model == null) { diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Privacy.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/Privacy.cshtml new file mode 100644 index 0000000..258c442 --- /dev/null +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/Privacy.cshtml @@ -0,0 +1,60 @@ +@using TravelCompanyDataModels.Models + +@model IUserModel + +@{ + ViewData["Title"] = "Privacy Policy"; +} +
+

Личные данные

+
+
+ @{ + if (Model == null) + { +

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

+ return; + } +
+
+
+
+
Фамилия:
+
+
+
+
+
Имя:
+
+
+
+
+
Отчество:
+
+
+
+
+
Дата рождения:
+
+
+
+
+
Логин:
+
+
+
+
+
Email:
+
+
+
+
+
Пароль:
+
+
+
+
+
+
+ + } \ No newline at end of file diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Register.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/Register.cshtml new file mode 100644 index 0000000..c2019db --- /dev/null +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/Register.cshtml @@ -0,0 +1,50 @@ +@{ + ViewData["Title"] = "Register"; +} + +
+

Регистрация

+
+
+
+
+
Фамилия:
+
+
+
+
+
Имя:
+
+
+
+
+
Отчество:
+
+
+
+
+
Дата рождения:
+
+
+
+
+
Логин:
+
+
+
+
+
Email:
+
+
+
+
+
Пароль:
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Report.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/Report.cshtml index 9550d27..27e9e06 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Report.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/Report.cshtml @@ -6,12 +6,12 @@ ViewData["Title"] = "Home Page"; } -
-

Туры

+
+

Отчёты

-
+
@{ if (Model == null) { diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Tour/Tour.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/Tour.cshtml similarity index 94% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Tour/Tour.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/Tour.cshtml index 76b24f9..061b5fe 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Tour/Tour.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/Tour.cshtml @@ -11,11 +11,11 @@
-
+
@{ if (Model == null) { -

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

+

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

return; } diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Excursion/UpdateExcursion.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/UpdateExcursion.cshtml similarity index 97% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Excursion/UpdateExcursion.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/UpdateExcursion.cshtml index 6b1d4ac..388e550 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Excursion/UpdateExcursion.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/UpdateExcursion.cshtml @@ -7,7 +7,7 @@

Экскурсия

-
+
Название:
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Place/UpdatePlace.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/UpdatePlace.cshtml similarity index 92% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Place/UpdatePlace.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/UpdatePlace.cshtml index 15105de..10e66a6 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Place/UpdatePlace.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/UpdatePlace.cshtml @@ -4,10 +4,10 @@ @{ ViewData["Title"] = "Privacy Policy"; } -
+

Место

- +
Название:
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/Travel/UpdatePlace.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/UpdateTravel.cshtml similarity index 96% rename from TravelCompany/TravelCompanyClientApp/Views/Home/Travel/UpdatePlace.cshtml rename to TravelCompany/TravelCompanyClientApp/Views/Home/UpdateTravel.cshtml index 991bfab..ed763c0 100644 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/Travel/UpdatePlace.cshtml +++ b/TravelCompany/TravelCompanyClientApp/Views/Home/UpdateTravel.cshtml @@ -8,7 +8,7 @@

Путешествие

- +
Название:
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/User/Enter.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/User/Enter.cshtml deleted file mode 100644 index 7e8a0c7..0000000 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/User/Enter.cshtml +++ /dev/null @@ -1,21 +0,0 @@ -@{ - ViewData["Title"] = "Enter"; -} - -
-

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

-
- -
-
Логин:
-
-
-
-
Пароль:
-
-
-
-
-
-
- \ No newline at end of file diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/User/Privacy.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/User/Privacy.cshtml deleted file mode 100644 index 01ab931..0000000 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/User/Privacy.cshtml +++ /dev/null @@ -1,24 +0,0 @@ -@using TravelCompanyDataModels.Models - -@model IUserModel - -@{ - ViewData["Title"] = "Privacy Policy"; -} -
-

Личные данные

-
-
-
-
Логин:
-
-
-
-
Пароль:
-
-
-
-
-
-
-
\ No newline at end of file diff --git a/TravelCompany/TravelCompanyClientApp/Views/Home/User/Register.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Home/User/Register.cshtml deleted file mode 100644 index 7bae11f..0000000 --- a/TravelCompany/TravelCompanyClientApp/Views/Home/User/Register.cshtml +++ /dev/null @@ -1,42 +0,0 @@ -@{ - ViewData["Title"] = "Register"; -} - -
-

Регистрация

-
-
-
-
Фамилия:
-
-
-
-
Имя:
-
-
-
-
Отчество:
-
-
-
-
Дата рождения:
-
-
-
-
Логин:
-
-
-
-
Email:
-
-
-
-
Пароль:
-
-
-
-
-
-
-
-
\ No newline at end of file