Добавил глобальный поиск

PaydayFrontend/Controllers/AdminController.cs

@@ -1,14 +1,53 @@
 using System.Diagnostics;
 using Microsoft.AspNetCore.Mvc;
 using PaydayFrontend.Models;
+using PaydayFrontend.Services;
 
 namespace PaydayFrontend.Controllers;
 
 public class AdminController : Controller
 {
-    public async Task<IActionResult> Index()
+    private readonly IUniversityService _universityService;
+    private readonly IBankService _bankService;
+
+    public AdminController(IUniversityService universityService, IBankService bankService)
     {
-        return View();
+        _universityService = universityService;
+        _bankService = bankService;
+    }
+
+    public async Task<IActionResult> Index(string searchString)
+    {
+        var result = new AdminViewModel();
+        result.searchString = searchString;
+        result.indexes = new();
+        if (!String.IsNullOrEmpty(searchString))
+        {
+            IEnumerable<University> universities = await _universityService.GetAllUniversity();
+            universities = universities.Where(s => s.Name!.ToLower().Contains(searchString.ToLower()) || s.FullName!.ToLower().Contains(searchString.ToLower())).ToList();
+            IEnumerable<Bank> banks = await _bankService.GetAllBanks();
+            banks = banks.Where(s => s.Name!.ToLower().Contains(searchString.ToLower())).ToList();
+            foreach (var university in universities)
+            {
+                result.indexes.Add(new AdminIndexViewModel
+                {
+                    Name = university.Name,
+                    LogoUrl = university.ImageUrl,
+                    Type = "Университет"
+                });
+            }
+            foreach (var bank in banks)
+            {
+                result.indexes.Add(new AdminIndexViewModel
+                {
+                    Name = bank.Name,
+                    LogoUrl = bank.ImageUrl,
+                    Type = "Банк"
+                });
+            }
+        }
+
+        return View(result);
     }
     
     public async Task<IActionResult> Universities()

PaydayFrontend/Controllers/HomeController.cs

@@ -9,11 +9,13 @@ public class HomeController : Controller
 {
     private readonly ILogger<HomeController> _logger;
     private readonly IUniversityService _universityService;
+    private readonly IBankService _bankService;
 
-    public HomeController(ILogger<HomeController> logger, IUniversityService universityService)
+    public HomeController(ILogger<HomeController> logger, IUniversityService universityService, IBankService bankService)
     {
         _logger = logger;
         _universityService = universityService;
+        _bankService = bankService;
     }
  
     public async Task<IActionResult> Index(string searchString)
@@ -62,7 +64,7 @@ public class HomeController : Controller
         var answer = new CreditsViewModel();
         answer.University = await _universityService.GetUniversityById(universityId);;
         answer.Direction = await _universityService.GetDirectionsById(directionId);
-        answer.Offers = await _universityService.GetOffers(directionId);
+        answer.Offers = await _bankService.GetOffers(directionId);
         
         return View(answer);
     }

PaydayFrontend/Models/AdminIndexViewModel.cs

@@ -0,0 +1,8 @@
+namespace PaydayFrontend.Models;
+
+public class AdminIndexViewModel
+{
+    public string Name { get; set; }
+    public string LogoUrl { get; set; }
+    public string Type { get; set; }
+}

PaydayFrontend/Models/AdminViewModel.cs

@@ -0,0 +1,7 @@
+namespace PaydayFrontend.Models;
+
+public class AdminViewModel
+{
+   public List<AdminIndexViewModel> indexes { get; set; }
+   public string searchString { get; set; }
+}

PaydayFrontend/Models/Bank.cs

@@ -0,0 +1,8 @@
+namespace PaydayFrontend.Models;
+
+public class Bank
+{
+    public long Id { get; set; }
+    public string Name { get; set; }
+    public string ImageUrl { get; set; }
+}

PaydayFrontend/PaydayFrontend.csproj

@@ -43,6 +43,7 @@
       <_ContentIncludedByDefault Remove="wwwroot\admin\sass\_general.sass" />
       <_ContentIncludedByDefault Remove="wwwroot\admin\sass\_media.sass" />
       <_ContentIncludedByDefault Remove="wwwroot\admin\sass\_mixins.sass" />
+      <_ContentIncludedByDefault Remove="wwwroot\admin\img\Vector.svg" />
     </ItemGroup>
 
 </Project>

PaydayFrontend/Program.cs

@@ -21,6 +21,7 @@ builder.Services.AddHttpClient("backend", client =>
     client.DefaultRequestHeaders.Add("Accept", "application/json");
 });
 builder.Services.AddTransient<IUniversityService, UniversityService>();
