Fix settings link bug, more thing

cmu-sei · Oct 31, 2024 · f96dc59 · f96dc59
1 parent 1b2e5a7
commit f96dc59
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.html b/projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.component.html
@@ -42,7 +42,7 @@ <h4 class="mt-4 px-3">Session Extension</h4>
         <input id="duration-input" class="form-control" type="number" placeholder="Extension length (in minutes)"
           [(ngModel)]="durationExtensionInMinutes">
         <div class="input-group-append">
-          <button class="btn" [class.btn-info]="(durationExtensionInMinutes || 0) >= 0"
+          <button class="btn" [class.btn-success]="(durationExtensionInMinutes || 0) >= 0"
             [class.btn-warning]="(durationExtensionInMinutes || 0) < 0" [disabled]="!durationExtensionInMinutes"
             [ariaDisabled]="!durationExtensionInMinutes" (click)="extendByDuration(team, durationExtensionInMinutes)">
             <span>{{ durationExtensionInMinutes && durationExtensionInMinutes < 0 ? "Shorten" : "Extend" }}</span>

diff --git a/projects/gameboard-ui/src/app/api/user-role-permissions.service.ts b/projects/gameboard-ui/src/app/api/user-role-permissions.service.ts
@@ -11,7 +11,7 @@ export class UserRolePermissionsService {
     private apiUrl: ApiUrlService,
     private http: HttpClient) { }
 
-  public can(user: { rolePermissions: UserRolePermissionKey[] } | null, key: UserRolePermissionKey) {
+  public can(user: { rolePermissions: UserRolePermissionKey[] } | null, key: UserRolePermissionKey): boolean {
     if (!user?.rolePermissions?.length)
       return false;
 

diff --git a/...cts/gameboard-ui/src/app/prac/components/practice-session/practice-session.component.html b/...cts/gameboard-ui/src/app/prac/components/practice-session/practice-session.component.html
@@ -18,7 +18,7 @@
 
       <div *ngIf="!isStartingSession" class="challenge-management-buttons d-flex justify-content-center">
         <app-confirm-button *ngIf="!isDeploying && !(activePracticeChallenge$ | async)"
-          btnClass="btn btn-lg btn-info px-4 mb-4" (confirm)="play(spec.gameId)" class="d-block">
+          btnClass="btn btn-lg btn-success px-4 mb-4" (confirm)="play(spec.gameId)" class="d-block">
           <span>Start Practice Session</span>
         </app-confirm-button>
 

diff --git a/...eboard-ui/src/app/users/components/certificate-printer/certificate-printer.component.html b/...eboard-ui/src/app/users/components/certificate-printer/certificate-printer.component.html
@@ -2,7 +2,7 @@
     <app-spinner *ngIf="isDownloading">Loading your certificate...</app-spinner>
 
     <div class="print-button-container" *ngIf="!isDownloading && isPublished">
-        <button type="button" class="btn btn-info print-button" (click)="handlePrintClick()">
+        <button type="button" class="btn btn-success print-button" (click)="handlePrintClick()">
             Print This Certificate
         </button>
     </div>

diff --git a/projects/gameboard-ui/src/app/users/components/settings/settings.component.html b/projects/gameboard-ui/src/app/users/components/settings/settings.component.html
@@ -44,7 +44,7 @@ <h3>Browser Notifications</h3>
             your browser.
         </div>
 
-        <button class="btn btn-lg btn-info my-4" (click)="requestNotificationPermission()">
+        <button class="btn btn-lg btn-success my-4" (click)="requestNotificationPermission()">
             Enable browser notifications
         </button>
     </ng-container>

diff --git a/projects/gameboard-ui/src/app/users/components/user-page/user-page.component.html b/projects/gameboard-ui/src/app/users/components/user-page/user-page.component.html
@@ -8,7 +8,7 @@
     <a class="btn btn-link" [routerLink]="['/', 'user', 'certificates']" routerLinkActive="active">Certificates</a>
     <a class="btn btn-link" [routerLink]="['/', 'user', 'profile', 'history']" routerLinkActive="active">History</a>
     <a class="btn btn-link" [routerLink]="['/', 'user', 'settings']" routerLinkActive="active"
-        *ngIf="localUser$ | async | can:'Admin_View'">Settings</a>
+        *appIfHasPermission="'Admin_View'">Settings</a>
 </div>
 
 <main class="container">

diff --git a/projects/gameboard-ui/src/app/utility/components/login/login.component.html b/projects/gameboard-ui/src/app/utility/components/login/login.component.html
@@ -3,7 +3,7 @@
 
 <div class="text-center">
   <p><ng-content></ng-content></p>
-  <button [hidden]="working" class="btn btn-lg btn-info" (click)="login()" aria-label="identity provider">
+  <button [hidden]="working" class="btn btn-lg btn-success" (click)="login()" aria-label="identity provider">
     <fa-icon [icon]="fa.openId"></fa-icon>
     <span>Login </span>
     <span>&mdash; {{authority}}</span>

diff --git a/projects/gameboard-ui/src/environments/environment.ts b/projects/gameboard-ui/src/environments/environment.ts
@@ -16,7 +16,7 @@ export const environment: Environment = {
     isProduction: false,
     oidc: {
       authority: 'http://localhost:8080/realms/foundry',
-      autoLogin: true,
+      autoLogin: false,
       client_id: 'dev.gameboard.web',
       logoutOnAppLogout: true,
       redirect_uri: 'http://localhost:4202/oidc',