From 800a21389a33629a787d8a9f9f5900981ab00e7a Mon Sep 17 00:00:00 2001 From: dasha Date: Sun, 2 Apr 2023 22:52:24 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BA=D1=80=D1=83=D1=82=D1=8B=D0=B5=20=D0=B8?= =?UTF-8?q?=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StorekeeperController.cs | 9 ++ .../HardwareShopClientApp.csproj | 8 -- .../Views/Home/Enter.cshtml | 10 +-- .../Views/Home/Index.cshtml | 17 ++-- .../Views/Home/Privacy.cshtml | 10 +++ .../Views/Home/Register.cshtml | 8 +- .../Views/Shared/_Layout.cshtml | 4 +- .../Views/Storekeeper/Components.cshtml | 77 +++++++++++++----- .../Views/Storekeeper/Goods.cshtml | 52 ++++++------ .../Views/Storekeeper/ListBuilds.cshtml | 41 ++++++++++ .../Views/Storekeeper/MainStorekeeper.cshtml | 16 ++-- .../Views/Storekeeper/Orders.cshtml | 54 ++++++------ .../Views/Storekeeper/Report.cshtml | 36 ++++++++ .../Views/Worker/Build.cshtml | 2 +- .../Views/Worker/Builds.cshtml | 2 +- .../Views/Worker/Comments.cshtml | 2 +- .../Views/Worker/MainWorker.cshtml | 2 +- .../Views/Worker/Purchase.cshtml | 2 +- .../Views/Worker/Purchases.cshtml | 2 +- .../Views/Worker/WorkerReport.cshtml | 2 +- .../Views/Worker/linkingBuild.cshtml | 2 +- .../Views/Worker/listComponents.cshtml | 2 +- .../wwwroot/images/logo.png | Bin 0 -> 46137 bytes 23 files changed, 244 insertions(+), 116 deletions(-) create mode 100644 HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml create mode 100644 HardwareShop/HardwareShopClientApp/Views/Storekeeper/Report.cshtml create mode 100644 HardwareShop/HardwareShopClientApp/wwwroot/images/logo.png diff --git a/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs b/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs index abc7a40..cd40646 100644 --- a/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs +++ b/HardwareShop/HardwareShopClientApp/Controllers/StorekeeperController.cs @@ -31,5 +31,14 @@ namespace HardwareShopClientApp.Controllers return View(); } + public IActionResult ListBuilds() + { + return View(); + } + + public IActionResult Report() + { + return View(); + } } } diff --git a/HardwareShop/HardwareShopClientApp/HardwareShopClientApp.csproj b/HardwareShop/HardwareShopClientApp/HardwareShopClientApp.csproj index 7dcaa49..457e569 100644 --- a/HardwareShop/HardwareShopClientApp/HardwareShopClientApp.csproj +++ b/HardwareShop/HardwareShopClientApp/HardwareShopClientApp.csproj @@ -6,14 +6,6 @@ enable - - - - - - - - diff --git a/HardwareShop/HardwareShopClientApp/Views/Home/Enter.cshtml b/HardwareShop/HardwareShopClientApp/Views/Home/Enter.cshtml index f74aed5..4640290 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Home/Enter.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Home/Enter.cshtml @@ -5,22 +5,16 @@
}
-

Вход в приложение

+

Вход

diff --git a/HardwareShop/HardwareShopClientApp/Views/Home/Index.cshtml b/HardwareShop/HardwareShopClientApp/Views/Home/Index.cshtml index 84ed0d9..8da1174 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Home/Index.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Home/Index.cshtml @@ -5,22 +5,24 @@
} -
- Основная страница -
- +
+ +
\ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Home/Privacy.cshtml b/HardwareShop/HardwareShopClientApp/Views/Home/Privacy.cshtml index 220b44a..80ee0e0 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Home/Privacy.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Home/Privacy.cshtml @@ -2,6 +2,16 @@ ViewData["Title"] = "Privacy Policy"; } @section Header { +
+ +
}

@ViewData["Title"]

diff --git a/HardwareShop/HardwareShopClientApp/Views/Home/Register.cshtml b/HardwareShop/HardwareShopClientApp/Views/Home/Register.cshtml index 12f9ed9..ed415fa 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Home/Register.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Home/Register.cshtml @@ -5,16 +5,10 @@
diff --git a/HardwareShop/HardwareShopClientApp/Views/Shared/_Layout.cshtml b/HardwareShop/HardwareShopClientApp/Views/Shared/_Layout.cshtml index d1dac07..57a8edb 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Shared/_Layout.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - HardwareShopClientApp + @ViewData["Title"] - Магазин компьютерной техники @@ -18,7 +18,7 @@
- © 2023 - HardwareShopClientApp - Privacy + © 2023 - "Ты ж программист" - Магазин компьютерной техники Privacy
diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml index 5486c28..f3a503d 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml @@ -1,32 +1,65 @@ @using HardwareShopContracts.ViewModels @{ - ViewData["Title"] = "Goods"; + ViewData["Title"] = "Комплектующие"; } @model List @section Header { -
- -
+ + } -
- привет, мы в компонентах + +
+

Комплектующие

+
+ + +
+ @{ +

+ Создать комплектующее +

+ + + + + + + + + +
+ Название + + Цена +
+ }
\ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml index 59fec69..4f61616 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml @@ -1,34 +1,40 @@ @using HardwareShopContracts.ViewModels @{ - ViewData["Title"] = "Goods"; + ViewData["Title"] = "Товары"; } @model List @section Header { -
- -
+ + }
привет, мы в товарах diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml new file mode 100644 index 0000000..32190e1 --- /dev/null +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/ListBuilds.cshtml @@ -0,0 +1,41 @@ +@using HardwareShopContracts.ViewModels +@{ + ViewData["Title"] = "Получение списка"; +} + +@model List + +@section Header { +
+ +
+} +
+

Список сборок

+
\ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/MainStorekeeper.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/MainStorekeeper.cshtml index d40ccd4..d1b62d3 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/MainStorekeeper.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/MainStorekeeper.cshtml @@ -1,11 +1,11 @@ @{ - ViewData["Title"] = "MainStorekeeper"; + ViewData["Title"] = "Основная страница для кладовщиков"; } @section Header {
-
+
+ +
}
привет, мы в заказах diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Report.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Report.cshtml new file mode 100644 index 0000000..086245f --- /dev/null +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Report.cshtml @@ -0,0 +1,36 @@ +@using HardwareShopContracts.ViewModels +@{ + ViewData["Title"] = "Отчет"; +} + +@section Header { +
+ +
+} \ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Worker/Build.cshtml b/HardwareShop/HardwareShopClientApp/Views/Worker/Build.cshtml index 107df0b..e081ca8 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Worker/Build.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Worker/Build.cshtml @@ -10,7 +10,7 @@ @section Header {