diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs index 6ed9020..c923804 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Controllers/HomeController.cs @@ -52,7 +52,7 @@ namespace BankYouBankruptCashierApp.Controllers //изменение данных Post-ом [HttpPost] - public void Privacy(string login, string password, string name, string surname, string patronymic, string telephone, string email) + public void Privacy(string login, string password, string name, string surname, string patronymic, string telephone) { if (APICashier.Cashier == null) { @@ -61,7 +61,7 @@ namespace BankYouBankruptCashierApp.Controllers if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(name) || string.IsNullOrEmpty(surname) || string.IsNullOrEmpty(patronymic) - || string.IsNullOrEmpty(telephone) || string.IsNullOrEmpty(email)) + || string.IsNullOrEmpty(telephone)) { throw new Exception("Введите логин, пароль, ФИО и телефон"); } @@ -83,9 +83,8 @@ namespace BankYouBankruptCashierApp.Controllers APICashier.Cashier.Email = login; APICashier.Cashier.Password = password; APICashier.Cashier.Telephone = telephone; - APICashier.Cashier.Email = email; - Response.Redirect("Index"); + Response.Redirect("Enter"); } [HttpGet] @@ -112,6 +111,13 @@ namespace BankYouBankruptCashierApp.Controllers Response.Redirect("Enter"); } + + [HttpPost] + public IActionResult Logout() + { + APICashier.Cashier = null; + return Redirect("~/Home/Enter"); + } #endregion #region Вывод ошибок diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseCrediting.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseCrediting.cshtml index ab596ae..181489c 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseCrediting.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseCrediting.cshtml @@ -29,10 +29,7 @@
-
-
- -
+
diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml index 5fbb73c..9c9e014 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CloseDebiting.cshtml @@ -29,10 +29,7 @@
-
-
- -
+
diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateAccount.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateAccount.cshtml index 0cec3c9..2a41e33 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateAccount.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateAccount.cshtml @@ -33,7 +33,7 @@
- +
\ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateReport.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateReport.cshtml index 17e87e1..2adc290 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateReport.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/CreateReport.cshtml @@ -29,10 +29,7 @@
-
-
- -
+

@if (Model != null) diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Diagram.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Diagram.cshtml index da14fad..d589ba0 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Diagram.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Diagram.cshtml @@ -11,17 +11,14 @@
-
+
Номер счета:
-
-
- -
+
@@ -67,7 +64,8 @@ datasets: [{ label: 'Денег в этом месяце', data: data, - borderWidth: 1 + borderWidth: 1, + backgroundColor: 'rgb(255, 165, 0)' }] }, options: { diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Enter.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Enter.cshtml index 0a59495..2ee42cd 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Enter.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Enter.cshtml @@ -1,5 +1,5 @@ @{ - ViewData["Title"] = "Страница пользователя"; + ViewData["Title"] = "Страница кассира"; }
diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Login.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Login.cshtml index 65705a9..6aa01ab 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Login.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Login.cshtml @@ -21,7 +21,7 @@
- +
\ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml index b4ccb2b..38ad7a1 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/MoneyTransfers.cshtml @@ -29,9 +29,6 @@
-
-
- -
+
diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Privacy.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Privacy.cshtml index 336e961..fe05523 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Privacy.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Privacy.cshtml @@ -32,6 +32,9 @@
-
+
+ + +
\ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Register.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Register.cshtml index 2d2ae30..24717bc 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Register.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/Register.cshtml @@ -45,7 +45,7 @@
- +
\ No newline at end of file diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/ReportWithAccounts.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/ReportWithAccounts.cshtml index 3b54dbe..129eb4a 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/ReportWithAccounts.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Home/ReportWithAccounts.cshtml @@ -16,14 +16,14 @@
- -
- +
+
- +
diff --git a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Shared/_Layout.cshtml b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Shared/_Layout.cshtml index f4cabd9..4f329eb 100644 --- a/BankYouBankrupt/BankYouBankruptCashierApp/Views/Shared/_Layout.cshtml +++ b/BankYouBankrupt/BankYouBankruptCashierApp/Views/Shared/_Layout.cshtml @@ -15,6 +15,10 @@