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

Merge pull request #1879 from lukashass/fix-comparison-always-false
fix comparison that is always false
2022-02-16 00:19:55 +01:00 · 2022-02-15 18:17:40 +01:00 · 2022-02-15 12:00:32 +01:00 · 2022-02-15 09:25:31 +01:00 · 2022-02-15 09:15:41 +01:00 · 2022-02-14 22:04:53 +01:00
20 changed files with 64 additions and 31 deletions
--- a/back/yarn.lock
+++ b/back/yarn.lock
@ -935,9 +935,9 @@ flatted@^3.1.0:
  integrity sha512-8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw==

 follow-redirects@^1.14.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==

 fs-minipass@^2.0.0:
  version "2.1.0"
--- a/docs/maps/menu.php
+++ b/docs/maps/menu.php
@ -141,6 +141,12 @@ return [
                        'markdown' => 'maps.api-controls',
                        'editUrl' => 'https://github.com/thecodingmachine/workadventure/edit/develop/docs/maps/api-controls.md',
                    ],
+                    [
+                        'title' => 'Camera',
+                        'url' => '/map-building/api-camera.md',
+                        'markdown' => 'maps.api-camera',
+                        'editUrl' => 'https://github.com/thecodingmachine/workadventure/edit/develop/docs/maps/api-camera.md',
+                    ],
                    [
                        'title' => 'Deprecated',
                        'url' => '/map-building/api-deprecated.md',
--- a/front/dist/index.ejs
+++ b/front/dist/index.ejs
@ -32,7 +32,6 @@

        <script src="/env-config.js"></script>
        <base href="/">
-        <link href="https://unpkg.com/nes.css@2.3.0/css/nes.min.css" rel="stylesheet" />

        <title>Kraut.World</title>
    </head>
--- a/front/package.json
+++ b/front/package.json
@ -42,6 +42,7 @@
    "webpack-dev-server": "^3.11.2"
  },
  "dependencies": {
+    "@16bits/nes.css": "^2.3.2",
    "@fontsource/press-start-2p": "^4.3.0",
    "@joeattardi/emoji-button": "^4.6.2",
    "@types/simple-peer": "^9.11.1",
--- a/front/src/Components/Menu/TextGlobalMessage.svelte
+++ b/front/src/Components/Menu/TextGlobalMessage.svelte
@ -76,7 +76,3 @@
 <section class="section-input-send-text">
    <div class="input-send-text" bind:this={QUILL_EDITOR} />
 </section>
-
-<style lang="scss">
-    @import "https://cdn.quilljs.com/1.3.7/quill.snow.css";
-</style>
--- a/front/src/Phaser/Entity/RemotePlayer.ts
+++ b/front/src/Phaser/Entity/RemotePlayer.ts
@ -7,6 +7,7 @@ import type { PlayerAnimationDirections } from "../Player/Animation";
 import type { Unsubscriber } from "svelte/store";
 import type { ActivatableInterface } from "../Game/ActivatableInterface";
 import type CancelablePromise from "cancelable-promise";
+import LL from "../../i18n/i18n-svelte";

 /**
 * Class representing the sprite of a remote player (a player that plays on another computer)
@ -107,7 +108,7 @@ export class RemotePlayer extends Character implements ActivatableInterface {
    private registerDefaultActionsMenuActions(): void {
        if (this.visitCardUrl) {
            this.registeredActions.push({
-                actionName: "Visiting Card",
+                actionName: LL.woka.menu.businessCard(),
                callback: () => {
                    requestVisitCardsStore.set(this.visitCardUrl);
                    actionsMenuStore.clear();
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@ -1409,7 +1409,7 @@ ${escapedMessage}
            phaserLayer.setCollisionByProperty({ collides: true }, visible);
        } else {
            const phaserLayers = this.gameMap.findPhaserLayers(layerName + "/");
-            if (phaserLayers === []) {
+            if (phaserLayers.length === 0) {
                console.warn(
                    'Could not find layer with name that contains "' +
                        layerName +
--- a/front/src/i18n/de-DE/index.ts
+++ b/front/src/i18n/de-DE/index.ts
@ -12,6 +12,7 @@ import menu from "./menu";
 import report from "./report";
 import warning from "./warning";
 import woka from "./woka";
+import trigger from "./trigger";

 const de_DE: Translation = {
    ...(en_US as Translation),
@ -29,6 +30,7 @@ const de_DE: Translation = {
    report,
    warning,
    emoji,
+    trigger,
 };

 export default de_DE;
--- a/front/src/i18n/de-DE/menu.ts
+++ b/front/src/i18n/de-DE/menu.ts
@ -70,7 +70,7 @@ const menu: NonNullable<Translation["menu"]> = {
        description: "Link zu diesem Raum teilen!",
        copy: "Kopieren",
        share: "Teilen",
-        walk_automatically_to_position: "Walk automatically to my position",
+        walk_automatically_to_position: "Automatisch zu meiner Position gehen",
    },
    globalMessage: {
        text: "Text",
--- a/front/src/i18n/de-DE/trigger.ts
+++ b/front/src/i18n/de-DE/trigger.ts
@ -0,0 +1,9 @@
+import type { Translation } from "../i18n-types";
+
+const trigger: NonNullable<Translation["trigger"]> = {
+    cowebsite: "Drücke LEERTASTE oder tippe hier um die Webseite zu öffnen",
+    newTab: "Drücke LEERTASTE oder tippe hier um die Webseite in einem neuen Tab zu öffnen",
+    jitsiRoom: "Drücke LEERTASTE oder tippe hier um dem Jitsi Meet Raum beizutreten",
+};
+
+export default trigger;
--- a/front/src/i18n/de-DE/woka.ts
+++ b/front/src/i18n/de-DE/woka.ts
@ -15,6 +15,9 @@ const woka: NonNullable<Translation["woka"]> = {
        continue: "Auswählen",
        customize: "Bearbeite dein WOKA",
    },
+    menu: {
+        businessCard: "Visitenkarte",
+    },
 };

 export default woka;
--- a/front/src/i18n/en-US/woka.ts
+++ b/front/src/i18n/en-US/woka.ts
@ -15,6 +15,9 @@ const woka: BaseTranslation = {
        continue: "Continue",
        customize: "Customize your WOKA",
    },
+    menu: {
+        businessCard: "Business Card",
+    },
 };

 export default woka;
--- a/front/src/i18n/fr-FR/woka.ts
+++ b/front/src/i18n/fr-FR/woka.ts
@ -15,6 +15,9 @@ const woka: NonNullable<Translation["woka"]> = {
        continue: "Continuer",
        customize: "Personnalisez votre WOKA",
    },
+    menu: {
+        businessCard: "Carte de visite",
+    },
 };

 export default woka;
--- a/front/style/TextGlobalMessageSvelte-Style.scss
+++ b/front/style/TextGlobalMessageSvelte-Style.scss
@ -1,4 +1,8 @@
 //TextGlobalMessage
+
+// TODO: load on demand with TextGlobalMessage component
+@import "quill/dist/quill.snow.css";
+
 section.section-input-send-text {
  --height-toolbar: 20%;
  height: 100%;
--- a/front/style/fonts.scss
+++ b/front/style/fonts.scss
@ -1,4 +1,5 @@
@import "~@fontsource/press-start-2p/index.css";
+@import "~@16bits/nes.css/css/nes.min.css";

 *{
  font-family: PixelFont-7,monospace;
--- a/front/yarn.lock
+++ b/front/yarn.lock
@ -2,6 +2,11 @@
 # yarn lockfile v1


+"@16bits/nes.css@^2.3.2":
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/@16bits/nes.css/-/nes.css-2.3.2.tgz#e69db834119b33ae8d3cb044f106a07a17cadd6f"
+  integrity sha512-nEM5PIth+Bab5JSOa4uUR+PMNUsNTYxA55oVlG3gXI/4LoYtWS767Uv9Pu/KCbHXVvnIjt4ZXt13kZw3083qTw==
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
  version "7.12.13"
  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
@ -2795,9 +2800,9 @@ focus-trap@^5.1.0:
    xtend "^4.0.1"

 follow-redirects@^1.0.0, follow-redirects@^1.14.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==

 for-in@^1.0.2:
  version "1.0.2"
--- a/pusher/src/Controller/AuthenticateController.ts
+++ b/pusher/src/Controller/AuthenticateController.ts
@ -79,7 +79,7 @@ export class AuthenticateController extends BaseController {
                            if (!code && !nonce) {
                                res.writeStatus("200");
                                this.addCorsHeaders(res);
-                                res.writeHeader('Content-Type', 'application/json');
+                                res.writeHeader("Content-Type", "application/json");
                                return res.end(JSON.stringify({ ...resUserData, authToken: token }));
                            }
                            console.error("Token cannot to be check on OpenId provider");
@ -92,7 +92,7 @@ export class AuthenticateController extends BaseController {
                        const resCheckTokenAuth = await openIDClient.checkTokenAuth(authTokenData.accessToken);
                        res.writeStatus("200");
                        this.addCorsHeaders(res);
-                        res.writeHeader('Content-Type', 'application/json');
+                        res.writeHeader("Content-Type", "application/json");
                        return res.end(JSON.stringify({ ...resCheckTokenAuth, ...resUserData, authToken: token }));
                    } catch (err) {
                        console.info("User was not connected", err);
@ -123,7 +123,7 @@ export class AuthenticateController extends BaseController {

                res.writeStatus("200");
                this.addCorsHeaders(res);
-                res.writeHeader('Content-Type', 'application/json');
+                res.writeHeader("Content-Type", "application/json");
                return res.end(JSON.stringify({ ...data, authToken }));
            } catch (e) {
                console.error("openIDCallback => ERROR", e);
@ -186,7 +186,7 @@ export class AuthenticateController extends BaseController {
                    const authToken = jwtTokenManager.createAuthToken(email || userUuid);
                    res.writeStatus("200 OK");
                    this.addCorsHeaders(res);
-                    res.writeHeader('Content-Type', 'application/json');
+                    res.writeHeader("Content-Type", "application/json");
                    res.end(
                        JSON.stringify({
                            authToken,
@ -226,7 +226,7 @@ export class AuthenticateController extends BaseController {
                const authToken = jwtTokenManager.createAuthToken(userUuid);
                res.writeStatus("200 OK");
                this.addCorsHeaders(res);
-                res.writeHeader('Content-Type', 'application/json');
+                res.writeHeader("Content-Type", "application/json");
                res.end(
                    JSON.stringify({
                        authToken,
--- a/pusher/src/Controller/MapController.ts
+++ b/pusher/src/Controller/MapController.ts
@ -47,7 +47,7 @@ export class MapController extends BaseController {
                if (!match) {
                    res.writeStatus("404 Not Found");
                    this.addCorsHeaders(res);
-                    res.writeHeader('Content-Type', 'application/json');
+                    res.writeHeader("Content-Type", "application/json");
                    res.end(JSON.stringify({}));
                    return;
                }
@ -56,7 +56,7 @@ export class MapController extends BaseController {

                res.writeStatus("200 OK");
                this.addCorsHeaders(res);
-                res.writeHeader('Content-Type', 'application/json');
+                res.writeHeader("Content-Type", "application/json");
                res.end(
                    JSON.stringify({
                        mapUrl,
@ -108,7 +108,7 @@ export class MapController extends BaseController {

                    res.writeStatus("200 OK");
                    this.addCorsHeaders(res);
-                    res.writeHeader('Content-Type', 'application/json');
+                    res.writeHeader("Content-Type", "application/json");
                    res.end(JSON.stringify(mapDetails));
                } catch (e) {
                    this.errorToResponse(e, res);
--- a/pusher/yarn.lock
+++ b/pusher/yarn.lock
@ -950,9 +950,9 @@ flatted@^2.0.0:
  integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==

 follow-redirects@^1.14.0:
-  version "1.14.7"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
-  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==

 fs-minipass@^2.0.0:
  version "2.1.0"
--- a/tests/package-lock.json
+++ b/tests/package-lock.json
@ -3182,9 +3182,9 @@
      }
    },
    "node_modules/follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
      "funding": [
        {
          "type": "individual",
@ -8177,9 +8177,9 @@
      }
    },
    "follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="
    },
    "fp-ts": {
      "version": "2.11.8",
Author	SHA1	Message	Date
Ludwig Behm	146e8e0dff	Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into develop	2022-02-16 00:19:55 +01:00
David Négrier	8af7166c47	Merge pull request #1879 from lukashass/fix-comparison-always-false fix comparison that is always false	2022-02-15 18:17:40 +01:00
Lukas Hass	cdc3d182bc	fix comparison that is always false	2022-02-15 12:00:32 +01:00
David Négrier	e801e2a435	Merge pull request #1876 from thecodingmachine/fix_pusher_header pusher: add missing Content-Type header for json responses (2)	2022-02-15 09:25:31 +01:00
David Négrier	4bcdbcb1bd	Fixing linting	2022-02-15 09:15:41 +01:00
David Négrier	897fbc1e8d	Merge pull request #1875 from thecodingmachine/dependabot/npm_and_yarn/tests/follow-redirects-1.14.8 Bump follow-redirects from 1.14.7 to 1.14.8 in /tests	2022-02-14 22:04:53 +01:00
David Négrier	c2129b3d05	Merge pull request #1860 from thecodingmachine/dependabot/npm_and_yarn/pusher/follow-redirects-1.14.8 Bump follow-redirects from 1.14.7 to 1.14.8 in /pusher	2022-02-14 22:04:43 +01:00
David Négrier	ceb5682f81	Merge pull request #1859 from thecodingmachine/dependabot/npm_and_yarn/back/follow-redirects-1.14.8 Bump follow-redirects from 1.14.7 to 1.14.8 in /back	2022-02-14 22:04:34 +01:00
David Négrier	8c8fdb9ee0	Merge pull request #1858 from thecodingmachine/dependabot/npm_and_yarn/front/follow-redirects-1.14.8 Bump follow-redirects from 1.14.7 to 1.14.8 in /front	2022-02-14 22:04:22 +01:00
dependabot[bot]	73e20c3a24	Bump follow-redirects from 1.14.7 to 1.14.8 in /tests Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-14 17:46:49 +00:00
David Négrier	7a44f3dcb8	Merge pull request #1853 from anbraten/remove-external-deps Bundle nes.css and quill-js	2022-02-14 18:46:19 +01:00
David Négrier	9b15ce546e	Merge pull request #1864 from thecodingmachine/translate_visiting_card Adding a missing translation for "Visiting card"	2022-02-14 16:46:25 +01:00
David Négrier	9bfce8412a	Adding a missing translation for "Visiting card" Also, changing "Visiting Card" to "Business Card" in English	2022-02-14 16:00:53 +01:00
David Négrier	0b095eb85c	Merge pull request #1855 from Lurkars/i18n-de-DE update de-DE translations.	2022-02-14 11:38:26 +01:00
David Négrier	d0af766394	Adding missing reference to Camera doc	2022-02-14 09:07:37 +01:00
Ludwig Behm	9073024b1d	pusher: add missing Content-Type header for json responses	2022-02-14 00:53:38 +01:00
dependabot[bot]	2cb7c518c1	Bump follow-redirects from 1.14.7 to 1.14.8 in /pusher Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-13 21:56:46 +00:00
dependabot[bot]	f9e8e0bd60	Bump follow-redirects from 1.14.7 to 1.14.8 in /back Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-13 20:09:24 +00:00
Anton Bracke	aef64afdb9	fix quill import	2022-02-13 20:20:38 +01:00
dependabot[bot]	c6b125b347	Bump follow-redirects from 1.14.7 to 1.14.8 in /front Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-02-13 09:55:59 +00:00
Lurkars	7da4fd7da6	merge latest translations	2022-02-12 14:37:25 +01:00
David Négrier	c4d18716c3	Merge pull request #1854 from thecodingmachine/develop Deploy 2022-02-11	2022-02-11 19:02:47 +01:00
Anton Bracke	948a674bb2	use correct file	2022-02-11 16:17:17 +01:00
Anton Bracke	51f7ce10e1	remove extenal quill import	2022-02-11 15:53:52 +01:00
Anton Bracke	3dbd83ac47	load nes.css from npm	2022-02-11 15:47:17 +01:00
David Négrier	3a8a622f46	Merge pull request #1848 from thecodingmachine/develop Deploy 2022-02-10	2022-02-10 12:35:49 +01:00
David Négrier	d72cc68c22	Merge pull request #1832 from thecodingmachine/develop Deploy 2022-02-07	2022-02-07 18:52:14 +01:00
David Négrier	89f9badb70	Merge pull request #1821 from thecodingmachine/develop Deploy 2022-02-03	2022-02-03 18:33:02 +01:00
David Négrier	603d60b83e	Merge pull request #1814 from thecodingmachine/develop Deploy 2022-02-02	2022-02-02 19:19:00 +01:00
David Négrier	95b471f809	Merge pull request #1812 from thecodingmachine/develop Deploy 2022-02-01	2022-02-01 19:01:26 +01:00