From da7936bfb281252183d2f6cdaa050fde8af4c10f Mon Sep 17 00:00:00 2001 From: AndriiSyrotenko Date: Thu, 2 Nov 2023 18:14:07 +0000 Subject: [PATCH 1/7] add cards and cart --- .vscode/settings.json | 12 +- .../CustomMiddlewares/GlobalUserMiddleware.cs | 32 +- .../Models/Product.cs | 38 +- .../Models/Wishlist.cs | 22 +- .../Pages/Cards.razor | 86 +++ .../Pages/Cards.razor.cs | 65 ++ .../Pages/Cards.razor.css | 244 ++++++ .../Pages/Cart.razor | 61 +- .../Pages/Cart.razor.cs | 68 +- .../Pages/Cart.razor.css | 193 +++-- .../Pages/Chat.cshtml | 227 ------ .../Pages/Chat.cshtml.cs | 21 - .../Pages/Chat.razor.cs | 28 +- .../Pages/Chat.razor.css | 720 +++++++++--------- .../Pages/Error.cshtml | 42 - .../Pages/Error.cshtml.cs | 26 - .../Pages/Login.cshtml | 8 + .../Pages/Login.cshtml.cs | 12 + .../Pages/Wishlist.cshtml | 75 -- .../Pages/Wishlist.cshtml.cs | 28 - .../Pages/Wishlists.razor | 42 - .../Pages/Wishlists.razor.cs | 14 - .../Pages/Wishlists.razor.css | 28 - ShoppingAssistantWebClient.Web/Program.cs | 2 +- .../Shared/MainLayout.razor | 15 +- .../Shared/MainLayout.razor.css | 73 +- .../Shared/NavMenu.razor | 95 ++- .../Shared/NavMenu.razor.cs | 75 +- .../appsettings.Development.json | 11 +- .../wwwroot/css/bootstrap/bootstrap.min.css | 12 +- .../wwwroot/images/amazon.png | Bin 0 -> 546 bytes .../wwwroot/images/back-button.png | Bin 0 -> 300 bytes .../wwwroot/images/cancel-button.png | Bin 0 -> 367 bytes .../wwwroot/images/empty-star.png | Bin 0 -> 406 bytes .../wwwroot/images/exit.png | Bin 0 -> 577 bytes .../wwwroot/images/half-star.png | Bin 0 -> 419 bytes .../wwwroot/images/icon_delete.svg | 6 +- .../wwwroot/images/icon_open_card.svg | 8 +- .../wwwroot/images/image1.png | Bin 0 -> 3033 bytes .../wwwroot/images/image2.png | Bin 0 -> 4415 bytes .../wwwroot/images/like-button.png | Bin 0 -> 559 bytes .../wwwroot/images/load-more-small.png | Bin 0 -> 242 bytes .../wwwroot/images/load-more.png | Bin 0 -> 387 bytes .../wwwroot/images/logo.svg | 18 +- .../wwwroot/images/return-card.png | Bin 0 -> 424 bytes .../wwwroot/images/return-small.png | Bin 0 -> 440 bytes .../wwwroot/images/star-cards.png | Bin 0 -> 348 bytes .../wwwroot/images/star.png | Bin 0 -> 249 bytes 48 files changed, 1202 insertions(+), 1205 deletions(-) create mode 100644 ShoppingAssistantWebClient.Web/Pages/Cards.razor create mode 100644 ShoppingAssistantWebClient.Web/Pages/Cards.razor.cs create mode 100644 ShoppingAssistantWebClient.Web/Pages/Cards.razor.css delete mode 100644 ShoppingAssistantWebClient.Web/Pages/Chat.cshtml delete mode 100644 ShoppingAssistantWebClient.Web/Pages/Chat.cshtml.cs delete mode 100644 ShoppingAssistantWebClient.Web/Pages/Error.cshtml delete mode 100644 ShoppingAssistantWebClient.Web/Pages/Error.cshtml.cs create mode 100644 ShoppingAssistantWebClient.Web/Pages/Login.cshtml create mode 100644 ShoppingAssistantWebClient.Web/Pages/Login.cshtml.cs delete mode 100644 ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml delete mode 100644 ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml.cs delete mode 100644 ShoppingAssistantWebClient.Web/Pages/Wishlists.razor delete mode 100644 ShoppingAssistantWebClient.Web/Pages/Wishlists.razor.cs delete mode 100644 ShoppingAssistantWebClient.Web/Pages/Wishlists.razor.css create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/amazon.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/back-button.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/cancel-button.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/empty-star.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/exit.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/half-star.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/image1.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/image2.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/like-button.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/load-more-small.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/load-more.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/return-card.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/return-small.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/star-cards.png create mode 100644 ShoppingAssistantWebClient.Web/wwwroot/images/star.png diff --git a/.vscode/settings.json b/.vscode/settings.json index c504a4e..35336bf 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,7 @@ -{ - "explorer.fileNesting.enabled": true, - "explorer.fileNesting.patterns": { - "*.cshtml": "${capture}.cshtml, ${capture}.cshtml.cs, ${capture}.cshtml.css", - "*.razor": "${capture}.razor, ${capture}.razor.css,${capture}.razor.cs" - } +{ + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.patterns": { + "*.cshtml": "${capture}.cshtml, ${capture}.cshtml.cs, ${capture}.cshtml.css", + "*.razor": "${capture}.razor, ${capture}.razor.css,${capture}.razor.cs" + } } \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/CustomMiddlewares/GlobalUserMiddleware.cs b/ShoppingAssistantWebClient.Web/CustomMiddlewares/GlobalUserMiddleware.cs index 7fc6790..2b01c54 100644 --- a/ShoppingAssistantWebClient.Web/CustomMiddlewares/GlobalUserMiddleware.cs +++ b/ShoppingAssistantWebClient.Web/CustomMiddlewares/GlobalUserMiddleware.cs @@ -13,26 +13,28 @@ public class GlobalUserMiddleware this._next = next; } - public async Task InvokeAsync(HttpContext httpContext, AuthenticationService authenticationService, ApiClient apiClient) +public async Task InvokeAsync(HttpContext httpContext, AuthenticationService authenticationService, ApiClient apiClient) { - try + if (httpContext.Request.Path != "/login") { - var accessToken = await authenticationService.GetAuthTokenAsync(); - if (!string.IsNullOrEmpty(accessToken)) + try { - apiClient.JwtToken = accessToken; - GlobalUser.Roles = authenticationService.GetRolesFromJwtToken(accessToken); - GlobalUser.Id = authenticationService.GetIdFromJwtToken(accessToken); - GlobalUser.Email = authenticationService.GetEmailFromJwtToken(accessToken); - GlobalUser.Phone = authenticationService.GetPhoneFromJwtToken(accessToken); + var accessToken = await authenticationService.GetAuthTokenAsync(); + if (!string.IsNullOrEmpty(accessToken)) + { + apiClient.JwtToken = accessToken; + GlobalUser.Roles = authenticationService.GetRolesFromJwtToken(accessToken); + GlobalUser.Id = authenticationService.GetIdFromJwtToken(accessToken); + GlobalUser.Email = authenticationService.GetEmailFromJwtToken(accessToken); + GlobalUser.Phone = authenticationService.GetPhoneFromJwtToken(accessToken); + } + } + catch (AuthenticationException ex) + { + httpContext.Response.Cookies.Delete("accessToken"); + httpContext.Response.Redirect("/login"); } } - catch (AuthenticationException ex) - { - httpContext.Response.Cookies.Delete("accessToken"); - httpContext.Response.Redirect(""); - } - await _next(httpContext); } } \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Models/Product.cs b/ShoppingAssistantWebClient.Web/Models/Product.cs index bff5020..ef0e20a 100644 --- a/ShoppingAssistantWebClient.Web/Models/Product.cs +++ b/ShoppingAssistantWebClient.Web/Models/Product.cs @@ -1,20 +1,20 @@ -namespace ShoppingAssistantWebClient.Web.Models; - -public class Product -{ - 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;} +namespace ShoppingAssistantWebClient.Web.Models; + +public class Product +{ + 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/Wishlist.cs b/ShoppingAssistantWebClient.Web/Models/Wishlist.cs index fc93e8f..bf09f01 100644 --- a/ShoppingAssistantWebClient.Web/Models/Wishlist.cs +++ b/ShoppingAssistantWebClient.Web/Models/Wishlist.cs @@ -1,12 +1,12 @@ -namespace ShoppingAssistantWebClient.Web.Models; - -public class Wishlist -{ - public required string Id {get; set;} - - public required string Name {get; set;} - - public required string Type {get; set;} - - public required string CreateById {get; set;} +namespace ShoppingAssistantWebClient.Web.Models; + +public class Wishlist +{ + 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/Cards.razor b/ShoppingAssistantWebClient.Web/Pages/Cards.razor new file mode 100644 index 0000000..6237394 --- /dev/null +++ b/ShoppingAssistantWebClient.Web/Pages/Cards.razor @@ -0,0 +1,86 @@ +@page "/cards" + +
+ +
+ +

Gift for Jessica

+
+ +
+
+ @if (Products != null && Products.Count != 0 && currentProduct != Products.Count && currentProduct >= 0) { +
+
+
+ @foreach (var image in Products[currentProduct].ImagesUrls) { + if (currentImage == image) { + + } + } +
+
+ @for (var i = 0; i < Products[currentProduct].ImagesUrls.Length; i++) { + var dotIndex = i; +
+ } +
+
+
+ +

@Products[currentProduct].Name

+

@Products[currentProduct].Description

+ +
+ + @{ + int whole = (int)Math.Floor(Products[currentProduct].Rating); + double fractal = Products[currentProduct].Rating - whole; + string price = "N/A"; + } + @for(int i = 0; i < 5; i++) { + if(i < whole) { + + continue; + } + if(fractal != 0.0) { + + fractal -= fractal; + } + else { + + } + } + +
+
+
+
+
+ + + +
+
+ } + else { + +
+ + +
+
+
+ + + +
+
+ } +
+ +
diff --git a/ShoppingAssistantWebClient.Web/Pages/Cards.razor.cs b/ShoppingAssistantWebClient.Web/Pages/Cards.razor.cs new file mode 100644 index 0000000..5655b42 --- /dev/null +++ b/ShoppingAssistantWebClient.Web/Pages/Cards.razor.cs @@ -0,0 +1,65 @@ +using Microsoft.AspNetCore.Components; +using ShoppingAssistantWebClient.Web.Models; + +namespace ShoppingAssistantWebClient.Web.Pages; + +public partial class Cards +{ + private int currentIndex = 0; + private int currentProduct = 0; + + private string currentImage; + + private static string[] Images = { + "/images/image2.png", + "/images/image1.png", + "/images/return-card.png" + }; + + public List Products = new() + { + new Product {Id = "0", Url = "some link", Name = "Belkin USB C to VGA + Charge Adapter - USB C to VGA Cable for MacBook", + Description = "The USB C to VGA + Charge Adapter connects to your laptop or tablet via USB-C port, giving you both a VGA port for video display and a USB-C port for power", Rating = 3.8, ImagesUrls = Images, WasOpened = false, WishlistId = "0"}, + new Product {Id = "1", Url = "some link", Name = "Second product", + Description = "Test description", Rating = 4.2, ImagesUrls = Images, WasOpened = false, WishlistId = "0"} + }; + + protected override void OnInitialized() + { + currentImage = Images[currentIndex]; + base.OnInitialized(); + } + + private void ChangeImage(string image) { + currentIndex = Array.IndexOf(Products[currentProduct].ImagesUrls, image); + currentIndex = (currentIndex + 1) % Products[currentProduct].ImagesUrls.Length; + currentImage = Products[currentProduct].ImagesUrls[currentIndex]; + StateHasChanged(); + } + + private void ChangeImageDot(int index) { + if (index >= 0 && index < Products[currentProduct].ImagesUrls.Length) { + currentIndex = index; + currentImage = Products[currentProduct].ImagesUrls[currentIndex]; + StateHasChanged(); + } + } + + private void LoadNextProduct() { + currentProduct += 1; + StateHasChanged(); + } + + private void LoadPreviousProduct() { + currentProduct -= 1; + StateHasChanged(); + } + + private void NavigateToMain() { + + } + + private void LoadMoreProducts() { + + } +} diff --git a/ShoppingAssistantWebClient.Web/Pages/Cards.razor.css b/ShoppingAssistantWebClient.Web/Pages/Cards.razor.css new file mode 100644 index 0000000..976c071 --- /dev/null +++ b/ShoppingAssistantWebClient.Web/Pages/Cards.razor.css @@ -0,0 +1,244 @@ + +.card-page { + position: relative; + border: 0.09em solid; + border-color: #0052CC; + border-radius: 0.6em; + height: 100%; + width: 100%; +} + +.container { + display: flex; + flex-direction: column; + height: 100%; +} + +.content { + padding-top: -52px; + display: flex; + flex-direction: column; + flex-grow: 1; + justify-content: center; + align-items: center; + height: 100%; + position: relative; +} + +.head { + display: flex; + justify-content: center; + align-items: center; +} + +.header-text { + text-align: center; + font-size: 24px; + color: rgba(0, 82, 204, 0.8); +} + +.back-button { + width: 20px; + height: 20px; + background-image: url("images/back-button.png"); + background-size: cover; + border: none; + background-color: transparent; + position: absolute; + left: 40px; +} + +.back-card, +.card, +.card-text { + width: 19em; + height: 30em; + border-radius: 15px; + position: absolute; +} + +.back-card { + transform: rotate(-5deg); + box-shadow: 0 0 10px rgba(0, 82, 204, 1); + z-index: 1; +} + +.card, +.card-text { + box-shadow: 0 0 10px rgba(1, 101, 255, 1); + padding: 30px 20px 50px 20px; + z-index: 2; +} + +.slider-container { + position: relative; + width: 100%; + height: 220px; + margin: 0 auto; + overflow: hidden; + border-radius: 15px; +} + +.slider { + display: flex; + transition: transform 0.3s ease-in-out; +} + +.slider-image { + width: 250px; + height: 180px; + object-fit: cover; +} + +.dots { + display: flex; + justify-content: center; + margin-top: 15px; +} + +.dot { + width: 10px; + height: 10px; + background-color: rgba(234, 234, 234, 1); + border-radius: 50%; + margin: 0 8px; + cursor: pointer; +} + +.active-dot { + background-color: rgba(50, 50, 50, 1); +} + +.product-info { + flex: 1; + display: flex; + flex-direction: column; +} + +.name, +.description { + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + text-overflow: ellipsis; +} + +.name { + max-height: 60px; + font-weight: bold; + font-size: 15px; + -webkit-line-clamp: 2; +} + +.description { + max-height: 70px; + font-size: 13px; + -webkit-line-clamp: 3; + position: absolute; + top: 300px; + right: 20px; + left: 20px; +} + +.star { + margin-right: 5px; +} + +.rating { + margin-right: 15px; +} + +.rating-price-row { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: auto; +} + +.price-label { + margin-left: auto; + font-weight: bold; +} + +.buttons-container { + width: 300px; + position: absolute; + margin-top: 640px; + z-index: 3; +} + +.buttons-row { + display: flex; + justify-content: space-between; + position: absolute; + bottom: 15px; + left: 20px; + right: 20px; +} + +.cancel-button { + width: 30px; + height: 30px; + background-image: url("images/cancel-button.png"); + background-size: cover; + border: none; + background-color: transparent; +} + +.return-button { + width: 30px; + height: 30px; + background-image: url("images/return-card.png"); + background-size: cover; + border: none; + background-color: transparent; +} + +.like-button { + width: 30px; + height: 30px; + background-image: url("images/like-button.png"); + background-size: cover; + border: none; + background-color: transparent; +} + +.exit-button { + width: 30px; + height: 30px; + background-image: url("images/exit.png"); + background-size: cover; + border: none; + background-color: transparent; +} + +.more-button { + width: 30px; + height: 30px; + background-image: url("images/load-more.png"); + background-size: cover; + border: none; + background-color: transparent; +} + +.bold-text { + + font-size: 24px; + font-weight: bold; +} + +.add-text { + font-size: 12px; +} + +.exit-text { + font-size: 12px; +} + +.card-text { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + text-align: left; +} \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Pages/Cart.razor b/ShoppingAssistantWebClient.Web/Pages/Cart.razor index 24d11b3..9e0a95a 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Cart.razor +++ b/ShoppingAssistantWebClient.Web/Pages/Cart.razor @@ -1,24 +1,37 @@ -@page "/cart" - -

Cart

-
- @foreach (var product in Products) { -
- - -
- - - @{ - string price = "N/A"; - } - -
-
- -
-
- } -
\ No newline at end of file +@page "/cart" + +
+
+ +

Cart

+
+
+ @foreach (var product in Products) { +
+ + +
+ + + @{ + string price = "N/A"; + } + +
+ +
+ } +
+
+ +@code +{ + [Inject] + private NavigationManager NavigationManager {get; set;} + private void NavigateToMainPage() + { + NavigationManager.NavigateTo("/Cards"); + } +} \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Pages/Cart.razor.cs b/ShoppingAssistantWebClient.Web/Pages/Cart.razor.cs index 51d2c19..b77645d 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Cart.razor.cs +++ b/ShoppingAssistantWebClient.Web/Pages/Cart.razor.cs @@ -1,19 +1,51 @@ -using Microsoft.AspNetCore.Components; -using ShoppingAssistantWebClient.Web.Models; - -namespace ShoppingAssistantWebClient.Web.Pages; - -public partial class Cart : ComponentBase -{ - public List Products = new() - { - new Product {Id = "0", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "0"}, - new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, - new Product {Id = "2", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "2"} - }; - - protected override async Task OnInitializedAsync() - { - // Get data from Back-end - } +using Microsoft.AspNetCore.Components; +using ShoppingAssistantWebClient.Web.Models; + +namespace ShoppingAssistantWebClient.Web.Pages; + +public partial class Cart : ComponentBase +{ + public List Products = new() + { + new Product {Id = "0", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "0"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "2", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "2"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + new Product {Id = "1", Url = "some link", Name = "HDMI", Description = "super mega hdmi cabel", Rating = 3.8, ImagesUrls = new string[] {"link"}, WasOpened = false, WishlistId = "1"}, + }; + + protected override async Task OnInitializedAsync() + { + // Get data from Back-end + } } \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Pages/Cart.razor.css b/ShoppingAssistantWebClient.Web/Pages/Cart.razor.css index a8dc3a6..e6c916c 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Cart.razor.css +++ b/ShoppingAssistantWebClient.Web/Pages/Cart.razor.css @@ -1,74 +1,121 @@ -.container { - display: flex; - flex-wrap: wrap; - justify-content: center; -} - -.product-div { - height: 310px; - width: 200px; - border-radius: 10px; - box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.1); - position: relative; - padding: 0 10px 0 10px; - margin: 30px; -} - -.product-img { - height: 130px; - width: 100%; - align-self: center; - display: block; - margin: 10px; -} - -.product-description { - display: -webkit-box; - -webkit-line-clamp: 2; - -webkit-box-orient: vertical; - overflow: hidden; -} - -.button-amazon { - display: flex; - justify-content: center; - align-items: center; - background-color: #009FFF; - border: none; - border-radius: 10px; - position: absolute; - width: 90%; - height: 40px; - bottom: 10px; -} - -.star { - position: absolute; - bottom: 60px; -} - -.rating { - position: absolute; - bottom: 60px; - left: 35px; - height: 16px; - display: flex; - justify-content: center; - align-items: center; -} - -.button-row { - display: flex; -} - -.price-label { - position: absolute; - right: 10px; - font-weight: bold; - font-size: larger; - height: 16px; - bottom: 60px; - display: flex; - justify-content: center; - align-items: center; +.cart { + border-radius: 10px; + border: 1px solid #0052CC; + position: fixed; + left: 20px; + right: 20px; + top: 20px; + bottom: 20px; + padding: 20px; + overflow: auto; + -ms-overflow-style: none; + scrollbar-width: none; +} + +.cart::-webkit-scrollbar { + display: none; +} + +.head { + display: flex; + justify-content: center; + align-items: center; + font-size: large; +} + +.header-text { + text-align: center; + font-size: 12; + color: rgba(0, 82, 204, 0.8); +} + +.back-button { + width: 15px; + height: 15px; + background-image: url("images/back-button.png"); + background-size: cover; + border: none; + background-color: transparent; + position: absolute; + left: 20px; +} + +.container { + display: flex; + flex-wrap: wrap; + justify-content: center; + max-width: 720px; + overflow: auto; +} + +.product-div { + height: 190px; + width: 130px; + border-radius: 10px; + box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.3); + position: relative; + padding: 0 10px 0 10px; + margin: 15px 15px 15px 15px; +} + +.product-img { + height: 70px; + width: 100%; + align-self: center; + display: block; + margin: 10px; +} + +.product-description { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + font-size: 12px; +} + +.button-amazon { + display: flex; + justify-content: center; + align-items: center; + background-color: #009FFF; + border: none; + border-radius: 10px; + position: absolute; + width: 109px; + height: 27px; + bottom: 10px; +} + +.star { + position: absolute; + bottom: 45px; +} + +.rating { + position: absolute; + bottom: 45px; + left: 26px; + height: 9px; + width: 9px; + display: flex; + justify-content: center; + align-items: center; + font-size: 12px; +} + +.button-row { + display: flex; +} + +.price-label { + position: absolute; + right: 10px; + font-weight: bold; + font-size: 14px; + height: 16px; + bottom: 45px; + display: flex; + justify-content: center; + align-items: center; } \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Pages/Chat.cshtml b/ShoppingAssistantWebClient.Web/Pages/Chat.cshtml deleted file mode 100644 index e47aff4..0000000 --- a/ShoppingAssistantWebClient.Web/Pages/Chat.cshtml +++ /dev/null @@ -1,227 +0,0 @@ -@page "/chat/1" -@model ShoppingAssistantWebClient.Web.Pages.ChatModel -@{ - ViewData["Title"] = "Gift for Jessica"; -} - - -
- -
- - - - -
- -
- -
- Wishlists - - - - - -
- -
- - Add chat + - -
- -
-
- Gift for Jessica -
- -
- Secret Santa -
- -
- Phone charger -
- -
- Phone -
- -
- Printer -
- - Books -
-
- -
-
-
-
- Avatar user - Username -
- -
- - -
- - -
- -
- -
- - - - - -
- - -
- -
- -
Gift for Jessica
- -
    - -
  • -

    Give me product recommendation. Ask me questions if you need more directions. I am looking for: hub for my macbook to connect external monitors

    -
    • -
  • -

    Sure! I can help you with that. I will ask you some leading questions. This is the first: -
    - How many external monitors do you want to connect to your MacBook?

    -
    • -
  • -

    7

    -
    • -
  • -

    Thank you. Here is the next question: -
    - What type of external monitors do you have? (e.g., HDMI, DisplayPort, VGA)

    -
    • - -
- - - - -
- - - - - Send message - - - -
- - -
- -
-
- - - diff --git a/ShoppingAssistantWebClient.Web/Pages/Chat.cshtml.cs b/ShoppingAssistantWebClient.Web/Pages/Chat.cshtml.cs deleted file mode 100644 index 1e11cc4..0000000 --- a/ShoppingAssistantWebClient.Web/Pages/Chat.cshtml.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; -using ShoppingAssistantWebClient.Web.Network; - -namespace ShoppingAssistantWebClient.Web.Pages; -public class ChatModel : PageModel -{ - private readonly ILogger _logger; - - private readonly AuthenticationService _authenticationService; - - public ChatModel(ILogger logger, AuthenticationService authenticationService) - { - _authenticationService = authenticationService; - _logger = logger; - } - - public void OnGet() - { - } -} diff --git a/ShoppingAssistantWebClient.Web/Pages/Chat.razor.cs b/ShoppingAssistantWebClient.Web/Pages/Chat.razor.cs index 3c8cbd7..80b5ddc 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Chat.razor.cs +++ b/ShoppingAssistantWebClient.Web/Pages/Chat.razor.cs @@ -1,14 +1,14 @@ -using Microsoft.AspNetCore.Components; - -namespace ShoppingAssistantWebClient.Web.Pages; - -public partial class Chat : ComponentBase -{ - [Inject] - public ILogger Logger { get; set; } - - protected override async Task OnInitializedAsync() - { - // Get data from Back-end - } -} +using Microsoft.AspNetCore.Components; + +namespace ShoppingAssistantWebClient.Web.Pages; + +public partial class Chat : ComponentBase +{ + [Inject] + public ILogger Logger { get; set; } + + protected override async Task OnInitializedAsync() + { + // Get data from Back-end + } +} diff --git a/ShoppingAssistantWebClient.Web/Pages/Chat.razor.css b/ShoppingAssistantWebClient.Web/Pages/Chat.razor.css index 28694d7..a2e08ed 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Chat.razor.css +++ b/ShoppingAssistantWebClient.Web/Pages/Chat.razor.css @@ -1,361 +1,361 @@ -html { - font-family: 'Nunito'; - padding-top: 20px; - padding-bottom: 20px; - } - .menu { - position: relative; - width: 100%; - height: 100%; - border: 1.5px solid; - border-color: #0052CC; - border-radius: 10px; - padding-top: 16px; - padding-bottom: 16px; - } - - .logo { - display: flex; - align-items: center; - padding-bottom: 15PX; - } - - .logo_name { - padding-top: 10px; - padding-left: 3px; - font-size: 17px; - justify-content: center; - /* Горизонтальное центрирование */ - align-items: center; - letter-spacing: 0.5px; - font-weight: 600; - - } - - .logo img { - float: left; - width: 52px; - height: 52px; - } - - .left_frame { - padding-left: 20px; - position: absolute; - height: calc(100% - 105px); - left: 0; - width: 20%; - transition: 1s; - } - - - .wishlist_name { - font-size: 15px; - margin-top: 7px; - margin-bottom: 7px; - color: black; - cursor: pointer; - } - - .elements { - padding-left: 12px; - padding-right: 12px; - - } - .elements_wishlisht{ - overflow-y: scroll; - padding-left: 12px; - padding-right: 12px; - height: 90%; - - } - .elements_wishlisht::-webkit-scrollbar { - visibility: hidden; - } - - - .close_menu { - position: relative; - background-color: #EAEAEA; - border-radius: 10px; - color: #4E4E4E; - font-size: 16px; - width: 90%; - height: 40px; - padding: 7px 9px; - } - - .add_chat { - display: flex; - align-items: center; - justify-content: center; - margin-top: 15px; - margin-bottom: 5px; - background-color: #EAEAEA; - border-radius: 10px; - font-size: 16px; - width: 100px; - height: 40px; - - cursor: pointer; - } - .add_chat a{ - border-radius: 10px; - padding: 7px 9px; - text-decoration: none; - color: #4E4E4E; - } - - - .info_user { - background-color: white; - position:absolute; - bottom: 0; - padding-bottom: 10px; - padding-top: 10px; - } - - .user_name { - font-size: 16px; - padding-left: 7px; - } - - .info_user img { - height: 40px; - width: 40px; - border-radius: 50%; - } - - .line { - position: absolute; - bottom: 60px; - width: 100%; - border-bottom: 1px solid #4b7bc4; - } - .button_close_menu{ - width: 23px; - height: 23px; - position: absolute; - right: 20px; - cursor: pointer; - - } - - .button_close_menu span { - width: 20px; - height: 1.5px; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - background-color: #4E4E4E; - } - - .button_close_menu span:nth-of-type(2) { - top: calc(50% - 5px); - } - .button_close_menu span:nth-of-type(3) { - top: calc(50% + 5px); - } - - .right_frame { - position: absolute; - border: 1.5px solid; - border-color: #0052CC; - border-radius: 10px; - left: 20px; - height: calc(100% - 40px); - width: calc(100% - 40px); - transition: 1s; - - } - - .button_open_menu{ - z-index: 2; - width: 23px; - height: 23px; - position: absolute; - top: 25px; - left: 25px; - cursor: pointer; - } - .button_open_menu span { - width: 20px; - height: 1.5px; - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - background-color: #4E4E4E; - } - - .button_open_menu span:nth-of-type(2) { - top: calc(50% - 5px); - } - .button_open_menu span:nth-of-type(3) { - top: calc(50% + 5px); - } - .title_one_frame{ - padding-top: 20px ; - color: #0052CC; - font-size: 17px; - text-align: center; - } - .title_two_frame{ - padding-top: 60px ; - padding-bottom: 40px ; - color: black; - font-size: 40px; - text-align: center; - font-weight: 600; - } - .title_three_frame{ - padding-top: 60px ; - padding-bottom: 40px ; - color: #202124; - font-size: 20px; - text-align: center; - font-weight: 400; - } - .topic { - font-size: 18px; - text-align: center; - line-height: 35px; - color: #009FFF; - width: 250px; - margin: 0 auto; - } - .topic div{ - margin-top: 20px; - border: 1.5px solid; - border-color: #009FFF; - border-radius: 10px; - justify-content: center; - align-items: center; - cursor: pointer; - } - .topic div a{ - color: #009FFF; - text-decoration:none; - } - .switch{ - height: 45px; - width: 350px; - margin: 0 auto; - border: 1.5px solid; - border-color: #EAEAEA; - border-radius: 10px; - text-align: center; - position: relative; - - } - - .switch_product{ - position: absolute; - background-color: #0052CC; - border-radius: 10px; - margin: 5px; - width: calc(50% - 10px); - height: calc(100% - 10px); - display: flex; - align-items: center; - justify-content: center; - cursor: pointer; - transition: 0.8s; - color: white; - } - - .switch_gift{ - right: 0; - position: absolute; - border-radius: 10px; - margin: 5px; - width: calc(50% - 10px); - height: calc(100% - 10px); - display: flex; - align-items: center; - justify-content: center; - cursor: pointer; - transition: 0.8s; - color: #202124; - } - - .chat_input{ - position: absolute; - margin-left: 25%; - margin-bottom: 20px; - width: 50%; - border-radius: 10px; - bottom: 0; - - } - .chat_input input{ - font-size: 17px; - width: 100%; - position: relative; - color: #4E4E4E; - background-color: #EAEAEA; - border-radius: 10px; - border: none; - padding: 10px 20px; - outline:none; - } - .button_sende{ - margin-top: 14px; - margin-right: 20px; - cursor: pointer; - height: calc(100% - 28px); - width: 2.8%; - position: absolute; - right: 0; - } - .button_sende img{ - height: 100%; - width: 100%; - position: absolute; - - } - - .new_chat{ - position: absolute; - overflow-y: scroll; - height: 100%; - width: 100%; - } - .new_chat::-webkit-scrollbar { - visibility: hidden; - } - - .chat_box{ - border-radius: 10px; - position: absolute; - margin-left: 25%; - margin-top: 35px; - width: 50%; - list-style: none; - padding:0; - - } - .chat_outgoing{ - display: flex; - } - .chat_incoming{ - display: flex; - } - .chat_box .chat_outgoing p { - margin-left: auto; - background-color: #009FFF; - border-radius: 10px; - color: white; - padding: 10px; - max-width: 60%; - - } - .chat_box .chat_incoming p { - background-color: #EAEAEA; - border-radius: 10px; - color: black; - padding: 10px; - width: 60%; - margin-bottom: 20px ; - margin-top: 20px ; +html { + font-family: 'Nunito'; + padding-top: 20px; + padding-bottom: 20px; + } + .menu { + position: relative; + width: 100%; + height: 100%; + border: 1.5px solid; + border-color: #0052CC; + border-radius: 10px; + padding-top: 16px; + padding-bottom: 16px; + } + + .logo { + display: flex; + align-items: center; + padding-bottom: 15PX; + } + + .logo_name { + padding-top: 10px; + padding-left: 3px; + font-size: 17px; + justify-content: center; + /* Горизонтальное центрирование */ + align-items: center; + letter-spacing: 0.5px; + font-weight: 600; + + } + + .logo img { + float: left; + width: 52px; + height: 52px; + } + + .left_frame { + padding-left: 20px; + position: absolute; + height: calc(100% - 105px); + left: 0; + width: 20%; + transition: 1s; + } + + + .wishlist_name { + font-size: 15px; + margin-top: 7px; + margin-bottom: 7px; + color: black; + cursor: pointer; + } + + .elements { + padding-left: 12px; + padding-right: 12px; + + } + .elements_wishlisht{ + overflow-y: scroll; + padding-left: 12px; + padding-right: 12px; + height: 90%; + + } + .elements_wishlisht::-webkit-scrollbar { + visibility: hidden; + } + + + .close_menu { + position: relative; + background-color: #EAEAEA; + border-radius: 10px; + color: #4E4E4E; + font-size: 16px; + width: 90%; + height: 40px; + padding: 7px 9px; + } + + .add_chat { + display: flex; + align-items: center; + justify-content: center; + margin-top: 15px; + margin-bottom: 5px; + background-color: #EAEAEA; + border-radius: 10px; + font-size: 16px; + width: 100px; + height: 40px; + + cursor: pointer; + } + .add_chat a{ + border-radius: 10px; + padding: 7px 9px; + text-decoration: none; + color: #4E4E4E; + } + + + .info_user { + background-color: white; + position:absolute; + bottom: 0; + padding-bottom: 10px; + padding-top: 10px; + } + + .user_name { + font-size: 16px; + padding-left: 7px; + } + + .info_user img { + height: 40px; + width: 40px; + border-radius: 50%; + } + + .line { + position: absolute; + bottom: 60px; + width: 100%; + border-bottom: 1px solid #4b7bc4; + } + .button_close_menu{ + width: 23px; + height: 23px; + position: absolute; + right: 20px; + cursor: pointer; + + } + + .button_close_menu span { + width: 20px; + height: 1.5px; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background-color: #4E4E4E; + } + + .button_close_menu span:nth-of-type(2) { + top: calc(50% - 5px); + } + .button_close_menu span:nth-of-type(3) { + top: calc(50% + 5px); + } + + .right_frame { + position: absolute; + border: 1.5px solid; + border-color: #0052CC; + border-radius: 10px; + left: 20px; + height: calc(100% - 40px); + width: calc(100% - 40px); + transition: 1s; + + } + + .button_open_menu{ + z-index: 2; + width: 23px; + height: 23px; + position: absolute; + top: 25px; + left: 25px; + cursor: pointer; + } + .button_open_menu span { + width: 20px; + height: 1.5px; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background-color: #4E4E4E; + } + + .button_open_menu span:nth-of-type(2) { + top: calc(50% - 5px); + } + .button_open_menu span:nth-of-type(3) { + top: calc(50% + 5px); + } + .title_one_frame{ + padding-top: 20px ; + color: #0052CC; + font-size: 17px; + text-align: center; + } + .title_two_frame{ + padding-top: 60px ; + padding-bottom: 40px ; + color: black; + font-size: 40px; + text-align: center; + font-weight: 600; + } + .title_three_frame{ + padding-top: 60px ; + padding-bottom: 40px ; + color: #202124; + font-size: 20px; + text-align: center; + font-weight: 400; + } + .topic { + font-size: 18px; + text-align: center; + line-height: 35px; + color: #009FFF; + width: 250px; + margin: 0 auto; + } + .topic div{ + margin-top: 20px; + border: 1.5px solid; + border-color: #009FFF; + border-radius: 10px; + justify-content: center; + align-items: center; + cursor: pointer; + } + .topic div a{ + color: #009FFF; + text-decoration:none; + } + .switch{ + height: 45px; + width: 350px; + margin: 0 auto; + border: 1.5px solid; + border-color: #EAEAEA; + border-radius: 10px; + text-align: center; + position: relative; + + } + + .switch_product{ + position: absolute; + background-color: #0052CC; + border-radius: 10px; + margin: 5px; + width: calc(50% - 10px); + height: calc(100% - 10px); + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + transition: 0.8s; + color: white; + } + + .switch_gift{ + right: 0; + position: absolute; + border-radius: 10px; + margin: 5px; + width: calc(50% - 10px); + height: calc(100% - 10px); + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; + transition: 0.8s; + color: #202124; + } + + .chat_input{ + position: absolute; + margin-left: 25%; + margin-bottom: 20px; + width: 50%; + border-radius: 10px; + bottom: 0; + + } + .chat_input input{ + font-size: 17px; + width: 100%; + position: relative; + color: #4E4E4E; + background-color: #EAEAEA; + border-radius: 10px; + border: none; + padding: 10px 20px; + outline:none; + } + .button_sende{ + margin-top: 14px; + margin-right: 20px; + cursor: pointer; + height: calc(100% - 28px); + width: 2.8%; + position: absolute; + right: 0; + } + .button_sende img{ + height: 100%; + width: 100%; + position: absolute; + + } + + .new_chat{ + position: absolute; + overflow-y: scroll; + height: 100%; + width: 100%; + } + .new_chat::-webkit-scrollbar { + visibility: hidden; + } + + .chat_box{ + border-radius: 10px; + position: absolute; + margin-left: 25%; + margin-top: 35px; + width: 50%; + list-style: none; + padding:0; + + } + .chat_outgoing{ + display: flex; + } + .chat_incoming{ + display: flex; + } + .chat_box .chat_outgoing p { + margin-left: auto; + background-color: #009FFF; + border-radius: 10px; + color: white; + padding: 10px; + max-width: 60%; + + } + .chat_box .chat_incoming p { + background-color: #EAEAEA; + border-radius: 10px; + color: black; + padding: 10px; + width: 60%; + margin-bottom: 20px ; + margin-top: 20px ; } \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Pages/Error.cshtml b/ShoppingAssistantWebClient.Web/Pages/Error.cshtml deleted file mode 100644 index c04afa8..0000000 --- a/ShoppingAssistantWebClient.Web/Pages/Error.cshtml +++ /dev/null @@ -1,42 +0,0 @@ -@page -@model ShoppingAssistantWebClient.Web.Pages.ErrorModel - - - - - - - - Error - - - - - -
-
-

Error.

-

An error occurred while processing your request.

- - @if (Model.ShowRequestId) - { -

- Request ID: @Model.RequestId -

- } - -

Development Mode

-

- Swapping to the Development environment displays detailed information about the error that occurred. -

-

- The Development environment shouldn't be enabled for deployed applications. - It can result in displaying sensitive information from exceptions to end users. - For local debugging, enable the Development environment by setting the ASPNETCORE_ENVIRONMENT environment variable to Development - and restarting the app. -

-
-
- - - diff --git a/ShoppingAssistantWebClient.Web/Pages/Error.cshtml.cs b/ShoppingAssistantWebClient.Web/Pages/Error.cshtml.cs deleted file mode 100644 index 9cc14d6..0000000 --- a/ShoppingAssistantWebClient.Web/Pages/Error.cshtml.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Diagnostics; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; - -namespace ShoppingAssistantWebClient.Web.Pages; - -[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] -[IgnoreAntiforgeryToken] -public class ErrorModel : PageModel -{ - public string? RequestId { get; set; } - - public bool ShowRequestId => !string.IsNullOrEmpty(RequestId); - - private readonly ILogger _logger; - - public ErrorModel(ILogger logger) - { - _logger = logger; - } - - public void OnGet() - { - RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier; - } -} diff --git a/ShoppingAssistantWebClient.Web/Pages/Login.cshtml b/ShoppingAssistantWebClient.Web/Pages/Login.cshtml new file mode 100644 index 0000000..198c17b --- /dev/null +++ b/ShoppingAssistantWebClient.Web/Pages/Login.cshtml @@ -0,0 +1,8 @@ +@page "/login" +@model ShoppingAssistantWebClient.Web.Pages.LoginModel + +

Login

+ +@{ + +} diff --git a/ShoppingAssistantWebClient.Web/Pages/Login.cshtml.cs b/ShoppingAssistantWebClient.Web/Pages/Login.cshtml.cs new file mode 100644 index 0000000..f57fb3e --- /dev/null +++ b/ShoppingAssistantWebClient.Web/Pages/Login.cshtml.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace ShoppingAssistantWebClient.Web.Pages +{ + public class LoginModel : PageModel + { + public void OnGet() + { + } + } +} diff --git a/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml b/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml deleted file mode 100644 index a1f555a..0000000 --- a/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml +++ /dev/null @@ -1,75 +0,0 @@ -@page -@model ShoppingAssistantWebClient.Web.Pages.WishlistModel -@{ - //Layout = null; -} - -

My Wishlist

- -
- - @if(!(Model.wishlist is null)) - { - - - - - - - - - - - - @foreach (var item in Model.wishlist) - { - - - - - - - - - - - - } - -
Chat nameTypeCreatedById
@Html.DisplayFor(modelItem => item.Name)@Html.DisplayFor(modelItem => item.Type)@Html.DisplayFor(modelItem => item.CreateById)
- } - else - { -

You don't have a wishlist

- } - -
\ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml.cs b/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml.cs deleted file mode 100644 index 6148cd2..0000000 --- a/ShoppingAssistantWebClient.Web/Pages/Wishlist.cshtml.cs +++ /dev/null @@ -1,28 +0,0 @@ -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 Models.Wishlist {Id = "0", Name = "Chat1", Type="product", CreateById="0"}, - new Models.Wishlist {Id = "1", Name = "Chat2", Type="gift", CreateById="1"}, - new Models.Wishlist {Id = "2", Name = "Chat3", Type="product", CreateById="2"} - }; - public void OnGet() - { - - } - - public void OnPostDelete(string id) { - var item = wishlist.FirstOrDefault(wishlist => wishlist.Id == id); - wishlist.RemoveAt(Int32.Parse(id)); - } - - public IActionResult OnPostMoveToChat() { - return RedirectToPage("Index"); - } - } -} diff --git a/ShoppingAssistantWebClient.Web/Pages/Wishlists.razor b/ShoppingAssistantWebClient.Web/Pages/Wishlists.razor deleted file mode 100644 index ee7aae0..0000000 --- a/ShoppingAssistantWebClient.Web/Pages/Wishlists.razor +++ /dev/null @@ -1,42 +0,0 @@ -@page "/wishlists" - -

My Wishlist

- -
- - @if(WishlistList != null) - { - - - - - - - - - - - - @foreach (var item in WishlistList) - { - - - - - - - - - - - - } - -
Chat nameTypeCreatedById
@item.Name@item.Type@item.CreateById
- } - else - { -

You don't have a wishlist

- } - -
\ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Pages/Wishlists.razor.cs b/ShoppingAssistantWebClient.Web/Pages/Wishlists.razor.cs deleted file mode 100644 index 81275fb..0000000 --- a/ShoppingAssistantWebClient.Web/Pages/Wishlists.razor.cs +++ /dev/null @@ -1,14 +0,0 @@ -using Microsoft.AspNetCore.Components; -using ShoppingAssistantWebClient.Web.Models; - -namespace ShoppingAssistantWebClient.Web.Pages; - -public partial class Wishlists : ComponentBase -{ - public List WishlistList = new() - { - new Wishlist {Id = "0", Name = "Chat1", Type="product", CreateById="0"}, - new Wishlist {Id = "1", Name = "Chat2", Type="gift", CreateById="1"}, - new Wishlist {Id = "2", Name = "Chat3", Type="product", CreateById="2"} - }; -} \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Pages/Wishlists.razor.css b/ShoppingAssistantWebClient.Web/Pages/Wishlists.razor.css deleted file mode 100644 index 529bc9f..0000000 --- a/ShoppingAssistantWebClient.Web/Pages/Wishlists.razor.css +++ /dev/null @@ -1,28 +0,0 @@ -.table-container { - width: 95%; - height: 95%; - display: flex; - justify-content: center; - align-items: center; - margin: auto; -} - -.styled-table { - border-collapse: collapse; - width: 100%; - max-width: 100%; -} -.styled-table th { - border-bottom: 1px solid #ddd; - text-align: center; - font-size: larger; - background-color: rgba(0, 159, 255, 0.1); -} -.styled-table td { - border-bottom: 5px solid #FFF; - border-top: 5px solid #FFF; - text-align: center; - font-size: large; - padding: 20px; - background-color: rgba(248, 248, 255, 1); -} \ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Program.cs b/ShoppingAssistantWebClient.Web/Program.cs index a804442..50d5733 100644 --- a/ShoppingAssistantWebClient.Web/Program.cs +++ b/ShoppingAssistantWebClient.Web/Program.cs @@ -28,6 +28,6 @@ app.UseRouting(); app.MapBlazorHub(); app.MapFallbackToPage("/_Host"); -// app.ConfigureGlobalUserMiddleware(); +app.ConfigureGlobalUserMiddleware(); app.Run(); diff --git a/ShoppingAssistantWebClient.Web/Shared/MainLayout.razor b/ShoppingAssistantWebClient.Web/Shared/MainLayout.razor index 0a22716..bb52780 100644 --- a/ShoppingAssistantWebClient.Web/Shared/MainLayout.razor +++ b/ShoppingAssistantWebClient.Web/Shared/MainLayout.razor @@ -1,15 +1,12 @@ @inherits LayoutComponentBase - +@using ShoppingAssistantWebClient.Web.Pages ShoppingAssistantWebClient.Web
- +
- -
+
+ @Body +
+
\ No newline at end of file diff --git a/ShoppingAssistantWebClient.Web/Shared/MainLayout.razor.css b/ShoppingAssistantWebClient.Web/Shared/MainLayout.razor.css index 950f666..e0e762a 100644 --- a/ShoppingAssistantWebClient.Web/Shared/MainLayout.razor.css +++ b/ShoppingAssistantWebClient.Web/Shared/MainLayout.razor.css @@ -1,73 +1,26 @@ - .page { + position: relative; width: 100%; height: 100vh; border: 1.5% solid; border-color: #edf106; padding: 1.25em; } + .sidebar-menu { - position: relative; + position: absolute; width: 20em; - height: 100%; + top: 1.25em; + bottom: 1.25em; + margin-right: 1.5em; transition: 1s; - border: 1.5% solid; - border-color: #f10606; } -.top-row { - background-color: #f7f7f7; - border-bottom: 1px solid #d6d5d5; - justify-content: flex-end; - height: 3.5rem; - display: flex; - align-items: center; -} - - .top-row ::deep a, .top-row .btn-link { - white-space: nowrap; - margin-left: 1.5rem; - } - - .top-row a:first-child { - overflow: hidden; - text-overflow: ellipsis; - } - -@media (max-width: 640.98px) { - .top-row:not(.auth) { - display: none; - } - - .top-row.auth { - justify-content: space-between; - } - - .top-row a, .top-row .btn-link { - margin-left: 0; - } -} - -@media (min-width: 641px) { - .page { - flex-direction: row; - } - - .sidebar { - width: 250px; - height: 100vh; - position: sticky; - top: 0; - } - - .top-row { - position: sticky; - top: 0; - z-index: 1; - } - - .top-row, article { - padding-left: 2rem !important; - padding-right: 1.5rem !important; - } +.right-frame { + position: absolute; + right: 1.25em; + left: 23.25em; + top: 1.25em; + bottom: 1.25em; + transition: 1s; } diff --git a/ShoppingAssistantWebClient.Web/Shared/NavMenu.razor b/ShoppingAssistantWebClient.Web/Shared/NavMenu.razor index 3b82f08..0d77508 100644 --- a/ShoppingAssistantWebClient.Web/Shared/NavMenu.razor +++ b/ShoppingAssistantWebClient.Web/Shared/NavMenu.razor @@ -1,4 +1,5 @@ -
+@inject NavigationManager Navigation +
-@if(isLoading == false){ -
New chat
@@ -58,16 +56,6 @@
- -}else{ - -
- - Loading chat - -
- -}
diff --git a/ShoppingAssistantWebClient.Web/Pages/Index.razor.cs b/ShoppingAssistantWebClient.Web/Pages/Index.razor.cs index 2cc2915..fdf4235 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Index.razor.cs +++ b/ShoppingAssistantWebClient.Web/Pages/Index.razor.cs @@ -7,6 +7,7 @@ using Newtonsoft.Json; using ShoppingAssistantWebClient.Web.Network; using System; using Microsoft.JSInterop; +using ShoppingAssistantWebClient.Web.Services; namespace ShoppingAssistantWebClient.Web.Pages { @@ -20,13 +21,10 @@ namespace ShoppingAssistantWebClient.Web.Pages private NavigationManager Navigation { get; set; } [Inject] protected IJSRuntime JSRuntime { get; set; } - + [Inject] + private SearchService _searchServise { get; set; } private MessageCreateDto messageCreateDto; - - private CancellationTokenSource cancelTokenSource; - private string inputValue = ""; - public bool isLoading; private async Task CreateNewChat() { @@ -38,7 +36,6 @@ namespace ShoppingAssistantWebClient.Web.Pages return; } - isLoading = true; StateHasChanged(); messageCreateDto = new MessageCreateDto { Text = inputValue }; var type = selectedChoice; @@ -62,58 +59,22 @@ namespace ShoppingAssistantWebClient.Web.Pages var response = await _apiClient.QueryAsync(request); var responseData = response.Data; var chatId = responseData?.startPersonalWishlist?.id; - string wishlistId1 = chatId; - - var text = inputValue; - - cancelTokenSource = new CancellationTokenSource(); - var cancellationToken = cancelTokenSource.Token; - - var serverSentEvent = _apiClient.GetServerSentEventStreamed($"ProductsSearch/search/{chatId}", messageCreateDto, cancellationToken); - - await foreach (var sseEvent in serverSentEvent.WithCancellation(cancellationToken)) - { - // Handle each ServerSentEvent as needed - Console.WriteLine($"Received SSE Event: {sseEvent.Event}, Data: {sseEvent.Data}"); - } - string wishlistId = chatId; - request = new GraphQLRequest - { - Query = @"mutation GenerateNameForPersonalWishlist($wishlistId: String!) { - generateNameForPersonalWishlist(wishlistId: $wishlistId) { - id - name - } - }", - Variables = new - { - wishlistId - - } - }; - response = await _apiClient.QueryAsync(request); + _searchServise.SetFirstMassage(inputValue); + await UpdateSideMenu(wishlistId); - isLoading = false; - StateHasChanged(); - - await UpdateSideMenu(wishlistId1); var url = $"/chat/{chatId}"; Navigation.NavigateTo(url); - } - catch (Exception ex) - { - // Handle exceptions appropriately - Console.WriteLine($"Error in CreateNewChat: {ex.Message}"); - } - finally - { - isLoading = false; - cancelTokenSource?.Dispose(); - } + } + catch (Exception ex) + { + // Handle exceptions appropriately + Console.WriteLine($"Error in CreateNewChat: {ex.Message}"); + } + } } From 22d0311ec425da185c68845eff3a2f128906c44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=96=C2=96AsTroLog?= Date: Wed, 22 Nov 2023 18:07:05 +0000 Subject: [PATCH 7/7] add error handling --- .../Pages/Chat.razor.cs | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/ShoppingAssistantWebClient.Web/Pages/Chat.razor.cs b/ShoppingAssistantWebClient.Web/Pages/Chat.razor.cs index 476cdd1..5e1f65a 100644 --- a/ShoppingAssistantWebClient.Web/Pages/Chat.razor.cs +++ b/ShoppingAssistantWebClient.Web/Pages/Chat.razor.cs @@ -38,39 +38,44 @@ public partial class Chat : ComponentBase private string name = ""; protected override async Task OnInitializedAsync() { - var input = _searchServise.firstMassage; + try{ + var input = _searchServise.firstMassage; - if (input!=null){ + if (input!=null){ - await LoadMessages(); + await LoadMessages(); - await AddNewMessage(input); + await AddNewMessage(input); + + string wishlistId = chatId; + var request = new GraphQLRequest + { + Query = @"mutation GenerateNameForPersonalWishlist($wishlistId: String!) { + generateNameForPersonalWishlist(wishlistId: $wishlistId) { + id + name + } + }", + Variables = new + { + wishlistId - string wishlistId = chatId; - var request = new GraphQLRequest - { - Query = @"mutation GenerateNameForPersonalWishlist($wishlistId: String!) { - generateNameForPersonalWishlist(wishlistId: $wishlistId) { - id - name } - }", - Variables = new - { - wishlistId + }; + var response = await _apiClient.QueryAsync(request); + _searchServise.SetFirstMassage(null); + isLoading = false; + await UpdateSideMenu(wishlistId); + StateHasChanged(); + + }else{ + await LoadMessages(); } - }; - - var response = await _apiClient.QueryAsync(request); - _searchServise.SetFirstMassage(null); - isLoading = false; - await UpdateSideMenu(wishlistId); - StateHasChanged(); - - }else{ - await LoadMessages(); + }catch(Exception ex){ + Console.WriteLine($"Error OnInitializedAsync: {ex.Message}"); } + }