Skip to content

Commit

Permalink
v3.25.0 (#208)
Browse files Browse the repository at this point in the history
* Make auto logout the default if not overridden by helm.

* Hide rerank if user doesn't have permission.

* Various bug fixes for competitive

* Make game center -> tickets show total ticket count

* Roll back default favicon changes. Refine info bubble styling.

* Bug fixes to challenge deploy status in practice

* Support ticket toasts now link to the ticket.

* Ticket activity sortable

* Resolves #540 and some other cleanup

* Fix duplicate login bugs, various testing bugs

* Misc formatting and cleanup

* Misc formatting and hide new feedback template picker

* Select first unfinished challenge section in practice mode
  • Loading branch information
sei-bstein authored Dec 2, 2024
1 parent ffb7241 commit e700334
Show file tree
Hide file tree
Showing 91 changed files with 726 additions and 884 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

8 changes: 3 additions & 5 deletions projects/gameboard-ui/src/app/admin/admin.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ import { GameMapEditorComponent } from './components/game-map-editor/game-map-ed
import { GameYamlImportModalComponent } from './components/game-yaml-import-modal/game-yaml-import-modal.component';
import { ManageManualChallengeBonusesModalComponent } from './components/manage-manual-challenge-bonuses-modal/manage-manual-challenge-bonuses-modal.component';
import { ManageManualChallengeBonusesComponent } from './components/manage-manual-challenge-bonuses/manage-manual-challenge-bonuses.component';
import { PlayerSessionComponent } from './admin-player-session/admin-player-session.component';
import { SiteOverviewStatsComponent } from './components/site-overview-stats/site-overview-stats.component';
import { SupportSettingsComponent } from './components/support-settings/support-settings.component';
import { TeamAdminContextMenuComponent } from './components/team-admin-context-menu/team-admin-context-menu.component';
import { TeamCenterComponent } from './components/team-center/team-center.component';
import { TeamListCardComponent } from './components/team-list-card/team-list-card.component';
import { DashboardComponent } from './dashboard/dashboard.component';
Expand Down Expand Up @@ -90,6 +88,7 @@ import { SpinnerComponent } from '@/standalone/core/components/spinner/spinner.c
import { ToSupportCodePipe } from '@/standalone/core/pipes/to-support-code.pipe';
import { IfHasPermissionDirective } from '@/standalone/directives/if-has-permission.directive';
import { FeedbackTemplatePickerComponent } from "../feedback/components/feedback-template-picker/feedback-template-picker.component";
import { UserPickerComponent } from '@/standalone/users/user-picker/user-picker.component';

@NgModule({
declarations: [
Expand Down Expand Up @@ -127,7 +126,6 @@ import { FeedbackTemplatePickerComponent } from "../feedback/components/feedback
GameBonusesConfigComponent,
ParticipationReportComponent,
PlayerNamesComponent,
PlayerSessionComponent,
PlayerSponsorReportComponent,
PracticeComponent,
PracticeSettingsComponent,
Expand All @@ -136,7 +134,6 @@ import { FeedbackTemplatePickerComponent } from "../feedback/components/feedback
SponsorBrowserComponent,
SupportAutoTagAdminComponent,
SupportReportLegacyComponent,
TeamAdminContextMenuComponent,
TeamObserverComponent,
UserApiKeysComponent,
UserRegistrarComponent,
Expand Down Expand Up @@ -230,7 +227,8 @@ import { FeedbackTemplatePickerComponent } from "../feedback/components/feedback
SafeUrlPipe,
SpinnerComponent,
ToSupportCodePipe,
FeedbackTemplatePickerComponent
FeedbackTemplatePickerComponent,
UserPickerComponent,
]
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export class AdminEnrollTeamModalComponent implements OnInit {
protected searchTerm = "";
protected selectedUsers: ApiUser[] = [];
protected typeaheadSearch$ = new Observable((observer: Observer<string | undefined>) => observer.next(this.searchTerm)).pipe(
filter(s => s?.length >= 3),
filter(s => s?.length >= 2),
switchMap(search => this.userService.list({
eligibleForGameId: this.game!.id,
excludeIds: [...this.selectedUsers.map(u => u.id)],
Expand Down Expand Up @@ -68,7 +68,7 @@ export class AdminEnrollTeamModalComponent implements OnInit {

try {
const userIds = this.selectedUsers.map(u => u.id);
const result = await firstValueFrom(this.teamService.adminEnroll({ userIds, gameId: this.game.id }));
const result = await this.teamService.adminEnroll({ userIds, gameId: this.game.id });

if (this.onConfirm)
await this.onConfirm(result);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ <h5 class="modal-title">{{ modalTitle }}</h5>

<alert type="warning" *ngIf="extensionInMinutes < 0">
If you use a negative value for the extension length, you'll <em>decrease</em> the amount of time
available to the {{ game?.isTeamGame ? "teams" : "players" }} shown here. Ensure the session times below
are what you expect.
available to the {{ (game?.maxTeamSize || 1) > 1 ? "teams" : "players" }} shown here. Ensure the session
times below are what you expect.
</alert>

<ng-container *ngIf="extensionInMinutes">
Expand Down Expand Up @@ -54,7 +54,7 @@ <h5 class="modal-title">{{ modalTitle }}</h5>
<ng-container
*ngIf="sessionEndDateTime | addDuration: { minutes: extensionInMinutes } as newSessionEnd">
<strong class="fw-bold" [class.text-danger]="newSessionEnd | dateTimeIsPast"
[class.text-info]="!(newSessionEnd | dateTimeIsPast)">
[class.text-success]="!(newSessionEnd | dateTimeIsPast)">
{{ newSessionEnd | datetimeToDate | friendlyDateAndTime }}
</strong>)
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import { Team } from '@/api/player-models';
export class ExtendTeamsModalComponent implements OnInit {
game?: {
id: string;
maxTeamSize: number;
name: string;
isTeamGame: boolean;
};
extensionInMinutes = 30;
onExtend?: () => Promise<void> | Observable<void>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
</ng-container>
</ng-container>
</div>
<div class="text-info cursor-pointer mr-2 text-right flex-grow-1" (click)="handleAboutFeedbackClick()">
<div class="btn-link mr-2 text-right flex-grow-1" (click)="handleAboutFeedbackClick()">
About feedback templates
</div>
<button type="button" class="btn btn-info ml-2 flex-basis-50" [disabled]="!sampleConfig"
<button type="button" class="btn btn-success ml-2 flex-basis-50" [disabled]="!sampleConfig"
(click)="handlePasteSample()">
Paste Example Configuration
</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</label>
<label>Featured</label>
</div>
<small>Featured games always show at the top of the homepage</small>
<small class="text-muted">Featured games always show at the top of the homepage</small>
</div>

<div class="form-group pb-0 pt-1">
Expand Down Expand Up @@ -148,6 +148,7 @@
</div>

<div class="col-12 mt-5">
<!-- <app-feedback-template-picker></app-feedback-template-picker> -->
<app-feedback-editor [feedbackTemplate]="game.feedbackTemplate"
(templateChange)="handleFeedbackTemplateChange($event || undefined)"></app-feedback-editor>
</div>
Expand Down Expand Up @@ -395,9 +396,9 @@ <h4>Registration</h4>
<label for="registrationType-input">Access</label><br />
<div id="registrationType-input" class="btn-group" btnRadioGroup name="registrationType"
tabindex="0" [(ngModel)]="game.registrationType" [ngModelOptions]="{updateOn: 'change'}">
<label class="btn btn-outline-info btn-sm" btnRadio="none">None</label>
<label class="btn btn-outline-info btn-sm" btnRadio="open">Open</label>
<label class="btn btn-outline-info btn-sm" btnRadio="domain">Domain</label>
<label class="btn btn-outline-success btn-sm" btnRadio="none">None</label>
<label class="btn btn-outline-success btn-sm" btnRadio="open">Open</label>
<label class="btn btn-outline-success btn-sm" btnRadio="domain">Domain</label>
</div>
<small></small>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ label {
font-size: 87.5%;
}

.form-group small {
color: $muted;
}

.help-text {
font-style: italic;
font-size: 0.8em;
Expand Down
Loading

0 comments on commit e700334

Please sign in to comment.