From 1dab9faa6251e8b3176be708928df9436bc60a17 Mon Sep 17 00:00:00 2001
From: m1aksim1 <kosheevmaksim228@gmail.com>
Date: Tue, 25 Apr 2023 17:31:19 +0400
Subject: [PATCH] fix

---
 ...j => SoftwareInstallationClientApp.csproj} |  0
 .../Views/Shared/_Layout.cshtml               |  2 +-
 ...roj => SoftwareInstallationRestApi.csproj} |  0
 ...roj => SoftwareInstallationShopApp.csproj} |  0
 .../{AddPastry.cshtml => AddPackage.cshtml}   |  0
 .../Views/Home/AddPackage2.cshtml             | 33 +++++++++++++++++++
 .../Views/Shared/_Layout.cshtml               |  2 +-
 SoftwareInstallation/SoftwareInstallation.sln |  6 ++--
 8 files changed, 38 insertions(+), 5 deletions(-)
 rename SoftwareInstallation/ConfectioneryClientApp/{ConfectioneryClientApp.csproj => SoftwareInstallationClientApp.csproj} (100%)
 rename SoftwareInstallation/ConfectioneryRestApi/{ConfectioneryRestApi.csproj => SoftwareInstallationRestApi.csproj} (100%)
 rename SoftwareInstallation/ConfectioneryShopApp/{ConfectioneryShopApp.csproj => SoftwareInstallationShopApp.csproj} (100%)
 rename SoftwareInstallation/ConfectioneryShopApp/Views/Home/{AddPastry.cshtml => AddPackage.cshtml} (100%)
 create mode 100644 SoftwareInstallation/ConfectioneryShopApp/Views/Home/AddPackage2.cshtml

diff --git a/SoftwareInstallation/ConfectioneryClientApp/ConfectioneryClientApp.csproj b/SoftwareInstallation/ConfectioneryClientApp/SoftwareInstallationClientApp.csproj
similarity index 100%
rename from SoftwareInstallation/ConfectioneryClientApp/ConfectioneryClientApp.csproj
rename to SoftwareInstallation/ConfectioneryClientApp/SoftwareInstallationClientApp.csproj
diff --git a/SoftwareInstallation/ConfectioneryClientApp/Views/Shared/_Layout.cshtml b/SoftwareInstallation/ConfectioneryClientApp/Views/Shared/_Layout.cshtml
index b00be1c..4a3a191 100644
--- a/SoftwareInstallation/ConfectioneryClientApp/Views/Shared/_Layout.cshtml
+++ b/SoftwareInstallation/ConfectioneryClientApp/Views/Shared/_Layout.cshtml
@@ -15,7 +15,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container-fluid">
-               <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Кондитерская</a>
+               <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Установка ПО</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
diff --git a/SoftwareInstallation/ConfectioneryRestApi/ConfectioneryRestApi.csproj b/SoftwareInstallation/ConfectioneryRestApi/SoftwareInstallationRestApi.csproj
similarity index 100%
rename from SoftwareInstallation/ConfectioneryRestApi/ConfectioneryRestApi.csproj
rename to SoftwareInstallation/ConfectioneryRestApi/SoftwareInstallationRestApi.csproj
diff --git a/SoftwareInstallation/ConfectioneryShopApp/ConfectioneryShopApp.csproj b/SoftwareInstallation/ConfectioneryShopApp/SoftwareInstallationShopApp.csproj
similarity index 100%
rename from SoftwareInstallation/ConfectioneryShopApp/ConfectioneryShopApp.csproj
rename to SoftwareInstallation/ConfectioneryShopApp/SoftwareInstallationShopApp.csproj
diff --git a/SoftwareInstallation/ConfectioneryShopApp/Views/Home/AddPastry.cshtml b/SoftwareInstallation/ConfectioneryShopApp/Views/Home/AddPackage.cshtml
similarity index 100%
rename from SoftwareInstallation/ConfectioneryShopApp/Views/Home/AddPastry.cshtml
rename to SoftwareInstallation/ConfectioneryShopApp/Views/Home/AddPackage.cshtml
diff --git a/SoftwareInstallation/ConfectioneryShopApp/Views/Home/AddPackage2.cshtml b/SoftwareInstallation/ConfectioneryShopApp/Views/Home/AddPackage2.cshtml
new file mode 100644
index 0000000..47c9546
--- /dev/null
+++ b/SoftwareInstallation/ConfectioneryShopApp/Views/Home/AddPackage2.cshtml
@@ -0,0 +1,33 @@
+@using SoftwareInstallationContracts.ViewModels;
+@using SoftwareInstallationDataModels.Models;
+
+@model Dictionary<int, (IPackageModel, int)>
+
+@{
+	ViewData["Title"] = "AddPackage";
+}
+<div class="text-center">
+	<h2 class="display-4">Пополнения магазина изделием</h2>
+</div>
+<form method="post">
+	<div class="row">
+		<div class="col-4">Выбранный магазин:</div>
+		<div class="col-8">
+			<select id="shop" name="shop" class="form-control" asp-items="@(new SelectList(@ViewBag.Shops, "Id", "Name"))"></select>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-4">Выбранное изделие:</div>
+		<div class="col-8">
+			<select id="package" name="package" class="form-control" asp-items="@(new SelectList(@ViewBag.Packages, "Id", "PackageName"))"></select>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-4">Количество:</div>
+		<div class="col-8"><input type="text" id="count" name="count"/></div>
+	</div>
+	<div class="row">
+		<div class="col-8"></div>
+		<div class="col-4"><input type="submit" value="Добавить" class="btn btn-primary" /></div>
+	</div>
+</form>
\ No newline at end of file
diff --git a/SoftwareInstallation/ConfectioneryShopApp/Views/Shared/_Layout.cshtml b/SoftwareInstallation/ConfectioneryShopApp/Views/Shared/_Layout.cshtml
index d56e644..ff6ba7b 100644
--- a/SoftwareInstallation/ConfectioneryShopApp/Views/Shared/_Layout.cshtml
+++ b/SoftwareInstallation/ConfectioneryShopApp/Views/Shared/_Layout.cshtml
@@ -15,7 +15,7 @@
     <header>
         <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
             <div class="container-fluid">
