starnakin/42_ft_transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: accounts: when logout go back to last page

Browse Source
This commit is contained in:
starnakin 2024-02-13 15:52:46 +01:00
parent d59a3dc646
commit 9128c0bf38
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/static/js/index.js
View File

@ -115,11 +115,9 @@ const router = async(uri) => {
const view = new match.route.view(getParams(match), lastPageUrlBeforeLogin); const view = new match.route.view(getParams(match), lastPageUrlBeforeLogin);
if (await client.isAuthenticated() === false && !(view instanceof AuthenticationView)) if (!(view instanceof AuthenticationView) && ! (view instanceof LogoutView))
lastPageUrlBeforeLogin = uri; lastPageUrlBeforeLogin = uri;
console.log(lastPageUrlBeforeLogin)
if (view instanceof AbstractRedirectView && await view.redirect()) if (view instanceof AbstractRedirectView && await view.redirect())
return 1; return 1;

4
frontend/static/js/views/abstracts/AbstractAuthenticatedView.js
View File

@ -2,8 +2,8 @@ import { client, navigateTo } from "../../index.js";
import AbstractRedirectView from "./AbstractRedirectView.js"; import AbstractRedirectView from "./AbstractRedirectView.js";
export default class extends AbstractRedirectView{ export default class extends AbstractRedirectView{
constructor(params, title) { constructor(params, title, uri = "/home") {
super(params, title, "/login"); super(params, title, uri);
} }
async redirect() async redirect()

4
frontend/static/js/views/abstracts/AbstractNonAuthenticatedView.js
View File

@ -2,8 +2,8 @@ import { client, navigateTo } from "../../index.js";
import AbstractRedirectView from "./AbstractRedirectView.js"; import AbstractRedirectView from "./AbstractRedirectView.js";
export default class extends AbstractRedirectView{ export default class extends AbstractRedirectView{
constructor(params, title, url) { constructor(params, title, uri = "/home") {
super(params, title, url); super(params, title, uri);
} }
async redirect() async redirect()

6
frontend/static/js/views/abstracts/AbstractRedirectView.js
View File

@ -2,14 +2,14 @@ import { navigateTo } from "../../index.js";
import AbstractView from "./AbstractView.js"; import AbstractView from "./AbstractView.js";
export default class extends AbstractView{ export default class extends AbstractView{
constructor(params, title, url) constructor(params, title, uri)
{ {
super(params, title); super(params, title);
this.redirect_url = url; this.redirect_url = uri;
} }
async redirect() async redirect()
{ {
navigateTo(url); navigateTo(this.redirect_url);
} }
} }

2
frontend/static/js/views/accounts/AuthenticationView.js
View File

@ -7,9 +7,7 @@ export default class extends AbstractNonAuthenticatedView
{ {
constructor(params, lastUrlBeforeLogin = '/home') constructor(params, lastUrlBeforeLogin = '/home')
{ {
super(params, lang.get('loginWindowTitle', 'Login'), lastUrlBeforeLogin); super(params, lang.get('loginWindowTitle', 'Login'), lastUrlBeforeLogin);
this.redirect_url = lastUrlBeforeLogin;
this.current_mode = undefined this.current_mode = undefined
} }

2
frontend/static/js/views/accounts/LogoutView.js
View File

@ -4,7 +4,7 @@ import AbstractAuthenticatedView from "../abstracts/AbstractAuthenticatedView.js
export default class extends AbstractAuthenticatedView export default class extends AbstractAuthenticatedView
{ {
constructor(params, lastPageUrl = '/login') { constructor(params, lastPageUrl = '/login') {
super(params, lang.get('logoutWindowTitle', 'Logout')); super(params, lang.get('logoutWindowTitle', 'Logout'), lastPageUrl);
this.lastPageUrl = lastPageUrl; this.lastPageUrl = lastPageUrl;
} }