From 7e0278ddafb3267ac13b515188205f63b44cf7c4 Mon Sep 17 00:00:00 2001
From: AnnZhimol <ankavanka731@gmail.com>
Date: Tue, 16 May 2023 18:24:40 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=B8=D1=87=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8F+=20=D0=BC=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B8=D1=81?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Hotel/HotelDataBaseImplement/HotelDataBase.cs |  2 +-
 .../Views/Home/BindingRoomAndMealPlan.cshtml  | 21 ------
 .../Views/Home/CreateConference.cshtml        |  2 +-
 .../Views/Home/FormationMember.cshtml         | 58 -----------------
 .../Home/FormationMembersAndConference.cshtml | 41 ------------
 .../Views/Home/Privacy.cshtml                 | 65 +++++++++++++++++++
 .../Views/Home/Report.cshtml                  | 47 --------------
 .../Home/ShapingMemberIntoMealPlans.cshtml    | 36 ----------
 .../Views/Home/UpdateConference.cshtml        |  2 +-
 .../Views/Shared/_Layout.cshtml               | 19 ++++--
 10 files changed, 82 insertions(+), 211 deletions(-)
 delete mode 100644 Hotel/HotelOrganiserApp/Views/Home/BindingRoomAndMealPlan.cshtml
 delete mode 100644 Hotel/HotelOrganiserApp/Views/Home/FormationMember.cshtml
 delete mode 100644 Hotel/HotelOrganiserApp/Views/Home/FormationMembersAndConference.cshtml
 create mode 100644 Hotel/HotelOrganiserApp/Views/Home/Privacy.cshtml
 delete mode 100644 Hotel/HotelOrganiserApp/Views/Home/Report.cshtml
 delete mode 100644 Hotel/HotelOrganiserApp/Views/Home/ShapingMemberIntoMealPlans.cshtml

diff --git a/Hotel/HotelDataBaseImplement/HotelDataBase.cs b/Hotel/HotelDataBaseImplement/HotelDataBase.cs
index 7141379..6d7ccea 100644
--- a/Hotel/HotelDataBaseImplement/HotelDataBase.cs
+++ b/Hotel/HotelDataBaseImplement/HotelDataBase.cs
@@ -9,7 +9,7 @@ namespace HotelDataBaseImplement
         {
             if (optionsBuilder.IsConfigured == false)
             {
-                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-V0ON61E\SQLEXPRESS;Initial Catalog=HotelDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+                optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-VG5USAH\SQLEXPRESS;Initial Catalog=HotelDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
             }
             base.OnConfiguring(optionsBuilder);
         }
diff --git a/Hotel/HotelOrganiserApp/Views/Home/BindingRoomAndMealPlan.cshtml b/Hotel/HotelOrganiserApp/Views/Home/BindingRoomAndMealPlan.cshtml
deleted file mode 100644
index 9524e8a..0000000
--- a/Hotel/HotelOrganiserApp/Views/Home/BindingRoomAndMealPlan.cshtml
+++ /dev/null
@@ -1,21 +0,0 @@
-@{
-	ViewData["Title"] = "BindingRoomAndMealPlan";
-}
-
-<div class="text-center">
-	<h2 class="display-4">Привязка комнаты к плану питания</h2>
-</div>
-<form method="post">
-    <label for="validationCustom04" class="form-label">Выбранная комната</label>
-    <select class="form-select" id="validationCustom04" required>
-        <option selected disabled value="">Сделайте выбор</option>
-        <option>Данные из бд*</option>
-    </select>
-    <label for="validationCustom04" class="form-label">Выбранный план питания</label>
-    <select class="form-select" id="validationCustom04" required>
-        <option selected disabled value="">Сделайте выбор</option>
-        <option>Данные из бд*</option>
-    </select>
-    <button type="button" class="btn btn-lg btn-primary" disabled>Привязать</button>
-    <button type="button" class="btn btn-secondary btn-lg" disabled>Отмена</button>
-</form>
\ No newline at end of file
diff --git a/Hotel/HotelOrganiserApp/Views/Home/CreateConference.cshtml b/Hotel/HotelOrganiserApp/Views/Home/CreateConference.cshtml
index f3cd3e3..029f558 100644
--- a/Hotel/HotelOrganiserApp/Views/Home/CreateConference.cshtml
+++ b/Hotel/HotelOrganiserApp/Views/Home/CreateConference.cshtml
@@ -18,7 +18,7 @@
                           <div class="u-form-email u-form-group u-label-top">
                             <label class="u-label u-text-custom-color-1 u-label-2">Начало</label>
                             <input
-                              type="date"
+                              type="datetime-local"
                               placeholder="Выберите дату начала"
                               name="startDate"
                               class="u-input u-input-rectangle"/>
