From f707dc2d87a2268a90cbfd0365f9b01a519f001c Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Sun, 17 Jul 2022 12:42:32 +0200 Subject: [PATCH] wip --- .../Components/AdminAdvisorTableComponent.razor | 6 +++--- .../Components/AdminReportTableComponent.razor | 2 +- .../{Home.razor => AdvisorLandingComponent.razor} | 0 ...{Home.razor.cs => AdvisorLandingComponent.razor.cs} | 7 +++---- ...ome.razor.css => AdvisorLandingComponent.razor.css} | 0 Wonky.Client/Pages/ActivityTodayListPage.razor.cs | 2 +- Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor | 2 +- Wonky.Client/Pages/AdminAdvisorUserListPage.razor | 2 +- Wonky.Client/Pages/AdminAdvisorViewPage.razor | 6 +++--- Wonky.Client/Pages/AdminReportListPage.razor | 2 +- Wonky.Client/Pages/AdminReportViewPage.razor | 2 +- Wonky.Client/Pages/AdminReportViewPage.razor.cs | 2 +- Wonky.Client/Pages/Index.razor | 5 ++++- Wonky.Client/Pages/LandingPageAdminAdvisers.razor | 8 ++++---- Wonky.Client/Pages/TaskItemListPage.razor.cs | 2 +- Wonky.Client/Pages/WarehouseOrderViewPage.razor | 2 +- Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs | 1 + Wonky.Client/Shared/NavMenu.razor | 4 ++-- Wonky.Client/wwwroot/appsettings.json | 10 +++++----- 19 files changed, 34 insertions(+), 31 deletions(-) rename Wonky.Client/Components/{Home.razor => AdvisorLandingComponent.razor} (100%) rename Wonky.Client/Components/{Home.razor.cs => AdvisorLandingComponent.razor.cs} (96%) rename Wonky.Client/Components/{Home.razor.css => AdvisorLandingComponent.razor.css} (100%) diff --git a/Wonky.Client/Components/AdminAdvisorTableComponent.razor b/Wonky.Client/Components/AdminAdvisorTableComponent.razor index d114b47f..e22627fd 100644 --- a/Wonky.Client/Components/AdminAdvisorTableComponent.razor +++ b/Wonky.Client/Components/AdminAdvisorTableComponent.razor @@ -44,9 +44,9 @@ @user.FullName @user.PhoneNumber @user.Email - Rapporter - Kunder - Rediger + Rapporter + Kunder + Rediger } diff --git a/Wonky.Client/Components/AdminReportTableComponent.razor b/Wonky.Client/Components/AdminReportTableComponent.razor index 9594d82d..fd124af5 100644 --- a/Wonky.Client/Components/AdminReportTableComponent.razor +++ b/Wonky.Client/Components/AdminReportTableComponent.razor @@ -41,7 +41,7 @@ @foreach (var report in ReportList) { - +
@report.ReportDate diff --git a/Wonky.Client/Components/Home.razor b/Wonky.Client/Components/AdvisorLandingComponent.razor similarity index 100% rename from Wonky.Client/Components/Home.razor rename to Wonky.Client/Components/AdvisorLandingComponent.razor diff --git a/Wonky.Client/Components/Home.razor.cs b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs similarity index 96% rename from Wonky.Client/Components/Home.razor.cs rename to Wonky.Client/Components/AdvisorLandingComponent.razor.cs index 52d5ef4b..8f520c6d 100644 --- a/Wonky.Client/Components/Home.razor.cs +++ b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs @@ -29,10 +29,10 @@ using Wonky.Entity.Models; using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class Home : IDisposable +public partial class AdvisorLandingComponent : IDisposable { [Inject] private UserPreferenceService _preferenceService { get; set; } - [Inject] private ILogger _logger { get; set; } + [Inject] private ILogger _logger { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private IToastService _toast { get; set; } [Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; } @@ -72,8 +72,7 @@ public partial class Home : IDisposable { await _preferenceService.SetWorkDate(DateTime.Now); var item = _taskItems.Find(x => x.TaskItemId == taskItemId); - _navigator.NavigateTo($"/companies/{item.ReferenceId}/activities/new"); - + _navigator.NavigateTo($"/companies/{item.ReferenceId}/activities/new"); } private async Task GetTaskItems(string workDate) diff --git a/Wonky.Client/Components/Home.razor.css b/Wonky.Client/Components/AdvisorLandingComponent.razor.css similarity index 100% rename from Wonky.Client/Components/Home.razor.css rename to Wonky.Client/Components/AdvisorLandingComponent.razor.css diff --git a/Wonky.Client/Pages/ActivityTodayListPage.razor.cs b/Wonky.Client/Pages/ActivityTodayListPage.razor.cs index 11ecf7b6..ee63c432 100644 --- a/Wonky.Client/Pages/ActivityTodayListPage.razor.cs +++ b/Wonky.Client/Pages/ActivityTodayListPage.razor.cs @@ -26,7 +26,7 @@ namespace Wonky.Client.Pages; public partial class ActivityTodayListPage { [Inject] private UserPreferenceService _preferenceService { get; set; } - [Inject] private ILogger _logger { get; set; } + [Inject] private ILogger _logger { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private NavigationManager _navigator { get; set; } [Inject] private IActivityHttpRepository _activityRepo { get; set; } diff --git a/Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor b/Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor index 8b2dab35..0ace3127 100644 --- a/Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor +++ b/Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor @@ -16,7 +16,7 @@ *@ @using Wonky.Client.Components -@page "/admin/users/Advisors/{CountryCode}/{UserId}/companies" +@page "/admin/users/advisors/{CountryCode}/{UserId}/companies"
diff --git a/Wonky.Client/Pages/AdminAdvisorUserListPage.razor b/Wonky.Client/Pages/AdminAdvisorUserListPage.razor index 8ad7bb71..b1a6b3cb 100644 --- a/Wonky.Client/Pages/AdminAdvisorUserListPage.razor +++ b/Wonky.Client/Pages/AdminAdvisorUserListPage.razor @@ -18,7 +18,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin")] -@page "/admin/users/Advisors/{CountryCode}" +@page "/admin/users/advisors/{CountryCode}"
diff --git a/Wonky.Client/Pages/AdminAdvisorViewPage.razor b/Wonky.Client/Pages/AdminAdvisorViewPage.razor index e92ce6b5..715a278f 100644 --- a/Wonky.Client/Pages/AdminAdvisorViewPage.razor +++ b/Wonky.Client/Pages/AdminAdvisorViewPage.razor @@ -15,7 +15,7 @@ // *@ -@page "/admin/users/Advisors/{CountryCode}/{UserId}/view" +@page "/admin/users/advisors/{CountryCode}/{UserId}/view" @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin")] @@ -96,10 +96,10 @@
- Tilbage + Tilbage
- Salg + Salg
diff --git a/Wonky.Client/Pages/AdminReportListPage.razor b/Wonky.Client/Pages/AdminReportListPage.razor index f26d4841..2179b23c 100644 --- a/Wonky.Client/Pages/AdminReportListPage.razor +++ b/Wonky.Client/Pages/AdminReportListPage.razor @@ -18,7 +18,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin")] -@page "/admin/users/Advisors/{CountryCode}/{UserId}/reports" +@page "/admin/users/advisors/{CountryCode}/{UserId}/reports"
diff --git a/Wonky.Client/Pages/AdminReportViewPage.razor b/Wonky.Client/Pages/AdminReportViewPage.razor index fa7064e8..22638e22 100644 --- a/Wonky.Client/Pages/AdminReportViewPage.razor +++ b/Wonky.Client/Pages/AdminReportViewPage.razor @@ -17,7 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@page "/admin/users/Advisors/{CountryCode}/{UserId}/reports/{ReportDate}" +@page "/admin/users/advisors/{CountryCode}/{UserId}/reports/{ReportDate}" @attribute [Authorize(Roles = "Admin")]
diff --git a/Wonky.Client/Pages/AdminReportViewPage.razor.cs b/Wonky.Client/Pages/AdminReportViewPage.razor.cs index 73f3c20b..834c28a8 100644 --- a/Wonky.Client/Pages/AdminReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdminReportViewPage.razor.cs @@ -72,7 +72,7 @@ public partial class AdminReportViewPage : IDisposable { if (workDate != ReportDate) { - _navigator.NavigateTo($"/admin/users/Advisors/{CountryCode}/{UserId}/reports/{workDate}"); + _navigator.NavigateTo($"/admin/users/advisors/{CountryCode}/{UserId}/reports/{workDate}"); return; } diff --git a/Wonky.Client/Pages/Index.razor b/Wonky.Client/Pages/Index.razor index ebe1efbe..a62c0127 100644 --- a/Wonky.Client/Pages/Index.razor +++ b/Wonky.Client/Pages/Index.razor @@ -23,7 +23,10 @@ @attribute [Authorize(Roles = "Advisor,Admin,Supervisor,Office,Warehouse")] - + + + + @code{ } diff --git a/Wonky.Client/Pages/LandingPageAdminAdvisers.razor b/Wonky.Client/Pages/LandingPageAdminAdvisers.razor index 1de98c6a..dd818c8b 100644 --- a/Wonky.Client/Pages/LandingPageAdminAdvisers.razor +++ b/Wonky.Client/Pages/LandingPageAdminAdvisers.razor @@ -17,7 +17,7 @@ @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin")] -@page "/admin/users/Advisors" +@page "/admin/users/advisors"
@@ -27,9 +27,9 @@
- Danmark - Norge - Sverige + Danmark + Norge + Sverige
diff --git a/Wonky.Client/Pages/TaskItemListPage.razor.cs b/Wonky.Client/Pages/TaskItemListPage.razor.cs index 63618c9d..e0580445 100644 --- a/Wonky.Client/Pages/TaskItemListPage.razor.cs +++ b/Wonky.Client/Pages/TaskItemListPage.razor.cs @@ -27,7 +27,7 @@ namespace Wonky.Client.Pages; public partial class TaskItemListPage : IDisposable { [Inject] public UserPreferenceService UserPrefs { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private NavigationManager _navigator { get; set; } [Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; } diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor b/Wonky.Client/Pages/WarehouseOrderViewPage.razor index 781a6071..7c2ca59f 100644 --- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor @@ -92,7 +92,7 @@ } @if (_order.ProcessStatusEnum.ToLower() == "packed") { - + }
diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs index df54789d..85ab1779 100644 --- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs @@ -52,6 +52,7 @@ public partial class WarehouseOrderViewPage : IDisposable ProcessStatusEnum = "shipped" }; await _warehouseRepo.UpdateWarehouseOrderStatus(process); + _navigator.NavigateTo("/warehouse/orders"); } public void Dispose() diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index dad04b15..88920104 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -20,7 +20,7 @@
- +