Merge branch 'develop' into 'master'

Develop

Closes #87

See merge request vtmk/web2.0!99

.deploy_dev.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+echo "Deploying to development."
+set -e
+set -x
+
+pushd deployment
+
+docker-compose down
+docker pull "$1"
+docker-compose up -d
+
+popd
+
+set +x
+set +e

.gitlab-ci.yml

@@ -76,7 +76,8 @@ deploy_dev:
         - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
     script:
         - scp docker-compose.yml $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/docker-compose.yml
-        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "cd deployment && docker-compose down && docker pull \"$IMAGE_NAME\" && docker-compose up -d && docker image prune -f"
+        - scp .deploy_dev.sh $DEV_SSH_USER@$DEV_SSH_HOST:~/deployment/deploy_dev.sh
+        - ssh $DEV_SSH_USER@$DEV_SSH_HOST "bash ~/deployment/deploy_dev.sh \"$IMAGE_NAME\""
 
 deploy_production:
     stage: deploy

coffee_scale/static/js/coffee.js

@@ -36,12 +36,30 @@ function onConnect() {
 // data update and parse functions
 function parseCups(ev){
     var cups = parseFloat(ev.detail).toFixed(1)
-    var cupsEvent = new CustomEvent("cupsChanged", {'detail': cups});
-    window.dispatchEvent(cupsEvent);
+
+    function makeEvent(cups) {
+        return (String(cups) !== '-1.0')
+            ? new CustomEvent("cupsChanged", {'detail': cups})
+            : new CustomEvent("cupsError", {'detail': 'Error: unable to fetch cups :('});
+    }
+    
+    window.dispatchEvent(makeEvent(cups));
 }
 function updateCups(ev){
     $("#text").text(ev.detail);
 }
+function showCupsError(ev) {
+    $('#text').text(ev.detail);
+    $('#text').css({
+        'font-size': '7vh',
+        'left': '0',
+        'top': '40%',
+        'width': '100%',
+        'text-align': 'center',
+        'color': 'red',
+    });
+    $('#lower').css({'background-image': 'none'});
+}
 function updateScale(ev){
      $("#scale2").css({width: Math.min(ev.detail/9*100,100) + '%'});
 }
@@ -72,7 +90,6 @@ function brewAnimStart(){
     $(".text").addClass("brewing");
     $(".layerone").hide();
     $(".layertwo").show();
-
 }
 function brewAnimEnd(){
     $(".text").removeClass("brewing");
@@ -145,6 +162,11 @@ $(document).ready(function(){
  window.addEventListener("cupsChanged", coffeeLowEffect);
  window.addEventListener("cupsChanged", updateScale);
  window.addEventListener("cupsChanged", resize);
+
+ window.addEventListener("cupsError", showCupsError);
+ window.addEventListener("cupsError", coffeeLowEffect);
+ window.addEventListener("cupsError", updateScale);
+
  window.addEventListener("brewStart", brewAnimStart);
  window.addEventListener("brewEnd", brewAnimEnd);
  window.addEventListener("brewEnd", coffeeReadyEffect);

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: postgres
   web:
     build: .
-    image: 86.50.143.82:5000/web20
+    image: git.sahkoinsinoorikilta.fi:4567/vtmk/web2.0
     command: ["bash", "-c", "cd /code && ./wait-for-it.sh db:5432 -- bash setup.sh --no-input --no-npm && python manage.py runserver 0.0.0.0:8080"]
     ports:
       - "8080:8080"