Merge pull request #17 from datasci4health/dev

Dev

.settings/.gitignore

@@ -0,0 +1 @@
+/.jsdtscope

.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.JRE_CONTAINER

.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Global

Dockerfile

@@ -4,6 +4,8 @@ RUN apt update && apt install -y apache2 python3-pip
 RUN pip3 install jupyter_kernel_gateway
 RUN rm /var/www/html/index.html
 
+COPY ./resources/apache2/000-default.conf /etc/apache2/sites-enabled/
+
 WORKDIR /var/www/html
 ADD ./notebook .
 

notebook/author/author.html

@@ -60,7 +60,13 @@
          <div class="sty-message-space" id="message-space"></div>
       </div>
       <div class="sty-work-panel">
-         <div id="navigation-panel" class="sty-navigation-panel std-border"></div>
+         <div id="navigation-block" class="sty-navigation-block std-border">
+            <div id="navigation-panel" class="sty-navigation-panel"></div>
+            <div id="navigator-expansion" class="sty-navigation-expansion">
+               <dcc-trigger id="button-expand" action="control/navigator/expand" label="Expand" image="icons/icon-expand.svg"></dcc-trigger>
+               <dcc-trigger id="button-retract" action="control/navigator/retract" label="Retract" image="icons/icon-retract.svg" style="display:none"></dcc-trigger>
+            </div>
+         </div>
          <div id="knot-panel" class="sty-knot-panel std-border"></div>
       </div>
    </div>

notebook/author/css/author.css

@@ -6,7 +6,7 @@ body {
 }
 
 .std-border {
-   border: 1px solid lightgray;
+   border: 1px solid gray;
    border-radius: 5px;
    margin: 5px;
 }
@@ -71,20 +71,35 @@ body {
    }
 }
 
-.sty-navigation-panel {
+.sty-navigation-block {
    flex: 15%;
-   max-height: 100%;
+   max-width: 80%;
+   height: 100%;
+   display: flex;
+   flex-direction: row;
+}
+
+.sty-navigation-panel {
+   width: 100%;
+   height: 100%;
    display: flex;
    flex-direction: column;
    overflow: scroll;
 }
 
+.sty-navigation-expansion {
+   width: 20px;
+   height: 100%;
+}
+
 .navigation-knot {
    max-width: 100%;
 }
 
 .sty-knot-panel {
    flex: 75%;
+   min-width: 20%;
    overflow: scroll;
+   height: 100%;
 }
 

notebook/author/js/dcc-author-server-address.js

@@ -1,4 +1,4 @@
 (function() {
-   // DCCAuthorServer.serverAddress = "http://cloud.lis.ic.unicamp.br/case-notebook/v1/server/";
-   DCCAuthorServer.serverAddress = "http://127.0.0.1:8888/";
-})();
+   DCCAuthorServer.serverAddress = "http://cloud.lis.ic.unicamp.br/case-notebook/latest/server/";
+   //DCCAuthorServer.serverAddress = "http://127.0.0.1:8888/";
+})();