-               <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Кондитерская</a>
+               <a class="navbar-brand" asp-area="" asp-controller="Home" asp-action="Index">Установка ПО</a>
                 <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
                         aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
diff --git a/SoftwareInstallation/SoftwareInstallation.sln b/SoftwareInstallation/SoftwareInstallation.sln
index 8afe6a7..698ae3c 100644
--- a/SoftwareInstallation/SoftwareInstallation.sln
+++ b/SoftwareInstallation/SoftwareInstallation.sln
@@ -17,11 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftWareInstallationFileImp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftWareInstallationDatabaseImplement", "SoftWareInstallationDatabaseImplement\SoftWareInstallationDatabaseImplement.csproj", "{3DF577A0-54E7-4912-B655-294B6B14C020}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryShopApp", "ConfectioneryShopApp\ConfectioneryShopApp.csproj", "{55EBC047-882A-4B53-A573-3645B5EFB613}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationShopApp", "ConfectioneryShopApp\SoftwareInstallationShopApp.csproj", "{55EBC047-882A-4B53-A573-3645B5EFB613}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryRestApi", "ConfectioneryRestApi\ConfectioneryRestApi.csproj", "{5581D35C-8B25-4432-932F-C672536A3823}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationRestApi", "ConfectioneryRestApi\SoftwareInstallationRestApi.csproj", "{5581D35C-8B25-4432-932F-C672536A3823}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryClientApp", "ConfectioneryClientApp\ConfectioneryClientApp.csproj", "{D107DB0E-9F5C-4FEA-9C94-0E5520CD3BCE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SoftwareInstallationClientApp", "ConfectioneryClientApp\SoftwareInstallationClientApp.csproj", "{D107DB0E-9F5C-4FEA-9C94-0E5520CD3BCE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution