diff --git a/Hotel/HotelAdministratorApp/Controllers/HomeController.cs b/Hotel/HotelAdministratorApp/Controllers/HomeController.cs index 829c064..57d9c78 100644 --- a/Hotel/HotelAdministratorApp/Controllers/HomeController.cs +++ b/Hotel/HotelAdministratorApp/Controllers/HomeController.cs @@ -79,11 +79,27 @@ namespace HotelAdministratorApp.Controllers { return View(); } + public IActionResult CreateConferenceBooking() + { + return View(); + } + public IActionResult UpdateConferenceBooking() + { + return View(); + } + public IActionResult DeleteConferenceBooking() + { + return View(); + } public IActionResult AddDinnerToRoom() { return View(); } - public IActionResult AddNumberToMealPlan() + public IActionResult AddDinnerToConferenceBooking() + { + return View(); + } + public IActionResult AddRoomToMealPlan() { return View(); } diff --git a/Hotel/HotelAdministratorApp/Views/Home/AddDinnerRoomToFiles.cshtml b/Hotel/HotelAdministratorApp/Views/Home/AddDinnerRoomToFiles.cshtml index ea9336f..30b9e81 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/AddDinnerRoomToFiles.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/AddDinnerRoomToFiles.cshtml @@ -2,39 +2,7 @@ ViewData["Title"] = "AddDinnerRoomToFiles"; } - +

Отчет (word/excel)

diff --git a/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToConferenceBooking.cshtml b/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToConferenceBooking.cshtml new file mode 100644 index 0000000..48b7833 --- /dev/null +++ b/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToConferenceBooking.cshtml @@ -0,0 +1,37 @@ +@{ + ViewData["Title"] = "AddDinnerToConferenceBooking"; +} + + + +
+

Добавить обед в бронь по конференциям

+
+
+
+ + +
+
+ + + + + + + + + + + +
НаименованиеКалорийностьЦена
+
+
+
+ +
+
+ Назад +
+
\ No newline at end of file diff --git a/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToFile.cshtml b/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToFile.cshtml index c1b7524..bb93718 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToFile.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToFile.cshtml @@ -2,27 +2,7 @@ ViewData["Title"] = "AddDinnerToFile"; } - +
diff --git a/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToRoom.cshtml b/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToRoom.cshtml index e1dd794..1df4fca 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToRoom.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/AddDinnerToRoom.cshtml @@ -1,5 +1,38 @@ -@* - For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -*@ -@{ +@{ + ViewData["Title"] = "AddDinnerToRoom"; } + + + +
+

Добавить обед в комнату

+
+
+
+ + +
+
+ + + + + + + + + + + +
НаименованиеКалорийностьЦена
+
+
+
+ +
+
+ Назад +
+
\ No newline at end of file diff --git a/Hotel/HotelAdministratorApp/Views/Home/AddNumberToMealPlan.cshtml b/Hotel/HotelAdministratorApp/Views/Home/AddRoomToMealPlan.cshtml similarity index 52% rename from Hotel/HotelAdministratorApp/Views/Home/AddNumberToMealPlan.cshtml rename to Hotel/HotelAdministratorApp/Views/Home/AddRoomToMealPlan.cshtml index 93f956e..4bad7c1 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/AddNumberToMealPlan.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/AddRoomToMealPlan.cshtml @@ -1,39 +1,10 @@ @{ ViewData["Title"] = "AddNumberToMealPlan"; } -

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

diff --git a/Hotel/HotelAdministratorApp/Views/Home/ConferenceBookings.cshtml b/Hotel/HotelAdministratorApp/Views/Home/ConferenceBookings.cshtml index 5f2de2f..e46bde0 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/ConferenceBookings.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/ConferenceBookings.cshtml @@ -3,39 +3,7 @@ } - +

Список броней по конференциям

@@ -61,16 +29,16 @@
- Добавить + Добавить
- Изменить + Изменить
- Удалить + Удалить
- Добавить обед + Добавить обед
diff --git a/Hotel/HotelAdministratorApp/Views/Home/CreateConferenceBooking.cshtml b/Hotel/HotelAdministratorApp/Views/Home/CreateConferenceBooking.cshtml new file mode 100644 index 0000000..ff3eb38 --- /dev/null +++ b/Hotel/HotelAdministratorApp/Views/Home/CreateConferenceBooking.cshtml @@ -0,0 +1,20 @@ +@{ + ViewData["Title"] = "CreateConferenceBooking"; +} + + + +
+

