favicon updated, product upsert page updated, order list page updated

imadrig · Nov 30, 2023 · b4d8e0b · b4d8e0b
1 parent 9a0d888
commit b4d8e0b
Show file tree

Hide file tree

Showing 24 changed files with 14 additions and 40 deletions.
diff --git a/.vs/PiecesCandyCo/DesignTimeBuild/.dtbcache.v2 b/.vs/PiecesCandyCo/DesignTimeBuild/.dtbcache.v2
diff --git a/...419654c-99fc-4865-825f-51ec5a79def3.vsidx → ...ecf89f8-1d9c-458b-8067-7367cf6a549e.vsidx b/...419654c-99fc-4865-825f-51ec5a79def3.vsidx → ...ecf89f8-1d9c-458b-8067-7367cf6a549e.vsidx
diff --git a/.vs/PiecesCandyCo/FileContentIndex/7d8f1e72-3d9e-4ddd-9661-de7f290e04de.vsidx b/.vs/PiecesCandyCo/FileContentIndex/7d8f1e72-3d9e-4ddd-9661-de7f290e04de.vsidx
diff --git a/.vs/PiecesCandyCo/FileContentIndex/974e09c5-3a0f-4f39-aa46-a01aa3965b43.vsidx b/.vs/PiecesCandyCo/FileContentIndex/974e09c5-3a0f-4f39-aa46-a01aa3965b43.vsidx
diff --git a/.vs/PiecesCandyCo/FileContentIndex/9ae88f65-cb67-49f9-9be2-c7e1e7117918.vsidx b/.vs/PiecesCandyCo/FileContentIndex/9ae88f65-cb67-49f9-9be2-c7e1e7117918.vsidx
diff --git a/.vs/PiecesCandyCo/FileContentIndex/db58f92c-29c8-454f-90c7-ded430eda323.vsidx b/.vs/PiecesCandyCo/FileContentIndex/db58f92c-29c8-454f-90c7-ded430eda323.vsidx
diff --git a/.vs/PiecesCandyCo/FileContentIndex/e9828688-38be-44b6-83da-a4cef43d0d2f.vsidx b/.vs/PiecesCandyCo/FileContentIndex/e9828688-38be-44b6-83da-a4cef43d0d2f.vsidx
diff --git a/.vs/PiecesCandyCo/FileContentIndex/ea667766-9cc1-4595-9d28-565f67e9ea4c.vsidx b/.vs/PiecesCandyCo/FileContentIndex/ea667766-9cc1-4595-9d28-565f67e9ea4c.vsidx
diff --git a/.vs/PiecesCandyCo/v17/.suo b/.vs/PiecesCandyCo/v17/.suo
diff --git a/PiecesCandyCo/Areas/Admin/Views/Order/Index.cshtml b/PiecesCandyCo/Areas/Admin/Views/Order/Index.cshtml
@@ -32,34 +32,7 @@
                 <th></th>
             </tr>
         </thead>
-        <!--<tbody>-->
-        <!-- use at symbol to use again -- foreach(var product in Model)
-         {
-         <tr>
-             <td>product.Name</td>
-             <td>product.Price</td>
-             <td>product.Price10</td>
-             <td>product.Category.Name</td>
-             <td>product.Description</td>
 
-             <td>
-                 <div col-6>
-                     <a asp-controller="Product" asp-action="Upsert" asp-route-id="product.Id" class="btn btn-outline-primary btn-sm">
-                                 <i class="bi bi-pencil-square"></i>  Edit
-                     </a>
-                 </div>
-             </td>
-             <td>
-                 <div col-6>
-                     <a asp-controller="Product" asp-action="Delete" asp-route-id="product.Id" class="btn btn-outline-danger btn-sm">
-                         <i class="bi bi-trash3-fill"></i>  Delete
-                     </a>
-                 </div>
-             </td>
-
-         </tr>
-             } -->
-        <!--</tbody>-->
     </table>
 </div>
 

diff --git a/PiecesCandyCo/Areas/Admin/Views/Product/Upsert.cshtml b/PiecesCandyCo/Areas/Admin/Views/Product/Upsert.cshtml
@@ -7,7 +7,7 @@
         <div class="col-10">
             <div class="border p-3 mt-4">
                 <div class="row pb-2">
-                    <h2 class="text-primary">@(Model.Product.Id != 0 ? "Update " : "Create ") New Product</h2>
+                    <h2 class="text-primary">@(Model.Product.Id != 0 ? "Update " : "Create ") Product</h2>
                     <hr />
 
                 </div>

diff --git a/PiecesCandyCo/Views/Shared/_Layout.cshtml b/PiecesCandyCo/Views/Shared/_Layout.cshtml
@@ -7,6 +7,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <link rel="icon" href="/favicon-32x32_1.png" type="image/x-icon">
     <title>@ViewData["Title"] Pieces Candy Co.</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
     <link rel="stylesheet" href="~/PiecesCandyCo.styles.css" asp-append-version="true" />

