From 246d1cc97d0f9b6455e4aedcf3fffa55733d5af9 Mon Sep 17 00:00:00 2001
From: prodigygirl <Prodigygirl1.0@yandex.ru>
Date: Fri, 19 May 2023 16:10:02 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B5=D1=89?=
 =?UTF-8?q?=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Hospital/HospitalWeb/Views/Home/Enter.cshtml  | 32 ++++++-----
 Hospital/HospitalWeb/Views/Home/Index.cshtml  |  6 +-
 .../Views/Prescription/Create.cshtml          |  2 +-
 .../HospitalWeb/Views/Recipe/Create.cshtml    |  2 +-
 .../HospitalWeb/Views/Shared/_Layout.cshtml   | 48 +++++++++-------
 Hospital/HospitalWeb/wwwroot/css/styles.css   | 57 ++++++++++++++++---
 6 files changed, 100 insertions(+), 47 deletions(-)

diff --git a/Hospital/HospitalWeb/Views/Home/Enter.cshtml b/Hospital/HospitalWeb/Views/Home/Enter.cshtml
index 2b3f7e6..685d79a 100644
--- a/Hospital/HospitalWeb/Views/Home/Enter.cshtml
+++ b/Hospital/HospitalWeb/Views/Home/Enter.cshtml
@@ -4,17 +4,23 @@
 <div class="text-center">
 	<h2 class="display-4">Вход в приложение</h2>
 </div>
-<form method="post" class="form mx-auto d-block" style="width: 50%">
-	<div class="row mb-3">
-	<div class="col-4">Логин:</div>
-	<div class="col-8"><input type="text" name="login" /></div>
-	</div>
-	<div class="row mb-3">
-	<div class="col-4">Пароль:</div>
-	<div class="col-8"><input type="password" name="password" /></div>
-	</div>
-	<div class="row mb-3">
-	<div class="col-8"></div>
-	<div class="col-4"><input type="submit" value="Вход" class="btn btn-primary" /></div>
-	</div>
+<form method="post" class="form mx-auto d-block shadow p-3 mb-5 bg-white rounded" style="width: 30%">
+    <div class="form-group row">
+        <label for="login" class="col-sm-4 col-form-label">Логин:</label>
+        <div class="col-sm-8">
+            <input type="text" class="form-control" id="login" name="login">
+        </div>
+    </div>
+    <div class="form-group row">
+        <label for="password" class="col-sm-4 col-form-label">Пароль:</label>
+        <div class="col-sm-8">
+            <input type="password" class="form-control" id="password" name="password">
+        </div>
+    </div>
+    <div class="form-group row">
+        <div class="col-sm-8"></div>
+        <div class="col-sm-4">
+            <button type="submit" class="btn btn-primary btn-block">Вход</button>
+        </div>
+    </div>
 </form>
\ No newline at end of file
diff --git a/Hospital/HospitalWeb/Views/Home/Index.cshtml b/Hospital/HospitalWeb/Views/Home/Index.cshtml
index 6f5e34e..dcc40db 100644
--- a/Hospital/HospitalWeb/Views/Home/Index.cshtml
+++ b/Hospital/HospitalWeb/Views/Home/Index.cshtml
@@ -13,7 +13,7 @@
                 <div class="card-body">
                     <h5 class="card-title">Лекарства</h5>
                     <p class="card-text">Добавляйте, редактируйте и удаляйте лекарства в базе данных</p>
-                    <a href="@Url.Action("Medicines", "Medicine")" class="btn btn-primary">Перейти</a>
+                    <a href="@Url.Action("Medicines", "Medicine")" class="btn btn-outline-success">Перейти</a>
                 </div>
             </div>
         </div>
@@ -22,7 +22,7 @@
                 <div class="card-body">
                     <h5 class="card-title">Поступления</h5>
                     <p class="card-text">Управляйте поступлениями лекарств в аптеку</p>
-                    <a href="@Url.Action("Prescriptions", "Prescription")" class="btn btn-primary">Перейти</a>
+                    <a href="@Url.Action("Prescriptions", "Prescription")" class="btn btn-outline-success">Перейти</a>
                 </div>
             </div>
         </div>
@@ -31,7 +31,7 @@
                 <div class="card-body">
                     <h5 class="card-title">Рецепты</h5>
                     <p class="card-text">Добавляйте, редактируйте и удаляйте рецепты в базе данных</p>
-                    <a href="@Url.Action("Recipes", "Recipe")" class="btn btn-primary">Перейти</a>
+                    <a href="@Url.Action("Recipes", "Recipe")" class="btn btn-outline-success">Перейти</a>
                 </div>
             </div>
         </div>
