Development (#108)

* MM-219 (#88)

* MM-155 Change Travis configuration to build and push images from environment branches (#56)

* removed package-lock

* mapillary implemented

* style fix

* fixed clearing markers and viewer

Co-authored-by: Petteri Pesonen <[email protected]>

* fixes and improvements to mapillaryView

* ortho tilelayer added and tilelayer control button

* implementation for restrooms

* MM-275: Move to Github Actions, clean old scripts

* Remove unused files

* MM-286: Tulostusmahdollisuus kuljettajaohjeisiin (#99)

* MM-286 - Tulostusmahdollisuus kuljettajaohjeisiin

* Add timing stop symbol to printable stoplist

* Tweak timingStopIcon draw logic

* MM-326 Change build trigger to push

Add also build for stage

* Change from serve to nginx to make things cleaner

* Revert "Change from serve to nginx to make things cleaner"

This reverts commit 0686cc5.

* MM-295/MM-313 - mobileview and mapillary fix (#97)

* travis configs removed

* mobileview added

* removed comments, fixed parameter

* mapillary version update

* mapillary toggle logic changed, added organization_id

* tokens removed

* better bbox with turf

* fix restrooms

* Use v2-map source and blurry maps on retina displays

* better mapillary search and restroom svg updated (#103)

* Add fix to printing mode toggle styling (#100)

* restrooms filtered by mode

* Fix print button position (#107)

* commented printing

Co-authored-by: Petteri Pesonen <[email protected]>
Co-authored-by: Juho Hänninen <[email protected]>
Co-authored-by: Erkki Halinen <[email protected]>
Co-authored-by: e-halinen <[email protected]>

.env

@@ -1,3 +1,6 @@
 REACT_APP_GRAPHQL_URL=https://dev.kartat.hsl.fi/jore/graphql
 REACT_APP_ROOT_PATH=/
 PORT=3000
+
+REACT_APP_MAPILLARY_CLIENT_TOKEN=MLY|4594581980627542|90daa882085f792338099ff89cf390b5
+

.env.dev

@@ -1,3 +1,6 @@
 REACT_APP_GRAPHQL_URL=https://dev.kartat.hsl.fi/jore/graphql
 REACT_APP_ROOT_PATH=/kuljettaja
 PORT=3000
+
+REACT_APP_MAPILLARY_CLIENT_TOKEN=MLY|4652630561442946|5b644eb16efdd0e808abf5fd87f82d77
+

.env.production → .env.prod

@@ -1,3 +1,5 @@
 REACT_APP_GRAPHQL_URL=https://kartat.hsl.fi/jore/graphql
 REACT_APP_ROOT_PATH=/kuljettaja
 PORT=3000
+
+REACT_APP_MAPILLARY_CLIENT_TOKEN=MLY|4843379739113529|30a747d7fcf21f81f293958597d2ae7c

.env.stage

@@ -1,3 +1,5 @@
 REACT_APP_GRAPHQL_URL=https://stage.kartat.hsl.fi/jore/graphql
 REACT_APP_ROOT_PATH=/kuljettaja
 PORT=3000
+
+REACT_APP_MAPILLARY_CLIENT_TOKEN=

.github/workflows/buildAndPublish_dev.yml

@@ -0,0 +1,51 @@
+name: Build and publish Docker Hub dev image
+
+on:
+  push:
+    branches:
+      - 'development'
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.KARTAT_DOCKERHUB_USER }}
+          password: ${{ secrets.KARTAT_DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: hsldevcom/hsl-map-web-ui
+
+      - name: Get commit hash
+        id: commit_hash
+        run: echo "::set-output name=hash::$(git rev-parse --short "$GITHUB_SHA")"
+
+      - name: Get image timestamp
+        id: timestamp
+        run: echo "::set-output name=timestamp::$(date +'%Y-%m-%d')"
+
+      - name: Build and push timestamped tag
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ format('hsldevcom/hsl-map-web-ui:dev-{0}-{1}', steps.timestamp.outputs.timestamp, steps.commit_hash.outputs.hash) }}
+          build-args: |
+            BUILD_ENV=dev
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: hsldevcom/hsl-map-web-ui:dev
+          build-args: |
+            BUILD_ENV=dev

.github/workflows/buildAndPublish_prod.yml

@@ -0,0 +1,51 @@
+name: Build and publish Docker Hub prod image
+
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.KARTAT_DOCKERHUB_USER }}
+          password: ${{ secrets.KARTAT_DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: hsldevcom/hsl-map-web-ui
+
+      - name: Get commit hash
+        id: commit_hash
+        run: echo "::set-output name=hash::$(git rev-parse --short "$GITHUB_SHA")"
+
+      - name: Get image timestamp
+        id: timestamp
+        run: echo "::set-output name=timestamp::$(date +'%Y-%m-%d')"
+
+      - name: Build and push timestamped tag
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: ${{ github.event_name == 'push' }}
+          tags: ${{ format('hsldevcom/hsl-map-web-ui:prod-{0}-{1}', steps.timestamp.outputs.timestamp, steps.commit_hash.outputs.hash) }}
+          build-args: |
+            BUILD_ENV=prod
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: ${{ github.event_name == 'push' }}
+          tags: hsldevcom/hsl-map-web-ui:prod
+          build-args: |
+            BUILD_ENV=prod

.github/workflows/buildAndPublish_stage.yml

@@ -0,0 +1,51 @@
+name: Build and publish Docker Hub stage image
+
+on:
+  push:
+    branches:
+      - 'stage'
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.KARTAT_DOCKERHUB_USER }}
+          password: ${{ secrets.KARTAT_DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: hsldevcom/hsl-map-web-ui
+
+      - name: Get commit hash
+        id: commit_hash
+        run: echo "::set-output name=hash::$(git rev-parse --short "$GITHUB_SHA")"
+
+      - name: Get image timestamp
+        id: timestamp
+        run: echo "::set-output name=timestamp::$(date +'%Y-%m-%d')"
+
+      - name: Build and push timestamped tag
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: ${{ format('hsldevcom/hsl-map-web-ui:stage-{0}-{1}', steps.timestamp.outputs.timestamp, steps.commit_hash.outputs.hash) }}
+          build-args: |
+            BUILD_ENV=stage
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: hsldevcom/hsl-map-web-ui:stage
+          build-args: |
+            BUILD_ENV=stage

.github/workflows/buildOnPullRequest.yml

@@ -0,0 +1,21 @@
+name: Build image
+
+on:
+  pull_request:
+    branches-ignore:
+      - 'master'
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          tags: hsldevcom/hsl-map-web-ui:dev
+          build-args: |
+            BUILD_ENV=dev

Dockerfile

@@ -14,7 +14,7 @@ RUN yarn
 # Bundle app source
 COPY . ${WORK}
 
-ARG BUILD_ENV=production
+ARG BUILD_ENV=prod
 COPY .env.${BUILD_ENV} ${WORK}/.env.production
 
 RUN yarn build

package.json

@@ -4,6 +4,7 @@
   "private": true,
   "homepage": "/kuljettaja",
   "dependencies": {
+    "@turf/turf": "^6.5.0",
     "apollo-cache-inmemory": "^1.6.2",
     "apollo-client": "^2.6.3",
     "apollo-fetch": "^0.7.0",
@@ -14,8 +15,9 @@
     "forever": "^1.0.0",
     "graphql": "^14.6.0",
     "graphql-tag": "^2.10.1",
-    "leaflet": "^1.5.1",
+    "leaflet": "^1.6.0",
     "lodash": "^4.17.11",
+    "mapillary-js": "^4.0.0",
     "material-ui": "^0.20.2",
     "mobx": "^5.15.4",
     "mobx-react": "^6.2.2",