Добавить бронь по конференциям

+
+
+ + + +
+ +
+
+ Назад +
+
diff --git a/Hotel/HotelAdministratorApp/Views/Home/CreateDinner.cshtml b/Hotel/HotelAdministratorApp/Views/Home/CreateDinner.cshtml index d983fa5..10402a0 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/CreateDinner.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/CreateDinner.cshtml @@ -1,39 +1,16 @@ @{ ViewData["Title"] = "CreateDinner"; } - + + +

Добавить обед

- - - + + +
diff --git a/Hotel/HotelAdministratorApp/Views/Home/CreateRoom.cshtml b/Hotel/HotelAdministratorApp/Views/Home/CreateRoom.cshtml index eefcf9a..67b9a6f 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/CreateRoom.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/CreateRoom.cshtml @@ -1,42 +1,16 @@ @{ ViewData["Title"] = "CreateRoom"; } - + + +

Добавить комнату

- - - + + +
diff --git a/Hotel/HotelAdministratorApp/Views/Home/DeleteConferenceBooking.cshtml b/Hotel/HotelAdministratorApp/Views/Home/DeleteConferenceBooking.cshtml new file mode 100644 index 0000000..54aa340 --- /dev/null +++ b/Hotel/HotelAdministratorApp/Views/Home/DeleteConferenceBooking.cshtml @@ -0,0 +1,22 @@ +@{ + ViewData["Title"] = "DeleteConferenceBooking"; +} + + + + +
+

Удалить бронь по конференциям

+
+ +
+ + +
+
+ +
+
+ Назад +
+
diff --git a/Hotel/HotelAdministratorApp/Views/Home/DeleteDinner.cshtml b/Hotel/HotelAdministratorApp/Views/Home/DeleteDinner.cshtml index 5cba694..4456e7b 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/DeleteDinner.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/DeleteDinner.cshtml @@ -1,35 +1,10 @@ @{ ViewData["Title"] = "DeleteDinner"; } -

Удалить обед

diff --git a/Hotel/HotelAdministratorApp/Views/Home/DeleteRoom.cshtml b/Hotel/HotelAdministratorApp/Views/Home/DeleteRoom.cshtml index eb9494c..98a464d 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/DeleteRoom.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/DeleteRoom.cshtml @@ -1,35 +1,10 @@ @{ ViewData["Title"] = "DeleteRoom"; } -

Удалить комнату

diff --git a/Hotel/HotelAdministratorApp/Views/Home/Dinners.cshtml b/Hotel/HotelAdministratorApp/Views/Home/Dinners.cshtml index 03e4f6d..e13facb 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/Dinners.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/Dinners.cshtml @@ -3,38 +3,9 @@ } - + +

Список обедов

@@ -63,13 +34,13 @@
- Добавить + Добавить
- Изменить + Изменить
- Удалить + Удалить
diff --git a/Hotel/HotelAdministratorApp/Views/Home/Enter.cshtml b/Hotel/HotelAdministratorApp/Views/Home/Enter.cshtml index bafc7fb..2c20d96 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/Enter.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/Enter.cshtml @@ -2,88 +2,9 @@ ViewData["Title"] = "Enter"; } - + +

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

@@ -100,7 +21,7 @@
-
diff --git a/Hotel/HotelAdministratorApp/Views/Home/Index.cshtml b/Hotel/HotelAdministratorApp/Views/Home/Index.cshtml index 2843700..6a6533a 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/Index.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/Index.cshtml @@ -2,7 +2,8 @@ ViewData["Title"] = "Home Page"; } - + + - +
diff --git a/Hotel/HotelAdministratorApp/Views/Home/Privacy.cshtml b/Hotel/HotelAdministratorApp/Views/Home/Privacy.cshtml index a421a83..b7f7940 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/Privacy.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/Privacy.cshtml @@ -5,28 +5,43 @@ @{ ViewData["Title"] = "Privacy"; } + + + +

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

