monkeytypegame/monkeytype
1
1
Fork 0
mirror of https://github.com/monkeytypegame/monkeytype.git synced 2026-01-05 23:15:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

made page change async

Browse source 
added force param to force page change even if page is the same
setting page to account if page is login and user is signed in
This commit is contained in:
Miodec 2022-05-08 15:01:00 +02:00
parent 4926ec2949
commit 857a0e15c8
1 changed files with 70 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

129
frontend/src/ts/controllers/page-controller.ts
View file

@ -8,70 +8,81 @@ import * as PageAbout from "../pages/about";
import * as PageLogin from "../pages/login";
import * as PageLoading from "../pages/loading";
import * as PageTransition from "../states/page-transition";
import { Auth } from "../firebase";
export function change(page?: MonkeyTypes.Page | ""): void {
if (PageTransition.get()) {
console.log(`change page ${page} stopped`);
return;
}
console.log(`change page ${page}`);
export async function change(
page?: MonkeyTypes.Page | "",
force = false
): Promise<void> {
return new Promise((resolve) => {
if (PageTransition.get()) {
console.log(`change page ${page} stopped`);
return;
}
console.log(`change page ${page}`);
if (page === "") page = "test";
if (page == undefined) {
//use window loacation
const pages: {
[key: string]: MonkeyTypes.Page;
} = {
"/": "test",
"/login": "login",
"/settings": "settings",
"/about": "about",
"/account": "account",
if (page === "") page = "test";
if (page == undefined) {
//use window loacation
const pages: {
[key: string]: MonkeyTypes.Page;
} = {
"/": "test",
"/login": "login",
"/settings": "settings",
"/about": "about",
"/account": "account",
};
let path = pages[window.location.pathname as keyof typeof pages];
if (!path) {
path = "test";
}
page = path;
if (Auth.currentUser && page === "login") {
page = "account";
}
}
if (!force && ActivePage.get() === page) {
console.log(`page ${page} already active`);
return;
}
const pages = {
loading: PageLoading.page,
test: PageTest.page,
settings: Settings.page,
about: PageAbout.page,
account: Account.page,
login: PageLogin.page,
};
let path = pages[window.location.pathname as keyof typeof pages];
if (!path) {
path = "test";
}
page = path;
}
if (ActivePage.get() === page) {
console.log(`page ${page} already active`);
return;
}
const previousPage = pages[ActivePage.get() as MonkeyTypes.Page];
const nextPage = pages[page];
const pages = {
loading: PageLoading.page,
test: PageTest.page,
settings: Settings.page,
about: PageAbout.page,
account: Account.page,
login: PageLogin.page,
};
const previousPage = pages[ActivePage.get() as MonkeyTypes.Page];
const nextPage = pages[page];
previousPage?.beforeHide();
PageTransition.set(true);
ActivePage.set(undefined);
$(".page").removeClass("active");
Misc.swapElements(
previousPage.element,
nextPage.element,
250,
() => {
PageTransition.set(false);
ActivePage.set(nextPage.name);
previousPage?.afterHide();
nextPage.element.addClass("active");
history.pushState(nextPage.pathname, "", nextPage.pathname);
nextPage?.afterShow();
},
async () => {
await nextPage?.beforeShow();
}
);
previousPage?.beforeHide();
PageTransition.set(true);
ActivePage.set(undefined);
$(".page").removeClass("active");
Misc.swapElements(
previousPage.element,
nextPage.element,
250,
() => {
PageTransition.set(false);
ActivePage.set(nextPage.name);
previousPage?.afterHide();
nextPage.element.addClass("active");
resolve();
history.pushState(nextPage.pathname, "", nextPage.pathname);
nextPage?.afterShow();
},
async () => {
await nextPage?.beforeShow();
}
);
});
}
$(document).on("click", "#top .logo", () => {