Compare commits

...

3 commits

Author SHA1 Message Date
Lilian 1a66dbd41f
Remove redundant nav from navbar
Add current location to navbar
Remove giant header on edit user page
2023-05-21 00:25:58 +02:00
Lilian 7409c4e948
Minor layout tweaks, comments, css cleanup 2023-05-21 00:25:54 +02:00
Lilian 7caf9aec8a
Improve layout of main page on small viewports 2023-05-21 00:25:48 +02:00
4 changed files with 20 additions and 22 deletions

View file

@ -24,6 +24,12 @@
var linkActive = !string.IsNullOrWhiteSpace(linkFlag?.Value) && linkFlag.Value == user.Id.ToString() && !string.IsNullOrWhiteSpace(lTimeFlag?.Value) && DateTime.UtcNow - DateTime.Parse(lTimeFlag.Value) < TimeSpan.FromMinutes(5);
}
@section HeaderNavAddLocation {
<span class="navbar-text">
Edit User
</span>
}
@section Scripts {
<script src="/js/idle-timer.min.js"></script>
@ -56,16 +62,10 @@
}
}
<div class="text-center">
<h1 class="display-5">
Edit User
</h1>
</div>
<form id="change_user" method="POST">
<div class="d-flex flex-row align-items-center my-3">
<h3>Account</h3>
<button type="button" class="btn btn-lg btn-danger mx-3" name="action" data-bs-toggle="modal" data-bs-target="#deleteConfirmModal">Delete</button> <!-- Calls the below modal dialog to confirm user deletetion -->
<button type="button" class="btn btn-lg btn-danger mx-3" name="action" data-bs-toggle="modal" data-bs-target="#deleteConfirmModal">Delete</button> <!-- Calls the modal dialog to confirm user deletion -->
</div>
<div class="mb-3">
<label for="nickname" class="form-label">Nickname</label>

View file

@ -10,8 +10,14 @@
<link rel="stylesheet" href="~/lib/datatables/dataTables.bootstrap5.min.css"/>
}
@section HeaderNavAddLocation {
<span class="navbar-text">
Home
</span>
}
@section HeaderAddUser {
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#add_user_modal">
<button type="button" class="btn btn-primary ms-auto" data-bs-toggle="modal" data-bs-target="#add_user_modal"> <!-- Calls the modal dialog to add user -->
Add User
</button>
}
@ -82,10 +88,10 @@
</div>
</div>
<div class="row row-cols-auto justify-content-start g-0" id="users">
<div class="row row-cols-auto justify-content-center justify-content-lg-start g-0" id="users">
@foreach (var user in db.Users.OrderBy(p => p.Nickname.ToLower())) {
<div class="col user-card-container" id="user_@user.Id">
<a href="/EditUser/@user.Id">
<a href="/EditUser/@user.Id"> <!-- Wrapping the entire div in a link, we are allowed to do that these days! Using user-card-container class to remove link decorations -->
<div class="d-flex flex-column align-items-center justify-content-center bg-light shadow-sm user-card">
<div class="text-dark">@user.Nickname</div>
@if (user.Balance < 0) {

View file

@ -15,17 +15,15 @@
<nav class="navbar fixed-top navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
<div class="container">
<a class="navbar-brand" asp-area="" asp-page="/Index">AfRApay</a>
@await RenderSectionAsync("HeaderNavAddLocation", required:false)
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
<ul class="navbar-nav flex-grow-1">
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
</li>
</ul>
<div class="d-flex">
<div class="d-flex mt-2 mt-md-0">
@await RenderSectionAsync("HeaderAddSearch", false)
@await RenderSectionAsync("HeaderAddUser", false)
</div>

View file

@ -550,10 +550,7 @@ button.accept-policy {
font-size: 1.5em;
width: 7em;
height: 5em;
margin-left: 0.5rem;
margin-right: 0.5rem;
margin-top: 0.5rem;
margin-bottom: 0.5rem;
margin: 0.5rem;
}
.balance-pos {
@ -571,8 +568,5 @@ button.accept-policy {
.transact-btn {
width: 5em;
height: 3.5em;
margin-right: 0.2em;
margin-left: 0.2em;
margin-top: 0.2em;
margin-bottom: 0.2em;
margin: 0.2em;
}