midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branches

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-09-20 19:14:01 +02:00
commit 71e4038f69
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
State.ts
View file

@ -22,7 +22,7 @@ export class State {
// The singleton of the global state // The singleton of the global state
public static state: 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 // The user journey states thresholds when a new feature gets unlocked
public static userJourney = { public static userJourney = {

20
deploy.sh
View file

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

2
index.ts
View file

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