From 74dd85bd7ecfe984da5ac23042120c56a280692c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= <elina_kallin@mail.ru>
Date: Wed, 29 May 2024 22:45:43 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B5=D0=B3=D0=B8?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8,=20=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=B8=D0=BD=D0=B0,=20=D0=BF=D0=B5=D1=80=D0=B5=D1=87?=
 =?UTF-8?q?=D0=B8=D1=81=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB=D1=8F?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=20=D0=B2=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B8=20=D0=BE=D1=82=20=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20=D0=B8=20=D1=82=D0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PolyclinicWebAppSuretor/LoginManager.cs   |  9 +++
 .../Models/UserPrivacyModel.cs                | 13 ++++
 .../RestrictionEnum.cs                        | 12 ++++
 .../PolyclinicWebAppSuretor/SiteMenuItems.cs  | 27 ++++----
 .../Views/Home/Login.cshtml                   |  9 ++-
 .../Views/Home/Privacy.cshtml                 | 40 +++++++++--
 .../Views/Home/Register.cshtml                | 10 ++-
 .../Views/Shared/_Layout.cshtml               | 68 ++++++++++++-------
 8 files changed, 145 insertions(+), 43 deletions(-)
 create mode 100644 Polyclinic/PolyclinicWebAppSuretor/LoginManager.cs
 create mode 100644 Polyclinic/PolyclinicWebAppSuretor/Models/UserPrivacyModel.cs
 create mode 100644 Polyclinic/PolyclinicWebAppSuretor/RestrictionEnum.cs

