Mass refactoring

author: Sergey Chebotar <s.chebotar@gmail.com> 2023-06-03 07:41:46 +0300
committer: Sergey Chebotar <s.chebotar@gmail.com> 2023-06-03 07:41:46 +0300
commit: 3bade8859bcd938b85c39ab16eaa0dcf8e01535f (patch)
tree: 9157e3f27d8007206c12d5ec0cf5f2936295c0e7 /Views
parent: 81c1fc0c14253457c3c4fc24735e787ace1db70b (diff)
8 files changed, 171 insertions, 157 deletions
diff --git a/Views/Account/Create.cshtml b/Views/Account/Create.cshtml
index 2fff64a..f871673 100644
--- a/Views/Account/Create.cshtml
+++ b/Views/Account/Create.cshtml
@@ -5,7 +5,7 @@
 <html>
 
 <head>
-    <title>User Acccounts</title>
+    <title>User Acсounts</title>
     <link href="/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
 </head>
 
@@ -14,7 +14,7 @@
     <form method="post">
         <div asp-validation-summary="All" class="text-danger"></div>
         <div class="form-group">
-            <label>User Name</label>
+            <label>Имя пользователя</label>
             <input name="UserName" class="form-control" value="@Model.UserName" />
         </div>
         <div class="form-group">
@@ -22,11 +22,11 @@
             <input name="Email" class="form-control" value="@Model.Email" />
         </div>
         <div class="form-group">
-            <label>Password</label>
+            <label>Пароль</label>
             <input name="Password" class="form-control" value="" />
         </div>
         <div class="py-2">
-            <button type="submit" class="btn btn-primary">Submit</button>
+            <button type="submit" class="btn btn-primary">Сохранить</button>
             <a class="btn btn-secondary" asp-page="list">Back</a>
         </div>
     </form>
diff --git a/Views/Bundle/Create.cshtml b/Views/Bundle/Create.cshtml
deleted file mode 100644
index 5197909..0000000
--- a/Views/Bundle/Create.cshtml
+++ /dev/null
@@ -1,33 +0,0 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@model MyDarling.Models.UnderwearBundle
-
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>New bundle</title>
-    <link href="/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
-</head>
-
-<body>
-    <container>
-        <form asp-action="Create" method="post" class="m-2">
-            <div asp-validation-summary="All"></div>
-            <div class="form-group">
-                <label asp-for="Name" class="form-label">Name:</label>
-                <input asp-for="Name" class="form-control" />
-            </div>
-            <div class="form-group">
-                <label asp-for="Description" class="form-label">Descrition:</label>
-                @Html.TextAreaFor(model => model.Description, new { @class="form-control", @rows = 2 })
-            </div>
-            <div class="form-group">
-                <label asp-for="Price" class="form-label">Price:</label>
-                <input asp-for="Price" class="form-control" />
-            </div>
-            <button type="submit" class="btn btn-primary mt-3">Submit</button>
-        </form>
-    </container>
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/Views/Bundle/Details.cshtml b/Views/Bundle/Details.cshtml
deleted file mode 100644
index ac13624..0000000
--- a/Views/Bundle/Details.cshtml
+++ /dev/null
@@ -1,53 +0,0 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@model MyDarling.Models.UnderwearBundle
-
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>Bundles list</title>
-    <link href="/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
-</head>
-
-<body>
-    <container>
-        <form asp-action="Edit" asp-route-id="@Model.Id" method="post" enctype="multipart/form-data" class="m-2">
-            <div asp-validation-summary="All"></div>
-            <div class="form-group">
-                <label asp-for="Name" class="form-label">Name:</label>
-                <input asp-for="Name" class="form-control" />
-            </div>
-            <div class="form-group">
-                <label asp-for="Description" class="form-label">Description:</label>
-                @Html.TextAreaFor(model => model.Description, new { @class="form-control", @rows = 2 })
-            </div>
-            <div>
-                <label class="form-label">Figures:</label>
-                <div class="row gx-4 gx-lg-5 row-cols-2 row-cols-md-3 row-cols-xl-4">
-                    @foreach (var figure in @Model.Figures)
-                    {
-                        <div class="col mb-5">
-                            <div class="thumbnail h-100">
-                                <a asp-controller="Figure" asp-action="Details" asp-route-id="@figure.Id">
-                                    <img src="@figure.FilePath" class="img-thumbnail img-fluid" alt="@figure.Description">
-                                </a>
-                            </div>
-                        </div>
-                    }
-                </div>
-            </div>
-            <div class="form-group">
-                <input type="file" name="file" />
-            </div>
-            <div class="form-group">
-                <label asp-for="Price" class="form-label">Price:</label>
-                <input asp-for="Price" class="form-control" />
-            </div>
-            <button type="submit" class="btn btn-primary mt-3">Save</button>
-            <button asp-action="Delete" asp-route-id="@Model.Id" method="post"
-                class="btn btn-primary mt-3">Delete</button>
-        </form>
-    </container>
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/Views/Bundle/Index.cshtml b/Views/Bundle/Index.cshtml
deleted file mode 100644
index 9e1f293..0000000
--- a/Views/Bundle/Index.cshtml
+++ /dev/null
@@ -1,49 +0,0 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@model IQueryable<MyDarling.Models.UnderwearBundle>
-
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>Bundles list</title>
-    <link href="/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
-</head>
-
-<body>
-    <div class="container-fluid">
-        <div class="row">
-            <div class="col">
-                <span class="navbar-brand ml-2">Underwear bundle list</span>
-            </div>
-            <div class="col-2 text-right">
-                <a class="btn btn-sm btn-primary" href="/account/logout">Log Out</a>
-            </div>
-        </div>
-    </div>
-    <container>
-        <table class="table table-striped">
-            <thead>
-                <tr>
-                    <th scope="col">#</th>
-                    <th scope="col">Name</th>
-                    <th scope="col">Descrition</th>
-                    <th scope="col">Price</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach (var bundle in Model)
-                {
-                    <tr>
-                        <th scope="row">@bundle.Id</th>
-                        <td><a asp-action="Details" asp-route-id="@bundle.Id">@bundle.Name</a></td>
-                        <td>@bundle.Description</td>
-                        <td>@bundle.Price</td>
-                    </tr>
-                }
-            </tbody>
-        </table>
-        <a asp-action="Create">Add bundle</a>
-    </container>
-</body>
-
-</html>
-\ No newline at end of file
diff --git a/Views/Figure/Details.cshtml b/Views/Figure/Details.cshtml
index ace2a9a..3bb43ea 100644
--- a/Views/Figure/Details.cshtml
+++ b/Views/Figure/Details.cshtml
@@ -5,30 +5,39 @@
 <html>
 
 <head>