diff --git a/Hotel/HotelOrganiserApp/Views/Home/FormationMember.cshtml b/Hotel/HotelOrganiserApp/Views/Home/FormationMember.cshtml
deleted file mode 100644
index 4fb025a..0000000
--- a/Hotel/HotelOrganiserApp/Views/Home/FormationMember.cshtml
+++ /dev/null
@@ -1,58 +0,0 @@
-@using HotelContracts.ViewModels
-
-
-@model List<MemberViewModel>
-
-@{
-	ViewData["Title"] = "FormationMember";
-}
-
-<div class="text-center">
-	<h1 class="display-4">Формирование участников</h1>
-</div>
-
-
-<div class="text-center">
-	@{
-		if (Model == null)
-		{
-			<h3 class="display-4">Авторизируйтесь</h3>
-			return;
-		}
-
-		<p>
-			<a asp-action="Create">Создать участника</a>
-		</p>
-		<table class="table">
-			<thead>
-				<tr>
-					<th>
-						Номер
-					</th>
-					<th>
-						ФИО
-					</th>
-					<th>
-						Гражданство
-					</th>
-				</tr>
-			</thead>
-			<tbody>
-				@foreach (var item in Model)
-				{
-					<tr>
-						<td>
-							@Html.DisplayFor(modelItem => item.Id)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.MemberFIO)
-						</td>
-						<td>
-							@Html.DisplayFor(modelItem => item.Citizenship)
-						</td>
-					</tr>
-				}
-			</tbody>
-		</table>
-	}
-</div>
\ No newline at end of file
diff --git a/Hotel/HotelOrganiserApp/Views/Home/FormationMembersAndConference.cshtml b/Hotel/HotelOrganiserApp/Views/Home/FormationMembersAndConference.cshtml
deleted file mode 100644
index 7ca05e5..0000000
--- a/Hotel/HotelOrganiserApp/Views/Home/FormationMembersAndConference.cshtml
+++ /dev/null
@@ -1,41 +0,0 @@
-@{
-    ViewData["Title"] = "FormationMembersAndConference";
-}
-
-<div class="text-center">
-	<h1 class="display-4">Формирование участников и конференций</h1>
-</div>
-
-
-<div class="form-group">
-    <label for="exampleFormControlSelect2">Данные по участникам</label>
-    <select multiple class="form-control" id="exampleFormControlSelect2">
-        <option>1</option>
-        <option>2</option>
-        <option>3</option>
-        <option>4</option>
-        <option>5</option>
-    </select>
-</div>
-<div class="form-group">
-    <label for="exampleFormControlSelect2">Выбранная конференция</label>
-    <select multiple class="form-control" id="exampleFormControlSelect2">
-        <option>1</option>
-        <option>2</option>
-        <option>3</option>
-        <option>4</option>
-        <option>5</option>
-    </select>
-</div>
-<div class="form-group">
-    <label for="exampleFormControlSelect2">Доступные для выбора конференции</label>
-    <select multiple class="form-control" id="exampleFormControlSelect2">
-        <option>1</option>
-        <option>2</option>
-        <option>3</option>
-        <option>4</option>
-        <option>5</option>
-    </select>
-</div>
-<button type="button" class="btn btn-lg btn-primary" disabled>Сохранить</button>
-<button type="button" class="btn btn-secondary btn-lg" disabled>Отмена</button>
\ No newline at end of file
diff --git a/Hotel/HotelOrganiserApp/Views/Home/Privacy.cshtml b/Hotel/HotelOrganiserApp/Views/Home/Privacy.cshtml
new file mode 100644
index 0000000..153d9ac
--- /dev/null
+++ b/Hotel/HotelOrganiserApp/Views/Home/Privacy.cshtml
@@ -0,0 +1,65 @@
+@using HotelContracts.ViewModels
+
+@model OrganiserViewModel
+
+@{
+	ViewData["Title"] = "Privacy";
+}
+<head>
+    <link rel="stylesheet" href="~/css/register.css" asp-append-version="true" />
+</head>
+<div class="text-center">
+    <h2 class="u-text u-text-custom-color-1 u-text-default u-text-1"> Мои данные </h2>
+</div>
+<form method="post">
+    <div class="u-form-group u-form-name u-label-top">
+                        <label class="u-label u-text-custom-color-1 u-label-1">Логин</label>
+                        <input
+                          type="text"
+                          placeholder="Введите логин"
+                          name="login"
+                          value="@Model.OrganiserLogin"
+                          class="u-input u-input-rectangle"/>
+                      </div>
+                      <div class="u-form-email u-form-group u-label-top">
+                        <label class="u-label u-text-custom-color-1 u-label-2">Электронная почта</label>
+                        <input
+                          type="email"
+                          placeholder="Введите электронную почту"
+                          name="email"
+                          value="@Model.OrganiserEmail"
+                          class="u-input u-input-rectangle"/>
+                      </div>
+    <div class="u-form-group u-label-top u-form-group-3">
+                        <label class="u-label u-text-custom-color-1 u-label-3">ФИО</label>
+                        <input
+                          type="text"
+                          placeholder="Введите ФИО"
+                          name="fio"
+                          value="@Model.OrganiserFIO"
+                          class="u-input u-input-rectangle"/>
+                      </div>
+                      <div class="u-form-group u-label-top u-form-group-4">
+                        <label class="u-label u-text-custom-color-1 u-label-4">Номер телефона</label>
+                        <input
+                          type="text"
+                          name="telephone"
+                          class="u-input u-input-rectangle"
+                          value="@Model.OrganiserNumber"
+                          placeholder="Введите номер телефона"/>
+                      </div>
+                      <div class="u-form-group u-label-top u-form-group-5">
+                        <label class="u-label u-text-custom-color-1 u-label-5">Пароль</label>
+                        <input
+                          type="text"
+                          placeholder="Введите пароль"
+                          name="password"
+                          value="@Model.OrganiserPassword"
+                          class="u-input u-input-rectangle"/>
+                      </div>
+    <div class="u-align-center u-form-group u-form-submit u-label-top"
+                        style="padding-bottom: 120px">
+        <div class="col-8"></div>
+        <div class="col-4"><input type="submit" value="Изменить" class="u-active-custom-color-6 u-border-none u-btn u-btn-submit u-button-style u-custom-color-1 u-hover-custom-color-2 u-btn-1" /></div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/Hotel/HotelOrganiserApp/Views/Home/Report.cshtml b/Hotel/HotelOrganiserApp/Views/Home/Report.cshtml
deleted file mode 100644
index 31d8287..0000000
--- a/Hotel/HotelOrganiserApp/Views/Home/Report.cshtml
+++ /dev/null
@@ -1,47 +0,0 @@
-@{
-	ViewData["Title"] = "Report";
-}
-
-<div class="text-center">
-	<h2 class="display-4">Создание отчёта</h2>
-</div>
-<form method="post">
-	<div class="container px-4">
-		<div class="row gx-5">
-			<div class="col">
-				<div class="p-3">С</div>
-			</div>
-			<div class="col">
-				<div class="p-3 btn-group">
-					<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false" padding="10">
-						Начало периода
-					</button>
-					<ul class="dropdown-menu">
-						...
-					</ul>
-				</div>
-			</div>
-			<div class="col">
-				<div class="p-3">по</div>
-			</div>
-			<div class="col">
-				<div class="p-3 btn-group">
-					<button class="btn btn-secondary btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false" padding="10">
-						Конец периода
-					</button>
-					<ul class="dropdown-menu">
-						...
-					</ul>
-				</div>
-			</div>
-			<div class="col">
-				<div class="p-3">
-					<button type="button" class="btn btn-primary з-3">Создать</button>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="row">
-		<div class="col-4">Отчёт:</div>
-	</div>
-</form>
\ No newline at end of file
diff --git a/Hotel/HotelOrganiserApp/Views/Home/ShapingMemberIntoMealPlans.cshtml b/Hotel/HotelOrganiserApp/Views/Home/ShapingMemberIntoMealPlans.cshtml
deleted file mode 100644
index 05fabe4..0000000
--- a/Hotel/HotelOrganiserApp/Views/Home/ShapingMemberIntoMealPlans.cshtml
+++ /dev/null
@@ -1,36 +0,0 @@
-@{
-    ViewData["Title"] = "ShapingMemberIntoMealPlans";
-}
-
-<div class="form-group">
-    <label for="exampleFormControlSelect2">Данные по планам питания</label>
-    <select multiple class="form-control" id="exampleFormControlSelect2">
-        <option>1</option>
-        <option>2</option>
-        <option>3</option>
-        <option>4</option>
-        <option>5</option>
-    </select>
-</div>
-<div class="form-group">
-    <label for="exampleFormControlSelect2">Выбранный участник</label>
-    <select multiple class="form-control" id="exampleFormControlSelect2">
-        <option>1</option>
-        <option>2</option>
-        <option>3</option>
-        <option>4</option>
-        <option>5</option>
-    </select>
-</div>
-<div class="form-group">
-    <label for="exampleFormControlSelect2">Доступный для выбора участник</label>
-    <select multiple class="form-control" id="exampleFormControlSelect2">
-        <option>1</option>
-        <option>2</option>
-        <option>3</option>
-        <option>4</option>
-        <option>5</option>
-    </select>
-</div>
-<button type="button" class="btn btn-lg btn-primary" disabled>Сохранить</button>
-<button type="button" class="btn btn-secondary btn-lg" disabled>Отмена</button>
\ No newline at end of file
diff --git a/Hotel/HotelOrganiserApp/Views/Home/UpdateConference.cshtml b/Hotel/HotelOrganiserApp/Views/Home/UpdateConference.cshtml
index bf0f925..fa97772 100644
--- a/Hotel/HotelOrganiserApp/Views/Home/UpdateConference.cshtml
+++ b/Hotel/HotelOrganiserApp/Views/Home/UpdateConference.cshtml
@@ -29,7 +29,7 @@
 	<div class="u-form-email u-form-group u-label-top">
 							<label class="u-label u-text-custom-color-1 u-label-2">Начало</label>
 							<input
