Merge remote-tracking branch 'origin/master'

# Conflicts:
#	PhoneStore/Controllers/PhonesController.cs
#	PhoneStore/PhoneStore.csproj
#	PhoneStore/Views/Phones/Create.cshtml
#	PhoneStore/Views/Phones/Index.cshtml

.gitignore

@@ -3,3 +3,4 @@ obj/
 /packages/
 riderModule.iml
 /_ReSharper.Caches/
+.idea
\ No newline at end of file

.idea/.idea.PhoneStore/.idea/.gitignore

-# Default ignored files
-/shelf/
-/workspace.xml
-# Rider ignored files
-/modules.xml
-/contentModel.xml
-/projectSettingsUpdater.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-.idea/
-bin/
-

PhoneStore/Controllers/BasketController.cs → PhoneStore/Controllers/BasketsController.cs

@@ -5,11 +5,11 @@ using PhoneStore.ViewModels;
 
 namespace PhoneStore.Controllers
 {
-    public class BasketController : Controller
+    public class BasketsController : Controller
     {
         private readonly IBasketService _basketService;
 
-        public BasketController(IBasketService basketService)
+        public BasketsController(IBasketService basketService)
         {
             _basketService = basketService;
         }

PhoneStore/Controllers/ErrorsController.cs

+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+using PhoneStore.ViewModels;
+
+namespace PhoneStore.Controllers
+{
+    public class ErrorsController : Controller
+    {
+        private readonly Dictionary<int, ErrorViewModel> _errorResolver;
+
+        public ErrorsController()
+        {
+            _errorResolver = new Dictionary<int, ErrorViewModel>();
+            _errorResolver.Add(404, new ErrorViewModel
+            {
+                StatusCode = 404,
+                Message = "Ресурс не найден",
+                Title = "Oops... Страница не найдена"
+            });
+            _errorResolver.Add(400, new ErrorViewModel
+            {
+                StatusCode = 400,
+                Message = "Сервер не смог обработать запрос",
+                Title = "Oops... Ошибка"
+            });
+            _errorResolver.Add(500, new ErrorViewModel
+            {
+                StatusCode = 500,
+                Message = "Сервер не смог обработать запрос",
+                Title = "Oops... Ошибка"
+            });
+            _errorResolver.Add(777, new ErrorViewModel
+            {
+                StatusCode = 777,
+                Message = "Сущность не найдена",
+                Title = "Oops... Ошибка"
+            });
+        }
+
+        [Route("Error/{statusCode}")]
+        [ActionName("Error")]
+        public IActionResult HttpStatusCodeHandler(int statusCode)
+        {
+            if (_errorResolver.ContainsKey(statusCode))
+            {
+                return View(_errorResolver[statusCode]);
+            }
+            return View(_errorResolver[404]);
+        }
+    }
+}
\ No newline at end of file

PhoneStore/Controllers/HomeController.cs

@@ -47,15 +47,10 @@ namespace PhoneStore.Controllers
         {
             return "tets";
         }
+
         public IActionResult Privacy()
         {
             return View();
         }
-
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Error()
-        {
-            return View(new ErrorViewModel {RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier});
-        }
     }
 }
\ No newline at end of file

PhoneStore/Controllers/OrdersController.cs