-    <title>Figure</title>
+    <title>Редактирование фотографии</title>
     <link href="/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
 </head>
 
 <body>
-    <div class="row gx-4 gx-lg-5 row-cols-2 row-cols-md-3 row-cols-xl-4 justify-content-center">
-        <div class="col mb-5">
-            <div class="thumbnail h-100">
-                <a href="@Model.FilePath">
-                    <img src="@Model.FilePath" class="img-thumbnail img-fluid" alt="@Model.Description">
-                </a>
+    <nav class="navbar navbar-dark bg-primary">
+        <a class="navbar-brand mx-4" href="/Products"><img height="30" src="/assets/img/logo.svg"></a>
+        <a href="/Account/logout"><button class="btn btn-outline-light mx-4">Выйти</button></a>
+    </nav>
+    <div class="container">
+        <div class="row row-cols-xl-3 row-cols-md-2 justify-content-center mt-3">
+            <div class="col">
+                <div class="thumbnail">
+                    @{
+                        var filePath = $"/Content/{Model.ProductId}/{Model.Id}.jpg";
+                    }
+                    <a href="@filePath">
+                        <img src="@filePath" class="img-thumbnail img-fluid" alt="@Model.Description">
+                    </a>
+                </div>
+                <form asp-action="Edit" asp-route-id="@Model.Id" method="post" class="m-2">
+                    <div asp-validation-summary="All"></div>
+                    <div class="form-group">
+                        <label asp-for="Description" class="form-label">Описание:</label>
+                        @Html.TextAreaFor(model => model.Description, new { @class="form-control", @rows = 2 })
+                    </div>
+                    <button type="submit" class="btn btn-outline-success mt-3">Сохранить</button>
+                    <button asp-action="Delete" asp-route-id="@Model.Id" method="post"
+                        class="btn btn-outline-danger mt-3">Удалить</button>
+                </form>
             </div>
         </div>
     </div>
-    <form asp-action="Edit" asp-route-id="@Model.Id" method="post" class="m-2">
-        <div asp-validation-summary="All"></div>
-        <div class="form-group">
-            <label asp-for="Description" class="form-label">Description:</label>
-            @Html.TextAreaFor(model => model.Description, new { @class="form-control", @rows = 2 })
-        </div>
-        <button type="submit" class="btn btn-primary mt-3">Save</button>
-        <button asp-action="Delete" asp-route-id="@Model.Id" method="post" class="btn btn-primary mt-3">Delete</button>
-    </form>
-
 </body>
 
