From c05c0faf169de251c2f88c31001cfdde89525944 Mon Sep 17 00:00:00 2001 From: gg12 darfren Date: Thu, 25 Apr 2024 19:28:11 +0400 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F,=20=D0=B2=D1=85=D0=BE=D0=B4=20=D0=B8?= =?UTF-8?q?=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BB=D0=B8=D1=87=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D0=B0=D1=88?= =?UTF-8?q?=D1=83=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VetClinic/PharmacistApp/PharmacistApp.csproj | 4 + VetClinic/PharmacistApp/Program.cs | 3 + .../PharmacistApp/Views/Home/Privacy.cshtml | 32 +++++- .../PharmacistApp/Views/Shared/_Layout.cshtml | 90 +++++++++-------- .../Views/Shared/_Layout.cshtml | 98 +++++++++---------- .../Controllers/PharmacistController.cs | 4 +- 6 files changed, 130 insertions(+), 101 deletions(-) diff --git a/VetClinic/PharmacistApp/PharmacistApp.csproj b/VetClinic/PharmacistApp/PharmacistApp.csproj index 362488f..fbf47ba 100644 --- a/VetClinic/PharmacistApp/PharmacistApp.csproj +++ b/VetClinic/PharmacistApp/PharmacistApp.csproj @@ -7,6 +7,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/VetClinic/PharmacistApp/Program.cs b/VetClinic/PharmacistApp/Program.cs index 559dd3a..57900d3 100644 --- a/VetClinic/PharmacistApp/Program.cs +++ b/VetClinic/PharmacistApp/Program.cs @@ -1,3 +1,5 @@ +using PharmacistApp; + var builder = WebApplication.CreateBuilder(args); // Add services to the container. @@ -5,6 +7,7 @@ builder.Services.AddControllersWithViews(); var app = builder.Build(); +APIPharmacist.Connect(builder.Configuration); // Configure the HTTP request pipeline. if (!app.Environment.IsDevelopment()) { diff --git a/VetClinic/PharmacistApp/Views/Home/Privacy.cshtml b/VetClinic/PharmacistApp/Views/Home/Privacy.cshtml index af4fb19..eb607de 100644 --- a/VetClinic/PharmacistApp/Views/Home/Privacy.cshtml +++ b/VetClinic/PharmacistApp/Views/Home/Privacy.cshtml @@ -1,6 +1,28 @@ -@{ - ViewData["Title"] = "Privacy Policy"; -} -

@ViewData["Title"]

+@using VetClinicContracts.ViewModels -

Use this page to detail your site's privacy policy.

+@model PharmacistViewModel + +@{ + ViewData["Title"] = "Privacy Policy"; +} +
+

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

+
+
+
+
Email:
+
+
+
+
Пароль:
+
+
+
+
ФИО:
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/VetClinic/PharmacistApp/Views/Shared/_Layout.cshtml b/VetClinic/PharmacistApp/Views/Shared/_Layout.cshtml index 2b7c726..6a922ea 100644 --- a/VetClinic/PharmacistApp/Views/Shared/_Layout.cshtml +++ b/VetClinic/PharmacistApp/Views/Shared/_Layout.cshtml @@ -1,49 +1,53 @@  - - - @ViewData["Title"] - PharmacistApp - - - + + + @ViewData["Title"] - IceCreamShopClientApp + + + + -
- -
-
-
- @RenderBody() -
-
- - - - - - @await RenderSectionAsync("Scripts", required: false) +
+ +
+
+
+ @RenderBody() +
+
+ + + @RenderSection("Scripts", required: false) - + \ No newline at end of file diff --git a/VetClinic/VetClinicAdminApi/Views/Shared/_Layout.cshtml b/VetClinic/VetClinicAdminApi/Views/Shared/_Layout.cshtml index 060ea79..6a922ea 100644 --- a/VetClinic/VetClinicAdminApi/Views/Shared/_Layout.cshtml +++ b/VetClinic/VetClinicAdminApi/Views/Shared/_Layout.cshtml @@ -1,57 +1,53 @@  - - - @ViewData["Title"] - VetClinicAdminApp - - - + + + @ViewData["Title"] - IceCreamShopClientApp + + + + -
- -
-
-
- @RenderBody() -
-
- - - - - - @await RenderSectionAsync("Scripts", required: false) +
+ +
+
+
+ @RenderBody() +
+
+ + + @RenderSection("Scripts", required: false) - + \ No newline at end of file diff --git a/VetClinic/VetClinicRestApi/Controllers/PharmacistController.cs b/VetClinic/VetClinicRestApi/Controllers/PharmacistController.cs index 2c0c9e0..9d67176 100644 --- a/VetClinic/VetClinicRestApi/Controllers/PharmacistController.cs +++ b/VetClinic/VetClinicRestApi/Controllers/PharmacistController.cs @@ -20,13 +20,13 @@ namespace VetClinicRestApi.Controllers _logic = logic; } [HttpGet] - public PharmacistViewModel? Login(string login, string password) + public PharmacistViewModel? Login(string email, string password) { try { return _logic.ReadElement(new PharmacistSearchModel { - Email = login, + Email = email, Password = password }); }