From 4fc9a12b950b3be3d09aae980cb1faec09a08134 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Mon, 12 Apr 2021 18:17:04 +0200
Subject: [PATCH 1/2] HotFix style WorkAdventure

---
 front/dist/resources/html/gameMenuIcon.html |  2 +-
 front/dist/resources/style/style.css        | 39 +++++++++++----------
 front/src/Phaser/Menu/MenuScene.ts          |  6 +++-
 front/src/Phaser/Menu/ReportMenu.ts         |  2 +-
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/front/dist/resources/html/gameMenuIcon.html b/front/dist/resources/html/gameMenuIcon.html
index 0df8ff80..946cb60a 100644
--- a/front/dist/resources/html/gameMenuIcon.html
+++ b/front/dist/resources/html/gameMenuIcon.html
@@ -8,7 +8,7 @@
     }
     #menuIcon button img{
         width: 14px;
-        padding-top: 3px;
+        padding-top: 0;
         cursor: url('/resources/logos/cursor_pointer.png'), pointer;
     }
     #menuIcon section {
diff --git a/front/dist/resources/style/style.css b/front/dist/resources/style/style.css
index ba5b6c07..010da692 100644
--- a/front/dist/resources/style/style.css
+++ b/front/dist/resources/style/style.css
@@ -44,13 +44,13 @@ body .message-info.warning{
 .video-container i{
     position: absolute;
     width: 100px;
-    height: 65px;
+    height: 100px;
     left: calc(50% - 50px);
     top: calc(50% - 50px);
     background-color: black;
     border-radius: 50%;
     text-align: center;
-    padding-top: 35px;
+    padding-top: 32px;
     font-size: 28px;
     color: white;
 }
@@ -58,8 +58,8 @@ body .message-info.warning{
 .video-container img{
     position: absolute;
     display: none;
-    width: 25px;
-    height: 25px;
+    width: 40px;
+    height: 40px;
     left: 5px;
     bottom: 5px;
     padding: 10px;
@@ -108,10 +108,12 @@ body .message-info.warning{
     margin: 0;
     padding: 0;
     cursor: url('/resources/logos/cursor_pointer.png'), pointer;
+    width: 25px;
+    height: 25px;
 }
 .video-container button.report span{
     position: absolute;
-    bottom: 8px;
+    bottom: 6px;
     left: 36px;
     color: white;
     font-size: 16px;
@@ -211,8 +213,8 @@ video#myCamVideo{
 .connecting-spinner {
       /*display: inline-block;*/
       position: absolute;
-      left: calc(50% - 68px);
-      top: calc(50% - 68px);
+      left: calc(50% - 62px);
+      top: calc(50% - 62px);
 
 
       width: 130px;
@@ -850,10 +852,10 @@ div.modal-report-user{
 
 .modal-report-user img{
     position: absolute;
-    height: 50px;
-    width: 50px;
+    height: 24px;
+    width: 24px;
     z-index: 999;
-    left: calc(50% - 25px);
+    left: calc(50% - 12px);
     top: 10px;
 }
 
@@ -1017,7 +1019,7 @@ div.modal-report-user{
     background-color: #2d2d2dba;
     right: 34px;
     margin: 0px;
-    padding: 6px 0px;
+    padding: 2px 0px;
     border-radius: 15px;
     border: none;
     color: white;
@@ -1073,18 +1075,18 @@ div.modal-report-user{
 .discussion .send-message{
     position: absolute;
     bottom: 45px;
-    width: 220px;
+    width: 200px;
     height: 26px;
     margin-bottom: 10px;
 }
 
 .discussion .send-message input{
     position: absolute;
-    width: calc(100% - 10px);
-    height: 20px;
+    width: calc(100% - 20px);
+    height: 30px;
     background-color: #171717;
     color: white;
-    border-radius: 15px;
+    border-radius: 10px;
     border: none;
     padding: 6px;
 }
@@ -1117,10 +1119,11 @@ div.action p.action-body{
     padding: 10px;
     background-color: #2d2d2dba;
     color: #fff;
-    font-size: 12px;
+    font-size: 14px;
+    font-weight: 500;
     text-align: center;
-    max-width: 150px;
-    margin-left: calc(50% - 75px);
+    max-width: 250px;
+    margin-left: calc(50% - 125px);
     border-radius: 15px;
 }
 .popUpElement{
diff --git a/front/src/Phaser/Menu/MenuScene.ts b/front/src/Phaser/Menu/MenuScene.ts
index 58e7f0a6..8899c62f 100644
--- a/front/src/Phaser/Menu/MenuScene.ts
+++ b/front/src/Phaser/Menu/MenuScene.ts
@@ -104,7 +104,11 @@ export class MenuScene extends Phaser.Scene {
     }
 
     public revealMenuIcon(): void {
-        (this.menuButton.getChildByID('menuIcon') as HTMLElement).hidden = false
+        try {
+            (this.menuButton.getChildByID('menuIcon') as HTMLElement).hidden = false;
+        } catch (err) {
+            console.error(err);
+        }
     }
 
     openSideMenu() {
diff --git a/front/src/Phaser/Menu/ReportMenu.ts b/front/src/Phaser/Menu/ReportMenu.ts
index d7d0658b..c5d59f38 100644
--- a/front/src/Phaser/Menu/ReportMenu.ts
+++ b/front/src/Phaser/Menu/ReportMenu.ts
@@ -72,8 +72,8 @@ export class ReportMenu extends Phaser.GameObjects.DOMElement {
     }
 
     public close(): void {
+        gameManager.getCurrentGameScene(this.scene).userInputManager.restoreControls();
         this.opened = false;
-        gameManager.getCurrentGameScene(this.scene).userInputManager.initKeyBoardEvent();
         const mainEl = this.getChildByID('gameReport') as HTMLElement;
         this.scene.tweens.add({
             targets: this,

From 6a08ca656f84d042b118e275593329f71554af0c Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Mon, 12 Apr 2021 18:26:36 +0200
Subject: [PATCH 2/2] Add TODO

---
 front/src/Phaser/Menu/MenuScene.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/front/src/Phaser/Menu/MenuScene.ts b/front/src/Phaser/Menu/MenuScene.ts
index 8899c62f..6d09f247 100644
--- a/front/src/Phaser/Menu/MenuScene.ts
+++ b/front/src/Phaser/Menu/MenuScene.ts
@@ -104,6 +104,7 @@ export class MenuScene extends Phaser.Scene {
     }
 
     public revealMenuIcon(): void {
+        //TODO fix me: add try catch because at the same time, 'this.menuButton' variable doesn't exist and there is error on 'getChildByID' function
         try {
             (this.menuButton.getChildByID('menuIcon') as HTMLElement).hidden = false;
         } catch (err) {