diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Controllers/HomeController.cs b/BankYouBankrupt/BankYouBankruptClientApp/Controllers/HomeController.cs index 85b91b7..e452238 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Controllers/HomeController.cs +++ b/BankYouBankrupt/BankYouBankruptClientApp/Controllers/HomeController.cs @@ -101,6 +101,13 @@ namespace BankYouBankruptClientApp.Controllers return; } + + [HttpPost] + public IActionResult Logout() { + APIClient.Client = null; + return Redirect("~/Home/Enter"); + } + #endregion #region Карты diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateCard.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateCard.cshtml index 993f67b..f89c051 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateCard.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateCard.cshtml @@ -33,7 +33,7 @@
- +
\ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateCrediting.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateCrediting.cshtml index d67cbfd..9b9df67 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateCrediting.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateCrediting.cshtml @@ -21,7 +21,7 @@
- +
\ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateDebiting.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateDebiting.cshtml index d3a93f4..f663727 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateDebiting.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateDebiting.cshtml @@ -21,7 +21,7 @@
- +
\ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateExcelReport.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateExcelReport.cshtml index 1d2e7b7..2561e8b 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateExcelReport.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateExcelReport.cshtml @@ -14,7 +14,7 @@
- +
\ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateReport.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateReport.cshtml index a37a5b3..fd1e640 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateReport.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/CreateReport.cshtml @@ -23,9 +23,8 @@
-
-
- +
+

diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Diagram.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Diagram.cshtml index a821589..4f7fd56 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Diagram.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Diagram.cshtml @@ -13,14 +13,13 @@
Номер счета:
-
+
-
-
- +
+
@@ -67,13 +66,17 @@ datasets: [{ label: 'Денег в этом месяце', data: data, - borderWidth: 1 + borderWidth: 6, + backgroundColor: 'rgb(255, 165, 0)' }] }, options: { plugins: { legend: { display: false + }, + customCanvasBackgroundColor: { + color: 'white', } }, scales: { diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Enter.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Enter.cshtml index 0bb17f2..796bb1f 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Enter.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Enter.cshtml @@ -11,6 +11,8 @@
@{ + + if (APIClient.Client == null) {

Сначала авторизируйтесь

diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Login.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Login.cshtml index c274f4c..f73e135 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Login.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Login.cshtml @@ -10,5 +10,5 @@

Логин

- + \ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Register.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Register.cshtml index 9766a19..79a8edd 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Register.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/Register.cshtml @@ -5,53 +5,15 @@

Регистрация

-
-
-
Логин:
-
- -
-
-
-
Пароль:
-
- -
-
-
-
Имя:
-
- -
-
-
-
Фамилия:
-
- -
-
-
-
Отчество:
-
- -
-
-
-
Телефон:
-
- -
-
-
-
-
- -
-
- + + +

Регистрация

+ + + + + + + +
\ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/ReportWithCards.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/ReportWithCards.cshtml index b9acd49..f80fc5f 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/ReportWithCards.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Home/ReportWithCards.cshtml @@ -25,8 +25,8 @@
} -
- +
+
diff --git a/BankYouBankrupt/BankYouBankruptClientApp/Views/Shared/_Layout.cshtml b/BankYouBankrupt/BankYouBankruptClientApp/Views/Shared/_Layout.cshtml index 30c10cf..71cfbb8 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/Views/Shared/_Layout.cshtml +++ b/BankYouBankrupt/BankYouBankruptClientApp/Views/Shared/_Layout.cshtml @@ -45,14 +45,15 @@ if (APIClient.Client == null) { } else { - +
+ + +
} } diff --git a/BankYouBankrupt/BankYouBankruptClientApp/wwwroot/css/site.css b/BankYouBankrupt/BankYouBankruptClientApp/wwwroot/css/site.css index 6cca161..a22d929 100644 --- a/BankYouBankrupt/BankYouBankruptClientApp/wwwroot/css/site.css +++ b/BankYouBankrupt/BankYouBankruptClientApp/wwwroot/css/site.css @@ -4,7 +4,7 @@ html { @media (min-width: 768px) { html { - font-size: 16px; + font-size: 19px; } } diff --git a/BankYouBankrupt/BankYouBankruptClientApp/wwwroot/lib/logo.png b/BankYouBankrupt/BankYouBankruptClientApp/wwwroot/lib/logo.png new file mode 100644 index 0000000..fa40e93 Binary files /dev/null and b/BankYouBankrupt/BankYouBankruptClientApp/wwwroot/lib/logo.png differ