This commit is contained in:
Programmist73 2023-05-19 20:12:16 +04:00
commit 6bf5c80c71
14 changed files with 44 additions and 70 deletions

View File

@ -101,6 +101,13 @@ namespace BankYouBankruptClientApp.Controllers
return; return;
} }
[HttpPost]
public IActionResult Logout() {
APIClient.Client = null;
return Redirect("~/Home/Enter");
}
#endregion #endregion
#region Карты #region Карты

View File

@ -33,7 +33,7 @@
<div class="row"> <div class="row">
<div class="col-8"></div> <div class="col-8"></div>
<div class="col-4"> <div class="col-4">
<input type="submit" value="Создание" class="btn btn-primary" /> <input type="submit" value="Создание" class="btn btn-warning" />
</div> </div>
</div> </div>
</form> </form>

View File

@ -21,7 +21,7 @@
<div class="row"> <div class="row">
<div class="col-8"></div> <div class="col-8"></div>
<div class="col-4"> <div class="col-4">
<input type="submit" value="Создание" class="btn btn-primary" /> <input type="submit" value="Создание" class="btn btn-warning" />
</div> </div>
</div> </div>
</form> </form>

View File

@ -21,7 +21,7 @@
<div class="row"> <div class="row">
<div class="col-8"></div> <div class="col-8"></div>
<div class="col-4"> <div class="col-4">
<input type="submit" value="Создание" class="btn btn-primary" /> <input type="submit" value="Создание" class="btn btn-warning" />
</div> </div>
</div> </div>
</form> </form>

View File

@ -14,7 +14,7 @@
<div class="row"> <div class="row">
<div class="col-8"></div> <div class="col-8"></div>
<div class="col-4"> <div class="col-4">
<input type="submit" value="Создание" class="btn btn-primary" /> <input type="submit" value="Создание" class="btn btn-warning" />
</div> </div>
</div> </div>
</form> </form>

View File

@ -23,9 +23,8 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-8"></div> <div class="col">
<div class="col-4"> <input id="createReport" type="submit" value="Сформировать отчёт" class="btn btn-warning" />
<input id="createReport" type="submit" value="Сформировать отчёт" class="btn btn-primary" />
</div> </div>
</div> </div>
<hr class="mt-5 mb-3" /> <hr class="mt-5 mb-3" />

View File

