Pushing updates.

antoniocavalcante · Sep 24, 2018 · a4ce1bd · a4ce1bd
1 parent 1e1540b
commit a4ce1bd
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 42 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,21 @@
 FROM ubuntu:latest
 USER root
-RUN apt-get update -y 
+RUN apt-get update -y
+#RUN apt-get install -y apt-utils
 RUN apt-get install -y python3-dev python3-pip build-essential
 RUN apt-get install -y python-dev python-pip
 
+# Install nodemon
+RUN apt-get install -y nodejs npm
+RUN npm i -g nodemon
 
 ENV TZ=America/Los_Angeles
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-# dependancies 
+# dependancies
 RUN apt-get install -y default-jdk
 RUN apt-get install -y python-tk
-RUN apt-get install -y python3-tk 
+RUN apt-get install -y python3-tk
 RUN apt install -y gunicorn
 RUN apt install -y python-numpy
 
@@ -23,7 +27,6 @@ WORKDIR /app
 RUN mkdir workspace
 RUN chmod a+rwx workspace
 
-
 RUN pip3 install -r requirements.txt
 RUN pip install -r mustache/resources/requirements.txt
 RUN pip install hdbscan
@@ -37,5 +40,3 @@ WORKDIR /app
 # EXPOSE 5000
 
 # ENTRYPOINT [ "gunicorn", "-b", "0.0.0.0:5000", "-w", "4", "wsgi:app" ]
-
-
diff --git a/compose.sh b/compose.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+
 echo "Building Application.."
 export COMPOSE_PROJECT_NAME=mustache
 export MUSTACHE_WORKSPACE=$1
@@ -14,5 +15,3 @@ echo "sleep 3" >> run.sh
 echo "xdg-open http://127.0.0.01:5000" >> run.sh
 
 docker-compose build --compress
-
-
diff --git a/mustache/settings.json b/mustache/settings.json
@@ -3,4 +3,4 @@
     "DEBUG": false,
     "CELERY_BROKER_URL": "redis://redis/0",
     "CELERY_RESULT_BACKEND": "redis://redis/0"
-}
+}
diff --git a/mustache/static/gen/dashboard.js b/mustache/static/gen/dashboard.js
diff --git a/mustache/static/gen/home.js b/mustache/static/gen/home.js
diff --git a/mustache/static/js/dashboard/myplots.js b/mustache/static/js/dashboard/myplots.js
@@ -30,7 +30,7 @@ var dendrogramXScale;
 var yScaleInverted;
 var lineScale;
 
-// reachabillity settings 
+// reachabillity settings
 var reachExponent = 1.0;
 var reachCharts = {};
 
@@ -388,7 +388,7 @@ function update() {
             .attr("fill", MultiReachcolorScale(medoids[d]));
     })
 
-    // add new 
+    // add new
     u.enter()
         .append("div").classed("chart-scroller", "true").property("id", function (d) {
             return "chart_" + d;
@@ -948,7 +948,7 @@ function dendrogram() {
 
         var transitionTime = 100;
 
-        // colour and extract clusters from dendogram based on threshold bar current value. 
+        // colour and extract clusters from dendogram based on threshold bar current value.
         function clusterThresholdExtraction(currentValue) {
 
             d3.select("#manualThresh").select("input").property("value", function () {
@@ -1135,7 +1135,7 @@ function dendrogram() {
 
         }
 
-        // set dendogram initially 
+        // set dendogram initially
         d3.selectAll("input").each(function (d, i) {
             dendoSelect(this)
         })
@@ -1560,4 +1560,4 @@ d3.select("#reach-per-pg").on("change", function () {
     d3.select('#reach-plot').selectAll(".chart-scroller").remove();
     reachPaging();
     update();
-})
+})
diff --git a/mustache/static/js/home/home.js b/mustache/static/js/home/home.js
@@ -310,7 +310,7 @@ function submitData() {
 
 function startStep() {
     $("#submitDataForm").trigger("reset");
-    console.log("start");
+    console.log("Opening data submission form...");
 }
 
 function nextStep() {
@@ -397,6 +397,7 @@ function check(selection) {
             }
             if (id == "file-labels") {
                 checkSum[1] = data.length;
+                console.log(data.length);
             }
 
             function resetFile(id) {
@@ -405,12 +406,11 @@ function check(selection) {
                 $('.dropify-wrapper').has("#" + id).toggleClass("has-error")
             }
 
-            if (errors.length > 0) {
-                resetFile(id);
-                console.log(errors);
-                return false;
-
-            }
+            // if (errors.length > 0) {
+            //     resetFile(id);
+            //     console.log(errors);
+            //     return false;
+            // }
 
             if (checkSum.length == 2) {
                 if (checkSum[0] != checkSum[1]) {
@@ -461,4 +461,4 @@ $(function () {
         checkSum = [];
     })
 
-});
+});
diff --git a/mustache/templates/dashboard/index2.html b/mustache/templates/dashboard/index2.html
@@ -453,7 +453,7 @@ <h1 class="text-center brand-block">
                     <img src="{{ url_for('static', filename='img/UA-EAC-COLOUR-REVERSE.svg') }}" class="side-logo-uofa">
                 </a>
                 <a href="">
-                    <img src="{{ url_for('static', filename='img/jcu-logo.png') }}" class="side-logo-jcu">
+                    <img src="{{ url_for('static', filename='img/newcastle-logo.png') }}" class="side-logo-newcastle">
                 </a>
             </div>
             </div>

diff --git a/mustache/templates/home/index.html b/mustache/templates/home/index.html
@@ -110,12 +110,11 @@ <h5 class="modal-title text-center panel-title-extra js-title-step" id="exampleM
 													<strong class="text-primary">Step 1: </strong>Load a CSV file of data. </p>
 											</div>
 											<div class="col-md-6">
-												<!-- <p>load yourself some really good data!</p> -->
 												<div class="well well-sm">
 													<code>
-														0.1\t0.2\t0.5\t0.9
-														<br>0.2\t0.1\t5.0\t0.2
-														<br>0.4\t0.1\t7.0\t0.8
+														0.1, 0.2, 0.5, 0.9 <br>
+														0.2, 0.1, 5.0, 0.2 <br>
+														0.4, 0.1, 7.0, 0.8
 													</code>
 												</div>
 											</div>
@@ -130,14 +129,12 @@ <h5 class="modal-title text-center panel-title-extra js-title-step" id="exampleM
 													<strong class="text-primary">Step 2: </strong>Load a CSV file of labels. </p>
 											</div>
 											<div class="col-md-6">
-												<!-- <p>load yourself some really good data!</p> -->
 												<div class="well well-sm">
 													<code>
-														Pokémon\tSpecies
-														<br>Wartortle\tTurtle
-														<br>Venusaur\tSeed
-														<br>Charmeleon\tFlame
-													</code>
+                                                        Linda Stanley, Toronto<br>
+                                                        Alan Jonhson, New York<br>
+														Marie Dubois, Paris
+                                                    </code>
 												</div>
 											</div>
 											<div class="col-md-6">
@@ -389,4 +386,4 @@ <h1 class="text-center brand-block">
 	</script>
 </body>
 
-</html>
+</html>
diff --git a/run.sh b/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 export COMPOSE_PROJECT_NAME=mustache
-export MUSTACHE_WORKSPACE=/home/csaba/Documents/datasets
+export MUSTACHE_WORKSPACE=/home/toni/workspace
 docker-compose up -d
 sleep 3
 xdg-open http://127.0.0.01:5000