From bd8df1444a8fb0364fb02af303112098abb12d4f Mon Sep 17 00:00:00 2001 From: AndriiSyrotenko Date: Sun, 15 Oct 2023 22:14:31 +0000 Subject: [PATCH] added product and wishlist model --- .../Models/ProductModel.cs | 20 +++++++++++++++++++ .../Models/WishlistModel.cs | 12 +++++++++++ .../Pages/Cart.cshtml | 3 --- .../Pages/Cart.cshtml.cs | 16 ++++++--------- .../Pages/Wishlist.cshtml | 4 ++-- .../Pages/Wishlist.cshtml.cs | 20 +++++++------------ 6 files changed, 47 insertions(+), 28 deletions(-) create mode 100644 ShoppingAssistantWebClient.Web/Models/ProductModel.cs create mode 100644 ShoppingAssistantWebClient.Web/Models/WishlistModel.cs diff --git a/ShoppingAssistantWebClient.Web/Models/ProductModel.cs b/ShoppingAssistantWebClient.Web/Models/ProductModel.cs new file mode 100644 index 0000000..8f6af3e --- /dev/null +++ b/ShoppingAssistantWebClient.Web/Models/ProductModel.cs @@ -0,0 +1,20 @@ +namespace ShoppingAssistantWebClient.Web.Models; + +public class ProductModel +{ + public required string Id {get; set;} + + public required string Url {get; set;} + + public required string Name {get; set;} + + public required string Description {get; set;} + + public required double Rating {get; set;} + + public required string[] ImagesUrls {get; set;} + + public required bool WasOpened {get; set;} + + public required string WishlistId {get; set;} +} \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Models/WishlistModel.cs b/ShoppingAssistantWebClient.Web/Models/WishlistModel.cs new file mode 100644 index 0000000..29f73e2 --- /dev/null +++ b/ShoppingAssistantWebClient.Web/Models/WishlistModel.cs @@ -0,0 +1,12 @@ +namespace ShoppingAssistantWebClient.Web.Models; + +public class WishlistModel +{ + public required string Id {get; set;} + + public required string Name {get; set;} + + public required string Type {get; set;} + + public required string CreateById {get; set;} +} \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Pages/Cart.cshtml b/ShoppingAssistantWebClient.Web/Pages/Cart.cshtml index 406d0b8..05baa68 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Cart.cshtml +++ b/ShoppingAssistantWebClient.Web/Pages/Cart.cshtml @@ -84,9 +84,6 @@ @{ string price = "N/A"; - if(!(product.Price is null)) { - price = "$" + product.Price.ToString(); - } } diff --git a/ShoppingAssistantWebClient.Web/Pages/Cart.cshtml.cs b/ShoppingAssistantWebClient.Web/Pages/Cart.cshtml.cs index 5d99cb5..6126561 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Cart.cshtml.cs +++ b/ShoppingAssistantWebClient.Web/Pages/Cart.cshtml.cs @@ -1,14 +1,16 @@ +using Microsoft.AspNetCore.Authorization.Infrastructure; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using ShoppingAssistantWebClient.Web.Models; namespace ShoppingAssistantWebClient.Web.Pages { public class CartModel : PageModel { - public List products = new List { - new Product {Description = "HDMI cabel HDMI cabel HDMI cabel HDMI cabel HDMI cabel HDMI cabelHDMI cabel", Rating = 4.0, Price = 12}, - new Product {Description = "super mega hdmi cabel", Rating = 3.8, Price = 13.11}, - new Product {Description = "", Rating = 4.0} + public List products = new List { + new ProductModel {Id = "0", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "0"}, + new ProductModel {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new ProductModel {Id = "2", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "2"} }; public void OnGet() @@ -16,10 +18,4 @@ namespace ShoppingAssistantWebClient.Web.Pages } } - - public class Product { - public string Description {get; set;} - public double? Rating {get; set;} - public double? Price {get; set;} - } } diff --git a/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml b/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml index 1c5b778..a1f555a 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml +++ b/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml @@ -45,7 +45,7 @@ Chat name Type - Time + CreatedById @@ -58,7 +58,7 @@ @Html.DisplayFor(modelItem => item.Name) @Html.DisplayFor(modelItem => item.Type) - @Html.DisplayFor(modelItem => item.Date) + @Html.DisplayFor(modelItem => item.CreateById)
diff --git a/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml.cs b/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml.cs index 4fa72c0..38fe688 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml.cs +++ b/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml.cs @@ -1,34 +1,28 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; +using ShoppingAssistantWebClient.Web.Models; namespace ShoppingAssistantWebClient.Web.Pages { public class WishlistModel : PageModel { - public List wishlist = new List{ - new Wishlist {Id = 0, Name = "Chat1", Type="product", Date="21.09.2023"}, - new Wishlist {Id = 1, Name = "Chat2", Type="gift", Date="29.09.2023"}, - new Wishlist {Id = 2, Name = "Chat3", Type="product", Date="02.10.2023"} + public List wishlist = new List{ + new Models.WishlistModel {Id = "0", Name = "Chat1", Type="product", CreateById="0"}, + new Models.WishlistModel {Id = "1", Name = "Chat2", Type="gift", CreateById="1"}, + new Models.WishlistModel {Id = "2", Name = "Chat3", Type="product", CreateById="2"} }; public void OnGet() { } - public void OnPostDelete(int id) { + public void OnPostDelete(string id) { var item = wishlist.FirstOrDefault(wishlist => wishlist.Id == id); - wishlist.RemoveAt(id); + wishlist.RemoveAt(Int32.Parse(id)); } public IActionResult OnPostMoveToChat() { return RedirectToPage("Index"); } } - - public class Wishlist { - public int Id {get; set;} - public string Name {get; set;} - public string Type {get; set;} - public string Date {get; set;} - } }