root/Wonky.Client
root/Wonky.Client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wip

Browse source
This commit is contained in:
Frede Hundewadt 2022-07-17 12:42:32 +02:00
parent 2d58f0c14f
commit f707dc2d87
19 changed files with 34 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Wonky.Client/Components/AdminAdvisorTableComponent.razor
View file

@ -44,9 +44,9 @@
<td>@user.FullName</td> <td>@user.FullName</td>
<td>@user.PhoneNumber</td> <td>@user.PhoneNumber</td>
<td>@user.Email</td> <td>@user.Email</td>
<td><a class="btn btn-outline-dark" href="/admin/users/Advisors/@user.CountryCode.ToLower()/@user.UserId/reports">Rapporter</a></td> <td><a class="btn btn-outline-dark" href="/admin/users/advisors/@user.CountryCode.ToLower()/@user.UserId/reports">Rapporter</a></td>
<td><a class="btn btn-outline-dark" href="/admin/users/Advisors/@user.CountryCode.ToLower()/@user.UserId/companies">Kunder</a></td> <td><a class="btn btn-outline-dark" href="/admin/users/advisors/@user.CountryCode.ToLower()/@user.UserId/companies">Kunder</a></td>
<td><a class="btn btn-outline-dark" href="/admin/users/Advisors/@user.CountryCode.ToLower()/@user.UserId/view">Rediger</a></td> <td><a class="btn btn-outline-dark" href="/admin/users/advisors/@user.CountryCode.ToLower()/@user.UserId/view">Rediger</a></td>
</tr> </tr>
} }
</tbody> </tbody>

2
Wonky.Client/Components/AdminReportTableComponent.razor
View file

