Merge pull request #46 from spectresystems/feature/semantic-ui

Rewrite the UI

.gitignore

@@ -3,4 +3,5 @@
 **/*.rs.bk
 
 # Configuration
-config.json
+config.json
+data/

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "duck"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Patrik Svensson <patrik@patriksvensson.se>"]
 edition = "2018"
 license = "MIT"

Dockerfile

@@ -8,11 +8,13 @@ RUN cargo build --release --target x86_64-unknown-linux-musl --features docker
 
 # Build frontend
 FROM node:lts-alpine as frontend-builder
+ARG VERSION=0.1.0
 WORKDIR /app
 ENV VUE_APP_MY_DUCK_SERVER=
 COPY ./web/package*.json ./
 RUN npm install
 COPY ./web .
+RUN sed -i -e "/version/ s/[[:digit:]].[[:digit:]].[[:digit:]]/$VERSION/" package.json
 RUN npm run build
 
 # Copy to Alpine container

build.sh

@@ -2,8 +2,9 @@
 for i in "$@"; do
   case "$1" in
     -d | --docker ) DOCKER=true ;;
-    -d | --schema ) SCHEMA=true ;;
+    -s | --schema ) SCHEMA=true ;;
     -v | --version) VERSION="$2"; shift ;;
+    -u | --update) UPDATE=true ;;
     * ) break ;;
   esac
   shift
@@ -19,6 +20,17 @@ if [ $SCHEMA ]; then
   fi
 fi
 
+# Update versions?
+if [ $UPDATE ]; then
+  if [ ! -z $VERSION ]; then
+    sed -i -e "/version/ s/[[:digit:]].[[:digit:]].[[:digit:]]/$VERSION/" Cargo.toml
+    sed -i -e "/version/ s/[[:digit:]].[[:digit:]].[[:digit:]]/$VERSION/" web/package.json
+  else
+    echo "You must specify a version using the --version option."
+    exit -1;
+  fi
+fi
+
 # Build Docker image?
 if [ $DOCKER ]; then
     docker build -t "duckhq/duck:latest" \