From 3dbd83ac47f88e8160a5f542b044ae8bcd001fa8 Mon Sep 17 00:00:00 2001 From: Anton Bracke Date: Fri, 11 Feb 2022 15:47:17 +0100 Subject: [PATCH 1/7] load nes.css from npm --- front/dist/index.tmpl.html.tmp | 126 +++++++++++++++++++++++++++++++++ front/package.json | 1 + front/style/fonts.scss | 1 + front/yarn.lock | 5 ++ 4 files changed, 133 insertions(+) create mode 100644 front/dist/index.tmpl.html.tmp diff --git a/front/dist/index.tmpl.html.tmp b/front/dist/index.tmpl.html.tmp new file mode 100644 index 00000000..7a3e210d --- /dev/null +++ b/front/dist/index.tmpl.html.tmp @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WorkAdventure + + +
+ +
+
+
+
+
+ + +
+
+
+ +
+
+
+
+ +
+
+ + +
+
+
+ +
+
+
+ +
+
+ + +
+
+
+ +
+
+
+ +
+
+ + +
+
+
+
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+ + + + diff --git a/front/package.json b/front/package.json index 86308a89..dee82314 100644 --- 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", diff --git a/front/style/fonts.scss b/front/style/fonts.scss index a49d3967..7a13ab49 100644 --- 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; diff --git a/front/yarn.lock b/front/yarn.lock index 3572e44b..3d3aa530 100644 --- 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" From 51f7ce10e18b3e3783b48fdd94b5349744d73542 Mon Sep 17 00:00:00 2001 From: Anton Bracke Date: Fri, 11 Feb 2022 15:53:52 +0100 Subject: [PATCH 2/7] remove extenal quill import --- front/src/Components/Menu/TextGlobalMessage.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/src/Components/Menu/TextGlobalMessage.svelte b/front/src/Components/Menu/TextGlobalMessage.svelte index ec3e7039..be6a57a4 100644 --- a/front/src/Components/Menu/TextGlobalMessage.svelte +++ b/front/src/Components/Menu/TextGlobalMessage.svelte @@ -78,5 +78,5 @@ From 948a674bb2ff0c594106e2bf40205f804f2e4db0 Mon Sep 17 00:00:00 2001 From: Anton Bracke Date: Fri, 11 Feb 2022 16:17:17 +0100 Subject: [PATCH 3/7] use correct file --- front/dist/index.ejs | 1 - front/dist/index.tmpl.html.tmp | 126 --------------------------------- 2 files changed, 127 deletions(-) delete mode 100644 front/dist/index.tmpl.html.tmp diff --git a/front/dist/index.ejs b/front/dist/index.ejs index 07732877..11d33ad0 100644 --- a/front/dist/index.ejs +++ b/front/dist/index.ejs @@ -29,7 +29,6 @@ - WorkAdventure diff --git a/front/dist/index.tmpl.html.tmp b/front/dist/index.tmpl.html.tmp deleted file mode 100644 index 7a3e210d..00000000 --- a/front/dist/index.tmpl.html.tmp +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WorkAdventure - - -
- -
-
-
-
-
- - -
-
-
- -
-
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- - -
-
-
-
-
-
-
-
-
- - -
-
- -
-
- -
-
- - - - From 7da4fd7da64761ac5f0fcda76a4f38cc08abf65f Mon Sep 17 00:00:00 2001 From: Lurkars Date: Sat, 12 Feb 2022 14:37:25 +0100 Subject: [PATCH 4/7] merge latest translations --- front/src/i18n/de-DE/index.ts | 2 ++ front/src/i18n/de-DE/menu.ts | 2 +- front/src/i18n/de-DE/trigger.ts | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 front/src/i18n/de-DE/trigger.ts diff --git a/front/src/i18n/de-DE/index.ts b/front/src/i18n/de-DE/index.ts index 40b63558..a72ecc1f 100644 --- 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; diff --git a/front/src/i18n/de-DE/menu.ts b/front/src/i18n/de-DE/menu.ts index 5e695d95..c1b7bc18 100644 --- a/front/src/i18n/de-DE/menu.ts +++ b/front/src/i18n/de-DE/menu.ts @@ -70,7 +70,7 @@ const menu: NonNullable = { 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", diff --git a/front/src/i18n/de-DE/trigger.ts b/front/src/i18n/de-DE/trigger.ts new file mode 100644 index 00000000..9239c0fc --- /dev/null +++ b/front/src/i18n/de-DE/trigger.ts @@ -0,0 +1,9 @@ +import type { Translation } from "../i18n-types"; + +const trigger: NonNullable = { + 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; From aef64afdb9476a3aadc03400ca8f1e1d12f05ee6 Mon Sep 17 00:00:00 2001 From: Anton Bracke Date: Sun, 13 Feb 2022 20:20:38 +0100 Subject: [PATCH 5/7] fix quill import --- front/src/Components/Menu/TextGlobalMessage.svelte | 4 ---- front/style/TextGlobalMessageSvelte-Style.scss | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/front/src/Components/Menu/TextGlobalMessage.svelte b/front/src/Components/Menu/TextGlobalMessage.svelte index be6a57a4..6b42e42e 100644 --- a/front/src/Components/Menu/TextGlobalMessage.svelte +++ b/front/src/Components/Menu/TextGlobalMessage.svelte @@ -76,7 +76,3 @@
- - diff --git a/front/style/TextGlobalMessageSvelte-Style.scss b/front/style/TextGlobalMessageSvelte-Style.scss index 4baa8c8a..94baa67a 100644 --- 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%; From d0af76639407ff68943bcda644d5d2202fc2fe1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Mon, 14 Feb 2022 09:07:37 +0100 Subject: [PATCH 6/7] Adding missing reference to Camera doc --- docs/maps/menu.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/maps/menu.php b/docs/maps/menu.php index b8d0e638..c8afc2c0 100644 --- 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', From 9bfce8412af99c253eedb5cae0f6ad2f20823b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Mon, 14 Feb 2022 15:59:04 +0100 Subject: [PATCH 7/7] Adding a missing translation for "Visiting card" Also, changing "Visiting Card" to "Business Card" in English --- front/src/Phaser/Entity/RemotePlayer.ts | 3 ++- front/src/i18n/de-DE/woka.ts | 3 +++ front/src/i18n/en-US/woka.ts | 3 +++ front/src/i18n/fr-FR/woka.ts | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/front/src/Phaser/Entity/RemotePlayer.ts b/front/src/Phaser/Entity/RemotePlayer.ts index 7af6da2e..a2ca63ea 100644 --- 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(); diff --git a/front/src/i18n/de-DE/woka.ts b/front/src/i18n/de-DE/woka.ts index 640cd756..98046f3b 100644 --- a/front/src/i18n/de-DE/woka.ts +++ b/front/src/i18n/de-DE/woka.ts @@ -15,6 +15,9 @@ const woka: NonNullable = { continue: "Auswählen", customize: "Bearbeite dein WOKA", }, + menu: { + businessCard: "Visitenkarte", + }, }; export default woka; diff --git a/front/src/i18n/en-US/woka.ts b/front/src/i18n/en-US/woka.ts index 6c1e02ad..ac4aaa64 100644 --- 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; diff --git a/front/src/i18n/fr-FR/woka.ts b/front/src/i18n/fr-FR/woka.ts index 36ef463b..3225a8a2 100644 --- a/front/src/i18n/fr-FR/woka.ts +++ b/front/src/i18n/fr-FR/woka.ts @@ -15,6 +15,9 @@ const woka: NonNullable = { continue: "Continuer", customize: "Personnalisez votre WOKA", }, + menu: { + businessCard: "Carte de visite", + }, }; export default woka;