diff --git a/Hospital/HospitalWeb/Views/Prescription/Create.cshtml b/Hospital/HospitalWeb/Views/Prescription/Create.cshtml
index 7fb47e2..13b4332 100644
--- a/Hospital/HospitalWeb/Views/Prescription/Create.cshtml
+++ b/Hospital/HospitalWeb/Views/Prescription/Create.cshtml
@@ -1,7 +1,7 @@
 @using HospitalContracts.ViewModels;
 @model PrescriptionViewModel
 @{
-	ViewData["Title"] = "Create";
+	ViewData["Title"] = "Поступление";
 }
 
 @{
diff --git a/Hospital/HospitalWeb/Views/Recipe/Create.cshtml b/Hospital/HospitalWeb/Views/Recipe/Create.cshtml
index 116a8e7..de82437 100644
--- a/Hospital/HospitalWeb/Views/Recipe/Create.cshtml
+++ b/Hospital/HospitalWeb/Views/Recipe/Create.cshtml
@@ -2,7 +2,7 @@
 @using System.Globalization
 @model RecipeViewModel
 @{
-	ViewData["Title"] = "Create";
+	ViewData["Title"] = "Рецепт";
 }
 
 @{
diff --git a/Hospital/HospitalWeb/Views/Shared/_Layout.cshtml b/Hospital/HospitalWeb/Views/Shared/_Layout.cshtml
index c043e90..9df254d 100644
--- a/Hospital/HospitalWeb/Views/Shared/_Layout.cshtml
+++ b/Hospital/HospitalWeb/Views/Shared/_Layout.cshtml
@@ -19,28 +19,32 @@
                     <span class="navbar-toggler-icon"></span>
                 </button>
                 <div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Prescription" asp-action="Prescriptions">Поступления</a>
-                        </li>
-                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Medicine" asp-action="Medicines">Лекарства</a>
-                        </li>
-                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Recipe" asp-action="Recipes">Рецепты</a>
-                        </li>
-                       <li class="nav-item dropdown">
-                          <a class="nav-link text-dark dropdown-toggle" href="#" id="reportDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
-                            Отчеты
-                          </a>
-                          <div class="dropdown-menu" aria-labelledby="reportDropdown">
-                            <a class="dropdown-item" asp-area="" asp-controller="Report" asp-action="ReportPatients">Отчет Пациенты</a>
-                            <a class="dropdown-item" asp-area="" asp-controller="Report" asp-action="ReportPrescriptions">Отчет Поступления</a>
-                          </div>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Профиль</a>
-                        </li>
+                    <ul class="navbar-nav flex-grow-1">                      
+                        @if (APIClient.Apothecary != null) { 
+                            <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-controller="Prescription" asp-action="Prescriptions">Поступления</a>
+                            </li>
+                             <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-controller="Medicine" asp-action="Medicines">Лекарства</a>
+                            </li>
+                             <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-controller="Recipe" asp-action="Recipes">Рецепты</a>
+                            </li>
+                           <li class="nav-item dropdown">
+                              <a class="nav-link text-dark dropdown-toggle" href="#" id="reportDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                Отчеты
+                              </a>
+                              <div class="dropdown-menu" aria-labelledby="reportDropdown">
+                                <a class="dropdown-item" asp-area="" asp-controller="Report" asp-action="ReportPatients">Отчет Пациенты</a>
+                                <a class="dropdown-item" asp-area="" asp-controller="Report" asp-action="ReportPrescriptions">Отчет Поступления</a>
+                              </div>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Профиль</a>
+                            </li>
+                        }
+                        
+                        
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Enter">Вход</a>
                         </li>
diff --git a/Hospital/HospitalWeb/wwwroot/css/styles.css b/Hospital/HospitalWeb/wwwroot/css/styles.css
index c8e2c24..934857c 100644
--- a/Hospital/HospitalWeb/wwwroot/css/styles.css
+++ b/Hospital/HospitalWeb/wwwroot/css/styles.css
@@ -31,27 +31,70 @@
     box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
 }
 
+.lead {
+    color: #9ac86a;
+    font-weight: bold;
+}
+
 .card {
     margin-bottom: 2rem;
     box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
+    transition: transform 0.3s ease-in-out;
+}
+
+
+.card:hover {
+    transform: scale(1.05);
 }
 
 .card-title {
     font-size: 1.25rem;
     font-weight: bold;
     margin-bottom: 0.5rem;
+    color: #4c4c4c;
 }
 
 .card-text {
     margin-bottom: 1rem;
+    color: #4c4c4c;
 }
 
-.btn-primary {
-    background-color: #007bff;
-    border-color: #007bff;
+.btn-outline-success {
+    color: #7cb342;
+    border-color: #7cb342;
 }
 
-    .btn-primary:hover {
-        background-color: #0062cc;
-        border-color: #0062cc;
-    }
\ No newline at end of file
+.btn-outline-success:hover {
+    background-color: #7cb342;
+    color: #fff;
+}
+
+.navbar-brand {
+    font-weight: bold;
+    color: #7cb342 !important;
+}
+
+a {
+    color: #7cb342; /* нежно-зеленый цвет для ссылок */
+}
+
+a:hover {
+    color: #5f8e29; /* темнее зеленый цвет для наведенных ссылок */
+}
+
+.table {
+    background-color: #fff; /* белый цвет фона таблицы */
+}
+
+.table th {
+    background-color: #7cb342; /* нежно-зеленый цвет фона заголовков таблицы */
+    color: #fff; /* белый цвет текста заголовков таблицы */
+}
+
+.table td {
+    background-color: #fff; 
+}
+
+.navbar-nav .nav-link:hover {
+    background-color: #f2f2f2; /* нежно-зеленый цвет фона при наведении */
+}
\ No newline at end of file