Merge branch 'develop' of github.com:thecodingmachine/workadventure into main

front/src/Phaser/Game/GameScene.ts

@@ -727,9 +727,9 @@ export class GameScene extends ResizableScene implements CenterListener {
                 return;
             }
             const escapedMessage = HtmlUtils.escapeHtml(openPopupEvent.message);
-            let html = `<div id="container"><div class="nes-container with-title is-centered">
+            let html = `<div id="container" hidden><div class="nes-container with-title is-centered">
 ${escapedMessage}
- </div> </div>`;
+ </div> `;
             const buttonContainer = `<div class="buttonContainer"</div>`;
             html += buttonContainer;
             let id = 0;
@@ -737,15 +737,18 @@ ${escapedMessage}
                 html  += `<button type="button" class="nes-btn is-${HtmlUtils.escapeHtml(button.className ?? '')}" id="popup-${openPopupEvent.popupId}-${id}">${HtmlUtils.escapeHtml(button.label)}</button>`;
                 id++;
             }
-            const domElement = this.add.dom(objectLayerSquare.x  + objectLayerSquare.width/2 ,
+            html += '</div>';
-                objectLayerSquare.y + objectLayerSquare.height/2).createFromHTML(html);
+            const domElement = this.add.dom(objectLayerSquare.x  ,
+                objectLayerSquare.y).createFromHTML(html);
 
             const container : HTMLDivElement =  domElement.getChildByID("container") as HTMLDivElement;
             container.style.width = objectLayerSquare.width + "px";
             domElement.scale = 0;
             domElement.setClassName('popUpElement');
 
-
+            setTimeout(() => {
+                (container).hidden = false;
+            }, 100);
 
             id = 0;
             for (const button of openPopupEvent.buttons) {
@@ -753,6 +756,7 @@ ${escapedMessage}
                 const btnId = id;
                 button.onclick = () => {
                     iframeListener.sendButtonClickedEvent(openPopupEvent.popupId, btnId);
+                    button.disabled = true;
                 }
                 id++;
             }

front/src/WebRtc/MediaManager.ts

@@ -2,19 +2,14 @@ import {DivImportance, layoutManager} from "./LayoutManager";
 import {HtmlUtils} from "./HtmlUtils";
 import {discussionManager, SendMessageCallback} from "./DiscussionManager";
 import {UserInputManager} from "../Phaser/UserInput/UserInputManager";
-import {VIDEO_QUALITY_SELECT} from "../Administration/ConsoleGlobalMessageManager";
+import {localUserStore} from "../Connexion/LocalUserStore";
 import {UserSimplePeerInterface} from "./SimplePeer";
 declare const navigator:any; // eslint-disable-line @typescript-eslint/no-explicit-any
 
-const localValueVideo = localStorage.getItem(VIDEO_QUALITY_SELECT);
-let valueVideo = 20;
-if(localValueVideo){
-    valueVideo = parseInt(localValueVideo);
-}
 let videoConstraint: boolean|MediaTrackConstraints = {
     width: { min: 640, ideal: 1280, max: 1920 },
     height: { min: 400, ideal: 720 },
-    frameRate: { ideal: valueVideo },
+    frameRate: { ideal: localUserStore.getVideoQualityValue() },
     facingMode: "user",
     resizeMode: 'crop-and-scale',
     aspectRatio: 1.777777778

maps/Tuto/scriptTuto.js

@@ -20,7 +20,7 @@ function launchTuto (){
                         callback: (popup1) => {
                             WA.sendChatMessage("Hey you can talk here too!", 'WA Guide');
                             popup1.close();
-                            WA.openPopup("TutoFinal","You are good to go! You can meet the dev team and discover the features in the next room!",[
+                            WA.openPopup("TutoFinal","You are good to go! Go through the gate to meet the dev team and discover the features !",[
                                 {
                                     label: "Got it!",
                                     className : "success",callback:(popup2 => {

maps/Village/scriptMapVillage.js

@@ -0,0 +1,62 @@
+var zoneOfficeName = "popupOfficeZone";
+var zoneEventName = "popupEventZone";
+var zoneSchoolName = "popupSchoolZone";
+var zoneTCMName = "popupTCMZone";
+
+var urlPricing = "https://workadventu.re/pricing";
+var urlSchoolOffer = "https://workadventu.re/school-offer";
+var urlEvent = "https://workadventu.re/events";
+var currentPopup = undefined;
+
+WA.onEnterZone(zoneOfficeName, () => {
+   currentPopup =  WA.openPopup("popUpOffice","You can purchase virtual office in WorkAdventure",[
+        {
+            label: "See the pricing",
+            className: "popUpElement",
+            callback: (popup => {
+                WA.openTab(urlPricing);
+            })
+        }]);
+})
+
+WA.onEnterZone(zoneEventName, () => {
+    currentPopup =  WA.openPopup("popUpEvent","You can create your own Event in WorkAdventure",[
+        {
+            label: "See the event page",
+            className: "popUpElement",
+            callback: (popup => {
+                WA.openTab(urlEvent);
+            })
+        }]);
+})
+
+WA.onEnterZone(zoneTCMName, () => {
+    currentPopup =  WA.openPopup("popUpTCM","Come meet the WorkAdventure team in our office ! ",[]);
+})
+
+
+WA.onEnterZone(zoneSchoolName, () => {
+    currentPopup =  WA.openPopup("popUpSchool","WorkAdventure is free for teachers a the moment ! Take advantage of our offer ",[
+        {
+            label: "See the offer",
+            className: "popUpElement",
+            callback: (popup => {
+                WA.openTab(urlSchoolOffer);
+            })
+        }]);
+})
+
+WA.onLeaveZone(zoneSchoolName, closePopUp)
+
+WA.onLeaveZone(zoneTCMName, closePopUp)
+
+WA.onLeaveZone(zoneEventName, closePopUp)
+
+WA.onLeaveZone(zoneOfficeName, closePopUp)
+
+function closePopUp(){
+    if (currentPopup !== undefined) {
+        currentPopup.close();
+        currentPopup = undefined;
+    }
+}