Подготовил направления

This commit is contained in:
Sergey Karmanov 2023-07-30 01:50:58 +03:00
parent 68f837b104
commit ad6e10250b
Signed by: serega404
GPG Key ID: B6AD49C8C835460C
8 changed files with 974 additions and 18 deletions

View File

@ -0,0 +1,15 @@
using System.Diagnostics;
using Microsoft.AspNetCore.Mvc;
using PaydayFrontend.Models;
namespace PaydayFrontend.Controllers;
public class AdminController : Controller
{
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public IActionResult Error()
{
return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
}
}

View File

@ -28,12 +28,19 @@ public class HomeController : Controller
return View(universities.ToList()); return View(universities.ToList());
} }
public IActionResult SecondPage([FromQuery] long universityId) [Route("Directions")]
public IActionResult Directions(long universityId)
{ {
Console.WriteLine(universityId);
if (universityId == 0)
return RedirectToAction("Index");
return View(); return View();
} }
public IActionResult ThirdPage() public IActionResult Credits()
{ {
return View(); return View();
} }

View File

@ -0,0 +1,11 @@
namespace PaydayFrontend.Models;
public class Direction
{
public long Id { get; set; }
public long UniversityId { get; set; }
public string Code { get; set; }
public string Name { get; set; }
public string Url { get; set; }
public int PlaceCost { get; set; }
}

View File

@ -6,6 +6,7 @@ namespace PaydayFrontend.Services;
public interface IUniversityService public interface IUniversityService
{ {
public Task<List<University>> GetAllUniversity(); public Task<List<University>> GetAllUniversity();
public Task<List<University>> GetDirectionsByUniversityId();
} }
public class UniversityService : IUniversityService public class UniversityService : IUniversityService
@ -28,4 +29,15 @@ public class UniversityService : IUniversityService
}); });
return university; return university;
} }
public async Task<List<University>> GetDirectionsByUniversityId()
{
var response = await _httpClient.GetAsync("v1/public/university");
var result = await response.Content.ReadAsStringAsync();
var university = JsonSerializer.Deserialize<List<University>>(result, new JsonSerializerOptions
{
PropertyNameCaseInsensitive = true
});
return university;
}
} }

View File

@ -22,10 +22,12 @@
</div> </div>
</div> </div>
<div class="navigation_slid"> <div class="navigation_choise">
<span class="navigation_slid_disable"></span> <div class="navigation_slid">
<span class="navigation_slid_active"></span> <span class="navigation_slid_disable"></span>
<span class="navigation_slid_disable"></span> <span class="navigation_slid_active"></span>
<span class="navigation_slid_disable"></span> <span class="navigation_slid_disable"></span>
<span class="navigation_slid_disable"></span>
</div>
</div> </div>
</section> </section>

View File

@ -14,27 +14,26 @@
@{ @{
foreach (var university in Model) foreach (var university in Model)
{ {
<div universityId="@university.Id" class="col-2 universe_card universe_card_text"> <a href="Directions?UniversityId=@university.Id" class="col-2 universe_card universe_card_text">
<img src="@university.ImageUrl" alt="universe" class="universe_icon"> <img src="@university.ImageUrl" alt="universe" class="universe_icon">
@university.Name @university.Name
@if (university.MinPlaceCost != 0) @if (university.MinPlaceCost != 0)
{ {
<span>от @university.MinPlaceCost тыс. руб</span> <span>от @university.MinPlaceCost тыс. руб</span>
} }
</div> </a>
} }
} }
</div> </div>
</div> </div>
<a asp-controller="Home" asp-action="SecondPage"> <div class="navigation_choise">
<input type="button" class="btn btn-primary"/> <div class="navigation_slid">
</a> <span class="navigation_slid_active"></span>
<div class="universe_slid"> <span class="navigation_slid_disable"></span>
<span class="universe_slid_active"></span> <span class="navigation_slid_disable"></span>
<span class="universe_slid_disable"></span> <span class="navigation_slid_disable"></span>
<span class="universe_slid_disable"></span> </div>
<span class="universe_slid_disable"></span>
</div> </div>

File diff suppressed because one or more lines are too long