From 343fe18f2427685f59f896586ffbfd83853c48e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Santanch=C3=A8?= Date: Sat, 18 May 2019 05:01:30 -0300 Subject: [PATCH 1/2] Zombie Health Classic II (working) --- src/adonisjs/public/infra/bus.js | 2 ++ src/adonisjs/public/player/js/player.js | 7 +++++++ src/adonisjs/public/themes/minimal/css/theme.css | 2 ++ src/adonisjs/public/themes/zombie/css/theme.css | 9 +++++---- src/adonisjs/public/themes/zombie/right.html | 2 +- src/adonisjs/public/themes/zombie/wrong.html | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/adonisjs/public/infra/bus.js b/src/adonisjs/public/infra/bus.js index c1f780a02..48bf6b378 100644 --- a/src/adonisjs/public/infra/bus.js +++ b/src/adonisjs/public/infra/bus.js @@ -49,6 +49,8 @@ class MessageBus { } async publish(topic, message) { + console.log(topic); + console.log(message); for (let l in this._listeners) if (this.matchTopic(l, topic)) this._listeners[l].callback(topic, message); diff --git a/src/adonisjs/public/player/js/player.js b/src/adonisjs/public/player/js/player.js index 6f64aa248..c6421a074 100644 --- a/src/adonisjs/public/player/js/player.js +++ b/src/adonisjs/public/player/js/player.js @@ -38,6 +38,9 @@ class PlayerManager { // tracking this.trackTyping = this.trackTyping.bind(this); + + // provisory + this._nextKnot = 1; } get currentThemeFamily() { @@ -86,6 +89,10 @@ class PlayerManager { this._history.push(startKnot); this.knotLoad(startKnot); break; + case "knot/>/navigate": this._nextKnot++; + this._history.push(this._nextKnot.toString()); + this.knotLoad(this._nextKnot.toString()); + break; default: if (MessageBus.matchFilter(topic, "knot/+/navigate")) { this._history.push(message); this.knotLoad(message); diff --git a/src/adonisjs/public/themes/minimal/css/theme.css b/src/adonisjs/public/themes/minimal/css/theme.css index cab89bf38..f9fcf216f 100644 --- a/src/adonisjs/public/themes/minimal/css/theme.css +++ b/src/adonisjs/public/themes/minimal/css/theme.css @@ -42,6 +42,8 @@ body { border-radius: 1px; box-shadow: 0px 0px 0px 20px rgba(0,0,0,0.5); margin: 15px; + width: 100%; + height: 100%; } .styn-control-button { diff --git a/src/adonisjs/public/themes/zombie/css/theme.css b/src/adonisjs/public/themes/zombie/css/theme.css index cab89bf38..56febcb38 100644 --- a/src/adonisjs/public/themes/zombie/css/theme.css +++ b/src/adonisjs/public/themes/zombie/css/theme.css @@ -2,7 +2,7 @@ body { font-family: "Trebuchet MS", Helvetica, sans-serif; - font-size: 3vh; + font-size: 4vh; margin-left: 10px; margin-right: 10px; } @@ -19,14 +19,13 @@ body { .styt-pul-main { width: 98%; height: 100%; - font-size: 3vh; + font-size: 4vh; margin-left: 1%; margin-right: 1%; } .styt-pul-main img { - width: 50%; - height: 50%; + width: 30%; object-fit: contain; float: left; margin-right: 10px; @@ -42,6 +41,8 @@ body { border-radius: 1px; box-shadow: 0px 0px 0px 20px rgba(0,0,0,0.5); margin: 15px; + width: 100%; + height: 100%; } .styn-control-button { diff --git a/src/adonisjs/public/themes/zombie/right.html b/src/adonisjs/public/themes/zombie/right.html index 0e9a51734..bb4c31967 100644 --- a/src/adonisjs/public/themes/zombie/right.html +++ b/src/adonisjs/public/themes/zombie/right.html @@ -1 +1 @@ -{knot} \ No newline at end of file +
{knot}
\ No newline at end of file diff --git a/src/adonisjs/public/themes/zombie/wrong.html b/src/adonisjs/public/themes/zombie/wrong.html index 0e9a51734..bb4c31967 100644 --- a/src/adonisjs/public/themes/zombie/wrong.html +++ b/src/adonisjs/public/themes/zombie/wrong.html @@ -1 +1 @@ -{knot} \ No newline at end of file +
{knot}
\ No newline at end of file From b4343699f0ebb3d958c1a0abc749178a1876c4d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Santanch=C3=A8?= Date: Sat, 18 May 2019 05:04:15 -0300 Subject: [PATCH 2/2] Adding Signin --- src/adonisjs/public/infra/basic.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/adonisjs/public/infra/basic.js b/src/adonisjs/public/infra/basic.js index 404c395d7..d63791dab 100644 --- a/src/adonisjs/public/infra/basic.js +++ b/src/adonisjs/public/infra/basic.js @@ -8,7 +8,6 @@ class Basic { let userid = null; let errorMessage = ""; while (userid == null) { - /* const userEmail = await DCCNoticeInput.displayNotice(errorMessage + "

Signin

inform your email:

", @@ -16,10 +15,11 @@ class Basic { const userPass = await DCCNoticeInput.displayNotice("

Signin

inform your password:

", "password"); - */ + /* let userEmail = "jacinto@example.com"; let userPass = "jacinto"; + */ let loginReturn = await MessageBus.ext.request("data/user/login", {email: userEmail,