Egalware/webdoorcreator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix pagina orderlist

Browse Source
This commit is contained in:
zaccaria.majid
2023-03-17 17:27:51 +01:00
parent 4073cc7a80
commit 35ca491b7a
19 changed files with 9897 additions and 8392 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WebDoorCreator.Data/Controllers/WebDoorCreatorController.cs
+2 -5
View File
@@ -2,7 +2,6 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using NLog;
using System.Collections.Generic;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.DTO;
@@ -253,6 +252,7 @@ namespace WebDoorCreator.Data.Controllers
#endregion Roles methods
#region Order status methods
/// <summary>
/// Order status
/// </summary>
@@ -268,7 +268,6 @@ namespace WebDoorCreator.Data.Controllers
{
try
{
var CompanyId = new SqlParameter("@CompanyId", companyId);
var OrderStatus = new SqlParameter("@OrderStatus", orderStatus);
var DataFrom = new SqlParameter("@DataFrom", dataFrom.Date);
@@ -286,10 +285,10 @@ namespace WebDoorCreator.Data.Controllers
{
Log.Error($"Error in GetOrderStatus:{Environment.NewLine}{exc}");
}
}
return dbResult;
}
#endregion Order status methods
#region Order methods
@@ -336,7 +335,6 @@ namespace WebDoorCreator.Data.Controllers
{
try
{
// extracting entire set
dbResult = localDbCtx
.DbSetDoor
@@ -352,7 +350,6 @@ namespace WebDoorCreator.Data.Controllers
return dbResult;
}
/// <summary>
/// Modifying or adding a new door
/// </summary>
WebDoorCreator.UI/Components/BUTTONS/ButtonAddRemDoor.razor.cs
+1 -1
View File
@@ -29,6 +29,7 @@ namespace WebDoorCreator.UI.Components.BUTTONS
public EventCallback<bool> E_isChange { get; set; }
protected bool doorChange { get; set; } = false;
protected async Task addOrRemoveOneDoorNumber()
{
//var door = new DoorModel();
@@ -39,7 +40,6 @@ namespace WebDoorCreator.UI.Components.BUTTONS
doorChange = true;
await E_isChange.InvokeAsync(doorChange);
}
}
}
}
WebDoorCreator.UI/Components/DOOR/DoorList.razor.cs
+7 -22
View File
@@ -1,26 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.JSInterop;
using WebDoorCreator.UI;
using WebDoorCreator.UI.Components;
using WebDoorCreator.UI.Components.DOORDEF;
using WebDoorCreator.UI.Components.COMPMAN;
using WebDoorCreator.UI.Components.GEN;
using WebDoorCreator.UI.Components.ORDER;
using WebDoorCreator.UI.Components.USERS;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
using Microsoft.AspNetCore.Identity;
using Microsoft.JSInterop;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.DOOR
@@ -29,20 +10,24 @@ namespace WebDoorCreator.UI.Components.DOOR
{
[Inject]
protected WebDoorCreatorService WDService { get; set; } = null!;
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
[Inject]
protected UserManager<IdentityUser> _userManager { get; set; } = null!;
[Inject]
protected NavigationManager NavManager { get; set; } = null!;
[Parameter]
public int currOrderId { get; set; } = 0;
[Parameter]
public EventCallback<bool> E_DoorChanged { get; set; }
protected bool IsChanged { get; set; } = false;
protected List<DoorModel>? DoorsList { get; set; } = null;
protected override async Task OnParametersSetAsync()
WebDoorCreator.UI/Components/DOORDEF/DoorPreview.razor.cs
-18
View File
@@ -1,21 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.JSInterop;
using WebDoorCreator.UI;
using WebDoorCreator.UI.Components;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
namespace WebDoorCreator.UI.Components
{
public partial class DoorPreview
WebDoorCreator.UI/Components/DOORDEF/DoorSizingStep.razor.cs
+2 -2
View File
@@ -10,8 +10,8 @@ namespace WebDoorCreator.UI.Components.DOORDEF
protected WebDoorCreatorService WDService { get; set; } = null!;
protected bool isSizing { get; set; } = true;
protected List<ListValuesModel>? ListSwings{ get; set; } = null;
protected List<ListValuesModel>? ListEdges{ get; set; } = null;
protected List<ListValuesModel>? ListSwings { get; set; } = null;
protected List<ListValuesModel>? ListEdges { get; set; } = null;
protected string isSizingActive
{
WebDoorCreator.UI/Components/DOORDEF/StepsList.razor.cs
-18
View File
@@ -1,21 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.JSInterop;
using WebDoorCreator.UI;
using WebDoorCreator.UI.Components;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
namespace WebDoorCreator.UI.Components
{
public partial class StepsList
WebDoorCreator.UI/Components/GEN/NavMenuHorizontal.razor.cs
-18
View File
@@ -1,21 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.JSInterop;
using WebDoorCreator.UI;
using WebDoorCreator.UI.Components;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
namespace WebDoorCreator.UI.Components
{
public partial class NavMenuHorizontal
WebDoorCreator.UI/Components/GEN/NavMenuHorizontal.razor.less
+2 -3
View File
@@ -7,7 +7,6 @@
background-color: rgba(0,0,0,0.4);
}
.oi {
width: 2rem;
font-size: 1.1rem;
@@ -58,10 +57,10 @@
}
}
.btnLogout{
.btnLogout {
border: none;
background-color: rgb(41, 182, 246);
margin-left: 1rem;
padding: 0.2rem;
border-radius: 0.3rem;
}
}
WebDoorCreator.UI/Components/ORDER/OrderDetails.razor.cs
-13
View File
@@ -1,17 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.JSInterop;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
namespace WebDoorCreator.UI.Components.ORDER
WebDoorCreator.UI/Components/ORDER/OrderList.razor.cs
+24 -21
View File
@@ -1,17 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.AspNetCore.Identity;
using Microsoft.JSInterop;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.UI.Data;
@@ -19,26 +9,39 @@ namespace WebDoorCreator.UI.Components.ORDER
{
public partial class OrderList
{
#region Protected Properties
[Parameter]
public bool B_doorChaged { get; set; }
[Parameter]
public EventCallback<int> E_currOrderStatus { get; set; }
#region Protected Properties
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
[Inject]
protected WebDoorCreatorService WDService { get; set; } = null!;
[Inject]
protected UserManager<IdentityUser> _userManager { get; set; } = null!;
[Inject]
protected AuthenticationStateProvider ASProvider { get; set; } = null!;
protected string currUser { get; set; } = "";
#endregion Protected Properties
#region Protected Methods
protected override async Task OnInitializedAsync()
{
var all = ASProvider.GetAuthenticationStateAsync().Result.User.Identity;
if (all != null)
{
currUser = all.Name;
}
await ReloadData();
}
@@ -60,9 +63,6 @@ namespace WebDoorCreator.UI.Components.ORDER
#region Private Methods
//protected List<UsersViewModel>? UsersList { get; set; } = null;
//protected List<AspNetRoles>? RolesList { get; set; } = null;
protected OrderStatusViewModel? currOrder { get; set; } = null;
protected bool isModRole { get; set; } = false;
@@ -99,19 +99,22 @@ namespace WebDoorCreator.UI.Components.ORDER
var adesso = DateTime.Now.Date;
ListOrdersStatus = null;
await Task.Delay(1);
ListOrdersStatus = await WDService.GetOrderStatus(0, 0, adesso.AddYears(-2), adesso);
var user = await _userManager.FindByNameAsync(currUser);
var compId = await _userManager.GetClaimsAsync(user);
var claim = compId.FirstOrDefault();
if (claim != null)
{
ListOrdersStatus = await WDService.GetOrderStatus(int.Parse(claim.Value), 0, adesso.AddYears(-2), adesso);
}
await Task.Delay(1);
await InvokeAsync(StateHasChanged);
}
private async Task setCurrOrder(int currOrd)
{
await Task.Delay(1);
await E_currOrderStatus.InvokeAsync(currOrd);
}
//private async Task editRec(CompanyModel currComp)
//{
// await E_currCompany.InvokeAsync(currComp);
//}
#endregion Private Methods
}
WebDoorCreator.UI/Components/USERS/UserList.razor.cs
+2 -4
View File
@@ -1,9 +1,6 @@
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using Microsoft.JSInterop;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.Data.DTO;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Components.USERS
@@ -14,6 +11,7 @@ namespace WebDoorCreator.UI.Components.USERS
[Inject]
protected WebDoorCreatorService WDService { get; set; } = null!;
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
@@ -55,11 +53,11 @@ namespace WebDoorCreator.UI.Components.USERS
await Task.Delay(1);
await InvokeAsync(StateHasChanged);
}
private async Task setCurrUser(string userId)
{
await Task.Delay(1);
currUser = await WDService.GetUsersById(userId);
}
//private async Task editRec(CompanyModel currComp)
WebDoorCreator.UI/Data/WebDoorCreatorService.cs
+16 -6
View File
@@ -1,13 +1,11 @@
using Microsoft.AspNetCore.Identity.UI.Services;
using EgwCoreLib.Razor.Data;
using Microsoft.AspNetCore.Identity.UI.Services;
using Newtonsoft.Json;
using NLog;
using StackExchange.Redis;
using System.Diagnostics;
using WebDoorCreator.Data.Controllers;
using WebDoorCreator.Data.DbModels;
using EgwCoreLib.Razor.Data;
using WebDoorCreator.Data.DTO;
using WebDoorCreator.Data;
namespace WebDoorCreator.UI.Data
{
@@ -118,6 +116,7 @@ namespace WebDoorCreator.UI.Data
await Task.Delay(1);
return dbResult;
}
#endregion Company methods
/*----------------------------------------------------------------------------------------------------------------------*/
@@ -150,6 +149,7 @@ namespace WebDoorCreator.UI.Data
return answ;
}
public async Task<bool> FlushRedisCache()
{
await Task.Delay(1);
@@ -157,19 +157,23 @@ namespace WebDoorCreator.UI.Data
bool answ = await ExecFlushRedisPattern(pattern);
return answ;
}
#endregion Cache methods
/*----------------------------------------------------------------------------------------------------------------------*/
#region Security Methods
public string DecriptData(string encData)
{
return SteamCrypto.DecryptString(encData, passPhrase);
}
public string EncriptData(string rawData)
{
return SteamCrypto.EncryptString(rawData, passPhrase);
}
#endregion Security Methods
/*----------------------------------------------------------------------------------------------------------------------*/
@@ -217,6 +221,7 @@ namespace WebDoorCreator.UI.Data
Log.Debug($"GetUserView | {source} in: {ts.TotalMilliseconds} ms");
return dbResult;
}
/// <summary>
/// Users roles list
/// </summary>
@@ -258,6 +263,7 @@ namespace WebDoorCreator.UI.Data
Log.Debug($"GetUsersAll | {source} in: {ts.TotalMilliseconds} ms");
return dbResult;
}
/// <summary>
/// Users roles list
/// </summary>
@@ -299,6 +305,7 @@ namespace WebDoorCreator.UI.Data
Log.Debug($"GetUsersById | {source} in: {ts.TotalMilliseconds} ms");
return dbResult;
}
#endregion User Methods
/*----------------------------------------------------------------------------------------------------------------------*/
@@ -346,11 +353,13 @@ namespace WebDoorCreator.UI.Data
Log.Debug($"GetRolesAll | {source} in: {ts.TotalMilliseconds} ms");
return dbResult;
}
#endregion Roles Methods
/*----------------------------------------------------------------------------------------------------------------------*/
#region Order status Methods
public async Task<List<OrderStatusViewModel>?> GetOrderStatus(int companyId, int orderStatus, DateTime dataFrom, DateTime dataTo)
{
string source = "DB";
@@ -416,6 +425,7 @@ namespace WebDoorCreator.UI.Data
/*----------------------------------------------------------------------------------------------------------------------*/
#region Door Methods
/// <summary>
/// Doors list by orderId
/// </summary>
@@ -475,6 +485,7 @@ namespace WebDoorCreator.UI.Data
await Task.Delay(1);
return dbResult;
}
/// <summary>
/// Adding or removing a single door
/// </summary>
@@ -500,7 +511,6 @@ namespace WebDoorCreator.UI.Data
#region ListValues Methods
/// <summary>
/// Company list
/// </summary>
@@ -584,6 +594,7 @@ namespace WebDoorCreator.UI.Data
//#endregion Public Methods
protected const string rKeyCompany = $"{redisBaseAddr}:Cache:Company";
protected const string rKeyOrderStatus = $"{redisBaseAddr}:Cache:OrderStatus";
protected const string rKeyUsers = $"{redisBaseAddr}:Cache:Users";
protected const string rKeyUsersView = $"{redisBaseAddr}:Cache:UsersView";
@@ -627,6 +638,5 @@ namespace WebDoorCreator.UI.Data
private IDatabase redisDb = null!;
#endregion Private Fields
}
}
WebDoorCreator.UI/Pages/DoorDefinition.razor.cs
+3 -20
View File
@@ -1,24 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.JSInterop;
using WebDoorCreator.UI;
using WebDoorCreator.UI.Components;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
using MailKit;
using Microsoft.AspNetCore.WebUtilities;
using System.Drawing.Printing;
using WebDoorCreator.Data.Controllers;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Pages
@@ -34,7 +16,8 @@ namespace WebDoorCreator.UI.Pages
protected int idOrd { get; set; } = 0;
protected OrderStatusViewModel? orderStatus { get; set; } = null;
private List<OrderStatusViewModel>? ListOrdersStatus = null;
protected async override Task OnInitializedAsync()
protected override async Task OnInitializedAsync()
{
await Task.Delay(1);
var uri = navManager.ToAbsoluteUri(navManager.Uri);
WebDoorCreator.UI/Pages/OrdersHomePage.razor.cs
+15 -19
View File
@@ -1,21 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.AspNetCore.Identity;
using Microsoft.JSInterop;
using WebDoorCreator.UI;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.UI.Data;
using Microsoft.AspNetCore.Identity;
namespace WebDoorCreator.UI.Pages
{
@@ -25,10 +12,13 @@ namespace WebDoorCreator.UI.Pages
[Inject]
protected WebDoorCreatorService WDService { get; set; } = null!;
[Inject]
protected IJSRuntime JSRuntime { get; set; } = null!;
[Inject]
protected UserManager<IdentityUser> _userManager { get; set; } = null!;
[Inject]
protected NavigationManager NavManager { get; set; } = null!;
@@ -37,28 +27,34 @@ namespace WebDoorCreator.UI.Pages
#endregion Protected Properties
#region Private Fields
protected string _orderCodExt = "";
protected string orderCodExt
{
get => _orderCodExt;
set => _orderCodExt = value;
}
protected string _orderDescr = "";
protected string orderDescr
{
get => _orderDescr;
set => _orderDescr = value;
}
protected string _doorExtCode = "";
protected string doorExtCode
{
get => _doorExtCode;
set => _doorExtCode = value;
}
protected int _doorQuantity = 0;
protected int doorQuantity
{
get => _doorQuantity;
@@ -111,6 +107,7 @@ namespace WebDoorCreator.UI.Pages
await Task.Delay(1);
currDoorType = doorType;
}
protected async Task SetCurrDoor(DoorModel door)
{
await Task.Delay(1);
@@ -118,6 +115,7 @@ namespace WebDoorCreator.UI.Pages
doorExtCode = currDoor.DoorExtCode;
doorQuantity = currDoor.Quantity;
}
protected async Task emptyModal()
{
await Task.Delay(1);
@@ -125,7 +123,6 @@ namespace WebDoorCreator.UI.Pages
currDoor = null;
}
protected async Task addOrModDoor(string userName)
{
var user = await _userManager.FindByNameAsync(userName);
@@ -142,7 +139,6 @@ namespace WebDoorCreator.UI.Pages
if (addRec != null)
{
var done = await WDService.DoorUpsert(addRec);
if (done)
@@ -157,8 +153,8 @@ namespace WebDoorCreator.UI.Pages
await Task.Delay(1);
doorChange = isChanged;
}
protected bool doorChange { get; set; } = false;
protected bool doorChange { get; set; } = false;
#if false
protected bool doorChange { get; set; } = false;
@@ -174,7 +170,7 @@ namespace WebDoorCreator.UI.Pages
}
doorChange = true;
}
}
#endif
protected string goToDefPage { get; set; } = "";
WebDoorCreator.UI/Pages/SuperAdmin.razor.cs
+30 -24
View File
@@ -1,27 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.JSInterop;
using WebDoorCreator.UI;
using WebDoorCreator.UI.Shared;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.UI.Data;
using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity.UI.Services;
using System.Text.Encodings.Web;
using Org.BouncyCastle.Asn1.Ocsp;
using System.Security.Policy;
using Microsoft.AspNetCore.WebUtilities;
using System.Text;
using System.Text.Encodings.Web;
using WebDoorCreator.Data.DbModels;
using WebDoorCreator.UI.Data;
namespace WebDoorCreator.UI.Pages
{
@@ -35,15 +20,16 @@ namespace WebDoorCreator.UI.Pages
protected NavigationManager NavManager { get; set; } = null!;
[Inject]
protected UserManager<IdentityUser> _userManager { get; set; } = null!;
[Inject]
[Inject]
protected IEmailSender _emailSender { get; set; } = null!;
protected CompanyModel? currCompany { get; set; } = null;
protected AspNetUsers? currUser { get; set; } = null;
protected int _companyId = 0;
protected int companyId
{
get => _companyId;
@@ -51,6 +37,7 @@ namespace WebDoorCreator.UI.Pages
}
protected string _companyExtCode = "";
protected string companyExtCode
{
get => _companyExtCode;
@@ -58,6 +45,7 @@ namespace WebDoorCreator.UI.Pages
}
protected string _companyName = "";
protected string companyName
{
get => _companyName;
@@ -65,6 +53,7 @@ namespace WebDoorCreator.UI.Pages
}
protected string _address = "";
protected string address
{
get => _address;
@@ -72,6 +61,7 @@ namespace WebDoorCreator.UI.Pages
}
protected int _zipCode = 0;
protected int zipCode
{
get => _zipCode;
@@ -79,6 +69,7 @@ namespace WebDoorCreator.UI.Pages
}
protected string _city = "";
protected string city
{
get => _city;
@@ -86,42 +77,55 @@ namespace WebDoorCreator.UI.Pages
}
protected string _state = "";
protected string state
{
get => _state;
set { _state = value; }
}
protected string _vat = "";
protected string vat
{
get => _vat;
set { _vat = value; }
}
protected string _privateNote = "";
protected string privateNote
{
get => _privateNote;
set { _privateNote = value; }
}
protected string _companyToken = "";
protected string companyToken
{
get => _companyToken;
set { _companyToken = value; }
}
protected string _email = "";
protected string email
{
get => _email;
set { _email = value; }
}
protected string _password = "";
protected string password
{
get => _password;
set { _password = value; }
}
protected string _passwordConfirm = "";
protected string passwordConfirm
{
get => _passwordConfirm;
@@ -174,6 +178,7 @@ namespace WebDoorCreator.UI.Pages
NavManager.NavigateTo(NavManager.Uri, true);
}
}
protected async Task addModNewUser()
{
Guid newCompToken = Guid.NewGuid();
@@ -185,12 +190,10 @@ namespace WebDoorCreator.UI.Pages
if (result.Succeeded)
{
await _userManager.AddToRoleAsync(user, "User");
await _userManager.AddToRoleAsync(user, "User");
var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
var callbackUrl = $"/Account/ConfirmEmail?userId{user.Id}&code{code}&returnUrl=~/";
await _emailSender.SendEmailAsync(email, "Web Door Creator: Please confirm your email account",
$"<a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>Click here</a> to confirm the account linked with this email.");
@@ -240,6 +243,7 @@ namespace WebDoorCreator.UI.Pages
companyToken = currCompany.CompanyToken;
}
}
protected async Task catchCurrUser(AspNetUsers? selUser)
{
await Task.Delay(1);
@@ -259,6 +263,7 @@ namespace WebDoorCreator.UI.Pages
return answ;
}
}
protected string selectedUser
{
get
@@ -274,6 +279,7 @@ namespace WebDoorCreator.UI.Pages
await Task.Delay(1);
isCompShow = true;
}
protected async Task doShowUser()
{
await Task.Delay(1);
WebDoorCreator.UI/Pages/SuperAdmin.razor.less
+1 -2
View File
@@ -14,11 +14,10 @@
background-color: #D9D9D9;
padding: 0.3rem 0.8rem 0.3rem 0.8rem;
border-radius: 0.8rem 0.8rem 0 0;
cursor: pointer;/*
cursor: pointer; /*
box-shadow: rgb(0 0 0 / 20%) 0px 5px 9px 0px inset;*/
}
.listContainer {
border-left: 1px solid black;
border-bottom: 1px solid black;
WebDoorCreator.UI/wwwroot/css/site.css
+43 -31
View File
@@ -1,54 +1,66 @@
@import url('open-iconic/font/css/open-iconic-bootstrap.min.css');
html,
body {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
}
h1:focus {
outline: none;
outline: none;
}
a,
.btn-link {
color: #0071c1;
color: #0071c1;
}
.btn-primary {
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
color: #fff;
background-color: #1b6ec2;
border-color: #1861ac;
}
.content {
padding-top: 1.1rem;
padding-top: 1.1rem;
}
.valid.modified:not([type=checkbox]) {
outline: 1px solid #26b050;
outline: 1px solid #26b050;
}
.invalid {
outline: 1px solid red;
outline: 1px solid red;
}
.validation-message {
color: red;
color: red;
}
#blazor-error-ui {
background: lightyellow;
bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
display: none;
left: 0;
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
position: fixed;
width: 100%;
z-index: 1000;
}
#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
background: lightyellow;
bottom: 0;
box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
display: none;
left: 0;
padding: 0.6rem 1.25rem 0.7rem 1.25rem;
position: fixed;
width: 100%;
z-index: 1000;
}
#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}
.blazor-error-boundary {
background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
padding: 1rem 1rem 1rem 3.7rem;
color: white;
background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
padding: 1rem 1rem 1rem 3.7rem;
color: white;
}
.blazor-error-boundary::after {
content: "An error has occurred.";
}
.blazor-error-boundary::after {
content: "An error has occurred.";
}
WebDoorCreator.UI/wwwroot/css/site.less
+10 -10
View File
@@ -17,6 +17,7 @@ a, .btn-link {
background-color: #1b6ec2;
border-color: #1861ac;
}
.content {
padding-top: 1.1rem;
}
@@ -45,12 +46,12 @@ a, .btn-link {
z-index: 1000;
}
#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}
#blazor-error-ui .dismiss {
cursor: pointer;
position: absolute;
right: 0.75rem;
top: 0.5rem;
}
.blazor-error-boundary {
background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
@@ -58,7 +59,6 @@ a, .btn-link {
color: white;
}
.blazor-error-boundary::after {
content: "An error has occurred."
}
.blazor-error-boundary::after {
content: "An error has occurred."
}
WebDoorCreator.UI/wwwroot/lib/bootstrap/css/bootstrap.css
Vendored
+9739 -8155
View File
File diff suppressed because it is too large Load Diff