Skip to content

Commit bc6777f

Browse files
committed
refactor: rename property, add optional property
also fixes missing space in account settings page title
1 parent 7a887df commit bc6777f

File tree

13 files changed

+24
-20
lines changed

13 files changed

+24
-20
lines changed

frontend/src/ts/controllers/page-controller.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ export async function change(
8282
void AdController.reinstate();
8383
},
8484
async () => {
85-
if (nextPage.name === "test") {
85+
if (nextPage.id === "test") {
8686
Misc.updateTitle();
8787
} else {
88-
Misc.updateTitle(
89-
Strings.capitalizeFirstLetterOfEachWord(nextPage.name) +
90-
" | Monkeytype"
91-
);
88+
const titleString =
89+
nextPage.display ??
90+
Strings.capitalizeFirstLetterOfEachWord(nextPage.id);
91+
Misc.updateTitle(`${titleString} | Monkeytype`);
9292
}
9393
Focus.set(false);
94-
ActivePage.set(nextPage.name);
94+
ActivePage.set(nextPage.id);
9595
await previousPage?.afterHide();
9696
await nextPage?.beforeShow({
9797
params: options.params,

frontend/src/ts/pages/404.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Page from "./page";
22
import * as Skeleton from "../utils/skeleton";
33

44
export const page = new Page({
5-
name: "404",
5+
id: "404",
66
element: $(".page.page404"),
77
path: "/404",
88
afterHide: async (): Promise<void> => {

frontend/src/ts/pages/about.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ function getHistogramDataBucketed(data: Record<string, number>): {
202202
}
203203

204204
export const page = new Page({
205-
name: "about",
205+
id: "about",
206206
element: $(".page.pageAbout"),
207207
path: "/about",
208208
afterHide: async (): Promise<void> => {

frontend/src/ts/pages/account-settings.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ $(".page.pageAccountSettings #setStreakHourOffset").on("click", () => {
208208
});
209209

210210
export const page = new Page({
211-
name: "accountSettings",
211+
id: "accountSettings",
212+
display: "Account Settings",
212213
element: pageElement,
213214
path: "/account-settings",
214215
afterHide: async (): Promise<void> => {

frontend/src/ts/pages/account.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1269,7 +1269,7 @@ ConfigEvent.subscribe((eventKey) => {
12691269
});
12701270

12711271
export const page = new Page({
1272-
name: "account",
1272+
id: "account",
12731273
element: $(".page.pageAccount"),
12741274
path: "/account",
12751275
afterHide: async (): Promise<void> => {

frontend/src/ts/pages/leaderboards.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ $(".page.pageLeaderboards .buttonGroup.secondary").on(
12801280
);
12811281

12821282
export const page = new Page({
1283-
name: "leaderboards",
1283+
id: "leaderboards",
12841284
element: $(".page.pageLeaderboards"),
12851285
path: "/leaderboards",
12861286
afterHide: async (): Promise<void> => {

frontend/src/ts/pages/loading.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export async function showBar(): Promise<void> {
4040
}
4141

4242
export const page = new Page({
43-
name: "loading",
43+
id: "loading",
4444
element: $(".page.pageLoading"),
4545
path: "/",
4646
afterHide: async (): Promise<void> => {

frontend/src/ts/pages/login.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ $(".page.pageLogin .register.side .verifyPasswordInput").on("input", () => {
348348
});
349349

350350
export const page = new Page({
351-
name: "login",
351+
id: "login",
352352
element: $(".page.pageLogin"),
353353
path: "/login",
354354
afterHide: async (): Promise<void> => {

frontend/src/ts/pages/page.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ type Options<T> = {
1717
};
1818

1919
type PageProperties<T> = {
20-
name: PageName;
20+
id: PageName;
21+
display?: string;
2122
element: JQuery;
2223
path: string;
2324
beforeHide?: () => Promise<void>;
@@ -30,7 +31,8 @@ async function empty(): Promise<void> {
3031
return;
3132
}
3233
export default class Page<T> {
33-
public name: PageName;
34+
public id: PageName;
35+
public display: string | undefined;
3436
public element: JQuery;
3537
public pathname: string;
3638
public beforeHide: () => Promise<void>;
@@ -39,7 +41,8 @@ export default class Page<T> {
3941
public afterShow: () => Promise<void>;
4042

4143
constructor(props: PageProperties<T>) {
42-
this.name = props.name;
44+
this.id = props.id;
45+
this.display = props.display;
4346
this.element = props.element;
4447
this.pathname = props.path;
4548
this.beforeHide = props.beforeHide ?? empty;

frontend/src/ts/pages/profile-search.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import Page from "./page";
22
import * as Skeleton from "../utils/skeleton";
33

44
export const page = new Page({
5-
name: "profileSearch",
5+
id: "profileSearch",
66
element: $(".page.pageProfileSearch"),
77
path: "/profile",
88
afterHide: async (): Promise<void> => {

0 commit comments

Comments
 (0)