From c6de2b6b0aea5c2b32b6a06fe1ae415a241f5cf4 Mon Sep 17 00:00:00 2001
From: Ben Stein <115497763+sei-bstein@users.noreply.github.com>
Date: Thu, 14 Nov 2024 10:02:17 -0500
Subject: [PATCH] v3.24.2 (#205)

* 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 a26c715cc3d8189bddcee6dadfa021eec98ab708.

* Revert "Add settings link to user menu"

This reverts commit d640ee80025f01185bee6c3a5918ebf8aba3b3af.

* Revert "Theme stuff"

This reverts commit c3e3b69b652224cac176dedebc0c66b8899cf490.

* Revert "Fix settings link bug, more thing"

This reverts commit f96dc596b83743e501fdf1c6b3a603fcda5e7ba3.

* Revert "Add favicon defaults. Update theme"

This reverts commit 1b2e5a7bfe8df33772e12c017d4d592b363ec6c8.

* 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

* Theming and console stuff

* Fix deploy UI issue

* WIP

* Fixed a bug that hid the 'settings' menu in user profile

* Fix create users sponsor bug and improve onclick directive

* WIP feedback templates

* Hide new feedback system for now.

* Enable certificate rename for practice.
---
 .../src/app/admin/admin.module.ts             |   3 +-
 .../create-users-modal.component.html         |   2 +-
 .../create-users-modal.component.ts           |   2 +-
 .../feedback-editor.component.ts              |   1 -
 .../game-center-settings.component.html       |  24 +--
 .../user-registrar.component.html             |  10 +-
 .../user-registrar.component.ts               |   7 +-
 .../src/app/api/feedback-models.ts            |   9 +
 .../src/app/api/feedback.service.ts           | 187 +++++++++++++++++-
 .../status-light/status-light.component.scss  |  72 +++----
 .../directives/copy-on-click.directive.ts     |  12 +-
 .../feedback-template-picker.component.html   | 173 ++++++++++++++++
 .../feedback-template-picker.component.scss   |   4 +
 .../feedback-template-picker.component.ts     | 113 +++++++++++
 .../src/app/feedback/feedback.models.ts       |  27 +++
 .../src/app/services/modal-confirm.service.ts |   2 +-
 .../challenge-questions.component.ts          |   1 -
 .../certificate-printer.component.html        |   4 +-
 .../user-page/user-page.component.ts          |   3 +-
 .../feedback-template-content.sample.yaml     |  21 ++
 projects/gameboard-ui/src/styles.scss         |   7 +-
 projects/gameboard-ui/src/tools/functions.ts  |   2 +
 22 files changed, 612 insertions(+), 74 deletions(-)
 create mode 100644 projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.html
 create mode 100644 projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.scss
 create mode 100644 projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.ts
 create mode 100644 projects/gameboard-ui/src/app/feedback/feedback.models.ts
 create mode 100644 projects/gameboard-ui/src/assets/yaml/feedback-template-content.sample.yaml

diff --git a/projects/gameboard-ui/src/app/admin/admin.module.ts b/projects/gameboard-ui/src/app/admin/admin.module.ts
index f1f962748..83b83f3d2 100644
--- a/projects/gameboard-ui/src/app/admin/admin.module.ts
+++ b/projects/gameboard-ui/src/app/admin/admin.module.ts
@@ -89,6 +89,7 @@ import { ErrorDivComponent } from '@/standalone/core/components/error-div/error-
 import { SpinnerComponent } from '@/standalone/core/components/spinner/spinner.component';
 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";
 
 @NgModule({
   declarations: [
@@ -222,7 +223,6 @@ import { IfHasPermissionDirective } from '@/standalone/directives/if-has-permiss
     ScoreboardModule,
     SponsorsModule,
     SystemNotificationsModule,
-
     // standalones
     ErrorDivComponent,
     GameInfoBubblesComponent,
@@ -230,6 +230,7 @@ import { IfHasPermissionDirective } from '@/standalone/directives/if-has-permiss
     SafeUrlPipe,
     SpinnerComponent,
     ToSupportCodePipe,
+    FeedbackTemplatePickerComponent
   ]
 })
 
diff --git a/projects/gameboard-ui/src/app/admin/components/create-users-modal/create-users-modal.component.html b/projects/gameboard-ui/src/app/admin/components/create-users-modal/create-users-modal.component.html
index 247172880..f0358b27e 100644
--- a/projects/gameboard-ui/src/app/admin/components/create-users-modal/create-users-modal.component.html
+++ b/projects/gameboard-ui/src/app/admin/components/create-users-modal/create-users-modal.component.html
@@ -66,7 +66,7 @@ <h2 class=fs-12>Settings</h2>
 
     <div footer>
         <div *ngIf="(userIds.length - invalidIds.length) > 0">
-            <strong class="text-info">{{userIds.length}}</strong>
+            <strong class="text-success">{{userIds.length}}</strong>
             {{ "user" | pluralizer:userIds.length - invalidIds.length }} will be created.
         </div>
     </div>
diff --git a/projects/gameboard-ui/src/app/admin/components/create-users-modal/create-users-modal.component.ts b/projects/gameboard-ui/src/app/admin/components/create-users-modal/create-users-modal.component.ts
index 4af3648a4..c5ee4e95b 100644
--- a/projects/gameboard-ui/src/app/admin/components/create-users-modal/create-users-modal.component.ts
+++ b/projects/gameboard-ui/src/app/admin/components/create-users-modal/create-users-modal.component.ts
@@ -44,7 +44,7 @@ export class CreateUsersModalComponent {
     private usersService: UserService,
     private userRolePermissions: UserRolePermissionsService) {
     this.appName = config.appName;
-    this.placeholder = "// one ID per line, e.g.:\n\n3496da07-d19e-440d-a246-e35f7b7bfcac\n9a53d8cd-ef88-44c0-96b2-fc8766b518dd\n\n//and so on";
+    this.placeholder = "// one ID per line, e.g.:\n\n3496da07-d19e-440d-a246-e35f7b7bfcac\n9a53d8cd-ef88-44c0-96b2-fc8766b518dd\n// and so on";
   }
 
   async ngOnInit() {
diff --git a/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.ts b/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.ts
index e0385610b..8ea31fb13 100644
--- a/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.ts
+++ b/projects/gameboard-ui/src/app/admin/components/feedback-editor/feedback-editor.component.ts
@@ -51,7 +51,6 @@ export class FeedbackEditorComponent implements OnInit {
   }
 
   protected handleAboutFeedbackClick() {
-
     this.modalService.openConfirm({
       bodyContent: `You can use this box to configure questions that will automatically be presented to players upon conclusion of a challenge or game. Enter valid YAML to set these up.
 
diff --git a/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.html b/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.html
index ca8456ffc..053605553 100644
--- a/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.html
+++ b/projects/gameboard-ui/src/app/admin/components/game-center/game-center-settings/game-center-settings.component.html
@@ -22,7 +22,7 @@
                     <label class="mb-0" for="hidden-toggle">Publish</label>
                     <div class="form-control h-auto d-flex align-items-center">
                         <label>Hidden</label>
-                        <label class="btn text-info" btnCheckbox [ngModelOptions]="{updateOn: 'change'}"
+                        <label class="btn text-success" btnCheckbox [ngModelOptions]="{updateOn: 'change'}"
                             id="isPublished-input" name="isPublished" [(ngModel)]="game.isPublished">
                             <fa-icon *ngIf="!game.isPublished" [icon]="fa.toggleOff" size="lg"></fa-icon>
                             <fa-icon *ngIf="game.isPublished" [icon]="fa.toggleOn" size="lg"></fa-icon>
@@ -36,7 +36,7 @@
                     <label class="mb-0" for="feature-toggle">Feature</label>
                     <div class="form-control h-auto d-flex align-items-center">
                         <label>Normal</label>
-                        <label class="btn text-info" btnCheckbox [ngModelOptions]="{updateOn: 'change'}"
+                        <label class="btn text-success" btnCheckbox [ngModelOptions]="{updateOn: 'change'}"
                             id="is-featured-input" name="is-featured" [(ngModel)]="game.isFeatured">
                             <fa-icon *ngIf="!game.isFeatured" [icon]="fa.toggleOff" size="lg"></fa-icon>
                             <fa-icon *ngIf="game.isFeatured" [icon]="fa.toggleOn" size="lg"></fa-icon>
@@ -207,9 +207,9 @@
                 <label class="mb-0" for="reset-toggle">Player Mode</label>
                 <div class="form-control h-auto d-flex align-items-center">
                     <label>Competition</label>
-                    <label class="btn text-info" btnCheckbox btnCheckboxTrue="practice" btnCheckboxFalse="competition"
-                        tabindex="0" [ngModelOptions]="{updateOn: 'change'}" id="reset-toggle" name="playerMode"
-                        [(ngModel)]="game.playerMode">
+                    <label class="btn text-success" btnCheckbox btnCheckboxTrue="practice"
+                        btnCheckboxFalse="competition" tabindex="0" [ngModelOptions]="{updateOn: 'change'}"
+                        id="reset-toggle" name="playerMode" [(ngModel)]="game.playerMode">
                         <fa-icon *ngIf="game.playerMode==='competition'" [icon]="fa.toggleOff" size="lg"></fa-icon>
                         <fa-icon *ngIf="game.playerMode==='practice'" [icon]="fa.toggleOn" size="lg"></fa-icon>
                     </label>
@@ -221,7 +221,7 @@
                 <label class="mb-0" for="sync-start-toggle">Show On Homepage When In Practice Mode</label>
                 <div class="form-control h-auto d-flex align-items-center">
                     <label>No</label>
-                    <label class="btn text-info" btnCheckbox [btnCheckboxTrue]="true" [btnCheckboxFalse]="false"
+                    <label class="btn text-success" btnCheckbox [btnCheckboxTrue]="true" [btnCheckboxFalse]="false"
                         tabindex="0" [ngModelOptions]="{updateOn: 'change'}" id="show-on-homepage-toggle"
                         name="showOnHomePageInPracticeMode" [(ngModel)]="game.showOnHomePageInPracticeMode">
                         <fa-icon *ngIf="!game.showOnHomePageInPracticeMode" [icon]="fa.toggleOff" size="lg"></fa-icon>
@@ -238,7 +238,7 @@
                 <label class="mb-0" for="sync-start-toggle">Require Synchronized Start</label>
                 <div class="form-control h-auto d-flex align-items-center">
                     <label>No</label>
-                    <label class="btn text-info" btnCheckbox [btnCheckboxTrue]="true" [btnCheckboxFalse]="false"
+                    <label class="btn text-success" btnCheckbox [btnCheckboxTrue]="true" [btnCheckboxFalse]="false"
                         tabindex="0" [ngModelOptions]="{updateOn: 'change'}" id="sync-start-toggle"
                         name="syncStartToggle" [(ngModel)]="game.requireSynchronizedStart">
                         <fa-icon *ngIf="!game.requireSynchronizedStart" [icon]="fa.toggleOff" size="lg"></fa-icon>
@@ -334,7 +334,7 @@ <h4>Execution</h4>
                     <label class="mb-0" for="preview-toggle">Allow Preview</label>
                     <div class="form-control h-auto d-flex align-items-center">
                         <label>Hidden</label>
-                        <label class="btn text-info" btnCheckbox tabindex="0" [ngModelOptions]="{updateOn: 'change'}"
+                        <label class="btn text-success" btnCheckbox tabindex="0" [ngModelOptions]="{updateOn: 'change'}"
                             id="preview-toggle" name="allowPreview" [(ngModel)]="game.allowPreview">
                             <fa-icon *ngIf="!game.allowPreview" [icon]="fa.toggleOff" size="lg"></fa-icon>
                             <fa-icon *ngIf="game.allowPreview" [icon]="fa.toggleOn" size="lg"></fa-icon>
@@ -348,7 +348,7 @@ <h4>Execution</h4>
                     <label class="mb-0" for="reset-toggle">Allow Reset</label>
                     <div class="form-control h-auto d-flex align-items-center">
                         <label>Forbidden</label>
-                        <label class="btn text-info" btnCheckbox tabindex="0" [ngModelOptions]="{updateOn: 'change'}"
+                        <label class="btn text-success" btnCheckbox tabindex="0" [ngModelOptions]="{updateOn: 'change'}"
                             id="reset-toggle" name="allowReset" [(ngModel)]="game.allowReset">
                             <fa-icon *ngIf="!game.allowReset" [icon]="fa.toggleOff" size="lg"></fa-icon>
                             <fa-icon *ngIf="game.allowReset" [icon]="fa.toggleOn" size="lg"></fa-icon>
@@ -362,7 +362,7 @@ <h4>Execution</h4>
                     <label class="mb-0" for="late-start-toggle">Allow Late Starts</label>
                     <div class="form-control h-auto d-flex align-items-center">
                         <label>Forbidden</label>
-                        <label class="btn text-info" btnCheckbox tabindex="0" [ngModelOptions]="{updateOn: 'change'}"
+                        <label class="btn text-success" btnCheckbox tabindex="0" [ngModelOptions]="{updateOn: 'change'}"
                             id="late-start-toggle" name="allowLateStart" [(ngModel)]="game.allowLateStart">
                             <fa-icon *ngIf="!game.allowLateStart" [icon]="fa.toggleOff" size="lg"></fa-icon>
                             <fa-icon *ngIf="game.allowLateStart" [icon]="fa.toggleOn" size="lg"></fa-icon>
@@ -376,7 +376,7 @@ <h4>Execution</h4>
                     <label class="mb-0" for="public-scoreboard-toggle">Allow Public Scoreboard Access</label>
                     <div class="form-control h-auto d-flex align-items-center">
                         <label>Forbidden</label>
-                        <label class="btn text-info" btnCheckbox tabindex="0" [ngModelOptions]="{updateOn: 'change'}"
+                        <label class="btn text-success" btnCheckbox tabindex="0" [ngModelOptions]="{updateOn: 'change'}"
                             id="public-scoreboard-toggle" name="allowPublicScoreboardAccess"
                             [(ngModel)]="game.allowPublicScoreboardAccess">
                             <fa-icon *ngIf="!game.allowPublicScoreboardAccess" [icon]="fa.toggleOff"
@@ -471,7 +471,7 @@ <h4>Registration</h4>
                     <label class="mb-0" for="hidden-toggle">Team Sponsorship</label>
                     <div class="form-control h-auto d-flex align-items-center">
                         <label>Open</label>
-                        <label class="btn text-info" btnCheckbox [ngModelOptions]="{updateOn: 'change'}" tabindex="0"
+                        <label class="btn text-success" btnCheckbox [ngModelOptions]="{updateOn: 'change'}" tabindex="0"
                             id="requireSponsoredTeam-input" name="requireSponsoredTeam"
                             [(ngModel)]="game.requireSponsoredTeam">
                             <fa-icon *ngIf="!game.requireSponsoredTeam" [icon]="fa.toggleOff" size="lg"></fa-icon>
diff --git a/projects/gameboard-ui/src/app/admin/user-registrar/user-registrar.component.html b/projects/gameboard-ui/src/app/admin/user-registrar/user-registrar.component.html
index 38f740006..c9a1841ae 100644
--- a/projects/gameboard-ui/src/app/admin/user-registrar/user-registrar.component.html
+++ b/projects/gameboard-ui/src/app/admin/user-registrar/user-registrar.component.html
@@ -16,7 +16,7 @@ <h4>Users</h4>
   </div>
   <div class="filter-and-sort-container mt-3 d-flex align-items-center justify-content-center">
     <div class="btn-group d-block mr-2 button-toggle-group filter" role="group" aria-label="Filter group">
-      <button type="button" class="btn btn-dark button-group-label text-upper fw-bold" disabled>Filter:</button>
+      <button type="button" class="btn btn-dark button-group-label text-upper fw-bold" disabled>Filter</button>
       <button type="button"
         [class]="filter ==='elevated-role' | toggleClass: 'btn-success' : 'btn-outline-success': 'btn'"
         (click)="toggleFilter('elevated-role')">
@@ -35,7 +35,7 @@ <h4>Users</h4>
     <div class="spacer"></div>
 
     <div class="btn-group d-block button-toggle-group sort" me-2 role="group" aria-label="Sort group">
-      <button type="button" class="btn btn-dark button-group-label text-upper fw-bold" disabled>Sort:</button>
+      <button type="button" class="btn btn-dark button-group-label text-upper fw-bold" disabled>Sort</button>
       <button type="button"
         [class]="search.sort ==='name' | toggleClass: 'btn-success' : 'btn-outline-success': 'btn toggle-button'"
         (click)="setSort('name')">
@@ -69,7 +69,7 @@ <h4>Users</h4>
 </div>
 
 <small *ngIf="source.length === 200" class="text-warning">
-  Results limited to 200. Refine search term if necessary.
+  Results limited to <strong>200</strong>. Refine search term if necessary.
 </small>
 
 <hr />
@@ -89,7 +89,9 @@ <h4>Users</h4>
 
       <div class="d-flex align-items-center">
         <div class="fs-08 mr-3 badge badge-success" *ngIf="user.role != 'member'">{{ user.role | titlecase }}</div>
-        <div class="btn-link fs-08" appCopyOnClick>{{ user.id | slice:0:8 }}</div>
+        <div class="btn-link fs-08" appCopyOnClick appCopyOnClickMessage="Copied user ID **$TEXT$** to your clipboard."
+          tooltip="Copy this user's ID to your clipboard">
+          {{ user.id | slice:0:8 }}</div>
       </div>
 
       <p *ngIf="user.lastLoginDate" class="text-muted fs-08 m-0">
diff --git a/projects/gameboard-ui/src/app/admin/user-registrar/user-registrar.component.ts b/projects/gameboard-ui/src/app/admin/user-registrar/user-registrar.component.ts
index 1712b36ca..796edb85d 100644
--- a/projects/gameboard-ui/src/app/admin/user-registrar/user-registrar.component.ts
+++ b/projects/gameboard-ui/src/app/admin/user-registrar/user-registrar.component.ts
@@ -22,6 +22,7 @@ type UserRegistrarSort = "name" | "lastLogin" | "createdOn";
 })
 export class UserRegistrarComponent {
   protected roles$: Observable<UserRoleKey[]>;
+  protected isLoading = false;
   refresh$ = new BehaviorSubject<boolean>(true);
   source$: Observable<ApiUser[]>;
   source: ApiUser[] = [];
@@ -48,8 +49,12 @@ export class UserRegistrarComponent {
       interval(60000)
     ).pipe(
       debounceTime(500),
+      tap(() => this.isLoading = true),
       switchMap(() => this.api.list({ ...this.search })),
-      tap(r => this.source = r),
+      tap(r => {
+        this.source = r;
+        this.isLoading = false;
+      }),
       tap(() => this.review()),
     );
   }
diff --git a/projects/gameboard-ui/src/app/api/feedback-models.ts b/projects/gameboard-ui/src/app/api/feedback-models.ts
index 9db2bf834..4a5c73f5a 100644
--- a/projects/gameboard-ui/src/app/api/feedback-models.ts
+++ b/projects/gameboard-ui/src/app/api/feedback-models.ts
@@ -1,6 +1,8 @@
 // Copyright 2021 Carnegie Mellon University. All Rights Reserved.
 // Released under a MIT (SEI)-style license. See LICENSE.md in the project root for license information.
 
+import { SimpleEntity } from "./models";
+
 export interface Feedback {
   id?: string;
   userId?: string;
@@ -98,3 +100,10 @@ export interface FeedbackStats {
   submittedCount: number;
   questionStats: QuestionStats[];
 }
+
+export interface FeedbackTemplate {
+  id: string;
+  content: string;
+  createdByUser: SimpleEntity;
+  name: string;
+}
diff --git a/projects/gameboard-ui/src/app/api/feedback.service.ts b/projects/gameboard-ui/src/app/api/feedback.service.ts
index 3784be6a2..b6b33c00d 100644
--- a/projects/gameboard-ui/src/app/api/feedback.service.ts
+++ b/projects/gameboard-ui/src/app/api/feedback.service.ts
@@ -2,34 +2,211 @@
 // Released under a MIT (SEI)-style license. See LICENSE.md in the project root for license information.
 
 import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { inject, Injectable } from '@angular/core';
+import { firstValueFrom, Observable, of } from 'rxjs';
 import { ConfigService } from '../utility/config.service';
 import { Feedback, FeedbackQuestion, FeedbackReportDetails, FeedbackSubmission, FeedbackTemplate, QuestionType } from './feedback-models';
 import { YamlService } from '@/services/yaml.service';
 import { hasProperty } from '@/../tools/functions';
 import { unique } from '@/../tools/tools';
+import { CreateFeedbackTemplate, FeedbackTemplateView, ListFeedbackTemplatesResponse } from '@/feedback/feedback.models';
+import { AbstractControl, FormControl, ValidationErrors, ValidatorFn } from '@angular/forms';
 
 @Injectable({ providedIn: 'root' })
 export class FeedbackService {
-  url = '';
+  private url = '';
+  private yamlService = inject(YamlService);
 
   constructor(
     config: ConfigService,
-    private http: HttpClient,
-    private yamlService: YamlService
+    private http: HttpClient
   ) {
     this.url = config.apphost + 'api';
   }
 
+  private dummyTemplate = {
+    id: "c1c81543-a7f8-4146-b647-2ad5f80cd821",
+    content: `
+- type: selectOne
+  required: true
+  min: 1
+  max: 0
+  options:
+    - Cyber Defense Incident Responder
+    - Cyber Defense Forensics Analyst
+    - Network Operations Specialist
+    - Cyber Defense Analyst
+    - Exploitation Analyst
+    - Cyber Operator
+    - Research and Development Specialist
+    - Vulnerability Assessment Analyst
+    - Data Analyst
+    - Threat/Warning Analyst
+    - Other
+  display: dropdown
+  id: q1
+  prompt: Which NICE Work Role best aligns with your position?
+  shortName: nice
+- type: selectOne
+  required: true
+  min: 1
+  max: 0
+  options:
+    - High School Diploma/GED
+    - Associate Degree
+    - Bachelor's Degree
+    - Master's Degree
+    - PhD
+    - Other
+  specify:
+    key: Other
+    prompt: ""
+  id: q2
+  prompt: Please Indicate your highest level of education.
+  shortName: education
+- type: selectOne
+  required: true
+  min: 1
+  max: 0
+  options:
+    - 1-5
+    - 5-10
+    - 15+
+    - None (N/A)
+  id: q3
+  prompt: How many years of cybersecurity experience do you have?
+  shortName: experience
+- type: selectMany
+  required: true
+  min: 1
+  max: 0
+  options:
+    - Promotional messages about the President’s Cup (emails, social media,
+      presentation, etc.)
+    - Word-of-Mouth (a supervisor, colleague or friend encouraged me to
+      register)
+    - Returning participant (enjoyed the event and wanted to participate in it
+      again)
+    - Professional development (a chance to grow my cybersecurity skills)
+    - Other
+  specify:
+    key: Other
+    prompt: ""
+  id: q4
+  prompt: What made you decide to participate?
+  shortName: decide
+- type: selectOne
+  required: true
+  min: 1
+  max: 0
+  options:
+    - Yes
+    - No
+    - Unsure
+  id: q5
+  prompt: Will you participate again next year if your schedule permits?
+  shortName: again
+- type: text
+  required: false
+  min: 1
+  max: 0
+  id: q6
+  prompt: How can we improve the next President’s Cup? Please provide any other
+    feedback you would like to share.
+  shortName: improve
+    `.trim(),
+    createdBy: { id: "5a6bfb3f-a2e3-4629-9014-acc4d3f22935", name: "Ben" },
+    helpText: "Tell us how you really feel.",
+    name: "My Cool Template",
+    responseCount: 12
+  };
+
+  public async createTemplate(template: CreateFeedbackTemplate) {
+    return await firstValueFrom(this.http.post<FeedbackTemplateView>(`${this.url}/feedback/template`, template));
+  }
+
+  public async deleteTemplate(template: FeedbackTemplateView) {
+    return await firstValueFrom(this.http.delete(`${this.url}/feedback/template/${template.id}`));
+  }
+
+  public getTemplates(): Promise<ListFeedbackTemplatesResponse> {
+    return firstValueFrom(of({
+      templates: [this.dummyTemplate]
+    }));
+  }
+
   public getRequiredProperties(): string[] {
     return ["id", "prompt", "type"];
   }
 
+  public getTemplateQuestionsValidator(): ValidatorFn {
+    return (formControl: AbstractControl<any, any>) => {
+      const set = this.yamlService.parse<FeedbackQuestion[]>(formControl.value);
+
+      if (!formControl.value)
+        return null;
+
+      if (!Array.isArray(set)) {
+        return {
+          questionValidation: {
+            valid: false,
+            errors: ["Your questions are in an invalid format. Try clicking the link below to learn more about the expected question format."]
+          }
+        };
+      }
+
+      if (!set?.length) {
+        return {
+          questionValidation: {
+            valid: false,
+            errors: ["Questions are a key part of the feedback process! Why not enter some now?"]
+          }
+        };
+      }
+
+      const retVal: string[] = [];
+      const requiredProperties: (keyof FeedbackQuestion)[] = ["id", "prompt", "type"];
+      const uniqueIds = unique(set.map(q => q?.id));
+
+      if (uniqueIds.length !== set.length) {
+        retVal.push(`Ensure the **id** property of all questions are unique.`);
+      }
+
+      for (let i = 0; i < set.length; i++) {
+        const displayIndex = i + 1;
+        // the user-friendly 1-indexed question
+        // ensure the question has a legal id
+        if (!set[i]?.id) {
+          retVal.push(`Question ${displayIndex} can't have a blank or missing ID.`);
+        }
+
+        for (const p of requiredProperties) {
+          if (!hasProperty(set[i], p))
+            retVal.push(`Question ${displayIndex} is missing required property **${p}**.`);
+        }
+      }
+
+      if (retVal.length) {
+        return {
+          questionValidation: {
+            valid: false,
+            errors: retVal
+          }
+        };
+      }
+
+      return null;
+    };
+  }
+
   public async getSampleYaml(): Promise<string | null> {
     return await this.yamlService.loadSample("feedback-config");
   }
 
+  public async getTemplateSampleYaml(): Promise<string | null> {
+    return await this.yamlService.loadSample("feedback-template-content");
+  }
+
   public list(search: any): Observable<FeedbackReportDetails[]> {
     return this.http.get<FeedbackReportDetails[]>(`${this.url}/feedback/list`, { params: search });
   }
diff --git a/projects/gameboard-ui/src/app/core/components/status-light/status-light.component.scss b/projects/gameboard-ui/src/app/core/components/status-light/status-light.component.scss
index 4f61d20c9..919092b9e 100644
--- a/projects/gameboard-ui/src/app/core/components/status-light/status-light.component.scss
+++ b/projects/gameboard-ui/src/app/core/components/status-light/status-light.component.scss
@@ -1,46 +1,46 @@
 @import "../../../../scss/variables";
 
 .component-container {
-    aspect-ratio: 1 / 1;
-    width: 36px;
-    height: 36px;
-    padding: 4px;
+  aspect-ratio: 1 / 1;
+  width: 36px;
+  height: 36px;
+  padding: 4px;
 }
 
 circle {
-    stroke-width: 1;
-    stroke: $secondary;
-
-    &.state-none {
-        background-color: #555;
-        fill: #555;
-    }
-
-    &.state-preparing {
-        background-color: #0078b8;
-        fill: #0078b8;
-    }
-
-    &.state-active {
-        animation: glow 1.5s infinite alternate;
-        background-color: #00a0f7;
-        fill: #00a0f7;
-    }
-
-    &.state-error {
-        background-color: #ff0000;
-        fill: #ff0000;
-    }
+  stroke-width: 1;
+  stroke: $secondary;
+
+  &.state-none {
+    background-color: #555;
+    fill: #555;
+  }
+
+  &.state-preparing {
+    background-color: #0078b8;
+    fill: #0078b8;
+  }
+
+  &.state-active {
+    animation: glow 1.5s infinite alternate;
+    background-color: $success;
+    fill: $success;
+  }
+
+  &.state-error {
+    background-color: #ff0000;
+    fill: #ff0000;
+  }
 }
 
 @keyframes glow {
-    from {
-        filter: drop-shadow(0px 0px 0px #ddd);
-        fill: darken(#0078b8, 20%);
-    }
-
-    to {
-        filter: drop-shadow(0px 0px 3px #00a0f7);
-        fill: #00a0f7;
-    }
+  from {
+    filter: drop-shadow(0px 0px 0px #ddd);
+    fill: darken($success, 20%);
+  }
+
+  to {
+    filter: drop-shadow(0px 0px 3px $success);
+    fill: $success;
+  }
 }
diff --git a/projects/gameboard-ui/src/app/core/directives/copy-on-click.directive.ts b/projects/gameboard-ui/src/app/core/directives/copy-on-click.directive.ts
index efa6c7908..758730f89 100644
--- a/projects/gameboard-ui/src/app/core/directives/copy-on-click.directive.ts
+++ b/projects/gameboard-ui/src/app/core/directives/copy-on-click.directive.ts
@@ -21,8 +21,18 @@ export class CopyOnClickDirective implements AfterViewInit {
       const text = (this.text || this.elementRef.nativeElement.innerHTML).trim();
       if (text) {
         this.clipboardService.copy(text);
-        this.toastService.showMessage(this.message || `Copied **${text}** to your clipboard.`);
+        this.toastService.showMessage(this.buildMessageText(text, this.message));
       }
     };
   }
+
+  private buildMessageText(copyText: string, message?: string) {
+    let retVal = `Copied **${copyText}** to your clipboard.`;
+
+    if (message) {
+      retVal = message.replace("$TEXT$", copyText) || retVal;
+    }
+
+    return retVal.trim();
+  }
 }
diff --git a/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.html b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.html
new file mode 100644
index 000000000..b6374d9a4
--- /dev/null
+++ b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.html
@@ -0,0 +1,173 @@
+<div class="feedback-template-picker-component">
+    <div class="form-group">
+        <label for="gameFeedbackTemplateId" class="form-label">Game-Level Template</label>
+
+        <div class="input-group">
+            <select id="gameFeedbackTemplateId" class="form-control" [(ngModel)]="gameFeedbackTemplate">
+                <option [ngValue]="undefined">[no game-level feedback template]</option>
+                <option *ngFor="let template of templates" [ngValue]="template">
+                    {{ template.name }}
+                    ({{ template.responseCount ? template.responseCount + " responses" : "no responses yet" }})
+                </option>
+            </select>
+
+            <div class="input-group-append gb-button-group">
+                <button type="button" class="btn btn-success btn-sm" (click)="handleCreate()">
+                    <fa-icon [icon]="fa.plus"></fa-icon>
+                </button>
+
+                <ng-container *ngIf="gameFeedbackTemplate">
+                    <button type="button" class="btn btn-success btn-sm">
+                        <fa-icon [icon]="fa.eye"></fa-icon>
+                    </button>
+                    <button type="button" class="btn btn-success btn-sm">
+                        <fa-icon [icon]="fa.edit"></fa-icon>
+                    </button>
+                    <button type="button" class="btn btn-danger btn-sm" (click)="handleDelete(gameFeedbackTemplate)">
+                        <fa-icon [icon]="fa.trash"></fa-icon>
+                    </button>
+                </ng-container>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label for="challengeFeedbackTemplateId" class="form-label">Challenge-Level Template</label>
+
+        <div class="input-group">
+            <select id="challengeFeedbackTemplateId" class="form-control" [(ngModel)]="challengeSpecFeedbackTemplate">
+                <option [ngValue]="undefined">[no challenge-level feedback template]</option>
+                <option *ngFor="let template of templates" [ngValue]="template">
+                    {{ template.name }}
+                    ({{ template.responseCount ? template.responseCount + " responses" : "no responses yet" }})
+                </option>
+            </select>
+
+            <div class="input-group-append gb-button-group">
+                <button type="button" class="btn btn-success btn-sm" (click)="handleCreate()">
+                    <fa-icon [icon]="fa.plus"></fa-icon>
+                </button>
+
+                <ng-container *ngIf="challengeSpecFeedbackTemplate">
+                    <button type="button" class="btn btn-success btn-sm">
+                        <fa-icon [icon]="fa.eye"></fa-icon>
+                    </button>
+                    <button type="button" class="btn btn-success btn-sm">
+                        <fa-icon [icon]="fa.edit"></fa-icon>
+                    </button>
+                    <button type="button" class="btn btn-danger btn-sm"
+                        (click)="handleDelete(challengeSpecFeedbackTemplate)">
+                        <fa-icon [icon]="fa.trash"></fa-icon>
+                    </button>
+                </ng-container>
+            </div>
+        </div>
+    </div>
+</div>
+
+<ng-template #previewTemplate>
+
+</ng-template>
+
+<ng-template #createTemplate>
+    <app-modal-content title="Create Feedback Template" [confirmDisabled]="!!!createEditTemplateForm.valid">
+        <ng-container *ngTemplateOutlet="createEditTemplate"></ng-container>
+
+        <div footer>
+            <a href="https://cmu-sei.github.io/foundry-docs/gameboard/admin-feedback-form/#configuration-yaml"
+                target="_blank">
+                About feedback templates
+            </a>
+        </div>
+    </app-modal-content>
+</ng-template>
+
+<ng-template #editTemplate>
+    <app-modal-content title="Edit Feedback Template" [subtitle]="editingTemplate?.name">
+
+    </app-modal-content>
+
+    <div footer>
+        <a href="https://cmu-sei.github.io/foundry-docs/gameboard/admin-feedback-form/#configuration-yaml"
+            target="_blank">
+            About feedback templates
+        </a>
+    </div>
+</ng-template>
+
+<ng-template #createEditTemplate>
+    <form [formGroup]="createEditTemplateForm" (ngSubmit)="handleCreateEditSubmit(createEditTemplateForm.value)">
+        <div class="form-group">
+            <label for="name" class="form-label">Name</label>
+            <input type="text" class="form-control" formControlName="name" required
+                placeholder="Enter a name for your feedback template (like &quot;Hackathon Feedback&quot;)">
+        </div>
+
+        <div class="form-group">
+            <label for="helpText" class="form-label">Help Text</label>
+            <input type="text" class="form-control" formControlName="helpText"
+                placeholder="Shown at the top of the form (optional)">
+        </div>
+
+        <div class="form-group">
+            <label for="content" class="form-label">Template</label>
+            <textarea type="text" class="form-control font-fixed-width" formControlName="content" required rows="10"
+                placeholder="Enter a feedback template here. You can also click the button below to paste an example feedback configuration or use the other controls to copy an existing template.">
+            </textarea>
+        </div>
+    </form>
+
+    <ng-container
+        *ngIf="(createEditTemplateForm.controls['name'].touched && !createEditTemplateForm.controls['name'].valid) || createEditTemplateForm.controls['content'].touched && !createEditTemplateForm.controls['content'].valid">
+        <alert type="warning" class="my-2">
+            <h5>Oops. A thing or two to sort out here...</h5>
+            <ul class="my-2 ml-2 li-style-type-circle">
+                <li
+                    *ngIf="createEditTemplateForm.controls['name'].dirty && createEditTemplateForm.controls['name'].hasError('required')">
+                    Your template needs a name so you can find it later. How about "Hacktacular Survey"?
+                </li>
+                <li
+                    *ngIf="createEditTemplateForm.controls['content'].dirty && createEditTemplateForm.controls['content'].hasError('required')">
+                    Questions are critical to the feedback process. Why not enter a few above?
+                </li>
+                <li
+                    *ngIf="createEditTemplateForm.controls['content'].dirty && createEditTemplateForm.controls['content'].hasError('questionValidation')">
+                    Whuh-oh. It looks like your question schema isn't quite right:
+
+                    <ul>
+                        <li class="ml-2"
+                            *ngFor="let error of createEditTemplateForm.controls['content'].getError('questionValidation').errors">
+                            - {{ error }}
+                        </li>
+                    </ul>
+                </li>
+            </ul>
+        </alert>
+    </ng-container>
+
+    <div class="d-flex align-items-center">
+        <button type="button" class="btn btn-sm btn-success d-block mr-2" [disabled]="!sampleConfig"
+            (click)="handlePasteSample()">
+            Paste Example Configuration
+        </button>
+
+        <div class="d-flex align-items-center flex-grow-1 mr-2">
+            <label class="copy-from-label d-block text-muted mr-2 mb-0">Copy from: </label>
+
+            <div class="input-group">
+                <select class="form-control custom-select custom-select-sm" #copyTemplateContentSelect>
+                    <option value="">[Choose a template to copy from]</option>
+                    <option *ngFor="let template of templates" [value]="template.id">{{ template.name }}</option>
+                </select>
+
+                <div class="input-group-append">
+                    <button type="button" class="btn btn-sm btn-warning"
+                        (click)="handleCopyFromTemplate(copyTemplateContentSelect.value)"
+                        [disabled]="!copyTemplateContentSelect.value">
+                        <fa-icon [icon]="fa.copy"></fa-icon>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
+</ng-template>
diff --git a/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.scss b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.scss
new file mode 100644
index 000000000..2179e46e4
--- /dev/null
+++ b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.scss
@@ -0,0 +1,4 @@
+.copy-from-label {
+  // literally no idea why i need this to prevent wrapping
+  min-width: 80px;
+}
diff --git a/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.ts b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.ts
new file mode 100644
index 000000000..017575a1d
--- /dev/null
+++ b/projects/gameboard-ui/src/app/feedback/components/feedback-template-picker/feedback-template-picker.component.ts
@@ -0,0 +1,113 @@
+import { Component, EventEmitter, inject, Input, OnInit, Output, TemplateRef, ViewChild } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { FeedbackTemplateView } from '@/feedback/feedback.models';
+import { fa } from '@/services/font-awesome.service';
+import { CoreModule } from "../../../core/core.module";
+import { FeedbackService } from '@/api/feedback.service';
+import { ModalConfirmService } from '@/services/modal-confirm.service';
+import { ToastService } from '@/utility/services/toast.service';
+
+interface UpsertFeedbackTemplateForm {
+  id: string | null | undefined;
+  helpText: string | null | undefined;
+  name: string | null | undefined;
+  content: string | null | undefined;
+}
+
+@Component({
+  selector: 'app-feedback-template-picker',
+  standalone: true,
+  imports: [
+    CommonModule,
+    ReactiveFormsModule,
+    FontAwesomeModule,
+    CoreModule,
+  ],
+  templateUrl: './feedback-template-picker.component.html',
+  styleUrls: ['./feedback-template-picker.component.scss']
+})
+export class FeedbackTemplatePickerComponent implements OnInit {
+  @Input() challengeSpecFeedbackTemplate?: FeedbackTemplateView;
+  @Output() challengeSpecFeedbackTemplateIdChange = new EventEmitter<string | undefined>();
+
+  @Input() gameFeedbackTemplate?: FeedbackTemplateView;
+  @Output() gameFeedbackTemplateChange = new EventEmitter<FeedbackTemplateView | undefined>();
+
+  @ViewChild("createTemplate") createTemplate?: TemplateRef<any>;
+
+  private feedbackService = inject(FeedbackService);
+  private modalService = inject(ModalConfirmService);
+  private toastsService = inject(ToastService);
+
+  protected challengeTemplateId?: string;
+  protected createEditTemplateForm = new FormGroup({
+    id: new FormControl(""),
+    helpText: new FormControl(""),
+    name: new FormControl("", Validators.required),
+    content: new FormControl("", [Validators.required, this.feedbackService.getTemplateQuestionsValidator()])
+  });
+  protected gameTemplateId?: string;
+  protected templates: FeedbackTemplateView[] = [];
+  protected editingTemplate?: FeedbackTemplateView;
+  protected fa = fa;
+  protected sampleConfig?: string;
+
+  async ngOnInit(): Promise<void> {
+    this.sampleConfig = await this.feedbackService.getTemplateSampleYaml() || "";
+    await this.load();
+  }
+
+  protected handleCopyFromTemplate(templateId: string) {
+    const template = this.templates.find(t => t.id === templateId);
+    if (!template) {
+      throw new Error("Couldn't resolve copy template.");
+    }
+
+    this.createEditTemplateForm.patchValue({
+      content: template.content,
+      helpText: template.helpText
+    });
+  }
+
+  protected handleCreate() {
+    if (!this.createTemplate)
+      throw new Error("Couldn't resolve create template.");
+
+    this.modalService.openTemplate(this.createTemplate);
+  }
+
+  protected async handleCreateEditSubmit(model: Partial<UpsertFeedbackTemplateForm>) {
+    const isEdit = !!model.id;
+
+    if (!isEdit) {
+      await this.feedbackService.createTemplate({
+        content: model.content!,
+        helpText: model.helpText || undefined,
+        name: model.name!
+      });
+    }
+
+    this.toastsService.showMessage(`Your new feedback template **${model.name}** has been created. You can select it for this game or its challenges now.`);
+  }
+
+  protected handleDelete(template: FeedbackTemplateView) {
+    this.modalService.openConfirm({
+      bodyContent: `Are you sure you want to delete this feedback template? This can't be undone.`,
+      onConfirm: async () => {
+      },
+      subtitle: template.name,
+      title: "Delete Feedback Template?"
+    });
+  }
+
+  protected handlePasteSample() {
+    this.createEditTemplateForm.patchValue({ content: this.sampleConfig });
+  }
+
+  private async load() {
+    const templatesResponse = await this.feedbackService.getTemplates();
+    this.templates = templatesResponse.templates;
+  }
+}
diff --git a/projects/gameboard-ui/src/app/feedback/feedback.models.ts b/projects/gameboard-ui/src/app/feedback/feedback.models.ts
new file mode 100644
index 000000000..a6893d601
--- /dev/null
+++ b/projects/gameboard-ui/src/app/feedback/feedback.models.ts
@@ -0,0 +1,27 @@
+import { SimpleEntity } from "@/api/models";
+
+export interface CreateFeedbackTemplate {
+    name: string;
+    helpText?: string;
+    content: string;
+}
+
+export interface EditTeedbackTemplate {
+    id: string;
+    helpText?: string;
+    name: string;
+    content: string;
+}
+
+export interface FeedbackTemplateView {
+    id: string;
+    content: string;
+    createdBy: SimpleEntity;
+    helpText?: string;
+    name: string;
+    responseCount: number;
+}
+
+export interface ListFeedbackTemplatesResponse {
+    templates: FeedbackTemplateView[];
+}
diff --git a/projects/gameboard-ui/src/app/services/modal-confirm.service.ts b/projects/gameboard-ui/src/app/services/modal-confirm.service.ts
index 0a0237814..1ee67682e 100644
--- a/projects/gameboard-ui/src/app/services/modal-confirm.service.ts
+++ b/projects/gameboard-ui/src/app/services/modal-confirm.service.ts
@@ -34,7 +34,7 @@ export class ModalConfirmService implements OnDestroy {
   }
 
   openTemplate<T>(templateRef: TemplateRef<T>) {
-    this.bsModalRef = this.bsModalService.show(templateRef, { class: "modal-dialog-centered" });
+    this.bsModalRef = this.bsModalService.show(templateRef, { class: "modal-dialog-centered modal-xl" });
   }
 
   hide(isCancelEvent = false): void {
diff --git a/projects/gameboard-ui/src/app/standalone/games/components/challenge-questions/challenge-questions.component.ts b/projects/gameboard-ui/src/app/standalone/games/components/challenge-questions/challenge-questions.component.ts
index 448260f81..df496a886 100644
--- a/projects/gameboard-ui/src/app/standalone/games/components/challenge-questions/challenge-questions.component.ts
+++ b/projects/gameboard-ui/src/app/standalone/games/components/challenge-questions/challenge-questions.component.ts
@@ -33,7 +33,6 @@ interface SectionTabViewModel {
     CoreModule,
     ChallengeSubmissionHistoryComponent,
     EpochMsToTimeRemainingStringPipe,
-    HoldConfirmButtonComponent,
     SpinnerComponent,
   ],
   providers: [ActiveChallengesRepo, ModalConfirmService],
diff --git a/projects/gameboard-ui/src/app/users/components/certificate-printer/certificate-printer.component.html b/projects/gameboard-ui/src/app/users/components/certificate-printer/certificate-printer.component.html
index 74a752b92..165f1e65a 100644
--- a/projects/gameboard-ui/src/app/users/components/certificate-printer/certificate-printer.component.html
+++ b/projects/gameboard-ui/src/app/users/components/certificate-printer/certificate-printer.component.html
@@ -6,9 +6,9 @@
             Print This Certificate
         </button>
 
-        <!-- <button type="button" class="btn btn-warning ml-2 print-button" (click)="handleProvideNameClick()">
+        <button type="button" class="btn btn-warning ml-2 print-button" (click)="handleProvideNameClick()">
             Provide Another Name
-        </button> -->
+        </button>
     </div>
 
     <div class="gameboard-print" *ngIf="isPublished; else notPublished">
diff --git a/projects/gameboard-ui/src/app/users/components/user-page/user-page.component.ts b/projects/gameboard-ui/src/app/users/components/user-page/user-page.component.ts
index 96bf19129..9c4312f34 100644
--- a/projects/gameboard-ui/src/app/users/components/user-page/user-page.component.ts
+++ b/projects/gameboard-ui/src/app/users/components/user-page/user-page.component.ts
@@ -11,11 +11,12 @@ import { ApiUser } from '@/api/user-models';
 })
 export class UserPageComponent {
   protected appName: string;
-  protected localUser$?: Observable<ApiUser>;
+  protected localUser$?: Observable<ApiUser | null>;
 
   constructor(
     config: ConfigService,
     localUser: LocalUserService) {
     this.appName = config.environment.settings.appname || "Gameboard";
+    this.localUser$ = localUser.user$;
   }
 }
diff --git a/projects/gameboard-ui/src/assets/yaml/feedback-template-content.sample.yaml b/projects/gameboard-ui/src/assets/yaml/feedback-template-content.sample.yaml
new file mode 100644
index 000000000..e8d5c0b88
--- /dev/null
+++ b/projects/gameboard-ui/src/assets/yaml/feedback-template-content.sample.yaml
@@ -0,0 +1,21 @@
+- id: q1
+  prompt: Please rate the difficulty of this game.
+  shortName: Difficulty
+  type: likert
+  max: 10
+  minLabel: Very Easy
+  maxLabel: Very Difficult
+  required: true
+- id: q2 
+  prompt: Please rate the quality of this game.
+  shortName: Quality
+  type: likert
+  max: 10
+  minLabel: Low Quality
+  maxLabel: High Quality
+- id: q3
+  prompt: What did you like about this game?
+  type: text
+- id: q4
+  prompt: How would you improve this game?
+  type: text
diff --git a/projects/gameboard-ui/src/styles.scss b/projects/gameboard-ui/src/styles.scss
index d69a06f24..788a0e23a 100644
--- a/projects/gameboard-ui/src/styles.scss
+++ b/projects/gameboard-ui/src/styles.scss
@@ -281,14 +281,9 @@ table.gameboard-table {
   margin: 0;
 }
 
-.li-style-type-circle {
+.li-style-type-circle > li {
   list-style-type: disc;
   margin-left: 0.5rem;
-
-  li {
-    list-style-type: disc;
-    margin-left: 0.5rem;
-  }
 }
 
 .dropdown-item:hover,
diff --git a/projects/gameboard-ui/src/tools/functions.ts b/projects/gameboard-ui/src/tools/functions.ts
index ba0e68526..53dff8c16 100644
--- a/projects/gameboard-ui/src/tools/functions.ts
+++ b/projects/gameboard-ui/src/tools/functions.ts
@@ -1,3 +1,5 @@
+import { FormGroup, ValidationErrors } from "@angular/forms";
+
 export function buildUrl(...urlBits: string[]): string | null {
     if (!urlBits?.length)
         return null;