+builder.Services.AddTransient<IBankService, BankService>();
 
 var app = builder.Build();
 

PaydayFrontend/Services/IBankService.cs

@@ -0,0 +1,43 @@
+using System.Text.Json;
+using PaydayFrontend.Models;
+
+namespace PaydayFrontend.Services;
+
+public interface IBankService
+{
+    public Task<List<Bank>> GetAllBanks();
+    public Task<IEnumerable<Offer>> GetOffers(long directionId);
+}
+
+public class BankService : IBankService
+{
+    private readonly HttpClient _httpClient;
+
+    public BankService(HttpClient httpClient)
+    {
+        _httpClient = httpClient;
+        _httpClient.BaseAddress = new Uri("https://payday.zetcraft.ru");
+    }
+
+    public async Task<List<Bank>> GetAllBanks()
+    {
+        var response = await _httpClient.GetAsync("v1/admin/banks");
+        var result = await response.Content.ReadAsStringAsync();
+        var banks = JsonSerializer.Deserialize<List<Bank>>(result, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
+        return banks;
+    }
+    
+    public async Task<IEnumerable<Offer>> GetOffers(long directionId)
+    {
+        var response = await _httpClient.GetAsync("v1/public/credit/direction/" + directionId);
+        var result = await response.Content.ReadAsStringAsync();
+        var offers = JsonSerializer.Deserialize<IEnumerable<Offer>>(result, new JsonSerializerOptions
+        {
+            PropertyNameCaseInsensitive = true
+        });
+        return offers;
+    }
+}

PaydayFrontend/Services/IUniversityService.cs

@@ -8,7 +8,6 @@ public interface IUniversityService
     public Task<List<University>> GetAllUniversity(); 
     public Task<List<Direction>> GetDirectionsByUniversityId(long universityId);
     public Task<University> GetUniversityById(long id);
-    public Task<IEnumerable<Offer>> GetOffers(long directionId);
     public Task<Direction> GetDirectionsById(long directionId);
 }
 
@@ -66,14 +65,4 @@ public class UniversityService : IUniversityService
         return university;
     }
     
-    public async Task<IEnumerable<Offer>> GetOffers(long directionId)
-    {
-        var response = await _httpClient.GetAsync("v1/public/credit/direction/" + directionId);
-        var result = await response.Content.ReadAsStringAsync();
-        var offers = JsonSerializer.Deserialize<IEnumerable<Offer>>(result, new JsonSerializerOptions
-        {
-            PropertyNameCaseInsensitive = true
-        });
-        return offers;
-    }
 }

PaydayFrontend/Views/Admin/Banks.cshtml

@@ -4,7 +4,7 @@
         <form id="navigation_row_block" class="navigation_input_block">
             <input type="hidden" name="universityId" value="6">
             <input type="text" name="searchString" class="navigation_input" placeholder="Введите название банка...">
-            <input type="image" src="/img/Vector.svg" alt="search" class="navigation_search">
+            <input type="image" src="~/img/search.svg" alt="search" class="navigation_search">
         </form>
         <div class="hamburger">
             <span></span>

PaydayFrontend/Views/Admin/Index.cshtml

@@ -1,31 +1,37 @@
+@model AdminViewModel
+
 <senction class="banks">
     <div class="flex_column">