@ -13,14 +13,13 @@
<form method="post"> <form method="post">
<div class="row"> <div class="row">
<div class="row">Номер счета:</div> <div class="row">Номер счета:</div>
<div class="col-8"> <div class="col">
<select id="cardId" name="cardId" class="form-control" asp-items="@(new SelectList( @ViewBag.Cards, "Id", "Number"))"></select> <select id="cardId" name="cardId" class="form-control" asp-items="@(new SelectList( @ViewBag.Cards, "Id", "Number"))"></select>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-8"></div> <div class="col">
<div class="col-4"> <input type="submit" value="Выбрать" class="btn btn-warning"/>
<input type="submit" value="Выбрать" class="btn btn-primary"/>
</div> </div>
</div> </div>
</form> </form>
@ -67,13 +66,17 @@
datasets: [{ datasets: [{
label: 'Денег в этом месяце', label: 'Денег в этом месяце',
data: data, data: data,
borderWidth: 1 borderWidth: 6,
backgroundColor: 'rgb(255, 165, 0)'
}] }]
}, },
options: { options: {
plugins: { plugins: {
legend: { legend: {
display: false display: false
},
customCanvasBackgroundColor: {
color: 'white',
} }
}, },
scales: { scales: {

View File

@ -11,6 +11,8 @@
<div class="text-center"> <div class="text-center">
@{ @{
<img src="~/lib/logo.png" style="width: 50%"/>
if (APIClient.Client == null) if (APIClient.Client == null)
{ {
<h3 class="display-4">Сначала авторизируйтесь</h3> <h3 class="display-4">Сначала авторизируйтесь</h3>

View File

@ -10,5 +10,5 @@
<h1 class="h3 mb-3 font-weight-normal">Логин</h1> <h1 class="h3 mb-3 font-weight-normal">Логин</h1>
<input type="email" id="login" name="login" class="form-control" placeholder="Почта" required autofocus> <input type="email" id="login" name="login" class="form-control" placeholder="Почта" required autofocus>
<input type="password" id="password" name="password" class="form-control" placeholder="Пароль" required> <input type="password" id="password" name="password" class="form-control" placeholder="Пароль" required>
<button class="btn btn-lg btn-primary btn-block" type="submit" asp-controller="Home" asp-action="Login">Войти</button> <button class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="Login">Войти</button>
</form> </form>

View File

@ -5,53 +5,15 @@
<div class="text-center"> <div class="text-center">
<h2 class="display-4">Регистрация</h2> <h2 class="display-4">Регистрация</h2>
</div> </div>
<form method="post">
<div class="row"> <form class="form-signin text-center" method="post">
<div class="col-4">Логин:</div> <h1 class="h3 mb-3 font-weight-normal">Регистрация</h1>
<div class="col-8"> <input type="email" id="login" name="login" class="form-control" placeholder="Почта" required>
<input type="text" name="login" /> <input type="password" id="password" name="password" class="form-control" placeholder="Пароль" required>
</div> <input type="text" id="name" name="name" class="form-control" placeholder="Имя" required>
</div> <input type="text" id="surname" name="surname" class="form-control" placeholder="Фамилия" required>
<div class="row"> <input type="text" id="patronymic" name="patronymic" class="form-control" placeholder="Отчество" required>
<div class="col-4">Пароль:</div> <input type="text" id="telephone" name="telephone" class="form-control" placeholder="Телефон" required>
<div class="col-8">
<input type="password" name="password" /> <button class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="Register">Регистрация</button>
</div>
</div>
<div class="row">
<div class="col-4">Имя:</div>
<div class="col-8">
<input type="text" name="name" />
</div>
</div>
<div class="row">
<div class="col-4">Фамилия:</div>
<div class="col-8">
<input type="text" name="surname" />
</div>
</div>
<div class="row">
<div class="col-4">Отчество:</div>
<div class="col-8">
<input type="text" name="patronymic" />
</div>
</div>
<div class="row">
<div class="col-4">Телефон:</div>
<div class="col-8">
<input type="text" name="telephone" />
</div>
</div>
<div class="row">
<div class="col-8"></div>
<div class="col-4">
<input type="submit" value="Регистрация" class="btn btn-primary" />
</div>
</div>
<div class="row">
<div class="col-8"></div>
<div class="col-4">
<a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Login">Уже есть аккаунт?</a>
</div>
</div>
</form> </form>

View File

@ -25,8 +25,8 @@
<input type="hidden" asp-for="@Model.Cards[item].LabelName" /> <input type="hidden" asp-for="@Model.Cards[item].LabelName" />
</div> </div>
} }
<div> <div class="mb-2">
<input class="btn btn-primary mt-3" type="submit" value="Submit" /> <button class="btn btn-lg btn-warning btn-block" type="submit" asp-controller="Home" asp-action="">Создать отчёт</button>
</div> </div>
<div> <div>
<button class="btn btn-lg btn-primary btn-block" type="submit" asp-controller="Home" asp-action="CreateExcelReport">Создать отчёт по переводам</button> <button class="btn btn-lg btn-primary btn-block" type="submit" asp-controller="Home" asp-action="CreateExcelReport">Создать отчёт по переводам</button>

View File

@ -45,14 +45,15 @@
if (APIClient.Client == null) if (APIClient.Client == null)
{ {
<div class="col-md-3 text-end"> <div class="col-md-3 text-end">
<a class="btn btn-primary me-2" asp-controller="Home" asp-action="Login">Войти</a> <a class="btn btn-warning me-2" asp-controller="Home" asp-action="Login">Войти</a>
<a class="btn btn-primary" asp-controller="Home" asp-action="Register">Регистрация</a> <a class="btn btn-warning" asp-controller="Home" asp-action="Register">Регистрация</a>
</div> </div>
} }
else { else {
<div class="col-md-3 text-end"> <form method="post" class="col-md-3 text-end">
<a class="btn btn-primary me-2" asp-controller="Home" asp-action="Enter">@APIClient.Client.Name @APIClient.Client.Surname</a> <label for="exit" class="text-light">@APIClient.Client.Name @APIClient.Client.Surname </label>
</div> <button class="btn btn-warning me-2" id="exit" name="exit" type="submit" asp-controller="Home" asp-action="Logout">Выход</button>
</form>
} }
} }
</header> </header>

View File

@ -4,7 +4,7 @@ html {
@media (min-width: 768px) { @media (min-width: 768px) {
html { html {
font-size: 16px; font-size: 19px;
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB