From 291605b6e1844cf916f8c39e379bcf094115927a Mon Sep 17 00:00:00 2001 From: Kirill <117719052+KirillFirsof@users.noreply.github.com> Date: Thu, 2 May 2024 00:58:39 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B8=20?= =?UTF-8?q?=D0=B5=D1=89=D0=B5=20=D0=B5=D1=89=D0=B5=20=D0=BF=D1=80=D0=B5?= =?UTF-8?q?=D0=B4=D1=81=D1=82=D0=BE=D0=B8=D1=82=20=D0=BC=D0=BD=D0=BE=D0=B3?= =?UTF-8?q?=D0=BE=20=D1=80=D0=B0=D0=B7=D0=B1=D0=B8=D1=80=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=D1=81=D1=8F=20=D1=8D=D1=82=D0=B8=D0=BC=20ASP.Net?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SchoolApp/Controllers/HomeController.cs | 4 ++ School/SchoolApp/Views/Home/Enter.cshtml | 35 +++++++++++ School/SchoolApp/Views/Home/Index.cshtml | 63 +++++++++++++++++-- School/SchoolApp/Views/Home/Register.cshtml | 4 ++ School/SchoolApp/wwwroot/css/site.css | 1 - 5 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 School/SchoolApp/Views/Home/Enter.cshtml diff --git a/School/SchoolApp/Controllers/HomeController.cs b/School/SchoolApp/Controllers/HomeController.cs index 5f77735..3607560 100644 --- a/School/SchoolApp/Controllers/HomeController.cs +++ b/School/SchoolApp/Controllers/HomeController.cs @@ -12,6 +12,10 @@ namespace SchoolApp.Controllers { _logger = logger; } + public IActionResult Enter() + { + return View(); + } public IActionResult Register() { diff --git a/School/SchoolApp/Views/Home/Enter.cshtml b/School/SchoolApp/Views/Home/Enter.cshtml new file mode 100644 index 0000000..ccbdde2 --- /dev/null +++ b/School/SchoolApp/Views/Home/Enter.cshtml @@ -0,0 +1,35 @@ + +@{ + ViewData["Title"] = "Enter"; +} + +
+

Вход

+
+
+
+
+
+
+
+

Введите имя

+
+ + +
+

Введите пароль

+
+ + +
+
+ + +
+
+
+
+
+
+
+ diff --git a/School/SchoolApp/Views/Home/Index.cshtml b/School/SchoolApp/Views/Home/Index.cshtml index d2d19bd..bca84a4 100644 --- a/School/SchoolApp/Views/Home/Index.cshtml +++ b/School/SchoolApp/Views/Home/Index.cshtml @@ -1,8 +1,63 @@ -@{ - ViewData["Title"] = "Home Page"; +@using SchoolContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "Home Page"; }
-

Welcome

-

Learn about building Web apps with ASP.NET Core.

+

Занятия

+
+ +
+ @{ + if (Model == null) + { +

Авторизируйтесь

+ return; + } +

+ Редактировать занятие + Удалить занятие + Связать занятие и интерес +

+

+ Создать занятие +

+ + + + + + + + + + + @foreach (var item in Model) + { + + + + + + + + } + +
+ Номер + + Начало занятия + + Конец занятия +
+ @Html.DisplayFor(modelItem => item.Id) + + @Html.DisplayFor(modelItem => item.TimeStart) + + @Html.DisplayFor(modelItem => item.TimeEnd) +
+ }
diff --git a/School/SchoolApp/Views/Home/Register.cshtml b/School/SchoolApp/Views/Home/Register.cshtml index 7376979..020ff8f 100644 --- a/School/SchoolApp/Views/Home/Register.cshtml +++ b/School/SchoolApp/Views/Home/Register.cshtml @@ -42,6 +42,10 @@ +
+ + +
diff --git a/School/SchoolApp/wwwroot/css/site.css b/School/SchoolApp/wwwroot/css/site.css index 26de935..2e92922 100644 --- a/School/SchoolApp/wwwroot/css/site.css +++ b/School/SchoolApp/wwwroot/css/site.css @@ -29,7 +29,6 @@ body { flex-direction: column; padding: 15px 20px; margin: 20px 0; - ; background: linear-gradient(135deg, #161616, #fff); border-radius: 20px; }