Compare commits

...

2 Commits

5 changed files with 10 additions and 9 deletions

View File

@ -55,7 +55,7 @@ public class AppealDiscord {
MC UUID: %s MC UUID: %s
Submitted: %s Submitted: %s
""".formatted( """.formatted(
safe(discordAppeal.username()), safe(discordAppeal.discordUsername()),
discordAppeal.discordId(), discordAppeal.discordId(),
safe(String.valueOf(discordAppeal.uuid())), safe(String.valueOf(discordAppeal.uuid())),
createdAt createdAt

View File

@ -102,7 +102,7 @@ public class AppealMail {
helper.setFrom(fromEmail); helper.setFrom(fromEmail);
helper.setTo(APPEAL_EMAIL); helper.setTo(APPEAL_EMAIL);
helper.setReplyTo(appeal.email()); helper.setReplyTo(appeal.email());
helper.setSubject("New Appeal Submitted - " + appeal.username()); helper.setSubject("New Appeal Submitted - " + appeal.discordUsername());
return helper; return helper;
} }

View File

@ -96,13 +96,13 @@
<main> <main>
<img id="header-img" src="https://beta.alttd.com/public/img/logos/logo.png" alt="The Altitude Minecraft Server" height="159" <img id="header-img" src="https://beta.alttd.com/public/img/logos/logo.png" alt="The Altitude Minecraft Server" height="159"
width="275"> width="275">
<h1 style="text-align: center;" th:text="'Appeal by ' + ${appeal.username}">Appeal by Username</h1> <h1 style="text-align: center;" th:text="'Appeal by ' + ${appeal.discordUsername}">Appeal by Username</h1>
<section class="columnSection"> <section class="columnSection">
<div class="columnContainer"> <div class="columnContainer">
<div> <div>
<h2>User information</h2> <h2>User information</h2>
<ul> <ul>
<li><strong>Username:</strong> <span th:text="${appeal.username}">username</span></li> <li><strong>Username:</strong> <span th:text="${appeal.discordUsername}">username</span></li>
<li><strong>UUID:</strong> <span th:text="${appeal.uuid}">uuid</span></li> <li><strong>UUID:</strong> <span th:text="${appeal.uuid}">uuid</span></li>
<li><strong>Email:</strong> <span th:text="${appeal.email}">email</span></li> <li><strong>Email:</strong> <span th:text="${appeal.email}">email</span></li>
<li><strong>Submitted at:</strong> <span th:text="${createdAt}">date</span></li> <li><strong>Submitted at:</strong> <span th:text="${createdAt}">date</span></li>

View File

@ -7,7 +7,7 @@ public record DiscordAppeal(
UUID id, UUID id,
UUID uuid, UUID uuid,
Long discordId, Long discordId,
String username, String discordUsername,
String reason, String reason,
Instant createdAt, Instant createdAt,
Instant sendAt, Instant sendAt,

View File

@ -7,18 +7,19 @@
<div class="staff-pt-container centered"> <div class="staff-pt-container centered">
<div class="week-header"> <div class="week-header">
<button mat-icon-button (click)="prevWeek()" matTooltip="Previous week" aria-label="Previous week"> <button mat-icon-button (click)="prevWeek()" matTooltip="Previous week" aria-label="Previous week">
<mat-icon>chevron_left</mat-icon> <mat-icon style="color: var(--font-color)">chevron_left</mat-icon>
</button> </button>
<div class="week-title"><span>{{ weekLabel() }}</span></div> <div class="week-title"><span style="color: var(--font-color)">{{ weekLabel() }}</span></div>
<button mat-icon-button (click)="nextWeek()" [disabled]="!canGoNextWeek()" <button mat-icon-button (click)="nextWeek()" [disabled]="!canGoNextWeek()"
matTooltip="Next week" aria-label="Next week"> matTooltip="Next week" aria-label="Next week">
<mat-icon>chevron_right</mat-icon> <mat-icon style="color: var(--font-color)">chevron_right</mat-icon>
</button> </button>
</div> </div>
<table mat-table [dataSource]="sortedStaffPt()" class="mat-elevation-z2 full-width" matSort (matSortChange)="sort.set($event)" <table mat-table [dataSource]="sortedStaffPt()" class="mat-elevation-z2 full-width" matSort
(matSortChange)="sort.set($event)"
[matSortActive]="sort().active" [matSortDirection]="sort().direction" [matSortDisableClear]="true"> [matSortActive]="sort().active" [matSortDirection]="sort().direction" [matSortDisableClear]="true">
<ng-container matColumnDef="staff_member"> <ng-container matColumnDef="staff_member">
<th mat-header-cell *matHeaderCellDef mat-sort-header="staff_member">Staff Member</th> <th mat-header-cell *matHeaderCellDef mat-sort-header="staff_member">Staff Member</th>