-
-
+
+
diff --git a/Wonky.Client/Components/CompanySort.razor.cs b/Wonky.Client/Components/CompanySortColumn.razor.cs
similarity index 84%
rename from Wonky.Client/Components/CompanySort.razor.cs
rename to Wonky.Client/Components/CompanySortColumn.razor.cs
index 410179ef..a0c749ae 100644
--- a/Wonky.Client/Components/CompanySort.razor.cs
+++ b/Wonky.Client/Components/CompanySortColumn.razor.cs
@@ -19,16 +19,15 @@ using Microsoft.AspNetCore.Components;
namespace Wonky.Client.Components
{
- public partial class CompanySort
+ public partial class CompanySortColumn
{
[Parameter]
public EventCallback@Title
- -Current count: @CurrentCount
- -@code { - - [Parameter] public string Title { get; set; } - - [Parameter] public int CurrentCount { get; set; } - - [Inject] public ILogger@Title
\ No newline at end of file +
+ 
+
\ No newline at end of file
diff --git a/Wonky.Client/Components/Home.razor.cs b/Wonky.Client/Components/Home.razor.cs
index 1d9b936b..c54bcfbb 100644
--- a/Wonky.Client/Components/Home.razor.cs
+++ b/Wonky.Client/Components/Home.razor.cs
@@ -20,8 +20,6 @@ namespace Wonky.Client.Components
{
public partial class Home
{
- [Parameter] public string Title { get; set; } = "Hej";
-
- [Parameter] public RenderFragment? LoginContent { get; set; }
+ [Parameter] public RenderFragment? LoginContent { get; set; }
}
}
diff --git a/Wonky.Client/Components/SalesItemGroupFilter.razor b/Wonky.Client/Components/ItemGroupFilter.razor
similarity index 68%
rename from Wonky.Client/Components/SalesItemGroupFilter.razor
rename to Wonky.Client/Components/ItemGroupFilter.razor
index 035beb6e..c1cbf34f 100644
--- a/Wonky.Client/Components/SalesItemGroupFilter.razor
+++ b/Wonky.Client/Components/ItemGroupFilter.razor
@@ -15,14 +15,15 @@
//
*@
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Wonky.Client/Components/SalesItemGroupFilter.razor.cs b/Wonky.Client/Components/ItemGroupFilter.razor.cs
similarity index 79%
rename from Wonky.Client/Components/SalesItemGroupFilter.razor.cs
rename to Wonky.Client/Components/ItemGroupFilter.razor.cs
index 9598a1e6..99392f5e 100644
--- a/Wonky.Client/Components/SalesItemGroupFilter.razor.cs
+++ b/Wonky.Client/Components/ItemGroupFilter.razor.cs
@@ -13,18 +13,19 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
+using System.Text.RegularExpressions;
using Microsoft.AspNetCore.Components;
namespace Wonky.Client.Components;
-public partial class SalesItemGroupFilter
+public partial class ItemGroupFilter
{
[Parameter] public EventCallback
-
-
+
+
diff --git a/Wonky.Client/Components/SalesItemSearchField.razor.cs b/Wonky.Client/Components/ItemSearchColumn.razor.cs
similarity index 71%
rename from Wonky.Client/Components/SalesItemSearchField.razor.cs
rename to Wonky.Client/Components/ItemSearchColumn.razor.cs
index 520f854d..3ec87ea5 100644
--- a/Wonky.Client/Components/SalesItemSearchField.razor.cs
+++ b/Wonky.Client/Components/ItemSearchColumn.razor.cs
@@ -17,14 +17,12 @@ using Microsoft.AspNetCore.Components;
namespace Wonky.Client.Components;
-public partial class SalesItemSearchField
+public partial class ItemSearchColumn
{
- [Parameter] public EventCallback-
diff --git a/Wonky.Client/Components/SalesItemTable.razor.cs b/Wonky.Client/Components/ItemTable.razor.cs
similarity index 97%
rename from Wonky.Client/Components/SalesItemTable.razor.cs
rename to Wonky.Client/Components/ItemTable.razor.cs
index 5bd14f65..3df0822c 100644
--- a/Wonky.Client/Components/SalesItemTable.razor.cs
+++ b/Wonky.Client/Components/ItemTable.razor.cs
@@ -19,7 +19,7 @@ using Wonky.Entity.DTO;
namespace Wonky.Client.Components;
-public partial class SalesItemTable
+public partial class ItemTable
{
[Parameter] public List
- @(string.IsNullOrEmpty(VirkRegInfo.Name) ? "" : VirkRegInfo.Name) -
- @(string.IsNullOrEmpty(VirkRegInfo.CoName) ? "" : VirkRegInfo.CoName) -
- @(string.IsNullOrEmpty(VirkRegInfo.Address) ? "" : VirkRegInfo.Address) -
- @(string.IsNullOrEmpty(VirkRegInfo.ZipCode) ? "" : VirkRegInfo.ZipCode) @(string.IsNullOrEmpty(VirkRegInfo.City) ? "" : VirkRegInfo.City) +
- @VirkRegInfo.Name +
- @VirkRegInfo.CoName +
- @VirkRegInfo.Address +
- @VirkRegInfo.ZipCode @VirkRegInfo.City
- AllItems { get; set; } = new();
+ private Item SelectedItem { get; set; } = new();
+
+ void ItemSelected(ChangeEventArgs args)
+ {
+ // Item has been selected
+ SelectedItem = (from x in AllItems where x.Id == Convert.ToInt32(args.Value) select x).First();
+ Quantity = "1";
+ ShowItem = true;
+ }
+
+ async Task AddToCart()
+ {
+ // create a new cart item
+ var item = new CartItem
+ {
+ Item = SelectedItem,
+ Quantity = Convert.ToInt32(Quantity)
+ };
+
+ // add it to the cart
+ CartStateProvider.ShoppingCart.Items.Add(item);
+
+ // save the item using the CartStateProvider's save method
+ await CartStateProvider.SaveChangesAsync();
+
+ // hide the selected item
+ ShowItem = false;
+ }
+
+ async Task RemoveItem(CartItem item)
+ {
+ // click on remove
+ CartStateProvider.ShoppingCart.Items.Remove(item);
+
+ // save the cart
+ await CartStateProvider.SaveChangesAsync();
+ }
+
+ protected override void OnInitialized()
+ {
+ // TODO load the items from server
+ // just create some for now
+ AllItems = new List
- (); + AllItems.Add(new Item() + { + Id = 1, + Name = "TEST 1", + Description = "Description 1", + Price = (decimal)10.99 + }); + AllItems.Add(new Item() + { + Id = 2, + Name = "TEST 2", + Description = "Description 2", + Price = (decimal)19.99 + }); + + } +} \ No newline at end of file diff --git a/Wonky.Client/Pages/VirkDataLookup.razor b/Wonky.Client/Pages/VirkDataLookup.razor deleted file mode 100644 index 1977e24b..00000000 --- a/Wonky.Client/Pages/VirkDataLookup.razor +++ /dev/null @@ -1,38 +0,0 @@ -@* -// Copyright (C) 2022 FCS Frede's Computer Services. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the Affero GNU General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// Affero GNU General Public License for more details. -// -// You should have received a copy of the Affero GNU General Public License -// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] -// -*@ - -@page "/VirkData" -
Innotec Danmark - -Virk CVR Database
-----CVR opslag
---- -- diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs index 54d472a2..84af82c1 100644 --- a/Wonky.Client/Program.cs +++ b/Wonky.Client/Program.cs @@ -12,6 +12,7 @@ // You should have received a copy of the Affero GNU General Public License // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // + using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.AspNetCore.Components.Authorization; @@ -25,7 +26,6 @@ using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; using Wonky.Client.Services; using Wonky.Entity.Configuration; -using Wonky.Virk.Services; var builder = WebAssemblyHostBuilder.CreateDefault(args); builder.RootComponents.Add--Adresse opslag
---- ("#app"); @@ -43,14 +43,11 @@ builder.Services.AddHttpClient("InnoAPI", (sp, cl) => }); builder.Services.AddBlazoredToast(); - builder.Services.AddHttpClientInterceptor(); builder.Services.Configure (builder.Configuration.GetSection("ApiConfig")); builder.Services.AddScoped (); diff --git a/Wonky.Client/Properties/launchSettings.json b/Wonky.Client/Properties/launchSettings.json index ac9f3170..e14599a8 100644 --- a/Wonky.Client/Properties/launchSettings.json +++ b/Wonky.Client/Properties/launchSettings.json @@ -1,30 +1,30 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:33781", - "sslPort": 44330 - } - }, - "profiles": { - "Wonky.Client": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "applicationUrl": "https://localhost:7207;http://localhost:5101", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:61714", + "sslPort": 44308 + } + }, + "profiles": { + "Wonky.Client": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "https://localhost:7174;http://localhost:5280", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } +} diff --git a/Wonky.Client/Services/AuthenticationService.cs b/Wonky.Client/Services/AuthenticationService.cs index 4e5b7dcd..2608ac2b 100644 --- a/Wonky.Client/Services/AuthenticationService.cs +++ b/Wonky.Client/Services/AuthenticationService.cs @@ -17,9 +17,9 @@ using System.Net.Http.Headers; using System.Net.Http.Json; using System.Text.Json; using Blazored.LocalStorage; +using Wonky.Client.AuthProviders; using Microsoft.AspNetCore.Components.Authorization; using Microsoft.Extensions.Options; -using Wonky.Client.AuthProviders; using Wonky.Entity.Configuration; using Wonky.Entity.DTO; diff --git a/Wonky.Client/Services/IAuthenticationService.cs b/Wonky.Client/Services/IAuthenticationService.cs index 022012eb..4c63df81 100644 --- a/Wonky.Client/Services/IAuthenticationService.cs +++ b/Wonky.Client/Services/IAuthenticationService.cs @@ -13,6 +13,7 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System.Threading.Tasks; using Wonky.Entity.DTO; namespace Wonky.Client.Services diff --git a/Wonky.Client/Services/RefreshTokenService.cs b/Wonky.Client/Services/RefreshTokenService.cs index 7a24a840..c8a3a4e0 100644 --- a/Wonky.Client/Services/RefreshTokenService.cs +++ b/Wonky.Client/Services/RefreshTokenService.cs @@ -13,7 +13,10 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System; +using System.Threading.Tasks; using Microsoft.AspNetCore.Components.Authorization; +using Microsoft.Extensions.Logging; namespace Wonky.Client.Services; diff --git a/Wonky.Client/Services/VirkRegistryService.cs b/Wonky.Client/Services/VirkRegistryService.cs new file mode 100644 index 00000000..e9a34630 --- /dev/null +++ b/Wonky.Client/Services/VirkRegistryService.cs @@ -0,0 +1,75 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.Text.Json; +using Microsoft.AspNetCore.WebUtilities; +using Microsoft.Extensions.Options; +using Wonky.Entity.Configuration; +using Wonky.Entity.Models; +using Wonky.Entity.Requests; + +namespace Wonky.Client.Services; + +public class VirkRegistryService +{ + private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true }; + private readonly HttpClient _client; + private readonly IOptions _apiConfig; + private readonly List _noData = new() { new VirkRegInfo { Name = "INGEN DATA" } }; + + public VirkRegistryService(HttpClient client, IOptions apiConfig) + { + _client = client; + _apiConfig = apiConfig; + } + + public async Task @ChildContent @@ -23,5 +23,5 @@ } else { - Indlæser...
+Indlæser ...
} \ No newline at end of file diff --git a/Wonky.Client/Shared/PoStateProvider.razor.cs b/Wonky.Client/Shared/CartStateProvider.razor.cs similarity index 60% rename from Wonky.Client/Shared/PoStateProvider.razor.cs rename to Wonky.Client/Shared/CartStateProvider.razor.cs index cab00b6d..1ef4fbc1 100644 --- a/Wonky.Client/Shared/PoStateProvider.razor.cs +++ b/Wonky.Client/Shared/CartStateProvider.razor.cs @@ -13,33 +13,45 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System.Threading.Tasks; using Blazored.LocalStorage; -using Microsoft.AspNetCore.Components; using Wonky.Client.Models; +using Microsoft.AspNetCore.Components; +using Wonky.Entity.Models; namespace Wonky.Client.Shared; -public partial class PoStateProvider +public partial class CartStateProvider { [Parameter] public RenderFragment ChildContent { get; set; } - public PurchaseOrder PurchaseOrder { get; set; } - [Parameter] public string Account { get; set; } = ""; + public Cart ShoppingCart { get; set; } + [Parameter] public string Account { get; set; } = "MyCart"; [Inject] public ILocalStorageService LocalStorageService { get; set; } - private bool hasLoaded; + private bool _hasLoaded; protected override async Task OnParametersSetAsync() { - PurchaseOrder = await LocalStorageService.GetItemAsync(Account); + ShoppingCart = await LocalStorageService.GetItemAsync (Account); - if (PurchaseOrder == null || PurchaseOrder.Lines.Count == 0) - PurchaseOrder = new PurchaseOrder(); + if (ShoppingCart == null || ShoppingCart.Items.Count == 0) + { + ShoppingCart = new Cart(); + } + else + { + if (DateTime.Now > ShoppingCart.LastAccessed.AddSeconds(ShoppingCart.TimeToLiveInSeconds)) + { + ShoppingCart = new Cart(); + } + } - hasLoaded = true; + ShoppingCart.LastAccessed = DateTime.Now; + _hasLoaded = true; } public async Task SaveChangesAsync() { - await LocalStorageService.SetItemAsync(Account, PurchaseOrder); + await LocalStorageService.SetItemAsync(Account, ShoppingCart); } } \ No newline at end of file diff --git a/Wonky.Client/Shared/MainLayout.razor b/Wonky.Client/Shared/MainLayout.razor index b9c05dd5..b68ccc79 100644 --- a/Wonky.Client/Shared/MainLayout.razor +++ b/Wonky.Client/Shared/MainLayout.razor @@ -15,6 +15,7 @@ // *@ @inherits LayoutComponentBase +@using Wonky.Client.Components diff --git a/Wonky.Client/Shared/MainLayout.razor.css b/Wonky.Client/Shared/MainLayout.razor.css index c7ac7630..89c04cce 100644 --- a/Wonky.Client/Shared/MainLayout.razor.css +++ b/Wonky.Client/Shared/MainLayout.razor.css @@ -9,18 +9,21 @@ main { } .sidebar { - background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%); + background-image: linear-gradient(180deg, rgb(22, 21, 23) 10%, #ffaa00 100%); } .top-row { - background-color: #f7f7f7; + color: #ffaa00; + background-color: #0e0e0e; border-bottom: 1px solid #d6d5d5; justify-content: flex-end; height: 3.5rem; display: flex; align-items: center; } - + a:active, a:visited, a:link { + color: #ffaa00; + } .top-row ::deep a, .top-row ::deep .btn-link { white-space: nowrap; margin-left: 1.5rem; diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index e53a0c9c..4d7fdbc9 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -16,6 +16,7 @@ *@ @inject IWebAssemblyHostEnvironment HostEnvironment +@using Wonky.Client.Components; diff --git a/Wonky.Client/Shared/ProductImageUpload.razor.cs b/Wonky.Client/Shared/ProductImageUpload.razor.cs deleted file mode 100644 index f75113b2..00000000 --- a/Wonky.Client/Shared/ProductImageUpload.razor.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (C) 2022 FCS Frede's Computer Services. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the Affero GNU General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// Affero GNU General Public License for more details. -// -// You should have received a copy of the Affero GNU General Public License -// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] -// - -using System.Net.Http.Headers; -using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Forms; -using Wonky.Client.HttpRepository; - -namespace Wonky.Client.Shared -{ - public partial class ProductImageUpload - { - private string _fileUploadMessage = "Ingen fil valgt"; - - [Parameter] - public string ImgUrl { get; set; } = ""; - - [Parameter] - public string ProductId { get; set; } = ""; - private EventCallbackOnChange { get; set; } - - [Inject] - public IKrvProductHttpRepository ProductRepo { get; set; } - - private async Task HandleSelected(InputFileChangeEventArgs e) - { - var imageFile = e.File; - if (imageFile.Size == 0) - return; - - _fileUploadMessage = string.Empty; - _fileUploadMessage += $"{imageFile.Name}"; - - var resizedFile = await imageFile.RequestImageFileAsync("image/png", 500, 500); - - await using var ms = resizedFile.OpenReadStream(resizedFile.Size); - - var content = new MultipartFormDataContent(); - - content.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data"); - - content.Add(new StreamContent(ms, - Convert.ToInt32(resizedFile.Size)), "image", imageFile.Name); - - ImgUrl = await ProductRepo.UploadImage(content, ProductId); - - await OnChange.InvokeAsync(ImgUrl); - } - } -} diff --git a/Wonky.Client/Shared/ProductImageUpload.razor.css b/Wonky.Client/Shared/ProductImageUpload.razor.css deleted file mode 100644 index 97d15716..00000000 --- a/Wonky.Client/Shared/ProductImageUpload.razor.css +++ /dev/null @@ -1,8 +0,0 @@ -/* product image upload */ -.image-name { - margin-left: 10px; -} -.image-preview { - width: 300px; - margin-top: 15px; -} \ No newline at end of file diff --git a/Wonky.Client/Shared/VariantImageUpload.razor.cs b/Wonky.Client/Shared/VariantImageUpload.razor.cs deleted file mode 100644 index eea0c304..00000000 --- a/Wonky.Client/Shared/VariantImageUpload.razor.cs +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (C) 2022 FCS Frede's Computer Services. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the Affero GNU General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// Affero GNU General Public License for more details. -// -// You should have received a copy of the Affero GNU General Public License -// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] -// - -using System.Net.Http.Headers; -using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Forms; -using Wonky.Client.HttpRepository; - -namespace Wonky.Client.Shared -{ - public partial class VariantImageUpload - { - private string _fileUploadMessage = "Ingen fil valgt"; - - [Parameter] - public EventCallback OnChange { get; set; } - - [Parameter] - public string PictureLink { get; set; } = ""; - - [Parameter] - public string VariantId { get; set; } = ""; - - [Parameter] - public string ImageFilename { get; set; } = ""; - - [Inject] - public IKrvVariantHttpRepository VariantRepo { get; set; } - - private async Task HandleSelected(InputFileChangeEventArgs e) - { - var imageFile = e.File; - _fileUploadMessage = string.Empty; - if (imageFile.Size == 0) - return; - _fileUploadMessage += $"{imageFile.Name}"; - var resizedFile = await imageFile.RequestImageFileAsync("image/png", 500, 500); - await using var ms = resizedFile.OpenReadStream(resizedFile.Size); - - var content = new MultipartFormDataContent(); - content.Headers.ContentDisposition = new ContentDispositionHeaderValue("form-data"); - content.Add(new StreamContent(ms, - Convert.ToInt32(resizedFile.Size)), "image", $"{ImageFilename}.png"); - - PictureLink = await VariantRepo.UploadImage(content, VariantId); - - Console.WriteLine($"response from api - {PictureLink}"); - - await OnChange.InvokeAsync(PictureLink); - } - } -} diff --git a/Wonky.Client/Shared/VariantImageUpload.razor.css b/Wonky.Client/Shared/VariantImageUpload.razor.css deleted file mode 100644 index 68123e2c..00000000 --- a/Wonky.Client/Shared/VariantImageUpload.razor.css +++ /dev/null @@ -1,8 +0,0 @@ -/* variant image upload */ -.image-name { - margin-left: 10px; -} -.image-preview { - width: 300px; - margin-top: 15px; -} \ No newline at end of file diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index 40c6e178..85171840 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -1,32 +1,63 @@ - - - +- - -net6.0 -enable -enable -- - -- - - - - - - - - - - - - - -- - - -- + + diff --git a/Wonky.Client/_Imports.razor b/Wonky.Client/_Imports.razor index 00d258bb..bdbd02e8 100644 --- a/Wonky.Client/_Imports.razor +++ b/Wonky.Client/_Imports.razor @@ -6,12 +6,12 @@ @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.JSInterop +@using Wonky.Client +@using Wonky.Client.Shared @using Blazored.Toast @using Blazored.Toast.Services @using Blazored.Toast.Configuration @using Microsoft.AspNetCore.Components.WebAssembly.Hosting @using Microsoft.AspNetCore.Components.Authorization -@using DnetIndexedDb @using Wonky.Entity -@using Wonky.Virk diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 88bdcfc1..9af3a118 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,19 +1,21 @@ { - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Debug", - "Microsoft": "Information" + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Debug", + "Microsoft": "Information" + } + }, + "apiConfig": { + "baseAddress": "https://api.innotec.dk", + "tokenPath": "token", + "userInfo": "api/auth/userinfo", + "crmCompanies": "api/v2/crm/companies", + "priceCatalog": "api/v2/crm/catalog", + "cvrLookup": "/api/v2/services/virk", + "krvProducts": "api/v2/admin/q/products", + "krvVariants": "api/v2/admin/q/variants", + "imageUpload": "api/v2/admin/upload2", + "userRegistration": "api/auth/register" } - }, - "apiConfig": { - "baseAddress": "https://api.innotec.dk", - "tokenPath": "token", - "userInfo": "api/auth/userinfo", - "crmCompanies": "api/v2/crm/companies/page", - "priceCatalog": "api/v2/crm/catalog/page", - "cvrLookup": "/api/v2/services/virk", - "imageUpload": "api/v2/admin/upload2", - "userRegistration": "api/auth/register" - } } \ No newline at end of file diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app.css index c47b2569..3848a5f4 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/app.css @@ -22,10 +22,6 @@ a, .btn-link { border-color: #1861ac; } -.card { - padding: 0; -} - .content { padding-top: 1.1rem; } diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index 8f39ff5f..3d7c56b0 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -8,9 +8,8 @@+ + +net6.0 +enable +enable +latestmajor ++ + ++ + + + + + + + + + + + + + ++ + + ++ +PreserveNewest ++ + ++ + <_ContentIncludedByDefault Remove="Components\AppVersion.razor" /> + <_ContentIncludedByDefault Remove="Components\AuthLinks.razor" /> + <_ContentIncludedByDefault Remove="Components\CompanyListHeader.razor" /> + <_ContentIncludedByDefault Remove="Components\CompanySearchField.razor" /> + <_ContentIncludedByDefault Remove="Components\CompanySort.razor" /> + <_ContentIncludedByDefault Remove="Components\CompanyTable.razor" /> + <_ContentIncludedByDefault Remove="Components\Home.razor" /> + <_ContentIncludedByDefault Remove="Components\PageSizeDropDown.razor" /> + <_ContentIncludedByDefault Remove="Components\Pagination.razor" /> + <_ContentIncludedByDefault Remove="Components\PoLineCreate.razor" /> + <_ContentIncludedByDefault Remove="Components\PurchaseOrderLinesTable.razor" /> + <_ContentIncludedByDefault Remove="Components\PurchaseOrderTable.razor" /> + <_ContentIncludedByDefault Remove="Components\RegInfoCompany.razor" /> + <_ContentIncludedByDefault Remove="Components\RegLookupAddress.razor" /> + <_ContentIncludedByDefault Remove="Components\RegLookupVatNo.razor" /> + <_ContentIncludedByDefault Remove="Components\RegStateVatNumber.razor" /> + <_ContentIncludedByDefault Remove="Components\SalesItemGroupFilter.razor" /> + <_ContentIncludedByDefault Remove="Components\SalesItemSearchField.razor" /> + <_ContentIncludedByDefault Remove="Components\SalesItemSort.razor" /> + <_ContentIncludedByDefault Remove="Components\SalesItemTable.razor" /> + <_ContentIncludedByDefault Remove="Components\SearchPhrase.razor" /> + + +- + - @@ -23,13 +22,6 @@ - - - - - - - diff --git a/Wonky.Entity/Configuration/ApiConfig.cs b/Wonky.Entity/Configuration/ApiConfig.cs new file mode 100644 index 00000000..0770641e --- /dev/null +++ b/Wonky.Entity/Configuration/ApiConfig.cs @@ -0,0 +1,29 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// +namespace Wonky.Entity.Configuration; + +public class ApiConfig +{ + public string BaseAddress { get; set; } = ""; + public string CrmCompanies { get; set; } = ""; + public string PriceCatalog { get; set; } = ""; + public string KrvVariants { get; set; } = ""; + public string KrvProducts { get; set; } = ""; + public string ImageUpload { get; set; } = ""; + public string UserRegistration { get; set; } = ""; + public string UserInfo { get; set; } = ""; + public string CvrLookup { get; set; } = ""; + public string TokenPath { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/AuthResponseDto.cs b/Wonky.Entity/DTO/AuthResponseDto.cs new file mode 100644 index 00000000..0d982634 --- /dev/null +++ b/Wonky.Entity/DTO/AuthResponseDto.cs @@ -0,0 +1,39 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.Text.Json.Serialization; + +namespace Wonky.Entity.DTO; + +public class AuthResponseDto +{ + + public bool IsSuccess { get; set; } + public string ErrorMessage { get; set; } = ""; + [JsonPropertyName("access_token")] public string? AccessToken { get; set; } = ""; + [JsonPropertyName("token_type")] public string TokenType { get; set; } = ""; + [JsonPropertyName("expires_in")] public long ExpiresIn { get; set; } + [JsonPropertyName("refresh_token")] public string RefreshToken { get; set; } = ""; + [JsonPropertyName(".issued")] public string Issued { get; set; } = ""; + [JsonPropertyName(".expires")] public string Expires { get; set; } = ""; + /*{ + "access_token": "", + "token_type": "bearer", + "expires_in": 1209599, + "refresh_token": "", + ".issued": "Fri, 14 Jan 2022 07:05:48 GMT", + ".expires": "Fri, 28 Jan 2022 07:05:48 GMT" + }*/ +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/CompanyDto.cs b/Wonky.Entity/DTO/CompanyDto.cs new file mode 100644 index 00000000..4eef8ff3 --- /dev/null +++ b/Wonky.Entity/DTO/CompanyDto.cs @@ -0,0 +1,41 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System; +using System.ComponentModel.DataAnnotations; +using System.Text.Json.Serialization; + +namespace Wonky.Entity.DTO; + +public class CompanyDto +{ + [Required(ErrorMessage = "Navn skal udyldes")] public string Name { get; set; } = ""; + [Required(ErrorMessage = "Postnummer skal udfyldes")] public string ZipCode { get; set; } = ""; + [Required(ErrorMessage = "Bynavn skal udfyldes")] public string City { get; set; } = ""; + [Required(ErrorMessage = "CVR nummer skal udfyldes")] public string VatNumber { get; set; } = ""; + + public string CompanyId { get; set; } = ""; + public string SalesRepId { get; set; } = ""; + public string Address1 { get; set; } = ""; + public string Address2 { get; set; } = ""; + public string Account { get; set; } = ""; + public string Phone { get; set; } = ""; + public string Mobile { get; set; } = ""; + public string Email { get; set; } = ""; + public string Attention { get; set; } = ""; + [JsonPropertyName("LastVisitTimestamp")] public DateTime LastVisitDate { get; set; } + [JsonPropertyName("NextVisitTimestamp")] public DateTime NextVisitDate { get; set; } + public int Interval { get; set; } = 12; +} \ No newline at end of file diff --git a/Wonky.Client/Pages/CompanyInfo.razor b/Wonky.Entity/DTO/CreateCompanyResponse.cs similarity index 92% rename from Wonky.Client/Pages/CompanyInfo.razor rename to Wonky.Entity/DTO/CreateCompanyResponse.cs index 96302a36..3d5e0f6b 100644 --- a/Wonky.Client/Pages/CompanyInfo.razor +++ b/Wonky.Entity/DTO/CreateCompanyResponse.cs @@ -1,4 +1,3 @@ -@* // Copyright (C) 2022 FCS Frede's Computer Services. // This program is free software: you can redistribute it and/or modify // it under the terms of the Affero GNU General Public License as @@ -13,11 +12,9 @@ // You should have received a copy of the Affero GNU General Public License // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // -*@ -@page "/CompanyInfo" - CompanyInfo
+namespace Wonky.Entity.DTO; -@code { - +public class CreateCompanyResponse +{ } \ No newline at end of file diff --git a/Wonky.Entity/DTO/CrmActivity.cs b/Wonky.Entity/DTO/CrmActivity.cs new file mode 100644 index 00000000..b6f8bb3f --- /dev/null +++ b/Wonky.Entity/DTO/CrmActivity.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; + +namespace Wonky.Entity.DTO; + +public class CrmActivity +{ + public int ActivityId { get; set; } + + public string CompanyId { get; set; } = ""; + // From company row + [Required(ErrorMessage = "Konto skal udfyldes")] public string Account { get; set; } = ""; + [Required(ErrorMessage = "Moms nummer skal udfyldes")] public string VatNumber { get; set; } = ""; + [Required(ErrorMessage = "Navn skal udfyldes")] public string Name { get; set; } = ""; + public string Address { get; set; } = ""; + public string Address2 { get; set; } = ""; + [Required(ErrorMessage = "Bynavn skal udfyldes")] public string City { get; set; }= ""; + [Required(ErrorMessage = "Postnummer skal udfyldes")] public string ZipCode { get; set; } = ""; + [Required(ErrorMessage = "Salgskonsulent skal udfyldes")] public string SalesRep { get; set; } = ""; + public string Phone { get; set; } = ""; + public string EMail { get; set; } = ""; + // Form entries + public string ReferenceNumber { get; set; } = ""; + [Required(ErrorMessage = "Reference skal udfyldes")] public string YourRef { get; set; } = ""; + public string OurRef { get; set; } = ""; + [MaxLength(255, ErrorMessage = "Du kan h�jst bruge 255 tegn")] public string OrderMessage { get; set; } = ""; + // From company or form entry + public string DlvName { get; set; } = ""; + public string DlvAddress1 { get; set; } = ""; + public string DlvAddress2 { get; set; } = ""; + public string DlvZipCode { get; set; } = ""; + public string DlvCity { get; set; } = ""; + public ListLines { get; set; } = new(); +} diff --git a/Wonky.Client/Shared/VariantImageUpload.razor b/Wonky.Entity/DTO/CrmActivityLine.cs similarity index 64% rename from Wonky.Client/Shared/VariantImageUpload.razor rename to Wonky.Entity/DTO/CrmActivityLine.cs index 957ac163..0dd5f5cf 100644 --- a/Wonky.Client/Shared/VariantImageUpload.razor +++ b/Wonky.Entity/DTO/CrmActivityLine.cs @@ -1,4 +1,4 @@ -@* + // Copyright (C) 2022 FCS Frede's Computer Services. // This program is free software: you can redistribute it and/or modify // it under the terms of the Affero GNU General Public License as @@ -13,19 +13,17 @@ // You should have received a copy of the Affero GNU General Public License // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // -*@ +namespace Wonky.Entity.DTO; - - - - @_fileUploadMessage - -@if(!string.IsNullOrWhiteSpace(PictureLink)) +public class CrmActivityLine { - -+ public int ActivityLineId { get; set; } + public int ActivityId { get; set; } + public string Sku { get; set; } = ""; + public string Text { get; set; } = ""; + public int Qty { get; set; } + public decimal Price { get; set; } + public decimal Discount { get; set; } + public decimal LineAmount { get; set; } + public int LineNumber { get; set; } } \ No newline at end of file diff --git a/Wonky.Entity/DTO/KrvProductDto.cs b/Wonky.Entity/DTO/KrvProductDto.cs new file mode 100644 index 00000000..40df0427 --- /dev/null +++ b/Wonky.Entity/DTO/KrvProductDto.cs @@ -0,0 +1,30 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.ComponentModel.DataAnnotations; + +namespace Wonky.Entity.DTO; + +public class KrvProductDto +{ + [Required] + public string ProductId { get; set; } = ""; + [Required] + public string TradingName { get; set; } = ""; + [Required] + public string PictureLink { get; set; } = ""; + [Required] + public string ProductCategoryEnum { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/KrvVariantDto.cs b/Wonky.Entity/DTO/KrvVariantDto.cs new file mode 100644 index 00000000..f0d79b1f --- /dev/null +++ b/Wonky.Entity/DTO/KrvVariantDto.cs @@ -0,0 +1,38 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.ComponentModel.DataAnnotations; + +namespace Wonky.Entity.DTO; + +public class KrvVariantDto +{ + [Required] + public string VariantId { get; set; } = ""; + [Required] + public string Name { get; set; } = ""; + [Required] + public string Sku { get; set; } = ""; + [Required] + public string ErpSku { get; set; } = ""; + [Required] + public string ErpName { get; set; } = ""; + [Required] + public string ShortName { get; set; } = ""; + [Required] + public string SdsLink { get; set; } = ""; + // [Required] + public string PictureLink { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/RefreshTokenDto.cs b/Wonky.Entity/DTO/RefreshTokenDto.cs new file mode 100644 index 00000000..9c0bffc6 --- /dev/null +++ b/Wonky.Entity/DTO/RefreshTokenDto.cs @@ -0,0 +1,21 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// +namespace Wonky.Entity.DTO; + +public class RefreshTokenDto +{ + public string Token { get; set; } = ""; + public string RefreshToken { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/ResponseDto.cs b/Wonky.Entity/DTO/ResponseDto.cs new file mode 100644 index 00000000..1e30904a --- /dev/null +++ b/Wonky.Entity/DTO/ResponseDto.cs @@ -0,0 +1,24 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.Collections.Generic; + +namespace Wonky.Entity.DTO; + +public class ResponseDto +{ + public bool IsSuccess { get; set; } + public IEnumerable-
? Errors { get; set; } +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/SalesItemDto.cs b/Wonky.Entity/DTO/SalesItemDto.cs new file mode 100644 index 00000000..497049c0 --- /dev/null +++ b/Wonky.Entity/DTO/SalesItemDto.cs @@ -0,0 +1,29 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.Collections.Generic; + +namespace Wonky.Entity.DTO; + +public class SalesItemDto +{ + public string ItemId { get; set; } = ""; + public string Name { get; set; } = ""; + public string Sku { get; set; } = ""; + public string ShortName { get; set; } = ""; + public string ProductGroup { get; set; } = ""; + public string PictureLink { get; set; } = ""; + public List Rates { get; set; } = new(); +} \ No newline at end of file diff --git a/Wonky.Client/Pages/CompanyActivity.razor b/Wonky.Entity/DTO/SalesRateDto.cs similarity index 84% rename from Wonky.Client/Pages/CompanyActivity.razor rename to Wonky.Entity/DTO/SalesRateDto.cs index c3164ed7..488ffb32 100644 --- a/Wonky.Client/Pages/CompanyActivity.razor +++ b/Wonky.Entity/DTO/SalesRateDto.cs @@ -1,4 +1,3 @@ -@* // Copyright (C) 2022 FCS Frede's Computer Services. // This program is free software: you can redistribute it and/or modify // it under the terms of the Affero GNU General Public License as @@ -13,11 +12,10 @@ // You should have received a copy of the Affero GNU General Public License // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // -*@ +namespace Wonky.Entity.DTO; -@page "/CompanyActivity" - CompanyActivity
- -@code { - +public class SalesRateDto +{ + public string Quantity { get; set; } = ""; + public string Rate { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Entity/DTO/UpdateCompanyDto.cs b/Wonky.Entity/DTO/UpdateCompanyDto.cs new file mode 100644 index 00000000..50128c0f --- /dev/null +++ b/Wonky.Entity/DTO/UpdateCompanyDto.cs @@ -0,0 +1,33 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.ComponentModel.DataAnnotations; + +namespace Wonky.Entity.DTO; + +public class UpdateCompanyDto +{ + [MaxLength(100)] public string Name { get; set; } = ""; + [MaxLength(30)] public string City { get; set; } = ""; + [MaxLength(20)] public string ZipCode { get; set; } = ""; + [MaxLength(20)] public string VatNumber { get; set; } = ""; + public string CompanyId { get; set; } = ""; + [MaxLength(30)] public string Phone { get; set; } = ""; + [MaxLength(100)] public string Address1 { get; set; } = ""; + [MaxLength(50)] public string Address2 { get; set; } = ""; + [MaxLength(100)] public string Attention { get; set; } = ""; + [MaxLength(80)] public string Email { get; set; } = ""; + [MaxLength(30)] public string Mobile { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Client/Pages/CompanyProducts.razor b/Wonky.Entity/DTO/UploadResponse.cs similarity index 88% rename from Wonky.Client/Pages/CompanyProducts.razor rename to Wonky.Entity/DTO/UploadResponse.cs index 9a63c2c9..628e5218 100644 --- a/Wonky.Client/Pages/CompanyProducts.razor +++ b/Wonky.Entity/DTO/UploadResponse.cs @@ -1,4 +1,3 @@ -@* // Copyright (C) 2022 FCS Frede's Computer Services. // This program is free software: you can redistribute it and/or modify // it under the terms of the Affero GNU General Public License as @@ -13,11 +12,9 @@ // You should have received a copy of the Affero GNU General Public License // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // -*@ +namespace Wonky.Entity.DTO; -@page "/CompanyProducts" -CompanyProducts
- -@code { - +public class UploadResponse +{ + public string Message { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Entity/DTO/UserAuthenticationDto.cs b/Wonky.Entity/DTO/UserAuthenticationDto.cs new file mode 100644 index 00000000..731cb699 --- /dev/null +++ b/Wonky.Entity/DTO/UserAuthenticationDto.cs @@ -0,0 +1,27 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.ComponentModel.DataAnnotations; + +namespace Wonky.Entity.DTO; + +public class UserAuthenticationDto +{ + [Required(ErrorMessage = "Email skal angives")] + public string Email { get; set; } = ""; + + [Required(ErrorMessage = "Password skal angives")] + public string Password { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/UserInfoDto.cs b/Wonky.Entity/DTO/UserInfoDto.cs new file mode 100644 index 00000000..e8f9148a --- /dev/null +++ b/Wonky.Entity/DTO/UserInfoDto.cs @@ -0,0 +1,35 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.Text.Json.Serialization; + +namespace Wonky.Entity.DTO; + +public class UserInfoDto +{ + [JsonPropertyName("Id")] public string Id { get; set; } = ""; + [JsonPropertyName("adviser")] public string Adviser { get; set; } = ""; + [JsonPropertyName("companyId")] public string CrmCompanyKey { get; set; } = ""; + [JsonPropertyName("countryCode")] public string CountryCode { get; set; } = ""; + [JsonPropertyName("countryName")] public string CountryName { get; set; } = ""; + [JsonPropertyName("email")] public string Email { get; set; } = ""; + [JsonPropertyName("fullName")] public string FullName { get; set; } = ""; + [JsonPropertyName("phoneNumber")] public string PhoneNumber { get; set; } = ""; + [JsonPropertyName("isAdmin")] public bool IsAdmin { get; set; } + [JsonPropertyName("isAdviser")] public bool IsAdviser { get; set; } + [JsonPropertyName("isEDoc")] public bool IsEDoc { get; set; } + [JsonPropertyName("isEShop")] public bool IsEShop { get; set; } + [JsonPropertyName("isSupervisor")] public bool IsSupervisor { get; set; } +} \ No newline at end of file diff --git a/Wonky.Entity/DTO/UserRegistrationDto.cs b/Wonky.Entity/DTO/UserRegistrationDto.cs new file mode 100644 index 00000000..4e7776a2 --- /dev/null +++ b/Wonky.Entity/DTO/UserRegistrationDto.cs @@ -0,0 +1,38 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// + +using System.ComponentModel.DataAnnotations; + +namespace Wonky.Entity.DTO; + +public class UserRegistrationDto +{ + [Required(ErrorMessage = "Login skal angives")] + public string? Email { get; set; } + + [Required(ErrorMessage = "Kode skal angives")] + public string? Password { get; set; } + + [Compare(nameof(Password), ErrorMessage = "Adgangskoder skal være identiske")] + public string? ConfirmPassword { get; set; } + + public string FirstName { get; set; } = ""; + public string LastName { get; set; } = ""; + public string CountryCode { get; set; } = "dk"; + public string SalesRep { get; set; } = ""; + public string PhoneNumber { get; set; } = ""; + public string UserName { get; set; } = ""; + public string Roles { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/Models/Cart.cs b/Wonky.Entity/Models/Cart.cs new file mode 100644 index 00000000..85d2632d --- /dev/null +++ b/Wonky.Entity/Models/Cart.cs @@ -0,0 +1,38 @@ +namespace Wonky.Entity.Models; + +public class Item +{ + public int Id { get; set; } + public string Name { get; set; } + public string Description { get; set; } + public decimal Price { get; set; } +} + +public class CartItem +{ + public int Quantity { get; set; } + public Item Item { get; set; } + + public decimal Total + { + get + { + return Item.Price * Quantity; + } + } +} + +public class Cart +{ + public ListItems { get; set; } = new List (); + + public decimal Total + { + get + { + return Items.Sum(item => item.Total); + } + } + public DateTime LastAccessed { get; set; } + public int TimeToLiveInSeconds { get; set; } = 60; // default +} \ No newline at end of file diff --git a/Wonky.Client/Pages/CompanyKApv.razor b/Wonky.Entity/Models/TimeFrame.cs similarity index 83% rename from Wonky.Client/Pages/CompanyKApv.razor rename to Wonky.Entity/Models/TimeFrame.cs index 6403491d..5b19b5f5 100644 --- a/Wonky.Client/Pages/CompanyKApv.razor +++ b/Wonky.Entity/Models/TimeFrame.cs @@ -1,4 +1,3 @@ -@* // Copyright (C) 2022 FCS Frede's Computer Services. // This program is free software: you can redistribute it and/or modify // it under the terms of the Affero GNU General Public License as @@ -13,11 +12,10 @@ // You should have received a copy of the Affero GNU General Public License // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // -*@ +namespace Wonky.Entity.Models; -@page "/CompanyKApv" - CompanyKApv
- -@code { - +public class TimeFrame +{ + public string StartDate { get; set; } = ""; + public string EndDate { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Client/Shared/ProductImageUpload.razor b/Wonky.Entity/Models/VirkRegInfo.cs similarity index 64% rename from Wonky.Client/Shared/ProductImageUpload.razor rename to Wonky.Entity/Models/VirkRegInfo.cs index 6aebbb8e..67b3070c 100644 --- a/Wonky.Client/Shared/ProductImageUpload.razor +++ b/Wonky.Entity/Models/VirkRegInfo.cs @@ -1,4 +1,3 @@ -@* // Copyright (C) 2022 FCS Frede's Computer Services. // This program is free software: you can redistribute it and/or modify // it under the terms of the Affero GNU General Public License as @@ -13,18 +12,18 @@ // You should have received a copy of the Affero GNU General Public License // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // -*@ - +using System.Collections.Generic; - - @_fileUploadMessage +namespace Wonky.Entity.Models; -@if (!string.IsNullOrEmpty(ImgUrl)) +public class VirkRegInfo { --+ public string VatNumber { get; set; } = ""; + public string Name { get; set; } = ""; + public string CoName { get; set; } = ""; + public string Address { get; set; } = ""; + public string City { get; set; } = ""; + public string ZipCode { get; set; } = ""; + public List-
States { get; set; } = new (); } \ No newline at end of file diff --git a/Wonky.Entity/Models/VirkState.cs b/Wonky.Entity/Models/VirkState.cs new file mode 100644 index 00000000..4370dcdd --- /dev/null +++ b/Wonky.Entity/Models/VirkState.cs @@ -0,0 +1,22 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// +namespace Wonky.Entity.Models; + +public class VirkState +{ + public string State { get; set; } = "UKENDT"; + public string LastUpdate { get; set; } = ""; + public TimeFrame TimeFrame { get; set; } = new(); +} \ No newline at end of file diff --git a/Wonky.Entity/Requests/MetaData.cs b/Wonky.Entity/Requests/MetaData.cs new file mode 100644 index 00000000..9b4e9f5a --- /dev/null +++ b/Wonky.Entity/Requests/MetaData.cs @@ -0,0 +1,25 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// +namespace Wonky.Entity.Requests; + +public class MetaData +{ + public int CurrentPage { get; set; } + public int TotalPages { get; set; } + public int PageSize { get; set; } + public int TotalCount { get; set; } + public bool HasPrevious => CurrentPage > 1; + public bool HasNext => CurrentPage < TotalPages; +} \ No newline at end of file diff --git a/Wonky.Entity/Requests/PagingParams.cs b/Wonky.Entity/Requests/PagingParams.cs new file mode 100644 index 00000000..9dbaea94 --- /dev/null +++ b/Wonky.Entity/Requests/PagingParams.cs @@ -0,0 +1,32 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// +namespace Wonky.Entity.Requests; + +public class PagingParams +{ + private const int MaxPageSize = 50; + private int _pageSize = 5; + public int PageNumber { get; set; } = 1; + public int PageSize + { + get => _pageSize; + set => _pageSize = (value > MaxPageSize) ? MaxPageSize : value; + } + + public string SearchTerm { get; set; } = ""; + public string OrderBy { get; set; } = "name"; + public string SearchColumn { get; set; } = "name"; + public string SelectGroup { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/Requests/VirkParams.cs b/Wonky.Entity/Requests/VirkParams.cs new file mode 100644 index 00000000..ca99ec47 --- /dev/null +++ b/Wonky.Entity/Requests/VirkParams.cs @@ -0,0 +1,23 @@ +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the Affero GNU General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// Affero GNU General Public License for more details. +// +// You should have received a copy of the Affero GNU General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// +namespace Wonky.Entity.Requests; + +public class VirkParams +{ + public string VatNumber { get; set; } = ""; + public string StreetName { get; set; } = ""; + public string HouseNumber { get; set; } = ""; + public string ZipCode { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/Wonky.Entity.csproj b/Wonky.Entity/Wonky.Entity.csproj new file mode 100644 index 00000000..44ee6765 --- /dev/null +++ b/Wonky.Entity/Wonky.Entity.csproj @@ -0,0 +1,13 @@ + + + diff --git a/global.json b/global.json new file mode 100644 index 00000000..87aef9f1 --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "6.0.0", + "rollForward": "latestMajor", + "allowPrerelease": false + } +} \ No newline at end of file+ + +net6.0 +enable +enable ++ + ++ - (); + AllItems.Add(new Item() + { + Id = 1, + Name = "TEST 1", + Description = "Description 1", + Price = (decimal)10.99 + }); + AllItems.Add(new Item() + { + Id = 2, + Name = "TEST 2", + Description = "Description 2", + Price = (decimal)19.99 + }); + + } +} \ No newline at end of file diff --git a/Wonky.Client/Pages/VirkDataLookup.razor b/Wonky.Client/Pages/VirkDataLookup.razor deleted file mode 100644 index 1977e24b..00000000 --- a/Wonky.Client/Pages/VirkDataLookup.razor +++ /dev/null @@ -1,38 +0,0 @@ -@* -// Copyright (C) 2022 FCS Frede's Computer Services. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the Affero GNU General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// Affero GNU General Public License for more details. -// -// You should have received a copy of the Affero GNU General Public License -// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] -// -*@ - -@page "/VirkData" -
-
-
-
-
\ No newline at end of file
+
+
diff --git a/Wonky.Client/Components/SearchPhrase.razor.cs b/Wonky.Client/Components/SearchPhrase.razor.cs
index 0cb5cb54..bf7d0fde 100644
--- a/Wonky.Client/Components/SearchPhrase.razor.cs
+++ b/Wonky.Client/Components/SearchPhrase.razor.cs
@@ -22,9 +22,8 @@ namespace Wonky.Client.Components
public partial class SearchPhrase
{
private Timer _timer = new();
- public string SearchTerm { get; set; } = "";
-
- [Parameter] public EventCallbackHvad er Wonky Online
+
+
+
-Wonky Online er Innotec Danmarks egen udviklede ordresystem.
+
+
+
-
+
+Salgs Aktivitet
- -
-
\ No newline at end of file
diff --git a/Wonky.Client/Pages/ActivityList.razor.cs b/Wonky.Client/Pages/ActivityList.razor.cs
deleted file mode 100644
index e519af77..00000000
--- a/Wonky.Client/Pages/ActivityList.razor.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System.Diagnostics;
-using Microsoft.AspNetCore.Components;
-
-namespace Wonky.Client.Pages;
-
-public partial class ActivityList
-{
- public List
-
-Opret firma
diff --git a/Wonky.Client/Pages/CompanyCreate.razor.cs b/Wonky.Client/Pages/CompanyCreate.razor.cs index 73aa7638..7b9d0045 100644 --- a/Wonky.Client/Pages/CompanyCreate.razor.cs +++ b/Wonky.Client/Pages/CompanyCreate.razor.cs @@ -13,18 +13,21 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System; using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Threading.Tasks; using Blazored.LocalStorage; using Blazored.Toast.Services; -using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.Forms; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; using Wonky.Client.Services; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Forms; +using Microsoft.Extensions.Logging; using Wonky.Entity.DTO; using Wonky.Entity.Models; using Wonky.Entity.Requests; -using Wonky.Virk.Services; namespace Wonky.Client.Pages { diff --git a/Wonky.Client/Pages/CompanyList.razor b/Wonky.Client/Pages/CompanyList.razor index 3b8e5b18..e2034697 100644 --- a/Wonky.Client/Pages/CompanyList.razor +++ b/Wonky.Client/Pages/CompanyList.razor @@ -16,21 +16,20 @@ *@ @page "/companies" +@using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Adviser")] -
+
-
-
-
-
+
Nyt firma
diff --git a/Wonky.Client/Pages/CompanyList.razor.cs b/Wonky.Client/Pages/CompanyList.razor.cs
index f10939e8..ce4eca25 100644
--- a/Wonky.Client/Pages/CompanyList.razor.cs
+++ b/Wonky.Client/Pages/CompanyList.razor.cs
@@ -13,9 +13,12 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
-using Microsoft.AspNetCore.Components;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpRepository;
+using Microsoft.AspNetCore.Components;
using Wonky.Entity.DTO;
using Wonky.Entity.Requests;
@@ -27,7 +30,7 @@ namespace Wonky.Client.Pages
public MetaData? MetaData { get; set; } = new();
private PagingParams _paging = new();
-
+
[Inject]
public ICompanyHttpRepository CompanyRepo { get; set; }
@@ -56,6 +59,7 @@ namespace Wonky.Client.Pages
private async Task FilterChanged(string? searchColumn)
{
+ _paging.SearchTerm = "";
_paging.SearchColumn = searchColumn;
_paging.PageNumber = 1;
await GetCompanies();
diff --git a/Wonky.Client/Pages/CompanyUpdate.razor b/Wonky.Client/Pages/CompanyUpdate.razor
index 9be2ebf6..4ecf3375 100644
--- a/Wonky.Client/Pages/CompanyUpdate.razor
+++ b/Wonky.Client/Pages/CompanyUpdate.razor
@@ -17,6 +17,7 @@
@page "/update-company/{account}"
@using Microsoft.AspNetCore.Authorization
+@using Wonky.Client.Components
@using Microsoft.AspNetCore.Components
@attribute [Authorize(Roles = "Adviser")]
diff --git a/Wonky.Client/Pages/CompanyUpdate.razor.cs b/Wonky.Client/Pages/CompanyUpdate.razor.cs
index e8913272..e08927f2 100644
--- a/Wonky.Client/Pages/CompanyUpdate.razor.cs
+++ b/Wonky.Client/Pages/CompanyUpdate.razor.cs
@@ -13,11 +13,14 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
+using System;
+using System.Threading.Tasks;
using Blazored.Toast.Services;
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Forms;
using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpRepository;
+using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.Extensions.Logging;
using Wonky.Entity.DTO;
namespace Wonky.Client.Pages;
diff --git a/Wonky.Client/Pages/CompanyView.razor b/Wonky.Client/Pages/CompanyView.razor
index e608c7fc..701eba5e 100644
--- a/Wonky.Client/Pages/CompanyView.razor
+++ b/Wonky.Client/Pages/CompanyView.razor
@@ -18,6 +18,7 @@
@page "/company/account/{account}"
@page "/company/{companyId}"
@using Microsoft.AspNetCore.Authorization
+@using Wonky.Client.Components;
@attribute [Authorize(Roles = "Adviser")]
@@ -34,7 +35,7 @@
- Tilbud
+ Tilbud
Ordre
Faktura
Produkter
diff --git a/Wonky.Client/Pages/CompanyView.razor.cs b/Wonky.Client/Pages/CompanyView.razor.cs
index 176138ff..aa79f743 100644
--- a/Wonky.Client/Pages/CompanyView.razor.cs
+++ b/Wonky.Client/Pages/CompanyView.razor.cs
@@ -13,9 +13,11 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
-using Microsoft.AspNetCore.Components;
+using System;
+using System.Threading.Tasks;
using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpRepository;
+using Microsoft.AspNetCore.Components;
using Wonky.Entity.DTO;
namespace Wonky.Client.Pages;
diff --git a/Wonky.Client/Pages/Index.razor b/Wonky.Client/Pages/Index.razor
index 0586e4d2..dd13f3c3 100644
--- a/Wonky.Client/Pages/Index.razor
+++ b/Wonky.Client/Pages/Index.razor
@@ -18,8 +18,9 @@
@page "/"
@page "/index"
@inject IWebAssemblyHostEnvironment _hostEnvironment
+@using Wonky.Client.Components;
-
-
\ No newline at end of file
diff --git a/Wonky.Client/Pages/Registration.razor.cs b/Wonky.Client/Pages/Registration.razor.cs
deleted file mode 100644
index df6ea013..00000000
--- a/Wonky.Client/Pages/Registration.razor.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (C) 2022 FCS Frede's Computer Services.
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
-//
-// You should have received a copy of the Affero GNU General Public License
-// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
-//
-
-using Microsoft.AspNetCore.Components;
-using Wonky.Client.Services;
-using Wonky.Entity.DTO;
-
-namespace Wonky.Client.Pages
-{
- public partial class Registration
- {
- private UserRegistrationDto _userRegistration = new ();
-
- [Inject]
- public IAuthenticationService AuthenticationService { get; set; }
-
- [Inject]
- public NavigationManager NavigationManager { get; set; }
-
- public bool ShowRegistrationErrors { get; set; }
- public IEnumerable? Errors { get; set; }
-
- public async Task Register()
- {
- ShowRegistrationErrors = false;
-
- var result = await AuthenticationService.RegisterUser(_userRegistration);
- if (!result.IsSuccess)
- {
- Errors = result.Errors;
- ShowRegistrationErrors = true;
- }
- else
- {
- // todo: redirect to login page
- // todo: store url
- // var returnUrl = NavigationManager.Uri;
- NavigationManager.NavigateTo("/login");
- }
- }
- }
-}
diff --git a/Wonky.Client/Pages/SalesItemCatalog.razor b/Wonky.Client/Pages/SalesItemCatalog.razor
index 01d1b5bd..f4a0a08f 100644
--- a/Wonky.Client/Pages/SalesItemCatalog.razor
+++ b/Wonky.Client/Pages/SalesItemCatalog.razor
@@ -16,21 +16,23 @@
*@
@page "/price-catalog"
+@using Wonky.Client.Components
@using Microsoft.AspNetCore.Authorization
@attribute [Authorize(Roles = "Adviser,Admin")]
-
-
+
-
-
+
*@
-
-
-
diff --git a/Wonky.Client/Pages/ProductCreate.razor.cs b/Wonky.Client/Pages/ProductCreate.razor.cs
deleted file mode 100644
index 1f4ec1df..00000000
--- a/Wonky.Client/Pages/ProductCreate.razor.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (C) 2022 FCS Frede's Computer Services.
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the Affero GNU General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// Affero GNU General Public License for more details.
-//
-// You should have received a copy of the Affero GNU General Public License
-// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
-//
-
-using Blazored.Toast.Services;
-using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.Forms;
-using Wonky.Client.HttpInterceptors;
-using Wonky.Client.HttpRepository;
-using Wonky.Entity.DTO;
-
-namespace Wonky.Client.Pages
-{
- public partial class ProductCreate : IDisposable
- {
- private KrvProductDto _productDto { get; set; } = new();
-
- private EditContext _editContext;
- private bool _formInvalid = true;
-
- [Inject]
- public IKrvProductHttpRepository ProductRepo { get; set; }
-
- [Inject]
- public HttpInterceptorService Interceptor { get; set; }
-
- [Inject]
- public IToastService ToastService { get; set; }
-
- [Inject]
- public ILogger Logger { get; set; }
-
- protected override void OnInitialized()
- {
- _editContext = new EditContext(_productDto);
- _editContext.OnFieldChanged += HandleFieldChanged;
- Interceptor.RegisterEvent();
- Interceptor.RegisterBeforeSendEvent();
- }
-
- private async Task Create()
- {
- Logger.LogDebug($"{_productDto}");
- await ProductRepo.CreateProduct(_productDto);
- ToastService.ShowSuccess($"Godt så. Produktet '{_productDto.TradingName}' er oprettet.");
- _productDto = new KrvProductDto();
- _editContext.OnValidationStateChanged += ValidationChanged;
- _editContext.NotifyValidationStateChanged();
- }
-
- private void HandleFieldChanged(object sender, FieldChangedEventArgs e)
- {
- _formInvalid = !_editContext.Validate();
- StateHasChanged();
- }
-
- private void ValidationChanged(object sender, ValidationStateChangedEventArgs e)
- {
- _formInvalid = true;
- _editContext.OnFieldChanged -= HandleFieldChanged;
- _editContext = new EditContext(_productDto);
- _editContext.OnFieldChanged += HandleFieldChanged;
- _editContext.OnValidationStateChanged -= ValidationChanged;
- }
-
- public void Dispose()
- {
- Interceptor.DisposeEvent();
- _editContext.OnFieldChanged -= HandleFieldChanged;
- _editContext.OnValidationStateChanged -= ValidationChanged;
- }
-
- private void AssignImageUrl(string imgUrl) => _productDto.PictureLink = imgUrl;
- }
-}
-
diff --git a/Wonky.Client/Pages/PurchaseOrderCreate.razor b/Wonky.Client/Pages/PurchaseOrderCreate.razor
index 1309aac1..d9342c39 100644
--- a/Wonky.Client/Pages/PurchaseOrderCreate.razor
+++ b/Wonky.Client/Pages/PurchaseOrderCreate.razor
@@ -18,6 +18,7 @@
@page "/company/{account}/activity"
@using Microsoft.AspNetCore.Authorization
@attribute [Authorize(Roles = "Adviser")]
+@using Wonky.Client.Components
@@ -104,7 +105,7 @@
-
+
Opret KRV Produkt
-@*
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- @_purchaseOrder.Name
-
Registration
- -@if - (ShowRegistrationErrors) -{ -
- @if (Errors != null)
- {
- foreach (var error in Errors)
- {
-
-}
-@error
- } - } -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
-
+
\ No newline at end of file
diff --git a/Wonky.Client/Pages/SalesItemCatalog.razor.cs b/Wonky.Client/Pages/SalesItemCatalog.razor.cs
index 26ca6ecf..0fe0efaa 100644
--- a/Wonky.Client/Pages/SalesItemCatalog.razor.cs
+++ b/Wonky.Client/Pages/SalesItemCatalog.razor.cs
@@ -13,9 +13,12 @@
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
-using Microsoft.AspNetCore.Components;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpRepository;
+using Microsoft.AspNetCore.Components;
using Wonky.Entity.DTO;
using Wonky.Entity.Requests;
@@ -26,7 +29,6 @@ public partial class SalesItemCatalog : IDisposable
private List SalesItemList { get; set; } = new();
private MetaData? MetaData { get; set; } = new();
private PagingParams _paging = new();
-
[Inject] public ISalesItemHttpRepository SalesItemRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
@@ -45,12 +47,9 @@ public partial class SalesItemCatalog : IDisposable
private async Task GetSalesItems()
{
- if (SalesItemRepo != null)
- {
- var pagingResponse = await SalesItemRepo.GetSalesItems(_paging);
- SalesItemList = pagingResponse.Items;
- MetaData = pagingResponse.MetaData;
- }
+ var pagingResponse = await SalesItemRepo.GetSalesItems(_paging);
+ SalesItemList = pagingResponse.Items!;
+ MetaData = pagingResponse.MetaData;
}
private async Task SetPageSize(int pageSize)
@@ -60,14 +59,27 @@ public partial class SalesItemCatalog : IDisposable
await GetSalesItems();
}
- private async Task SearchChanged(string? searchTerm)
+ private async Task GroupFilterChanged(string groupFilter)
+ {
+ _paging.PageNumber = 1;
+ _paging.SelectGroup = groupFilter;
+ await GetSalesItems();
+ }
+ private async Task SearchColumnChanged(string columnName)
+ {
+ _paging.PageNumber = 1;
+ _paging.SearchTerm = "";
+ _paging.SearchColumn = columnName;
+ await GetSalesItems();
+ }
+ private async Task SearchPhraseChanged(string searchTerm)
{
_paging.PageNumber = 1;
_paging.SearchTerm = searchTerm;
await GetSalesItems();
}
- private async Task SortChanged(string? orderBy)
+ private async Task SortColumnChanged(string orderBy)
{
_paging.OrderBy = orderBy;
await GetSalesItems();
diff --git a/Wonky.Client/Pages/SalesItemView.razor b/Wonky.Client/Pages/SalesItemView.razor
index 57e348f9..637ea649 100644
--- a/Wonky.Client/Pages/SalesItemView.razor
+++ b/Wonky.Client/Pages/SalesItemView.razor
@@ -20,18 +20,18 @@
@attribute [Authorize(Roles = "Adviser,Admin")]
+
-
- @* Nyt firma *@
+
+
@@ -45,6 +47,6 @@
-
-
@Item.ItemName
+@Item.Name
| Navn | -@Item.ItemName | +@Item.Name | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Varenr | -@Item.ItemNumber | +@Item.Sku | ||||||||||||||||||||
| diff --git a/Wonky.Client/Pages/SalesItemView.razor.cs b/Wonky.Client/Pages/SalesItemView.razor.cs index 6dcce758..6779b75d 100644 --- a/Wonky.Client/Pages/SalesItemView.razor.cs +++ b/Wonky.Client/Pages/SalesItemView.razor.cs @@ -13,9 +13,11 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // -using Microsoft.AspNetCore.Components; +using System; +using System.Threading.Tasks; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; +using Microsoft.AspNetCore.Components; using Wonky.Entity.DTO; namespace Wonky.Client.Pages; diff --git a/Wonky.Client/Pages/ShoppingCart.razor b/Wonky.Client/Pages/ShoppingCart.razor new file mode 100644 index 00000000..49ad43d1 --- /dev/null +++ b/Wonky.Client/Pages/ShoppingCart.razor @@ -0,0 +1,153 @@ +@using Wonky.Entity.Models +@page "/cart" + | ||||||||||||||||||||||
| Name: | +@SelectedItem.Name | +
| Description: | +@SelectedItem.Description | +
| Price: | +$@SelectedItem.Price | +
| Add To Cart: | ++ Quantity: + + + | +
+
Your Cart:
+Total: $@CartStateProvider.ShoppingCart.Total
+|
+ + |
+ |
| Name: | +@item.Item.Name | +
| Description: | +@item.Item.Description | +
| Price: | +$@item.Item.Price | +
| Quantity: | +@item.Quantity | +
| Total: | +$@item.Total | +
| + @*Clicking this button passes the item so we can remove it*@ + + | +|
+