-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Fix tracking of active prac challenge * Minor cleanup and improved console logging * Bug fixes and challenge report tags filter. * Fix event horizon, game center teams, enrollment report stat summary, progress widget * Fix issue with past games not showing ongoing ones * WIP question sets * More question set stuff * Improvements to OIDC experience and support for auto log in/out. * merge from next * Add favicon defaults. Update theme * Fix settings link bug, more thing * Theme stuff * Add settings link to user menu * Theme stuff * Revert "Theme stuff" This reverts commit a26c715. * Revert "Add settings link to user menu" This reverts commit d640ee8. * Revert "Theme stuff" This reverts commit c3e3b69. * Revert "Fix settings link bug, more thing" This reverts commit f96dc59. * Revert "Add favicon defaults. Update theme" This reverts commit 1b2e5a7. * Rollback and reimplement oauth changes * Update oidc settings to match topo * Cleanup * Update dev env settings * Improvements to OIDC experience and support for auto log in/out. * Restore ux improvements * More retheme * Retheming and initial work on name improvements. * Update gh action versions * Retheming and name mgmt * Styling stuff * Styling stuff * Move challenge markdown * Un 'fix' start practice button * minor name fixes * Name cleanup * Finish merge from main * More theming and fix to GBAPI#502 * More theming and markdown fix * More style fixes * Partially address GBAPI#254 * Return question example answers * Auto-select first available uncompleted tab * Standard challenge panel sticky enhancements * Styling * Roll back login experience changes * Settings bug fix and hide rename cert * Minor theme stuff * Theming * Add additional sticky panel toggle button
- Loading branch information
1 parent
3054a32
commit bd3321c
Showing
27 changed files
with
166 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 6 additions & 1 deletion
7
...mponents/practice-challenge-state-summary/practice-challenge-state-summary.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,8 @@ | ||
| a:hover { | ||
| text-decoration: none; | ||
| text-decoration: none; | ||
| } | ||
|
|
||
| table, | ||
| thead { | ||
| border-top-width: 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
...gameboard-ui/src/app/scoreboard/components/scoreboard-page/scoreboard-page.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <div class="container"> | ||
| <ng-container *ngIf="game"> | ||
| <h1 class="mt-4">Scoreboard</h1> | ||
| <h2 class="text-success fw-bold text-upper fs-12"> | ||
| <a [routerLink]="['/game', game.id]">{{ game.name }}</a> | ||
| </h2> | ||
|
|
||
| <app-scoreboard class="d-block mt-5" [gameId]="game.id"></app-scoreboard> | ||
| </ng-container> | ||
|
|
||
| </div> | ||
|
|
||
| <ng-template #loading> | ||
| <app-spinner>Loading the score...</app-spinner> | ||
| </ng-template> |
Empty file.
35 changes: 35 additions & 0 deletions
35
...s/gameboard-ui/src/app/scoreboard/components/scoreboard-page/scoreboard-page.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { ActivatedRoute } from '@angular/router'; | ||
| import { firstValueFrom } from 'rxjs'; | ||
| import { GameService } from '@/api/game.service'; | ||
| import { SimpleEntity } from '@/api/models'; | ||
| import { AppTitleService } from '@/services/app-title.service'; | ||
| import { UnsubscriberService } from '@/services/unsubscriber.service'; | ||
| import { Component } from '@angular/core'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-scoreboard-page', | ||
| providers: [UnsubscriberService], | ||
| templateUrl: './scoreboard-page.component.html', | ||
| styleUrls: ['./scoreboard-page.component.scss'] | ||
| }) | ||
| export class ScoreboardPageComponent { | ||
| protected game?: SimpleEntity; | ||
|
|
||
| constructor( | ||
| private appTitle: AppTitleService, | ||
| private gameService: GameService, | ||
| private route: ActivatedRoute, | ||
| private unsub: UnsubscriberService) { | ||
| this.unsub.add(this.route.params.subscribe(async params => this.loadGame(params.gameId))); | ||
| } | ||
|
|
||
| private async loadGame(gameId: string) { | ||
| if (!gameId) { | ||
| this.game = undefined; | ||
| return; | ||
| } | ||
|
|
||
| this.game = await firstValueFrom(this.gameService.retrieve(gameId)); | ||
| this.appTitle.set(`Scoreboard | ${this.game.name}`); | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
projects/gameboard-ui/src/app/scoreboard/components/scoreboard/scoreboard.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
projects/gameboard-ui/src/app/services/user-settings.service.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| import { UserAppSettings } from "@/users/users.models"; | ||
| import { Injectable } from "@angular/core"; | ||
| import { BehaviorSubject } from "rxjs"; | ||
|
|
||
| @Injectable({ providedIn: 'root' }) | ||
| export class UserSettingsService { | ||
| public updated$ = new BehaviorSubject<UserAppSettings>({ useStickyChallengePanel: false }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.