@ -41,7 +41,7 @@
</div> </div>
@foreach (var report in ReportList) @foreach (var report in ReportList)
{ {
<a class="list-group-item list-group-item-action" href="/admin/users/Advisors/@CountryCode/@UserId/reports/@report.ReportDate"> <a class="list-group-item list-group-item-action" href="/admin/users/advisors/@CountryCode/@UserId/reports/@report.ReportDate">
<div class="row"> <div class="row">
<div class="col"> <div class="col">
@report.ReportDate @report.ReportDate

0
Wonky.Client/Components/Home.razor → Wonky.Client/Components/AdvisorLandingComponent.razor
View file

7
Wonky.Client/Components/Home.razor.cs → Wonky.Client/Components/AdvisorLandingComponent.razor.cs
View file

@ -29,10 +29,10 @@ using Wonky.Entity.Models;
using Wonky.Entity.Views; using Wonky.Entity.Views;
namespace Wonky.Client.Components; namespace Wonky.Client.Components;
public partial class Home : IDisposable public partial class AdvisorLandingComponent : IDisposable
{ {
[Inject] private UserPreferenceService _preferenceService { get; set; } [Inject] private UserPreferenceService _preferenceService { get; set; }
[Inject] private ILogger<Home> _logger { get; set; } [Inject] private ILogger<AdvisorLandingComponent> _logger { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private IToastService _toast { get; set; } [Inject] private IToastService _toast { get; set; }
[Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; } [Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; }
@ -72,8 +72,7 @@ public partial class Home : IDisposable
{ {
await _preferenceService.SetWorkDate(DateTime.Now); await _preferenceService.SetWorkDate(DateTime.Now);
var item = _taskItems.Find(x => x.TaskItemId == taskItemId); 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) private async Task GetTaskItems(string workDate)

0
Wonky.Client/Components/Home.razor.css → Wonky.Client/Components/AdvisorLandingComponent.razor.css
View file

2
Wonky.Client/Pages/ActivityTodayListPage.razor.cs
View file

@ -26,7 +26,7 @@ namespace Wonky.Client.Pages;
public partial class ActivityTodayListPage public partial class ActivityTodayListPage
{ {
[Inject] private UserPreferenceService _preferenceService { get; set; } [Inject] private UserPreferenceService _preferenceService { get; set; }
[Inject] private ILogger<Home> _logger { get; set; } [Inject] private ILogger<AdvisorLandingComponent> _logger { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private NavigationManager _navigator { get; set; } [Inject] private NavigationManager _navigator { get; set; }
[Inject] private IActivityHttpRepository _activityRepo { get; set; } [Inject] private IActivityHttpRepository _activityRepo { get; set; }

2
Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor
View file

@ -16,7 +16,7 @@
*@ *@
@using Wonky.Client.Components @using Wonky.Client.Components
@page "/admin/users/Advisors/{CountryCode}/{UserId}/companies" @page "/admin/users/advisors/{CountryCode}/{UserId}/companies"
<div class="card"> <div class="card">
<div class="card-header bg-dark text-white"> <div class="card-header bg-dark text-white">

2
Wonky.Client/Pages/AdminAdvisorUserListPage.razor
View file

@ -18,7 +18,7 @@
@using Wonky.Client.Components @using Wonky.Client.Components
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization
@attribute [Authorize(Roles = "Admin")] @attribute [Authorize(Roles = "Admin")]
@page "/admin/users/Advisors/{CountryCode}" @page "/admin/users/advisors/{CountryCode}"
<div class="card"> <div class="card">
<div class="card-header bg-dark text-white"> <div class="card-header bg-dark text-white">

6
Wonky.Client/Pages/AdminAdvisorViewPage.razor
View file

@ -15,7 +15,7 @@
// //
*@ *@
@page "/admin/users/Advisors/{CountryCode}/{UserId}/view" @page "/admin/users/advisors/{CountryCode}/{UserId}/view"
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization
@attribute [Authorize(Roles = "Admin")] @attribute [Authorize(Roles = "Admin")]
@ -96,10 +96,10 @@
<button type="submit" class="btn btn-primary">Gem</button> <button type="submit" class="btn btn-primary">Gem</button>
</div> </div>
<div class="col"> <div class="col">
<a class="btn btn-primary" href="/admin/users/Advisors/@CountryCode">Tilbage</a> <a class="btn btn-primary" href="/admin/users/advisors/@CountryCode">Tilbage</a>
</div> </div>
<div class="col"> <div class="col">
<a class="btn btn-primary" href="/admin/users/Advisors/@CountryCode/@UserId/reports">Salg</a> <a class="btn btn-primary" href="/admin/users/advisors/@CountryCode/@UserId/reports">Salg</a>
</div> </div>
</div> </div>
</EditForm> </EditForm>

2
Wonky.Client/Pages/AdminReportListPage.razor
View file

@ -18,7 +18,7 @@
@using Wonky.Client.Components @using Wonky.Client.Components
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization
@attribute [Authorize(Roles = "Admin")] @attribute [Authorize(Roles = "Admin")]
@page "/admin/users/Advisors/{CountryCode}/{UserId}/reports" @page "/admin/users/advisors/{CountryCode}/{UserId}/reports"
<div class="card"> <div class="card">
<div class="card-header bg-dark text-white"> <div class="card-header bg-dark text-white">

2
Wonky.Client/Pages/AdminReportViewPage.razor
View file

@ -17,7 +17,7 @@
@using Wonky.Client.Components @using Wonky.Client.Components
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization
@page "/admin/users/Advisors/{CountryCode}/{UserId}/reports/{ReportDate}" @page "/admin/users/advisors/{CountryCode}/{UserId}/reports/{ReportDate}"
@attribute [Authorize(Roles = "Admin")] @attribute [Authorize(Roles = "Admin")]
<div class="report-page"> <div class="report-page">

2
Wonky.Client/Pages/AdminReportViewPage.razor.cs
View file

@ -72,7 +72,7 @@ public partial class AdminReportViewPage : IDisposable
{ {
if (workDate != ReportDate) if (workDate != ReportDate)
{ {
_navigator.NavigateTo($"/admin/users/Advisors/{CountryCode}/{UserId}/reports/{workDate}"); _navigator.NavigateTo($"/admin/users/advisors/{CountryCode}/{UserId}/reports/{workDate}");
return; return;
} }

5
Wonky.Client/Pages/Index.razor
View file

@ -23,7 +23,10 @@
@attribute [Authorize(Roles = "Advisor,Admin,Supervisor,Office,Warehouse")] @attribute [Authorize(Roles = "Advisor,Admin,Supervisor,Office,Warehouse")]
<Home></Home> <AuthorizeView Roles="Advisor">
<AdvisorLandingComponent />
</AuthorizeView>
@code{ @code{
} }

8
Wonky.Client/Pages/LandingPageAdminAdvisers.razor
View file

@ -17,7 +17,7 @@
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization
@attribute [Authorize(Roles = "Admin")] @attribute [Authorize(Roles = "Admin")]
@page "/admin/users/Advisors" @page "/admin/users/advisors"
<div class="card"> <div class="card">
<div class="card-header bg-dark text-white"> <div class="card-header bg-dark text-white">
@ -27,9 +27,9 @@
</div> </div>
<div class="card-body"> <div class="card-body">
<div class="list-group list-group-flush"> <div class="list-group list-group-flush">
<a class="list-group-item list-group-item-action" href="/admin/users/Advisors/dk">Danmark</a> <a class="list-group-item list-group-item-action" href="/admin/users/advisors/dk">Danmark</a>
<a class="list-group-item list-group-item-action" href="/admin/users/Advisors/no">Norge</a> <a class="list-group-item list-group-item-action" href="/admin/users/advisors/no">Norge</a>
<a class="list-group-item list-group-item-action" href="/admin/users/Advisors/se">Sverige</a> <a class="list-group-item list-group-item-action" href="/admin/users/advisors/se">Sverige</a>
</div> </div>
</div> </div>
</div> </div>

2
Wonky.Client/Pages/TaskItemListPage.razor.cs
View file

@ -27,7 +27,7 @@ namespace Wonky.Client.Pages;
public partial class TaskItemListPage : IDisposable public partial class TaskItemListPage : IDisposable
{ {
[Inject] public UserPreferenceService UserPrefs { get; set; } [Inject] public UserPreferenceService UserPrefs { get; set; }
[Inject] public ILogger<Home> Logger { get; set; } [Inject] public ILogger<AdvisorLandingComponent> Logger { get; set; }
[Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; }
[Inject] private NavigationManager _navigator { get; set; } [Inject] private NavigationManager _navigator { get; set; }
[Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; } [Inject] private ITaskItemHttpRepository _taskItemRepo { get; set; }

2
Wonky.Client/Pages/WarehouseOrderViewPage.razor
View file

@ -92,7 +92,7 @@
} }
@if (_order.ProcessStatusEnum.ToLower() == "packed") @if (_order.ProcessStatusEnum.ToLower() == "packed")
{ {
<button class="btn btn-lg btn-primary text-nowrap" type="button" @onclick="SetProcessStatusPacked">Sæt status afsendt</button> <button class="btn btn-lg btn-primary text-nowrap" type="button" @onclick="SetProcessStatusShipped">Sæt status afsendt</button>
} }
</div> </div>
</div> </div>

1
Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs
View file

@ -52,6 +52,7 @@ public partial class WarehouseOrderViewPage : IDisposable
ProcessStatusEnum = "shipped" ProcessStatusEnum = "shipped"
}; };
await _warehouseRepo.UpdateWarehouseOrderStatus(process); await _warehouseRepo.UpdateWarehouseOrderStatus(process);
_navigator.NavigateTo("/warehouse/orders");
} }
public void Dispose() public void Dispose()

4
Wonky.Client/Shared/NavMenu.razor
View file

@ -20,7 +20,7 @@
<div class="top-row ps-3 navbar navbar-dark"> <div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href=""> <a class="navbar-brand" href="/">
<TopbarDisplayUser></TopbarDisplayUser> <TopbarDisplayUser></TopbarDisplayUser>
</a> </a>
<button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu"> <button title="Navigation menu" class="navbar-toggler" @onclick="ToggleNavMenu">
@ -56,7 +56,7 @@
<AuthorizeView Roles="Admin"> <AuthorizeView Roles="Admin">
<div class="nav-item px-3"> <div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/admin/users/Advisors"> <NavLink class="nav-link ps-2" href="/admin/users/advisors">
<span class="oi oi-people" aria-hidden="true"></span> Sælgere <span class="oi oi-people" aria-hidden="true"></span> Sælgere
</NavLink> </NavLink>
</div> </div>

10
Wonky.Client/wwwroot/appsettings.json
View file

@ -1,7 +1,7 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Client", "name": "Wonky Client",
"version": "0.9.17", "version": "0.9.19",
"rc": true, "rc": true,
"sandBox": false, "sandBox": false,
"image": "grumpy-coder.png" "image": "grumpy-coder.png"
@ -16,14 +16,14 @@
"tokenUri": "token", "tokenUri": "token",
"userInfoUri": "api/auth/userinfo", "userInfoUri": "api/auth/userinfo",
"catalogUri": "api/v2/crm/catalog", "catalogUri": "api/v2/crm/catalog",
"activityUri": "api/v2/crm/Advisors/sales", "activityUri": "api/v2/crm/advisors/sales",
"reportUri": "api/v2/crm/Advisors/reports", "reportUri": "api/v2/crm/advisors/reports",
"taskUri": "api/v2/crm/Advisors/tasks", "taskUri": "api/v2/crm/advisors/tasks",
"companyUri": "api/v2/crm/companies", "companyUri": "api/v2/crm/companies",
"inventoryUri": "history/inventory", "inventoryUri": "history/inventory",
"productUri": "history/products", "productUri": "history/products",
"syncUri": "history/sync", "syncUri": "history/sync",
"adminAdvisorUri": "api/v2/admin/users/Advisors", "adminAdvisorUri": "api/v2/admin/users/advisors",
"adminUserUri": "api/v2/admin/users/office", "adminUserUri": "api/v2/admin/users/office",
"adminPasswdUri": "api/v2/admin/users/passwd", "adminPasswdUri": "api/v2/admin/users/passwd",
"adminReportUri": "reports", "adminReportUri": "reports",