-        <div class="page">Главная/Институты</div>
+        <div class="page">Главная</div>
         <form id="navigation_row_block" class="navigation_input_block">
             <input type="hidden" name="universityId" value="6">
-            <input type="text" name="searchString" class="navigation_input" placeholder="Введите название Вуза">
+            <input type="text" name="searchString" class="navigation_input" placeholder="Глобальный поиск..." value="@Model.searchString">
-            <input type="image" src="~/admin/img/Vector.svg" alt="search" class="navigation_search">
+            <input type="image" src="~/img/search.svg" alt="search" class="navigation_search">
         </form>
-        <div class="hamburger">
-            <span></span>
-            <span></span>
-            <span></span>
-        </div>
     </div>
 
     <div class="row flex_row">
-        <div class="row row-cols-lg-10 g-5 g-lg-3">
+        @{
+            if (Model.indexes.Count != 0)
+            {
+                foreach (var index in @Model.indexes)
+                {
+                    <a class="col-2 universe_card universe_card_text">
+                        <img src="@index.LogoUrl" alt="universe" class="universe_icon">
+                        @index.Name
+                        <span>Тип: @index.Type</span>
+                    </a>
+                }
+            }
+            else
+            {
+                <div class="col-12 universe_card universe_card_text">
+                    <span>Добро пожаловать в панель администратора!</span>
+                </div>
+            }
             
-            <div class="col-12 navigation_card navigation_bank_text" id="add">
+        }
-                <div class="navigation_bank" id="add_text">
-                    <img src="~/admin/img/icons/alpha.png" alt="navigation" class="navigation_icon add_img">
-                    Альфа Банк
-                    <span> на 4 года &nbsp;</span>
-                </div>
-                <div class="navigation_credit add_procent">
-                    <span class="navigation_credit_prosent" id="add_text">Потребительский кредит от 13% в год</span>
-                </div>
-            </div>
-        </div>
     </div>
+        
+
 </senction>

PaydayFrontend/Views/Admin/Universities.cshtml

@@ -4,7 +4,7 @@
         <form id="navigation_row_block" class="navigation_input_block">
             <input type="hidden" name="universityId" value="6">
             <input type="text" name="searchString" class="navigation_input" placeholder="Введите название Вуза">
-            <input type="image" src="~/admin/img/Vector.svg" alt="search" class="navigation_search">
+            <input type="image" src="~/logo/search.svg" alt="search" class="navigation_search">
         </form>
         <div class="hamburger">
             <span></span>

PaydayFrontend/Views/Home/Credits.cshtml

@@ -74,7 +74,7 @@
                     <div class="bank_block_img">
                         <img class="bank_img" src="~/img/icons/alpha.png" alt="bank">
                         <div class="bank_procent_text">Процентная ставка</div>
-                        <div class="bank_procent">10%</div>
+                        <div class="bank_procent">от 4%</div>
                     </div>
                     <div class="bank_name">Альфа Банк</div>
                     <div class="bank_form">
@@ -88,7 +88,7 @@
 
                 </div>
                 <div class="form_btn_block">
-                    <div class="form_btn">Беру!<img src="~/img/logo/esia.png" alt="esia" class="form_btn_img"></div>
+                    <div class="form_btn">Беру!<img src="~/img/esia.png" alt="esia" class="form_btn_img"></div>
 
                 </div>
             </form>

PaydayFrontend/Views/Home/Directions.cshtml

@@ -13,7 +13,7 @@
                 <form id="navigation_row_block" class="navigation_input_block">
                     <input type="hidden" name="universityId" value="@Model.University.Id" /> 
                     <input type="text" name="searchString" class="navigation_input" placeholder="Введите код или название направления" value="@Model.SearchString">
-                    <input type="image" src="/img/logo/search.svg" alt="search" class="navigation_search">
+                    <input type="image" src="~/img/search.svg" alt="search" class="navigation_search">
                 </form>
             </div>
 

PaydayFrontend/Views/Home/Index.cshtml

