-
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.
* Add external game host 'extend' endpoint * Change default cancel button color on the default confirm dialog * Incorporate advanced score into scoreboard. Fix bugs with manual bonuses and scoreboard. * Start on #392. * Finish. Resolves #392. * Add date filters to challenges report (just filters stat data, not records). * Try to have external game page scroll to bottom on iframe load. * flex wrap on team active challenges * Style scoreboard * Refine ready player/session start in player admin. * Style scoreboard * Remove unused models and properties. Pull logging * Allow games with end dates in the future as advance targets. * Start admin enroll team * Better hints for admin overview clicks * Minor styling * Fix a bug that prevented the 'start session' option from appearing in Game - > players
- Loading branch information
1 parent
c338d4e
commit 8c48cf7
Showing
46 changed files
with
419 additions
and
134 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
14 changes: 11 additions & 3 deletions
14
projects/gameboard-ui/src/app/admin/admin-player-session/admin-player-session.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,4 +1,12 @@ | ||
| .yaml-container { | ||
| margin: 1.5rem 0 0 1.5rem; | ||
| padding-bottom: 1.5rem; | ||
| } | ||
| margin: 1.5rem 0 0 1.5rem; | ||
| padding-bottom: 1.5rem; | ||
| } | ||
|
|
||
| .advancement-container { | ||
| h6 { | ||
| font-size: 0.9rem; | ||
| font-weight: bold; | ||
| text-transform: uppercase; | ||
| } | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ h5 { | |
| } | ||
|
|
||
| li { | ||
| flex-basis: 32%; | ||
| flex-basis: 30%; | ||
| min-width: 250px; | ||
| } | ||
|
|
||
|
|
||
25 changes: 25 additions & 0 deletions
25
...i/src/app/admin/components/admin-enroll-team-modal/admin-enroll-team-modal.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,25 @@ | ||
| <div class="modal-content" *ngIf="game"> | ||
| <div class="modal-header"> | ||
| <h2 class="modal-title">Add {{game.isTeamGame ? "Team" : "Player"}}</h2> | ||
| <button type="button" class="close" data-dismiss="modal" aria-label="Close" (click)="close()"> | ||
| <span aria-hidden="true">×</span> | ||
| </button> | ||
| </div> | ||
|
|
||
| <div class="modal-body" *ngIf="!isWorking; else loading"> | ||
| <app-error-div [errors]="errors"></app-error-div> | ||
| <div class="form-group"> | ||
| <input type="text" class="form-control" [(ngModel)]="addUserId" | ||
| placeholder="This is totally the final interface, just so you know."> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="modal-footer"> | ||
| <button type="button" class="btn link-button" (click)="close()">Cancel</button> | ||
| <button type="button" class="btn btn-success" (click)="handleAddClick(addUserId)">Add this player</button> | ||
| </div> | ||
| </div> | ||
|
|
||
| <ng-template #loading> | ||
| <app-spinner></app-spinner> | ||
| </ng-template> |
Empty file.
48 changes: 48 additions & 0 deletions
48
...-ui/src/app/admin/components/admin-enroll-team-modal/admin-enroll-team-modal.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,48 @@ | ||
| import { TeamService } from '@/api/team.service'; | ||
| import { ModalConfirmService } from '@/services/modal-confirm.service'; | ||
| import { Component, OnInit } from '@angular/core'; | ||
| import { firstValueFrom } from 'rxjs'; | ||
|
|
||
| @Component({ | ||
| selector: 'app-admin-enroll-team-modal', | ||
| templateUrl: './admin-enroll-team-modal.component.html', | ||
| styleUrls: ['./admin-enroll-team-modal.component.scss'] | ||
| }) | ||
| export class AdminEnrollTeamModalComponent implements OnInit { | ||
| game?: { | ||
| id: string; | ||
| name: string; | ||
| isTeamGame: boolean; | ||
| }; | ||
|
|
||
| protected addUserId = ""; | ||
| protected errors: any[] = []; | ||
| protected isWorking = false; | ||
|
|
||
| constructor( | ||
| private modalConfirmService: ModalConfirmService, | ||
| private teamService: TeamService) { } | ||
|
|
||
| ngOnInit(): void { | ||
| if (!this.game) | ||
| throw new Error("Can't resolve the game."); | ||
| } | ||
|
|
||
| protected close() { | ||
| this.modalConfirmService.hide(); | ||
| } | ||
|
|
||
| protected async handleAddClick(userId: string) { | ||
| this.errors = []; | ||
| if (!this.game?.id) | ||
| return; | ||
|
|
||
| try { | ||
| await firstValueFrom(this.teamService.adminEnroll({ userIds: [this.addUserId], gameId: this.game.id })); | ||
| this.modalConfirmService.hide(); | ||
| } | ||
| catch (err: any) { | ||
| this.errors.push(err); | ||
| } | ||
| } | ||
| } |
2 changes: 1 addition & 1 deletion
2
...ents/deployment-admin-team-context-menu/deployment-admin-team-context-menu.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
1 change: 0 additions & 1 deletion
1
...ernal-game-admin-player-context-menu/external-game-admin-player-context-menu.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
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
12 changes: 9 additions & 3 deletions
12
...i/src/app/admin/components/team-admin-context-menu/team-admin-context-menu.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,8 +1,14 @@ | ||
| @import "../../../../scss/variables"; | ||
|
|
||
| .ctx-menu-button { | ||
| aspect-ratio: 1 / 1; | ||
| aspect-ratio: 1 / 1; | ||
| } | ||
|
|
||
| .btn-danger { | ||
| font-weight: bold; | ||
| color: red; | ||
| color: red; | ||
| font-weight: bold; | ||
| } | ||
|
|
||
| .btn-warning { | ||
| color: $warning; | ||
| } |
Oops, something went wrong.