Merge pull request #119 from ezraroi/117-add-column-in-admin-view-wit…

…h-user-role added
ezraroi · Sep 15, 2024 · a989f43 · a989f43
2 parents 81467b5 + 7ddae98
commit a989f43
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/Mundialito/Client/src/Users/ManageApp.html b/Mundialito/Client/src/Users/ManageApp.html
@@ -8,12 +8,14 @@
                     <table class="table table-striped">
                         <thead>
                         <th>Name</th>
+                        <th>Role</th>
                         <th>Email</th>
                         <th>Actions</th>
                         </thead>
                         <tbody>
                         <tr ng-repeat="user in users">
-                            <td><a href="{{user.getUrl()}}">{{::user.Name}}</a><span style="margin-left: 5px;" class="label label-as-badge" ng-class="{'label-success': user.Roles === 'Admin', 'label-default': user.Roles === 'Active', 'label-danger':user.Roles === 'Disabled'}">{{::user.Roles}}</span> </td>
+                            <td><a href="{{user.getUrl()}}">{{::user.Name}}</a></td>
+                            <td><span style="margin-left: 5px;" class="label label-as-badge" ng-class="{'label-success': user.Roles === 'Admin', 'label-default': user.Roles === 'Active', 'label-danger':user.Roles === 'Disabled'}">{{::user.Roles}}</span></td>
                             <td>{{user.Email}}</td>
                             <td>
                                 <button title="delete" type="button" class="btn btn-danger btn-sm" ng-click="deleteUser(user)" tooltip="Delete User"><i class="fa fa-times-circle"></i> <span class="hidden-xs">Delete</span></button>

diff --git a/Mundialito/Client/src/Users/UserProfile.html b/Mundialito/Client/src/Users/UserProfile.html
@@ -3,7 +3,7 @@
         <h4>
             <i class="fa fa-user" ng-if="profileUser.ProfilePicture == null"></i><img referrerpolicy="no-referrer"
                 ng-if="profileUser.ProfilePicture != null" src="{{profileUser.ProfilePicture}}" class="img-circle">
-            {{profileUser.Name}} Profile
+            {{profileUser.Name}} <span style="margin-left: 5px;" class="label label-as-badge" ng-class="{'label-success': profileUser.Roles === 'Admin', 'label-default': profileUser.Roles === 'Active', 'label-danger':profileUser.Roles === 'Disabled'}">{{::profileUser.Roles}}</span> 
         </h4>
     </div>
     <div class="col-md-2" ng-if="profileUser.Username !== security.user.Username">

diff --git a/Mundialito/Models/UserModel.cs b/Mundialito/Models/UserModel.cs
@@ -14,6 +14,7 @@ public UserModel(MundialitoUser user)
         Email = user.Email;
         Points = 0;
         ProfilePicture = user.ProfilePicture == null ? "../../../icons/user.webp" :user.ProfilePicture;
+        Roles = user.Role.ToString();
     }
 
     [JsonPropertyName("Id")]
@@ -27,10 +28,7 @@ public UserModel(MundialitoUser user)
 
     [JsonPropertyName("Email")]
     public string Email { get; set; }
-
-    [JsonPropertyName("IsAdmin")]
-    public bool IsAdmin { get; set; }
-
+
     [JsonPropertyName("Username")]
     public string Username { get; set; }
 

diff --git a/Mundialito/wwwroot/App/Users/ManageApp.html b/Mundialito/wwwroot/App/Users/ManageApp.html
@@ -8,12 +8,14 @@
                     <table class="table table-striped">
                         <thead>
                         <th>Name</th>
+                        <th>Role</th>
                         <th>Email</th>
                         <th>Actions</th>
                         </thead>
                         <tbody>
                         <tr ng-repeat="user in users">
-                            <td><a href="{{user.getUrl()}}">{{::user.Name}}</a><span style="margin-left: 5px;" class="label label-as-badge" ng-class="{'label-success': user.Roles === 'Admin', 'label-default': user.Roles === 'Active', 'label-danger':user.Roles === 'Disabled'}">{{::user.Roles}}</span> </td>
+                            <td><a href="{{user.getUrl()}}">{{::user.Name}}</a></td>
+                            <td><span style="margin-left: 5px;" class="label label-as-badge" ng-class="{'label-success': user.Roles === 'Admin', 'label-default': user.Roles === 'Active', 'label-danger':user.Roles === 'Disabled'}">{{::user.Roles}}</span></td>
                             <td>{{user.Email}}</td>
                             <td>
                                 <button title="delete" type="button" class="btn btn-danger btn-sm" ng-click="deleteUser(user)" tooltip="Delete User"><i class="fa fa-times-circle"></i> <span class="hidden-xs">Delete</span></button>

diff --git a/Mundialito/wwwroot/App/Users/UserProfile.html b/Mundialito/wwwroot/App/Users/UserProfile.html
@@ -3,7 +3,7 @@
         <h4>
             <i class="fa fa-user" ng-if="profileUser.ProfilePicture == null"></i><img referrerpolicy="no-referrer"
                 ng-if="profileUser.ProfilePicture != null" src="{{profileUser.ProfilePicture}}" class="img-circle">
-            {{profileUser.Name}} Profile
+            {{profileUser.Name}} Profile<span style="margin-left: 5px;" class="label label-as-badge" ng-class="{'label-success': profileUser.Roles === 'Admin', 'label-default': profileUser.Roles === 'Active', 'label-danger':profileUser.Roles === 'Disabled'}">{{::profileUser.Roles}}</span> 
         </h4>
     </div>
     <div class="col-md-2" ng-if="profileUser.Username !== security.user.Username">