@@ -29,7 +29,7 @@ namespace PhoneStore.Controllers
         {
             var phone = _db.Phones.FirstOrDefault(p => p.Id == phoneId);
             if (phone is null)
-                return Content("Такого телефона нет.");
+                return RedirectToAction("Error", "Errors", new {statusCode = 777});
             Order order = new Order
             {
                 Phone = phone

PhoneStore/Controllers/PhonesController.cs

@@ -22,13 +22,13 @@ namespace PhoneStore.Controllers
         public IActionResult Index()
         {
             List<Phone> phones = _db.Phones.ToList();
+            
             return View(phones);
         }
 
         [HttpGet]
         public IActionResult Create()
         {
-            
             return View();
         }
         
@@ -40,6 +40,29 @@ namespace PhoneStore.Controllers
             return RedirectToAction("Index");
         }
 
+        [HttpGet]
+        public IActionResult Delete(int phoneId)
+        {
+            var phone = _db.Phones.FirstOrDefault(p => p.Id == phoneId);
+            if (phone is null)
+                return BadRequest();
+            
+            return View(phone);
+        }
+        
+        [HttpPost]
+        [ActionName("Delete")]
+        public IActionResult Confirm(int phoneId)
+        {
+            var phone = _db.Phones.FirstOrDefault(p => p.Id == phoneId);
+            if (phone is null)
+                return BadRequest();
+            _db.Phones.Remove(phone);
+            _db.SaveChanges();
+            
+            return RedirectToAction("Index");
+        }
+
         [HttpGet]
         public IActionResult Edit(int phoneId)
         {

PhoneStore/Migrations/20220616111154_AddBasketEntity.cs

-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace PhoneStore.Migrations
-{
-    public partial class AddBasketEntity : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Baskets",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "INTEGER", nullable: false)
-                        .Annotation("Sqlite:Autoincrement", true),
-                    PhoneId = table.Column<int>(type: "INTEGER", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Baskets", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_Baskets_Phones_PhoneId",
-                        column: x => x.PhoneId,
-                        principalTable: "Phones",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Baskets_PhoneId",
-                table: "Baskets",
-                column: "PhoneId");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Baskets");
-        }
-    }
-}

PhoneStore/Migrations/20220616111154_AddBasketEntity.Designer.cs → PhoneStore/Migrations/20220622133702_Init.Designer.cs

