Sarah/Lieb-Website
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

merged LiebUserId with DiscordId

Browse source
This commit is contained in:
t.ruspekhofer 2022-05-17 23:14:58 +02:00
parent 49374412b3
commit d54ce50336
19 changed files with 109 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lieb/Pages/User/ManageGuildWars2Account.razor
View file

@ -161,7 +161,7 @@
private async Task HandleValidSubmit()
{
await GuildWars2AccountService.AddOrEditAccount(_account, _user.LiebUserId);
await GuildWars2AccountService.AddOrEditAccount(_account, _user.Id);
_account = GuildWars2AccountService.GetAccount(_account.GuildWars2AccountId);
_saveMessage = "changes saved successfully";
}

12
Lieb/Pages/User/UserEdit.razor
View file

@ -64,7 +64,7 @@
@code {
[Parameter]
public string userId { get; set; }
public string _userId { get; set; }
private LiebUser _user;
private int _editingUserRights = 0;
@ -85,7 +85,7 @@
}
}
if(!string.IsNullOrEmpty(userId) && int.TryParse(userId, out int parsedId))
if(!string.IsNullOrEmpty(_userId) && ulong.TryParse(_userId, out ulong parsedId))
{
_user = UserService.GetLiebUser(parsedId);
_roles = UserService.GetLiebRoles();
@ -105,21 +105,21 @@
RoleAssignment roleAssignment = new RoleAssignment()
{
LiebRoleId = role.LiebRoleId,
LiebUserId = _user.LiebUserId
LiebUserId = _user.Id
};
await UserService.AddRoleToUser(_user.LiebUserId, role.LiebRoleId);
await UserService.AddRoleToUser(_user.Id, role.LiebRoleId);
_user.RoleAssignments.Add(roleAssignment);
}
else if(!isChecked && assignment != null)
{
await UserService.RemoveRoleFromUser(_user.LiebUserId, role.LiebRoleId);
await UserService.RemoveRoleFromUser(_user.Id, role.LiebRoleId);
_user.RoleAssignments.Remove(assignment);
}
}
private async Task HandleValidSubmit()
{
await UserService.UpdateBannedUntil(_user.LiebUserId, _user.BannedUntil);
await UserService.UpdateBannedUntil(_user.Id, _user.BannedUntil);
if(_user.BannedUntil >= DateTime.Now.Date)
{
_submitMessage = "user banned successfully";

2
Lieb/Pages/User/UserOverview.razor
View file

@ -63,7 +63,7 @@
{
<tr>
<td class="nav-item px-3">
@{string navLink = $"useredit/{@user.LiebUserId}";}
@{string navLink = $"useredit/{@user.Id}";}
<NavLink class="nav-link" href="@navLink">@user.Name</NavLink>
</td>
<td>@foreach(var account in user.GuildWars2Accounts){<div>@account.AccountName </div> }</td>