reworked account pages

Lieb/Pages/User/ManageAccount.razor

@@ -14,8 +14,8 @@
     <Authorized>
     <EditForm Model="@_user" OnValidSubmit="@HandleValidSubmit">
         <DataAnnotationsValidator />
-        <ValidationSummary />
     
+        <p>@_saveMessage</p>
         <p>
             <label>
                 Name:
@@ -36,24 +36,26 @@
             </label>
         </p>
         
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="gw2accountedit">
-                <span class="oi oi-plus" aria-hidden="true"></span> Add Guild Wars 2 Account
-            </NavLink>
-        </div>
-
-        @foreach(GuildWars2Account account in _user.GuildWars2Accounts)
-        {
-            <div class="nav-item px-3">
-                @{string navLink = $"gw2accountedit/{@account.GuildWars2AccountId}";}
-                <NavLink class="nav-link" href="@navLink">@account.AccountName</NavLink>
-            </div>
-        }
-        
         <br />
-        <button type="submit">Submit</button>
+        <button type="submit">Save</button>
+        <ValidationSummary />
 
     </EditForm>
+    
+    <br />
+    <div class="nav-item px-3">
+        <NavLink class="nav-link" href="gw2accountedit">
+            <span class="oi oi-plus" aria-hidden="true"></span> Add Guild Wars 2 Account
+        </NavLink>
+    </div>
+
+    @foreach(GuildWars2Account account in _user.GuildWars2Accounts)
+    {
+        <div class="nav-item px-3">
+            @{string navLink = $"gw2accountedit/{@account.GuildWars2AccountId}";}
+            <NavLink class="nav-link" href="@navLink">@account.AccountName</NavLink>
+        </div>
+    }
 </Authorized>
 </AuthorizeView>
 
@@ -61,6 +63,7 @@
 @code {
 
     public LiebUser _user;
+    private string _saveMessage = string.Empty;
 
     protected override async Task OnInitializedAsync()
     {
@@ -74,5 +77,6 @@
     private async Task HandleValidSubmit()
     {
         await UserService.EditUser(_user);
+        _saveMessage = "changes saved successfully";
     }
 }

Lieb/Pages/User/ManageGuildWars2Account.razor

@@ -18,8 +18,8 @@
     <Authorized>
         <EditForm Model="@_account" OnValidSubmit="@HandleValidSubmit">
             <DataAnnotationsValidator />
-            <ValidationSummary />
     
+            <p>@_saveMessage</p>
             <p>
                 <label>
                     Account name:
@@ -33,11 +33,18 @@
                 </label>
             </p>
 
-            
-            <label>Equipped Builds</label>
+            <br />
+            <button type="submit">Save</button>
+            <ValidationSummary />
+
+        </EditForm>
+
+        @if (_account.GuildWars2AccountId != 0)
+        {
+            <br />
             <table>
                 <tr>
-                    <th></th>
+                    <th>Equipped</th>
                     <th>can Tank</th>
                     <th>Build</th>
                     <th>Class</th>
@@ -47,61 +54,34 @@
                     <th>Quick</th>
                     <th>Alac</th>
                 </tr>
-                @foreach (Equipped equippedBuild in _account.EquippedBuilds)
-                {
-                    <tr>
-                        <td><button type=button @onclick="() => RemoveBuildClicked(equippedBuild.GuildWars2BuildId)">Remove</button></td>
-                        <td><input type="checkbox" checked="@equippedBuild.CanTank" @onchange="args => TankingStatusChanged(equippedBuild, args)" /></td>
-                        <td>@equippedBuild.GuildWars2Build.BuildName</td>
-                        <td>@equippedBuild.GuildWars2Build.Class.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.EliteSpecialization.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.Might.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.Heal.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.Quickness.ToString()</td>
-                        <td>@equippedBuild.GuildWars2Build.Alacrity.ToString()</td>
-                    </tr>
-                }
-            </table> 
-                
-            <p>
-                <label>Existing Builds</label>
-            <table>
-                <tr>
-                    <th></th>
-                    <th>Build</th>
-                    <th>Class</th>
-                    <th>Elite</th>
-                    <th>Might</th>
-                    <th>Heal</th>
-                    <th>Quick</th>
-                    <th>Alac</th>
-                </tr>
                 @foreach (GuildWars2Build build in GuildWars2BuildService.GetBuilds())
                 {
-                    if(!_account.EquippedBuilds.Where(e => e.GuildWars2BuildId == build.GuildWars2BuildId).Any())
+                    Equipped? equippedBuild = _account.EquippedBuilds.FirstOrDefault(e => e.GuildWars2BuildId == build.GuildWars2BuildId);
+                    bool isEquipped = equippedBuild != null;
+                    bool canTank = false;
+                    if (isEquipped)
                     {
-                        <tr>
-                            <td><button type=button @onclick="() => AddBuildlicked(build)">Add</button></td>
-                            <td>@build.BuildName</td>
-                            <td>@build.Class.ToString()</td>
-                            <td>@build.EliteSpecialization.ToString()</td>
-                            <td>@build.Might.ToString()</td>
-                            <td>@build.Heal.ToString()</td>
-                            <td>@build.Quickness.ToString()</td>
-                            <td>@build.Alacrity.ToString()</td>
-                        </tr>
+                        canTank = equippedBuild.CanTank;
                     }
+
+                    <tr>
+                        <td><input type="checkbox" checked="@isEquipped" @onchange="args => EquippedStatusChanged(build.GuildWars2BuildId, args)" /></td>
+                        <td><input type="checkbox" checked="@canTank" disabled="@(!isEquipped)" @onchange="args => TankingStatusChanged(build.GuildWars2BuildId, args)" /></td>
+                        <td>@build.BuildName</td>
+                        <td>@build.Class.ToString()</td>
+                        <td>@build.EliteSpecialization.ToString()</td>
+                        <td><input type="checkbox" checked="@(build.Might > 0)" disabled="true" /></td>
+                        <td><input type="checkbox" checked="@(build.Heal > 0)" disabled="true" /></td>
+                        <td><input type="checkbox" checked="@(build.Quickness > 0)" disabled="true" /></td>
+                        <td><input type="checkbox" checked="@(build.Alacrity > 0)" disabled="true" /></td>
+                    </tr>
                 }
             </table> 
-            </p>
-        
-
-            <br />
-            <button type="submit">Submit</button>
-
-        </EditForm>
-        <br/>
-        <button type=button @onclick="() => DeleteAccountClicked()">Delete Account</button>
+            
+            <br/>
+            <button type=button @onclick="() => DeleteAccountClicked()">Delete Account</button>
+        }
+             
     </Authorized>
 </AuthorizeView>
 
@@ -115,6 +95,8 @@
 
     private LiebUser _user;
 
+    private string _saveMessage = string.Empty;
+
     protected override async Task OnInitializedAsync()
     {
         var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
@@ -131,31 +113,24 @@
         }
     }
 