-
-
Логин:
-
-
-
-
Почта:
-
-
-
-
Пароль:
-
-
-
-
ФИО:
-
-
-
-
-
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
\ No newline at end of file diff --git a/Hotel/HotelAdministratorApp/Views/Home/Register.cshtml b/Hotel/HotelAdministratorApp/Views/Home/Register.cshtml index 2edda3f..02aab58 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/Register.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/Register.cshtml @@ -2,82 +2,9 @@ ViewData["Title"] = "Register"; } - + +

Регистрация в приложении

diff --git a/Hotel/HotelAdministratorApp/Views/Home/Rooms.cshtml b/Hotel/HotelAdministratorApp/Views/Home/Rooms.cshtml index 11a0d43..636324e 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/Rooms.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/Rooms.cshtml @@ -3,40 +3,9 @@ } - + +

Список комнат

@@ -64,16 +33,16 @@
- Добавить + Добавить
- Изменить + Изменить
- Удалить + Удалить
- Добавить обед + Добавить обед
diff --git a/Hotel/HotelAdministratorApp/Views/Home/UpdateConferenceBooking.cshtml b/Hotel/HotelAdministratorApp/Views/Home/UpdateConferenceBooking.cshtml new file mode 100644 index 0000000..9063530 --- /dev/null +++ b/Hotel/HotelAdministratorApp/Views/Home/UpdateConferenceBooking.cshtml @@ -0,0 +1,49 @@ +@{ + ViewData["Title"] = "UpdateConferenceBooking"; +} + + + +
+

Обновить бронь по конференциям

+
+
+
+ + +
+
+ +
+
+ +
+ + + + + + + + + + + + +
+ Номер + + Название + + Калорийность + + Цена +
+
+ +
+
+ Назад +
+ +
\ No newline at end of file diff --git a/Hotel/HotelAdministratorApp/Views/Home/UpdateDinner.cshtml b/Hotel/HotelAdministratorApp/Views/Home/UpdateDinner.cshtml index d2b4bd6..8a1a071 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/UpdateDinner.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/UpdateDinner.cshtml @@ -1,39 +1,9 @@ @{ ViewData["Title"] = "UpdateDinner"; } - + + +

Обновить обед

@@ -43,13 +13,13 @@
- +
- +
- +
diff --git a/Hotel/HotelAdministratorApp/Views/Home/UpdateRoom.cshtml b/Hotel/HotelAdministratorApp/Views/Home/UpdateRoom.cshtml index 6894677..d506a33 100644 --- a/Hotel/HotelAdministratorApp/Views/Home/UpdateRoom.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Home/UpdateRoom.cshtml @@ -1,50 +1,9 @@ @{ ViewData["Title"] = "UpdateRoom"; } - + + +

Обновить комнату

