diff --git a/Dockerfile b/Dockerfile index 36253a7..09cdaa5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,9 +9,7 @@ COPY package.json $HOME/ WORKDIR $HOME -RUN apk add --no-cache make gcc g++ python && \ - npm install && \ - apk del make gcc g++ python +RUN npm install COPY app $HOME/app COPY public $HOME/public @@ -30,9 +28,7 @@ COPY config.json package.json $HOME/ WORKDIR $HOME -RUN apk add --no-cache make gcc g++ python && \ - npm install --production && \ - apk del make gcc g++ python +RUN npm install --production COPY --from=build /app/public $HOME/public diff --git a/app/styl/main.styl b/app/styl/main.styl index ba78a36..9544e92 100644 --- a/app/styl/main.styl +++ b/app/styl/main.styl @@ -28,7 +28,7 @@ header { flex-grow: 2; text-indent: -9999px; padding-top: 96%; - background: url('./assets/logo.png') center no-repeat transparent; + background: url('./assets/logo.svg') center no-repeat transparent; background-size: contain; max-width: 400px; } diff --git a/package.json b/package.json index c8939f0..fe3f123 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "main": "index.js", "scripts": { "build": "npm run build:styl && npm run build:js", - "build:js": "browserify app/main.js -o public/main.js --debug", - "build:styl": "stylus -m app/styl/main.styl --out public", + "build:js": "browserify app/main.js | uglifyjs --comments -o public/main.js", + "build:styl": "stylus app/styl/main.styl -c --out public", "dev": "run-p watch:js watch:styl start", "dev:run": "npm install && npm run dev", "docker": "docker run -it --rm --name nfpis -p 3000:3000 -v \"$PWD\":/usr/src/app -w /usr/src/app node:slim", @@ -32,9 +32,10 @@ "mithril": "^1.1.6", "npm-run-all": "^4.1.3", "stylus": "^0.54.5", + "uglify-es": "^3.3.9", "watchify": "^3.11.0" }, "dependencies": { - "spserver": "^0.2.0" + "spserver": "^0.3.0" } } diff --git a/public/assets/fonts/Roboto-Black.ttf b/public/assets/fonts/Roboto-Black.ttf deleted file mode 100755 index 689fe5c..0000000 Binary files a/public/assets/fonts/Roboto-Black.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-BlackItalic.ttf b/public/assets/fonts/Roboto-BlackItalic.ttf deleted file mode 100755 index 0b4e0ee..0000000 Binary files a/public/assets/fonts/Roboto-BlackItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-Bold.ttf b/public/assets/fonts/Roboto-Bold.ttf deleted file mode 100755 index d3f01ad..0000000 Binary files a/public/assets/fonts/Roboto-Bold.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-BoldItalic.ttf b/public/assets/fonts/Roboto-BoldItalic.ttf deleted file mode 100755 index 41cc1e7..0000000 Binary files a/public/assets/fonts/Roboto-BoldItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-Italic.ttf b/public/assets/fonts/Roboto-Italic.ttf deleted file mode 100755 index 6a1cee5..0000000 Binary files a/public/assets/fonts/Roboto-Italic.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-Light.ttf b/public/assets/fonts/Roboto-Light.ttf deleted file mode 100755 index 219063a..0000000 Binary files a/public/assets/fonts/Roboto-Light.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-LightItalic.ttf b/public/assets/fonts/Roboto-LightItalic.ttf deleted file mode 100755 index 0e81e87..0000000 Binary files a/public/assets/fonts/Roboto-LightItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-Medium.ttf b/public/assets/fonts/Roboto-Medium.ttf deleted file mode 100755 index 1a7f3b0..0000000 Binary files a/public/assets/fonts/Roboto-Medium.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-MediumItalic.ttf b/public/assets/fonts/Roboto-MediumItalic.ttf deleted file mode 100755 index 0030295..0000000 Binary files a/public/assets/fonts/Roboto-MediumItalic.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-Thin.ttf b/public/assets/fonts/Roboto-Thin.ttf deleted file mode 100755 index b74a4fd..0000000 Binary files a/public/assets/fonts/Roboto-Thin.ttf and /dev/null differ diff --git a/public/assets/fonts/Roboto-ThinItalic.ttf b/public/assets/fonts/Roboto-ThinItalic.ttf deleted file mode 100755 index dd0ddb8..0000000 Binary files a/public/assets/fonts/Roboto-ThinItalic.ttf and /dev/null differ diff --git a/public/assets/logo.png b/public/assets/logo.png deleted file mode 100644 index 47916b0..0000000 Binary files a/public/assets/logo.png and /dev/null differ diff --git a/public/assets/logo.svg b/public/assets/logo.svg index 42cd059..87ed05d 100644 --- a/public/assets/logo.svg +++ b/public/assets/logo.svg @@ -1,120 +1 @@ - -image/svg+xml \ No newline at end of file + \ No newline at end of file diff --git a/public/assets/logo_only.png b/public/assets/logo_only.png deleted file mode 100644 index 42ff032..0000000 Binary files a/public/assets/logo_only.png and /dev/null differ diff --git a/public/assets/og-image.jpg b/public/assets/og-image.jpg deleted file mode 100644 index f3f7862..0000000 Binary files a/public/assets/og-image.jpg and /dev/null differ diff --git a/public/assets/stjornarradid.svg b/public/assets/stjornarradid.svg index 2f8029f..4e38ed5 100644 --- a/public/assets/stjornarradid.svg +++ b/public/assets/stjornarradid.svg @@ -1,511 +1 @@ - - - - skjaldamerkid (2) - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +skjaldamerkid (2) \ No newline at end of file