Wikidocumentaries · jgyfutub · Jun 14, 2021 · Jun 28, 2021 · Jul 1, 2021 · Jul 5, 2021
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+node_modules
+npm-debug.log*
+.git
+*~
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,40 @@
+---
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          install: true
+      -
+        name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Determine metadata for DockerHub
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ secrets.DOCKERHUB_USERNAME || 'local' }}/wikidocumentaries-ui
+          flavor: |
+            latest=${{ github.ref == 'refs/heads/master' }}
+      -
+        name: Build and push to DockerHub
+        uses: docker/build-push-action@v2
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/CREDITS b/CREDITS
@@ -7,3 +7,4 @@ following names for their contribution to the product.
 * Susanna Ånäs
 * Niklas Laxström
 * Tuukka Hastrup
+* Mikko Rinne
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,14 @@
+# build stage
+FROM node:8.16-alpine as build-stage
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build
+
+# production stage
+FROM nginx:stable-alpine as production-stage
+COPY --from=build-stage /app/dist /usr/share/nginx/html
+COPY docker/nginx-default.conf /etc/nginx/conf.d/default.conf
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 > Basic page template for the Wikidocumentaries UI
 
-For more info, see the project page: https://wikidocumentaries.wmflabs.org
+For more info, see the project page: https://wikidocumentaries.wmcloud.org
 
 
 ## Build Setup
@@ -14,6 +14,10 @@ npm install
 # serve with hot reload at localhost:8080
 npm run dev
 
+# serve with hot reload at localhost:8080
+# and use a local wikidocumentaries-api instead of the production one
+API_URL=http://localhost:3000/ npm run dev
+
 # build for production with minification
 npm run build
 

diff --git a/config/prod.env.js b/config/prod.env.js
@@ -1,4 +1,6 @@
 'use strict'
+process = require('process');
 module.exports = {
-  NODE_ENV: '"production"'
-}
+  NODE_ENV: '"production"',
+  API_URL: JSON.stringify(process.env.API_URL)
+};
diff --git a/docker/nginx-default.conf b/docker/nginx-default.conf
@@ -0,0 +1,29 @@
+server {
+  listen 80 default_server;
+  listen [::]:80 default_server;
+  server_name localhost;
+
+  root /usr/share/nginx/html;
+  index index.html;
+
+  location / {
+    try_files $uri $uri/ @rewrites;
+  }
+
+  location @rewrites {
+    rewrite ^(.+)$ /index.html last;
+  }
+
+  # Some basic cache-control for static files to be sent to the browser
+  location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
+    expires max;
+    add_header Pragma public;
+    add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+  }
+
+  # Redirect server error pages to the static page /50x.html
+  error_page   500 502 503 504  /50x.html;
+  location = /50x.html {
+    root   /usr/share/nginx/html;
+  }
+}
diff --git a/index.html b/index.html
@@ -3,9 +3,12 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <meta name="google-site-verification" content="Hzrt7jfmWPYpMOSR12msYCvqxiUuNjrHQiFzRUfZx1s">
     <link href="https://fonts.googleapis.com/css?family=Barlow|Barlow+Condensed" rel="stylesheet">
     <link href="/static/wikifont/wikiglyphs.css" rel="stylesheet">
     <link href="/static/flag-icon-css/css/flag-icon.min.css" rel="stylesheet">
+    <link href='https://api.mapbox.com/mapbox-gl-js/v1.10.1/mapbox-gl.css' rel='stylesheet' />
+    <link rel="icon" href="static/favicon.ico">
     <title>Wikidocumentaries</title>
   </head>
   <body>