-    async Task AddBuildlicked(GuildWars2Build build)
+    async Task EquippedStatusChanged(int buildId, ChangeEventArgs args)
     {
-        Equipped equipped = new Equipped()
-            {
-                GuildWars2AccountId = _account.GuildWars2AccountId,
-                GuildWars2Account = _account,
-                GuildWars2BuildId = build.GuildWars2BuildId,
-                GuildWars2Build = build
-            };
-        _account.EquippedBuilds.Add(equipped);
-    }
-
-
-    async Task RemoveBuildClicked(int buildId)
-    {
-        Equipped equipped = _account.EquippedBuilds.FirstOrDefault(e => e.GuildWars2BuildId == buildId);
-        if (equipped != null)
+        bool isEquipped = bool.Parse(args.Value.ToString());
+        if(isEquipped)
         {
-            _account.EquippedBuilds.Remove(equipped);
+            await GuildWars2AccountService.AddBuild(_account.GuildWars2AccountId, buildId);
         }
+        else
+        {
+            await GuildWars2AccountService.RemoveBuild(_account.GuildWars2AccountId, buildId);
+        }
+        _account = GuildWars2AccountService.GetAccount(_account.GuildWars2AccountId);
     }
 
-    async Task TankingStatusChanged(Equipped equipped, ChangeEventArgs args)
+    async Task TankingStatusChanged(int buildId, ChangeEventArgs args)
     {
-        equipped.CanTank =bool.Parse(args.Value.ToString());
+        bool canTank = bool.Parse(args.Value.ToString());
+        await GuildWars2AccountService.ChangeTankStatus(_account.GuildWars2AccountId, buildId, canTank);
     }
 
     async Task DeleteAccountClicked()
@@ -171,6 +146,7 @@
     private async Task HandleValidSubmit()
     {
         await GuildWars2AccountService.AddOrEditAccount(_account, _user.LiebUserId);
-        NavigationManager.NavigateTo("accountedit");
+        _account = GuildWars2AccountService.GetAccount(_account.GuildWars2AccountId);
+        _saveMessage = "changes saved successfully";
     }
 }

Lieb/Pages/User/UserEdit.razor

@@ -19,43 +19,51 @@
             
     <AuthorizeView Policy="@Constants.Roles.Admin" Context="authorizationContext">
         <Authorized>
+            <p>@_submitMessage</p>
             <p>
                 <label>
                     Banned Until:
                     <InputDate @bind-Value="_user.BannedUntil" />
