Skip to content

Commit

Permalink
Rewrite the UI
Browse files Browse the repository at this point in the history
The UI started to become difficult to maintain and I
didn't like all the functionality and how it was
implemented. This commit also swaps out Bootstrap
in favor of using Semantic UI.
  • Loading branch information
patriksvensson committed Feb 20, 2020
1 parent 969dd3b commit 509fc65
Show file tree
Hide file tree
Showing 29 changed files with 2,572 additions and 2,371 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
**/*.rs.bk

# Configuration
config.json
config.json
data/
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 13 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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" \
Expand Down
72 changes: 72 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added web/output.js
Binary file not shown.
Loading

0 comments on commit 509fc65

Please sign in to comment.