Merge branches

State.ts

@@ -22,7 +22,7 @@ export class State {
     // The singleton of the global state
     public static state: State;
     
-    public static vNumber = "0.0.8b";
+    public static vNumber = "0.0.8c";
     
     // The user journey states thresholds when a new feature gets unlocked
     public static userJourney = {

deploy.sh

@@ -1,19 +1,13 @@
 #! /bin/bash
 
 mkdir -p assets/generated
-ts-node createLayouts.ts
+ts-node createLayouts.ts || { echo 'Creating layouts failed' ; exit 1; }
 find -name '*.png' | parallel optipng '{}'
-npm run build
+npm run build || { echo 'Npm build failed' ; exit 1; }
 
-if [[ $1 == "production" ]]
+if [[ $1 == "groen" ]]
 then
-    echo "DEPLOYING TO PRODUCTION!"
-    rm -rf /home/pietervdvn/git/pietervdvn.github.io/MapComplete/*
-    cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/MapComplete/
-    cd /home/pietervdvn/git/pietervdvn.github.io/MapComplete/
-elif [[ $1 == "groen" ]]
-then
-    echo "DEPLOYING TO BUURTNATUUR"
+    echo "DEPLOYING TO BUURTNATUUR!"
     mv /home/pietervdvn/git/buurtnatuur.github.io/CNAME /home/pietervdvn/git/
     mv /home/pietervdvn/git/buurtnatuur.github.io/.git /home/pietervdvn/git/
     rm -rf /home/pietervdvn/git/buurtnatuur.github.io/*
@@ -21,6 +15,12 @@ then
     mv /home/pietervdvn/git/CNAME /home/pietervdvn/git/buurtnatuur.github.io/
     mv /home/pietervdvn/git/.git /home/pietervdvn/git/buurtnatuur.github.io/
     cd /home/pietervdvn/git/buurtnatuur.github.io/
+elif [[ $1 == "production" ]]
+then
+    echo "DEPLOYING TO MAPCOMPLETE"
+    rm -rf /home/pietervdvn/git/pietervdvn.github.io/MapComplete/*
+    cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/MapComplete/
+    cd /home/pietervdvn/git/pietervdvn.github.io/MapComplete/
 else
     echo "Testversion deploy"
     rm -rf /home/pietervdvn/git/pietervdvn.github.io/Staging/*

index.ts

@@ -101,7 +101,7 @@ if (layoutFromBase64.startsWith("wiki:")) {
                 throw e;
             }
         },
-    }).fail(e => {
+    }).fail(() => {
         new FixedUiElement(`<a href="${cleanUrl}">${themeName}</a> is invalid:<br/>Could not download - wrong URL?`)
             .SetClass("clickable")
             .AttachTo("centermessage");