@@ -8,8 +8,8 @@ using PhoneStore.Models;
 namespace PhoneStore.Migrations
 {
     [DbContext(typeof(MobileContext))]
-    [Migration("20220616111154_AddBasketEntity")]
-    partial class AddBasketEntity
+    [Migration("20220622133702_Init")]
+    partial class Init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {

PhoneStore/Migrations/20220613142445_Initial.cs → PhoneStore/Migrations/20220622133702_Init.cs

@@ -2,7 +2,7 @@
 
 namespace PhoneStore.Migrations
 {
-    public partial class Initial : Migration
+    public partial class Init : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
@@ -21,6 +21,25 @@ namespace PhoneStore.Migrations
                     table.PrimaryKey("PK_Phones", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "Baskets",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    PhoneId = table.Column<int>(type: "INTEGER", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Baskets", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Baskets_Phones_PhoneId",
+                        column: x => x.PhoneId,
+                        principalTable: "Phones",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Orders",
                 columns: table => new
@@ -43,6 +62,11 @@ namespace PhoneStore.Migrations
                         onDelete: ReferentialAction.Cascade);
                 });
 
+            migrationBuilder.CreateIndex(
+                name: "IX_Baskets_PhoneId",
+                table: "Baskets",
+                column: "PhoneId");
+
             migrationBuilder.CreateIndex(
                 name: "IX_Orders_PhoneId",
                 table: "Orders",
@@ -51,6 +75,9 @@ namespace PhoneStore.Migrations
 
         protected override void Down(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropTable(
+                name: "Baskets");
+
             migrationBuilder.DropTable(
                 name: "Orders");
 

PhoneStore/Models/ErrorViewModel.cs

-using System;
-
-namespace PhoneStore.Models
-{
-    public class ErrorViewModel
-    {
-        public string RequestId { get; set; }
-
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-    }
-}
\ No newline at end of file

PhoneStore/PhoneStore.csproj

@@ -18,6 +18,7 @@
 
     <ItemGroup>
       <Folder Include="Phones" />
+      <Folder Include="Migrations" />
     </ItemGroup>
 
 </Project>

PhoneStore/Startup.cs

@@ -56,6 +56,7 @@ namespace PhoneStore
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
+                app.UseStatusCodePagesWithRedirects("/Error/{0}");
             }
             else
             {

PhoneStore/ViewModels/ErrorViewModel.cs

+namespace PhoneStore.ViewModels
+{
+    public class ErrorViewModel
+    {
+        public int StatusCode { get; set; }
+        public string Title { get; set; }
+        public string Message { get; set; }
+    }
+}
\ No newline at end of file

PhoneStore/Views/Basket/Add.cshtml → PhoneStore/Views/Baskets/Add.cshtml

@@ -7,4 +7,4 @@
 
 <h2>@Model.Status : @Model.Message</h2>
 
-<a asp-action="Index" asp-controller="Basket">Перейти в корзину</a>
+<a asp-action="Index" asp-controller="Baskets">Перейти в корзину</a>

PhoneStore/Views/Basket/Index.cshtml → PhoneStore/Views/Baskets/Index.cshtml

@@ -21,7 +21,7 @@
             <td>@basket.Phone.Name</td>
             <td>@basket.Phone.Company</td>
             <td>@basket.Phone.Price</td>
-            <td><a asp-route-id="@basket.PhoneId" asp-action="Remove" asp-controller="Basket" class="btn btn-outline-danger">Удалить из корзины</a></td>
+            <td><a asp-route-id="@basket.PhoneId" asp-action="Remove" asp-controller="Baskets" class="btn btn-outline-danger">Удалить из корзины</a></td>
         </tr>
     }
 </table>
\ No newline at end of file

PhoneStore/Views/Home/Index.cshtml

@@ -6,9 +6,3 @@
     <h1 class="display-4">Welcome</h1>
     <p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
 </div>
-
-<form asp-action="Test">
-    <input type="text" name="id" placeholder="id">
-    <input type="text" name="quantity" placeholder="quantity">
-    <button type="submit">Отправить</button>
-</form>
\ No newline at end of file

PhoneStore/Views/Phones/Create.cshtml

@@ -10,9 +10,18 @@
     <div class="phone_add_form col-md-6">
         <form asp-action="Create" asp-controller="Phones" method="post">
             <div class="form_row">
-                @{
-                    await Html.RenderPartialAsync("PartialViews/PhoneFormPartialView");
-                }
+                <label for="name">
+                    Наименование
+                    <input id="name" type="text" asp-for="Name">
+                </label>
+                <label for="company">
+                    Производитель
+                    <input id="company" type="text" asp-for="Company">
+                </label>
+                <label for="price">
+                    Стоимость
+                    <input id="price" type="text" asp-for="Price">
+                </label>
                 <button class="btn btn-outline-warning">Отправить</button>
             </div>
         </form>

PhoneStore/Views/Phones/Delete.cshtml

+@model Phone
+
+@{
+    ViewBag.Title = "title";
+    Layout = "_Layout";
+}
+
+<div class="card text-center">
+    <div class="card-header">
+        Ахтунг!
+    </div>
+    <div class="card-body">
+        <h5 class="card-title">Вы уверены?</h5>
+        <p class="card-text">Данные могут быть безвозвратно удалены.</p>
+        <form asp-action="Delete" asp-controller="Phones" method="post">
+            <input type="text" name="phoneId" value="@Model.Id" hidden>
+            <a class="btn btn-outline-warning" asp-action="Index">Отмена</a>
+            <button class="btn btn-danger">Удалить</button>
+        </form>
+    </div>
+</div>
\ No newline at end of file

PhoneStore/Views/Phones/Index.cshtml

 @model List<Phone>
 
 @{
-    ViewBag.Title = @"title";
+    ViewBag.Title = "Смартфоны";
     Layout = "_Layout";
 }
 <a asp-action="Create" asp-controller="Phones">Добавить устройство</a>
@@ -31,7 +31,7 @@ else
                 <td>
                     <a asp-route-id="@phone.Id"
                        asp-action="Add"
-                       asp-controller="Basket"
+                       asp-controller="Baskets"
                        class="btn btn-outline-warning">
                         В корзину
                     </a>
@@ -52,9 +52,16 @@ else
                         Изменить
                     </a>
                 </td>
+                <td>
+                    <a asp-route-phoneId="@phone.Id"
+                       asp-action="Delete"
+                       asp-controller="Phones"
+                       class="btn btn-danger">
+                        Удалить
+                    </a>
+                </td>
             </tr>
         }
     </table>
 }
 
-

PhoneStore/Views/Shared/Error.cshtml

-@model ErrorViewModel
-@{
-    ViewData["Title"] = "Error";
-}
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
-
-@if (Model.ShowRequestId)
-{
-    <p>
-        <strong>Request ID:</strong> <code>@Model.RequestId</code>
-    </p>
-}
-
-<h3>Development Mode</h3>
-<p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
-</p>
-<p>
-    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
-    It can result in displaying sensitive information from exceptions to end users.
-    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
-    and restarting the app.
-</p>
\ No newline at end of file