@@ -10,7 +10,7 @@
         <div id="listUniversity" class="row row_flex">
             <form class="universe_input_block col-md-12">
                 <input type="text" class="universe_input" name="searchString" placeholder="Введите название вуза или суза..." value="@Model.SearchString">
-                <input type="image" src="/img/logo/search.svg" alt="search" class="universe_search">
+                <input type="image" src="~/img/search.svg" alt="search" class="universe_search">
             </form>
             @{
                 foreach (var university in Model.Directions)

PaydayFrontend/Views/Shared/_AdminLayout.cshtml

@@ -17,9 +17,10 @@
         <div class="admin_logo">
             <img class="admin_img" src="~/img/logo.png" alt="logo">
         </div>
-        <a asp-action="Index" class="admin_main">Главная</a>
+        <a asp-action="Index" class="admin_main admin_button">Главная</a>
-        <a asp-action="Banks" class="admin_banks">Банки</a>
+        <a asp-action="Banks" class="admin_banks admin_button">Банки</a>
-        <a asp-action="Universities" class="admin_university">Институты</a>
+        <a asp-action="Universities" class="admin_university admin_button">Институты</a>
+        <a asp-controller="Home" asp-action="Index" class="admin_university admin_button">На сайт</a>
         <button class="admin_exit">Выход</button>
     </div>
 </div>

PaydayFrontend/wwwroot/admin/css/style.css

@@ -2,6 +2,15 @@
     font-family: "Roboto", sans-serif
 }
 
+.admin_button {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: white;
+    text-align: center;
+    text-decoration: none;
+}
+
 .admin_menu_block {
     position: fixed;
     z-index: 3;
@@ -11,6 +20,76 @@
     background-color: #fff
 }
 
