Обновил api

This commit is contained in:
Sergey Karmanov 2023-07-29 21:30:18 +03:00
parent a43b371272
commit 2d31231c2e
Signed by: serega404
GPG Key ID: B6AD49C8C835460C
7 changed files with 37 additions and 44 deletions

View File

@ -1,5 +1,6 @@
using System.Diagnostics; using System.Diagnostics;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using PaydayFrontend.Models; using PaydayFrontend.Models;
namespace PaydayFrontend.Controllers; namespace PaydayFrontend.Controllers;
@ -13,9 +14,17 @@ public class HomeController : Controller
_logger = logger; _logger = logger;
} }
public IActionResult Index()
public async Task<IActionResult> Index()
{ {
return View(); using HttpClient client = new();
string json = await client.GetStringAsync(
"https://payday.zetcraft.ru/v1/public/university");
List<University> universities = JsonConvert.DeserializeObject<List<University>>(json);
return View(universities);
} }
public IActionResult SecondPage() public IActionResult SecondPage()

View File

@ -0,0 +1,10 @@
namespace PaydayFrontend.Models;
public class University
{
public long Id { get; set; }
public string Name { get; set; }
public string FullName { get; set; }
public string ImageUrl { get; set; }
public long MinPlaceCost { get; set; }
}

View File

@ -18,6 +18,7 @@
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,4 +1,6 @@
@{ @model List<University>
@{
ViewData["Title"] = "Home Page"; ViewData["Title"] = "Home Page";
} }
@ -8,46 +10,18 @@
<div class="universe_input_block col-md-12"> <div class="universe_input_block col-md-12">
<input type="text" class="universe_input" placeholder="Введите название вуза или суза..."><img src="/img/logo/search.svg" alt="search" class="universe_search"> <input type="text" class="universe_input" placeholder="Введите название вуза или суза..."><img src="/img/logo/search.svg" alt="search" class="universe_search">
</div> </div>
<div class="col-2 universe_card universe_card_text"> @{
<img src="./img/icons/ufu.jpg" alt="universe" class="universe_icon"> foreach (var university in Model)
ЮФУ <span>от 135т руб</span> {
</div> <div class="col-2 universe_card universe_card_text">
<div class="col-2 universe_card universe_card_text"> <img src="@university.ImageUrl" alt="universe" class="universe_icon">
<img src="./img/icons/kubgu.jpg" alt="universe" class="universe_icon"> @university.Name @if (university.MinPlaceCost != 0)
КубГУ <span>от 135т руб</span> {
</div> <span>от @university.MinPlaceCost тыс. руб</span>
<div class="col-2 universe_card universe_card_text"> }
<img src="./img/icons/vshe.png" alt="universe" class="universe_icon"> </div>
ВШЭ <span>от 135т руб</span> }
</div> }
<div class="col-2 universe_card universe_card_text">
<img src="./img/icons/ufu.jpg" alt="universe" class="universe_icon">
ЮФУ <span>от 135т руб</span>
</div>
<div class="col-2 universe_card universe_card_text">
<img src="./img/icons/ufu.jpg" alt="universe" class="universe_icon">
ЮФУ <span>от 135т руб</span>
</div>
<div class="col-2 universe_card universe_card_text">
<img src="./img/icons/ufu.jpg" alt="universe" class="universe_icon">
ЮФУ <span>от 135т руб</span>
</div>
<div class="col-2 universe_card universe_card_text">
<img src="./img/icons/kubgu.jpg" alt="universe" class="universe_icon">
КубГУ <span>от 135т руб</span>
</div>
<div class="col-2 universe_card universe_card_text">
<img src="./img/icons/vshe.png" alt="universe" class="universe_icon">
ВШЭ <span>от 135т руб</span>
</div>
<div class="col-2 universe_card universe_card_text">
<img src="./img/icons/ufu.jpg" alt="universe" class="universe_icon">
ЮФУ <span>от 135т руб</span>
</div>
<div class="col-2 universe_card universe_card_text">
<img src="./img/icons/ufu.jpg" alt="universe" class="universe_icon">
ЮФУ <span>от 135т руб</span>
</div>
</div> </div>
</div> </div>

View File

@ -11,7 +11,6 @@
<link rel="stylesheet" href="~/css/bootstrap-grid.min.css"> <link rel="stylesheet" href="~/css/bootstrap-grid.min.css">
<link rel="stylesheet" href="~/css/bootstrap.min.css"> <link rel="stylesheet" href="~/css/bootstrap.min.css">
@* <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css"/> *@ @* <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css"/> *@
@* <link rel="stylesheet" href="~/css/site.css" asp-append-version="true"/> *@
@* <link rel="stylesheet" href="~/PaydayFrontend.styles.css" asp-append-version="true"/> *@ @* <link rel="stylesheet" href="~/PaydayFrontend.styles.css" asp-append-version="true"/> *@
</head> </head>
<body> <body>

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB