From 0d9306c5976eed607af079181150e7d9e6e1f0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?=
 <raspaev.niko@mail.ru>
Date: Sun, 2 Apr 2023 19:52:02 +0400
Subject: [PATCH] fix

---
 .../HardwareShopClientApp/Controllers/HomeController.cs         | 1 -
 .../HardwareShopClientApp/Controllers/WorkerController.cs       | 2 +-
 HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml | 2 +-
 .../HardwareShopClientApp/Views/Worker/Purchases.cshtml         | 1 -
 .../HardwareShopClientApp/Views/Worker/listComponents.cshtml    | 2 +-
 .../HardwareShopDatabaseImplement/HardwareShopDatabase.cs       | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/HardwareShop/HardwareShopClientApp/Controllers/HomeController.cs b/HardwareShop/HardwareShopClientApp/Controllers/HomeController.cs
index 7bdafe2..0a5a8a0 100644
--- a/HardwareShop/HardwareShopClientApp/Controllers/HomeController.cs
+++ b/HardwareShop/HardwareShopClientApp/Controllers/HomeController.cs
@@ -83,7 +83,6 @@ namespace HardwareShopClientApp.Controllers
             if ((int)APIClient.User.Role == 1)
             {
                 return RedirectToAction("MainWorker", "Worker");
-                return RedirectToAction("WorkerReport", "Worker");
             }
             else 
             {
diff --git a/HardwareShop/HardwareShopClientApp/Controllers/WorkerController.cs b/HardwareShop/HardwareShopClientApp/Controllers/WorkerController.cs
index 9155dc8..75f367c 100644
--- a/HardwareShop/HardwareShopClientApp/Controllers/WorkerController.cs
+++ b/HardwareShop/HardwareShopClientApp/Controllers/WorkerController.cs
@@ -35,7 +35,7 @@ namespace HardwareShopClientApp.Controllers
         [HttpGet]
         public IActionResult Purchases()
         {
-            return View(APIClient.GetRequest<List<PurchaseViewModel>>($"api/client/getpurchases?UserId={APIClient.User.Id}"));
+            return View();
         }
 
         [HttpPost]
diff --git a/HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml b/HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml
index bb67b2a..7b70f77 100644
--- a/HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml
+++ b/HardwareShop/HardwareShopClientApp/Views/Worker/Comments.cshtml
@@ -42,7 +42,7 @@
 	<form method="post" class="d-flex justify-content-evenly">
 		<div class=" col-sm-8">
 			<div class="text-center">
-				<h2 class="display-4">Сборки</h2>
+				<h2 class="display-4">Комментарии</h2>
 			</div>
 			<div class="text-center" name="id">
 				<table class="table">
diff --git a/HardwareShop/HardwareShopClientApp/Views/Worker/Purchases.cshtml b/HardwareShop/HardwareShopClientApp/Views/Worker/Purchases.cshtml
index b7b3c25..570f975 100644
--- a/HardwareShop/HardwareShopClientApp/Views/Worker/Purchases.cshtml
+++ b/HardwareShop/HardwareShopClientApp/Views/Worker/Purchases.cshtml
@@ -68,7 +68,6 @@
 					<tbody>
 					</tbody>
 				</table>
-			}
 		</div>
 	</div>
 	<div class="text-center d-flex flex-column mt-5">
diff --git a/HardwareShop/HardwareShopClientApp/Views/Worker/listComponents.cshtml b/HardwareShop/HardwareShopClientApp/Views/Worker/listComponents.cshtml
index b1d46ff..5e4f831 100644
--- a/HardwareShop/HardwareShopClientApp/Views/Worker/listComponents.cshtml
+++ b/HardwareShop/HardwareShopClientApp/Views/Worker/listComponents.cshtml
@@ -84,7 +84,7 @@
 			<div class="modal-dialog">
 				<div class="modal-content">
 					<div class="modal-header">
-						<h5 class="modal-title" id="exampleModalLabel">Комментарий</h5>
+						<h5 class="modal-title" id="exampleModalLabel">Покупка</h5>
 						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Закрыть"></button>
 					</div>
 					<div class="modal-body">
diff --git a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs
index 90abdf7..34106e5 100644
--- a/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs
+++ b/HardwareShop/HardwareShopDatabaseImplement/HardwareShopDatabase.cs
@@ -10,7 +10,7 @@ namespace HardwareShopDatabaseImplement
     {
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder.UseNpgsql("Host=localhost;Port=5433;Database=Computer_Hardware_Store;Username=user;Password=12345");
+            optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=Computer_Hardware_Store;Username=postgres;Password=1234");
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)