-                              type="datetime"
+                              type="datetime-local"
 							  id="startDate"
                               placeholder="Выберите начало конференции"
                               name="startDate"
diff --git a/Hotel/HotelOrganiserApp/Views/Shared/_Layout.cshtml b/Hotel/HotelOrganiserApp/Views/Shared/_Layout.cshtml
index 347c693..b2ccf7d 100644
--- a/Hotel/HotelOrganiserApp/Views/Shared/_Layout.cshtml
+++ b/Hotel/HotelOrganiserApp/Views/Shared/_Layout.cshtml
@@ -55,13 +55,13 @@
                 <div class="u-custom-menu u-nav-container">
                     <ul class="u-nav u-unstyled u-nav-1">
                         <li class="u-nav-item">
-                            <a class="u-button-style u-nav-link u-text-active-custom-color-2 u-text-custom-color-1 u-text-hover-custom-color-6" style="padding: 10px 20px" asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
+                            <a class="u-button-style u-nav-link u-text-active-custom-color-2 u-text-custom-color-1 u-text-hover-custom-color-6" style="padding: 10px 10px" asp-area="" asp-controller="Home" asp-action="Index">Главная</a>
                         </li>
                         <li class="u-nav-item">
                 <a
                   class="u-button-style u-nav-link u-text-active-custom-color-2 u-text-custom-color-1 u-text-hover-custom-color-6"
                   href="#"
