Merge pull request #23 from datasci4health/development

Development
harena-lab · May 18, 2019 · c510f5a · c510f5a
2 parents e577ff8 + b434369
commit c510f5a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 8 deletions.
diff --git a/src/adonisjs/public/infra/basic.js b/src/adonisjs/public/infra/basic.js
@@ -8,18 +8,18 @@ class Basic {
       let userid = null;
       let errorMessage = "";
       while (userid == null) {
-         /*
          const userEmail =
             await DCCNoticeInput.displayNotice(errorMessage +
                                          "<h3>Signin</h3><h4>inform your email:</h4>",
                                          "input");
          const userPass =
             await DCCNoticeInput.displayNotice("<h3>Signin</h3><h4>inform your password:</h4>",
                                          "password");
-         */
 
+         /*
          let userEmail = "jacinto@example.com";
          let userPass = "jacinto";
+         */
 
          let loginReturn = await MessageBus.ext.request("data/user/login",
                                                         {email: userEmail,

diff --git 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
@@ -38,6 +38,9 @@ class PlayerManager {
 
       // tracking
       this.trackTyping = this.trackTyping.bind(this);
+
+      // <TODO> 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
@@ -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
@@ -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
@@ -1 +1 @@
-{knot}
+<div class="styt-pul-main">{knot}</div>
diff --git a/src/adonisjs/public/themes/zombie/wrong.html b/src/adonisjs/public/themes/zombie/wrong.html
@@ -1 +1 @@
-{knot}
+<div class="styt-pul-main">{knot}</div>