+
+.universe_icon {
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    height: 130px;
+    width: 130px
+}
+
+/*.universe_card {*/
+/*    -moz-user-select: none;*/
+/*    -webkit-user-select: none;*/
+/*    -ms-user-select: none;*/
+/*    user-select: none;*/
+/*    display: -webkit-box;*/
+/*    display: -ms-flexbox;*/
+/*    display: flex;*/
+/*    -webkit-box-orient: vertical;*/
+/*    -webkit-box-direction: normal;*/
+/*    -ms-flex-direction: column;*/
+/*    flex-direction: column;*/
+/*    -webkit-box-pack: center;*/
+/*    -ms-flex-pack: center;*/
+/*    justify-content: center;*/
+/*    -ms-flex-line-pack: center;*/
+/*    align-content: center;*/
+/*    -webkit-box-align: center;*/
+/*    -ms-flex-align: center;*/
+/*    align-items: center;*/
+/*    margin: 0 30px 20px 0;*/
+/*    height: 205px;*/
+/*    width: 205px;*/
+/*    background-color: #fff;*/
+/*    border-radius: 44px*/
+/*}*/
+
+/*.universe_card:nth-child(6) {*/
+/*    margin-right: 0px*/
+/*}*/
+
+/*.universe_card:nth-child(11) {*/
+/*    margin-right: 0px*/
+/*}*/
+
+/*.universe_card_text {*/
+/*    text-decoration: none;*/
+/*}*/
+/*.universe_card:nth-child(6) {*/
+/*    margin-right: 0px*/
+/*}*/
+
+/*.universe_card:nth-child(11) {*/
+/*    margin-right: 0px*/
+/*}*/
+
+/*.universe_card_text {*/
+/*    color: #2a2a2a;*/
+/*    font-size: 24px;*/
+/*    font-style: normal;*/
+/*    font-weight: 500*/
+/*}*/
+
+/*.universe_card_text span {*/
+/*    color: #50d400;*/
+/*    font-size: 16px;*/
+/*    font-style: normal;*/
+/*    font-weight: 500*/
+/*}*/
+
 .admin_menu {
     z-index: 1;
     height: 360px;
@@ -166,7 +245,7 @@
     height: 54px;
     margin-left: 30px;
     margin-top: 30px;
-    width: 160px;
+    width: 200px;
     color: #000;
     font-size: 18px;
     font-style: normal;

PaydayFrontend/wwwroot/admin/img/Vector.svg

@@ -1,3 +0,0 @@
-<svg width="35" height="36" viewBox="0 0 35 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M34.8925 34.7695C34.8925 35.0977 34.7967 35.3848 34.6052 35.6309C34.4137 35.877 34.149 36 33.8111 36C33.5183 36 33.2648 35.8887 33.0508 35.666L19.7874 21.8848C18.7061 22.8105 17.5233 23.5195 16.2392 24.0117C14.9551 24.5039 13.6035 24.75 12.1842 24.75C11.0916 24.75 10.0384 24.6035 9.02462 24.3105C8.01086 24.0176 7.06468 23.6016 6.18609 23.0625C5.30749 22.5234 4.50775 21.8789 3.78685 21.1289C3.06595 20.3789 2.4408 19.541 1.91139 18.6152C1.38198 17.6895 0.982106 16.7051 0.711769 15.6621C0.441432 14.6191 0.300632 13.5234 0.289368 12.375C0.289368 11.2383 0.430168 10.1426 0.711769 9.08789C0.99337 8.0332 1.39324 7.04883 1.91139 6.13477C2.42953 5.2207 3.04906 4.38867 3.76995 3.63867C4.49085 2.88867 5.29623 2.23828 6.18609 1.6875C7.07595 1.13672 8.02213 0.720703 9.02462 0.439453C10.0271 0.158203 11.0803 0.0117188 12.1842 0C13.2768 0 14.33 0.146484 15.3437 0.439453C16.3575 0.732422 17.3037 1.14844 18.1823 1.6875C19.0609 2.22656 19.8606 2.87109 20.5815 3.62109C21.3024 4.37109 21.9276 5.20898 22.457 6.13477C22.9864 7.06055 23.3863 8.04492 23.6566 9.08789C23.9269 10.1309 24.0677 11.2266 24.079 12.375C24.079 13.8398 23.8425 15.2402 23.3694 16.5762C22.8963 17.9121 22.2148 19.1484 21.3249 20.2852L22.288 21.2871C22.7611 21.7793 23.3356 22.3652 24.0114 23.0449C24.6873 23.7246 25.4194 24.4688 26.2079 25.2773C26.9964 26.0859 27.7961 26.9121 28.6071 27.7559C29.4182 28.5996 30.201 29.4199 30.9557 30.2168C31.7104 31.0137 32.3806 31.7344 32.9663 32.3789C33.5521 33.0234 34.0195 33.5566 34.3687 33.9785C34.7179 34.4004 34.8925 34.6641 34.8925 34.7695ZM12.1842 22.5C13.5246 22.5 14.7862 22.2363 15.9689 21.709C17.1516 21.1816 18.1823 20.4551 19.0609 19.5293C19.9395 18.6035 20.6322 17.5312 21.1391 16.3125C21.646 15.0938 21.905 13.7812 21.9163 12.375C21.9163 10.9805 21.6629 9.66797 21.156 8.4375C20.6491 7.20703 19.9507 6.13477 19.0609 5.2207C18.171 4.30664 17.1404 3.58594 15.9689 3.05859C14.7974 2.53125 13.5359 2.26172 12.1842 2.25C10.8438 2.25 9.58219 2.51367 8.39947 3.04102C7.21675 3.56836 6.18609 4.29492 5.30749 5.2207C4.4289 6.14648 3.73616 7.21875 3.22928 8.4375C2.7224 9.65625 2.46333 10.9688 2.45206 12.375C2.45206 13.7695 2.7055 15.082 3.21238 16.3125C3.71927 17.543 4.41763 18.6152 5.30749 19.5293C6.19735 20.4434 7.22801 21.1641 8.39947 21.6914C9.57093 22.2188 10.8325 22.4883 12.1842 22.5Z" fill="#03D764"/>
-</svg>