@@ -54,13 +13,13 @@
- +
- +
- +
diff --git a/Hotel/HotelAdministratorApp/Views/Shared/_Layout.cshtml b/Hotel/HotelAdministratorApp/Views/Shared/_Layout.cshtml index 7c8e23e..059c7e6 100644 --- a/Hotel/HotelAdministratorApp/Views/Shared/_Layout.cshtml +++ b/Hotel/HotelAdministratorApp/Views/Shared/_Layout.cshtml @@ -67,7 +67,7 @@
  • - Привязка + Привязка
  • Администратор diff --git a/Hotel/HotelAdministratorApp/wwwroot/css/enter.css b/Hotel/HotelAdministratorApp/wwwroot/css/enter.css new file mode 100644 index 0000000..c081546 --- /dev/null +++ b/Hotel/HotelAdministratorApp/wwwroot/css/enter.css @@ -0,0 +1,78 @@ +.main { + margin-top: 50px; + display: flex; + align-items: center; + justify-content: center; +} + +.main_wrapper { + width: 430px; + display: flex; + justify-content: center; + text-align: center; +} + +.main_block { + margin-top: 35px; +} + +.main_fields { + margin-top: 18px; +} + +input { + height: 53px; + width: 100%; + font-size: 20px; + line-height: 16px; + border: 1px solid #000000; + border-radius: 30px; + padding-left: 31px; +} + +.main_field_one { + margin-bottom: 17px; + width: 100%; +} + +.class_login { + width: 100%; + display: flex; + justify-content: center; + margin-top: 84px; +} + +.button_login { + background-color: #FFFFFF; + display: flex; + justify-content: center; + align-items: center; + width: 216px; + height: 39px; + border-radius: 30px; + border: 1px solid #000000; + font-size: 20px; + line-height: 39px; + transition: 0.2s ease; + cursor: pointer; +} + + .button_login:hover { + background: #E3E3E3; + } + +.down_word { + width: 100%; + margin-top: 23px; + font-size: 15px; +} + +.word_registr { + text-decoration: none; + color: #18BDF1; + transition: color 0.2s ease; +} + + .word_registr:hover { + color: #91F0FD; + } diff --git a/Hotel/HotelAdministratorApp/wwwroot/css/register.css b/Hotel/HotelAdministratorApp/wwwroot/css/register.css new file mode 100644 index 0000000..eba34cb --- /dev/null +++ b/Hotel/HotelAdministratorApp/wwwroot/css/register.css @@ -0,0 +1,73 @@ +.up_word { + width: 100%; + display: flex; + flex-direction: column; + align-items: center; + margin-bottom: 10px; +} + +.main_text { + font-size: 17px; +} + +.main { + display: flex; + align-items: center; + justify-content: center; +} + +.main_wrapper { + width: 430px; + display: flex; + justify-content: center; + text-align: center; +} + +.main_block { + margin-top: 20px; +} + +.main_fields { + margin-top: 15px; +} + +input { + height: 53px; + width: 100%; + font-size: 20px; + line-height: 16px; + border: 1px solid #000000; + border-radius: 30px; + padding-left: 31px; +} + +.main_field { + margin-bottom: 10px; + width: 100%; +} + +.class_login { + width: 100%; + display: flex; + justify-content: center; + margin-top: 55px; +} + +.button_login { + background-color: #FFFFFF; + display: flex; + justify-content: center; + align-items: center; + width: 216px; + height: 39px; + border-radius: 30px; + border: 1px solid #000000; + font-size: 20px; + line-height: 39px; + transition: 0.2s ease; + cursor: pointer; +} + + .button_login:hover { + background: #E3E3E3; + } diff --git a/Hotel/HotelAdministratorApp/wwwroot/css/style.css b/Hotel/HotelAdministratorApp/wwwroot/css/style.css new file mode 100644 index 0000000..c6f9229 --- /dev/null +++ b/Hotel/HotelAdministratorApp/wwwroot/css/style.css @@ -0,0 +1,56 @@ +.text-center { + margin-bottom: 30px; +} +.list-words-add { + display: flex; + justify-content: center; + font-size: 20px; + margin-top: 20px; + margin-bottom: 20px; + font-weight: bold; +} +.table { + text-align: center; +} +.spisok { + margin-bottom: 20px; +} +.word-dinner { + font-size: 25px; + display: flex; + justify-content: center; +} +.button-action { + display: flex; + width: 300px; + height: 40px; + border-radius: 10px; + border: 1px solid #000000; + align-items: center; + justify-content: center; + background-color: #BDBDBD; + text-decoration: none; + color: #000000; + transition: 0.2s ease; + margin-bottom: 10px; +} +.button-action:hover { + background-color: #D2D3D3; + color: #393939; +} +.buttons-create-file { + display: flex; + justify-content: center; +} +.buttons-action-with-conferencebooking { + display: flex; + justify-content: space-between; +} +.buttons-action-with-dinner { + display: flex; + justify-content: space-between; +} +.buttons-action-with-room { + display: flex; + justify-content: space-between; +} \ No newline at end of file diff --git a/Hotel/HotelRestApi/Controllers/MainController.cs b/Hotel/HotelRestApi/Controllers/MainController.cs index bbaf05d..5583bf5 100644 --- a/Hotel/HotelRestApi/Controllers/MainController.cs +++ b/Hotel/HotelRestApi/Controllers/MainController.cs @@ -323,7 +323,6 @@ namespace HotelRestApi.Controllers } } - [HttpPost] public void CreateMealPlan(MealPlanBindingModel model) {