diff --git a/PiecesCandyCo/bin/Debug/net7.0/PiecesCandyCo.dll b/PiecesCandyCo/bin/Debug/net7.0/PiecesCandyCo.dll
diff --git a/PiecesCandyCo/bin/Debug/net7.0/PiecesCandyCo.pdb b/PiecesCandyCo/bin/Debug/net7.0/PiecesCandyCo.pdb
diff --git a/PiecesCandyCo/bin/Debug/net7.0/PiecesCandyCo.staticwebassets.runtime.json b/PiecesCandyCo/bin/Debug/net7.0/PiecesCandyCo.staticwebassets.runtime.json
diff --git a/PiecesCandyCo/obj/Debug/net7.0/PiecesCandyCo.dll b/PiecesCandyCo/obj/Debug/net7.0/PiecesCandyCo.dll
diff --git a/PiecesCandyCo/obj/Debug/net7.0/PiecesCandyCo.pdb b/PiecesCandyCo/obj/Debug/net7.0/PiecesCandyCo.pdb
diff --git a/PiecesCandyCo/obj/Debug/net7.0/staticwebassets.build.json b/PiecesCandyCo/obj/Debug/net7.0/staticwebassets.build.json
@@ -1,6 +1,6 @@
 {
   "Version": 1,
-  "Hash": "FIxzsJ9bwW2e88esODFUhsxZHoaEaesblL/owtrWlnE=",
+  "Hash": "S2vSvWn8vW2AQNMMSR6dUMDFjjRQO0+yAZNdXZsTDa4=",
   "Source": "PiecesCandyCo",
   "BasePath": "_content/PiecesCandyCo",
   "Mode": "Default",
@@ -1088,12 +1088,12 @@
       "OriginalItemSpec": "wwwroot\\css\\site.css"
     },
     {
-      "Identity": "C:\\Users\\PC-IM\\repos\\PiecesCandyCo\\PiecesCandyCo\\wwwroot\\favicon.ico",
+      "Identity": "C:\\Users\\PC-IM\\repos\\PiecesCandyCo\\PiecesCandyCo\\wwwroot\\favicon-32x32_1.png",
       "SourceId": "PiecesCandyCo",
       "SourceType": "Discovered",
       "ContentRoot": "C:\\Users\\PC-IM\\repos\\PiecesCandyCo\\PiecesCandyCo\\wwwroot\\",
       "BasePath": "_content/PiecesCandyCo",
-      "RelativePath": "favicon.ico",
+      "RelativePath": "favicon-32x32_1.png",
       "AssetKind": "All",
       "AssetMode": "All",
       "AssetRole": "Primary",
@@ -1102,7 +1102,7 @@
       "AssetTraitValue": "",
       "CopyToOutputDirectory": "Never",
       "CopyToPublishDirectory": "PreserveNewest",
-      "OriginalItemSpec": "wwwroot\\favicon.ico"
+      "OriginalItemSpec": "wwwroot\\favicon-32x32_1.png"
     },
     {
       "Identity": "C:\\Users\\PC-IM\\repos\\PiecesCandyCo\\PiecesCandyCo\\wwwroot\\images\\logos\\Pieces.png",

diff --git a/PiecesCandyCo/obj/Debug/net7.0/staticwebassets.development.json b/PiecesCandyCo/obj/Debug/net7.0/staticwebassets.development.json
diff --git a/PiecesCandyCo/obj/Debug/net7.0/staticwebassets.pack.json b/PiecesCandyCo/obj/Debug/net7.0/staticwebassets.pack.json
@@ -9,8 +9,8 @@
       "PackagePath": "staticwebassets\\css\\site.css"
     },
     {
-      "Id": "C:\\Users\\PC-IM\\repos\\PiecesCandyCo\\PiecesCandyCo\\wwwroot\\favicon.ico",
-      "PackagePath": "staticwebassets\\favicon.ico"
+      "Id": "C:\\Users\\PC-IM\\repos\\PiecesCandyCo\\PiecesCandyCo\\wwwroot\\favicon-32x32_1.png",
+      "PackagePath": "staticwebassets\\favicon-32x32_1.png"
     },
     {
       "Id": "C:\\Users\\PC-IM\\repos\\PiecesCandyCo\\PiecesCandyCo\\wwwroot\\images\\logos\\Pieces.png",

diff --git a/...g/net7.0/staticwebassets/msbuild.PiecesCandyCo.Microsoft.AspNetCore.StaticWebAssets.props b/...g/net7.0/staticwebassets/msbuild.PiecesCandyCo.Microsoft.AspNetCore.StaticWebAssets.props
@@ -16,12 +16,12 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\css\site.css))</OriginalItemSpec>
     </StaticWebAsset>
-    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\favicon.ico))">
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\favicon-32x32_1.png))">
       <SourceType>Package</SourceType>
       <SourceId>PiecesCandyCo</SourceId>
       <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
       <BasePath>_content/PiecesCandyCo</BasePath>
-      <RelativePath>favicon.ico</RelativePath>
+      <RelativePath>favicon-32x32_1.png</RelativePath>
       <AssetKind>All</AssetKind>
       <AssetMode>All</AssetMode>
       <AssetRole>Primary</AssetRole>
@@ -30,7 +30,7 @@
       <AssetTraitValue></AssetTraitValue>
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\favicon.ico))</OriginalItemSpec>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\favicon-32x32_1.png))</OriginalItemSpec>
     </StaticWebAsset>
     <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\images\logos\Pieces.png))">
       <SourceType>Package</SourceType>

diff --git a/PiecesCandyCo/wwwroot/favicon-32x32_1.png b/PiecesCandyCo/wwwroot/favicon-32x32_1.png
diff --git a/PiecesCandyCo/wwwroot/favicon.ico b/PiecesCandyCo/wwwroot/favicon.ico
diff --git a/PiecesCandyCo/wwwroot/js/order.js b/PiecesCandyCo/wwwroot/js/order.js
@@ -18,7 +18,7 @@ function loadDataTable() {
                 data: 'id',
                 "render": function (data) {
                     return `<div class="w-75" role="group">
-                    <a href="/admin/order/details?orderId=${data}" class="btn btn-outline-primary btn-sm mx-2"> <i class="bi bi-pencil-square"></i></a>
+                    <a href="/admin/order/details?orderId=${data}" class="btn btn-outline-primary btn-sm mx-2"> <i class="bi bi-binoculars-fill"></i></a>
                     </div>`