Make Em The Same

Author: RyCarpenter

web-app/admin/src/app/admin/admin-event/dashboard/event-dashboard.component.html

@@ -6,7 +6,6 @@ <h2 class="page-title">Events</h2>
   </div>
 
   <div class="table-wrapper mat-elevation-z2">
-    <!-- Top Bar -->
     <div
       class="integrated-navbar d-flex align-items-center justify-content-between"
     >
@@ -31,17 +30,18 @@ <h2 class="page-title">Events</h2>
         </mat-form-field>
       </div>
 
-      <button
-        *ngIf="hasEventCreatePermission"
-        mat-flat-button
-        color="primary"
-        (click)="createEvent()"
-      >
-        New Event
-      </button>
+      <div class="button-group">
+        <button
+          *ngIf="hasEventCreatePermission"
+          mat-flat-button
+          color="primary"
+          (click)="createEvent()"
+        >
+          New Event
+        </button>
+      </div>
     </div>
 
-    <!-- Event Table -->
     <div class="table-scroll" *ngIf="filteredEvents?.length; else noEvents">
       <table
         mat-table
@@ -80,12 +80,10 @@ <h2 class="page-title">Events</h2>
       </table>
     </div>
 
-    <!-- Empty State -->
     <ng-template #noEvents>
       <div class="text-center p-4 muted">No events found.</div>
     </ng-template>
 
-    <!-- Pagination -->
     <div class="pagination">
       <mat-paginator
         [length]="totalEvents"

web-app/admin/src/app/admin/admin-teams/dashboard/team-dashboard.component.html

@@ -6,52 +6,70 @@ <h2 class="page-title">Teams</h2>
   </div>
 
   <div class="table-wrapper mat-elevation-z2">
-    <div class="integrated-navbar">
-      <mage-card-navbar
-        [isSearchable]="true"
-        [searchPlaceholder]="'Search teams...'"
-        [actionButtons]="actionButtons"
-        (searchTermChanged)="onSearchTermChanged($event)"
-        (searchCleared)="onSearchCleared()"
-      ></mage-card-navbar>
+    <div
+      class="integrated-navbar d-flex align-items-center justify-content-between"
+    >
+      <div class="filters d-flex align-items-center">
+        <mage-card-navbar
+          [isSearchable]="true"
+          [searchPlaceholder]="'Search teams...'"
+          (searchTermChanged)="onSearchTermChanged($event)"
+          (searchCleared)="onSearchCleared()"
+        ></mage-card-navbar>
+      </div>
+
+      <div class="button-group">
+        <button mat-flat-button class="btn-primary" (click)="createTeam()">
+          New Team
+        </button>
+      </div>
     </div>
 
-    <table
-      mat-table
-      [class.mat-table]="true"
-      [dataSource]="dataSource"
-      class="mat-table-even-columns"
-    >
-      <ng-container matColumnDef="name">
-        <th mat-header-cell *matHeaderCellDef>Name</th>
-        <td mat-cell *matCellDef="let team">
-          <div class="strong">{{ team.name }}</div>
-        </td>
-      </ng-container>
-
-      <ng-container matColumnDef="description">
-        <th mat-header-cell *matHeaderCellDef>Description</th>
-        <td mat-cell *matCellDef="let team">
-          <div class="muted description-cell" [title]="team.description">
-            {{ team.description }}
-          </div>
-        </td>
-      </ng-container>
-
-      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-      <tr
-        mat-row
-        *matRowDef="let row; columns: displayedColumns"
-        (click)="gotoTeam(row)"
-        class="pointer"
-      ></tr>
-    </table>
-    <mat-paginator
-      [length]="totalTeams"
-      [pageSize]="pageSize"
-      [pageSizeOptions]="pageSizeOptions"
-      (page)="onPageChange($event)"
-    >
-    </mat-paginator>
+    <div class="table-scroll" *ngIf="teams.length; else noTeams">
+      <table
+        mat-table
+        [class.mat-table]="true"
+        [dataSource]="dataSource"
+        class="mat-table-even-columns"
+      >
+        <ng-container matColumnDef="name">
+          <th mat-header-cell *matHeaderCellDef>Name</th>
+          <td mat-cell *matCellDef="let team">
+            <div class="strong">{{ team.name }}</div>
+          </td>
+        </ng-container>
+
+        <ng-container matColumnDef="description">
+          <th mat-header-cell *matHeaderCellDef>Description</th>
+          <td mat-cell *matCellDef="let team">
+            <div class="muted description-cell" [title]="team.description">
+              {{ team.description }}
+            </div>
+          </td>
+        </ng-container>
+
+        <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+        <tr
+          mat-row
+          *matRowDef="let row; columns: displayedColumns"
+          (click)="gotoTeam(row)"
+          class="pointer"
+        ></tr>
+      </table>
+    </div>
+
+    <ng-template #noTeams>
+      <div class="text-center p-4 muted">No teams found.</div>
+    </ng-template>
+
+    <div class="pagination">
+      <mat-paginator
+        [length]="totalTeams"
+        [pageSize]="pageSize"
+        [pageSizeOptions]="pageSizeOptions"
+        (page)="onPageChange($event)"
+      >
+      </mat-paginator>
+    </div>
   </div>
 </div>