-</html>
+</html>
+\ No newline at end of file
diff --git a/Views/Products/Create.cshtml b/Views/Products/Create.cshtml
new file mode 100644
index 0000000..4a6732c
--- /dev/null
+++ b/Views/Products/Create.cshtml
@@ -0,0 +1,37 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@model MyDarling.Models.Product
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>New bundle</title>
+    <link href="/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+</head>
+
+<body>
+    <nav class="navbar navbar-dark bg-primary" aria-label="breadcrumb">
+        <a class="navbar-brand mx-4" href="/Products"><img height="30" src="/assets/img/logo.svg"></a>
+        <a href="/Account/logout"><button class="btn btn-outline-light mx-4">Выйти</button></a>
+    </nav>
+    <div class="row container-fluid justify-content-center">
+        <form asp-action="Create" method="post" class="m-2 col-8">
+            <div asp-validation-summary="All"></div>
+            <div class="form-group">
+                <label asp-for="Name" class="form-label">Название:</label>
+                <input asp-for="Name" class="form-control" />
+            </div>
+            <div class="form-group">
+                <label asp-for="Description" class="form-label">Описание:</label>
+                @Html.TextAreaFor(model => model.Description, new { @class="form-control", @rows = 2 })
+            </div>
+            <div class="form-group">
+                <label asp-for="Price" class="form-label">Цена:</label>
+                <input asp-for="Price" class="form-control" />
+            </div>
+            <button type="submit" class="btn btn-outline-success mt-3">Сохранить</button>
+        </form>
+    </div>
+</body>
+
+</html>
+\ No newline at end of file
diff --git a/Views/Products/Details.cshtml b/Views/Products/Details.cshtml
new file mode 100644
index 0000000..3e45748
--- /dev/null
+++ b/Views/Products/Details.cshtml
@@ -0,0 +1,60 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@model MyDarling.Models.Product
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>Комплект: @Model.Name</title>
+    <link href="/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+</head>
+
+<body>
+    <nav class="navbar navbar-dark bg-primary" aria-label="breadcrumb">
+        <a class="navbar-brand mx-4" href="/Products"><img height="30" src="/assets/img/logo.svg"></a>
+        <a href="/Account/logout"><button class="btn btn-outline-light mx-4">Выйти</button></a>
+    </nav>
+    <div class="row container-fluid justify-content-center">
+        <form asp-action="Edit" asp-route-id="@Model.Id" method="post" enctype="multipart/form-data" class="m-2 col-8">
+            <div asp-validation-summary="All"></div>
+            <div class="form-group">
+                <label asp-for="Name" class="form-label">Название:</label>
+                <input asp-for="Name" class="form-control" />
+            </div>
+            <div class="form-group">
+                <label asp-for="Description" class="form-label">Описание:</label>
+                @Html.TextAreaFor(model => model.Description, new { @class="form-control", @rows = 2 })
+            </div>
+            <div class="form-group">
+                <label asp-for="Price" class="form-label">Цена:</label>
+                <input asp-for="Price" class="form-control" />
+            </div>
+            <div>
+                <label class="form-label">Фотографии:</label>
+                <div class="row row-cols-md-2 row-cols-xl-3">
+                    @foreach (var figure in @Model.Figures)
+                    {
+                        <div class="mb-3">
+                            <div class="thumbnail h-100">
+                                <a href="/Figure/Details/@figure.Id">
+                                    @{
+                                        var filePath = $"/Content/{@Model.Id}/{figure.Id}.jpg";
+                                    }
+                                    <img src="@filePath" class="img-thumbnail img-fluid" alt="@figure.Description">
+                                </a>
+                            </div>
+                        </div>
+                    }
+                    <div class="form-group mb-3">
+                        <input type="file" name="file" />
+                    </div>
+                </div>
+            </div>
+            <button type="submit" class="btn btn-outline-success">Сохранить</button>
+            <button asp-action="Delete" asp-route-id="@Model.Id" method="post"
+                class="btn btn-outline-danger">Удалить</button>
+        </form>
+    </div>
+</body>
+
+</html>
+\ No newline at end of file
diff --git a/Views/Products/Index.cshtml b/Views/Products/Index.cshtml
new file mode 100644
index 0000000..0725bb6
--- /dev/null
+++ b/Views/Products/Index.cshtml
@@ -0,0 +1,43 @@
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@model IQueryable<MyDarling.Models.Product>
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>My Darling Underwear</title>
+    <link href="/lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
+</head>
+
+<body>
+    <nav class="navbar navbar-dark bg-primary">
+        <a class="navbar-brand mx-4" href="/Products"><img height="30" src="/assets/img/logo.svg"></a>
+        <a href="/Account/logout"><button class="btn btn-outline-light mx-4">Выйти</button></a>
+    </nav>
+    <div class="row container-fluid justify-content-center row-cols-xl-2">
+        <div class="col">
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th scope="col">Название</th>
+                        <th scope="col">Описание</th>
+                        <th scope="col">Цена</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach (var bundle in Model)
+                    {
+                        <tr>
+                            <td><a asp-action="Details" asp-route-id="@bundle.Id">@bundle.Name</a></td>
+                            <td>@bundle.Description</td>
+                            <td>@bundle.Price</td>
+                        </tr>
+                    }
+                </tbody>
+            </table>
+            <a asp-action="Create"><button class="btn btn-primary">Добавить</button></a>
+        </div>
+    </div>
+</body>
+
+</html>
+\ No newline at end of file
author	Sergey Chebotar <s.chebotar@gmail.com>	2023-06-03 07:41:46 +0300
committer	Sergey Chebotar <s.chebotar@gmail.com>	2023-06-03 07:41:46 +0300
commit	3bade8859bcd938b85c39ab16eaa0dcf8e01535f (patch)
tree	9157e3f27d8007206c12d5ec0cf5f2936295c0e7 /Views
parent	81c1fc0c14253457c3c4fc24735e787ace1db70b (diff)