From d9ca888c288b14592462e586ace4099ffbfa6db2 Mon Sep 17 00:00:00 2001 From: Jakob Stendahl Date: Sat, 6 Feb 2021 19:51:13 +0100 Subject: Add title, version to app, add deploy-script 1.1.0 1.1.1 1.1.2 Work on deployscript Try to fix sed Add x to deploy Fix sed Add gitignore Version test 1.0.1 test 1.1.0 1.1.1 test --- deploy.sh | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 2 +- package.json | 2 +- src/deploy.sh | 0 src/index.html | 5 ++++- src/scss/styles.scss | 19 ++++++++++++---- 6 files changed, 84 insertions(+), 7 deletions(-) create mode 100755 deploy.sh create mode 100644 src/deploy.sh diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..5a8bd10 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,63 @@ +#!/bin/bash + +if output=$(git status --porcelain) && [ -z "$output" ]; then + echo "Git working directory is clean." +else + echo "Git working directory is not clean..." + exit 1 +fi + +tput setaf 4 +echo "> Bump version number" +tput sgr0 + +if [ $# -gt 0 ]; then + npm version "$1" || exit 1; +else + npm version patch || exit 1; +fi + +VERSION=$(cat package.json \ + | grep version \ + | head -1 \ + | awk -F: '{ print $2 }' \ + | sed 's/[",]//g' \ + | tr -d '[[:space:]]') +echo "Deploying for tag: $VERSION." + +tput setaf 4 +echo "> Build app" +tput sgr0 + +rm -r dist/ +npm install +npm run build + + + +tput setaf 4 +echo "> Copy to gh-pages branch and commit" +tput sgr0 + +cp .gitignore dist/.gitignore +git checkout gh-pages || git checkout --orphan gh-pages +git rm -rf . + +cp dist/.gitignore .gitignore +cp -r dist/* . + +sed -i".bak" "s/{{ VERSION }}/$VERSION/g" index.html +rm index.html.bak + +git add . +git commit -m ":rocket: Deploy app v$VERSION" + + +tput setaf 4 +echo "> Return to controller branch and tag last commit" +tput sgr0 + +git checkout controller + +#git push --follow-tags origin controller +#git push origin gh-pages diff --git a/package-lock.json b/package-lock.json index 0c1e3da..e864c21 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "hoverbit-ble-controller", - "version": "1.0.0", + "version": "1.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 46844e7..d148a2f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hoverbit-ble-controller", - "version": "1.0.0", + "version": "1.1.1", "description": "", "license": "MIT", "scripts": { diff --git a/src/deploy.sh b/src/deploy.sh new file mode 100644 index 0000000..e69de29 diff --git a/src/index.html b/src/index.html index fb23d7e..9f76b6f 100644 --- a/src/index.html +++ b/src/index.html @@ -15,7 +15,10 @@ - +

HOVER:BIT Controller

+ {{ VERSION }} +

diff --git a/src/scss/styles.scss b/src/scss/styles.scss index b72acef..e4869ff 100644 --- a/src/scss/styles.scss +++ b/src/scss/styles.scss @@ -28,10 +28,21 @@ body { color: $foreground-base; } -h1 { - font-size: 10px; - margin: 0; - color: $foreground-base; +.app-info { + position: absolute; + top: 15px; + left: 10px; + left: max(env(safe-area-inset-left, 10px), 10px); + + h1 { + font-size: 14px; + margin: 0; + color: $foreground-base; + } + .version { + display: block; + font-size: 9px; + } } .statusline { -- cgit v1.2.3