-                </label>
+                </label>       
+                @if (_user.BannedUntil >= DateTime.Now.Date)
+                {
+                    <button type="submit">Ban</button>
+                }
+                else
+                {
+                    <button type="submit">Unban</button>
+            }
             </p>
         </Authorized>
     </AuthorizeView>
 
-    <table>
-        <tr>
-            <th></th>
-            <th>Role</th>
-            <th>IsSystemRole</th>
-        </tr>
-        @foreach (LiebRole role in _roles)
-        {
-            <tr>
-                @{
-                    bool hasRole = _user.RoleAssignments.Where(a => a.LiebRoleId == role.LiebRoleId).Any();
-                    bool disabled = _editingUserRights < role.LevelToAssign;
-                 }
-                <td><input type="checkbox" disabled="@disabled" checked="@hasRole" @onchange="args => RoleStatusChanged(role, args)" /></td>
-                <td>@role.RoleName</td>
-                @if(@role.IsSystemRole)
-                {
-                    <td>True</td>
-                }
-            </tr>
-        }
-    </table> 
-    <br />
-    <button type="submit">Submit</button>
-
 </EditForm>
 
 
+<table>
+    <tr>
+        <th></th>
+        <th>Role</th>
+        <th>IsSystemRole</th>
+    </tr>
+    @foreach (LiebRole role in _roles)
+    {
+        <tr>
+            @{
+                bool hasRole = _user.RoleAssignments.Where(a => a.LiebRoleId == role.LiebRoleId).Any();
+                bool disabled = _editingUserRights < role.LevelToAssign;
+                }
+            <td><input type="checkbox" disabled="@disabled" checked="@hasRole" @onchange="args => RoleStatusChanged(role, args)" /></td>
+            <td>@role.RoleName</td>
+            @if(@role.IsSystemRole)
+            {
+                <td>True</td>
+            }
+        </tr>
+    }
+</table> 
+<br />
+
 @code {
 
     [Parameter]
@@ -64,6 +72,7 @@
     private LiebUser _user;
     private int _editingUserRights = 0;
     private List<LiebRole> _roles;
+    private string _submitMessage = string.Empty;
 
     protected override async Task OnInitializedAsync()
     {
@@ -101,17 +110,26 @@
                     LiebRoleId = role.LiebRoleId,
                     LiebUserId = _user.LiebUserId
                 };
+            await UserService.AddRoleToUser(_user.LiebUserId, role.LiebRoleId);
             _user.RoleAssignments.Add(roleAssignment);
         }
         else if(!isChecked && assignment != null)
         {
+            await UserService.RemoveRoleFromUser(_user.LiebUserId, role.LiebRoleId);
             _user.RoleAssignments.Remove(assignment);
         }
     }
 
     private async Task HandleValidSubmit()
     {
-        await UserService.EditUserRoles(_user);
-        NavigationManager.NavigateTo("useroverview");
+        await UserService.UpdateBannedUntil(_user.LiebUserId, _user.BannedUntil);
+        if(_user.BannedUntil >= DateTime.Now.Date)
+        {
+            _submitMessage = "user banned successfully";
+        }
+        else
+        {
+            _submitMessage = "user unbanned successfully";
+        }
     }
 }

Lieb/Pages/User/UserOverview.razor

@@ -38,11 +38,11 @@
         HashSet<LiebUser> foundUsers = new HashSet<LiebUser>();
         if(_bannedOnly)
         {
-            foreach(LiebUser user in _users.Where(u => u.Name.Contains(_searchString, StringComparison.OrdinalIgnoreCase) && u.BannedUntil > DateTime.Now))
+            foreach(LiebUser user in _users.Where(u => u.Name.Contains(_searchString, StringComparison.OrdinalIgnoreCase) && u.BannedUntil >= DateTime.Now.Date))
             {
                 foundUsers.Add(user);
             }
-            foreach(LiebUser user in _users.Where(u => u.GuildWars2Accounts.Where(a => a.AccountName.Contains(_searchString, StringComparison.OrdinalIgnoreCase)).Any() && u.BannedUntil > DateTime.Now))
+            foreach(LiebUser user in _users.Where(u => u.GuildWars2Accounts.Where(a => a.AccountName.Contains(_searchString, StringComparison.OrdinalIgnoreCase)).Any() && u.BannedUntil >= DateTime.Now.Date))
             {
                 foundUsers.Add(user);
             }
@@ -67,7 +67,10 @@
                 <NavLink class="nav-link" href="@navLink">@user.Name</NavLink>
             </td>
             <td>@foreach(var account in user.GuildWars2Accounts){<div>@account.AccountName </div> }</td>
-            <td>@user.BannedUntil?.ToLongDateString()</td>
+            @if(user.BannedUntil >= DateTime.Now.Date)
+            {
+                <td>@user.BannedUntil?.ToLongDateString()</td>
+            }
         </tr>
     }
 </table>