From 08ce954f56329ccdcdbdb8dc2f63ebc722955ece Mon Sep 17 00:00:00 2001 From: Gregoire Parant Date: Thu, 17 Dec 2020 16:36:01 +0100 Subject: [PATCH 1/3] Add new click event to close co website --- front/src/WebRtc/CoWebsiteManager.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/front/src/WebRtc/CoWebsiteManager.ts b/front/src/WebRtc/CoWebsiteManager.ts index e6d5b748..72100ffe 100644 --- a/front/src/WebRtc/CoWebsiteManager.ts +++ b/front/src/WebRtc/CoWebsiteManager.ts @@ -47,6 +47,13 @@ class CoWebsiteManager { this.cowebsiteDiv.innerHTML = ``; + setTimeout(() => { + try { + HtmlUtils.getElementByIdOrFail('cowebsite-close').addEventListener('click', () => { + this.closeCoWebsite(); + }); + }catch (err){throw err} + }, 100); const iframe = document.createElement('iframe'); iframe.id = 'cowebsite-iframe'; From ca1cd388e8d7f95c47f1e995a08ad0862ca1f9f8 Mon Sep 17 00:00:00 2001 From: Gregoire Parant Date: Thu, 17 Dec 2020 16:39:11 +0100 Subject: [PATCH 2/3] Fix lint --- front/src/WebRtc/CoWebsiteManager.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/front/src/WebRtc/CoWebsiteManager.ts b/front/src/WebRtc/CoWebsiteManager.ts index 72100ffe..e9564222 100644 --- a/front/src/WebRtc/CoWebsiteManager.ts +++ b/front/src/WebRtc/CoWebsiteManager.ts @@ -48,11 +48,9 @@ class CoWebsiteManager { `; setTimeout(() => { - try { - HtmlUtils.getElementByIdOrFail('cowebsite-close').addEventListener('click', () => { - this.closeCoWebsite(); - }); - }catch (err){throw err} + HtmlUtils.getElementByIdOrFail('cowebsite-close').addEventListener('click', () => { + this.closeCoWebsite(); + }); }, 100); const iframe = document.createElement('iframe'); From e77eb6d5bea0ffdb64a3d8eccce1af0bafc9e5dd Mon Sep 17 00:00:00 2001 From: Gregoire Parant Date: Thu, 17 Dec 2020 18:19:47 +0100 Subject: [PATCH 3/3] Typo fixes --- front/src/Phaser/Menu/MenuScene.ts | 6 +++--- website/dist/index.html | 15 +++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/front/src/Phaser/Menu/MenuScene.ts b/front/src/Phaser/Menu/MenuScene.ts index 859317db..47e083bb 100644 --- a/front/src/Phaser/Menu/MenuScene.ts +++ b/front/src/Phaser/Menu/MenuScene.ts @@ -155,7 +155,7 @@ export class MenuScene extends Phaser.Scene { gameManager.leaveGame(this, LoginSceneName, new LoginScene()); break; case 'sparkButton': - this.goToSpark(); + this.gotToCreateMapPage(); break; case 'changeSkinButton': this.closeSideMenu(); @@ -195,8 +195,8 @@ export class MenuScene extends Phaser.Scene { this.closeGameQualityMenu(); } - private goToSpark() { - const sparkHost = 'https://'+window.location.host.replace('play.', 'admin.')+'/register'; + private gotToCreateMapPage() { + const sparkHost = 'https://'+window.location.host.replace('play.', '')+'/choose-map.html'; window.open(sparkHost, '_blank'); } } diff --git a/website/dist/index.html b/website/dist/index.html index 9f0fc753..09fe52d5 100644 --- a/website/dist/index.html +++ b/website/dist/index.html @@ -61,11 +61,6 @@ function startGame() { let playUrl = window.location.protocol + "//play."+window.location.host+'/_/global/npeguin.github.io/office-map/map.json'; window.open(playUrl, '_blank'); - } - function startConsole() { - //let playUrl = window.location.protocol + "//admin."+window.location.host; - let playUrl = 'https://admin.workadventu.re'; - window.open(playUrl, '_blank'); } function shareFB() { window.open('https://www.facebook.com/sharer/sharer.php?u=https://workadventu.re/', '_blank', 'width=500,height=500'); @@ -118,27 +113,27 @@ Stay connected with your clients by providing a dedicated digital place to organize meetings, workshops.

- Stay connected with your future collaborators by organizing online event. + Engage with your future collaborators by organizing online events.