diff --git a/Polyclinic/PolyclinicWebAppSuretor/LoginManager.cs b/Polyclinic/PolyclinicWebAppSuretor/LoginManager.cs
new file mode 100644
index 0000000..7590620
--- /dev/null
+++ b/Polyclinic/PolyclinicWebAppSuretor/LoginManager.cs
@@ -0,0 +1,9 @@
+using PolyclinicContracts.ViewModels;
+
+namespace PolyclinicWebAppSuretor
+{
+    public class LoginManager
+    {
+        public static UserViewModel? LogginedUser { get; set; }
+    }
+}
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Models/UserPrivacyModel.cs b/Polyclinic/PolyclinicWebAppSuretor/Models/UserPrivacyModel.cs
new file mode 100644
index 0000000..d3990d2
--- /dev/null
+++ b/Polyclinic/PolyclinicWebAppSuretor/Models/UserPrivacyModel.cs
@@ -0,0 +1,13 @@
+using PolyclinicDataModels.Enums;
+using System.ComponentModel;
+
+namespace PolyclinicWebAppSuretor.Models
+{
+    public class UserPrivacyModel
+    {
+        public int Id { get; set; }
+
+        [DisplayName("Роль")]
+        public UserRole Role { get; set; }
+    }
+}
diff --git a/Polyclinic/PolyclinicWebAppSuretor/RestrictionEnum.cs b/Polyclinic/PolyclinicWebAppSuretor/RestrictionEnum.cs
new file mode 100644
index 0000000..881e7ae
--- /dev/null
+++ b/Polyclinic/PolyclinicWebAppSuretor/RestrictionEnum.cs
@@ -0,0 +1,12 @@
+namespace PolyclinicWebAppSuretor
+{
+    public class RestrictionEnum
+    {
+        public enum PageVisible
+        {
+            AllowAnyBody = 0,
+            AllowOnlyAuthorized = 1,
+            AllowOnlyNotAuthorized = 2,
+        }
+    }
+}
diff --git a/Polyclinic/PolyclinicWebAppSuretor/SiteMenuItems.cs b/Polyclinic/PolyclinicWebAppSuretor/SiteMenuItems.cs
index a791e92..6aa0fcc 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/SiteMenuItems.cs
+++ b/Polyclinic/PolyclinicWebAppSuretor/SiteMenuItems.cs
@@ -1,20 +1,23 @@
-namespace PolyclinicWebAppSuretor
+using static PolyclinicWebAppSuretor.RestrictionEnum;
+
+namespace PolyclinicWebAppSuretor
 {
     public static class SiteMenuItems
     {
-        public static (string Url, string Title) Index = ("", "Главная");
-        public static (string Url, string Title) Medicaments = ("Medicaments", "Лекарства");
-        public static (string Url, string Title) Procedures = ("Procedures", "Процедуры");
-        public static (string Url, string Title) Recipes = ("Recipes", "Рецепты");
-        public static (string Url, string Title) Login = ("Login", "Вход");
-        public static (string Url, string Title) Register = ("Register", "Регистрация");
-        public static (string Url, string Title) AddSymptomToMedicament = ("AddSymptomToMedicament", "Привязка симптома к лекарству");
-        public static (string Url, string Title) ProceduresReport = ("ProceduresReport", "Отчет по процедурам");
-        public static (string Url, string Title) ListCoursesByProcedures = ("ListCoursesByProcedures", "Список курсов приема препаратов");
+        public static (string Url, string Title, PageVisible Visible) Index = ("", "Главная", PageVisible.AllowAnyBody);
+        public static (string Url, string Title, PageVisible Visible) Medicaments = ("Medicaments", "Лекарства", PageVisible.AllowOnlyAuthorized);
+        public static (string Url, string Title, PageVisible Visible) Procedures = ("Procedures", "Процедуры", PageVisible.AllowOnlyAuthorized);
+        public static (string Url, string Title, PageVisible Visible) Recipes = ("Recipes", "Рецепты", PageVisible.AllowOnlyAuthorized);
+        public static (string Url, string Title, PageVisible Visible) Login = ("Login", "Вход", PageVisible.AllowOnlyNotAuthorized);
+        public static (string Url, string Title, PageVisible Visible) Register = ("Register", "Регистрация", PageVisible.AllowOnlyNotAuthorized);
+        public static (string Url, string Title, PageVisible Visible) AddSymptomToMedicament = ("AddSymptomToMedicament", "Привязка симптома к лекарству", PageVisible.AllowOnlyAuthorized);
+        public static (string Url, string Title, PageVisible Visible) ProceduresReport = ("ProceduresReport", "Отчет по процедурам", PageVisible.AllowOnlyAuthorized);
+        public static (string Url, string Title, PageVisible Visible) ListCoursesByProcedures = ("ListCoursesByProcedures", "Список курсов приема препаратов", PageVisible.AllowOnlyAuthorized);
+        public static (string Url, string Title, PageVisible Visible) Privacy = ("Privacy", "Личный кабинет", PageVisible.AllowOnlyAuthorized);
 
-        public static List<(string Url, string Title)> MenuItemsOrder = new List<(string Url, string Title)>
+        public static List<(string Url, string Title, PageVisible Visible)> MenuItemsOrder = new List<(string Url, string Title, PageVisible Visible)>
         {
-            Index, Medicaments, Procedures, Recipes, ListCoursesByProcedures, Login, Register, AddSymptomToMedicament, ProceduresReport
+            Index, Medicaments, Procedures, Recipes, ListCoursesByProcedures, Login, Register, AddSymptomToMedicament, ProceduresReport, Privacy
         };
     }
 }
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Login.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Login.cshtml
index c7e4e0c..02501fc 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Login.cshtml
+++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Login.cshtml
@@ -1,9 +1,16 @@
-@{
+@model LoginModel
+@{
     ViewBag.SelectedSiteMenuItem = SiteMenuItems.Login;
 }
 <div class="d-flex w-100 h-100 align-content-center justify-content-center align-items-center mt-5 pt-5">
     <form class="d-flex flex-column border border-primary border-3 rounded-3 p-5" id="loginForm" method="post">
         <h4>Вход</h4>
+        @foreach (var item in Model.Errors)
+        {
+            <div class="alert alert-danger" role="alert">
+                @item
+            </div>
+        }
         <div class="mb-2 row">
             <label for="emailInput" class="col-4 ps-0">
                 Email
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Privacy.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Privacy.cshtml
index af4fb19..f3c4049 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Privacy.cshtml
+++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Privacy.cshtml
@@ -1,6 +1,38 @@
-@{
-    ViewData["Title"] = "Privacy Policy";
+@model UserPrivacyModel
+@{
+    ViewBag.SelectedSiteMenuItem = SiteMenuItems.Privacy;
 }
-<h1>@ViewData["Title"]</h1>
+<h4>Личный кабинет</h4>
+@foreach (var item in Model.Errors)
+{
+    <div class="alert alert-danger" role="alert">
+        @item
+    </div>
+}
+<form method="post">
+    <input hidden readonly asp-for="Id" />
+    <div class="mb-3">
+        <label asp-for="FIO"></label>
+        <input required asp-for="FIO" />
+    </div>
+    <div class="mb-3">
+        <label asp-for="Email"></label>
+        <input required asp-for="Email" />
+    </div>
+    <div class="mb-3">
+        <label asp-for="Role"></label>
+        <input readonly asp-for="Role" />
+    </div>
+    <div class="mb-3">
+        <label asp-for="Password"></label>
+        <input type="password" asp-for="Password" />
+    </div>
+    <div class="mb-3">
+        <label asp-for="ConfirmPassword"></label>
+        <input type="password" asp-for="ConfirmPassword" />
+    </div>
+    <button class="btn btn-secondary" type="submit">
+        Применить
+    </button>
+</form>
 
-<p>Use this page to detail your site's privacy policy.</p>
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Register.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Register.cshtml
index 690c931..787e52c 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Register.cshtml
+++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Register.cshtml
@@ -1,8 +1,16 @@
 @model RegisterModel
-
+@{
+    ViewBag.SelectedSiteMenuItem = SiteMenuItems.Register;
+}
 <div class="d-flex w-100 h-100 align-content-center justify-content-center align-items-center mt-5 pt-5">
     <form class="d-flex flex-column border border-success border-3 rounded-3 p-5" id="loginForm" method="post">
         <h4>Регистрация</h4>
+        @foreach (var item in Model.Errors)
+        {
+            <div class="alert alert-danger" role="alert">
+                @item
+            </div>
+        }
         <div class="d-flex mb-3">
             <label for="fioInput" class="pe-3 w-25">
                 ФИО
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Shared/_Layout.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Shared/_Layout.cshtml
index f5d7039..a288b32 100644
--- a/Polyclinic/PolyclinicWebAppSuretor/Views/Shared/_Layout.cshtml
+++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Shared/_Layout.cshtml
@@ -1,26 +1,30 @@
-<!DOCTYPE html>
+@using static PolyclinicWebAppSuretor.RestrictionEnum
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>
-        @if (ViewData.ContainsKey("SelectedSiteMenuItem"))
-        {
-            @ViewBag.SelectedSiteMenuItem.Item2
-        }
-        else if (ViewData.ContainsKey("Title"))
-        {
+    @if (ViewData.ContainsKey("Title"))
+    {
+        <title>
             @ViewData["Title"]
-        }
-    </title>
+        </title>
+    }
+    else
+    {
+        <title>Боликлиника</title>
+    }
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
-    <link rel="stylesheet" href="~/PolyclinicWebAppSuretor.styles.css" asp-append-version="true" />
+    <link rel="stylesheet" href="~/PolyclinicWebView.styles.css" asp-append-version="true" />
 </head>
 <body>
-    <header>
+    <header class="sticky-top">
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container-fluid">
+                <a class="navbar-brand" href="#">
+                    <img src="~/img/polyclinic_logo_mini.svg" height="30" alt="Logo" class="d-inline-block align-text-top">
+                </a>
                 <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
@@ -29,19 +33,33 @@
                     <ul class="navbar-nav flex-grow-1">
                         @foreach (var menuItem in SiteMenuItems.MenuItemsOrder)
                         {
-                            <li class="menu-item">
-                                @Html.RouteLink(menuItem.Title, new
-                                    {
-                                        controller = "Home",
-                                        action = menuItem.Url
-                                    }, new
-                                    {
-                                        @class = "nav-link text-dark" + (menuItem.Equals(ViewBag.SelectedSiteMenuItem) ? " fw-bold" : "")
-                                    }
-                                )
-                            </li>
+                            @if (menuItem.Visible == PageVisible.AllowAnyBody ||
+                           LoginManager.LogginedUser == null && menuItem.Visible == PageVisible.AllowOnlyNotAuthorized ||
+                           LoginManager.LogginedUser != null && menuItem.Visible == PageVisible.AllowOnlyAuthorized)
+                            {
+                                <li class="menu-item">
+                                    @Html.RouteLink(menuItem.Title, new
+                                        {
+                                            controller = "Home",
+                                            action = menuItem.Url
+                                        }, new
+                                        {
+                                            @class = "nav-link text-dark" + (menuItem.Equals(ViewBag.SelectedSiteMenuItem) ? " fw-bold" : "")
+                                        }
+                                             )
+                                </li>
+                            }
                         }
                     </ul>
+                    @if (LoginManager.LogginedUser != null)
+                    {
+                        <div class="d-flex align-items-center">
+                            @Html.RouteLink(LoginManager.LogginedUser.FIO, new { controller = "User", action = "Privacy" }, new { @title = "Личный кабинет" })
+                            <form class="ms-3" method="post" asp-action="Logout" asp-controller="User">
+                                <button class="btn btn-secondary" type="submit">Выйти</button>
+                            </form>
+                        </div>
+                    }
                 </div>
             </div>
         </nav>
@@ -52,9 +70,9 @@
         </main>
     </div>
 
-    <footer class="border-top footer text-muted">
+    <footer class="border-top footer text-muted bg-light fixed-bottom">
         <div class="container">
-            &copy; 2024 - Поликлиника "Будьте больны" - <a asp-area="" asp-controller="Home" asp-action="Privacy">Политика конфедициальности</a>
+            &copy; 2024 - Поликлиника БудьтеБольны
         </div>
     </footer>
     <script src="~/lib/jquery/dist/jquery.min.js"></script>