router.go

@@ -159,7 +159,6 @@ func (app *appContext) loadRoutes(router *gin.Engine) {
 		}
 		if userPageEnabled {
 			router.GET(p+"/my/account", app.MyUserPage)
-			router.GET(p+"/my/account/password/reset", app.MyUserPage)
 			router.GET(p+"/my/token/login", app.getUserTokenLogin)
 			router.GET(p+"/my/token/refresh", app.getUserTokenRefresh)
 			router.GET(p+"/my/confirm/:jwt", app.ConfirmMyAction)

ts/modules/login.ts

@@ -2,7 +2,6 @@ import { Modal } from "../modules/modal.js";
 import { toggleLoader, _post } from "../modules/common.js";
 
 export class Login {
-    loggedIn: boolean = false;
     private _modal: Modal;
     private _form: HTMLFormElement;
     private _url: string;
@@ -92,7 +91,6 @@ export class Login {
                 } else {
                     const data = req.response;
                     window.token = data["token"];
-                    this.loggedIn = true;
                     if (this._onLogin) {
                         this._onLogin(username, password);
                     }

ts/modules/modal.ts

@@ -20,9 +20,7 @@ export class Modal implements Modal {
             });
         }
     }
-    close = (event?: Event, noDispatch?: boolean) => {
+    close = (event?: Event) => {
-        // If we don't check we can mess up a closed modal.
-        if (!this.modal.classList.contains("block") && !this.modal.classList.contains("animate-fade-in")) return;
         if (event) {
             event.preventDefault();
         }
@@ -32,8 +30,8 @@ export class Modal implements Modal {
         const listenerFunc = () => {
             modal.classList.remove('block');
             modal.classList.remove('animate-fade-out');
-            modal.removeEventListener(window.animationEvent, listenerFunc)
+            modal.removeEventListener(window.animationEvent, listenerFunc);
-            if (!noDispatch) document.dispatchEvent(this.closeEvent);
+            document.dispatchEvent(this.closeEvent);
         };
         this.modal.addEventListener(window.animationEvent, listenerFunc, false);
     }

ts/setup.ts

@@ -525,6 +525,7 @@ const pageNames: string[][] = [];
 })();
 
 window.onpopstate = (event: PopStateEvent) => {
+    console.log("CALLLLLLLL", event);
     if (event.state === "welcome") {
         cards[0].classList.remove("unfocused");
         for (let i = 1; i < cards.length; i++) { cards[i].classList.add("unfocused"); }

ts/typings/d.ts

@@ -2,7 +2,7 @@ declare interface Modal {
     modal: HTMLElement;
     closeButton: HTMLSpanElement
     show: () => void;
-    close: (event?: Event, noDispatch?: boolean) => void;
+    close: (event?: Event) => void;
     toggle: () => void;
     onopen: (f: () => void) => void;
     onclose: (f: () => void) => void;

ts/user.ts

@@ -50,37 +50,19 @@ window.modals = {} as Modals;
     if (window.pwrEnabled) {
         window.modals.pwr = new Modal(document.getElementById("modal-pwr"), false);
         window.modals.pwr.onclose = () => {
-            window.history.pushState("", "", window.location.pathname.replace("/password/reset", ""));
+            window.modals.login.show();
         };
         const resetButton = document.getElementById("modal-login-pwr");
         resetButton.onclick = () => {
-            window.history.pushState("reset", "", window.location.pathname+"/password/reset");
+            const usernameInput = document.getElementById("login-user") as HTMLInputElement;
+            const input = document.getElementById("pwr-address") as HTMLInputElement;
+            input.value = usernameInput.value;
+            window.modals.login.close();
+            window.modals.pwr.show();
         }
-
-        window.onpopstate = (event: PopStateEvent) => {
-            if ((event.state == "reset" || window.location.pathname.includes("/password/reset")) && window.pwrEnabled) {
-                const usernameInput = document.getElementById("login-user") as HTMLInputElement;
-                const input = document.getElementById("pwr-address") as HTMLInputElement;
-                input.value = usernameInput.value;
-                window.modals.login.close();
-                window.modals.pwr.show();
-            } else {
-                window.modals.pwr.close(null, true);
-                if (!login.loggedIn) login.login("", "");
-            }
-        };
     }
 })();
 
-(() => {
-    const pushState = window.history.pushState;
-    window.history.pushState = function (data: any, __: string, _: string | URL) {
-        pushState.apply(window.history, arguments);
-        let ev = { state: data as string } as PopStateEvent;
-        window.onpopstate(ev);
-    };
-})();
-
 window.notifications = new notificationBox(document.getElementById('notification-box') as HTMLDivElement, 5);
 
 if (window.pwrEnabled && window.linkResetEnabled) {
@@ -798,8 +780,4 @@ const generatePermutations = (xs: number[]): [number[], number[]][] => {
 
 login.bindLogout(document.getElementById("logout-button"));
 
-(() => {
+login.login("", "");
-    let data = "";
-    if (window.location.pathname.endsWith("/password/reset")) data = "reset";
-    window.history.pushState(data, "", window.location.pathname);
-})();