-                  style="padding: 10px 20px"
+                  style="padding: 10px 10px"
                   >Отчеты</a
                 >
                 <div class="u-nav-popup">
@@ -91,7 +91,7 @@
                 <a
                   class="u-button-style u-nav-link u-text-active-custom-color-2 u-text-custom-color-1 u-text-hover-custom-color-6"
                   href="#"
-                  style="padding: 10px 20px"
+                  style="padding: 10px 10px"
                   >Справочники</a
                 >
                 <div class="u-nav-popup">
@@ -118,10 +118,13 @@
                 </div>
               </li>
                         <li class="u-nav-item">
-                            <a class="u-button-style u-nav-link u-text-active-custom-color-2 u-text-custom-color-1 u-text-hover-custom-color-6" style="padding: 10px 20px" asp-area="" asp-controller="Home" asp-action="Register">Зарегистрироваться</a>
+                            <a class="u-button-style u-nav-link u-text-active-custom-color-2 u-text-custom-color-1 u-text-hover-custom-color-6" style="padding: 10px 10px" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
                         </li>
                         <li class="u-nav-item">
-                            <a class="u-button-style u-nav-link u-text-active-custom-color-2 u-text-custom-color-1 u-text-hover-custom-color-6" style="padding: 10px 20px" asp-area="" asp-controller="Home" asp-action="Enter">Войти</a>
+                            <a class="u-button-style u-nav-link u-text-active-custom-color-2 u-text-custom-color-1 u-text-hover-custom-color-6" style="padding: 10px 10px" asp-area="" asp-controller="Home" asp-action="Register">Зарегистрироваться</a>
+                        </li>
+                        <li class="u-nav-item">
+                            <a class="u-button-style u-nav-link u-text-active-custom-color-2 u-text-custom-color-1 u-text-hover-custom-color-6" style="padding: 10px 10px" asp-area="" asp-controller="Home" asp-action="Enter">Войти</a>
                         </li>
                     </ul>
                 </div>
@@ -188,6 +191,12 @@
                       </ul>
                     </div>
                   </li>
+                  <li class="u-nav-item">
+                    <a
+                      class="u-button-style u-nav-link"
+                      asp-area="" asp-controller="Home" asp-action="Privacy"
+                      >Личные данные</a>
+                  </li>
                   <li class="u-nav-item">
                     <a
                       class="u-button-style u-nav-link"