Release 2.10.0

Sort device location history entries by timestamp
Fixes #67.
2026-02-17 21:19:50 +00:00 · 2021-11-28 18:04:58 +00:00 · 2021-11-28 17:52:28 +00:00 · 2021-11-28 17:33:32 +00:00 · 2021-11-28 17:33:08 +00:00 · 2021-11-28 17:31:55 +00:00
47 changed files with 4102 additions and 4447 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,14 @@
+name: Build
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: yarn install
+      - run: yarn build
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,79 @@
+name: Build Docker images
+
+on:
+  schedule:
+    - cron: '0 3 * * *' # everyday at 3am
+  pull_request:
+    branches: main
+  push:
+    branches: main
+    tags:
+      - v*
+  release:
+    types: [published]
+    branches: main
+    tags:
+      - v*
+
+jobs:
+  build-docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Prepare
+        id: prepare
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        run: |
+          DOCKER_IMAGE=owntracks/frontend
+          DOCKER_PLATFORMS=linux/amd64,linux/arm/v7,linux/arm64
+          VERSION=main
+
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+          fi
+          if [ "${{ github.event_name }}" = "schedule" ]; then
+            VERSION=nightly
+          fi
+
+          TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
+          if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
+            TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
+          fi
+
+          echo ::set-output name=docker_image::${DOCKER_IMAGE}
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
+            --build-arg VERSION=${VERSION} \
+            --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
+            --build-arg VCS_REF=${GITHUB_SHA::8} \
+            ${TAGS} --file ./docker/Dockerfile .
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Docker Buildx (build)
+        run: |
+          docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
+      - name: Docker Login
+        if: success() && github.event_name != 'pull_request'
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+      - name: Docker Buildx (push)
+        if: success() && github.event_name != 'pull_request'
+        run: |
+          docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
+      - name: Docker Check Manifest
+        if: always() && github.event_name != 'pull_request'
+        run: |
+          docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
+      - name: Clear
+        if: always() && github.event_name != 'pull_request'
+        run: |
+          rm -f ${HOME}/.docker/config.json
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -0,0 +1,16 @@
+name: Lint
+
+on: [push]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: yarn install
+      - run: yarn lint:js
+      - run: yarn lint:md
+      - run: yarn lint:scss
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -0,0 +1,14 @@
+name: Tests
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - run: yarn install
+      - run: yarn test
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +0,0 @@
-language: node_js
-node_js:
-  - 10
-cache: yarn
-script:
-  - yarn lint:js
-  - yarn lint:md
-  - yarn test
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,58 @@

 Dates are in UTC.

+## 2.10.0 (2021-11-28)
+
+- Ensure location history line segments are drawn in chronological order ([#67](https://github.com/owntracks/frontend/issues/67))
+- Add trailing slashes to paths used by Docker nginx config ([#63](https://github.com/owntracks/frontend/pull/63), [@growse](https://github.com/growse))
+- Upgrade dependencies
+
+## 2.9.0 (2021-05-01)
+
+- Add a cancel button to the loading data modal
+- Replace remaining uses of "OwnTracks UI" with "OwnTracks Frontend"
+- Upgrade dependencies
+
+## 2.8.0 (2021-02-19)
+
+- Add elevation gain / loss to "distance travelled" calculation ([#51](https://github.com/owntracks/frontend/issues/51))
+
+## 2.7.0 (2021-02-14)
+
+- Rename translation files from `xx` to `xx-XX` format to allow different language variants
+- Separate `en` translations into British English (`en-GB`) and American English (`en-US`, default)
+- Add French translations ([#49](https://github.com/owntracks/frontend/pull/49), [@Elu43](https://github.com/Elu43))
+- Update Docker image to use Node 14 and nginx 1.18
+- Upgrade dependencies
+
+## 2.6.0 (2020-12-29)
+
+- Add `router.basePath` config option for non-webroot deployments
+- Configure Vue to not assume it's on the web root ([#47](https://github.com/owntracks/frontend/pull/47), [@growse](https://github.com/growse))
+- Update Docker NGINX config to listen on IPv6 as well ([#46](https://github.com/owntracks/frontend/pull/46), [@growse](https://github.com/growse))
+- Upgrade dependencies
+
+## 2.5.1 (2020-10-27)
+
+- Fix incorrect handling of `api.baseUrl` with trailing slash ([#44](https://github.com/owntracks/frontend/pull/44), [@karmanyaahm](https://github.com/karmanyaahm))
+- Upgrade dependencies
+
+## 2.5.0 (2020-09-07)
+
+- Add `filters.fitView` config option - this will prevent the map from re-fitting automatically by default when a live location changes ([#41](https://github.com/owntracks/frontend/issues/41))
+- Show regions for location on popup
+- Fix vertical offset of non-pin popups
+- Build Docker images for multiple architectures (linux/amd64, linux/arm/v7, linux/arm64) using GitHub Actions ([#38](https://github.com/owntracks/frontend/pull/38), [@wollew](https://github.com/wollew))
+- Replace Travis CI with GitHub Actions build/lint/test workflows ([#39](https://github.com/owntracks/frontend/pull/39))
+- Replace node-sass with sass (dart-sass)
+- Upgrade dependencies
+
+## 2.4.0 (2020-06-01)
+
+- Add `filters.minAccuracy` config option - this allows ignoring location points which do
+  not meet the configured accuracy requirement ([#35](https://github.com/owntracks/frontend/issues/35))
+- Upgrade dependencies
+
 ## 2.3.1 (2020-05-09)

 - Fix linting issue in `config.md`
--- a/README.md
+++ b/README.md
@@ -1,11 +1,14 @@
-# OwnTracks UI
+# OwnTracks Frontend

 ![Version](https://img.shields.io/github/package-json/v/owntracks/frontend)
 [![Docker Pulls](https://img.shields.io/docker/pulls/owntracks/frontend)](https://hub.docker.com/r/owntracks/frontend)
-[![Build Status](https://travis-ci.org/owntracks/frontend.svg?branch=master)](https://travis-ci.org/owntracks/frontend)
-[![License](https://img.shields.io/github/license/owntracks/frontend?color=d63e97)](https://github.com/owntracks/frontend/blob/master/LICENSE)
+[![Build](https://github.com/owntracks/frontend/workflows/Build/badge.svg)](https://github.com/owntracks/frontend/actions?query=workflow%3ABuild+branch%3Amain)
+[![Tests](https://github.com/owntracks/frontend/workflows/Tests/badge.svg)](https://github.com/owntracks/frontend/actions?query=workflow%3ATests+branch%3Amain)
+[![Lint](https://github.com/owntracks/frontend/workflows/Lint/badge.svg)](https://github.com/owntracks/frontend/actions?query=workflow%3ALint+branch%3Amain)
+[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
+[![License](https://img.shields.io/github/license/owntracks/frontend?color=d63e97)](https://github.com/owntracks/frontend/blob/main/LICENSE)

-![OwnTracks UI](https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/owntracks-ui.png)
+![Screenshot](https://raw.githubusercontent.com/owntracks/frontend/main/docs/images/screenshot.png)

 ## Introduction

@@ -13,20 +16,21 @@ This is a web interface for [OwnTracks](https://github.com/owntracks/recorder) b
 a Vue.js single page application. The recorder itself already ships with some basic web
 pages, this is a more advanced interface with more functionality, all in one place.

-![Map features](https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/map-features.png)
+![Map features](https://raw.githubusercontent.com/owntracks/frontend/main/docs/images/map-features.png)

 ## Features

 - Last known (i.e. live) locations:
  - Accuracy visualization (circle)
  - Device friendly name and icon
-  - Detailed information (if available): time, latitude, longitude, height, battery and
-    speed
+  - Detailed information (if available): time, latitude, longitude, height, battery,
+    speed and regions
 - Location history (data points, line or both)
 - Location heatmap
 - Quickly fit all shown objects on the map into view
- Display data in a specific date range
- Filter by user and device
+- Display data in a specific date and time range
+- Filter by user or specific device
+- Calculation of distance travelled
 - Download selected location data as JSON
 - Highly customisable

@@ -49,7 +53,7 @@ compose config, and the service is named `otrecorder`):
 version: "3"

 services:
-  owntracks-ui:
+  owntracks-frontend:
    image: owntracks/frontend
    ports:
      - 80:80
@@ -97,8 +101,10 @@ See [`docs/config.md`](docs/config.md) for all available options.
 - Run `yarn serve` to compile for development and start the hot-reload server
 - Run `yarn lint:js` to lint JavaScript/Vue files
 - Run `yarn lint:md` to lint Markdown files
+- Run `yarn lint:scss` to lint SCSS files
 - Run `yarn format:js` to format JavaScript/Vue files
 - Run `yarn format:md` to format Markdown files
+- Run `yarn format:scss` to format SCSS files
 - Run `yarn test` to run unit tests

 ### CORS-Proxy
@@ -138,24 +144,12 @@ unused i18n entries, run:
 $ yarn i18n:report
 ```

-To add a new locale, copy `en.json` to `<locale>.json` in [`src/locales`](src/locales)
+To add a new locale, copy `en-US.json` to `<locale>.json` in [`src/locales`](src/locales)
 and start translating the individual strings. Make sure to [mention the new locale to the docs](docs/config.md#locale)!

 For a specific example see commit [`b2edda4`](https://github.com/owntracks/frontend/commit/b2edda410f16633aa6fd9cd4e5250f2031536c7d)
 where German translations were added.

-## Screenshots
-
-<p align="center">
-  <img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/loading.gif" alt="Loading...">
-  <br>
-  <br>
-  <img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/downloader.png" alt="Download location data">
-  <br>
-  <br>
-  <img src="https://raw.githubusercontent.com/owntracks/frontend/master/docs/images/info.png" alt="Info">
-</p>
-
 ## Contributing

 Please feel free to open an issue and discuss your ideas and report bugs. If you think
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,13 +1,13 @@
-FROM node:10 as build
+FROM node:14 as build
 WORKDIR /usr/src/app
 COPY package.json yarn.lock ./
 RUN yarn install
 COPY . ./
 RUN yarn build

-FROM nginx:1.17-alpine
-LABEL version="2.3.1"
-LABEL description="OwnTracks UI"
+FROM nginx:1.18-alpine
+LABEL version="2.10.0"
+LABEL description="OwnTracks Frontend"
 LABEL maintainer="Linus Groh <mail@linusgroh.de>"
 ENV LISTEN_PORT=80 \
  SERVER_HOST=otrecorder \
--- a/docker/nginx.tmpl
+++ b/docker/nginx.tmpl
@@ -8,11 +8,12 @@ http {
    }
    server {
        listen ${LISTEN_PORT};
+        listen [::]:${LISTEN_PORT};        
        root /usr/share/nginx/html;
-        location /api {
+        location /api/ {
            proxy_pass http://otrecorder/api/;
        }
-        location /ws {
+        location /ws/ {
            proxy_pass http://otrecorder/ws/;
            proxy_http_version 1.1;
            proxy_set_header Upgrade $http_upgrade;
--- a/docs/config.md
+++ b/docs/config.md
@@ -26,6 +26,8 @@ window.owntracks.config = {};
  - [`baseUrl`](#apibaseurl)
  - [`fetchOptions`](#apifetchoptions)
 - [`endDateTime`](#enddatetime)
+- `filters`
+  - [`minAccuracy`](#filtersminaccuracy)
 - [`ignorePingLocation`](#ignorepinglocation)
 - [`locale`](#locale)
 - `map`
@@ -58,8 +60,11 @@ window.owntracks.config = {};
  - [`polyline`](#mappolyline)
  - [`url`](#mapurl)
 - `onLocationChange`
+  - [`fitView`](#onlocationchangefitview)
  - [`reloadHistory`](#onlocationchangereloadhistory)
 - [`primaryColor`](#primarycolor)
+- `router`
+  - [`basePath`](#routerbasepath)
 - [`selectedDevice`](#selecteddevice)
 - [`selectedUser`](#selecteduser)
 - [`showDistanceTravelled`](#showdistancetravelled)
@@ -77,16 +82,16 @@ Base URL for the recorder's HTTP and WebSocket API. Keep CORS in mind.
  // API requests will be made to https://owntracks.example.com/api/0/...
  window.owntracks.config = {
    api: {
-      baseUrl: "https://owntracks.example.com"
-    }
+      baseUrl: "https://owntracks.example.com",
+    },
  };
  ```
  ```js
  // API requests will be made to https://example.com/owntracks/api/0/...
  window.owntracks.config = {
    api: {
-      baseUrl: "https://example.com/owntracks/"
-    }
+      baseUrl: "https://example.com/owntracks/",
+    },
  };
  ```

@@ -104,9 +109,9 @@ You can use this for example to send custom HTTP headers or to include cookies i
  window.owntracks.config = {
    api: {
      fetchOptions: {
-        credentials: "include"
-      }
-    }
+        credentials: "include",
+      },
+    },
  };
  ```

@@ -120,7 +125,27 @@ Initial end date and time (browser timezone) for fetched data.
  ```js
  // Data will be fetched up to 1970-01-01
  window.owntracks.config = {
-    endDateTime: new Date(1970, 1, 1)
+    endDateTime: new Date(1970, 1, 1),
+  };
+  ```
+
+### `filters.minAccuracy`
+
+Minimum accuracy in meters for location points to be rendered & included in the travelled distance.
+
+This filter is disabled by default as accuracies can vary across devices an locations, but you're
+encouraged to set it as it can be a simple way to remove outliers and vastly improve the travelled
+distance calculation.
+
+- Type: [`Number`] or `null`
+- Default: `null`
+- Example:
+  ```js
+  // Don't include location points with an accuracy exceeding 100 meters
+  window.owntracks.config = {
+    filters: {
+      minAccuracy: 100,
+    },
  };
  ```

@@ -135,7 +160,7 @@ Remove the `ping/ping` location from the fetched data. This is useful when using
  ```js
  // Don't ignore ping/ping location. Not sure why you'd do this :)
  window.owntracks.config = {
-    ignorePingLocation: false
+    ignorePingLocation: false,
  };
  ```

@@ -146,14 +171,17 @@ formats.

 Available languages:

- `de` (German)
- `en` (English)
- `es` (Spanish)
+- `de-DE` (Standard German)
+- `en-GB` (British English)
+- `en-US` (American English)
+- `es-ES` (Castilian Spanish)
+- `fr-FR` (Standard French)

-You can use formats like `en-GB`, `en-US`, `de-DE`.
+Using a locale with non-existent translations is possible and will affect date/time formats, but
+use `en-US` for translations.

 - Type: [`String`]
- Default: `"en"`
+- Default: `"en-US"`

 ### `map.attribution`

@@ -166,8 +194,8 @@ Attribution for map tiles.
  // Make sure to add proper attribution!
  window.owntracks.config = {
    map: {
-      attribution: "Map tiles &copy; MyTileServerProvider"
-    }
+      attribution: "Map tiles &copy; MyTileServerProvider",
+    },
  };
  ```

@@ -334,8 +362,8 @@ splitting into separate lines.
  // Don't connect points with a distance of more than 1km
  window.owntracks.config = {
    map: {
-      maxPointDistance: 1000
-    }
+      maxPointDistance: 1000,
+    },
  };
  ```

@@ -375,12 +403,20 @@ and [this Wikipedia article](https://en.wikipedia.org/wiki/Tiled_web_map).
  // Use dark HDPI tiles from Mapbox
  window.owntracks.config = {
    map: {
-      url:
-        "https://api.mapbox.com/v4/mapbox.dark/{z}/{x}/{y}@2x.png?access_token=xxxxxxxxxxxxxxxx"
-    }
+      url: "https://api.mapbox.com/v4/mapbox.dark/{z}/{x}/{y}@2x.png?access_token=xxxxxxxxxxxxxxxx",
+    },
  };
  ```

+### `onLocationChange.fitView`
+
+Whether to re-fit the map's content into view or not when a location update is received.
+
+This can be useful if you're showing live locations and don't want them to "leave" the map.
+
+- Type: [`Boolean`]
+- Default: `false`
+
 ### `onLocationChange.reloadHistory`

 Whether to reload the location history (of selected date range) or not when a location
@@ -399,7 +435,23 @@ Primary color for the user interface (navigation bar and various map elements).
  ```js
  // Set the UI's primary color to 'rebeccapurple'
  window.owntracks.config = {
-    primaryColor: "rebeccapurple"
+    primaryColor: "rebeccapurple",
+  };
+  ```
+
+### `router.basePath`
+
+Base path of the application deployment.
+
+- Type: [`String`]
+- Default: `"/"`
+- Example:
+  ```js
+  // Frontend will be reachable at https://example.com/owntracks
+  window.owntracks.config = {
+    router: {
+      basePath: "/owntracks",
+    },
  };
  ```

@@ -418,7 +470,7 @@ amount of data fetched after page load.
  // Select the device 'phone' from user 'foo' by default
  window.owntracks.config = {
    selectedUser: "foo",
-    selectedDevice: "phone"
+    selectedDevice: "phone",
  };
  ```

@@ -435,7 +487,7 @@ amount of data fetched after page load.
  ```js
  // Select all devices from user 'foo' by default
  window.owntracks.config = {
-    selectedUser: "foo"
+    selectedUser: "foo",
  };
  ```

@@ -446,6 +498,8 @@ header bar. `maxPointDistance` is being takein into account, if a distance betwe
 subsequent points is greater than `maxPointDistance`, it will not contibute to the
 calculated travelled distance.

+This also includes a calculation of elevation gain / loss.
+
 - Type: [`Boolean`]
 - Default: `true`

@@ -462,7 +516,7 @@ Initial start date and time (browser timezone) for fetched data.
  startDateTime.setHours(0, 0, 0, 0);
  startDateTime.setDate(1);
  window.owntracks.config = {
-    startDateTime
+    startDateTime,
  };
  ```

--- a/docs/images/downloader.png
+++ b/docs/images/downloader.png
--- a/docs/images/info.png
+++ b/docs/images/info.png
--- a/docs/images/loading.gif
+++ b/docs/images/loading.gif
--- a/docs/images/owntracks-ui.png
+++ b/docs/images/owntracks-ui.png
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "owntracks-ui",
-  "version": "2.3.1",
+  "name": "owntracks-frontend",
+  "version": "2.10.0",
  "author": {
    "name": "Linus Groh",
    "email": "mail@linusgroh.de"
@@ -11,50 +11,53 @@
    "cors-proxy": "node scripts/corsProxy.js",
    "format:js": "vue-cli-service lint",
    "format:md": "prettier --write '{*.md,docs/**/*.md,src/**/*.md}'",
+    "format:scss": "prettier --write 'src/**/*.scss'",
    "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'",
    "lint:js": "vue-cli-service lint --no-fix",
    "lint:md": "prettier --check '{*.md,docs/**/*.md,src/**/*.md}'",
+    "lint:scss": "prettier --check 'src/**/*.scss'",
    "test": "vue-cli-service test:unit"
  },
  "dependencies": {
-    "clipboard-copy": "^3.1.0",
-    "core-js": "^3.6.5",
+    "clipboard-copy": "^4.0.1",
+    "core-js": "^3.19.1",
    "deepmerge": "^4.2.2",
-    "leaflet": "^1.6.0",
+    "leaflet": "^1.7.1",
    "leaflet.heat": "^0.2.0",
-    "moment": "^2.25.3",
-    "vue": "^2.6.11",
-    "vue-ctk-date-time-picker": "^2.4.0",
-    "vue-feather-icons": "^5.0.0",
-    "vue-i18n": "^8.17.4",
-    "vue-js-modal": "^1.3.33",
+    "moment": "^2.29.1",
+    "vue": "^2.6.14",
+    "vue-ctk-date-time-picker": "^2.5.0",
+    "vue-feather-icons": "^5.1.0",
+    "vue-i18n": "^8.26.7",
+    "vue-js-modal": "^2.0.1",
    "vue-mq": "^1.0.1",
    "vue-outside-events": "^1.1.3",
-    "vue-router": "^3.1.6",
-    "vue2-leaflet": "^2.5.2",
-    "vuex": "^3.3.0"
+    "vue-router": "^3.5.3",
+    "vue2-leaflet": "^2.7.1",
+    "vuex": "^3.6.2"
  },
  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.3.1",
-    "@vue/cli-plugin-eslint": "~4.3.1",
-    "@vue/cli-plugin-unit-jest": "~4.3.1",
-    "@vue/cli-service": "~4.3.1",
+    "@vue/cli-plugin-babel": "~4.5.15",
+    "@vue/cli-plugin-eslint": "~4.5.15",
+    "@vue/cli-plugin-unit-jest": "~4.5.15",
+    "@vue/cli-service": "~4.5.15",
    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/test-utils": "1.0.2",
+    "@vue/test-utils": "1.3.0",
    "babel-core": "7.0.0-bridge.0",
    "babel-eslint": "^10.1.0",
-    "babel-jest": "^26.0.1",
-    "cors-anywhere": "^0.4.3",
-    "eslint": "^7.0.0",
-    "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-vue": "^6.2.2",
+    "babel-jest": "^27.3.1",
+    "cors-anywhere": "^0.4.4",
+    "eslint": "^7.32.0",
+    "eslint-plugin-prettier": "^3.4.1",
+    "eslint-plugin-vue": "^7.17.0",
    "jest-fetch-mock": "^3.0.3",
-    "lint-staged": "^10.2.2",
+    "lint-staged": "^12.1.2",
    "moment-locales-webpack-plugin": "^1.2.0",
-    "node-sass": "^4.14.1",
-    "sass-loader": "^8.0.2",
-    "vue-cli-plugin-i18n": "~1.0.1",
-    "vue-template-compiler": "^2.6.11"
+    "prettier": "^2.5.0",
+    "sass": "^1.43.5",
+    "sass-loader": "^10.1.1",
+    "vue-cli-plugin-i18n": "~2.3.1",
+    "vue-template-compiler": "^2.6.14"
  },
  "license": "MIT",
  "repository": {
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>OwnTracks UI</title>
+    <title>OwnTracks Frontend</title>
  </head>
  <body>
    <noscript>
--- a/src/App.vue
+++ b/src/App.vue
@@ -34,7 +34,7 @@ export default {
    this.populateStateFromQuery(this.$route.query);
    this.loadData();
    // Update URL query params when relevant values changes
-    this.$store.subscribe(mutation => {
+    this.$store.subscribe((mutation) => {
      if (
        [
          types.SET_SELECTED_USER,
@@ -73,7 +73,7 @@ export default {
        selectedDevice: device,
      } = this.$store.state;
      const activeLayers = Object.keys(map.layers).filter(
-        key => map.layers[key] === true
+        (key) => map.layers[key] === true
      );
      const query = {
        lat: map.center.lat,
--- a/src/api.js
+++ b/src/api.js
@@ -7,21 +7,30 @@ import { getApiUrl, getLocationHistoryCount } from "@/util";
 *
 * @param {String} path API resource path
 * @param {Object} [params] Query parameters
- * @returns {Promise} Promise returned by the fetch function
+ * @param {Object} [fetchOptions]
+ *   fetch() options (merged with config.api.fetchOptions)
+ * @returns {Promise<Response>} Response returned by the fetch call
 */
-const fetchApi = (path, params = {}) => {
+const fetchApi = (path, params = {}, fetchOptions = {}) => {
  const url = getApiUrl(path);
-  Object.keys(params).forEach(key => url.searchParams.append(key, params[key]));
+  Object.keys(params).forEach((key) => url.searchParams.set(key, params[key]));
  log("HTTP", `GET ${url.href}`);
-  return fetch(url.href, config.api.fetchOptions).catch(error =>
-    log("HTTP", error, logLevels.ERROR)
-  );
+  return fetch(url.href, {
+    ...fetchOptions,
+    ...config.api.fetchOptions,
+  }).catch((error) => {
+    if (error.name === "AbortError") {
+      log("HTTP", `GET ${url.href} - Request was aborted`, logLevels.WARNING);
+    } else {
+      log("HTTP", error, logLevels.ERROR);
+    }
+  });
 };

 /**
 * Get the recorder's version.
 *
- * @returns {String} Version
+ * @returns {Promise<String>} Version
 */
 export const getVersion = async () => {
  const response = await fetchApi("/api/0/version");
@@ -34,7 +43,7 @@ export const getVersion = async () => {
 /**
 * Get all users.
 *
- * @returns {User[]} Array of usernames
+ * @returns {Promise<User[]>} Array of usernames
 */
 export const getUsers = async () => {
  const response = await fetchApi("/api/0/list");
@@ -48,13 +57,13 @@ export const getUsers = async () => {
 * Get all devices for the provided users.
 *
 * @param {User[]} users Array of usernames
- * @returns {{User: Device[]}}
+ * @returns {Promise<{User: Device[]}>}
 *   Object mapping each username to an array of device names
 */
-export const getDevices = async users => {
+export const getDevices = async (users) => {
  const devices = {};
  await Promise.all(
-    users.map(async user => {
+    users.map(async (user) => {
      const response = await fetchApi(`/api/0/list`, { user });
      const json = await response.json();
      const userDevices = json.results;
@@ -63,7 +72,7 @@ export const getDevices = async users => {
  );
  log("API", () => {
    const devicesCount = Object.keys(devices)
-      .map(user => devices[user].length)
+      .map((user) => devices[user].length)
      .reduce((a, b) => a + b, 0);
    return (
      `[getDevices] Fetched ${devicesCount} ` +
@@ -78,7 +87,7 @@ export const getDevices = async users => {
 *
 * @param {User} [user] Get last locations of all devices from this user
 * @param {Device} [device] Get last location of specific device
- * @returns {OTLocation[]} Array of last location objects
+ * @returns {Promise<OTLocation[]>} Array of last location objects
 */
 export const getLastLocations = async (user, device) => {
  const params = {};
@@ -105,23 +114,33 @@ export const getLastLocations = async (user, device) => {
 * @param {Device} device Device name
 * @param {String} start Start date and time in UTC
 * @param {String} end End date and time in UTC
- * @returns {OTLocation[]} Array of location history objects
+ * @param {Object} [fetchOptions] fetch() options
+ * @returns {Promise<OTLocation[]>} Array of location history objects
 */
 export const getUserDeviceLocationHistory = async (
  user,
  device,
  start,
-  end
+  end,
+  fetchOptions
 ) => {
-  const response = await fetchApi("/api/0/locations", {
-    from: start,
-    to: end,
-    user,
-    device,
-    format: "json",
-  });
+  const response = await fetchApi(
+    "/api/0/locations",
+    {
+      from: start,
+      to: end,
+      user,
+      device,
+      format: "json",
+    },
+    fetchOptions
+  );
  const json = await response.json();
-  const userDeviceLocationHistory = json.data;
+  // We need to manually sort by timestamp, otherwise the line segments may be
+  // drawn in the wrong order. The recorder API simply returns entries in the
+  // same order in which they are in each *.rec file.
+  // See https://github.com/owntracks/frontend/issues/67.
+  const userDeviceLocationHistory = json.data.sort((a, b) => a.tst - b.tst);
  log(
    "API",
    () =>
@@ -139,20 +158,22 @@ export const getUserDeviceLocationHistory = async (
 *   Devices of which the history should be fetched
 * @param {String} start Start date and time in UTC
 * @param {String} end End date and time in UTC
- * @returns {LocationHistory} Location history
+ * @param {Object} [fetchOptions] fetch() options
+ * @returns {Promise<LocationHistory>} Location history
 */
-export const getLocationHistory = async (devices, start, end) => {
+export const getLocationHistory = async (devices, start, end, fetchOptions) => {
  const locationHistory = {};
  await Promise.all(
-    Object.keys(devices).map(async user => {
+    Object.keys(devices).map(async (user) => {
      locationHistory[user] = {};
      await Promise.all(
-        devices[user].map(async device => {
+        devices[user].map(async (device) => {
          locationHistory[user][device] = await getUserDeviceLocationHistory(
            user,
            device,
            start,
-            end
+            end,
+            fetchOptions
          );
        })
      );
@@ -174,7 +195,7 @@ export const getLocationHistory = async (devices, start, end) => {
 *
 * @param {WebSocketLocationCallback} [callback] Callback for location messages
 */
-export const connectWebsocket = async callback => {
+export const connectWebsocket = async (callback) => {
  let url = getApiUrl("/ws/last");
  url.protocol = url.protocol.replace("http", "ws");
  url = url.href;
@@ -184,16 +205,17 @@ export const connectWebsocket = async callback => {
    log("WS", "Connected");
    ws.send("LAST");
  };
-  ws.onclose = event => {
+  ws.onclose = (event) => {
    log(
      "WS",
-      `Disconnected unexpectedly (reason: ${event.reason ||
-        "unknown"}). Reconnecting in one second.`,
+      `Disconnected unexpectedly (reason: ${
+        event.reason || "unknown"
+      }). Reconnecting in one second.`,
      logLevels.WARNING
    );
    setTimeout(connectWebsocket, 1000);
  };
-  ws.onmessage = async msg => {
+  ws.onmessage = async (msg) => {
    if (msg.data) {
      try {
        const data = JSON.parse(msg.data);
--- a/src/components/AppHeader.vue
+++ b/src/components/AppHeader.vue
@@ -118,10 +118,19 @@
    <nav class="header-item header-item-right">
      <div
        v-if="$config.showDistanceTravelled && distanceTravelled"
-        class="nav-item"
-        :title="$t('Distance travelled')"
+        class="nav-item distance-travelled"
      >
-        {{ humanReadableDistance(distanceTravelled) }}
+        <span :title="$t('Distance travelled')">
+          {{ humanReadableDistance(distanceTravelled) }}
+        </span>
+        <br />
+        <span :title="$t('Elevation gain / loss')">
+          <ArrowUpIcon size="0.8x" role="img" />
+          {{ humanReadableDistance(elevationGain) }}
+          /
+          <ArrowDownIcon size="0.8x" role="img" />
+          {{ humanReadableDistance(elevationLoss) }}
+        </span>
      </div>
      <div class="nav-item">
        <button
@@ -149,10 +158,24 @@
  </header>
 </template>

+<style lang="scss" scoped>
+.distance-travelled {
+  text-align: right;
+  line-height: 1.2;
+
+  .feather {
+    margin-top: 3px;
+    margin-right: 0 !important;
+  }
+}
+</style>
+
 <script>
 import moment from "moment";
 import { mapActions, mapGetters, mapMutations, mapState } from "vuex";
 import {
+  ArrowDownIcon,
+  ArrowUpIcon,
  CalendarIcon,
  CrosshairIcon,
  DownloadIcon,
@@ -172,6 +195,8 @@ import { humanReadableDistance } from "@/util";

 export default {
  components: {
+    ArrowDownIcon,
+    ArrowUpIcon,
    CalendarIcon,
    CrosshairIcon,
    DownloadIcon,
@@ -196,7 +221,14 @@ export default {
    };
  },
  computed: {
-    ...mapState(["users", "devices", "map", "distanceTravelled"]),
+    ...mapState([
+      "users",
+      "devices",
+      "map",
+      "distanceTravelled",
+      "elevationGain",
+      "elevationLoss",
+    ]),
    selectedUser: {
      get() {
        return this.$store.state.selectedUser;
@@ -222,9 +254,7 @@ export default {
      },
      set(value) {
        this.setStartDateTime(
-          moment(value, DATE_TIME_FORMAT)
-            .utc()
-            .format(DATE_TIME_FORMAT)
+          moment(value, DATE_TIME_FORMAT).utc().format(DATE_TIME_FORMAT)
        );
      },
    },
--- a/src/components/LDeviceLocationPopup.vue
+++ b/src/components/LDeviceLocationPopup.vue
@@ -1,5 +1,5 @@
 <template>
-  <LPopup>
+  <LPopup :options="options">
    <div class="device">{{ deviceName }}</div>
    <div class="wrapper">
      <img
@@ -35,6 +35,10 @@
        </li>
      </ul>
    </div>
+    <div v-if="regions.length" class="regions">
+      {{ $t("Regions:") }}
+      {{ regions.join(", ") }}
+    </div>
  </LPopup>
 </template>

@@ -56,6 +60,11 @@
    margin-right: 20px;
  }
 }
+.regions {
+  border-top: 1px solid var(--color-separator);
+  margin-top: 15px;
+  padding-top: 15px;
+}
 </style>

 <script>
@@ -123,6 +132,14 @@ export default {
      type: Number,
      default: null,
    },
+    regions: {
+      type: Array,
+      default: () => [],
+    },
+    options: {
+      type: Object,
+      default: () => {},
+    },
  },
  computed: {
    /**
--- a/src/components/LHeatmap.vue
+++ b/src/components/LHeatmap.vue
@@ -94,7 +94,7 @@ export default {
    this.parentContainer.addLayer(this, !this.visible);
    this.$watch(
      "latLng",
-      newVal => {
+      (newVal) => {
        this.mapObject.setLatLngs(newVal);
      },
      { deep: true }
--- a/src/components/modals/Information.vue
+++ b/src/components/modals/Information.vue
@@ -3,17 +3,13 @@
    <ul class="info-list">
      <li>
        <GithubIcon size="1x" aria-hidden="true" role="img" />
-        <a href="https://github.com/owntracks/frontend">
-          owntracks/frontend
-        </a>
+        <a href="https://github.com/owntracks/frontend">owntracks/frontend</a>
        ({{ frontendVersion }})
      </li>
      <li>
        <GithubIcon size="1x" aria-hidden="true" role="img" />
-        <a href="https://github.com/owntracks/recorder">
-          owntracks/recorder
-        </a>
-        ({{ recorderVersion || "Loading version..." }})
+        <a href="https://github.com/owntracks/recorder">owntracks/recorder</a>
+        ({{ recorderVersion || $t("Loading version...") }})
      </li>
      <li>
        <GlobeIcon size="1x" aria-hidden="true" role="img" />
--- a/src/components/modals/Loading.vue
+++ b/src/components/modals/Loading.vue
@@ -1,16 +1,29 @@
 <template>
  <modal name="loading" :click-to-close="false" adaptive>
-    <LoaderIcon class="loader" size="1.5x" />
+    <LoaderIcon class="loader-icon" size="1.5x" />
    {{ $t("Loading data, please wait...") }}
+    <br />
+    <button
+      type="button"
+      class="button button-primary button-cancel"
+      @click="requestAbortController.abort()"
+    >
+      {{ $t("Cancel") }}
+    </button>
  </modal>
 </template>

 <style scoped>
-.loader {
+.loader-icon {
  animation: spinning 2s linear infinite;
  margin-right: 5px;
 }

+.button-cancel {
+  display: block;
+  margin: 20px auto 0;
+}
+
@keyframes spinning {
  from {
    transform: rotate(0deg);
@@ -22,11 +35,15 @@
 </style>

 <script>
+import { mapState } from "vuex";
 import { LoaderIcon } from "vue-feather-icons";

 export default {
  components: {
    LoaderIcon,
  },
+  computed: {
+    ...mapState(["requestAbortController"]),
+  },
 };
 </script>
--- a/src/config.js
+++ b/src/config.js
@@ -13,8 +13,11 @@ const DEFAULT_CONFIG = {
    fetchOptions: {},
  },
  endDateTime,
+  filters: {
+    minAccuracy: null,
+  },
  ignorePingLocation: true,
-  locale: "en",
+  locale: "en-US",
  map: {
    attribution:
      '&copy; <a href="https://osm.org/copyright">OpenStreetMap</a> contributors',
@@ -64,9 +67,13 @@ const DEFAULT_CONFIG = {
    url: "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
  },
  onLocationChange: {
+    fitView: false,
    reloadHistory: false,
  },
  primaryColor: "#3f51b5",
+  router: {
+    basePath: "/",
+  },
  selectedDevice: null,
  selectedUser: null,
  showDistanceTravelled: true,
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -7,7 +7,7 @@ Vue.use(VueI18n);

 const locales = require.context("./locales", true, /[A-Za-z0-9-_,\s]+\.json$/i);
 const messages = {};
-locales.keys().forEach(key => {
+locales.keys().forEach((key) => {
  const matched = key.match(/([A-Za-z0-9-_]+)\./i);
  if (matched && matched.length > 1) {
    const locale = matched[1];
@@ -16,8 +16,8 @@ locales.keys().forEach(key => {
 });

 export default new VueI18n({
-  locale: config.locale.split("-")[0],
-  fallbackLocale: "en",
+  locale: config.locale,
+  fallbackLocale: "en-US",
  formatFallbackMessages: true,
  messages,
 });
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -2,8 +2,12 @@
 interface Config {
    api: {
        baseUrl: string;
+        fetchOptions: object;
    };
    endDateTime: Date;
+    filters: {
+      minAccuracy: number | null,
+    };
    ignorePingLocation: boolean;
    locale: string;
    map: {
@@ -54,11 +58,16 @@ interface Config {
        url: string;
    };
    onLocationChange: {
+        fitView: boolean;
        reloadHistory: boolean;
    };
    primaryColor: Color;
-    selectedUser: User| null;
-    selectedDevice: Device| null;
+    router: {
+      basePath: string;
+    };
+    selectedUser: User | null;
+    selectedDevice: Device | null;
+    showDistanceTravelled: boolean;
    startDateTime: Date;
    verbose: boolean;
 }
@@ -72,8 +81,8 @@ interface State {
    devices: { User: Device[] };
    lastLocations: OTLocation[];
    locationHistory: LocationHistory;
-    selectedUser: User| null;
-    selectedDevice: Device| null;
+    selectedUser: User | null;
+    selectedDevice: Device | null;
    startDateTime: string;
    endDateTime: string;
    map: {
--- a/src/locales/de-DE.json
+++ b/src/locales/de-DE.json
@@ -11,6 +11,7 @@
  "Show all": "Alle anzeigen",
  "Select device": "Gerät auswählen",
  "Distance travelled": "Gereiste Entfernung",
+  "Elevation gain / loss": "Höhengewinn / -verlust",
  "Download raw data": "Rohdaten herunterladen",
  "Information": "Information",
  "Show last known locations": "Zeige letzte bekannte Standorte",
@@ -20,14 +21,17 @@
  "Minify JSON": "JSON minimieren",
  "Copy to clipboard": "In die Zwischenablage kopieren",
  "Download": "Herunterladen",
+  "Loading version...": "Version wird abgerufen...",
  "OwnTracks website": "OwnTracks Webseite",
  "OwnTracks documentation": "OwnTracks Dokumentation",
  "OwnTracks on Twitter": "OwnTracks auf Twitter",
  "Loading data, please wait...": "Daten werden geladen, bitte warten...",
+  "Cancel": "Abbrechen",
  "Image of {deviceName}": "Bild von {deviceName}",
  "Timestamp": "Zeitstempel",
  "Location": "Standort",
  "Address": "Adresse",
  "Battery": "Akku",
-  "Speed": "Geschwindigkeit"
+  "Speed": "Geschwindigkeit",
+  "Regions:": "Regionen:"
 }
--- a/src/locales/en-GB.json
+++ b/src/locales/en-GB.json
@@ -0,0 +1,37 @@
+{
+  "Automatically center the map view and zoom in to relevant data": "Automatically centre the map view and zoom in to relevant data",
+  "Fit view": "Fit view",
+  "Layer settings": "Layer settings",
+  "Show/hide layers": "Show/hide layers",
+  "Now": "Now",
+  "Select start date": "Select start date",
+  "to": "to",
+  "Select end date": "Select end date",
+  "Select user": "Select user",
+  "Show all": "Show all",
+  "Select device": "Select device",
+  "Distance travelled": "Distance travelled",
+  "Elevation gain / loss": "Elevation gain / loss",
+  "Download raw data": "Download raw data",
+  "Information": "Information",
+  "Show last known locations": "Show last known locations",
+  "Show location history (line)": "Show location history (line)",
+  "Show location history (points)": "Show location history (points)",
+  "Show location heatmap": "Show location heatmap",
+  "Minify JSON": "Minify JSON",
+  "Copy to clipboard": "Copy to clipboard",
+  "Download": "Download",
+  "Loading version...": "Loading version...",
+  "OwnTracks website": "OwnTracks website",
+  "OwnTracks documentation": "OwnTracks documentation",
+  "OwnTracks on Twitter": "OwnTracks on Twitter",
+  "Loading data, please wait...": "Loading data, please wait...",
+  "Cancel": "Cancel",
+  "Image of {deviceName}": "Image of {deviceName}",
+  "Timestamp": "Timestamp",
+  "Location": "Location",
+  "Address": "Address",
+  "Battery": "Battery",
+  "Speed": "Speed",
+  "Regions:": "Regions:"
+}
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -10,7 +10,8 @@
  "Select user": "Select user",
  "Show all": "Show all",
  "Select device": "Select device",
-  "Distance travelled": "Distance travelled",
+  "Distance travelled": "Distance traveled",
+  "Elevation gain / loss": "Elevation gain / loss",
  "Download raw data": "Download raw data",
  "Information": "Information",
  "Show last known locations": "Show last known locations",
@@ -20,14 +21,17 @@
  "Minify JSON": "Minify JSON",
  "Copy to clipboard": "Copy to clipboard",
  "Download": "Download",
+  "Loading version...": "Loading version...",
  "OwnTracks website": "OwnTracks website",
  "OwnTracks documentation": "OwnTracks documentation",
  "OwnTracks on Twitter": "OwnTracks on Twitter",
  "Loading data, please wait...": "Loading data, please wait...",
+  "Cancel": "Cancel",
  "Image of {deviceName}": "Image of {deviceName}",
  "Timestamp": "Timestamp",
  "Location": "Location",
  "Address": "Address",
  "Battery": "Battery",
-  "Speed": "Speed"
+  "Speed": "Speed",
+  "Regions:": "Regions:"
 }
--- a/src/locales/es-ES.json
+++ b/src/locales/es-ES.json
@@ -11,6 +11,7 @@
  "Show all": "Mostrar todos",
  "Select device": "Seleccionar dispositivo",
  "Distance travelled": "Distancia recorrida",
+  "Elevation gain / loss": "Aumento / disminución de la altura",
  "Download raw data": "Descargar datos en crudo",
  "Information": "Información",
  "Show last known locations": "Mostrar última ubicación conocida",
@@ -20,14 +21,17 @@
  "Minify JSON": "Reducir JSON",
  "Copy to clipboard": "Copiar al portapapeles",
  "Download": "Descarga",
+  "Loading version...": "Cargando versión...",
  "OwnTracks website": "OwnTracks - Sitio web",
  "OwnTracks documentation": "OwnTracks - documentación",
  "OwnTracks on Twitter": "OwnTracks en Twitter",
  "Loading data, please wait...": "Cargando datos, por favor, espera...",
+  "Cancel": "Cancelar",
  "Image of {deviceName}": "Imágen de {deviceName}",
  "Timestamp": "Fecha / Hora",
  "Location": "Ubicación",
  "Address": "Dirección",
  "Battery": "Bateria",
-  "Speed": "Velocidad"
+  "Speed": "Velocidad",
+  "Regions:": "Regiones:"
 }
--- a/src/locales/fr-FR.json
+++ b/src/locales/fr-FR.json
@@ -0,0 +1,37 @@
+{
+  "Automatically center the map view and zoom in to relevant data": "Centrer automatiquement la vue de la carte et zoomer sur les données pertinentes",
+  "Fit view": "Vue d'ensemble",
+  "Layer settings": "Paramètres des couches",
+  "Show/hide layers": "Montrer/cacher certaines couches",
+  "Now": "Maintenant",
+  "Select start date": "Sélectionner une date de début",
+  "to": "à",
+  "Select end date": "Sélectionner une date de fin",
+  "Select user": "Sélectionner un utilisateur",
+  "Show all": "Tout afficher",
+  "Select device": "Sélectionner un appareil",
+  "Distance travelled": "Distance parcourue",
+  "Elevation gain / loss": "Augmentation / diminution de l'altitude",
+  "Download raw data": "Télécharger les données brutes",
+  "Information": "Informations",
+  "Show last known locations": "Afficher les dernières localisations connues",
+  "Show location history (line)": "Afficher l'historique de localisation (lignes)",
+  "Show location history (points)": "Afficher l'historique de localisation (points)",
+  "Show location heatmap": "Afficher la carte de fréquentation",
+  "Minify JSON": "Minifier JSON",
+  "Copy to clipboard": "Copier dans le presse-papier",
+  "Download": "Télécharger",
+  "Loading version...": "Chargement de la version...",
+  "OwnTracks website": "Site d'OwnTracks",
+  "OwnTracks documentation": "Documentation d'OwnTracks",
+  "OwnTracks on Twitter": "OwnTracks sur Twitter",
+  "Loading data, please wait...": "Chargement des données, merci de patienter ...",
+  "Cancel": "Annuler",
+  "Image of {deviceName}": "Image de {deviceName}",
+  "Timestamp": "Horodatage",
+  "Location": "Localisation",
+  "Address": "Addresse",
+  "Battery": "Batterie",
+  "Speed": "Vitesse",
+  "Regions:": "Régions:"
+}
--- a/src/main.js
+++ b/src/main.js
@@ -29,5 +29,5 @@ new Vue({
  i18n,
  router,
  store,
-  render: h => h(App),
+  render: (h) => h(App),
 }).$mount("#app");
--- a/src/router.js
+++ b/src/router.js
@@ -1,12 +1,13 @@
 import Vue from "vue";
 import Router from "vue-router";
-import Map from "./views/Map.vue";
+import config from "@/config";
+import Map from "@/views/Map.vue";

 Vue.use(Router);

 export default new Router({
  mode: "history",
-  base: process.env.BASE_URL,
+  base: config.router.basePath,
  routes: [
    {
      path: "/",
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -43,7 +43,7 @@ const populateStateFromQuery = ({ state, commit }, query) => {
  }
  if (query.layers) {
    const activeLayers = query.layers.split(",");
-    Object.keys(state.map.layers).forEach(layer => {
+    Object.keys(state.map.layers).forEach((layer) => {
      const visibility = activeLayers.includes(layer);
      if (state.map.layers[layer] !== visibility) {
        commit(types.SET_MAP_LAYER_VISIBILITY, { layer, visibility });
@@ -116,33 +116,41 @@ const getLastLocations = async ({ commit, state }) => {
    // Remove ping/ping from the owntracks/recorder Docker image
    // https://github.com/owntracks/frontend/issues/12
    lastLocations = lastLocations.filter(
-      l => !(l.username === "ping" && l.device === "ping")
+      (l) => !(l.username === "ping" && l.device === "ping")
    );
  }
  commit(types.SET_LAST_LOCATIONS, lastLocations);
 };

-const _getDistanceTravelled = locationHistory => {
+const _getTravelStats = (locationHistory) => {
  const start = Date.now();
  let distanceTravelled = 0;
-  Object.keys(locationHistory).forEach(user => {
-    Object.keys(locationHistory[user]).forEach(device => {
+  let elevationGain = 0;
+  let elevationLoss = 0;
+  Object.keys(locationHistory).forEach((user) => {
+    Object.keys(locationHistory[user]).forEach((device) => {
      let lastLatLng = null;
-      locationHistory[user][device].forEach(coordinate => {
-        const latLng = L.latLng(coordinate.lat, coordinate.lon);
+      locationHistory[user][device].forEach((location) => {
+        if (
+          config.filters.minAccuracy !== null &&
+          location.acc > config.filters.minAccuracy
+        )
+          return;
+        const latLng = L.latLng(location.lat, location.lon, location.alt ?? 0);
        if (lastLatLng !== null) {
          const distance = distanceBetweenCoordinates(lastLatLng, latLng);
+          const elevationChange = latLng.alt - lastLatLng.alt;
          if (
            typeof config.map.maxPointDistance === "number" &&
            config.map.maxPointDistance > 0
+              ? // If part of the current group, add to total
+                distance <= config.map.maxPointDistance
+              : // If grouping is disabled, always add to total
+                true
          ) {
-            if (distance <= config.map.maxPointDistance) {
-              // Part of the current group, add calculated distance to total
-              distanceTravelled += distance;
-            }
-          } else {
-            // If grouping is disabled always add calculated distance to total
            distanceTravelled += distance;
+            if (elevationChange >= 0) elevationGain += elevationChange;
+            else elevationLoss += -elevationChange;
          }
        }
        lastLatLng = latLng;
@@ -150,15 +158,15 @@ const _getDistanceTravelled = locationHistory => {
    });
  });
  const end = Date.now();
-  log("DISTANCE", () => {
+  log("PERFORMANCE", () => {
    const locationHistoryCount = getLocationHistoryCount(locationHistory);
    const duration = (end - start) / 1000;
    return (
-      `[_getDistanceTravelled] Took ${duration} seconds to ` +
-      `calculate distance of ${locationHistoryCount} locations`
+      `[_getTravelStats] Took ${duration} seconds to calculate distance ` +
+      `and elevation gain/loss of ${locationHistoryCount} locations`
    );
  });
-  return distanceTravelled;
+  return { distanceTravelled, elevationGain, elevationLoss };
 };

 /**
@@ -176,18 +184,28 @@ const getLocationHistory = async ({ commit, state }) => {
  } else {
    devices = state.devices;
  }
-  const locationHistory = await api.getLocationHistory(
-    devices,
-    state.startDateTime,
-    state.endDateTime
-  );
-  commit(types.SET_IS_LOADING, false);
+  commit(types.SET_REQUEST_ABORT_CONTROLLER, new AbortController());
+  let locationHistory;
+  try {
+    locationHistory = await api.getLocationHistory(
+      devices,
+      state.startDateTime,
+      state.endDateTime,
+      { signal: state.requestAbortController.signal }
+    );
+  } catch (error) {
+    return;
+  } finally {
+    commit(types.SET_REQUEST_ABORT_CONTROLLER, null);
+    commit(types.SET_IS_LOADING, false);
+  }
  commit(types.SET_LOCATION_HISTORY, locationHistory);
  if (config.showDistanceTravelled) {
-    commit(
-      types.SET_DISTANCE_TRAVELLED,
-      _getDistanceTravelled(locationHistory)
-    );
+    const { distanceTravelled, elevationGain, elevationLoss } =
+      _getTravelStats(locationHistory);
+    commit(types.SET_DISTANCE_TRAVELLED, distanceTravelled);
+    commit(types.SET_ELEVATION_GAIN, elevationGain);
+    commit(types.SET_ELEVATION_LOSS, elevationLoss);
  }
 };

--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -4,20 +4,46 @@ import config from "@/config";
 import { distanceBetweenCoordinates } from "@/util";

 /**
- * From the selected users' and devices' location histories, create an
- * array of all coordinates.
+ * Apply filters to the selected users' and devices' location histories.
 *
 * @param {State} state
 * @param {LocationHistory} state.locationHistory
 *   Location history of selected users and devices
+ * @returns {LocationHistory} Filtered location history
+ */
+const filteredLocationHistory = (state) => {
+  const locationHistory = {};
+  Object.keys(state.locationHistory).forEach((user) => {
+    locationHistory[user] = {};
+    Object.keys(state.locationHistory[user]).forEach((device) => {
+      locationHistory[user][device] = [];
+      state.locationHistory[user][device].forEach((location) => {
+        if (
+          config.filters.minAccuracy !== null &&
+          location.acc > config.filters.minAccuracy
+        )
+          return;
+        locationHistory[user][device].push(location);
+      });
+    });
+  });
+  return locationHistory;
+};
+
+/**
+ * From the selected users' and devices' location histories, create an
+ * array of all coordinates.
+ *
+ * @param {State} state
 * @returns {L.LatLng[]} All coordinates
 */
-const locationHistoryLatLngs = state => {
+const filteredLocationHistoryLatLngs = (state) => {
  const latLngs = [];
-  Object.keys(state.locationHistory).forEach(user => {
-    Object.keys(state.locationHistory[user]).forEach(device => {
-      state.locationHistory[user][device].forEach(coordinate => {
-        latLngs.push(L.latLng(coordinate.lat, coordinate.lon));
+  const locationHistory = filteredLocationHistory(state);
+  Object.keys(locationHistory).forEach((user) => {
+    Object.keys(locationHistory[user]).forEach((device) => {
+      locationHistory[user][device].forEach((location) => {
+        latLngs.push(L.latLng(location.lat, location.lon));
      });
    });
  });
@@ -30,17 +56,16 @@ const locationHistoryLatLngs = state => {
 * coordinates does not exceed `config.map.maxPointDistance`.
 *
 * @param {State} state
- * @param {LocationHistory} state.locationHistory
- *   Location history of selected users and devices
 * @returns {L.LatLng[][]} Groups of coherent coordinates
 */
-const locationHistoryLatLngGroups = state => {
+const filteredLocationHistoryLatLngGroups = (state) => {
  const groups = [];
-  Object.keys(state.locationHistory).forEach(user => {
-    Object.keys(state.locationHistory[user]).forEach(device => {
+  const locationHistory = filteredLocationHistory(state);
+  Object.keys(locationHistory).forEach((user) => {
+    Object.keys(locationHistory[user]).forEach((device) => {
      let latLngs = [];
-      state.locationHistory[user][device].forEach(coordinate => {
-        const latLng = L.latLng(coordinate.lat, coordinate.lon);
+      locationHistory[user][device].forEach((location) => {
+        const latLng = L.latLng(location.lat, location.lon);
        // Skip if group splitting is disabled or this is the first
        // coordinate in the current group
        if (
@@ -68,6 +93,7 @@ const locationHistoryLatLngGroups = state => {
 };

 export default {
-  locationHistoryLatLngs,
-  locationHistoryLatLngGroups,
+  filteredLocationHistory,
+  filteredLocationHistoryLatLngs,
+  filteredLocationHistoryLatLngGroups,
 };
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -30,7 +30,10 @@ export default new Vuex.Store({
      zoom: 19,
      layers: config.map.layers,
    },
-    distanceTravelled: null,
+    distanceTravelled: 0,
+    elevationGain: 0,
+    elevationLoss: 0,
+    requestAbortController: null,
  },
  getters,
  mutations,
--- a/src/store/mutation-types.js
+++ b/src/store/mutation-types.js
@@ -12,3 +12,6 @@ export const SET_MAP_CENTER = "SET_MAP_CENTER";
 export const SET_MAP_ZOOM = "SET_MAP_ZOOM";
 export const SET_MAP_LAYER_VISIBILITY = "SET_MAP_LAYER_VISIBILITY";
 export const SET_DISTANCE_TRAVELLED = "SET_DISTANCE_TRAVELLED";
+export const SET_ELEVATION_GAIN = "SET_ELEVATION_GAIN";
+export const SET_ELEVATION_LOSS = "SET_ELEVATION_LOSS";
+export const SET_REQUEST_ABORT_CONTROLLER = "SET_REQUEST_ABORT_CONTROLLER";
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -43,4 +43,13 @@ export default {
  [types.SET_DISTANCE_TRAVELLED](state, distanceTravelled) {
    state.distanceTravelled = distanceTravelled;
  },
+  [types.SET_ELEVATION_GAIN](state, elevationGain) {
+    state.elevationGain = elevationGain;
+  },
+  [types.SET_ELEVATION_LOSS](state, elevationLoss) {
+    state.elevationLoss = elevationLoss;
+  },
+  [types.SET_REQUEST_ABORT_CONTROLLER](state, requestAbortController) {
+    state.requestAbortController = requestAbortController;
+  },
 };
--- a/src/styles/_base.scss
+++ b/src/styles/_base.scss
@@ -9,12 +9,14 @@
  --color-background: #fff;
  --color-primary: #3f51b5;
  --color-primary-text: #fff;
+  --color-separator: #ddd;
  --drop-shadow: drop-shadow(0 10px 10px rgb(0, 0, 0, 0.2));
  --dropdown-arrow: url("data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2225%22%20height%3D%2210%22%3E%3Cpath%20fill%3D%22%23333%22%20fill-opacity%3D%221%22%20stroke%3D%22none%22%20d%3D%22M0%2C0%20L0%2C0%20L1%2C0%20L1%2C6%20L7%2C6%20L7%2C7%20L0%2C7%20z%22%20transform%3D%22rotate(-45%205%200)%22%20%2F%3E%3C%2Fsvg%3E");
  --pin-width: 32px;
 }

-html, body {
+html,
+body {
  height: 100%;
 }

@@ -84,7 +86,8 @@ pre {
  display: block;
  font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console",
    "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono",
-    "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace;
+    "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier,
+    monospace;
  overflow-x: auto;

  code {
--- a/src/styles/_datepicker.scss
+++ b/src/styles/_datepicker.scss
@@ -6,14 +6,5 @@
    box-shadow: none !important;
    filter: var(--drop-shadow);
    margin-top: 5px;
-
-    @media screen and (max-width: 415px) {
-      // Fix buttons being off screen
-      .datepicker-buttons-container {
-        bottom: 0;
-        position: absolute;
-        width: 100%;
-      }
-    }
  }
 }
--- a/src/styles/_map.scss
+++ b/src/styles/_map.scss
@@ -4,7 +4,10 @@

  .leaflet-popup {
    filter: var(--drop-shadow);
-    margin-bottom: calc(var(--pin-width) * 1.5 + 20px);
+
+    &--for-pin {
+      margin-bottom: calc(var(--pin-width) * 1.5 + 20px);
+    }

    .leaflet-popup-content-wrapper {
      border-radius: 3px;
--- a/src/styles/_modal.scss
+++ b/src/styles/_modal.scss
@@ -1,22 +1,20 @@
-.v--modal-overlay {
-  background: rgba(0, 0, 0, 0.5) !important;
-
-  .v--modal-background-click {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    .v--modal-box.v--modal {
-      top: initial !important;
-      left: initial !important;
-      width: auto !important;
-      height: auto !important;
-      max-width: 95vw;
-      max-height: 95vh;
-      overflow: auto;
-      padding: 30px;
-      border-radius: 3px;
-      background: var(--color-background);
-    }
+.vm--container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .vm--overlay {
+    background: rgba(0, 0, 0, 0.5) !important;
+  }
+  .vm--modal {
+    top: initial !important;
+    left: initial !important;
+    width: auto !important;
+    height: auto !important;
+    max-width: 95vw;
+    max-height: 95vh;
+    overflow: auto;
+    padding: 30px;
+    border-radius: 3px;
+    background: var(--color-background);
  }
 }
--- a/src/util.js
+++ b/src/util.js
@@ -10,9 +10,9 @@ import { DATE_TIME_FORMAT, EARTH_RADIUS_IN_KM } from "@/constants";
 * @param {String} path Path to the API resource
 * @returns {URL} Final API URL
 */
-export const getApiUrl = path => {
+export const getApiUrl = (path) => {
  const normalizedBaseUrl = config.api.baseUrl.endsWith("/")
-    ? config.api.baseUrl.slice(1)
+    ? config.api.baseUrl.slice(0, -1)
    : config.api.baseUrl;
  const normalizedPath = path.startsWith("/") ? path : `/${path}`;
  return new URL(`${normalizedBaseUrl}${normalizedPath}`);
@@ -24,7 +24,7 @@ export const getApiUrl = path => {
 * @param {String} s Input value to be tested
 * @returns {Boolean} Whether the input matches the expected format
 */
-export const isIsoDateTime = s => moment(s, DATE_TIME_FORMAT, true).isValid();
+export const isIsoDateTime = (s) => moment(s, DATE_TIME_FORMAT, true).isValid();

 /**
 * Convert degrees to radians.
@@ -32,7 +32,7 @@ export const isIsoDateTime = s => moment(s, DATE_TIME_FORMAT, true).isValid();
 * @param {Number} degrees Angle in degrees
 * @returns {Number} Angle in radians
 */
-export const degreesToRadians = degrees => (degrees * Math.PI) / 180;
+export const degreesToRadians = (degrees) => (degrees * Math.PI) / 180;

 /**
 * Calculate the distance between two coordinates. Uses the haversine formula,
@@ -91,7 +91,7 @@ export const download = (text, filename, mimeType = "text/plain") => {
 * @param {Number} distance Distance in meters
 * @returns {String} Formatted string including unit
 */
-export const humanReadableDistance = distance => {
+export const humanReadableDistance = (distance) => {
  let unit = "m";
  if (Math.abs(distance) >= 1000) {
    distance = distance / 1000;
@@ -108,11 +108,11 @@ export const humanReadableDistance = distance => {
 * @param {LocationHistory} locationHistory Location history
 * @returns {Number} Total number of locations
 */
-export const getLocationHistoryCount = locationHistory =>
+export const getLocationHistoryCount = (locationHistory) =>
  Object.keys(locationHistory)
-    .map(user =>
+    .map((user) =>
      Object.keys(locationHistory[user])
-        .map(device => locationHistory[user][device].length)
+        .map((device) => locationHistory[user][device].length)
        .reduce((a, b) => a + b, 0)
    )
    .reduce((a, b) => a + b, 0);
--- a/src/views/Map.vue
+++ b/src/views/Map.vue
@@ -50,13 +50,15 @@
          :alt="l.alt"
          :battery="l.batt"
          :speed="l.vel"
+          :regions="l.inregions"
+          :options="{ className: 'leaflet-popup--for-pin' }"
        />
      </LMarker>
    </template>

    <template v-if="map.layers.line">
      <LPolyline
-        v-for="(group, i) in locationHistoryLatLngGroups"
+        v-for="(group, i) in filteredLocationHistoryLatLngGroups"
        :key="i"
        :lat-lngs="group"
        v-bind="polyline"
@@ -64,7 +66,7 @@
    </template>

    <template v-if="map.layers.points">
-      <template v-for="(userDevices, user) in locationHistory">
+      <template v-for="(userDevices, user) in filteredLocationHistory">
        <template v-for="(deviceLocations, device) in userDevices">
          <LCircleMarker
            v-for="(l, n) in deviceLocationsWithNameAndFace(
@@ -87,6 +89,7 @@
              :alt="l.alt"
              :battery="l.batt"
              :speed="l.vel"
+              :regions="l.inregions"
            ></LDeviceLocationPopup>
          </LCircleMarker>
        </template>
@@ -95,8 +98,8 @@

    <template v-if="map.layers.heatmap">
      <LHeatmap
-        v-if="locationHistoryLatLngs.length"
-        :lat-lng="locationHistoryLatLngs"
+        v-if="filteredLocationHistoryLatLngs.length"
+        :lat-lng="filteredLocationHistoryLatLngs"
        :max="heatmap.max"
        :radius="heatmap.radius"
        :blur="heatmap.blur"
@@ -171,8 +174,12 @@ export default {
    });
  },
  computed: {
-    ...mapGetters(["locationHistoryLatLngs", "locationHistoryLatLngGroups"]),
-    ...mapState(["lastLocations", "locationHistory", "map"]),
+    ...mapGetters([
+      "filteredLocationHistory",
+      "filteredLocationHistoryLatLngs",
+      "filteredLocationHistoryLatLngGroups",
+    ]),
+    ...mapState(["lastLocations", "map"]),
  },
  methods: {
    ...mapMutations({
@@ -187,13 +194,13 @@ export default {
        (this.map.layers.line ||
          this.map.layers.points ||
          this.map.layers.heatmap) &&
-        this.locationHistoryLatLngs.length > 0
+        this.filteredLocationHistoryLatLngs.length > 0
      ) {
        this.$refs.map.mapObject.fitBounds(
-          new L.LatLngBounds(this.locationHistoryLatLngs)
+          new L.LatLngBounds(this.filteredLocationHistoryLatLngs)
        );
      } else if (this.map.layers.last && this.lastLocations.length > 0) {
-        const locations = this.lastLocations.map(l => L.latLng(l.lat, l.lon));
+        const locations = this.lastLocations.map((l) => L.latLng(l.lat, l.lon));
        this.$refs.map.mapObject.fitBounds(new L.LatLngBounds(locations), {
          maxZoom: this.maxNativeZoom,
        });
@@ -211,12 +218,12 @@ export default {
     */
    deviceLocationsWithNameAndFace(user, device, deviceLocations) {
      const lastLocation = this.lastLocations.find(
-        l => l.username === user && l.device === device
+        (l) => l.username === user && l.device === device
      );
      if (!lastLocation) {
        return deviceLocations;
      }
-      return deviceLocations.map(l => ({
+      return deviceLocations.map((l) => ({
        ...l,
        name: lastLocation.name,
        face: lastLocation.face,
@@ -225,9 +232,11 @@ export default {
  },
  watch: {
    lastLocations() {
-      this.fitView();
+      if (this.$config.onLocationChange.fitView) {
+        this.fitView();
+      }
    },
-    locationHistory() {
+    filteredLocationHistory() {
      this.fitView();
    },
  },
--- a/tests/util.test.js
+++ b/tests/util.test.js
@@ -22,6 +22,13 @@ describe("getApiUrl", () => {
    expect(getApiUrl("/foo/bar").href).toBe(
      "http://example.com/owntracks/foo/bar"
    );
+
+    config.api.baseUrl = "http://example.com/owntracks/";
+    expect(getApiUrl("foo").href).toBe("http://example.com/owntracks/foo");
+    expect(getApiUrl("/foo").href).toBe("http://example.com/owntracks/foo");
+    expect(getApiUrl("/foo/bar").href).toBe(
+      "http://example.com/owntracks/foo/bar"
+    );
  });
 });

--- a/vue.config.js
+++ b/vue.config.js
@@ -6,6 +6,7 @@ const packageJson = fs.readFileSync("./package.json");
 const version = JSON.parse(packageJson).version;

 module.exports = {
+  publicPath: "",
  configureWebpack: {
    plugins: [
      new webpack.DefinePlugin({
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Linus Groh	9e36d31997	Release 2.10.0	2021-11-28 18:04:58 +00:00
Linus Groh	5e37c7f4b8	Sort device location history entries by timestamp Fixes #67.	2021-11-28 17:52:28 +00:00
Linus Groh	7dda60d457	Ensure all SCSS files are formatted with prettier	2021-11-28 17:33:32 +00:00
Linus Groh	228900ff9f	Upgrade vue-js-modal to v2	2021-11-28 17:33:08 +00:00
Linus Groh	129446de1a	Upgrade dependencies	2021-11-28 17:31:55 +00:00
Linus Groh	af6c308bd6	Rename master branch to main	2021-11-28 17:31:39 +00:00
Linus Groh	223e19a118	Upgrade dependencies	2021-08-30 16:02:53 +01:00
Linus Groh	1260814309	Upgrade dependencies	2021-08-30 16:02:53 +01:00
Andrew Rowson	cfffbe9472	Add trailing slashes to location blocks (#63 ) On my configuration, having a trailing slash on `proxy_pass` but not on the location block causes the sub-path after the `location` to be appended to the `proxy_pass` url, causing a double-forward-slash. E.g. going to `/api/0/list` actually ends up making a call to the proxy of `http://otrecorder/api//0/list`, which fails for me.	2021-06-28 12:36:16 +01:00
Linus Groh	4031bda2f0	Reformat files with updated prettier	2021-05-28 17:37:35 +01:00
Linus Groh	69094e240e	Upgrade dependencies	2021-05-28 17:37:08 +01:00
Linus Groh	dfa7a423fa	Release 2.9.0	2021-05-01 22:46:02 +02:00
Linus Groh	411bc10b0b	Upgrade dependencies	2021-05-01 22:32:17 +02:00
Linus Groh	a994051940	Upgrade dependencies	2021-04-28 20:30:06 +02:00
Linus Groh	d325543bc6	Replace "OwnTracks UI" with "OwnTracks Frontend" "OwnTracks UI" was the name I initially used when developing this separately, but since it's now known as the "OwnTracks frontend", let's just call it that.	2021-03-24 19:00:35 +01:00
Linus Groh	80d3060fa8	Replace borales/actions-yarn with actions/setup-node	2021-03-24 18:26:52 +01:00
Linus Groh	e6c79ac606	Upgrade dependencies	2021-03-24 18:02:09 +01:00
Linus Groh	0b1271502f	Upgrade dependencies	2021-02-24 20:18:56 +01:00
Linus Groh	fdddd8e035	Add cancel button to loading modal	2021-02-24 20:07:47 +01:00
Linus Groh	245c1295e5	Fix JSDoc return type annotations of async functions These don't return the mentioned type directly, but a promise containing this type, which has to be await'ed first. This was confusing my IDE's tslint which suggested await would not be necessary.	2021-02-24 20:07:47 +01:00
Linus Groh	9786487646	Move .distance-travelled SCSS to scoped <style>	2021-02-24 20:07:47 +01:00
Linus Groh	b3529c211c	Release 2.8.0	2021-02-19 18:57:19 +01:00
Linus Groh	55178c7cc8	Add "Elevation gain / loss" es-ES and fr-FR translations Based on help from computers & friends, I'm sure both know better than I do!	2021-02-19 18:54:27 +01:00
Linus Groh	2fcf2151fa	Add elevation gain / loss to distance travelled stats Closes #51.	2021-02-18 22:05:46 +01:00
Linus Groh	5c6370090f	Release 2.7.0	2021-02-14 15:06:35 +01:00
Linus Groh	fc0189e5e2	Use official Docker Buildx action	2021-02-14 15:04:21 +01:00
Linus Groh	04fb50667b	Update Dockerfile to use node:14 and nginx:1.18-alpine	2021-02-14 15:04:21 +01:00
Linus Groh	6359b4783c	Add missing i18n for "Loading version..." Hopefully DeepL got the translations for French and Spanish right...	2021-02-14 13:51:34 +01:00
Linus Groh	4679f7fbb7	Add en-GB translations	2021-02-14 13:23:29 +01:00
Linus Groh	b29cd12ed9	Use xx-XX format for translation files and default to en-US Many languages have different variants, so instead of "en" we should be using "en-US" - this will make it possible to add slightly different British English translations, for example. Note that this was already supported for the `locale` config option, we were simply discarding the part after the dash when looking for the right translation file. Also make sure the en-US translations are actually American English, I'll add en-GB separately.	2021-02-14 13:21:54 +01:00
Linus Groh	a9026c7a0a	Upgrade dependencies	2021-02-14 12:49:46 +01:00
Elu43	27070812a4	Add French translations	2021-02-14 12:49:07 +01:00
Linus Groh	75e79fb0b1	Upgrade dependencies	2021-01-11 19:02:35 +01:00
Linus Groh	4bb9a20787	Fix incomplete Config interface in index.d.ts Haven't looked at this in a while. :)	2021-01-11 18:53:34 +01:00
Linus Groh	1a47fd1b6c	Release 2.6.0	2020-12-29 19:39:37 +01:00
Linus Groh	163e0e3ec7	Upgrade dependencies	2020-12-29 19:21:38 +01:00
Andrew Rowson	8d8664a338	Configure Vue to not assume it's on the web root Fixes #21.	2020-12-29 19:17:11 +01:00
Linus Groh	045e635c21	Add router.basePath config option for deployments at non-webroot This is in preparation of configuring Vue with publicPath: "".	2020-12-29 19:17:11 +01:00
dependabot[bot]	7db7837dfd	Bump ini from 1.3.5 to 1.3.8	2020-12-24 13:56:38 +01:00
Andrew Rowson	beb522c03e	NGINX should listen on IPv6 as well	2020-12-24 13:15:34 +01:00
Linus Groh	658cb6b223	Release 2.5.1	2020-10-27 18:07:21 +00:00
Linus Groh	7ab98be4ad	Add tests for baseUrl with trailing slash	2020-10-27 17:58:01 +00:00
Karmanyaah Malhotra	6d4d47b5a1	Fix getApiUrl() for baseUrl with trailing slash	2020-10-27 17:52:07 +00:00
Linus Groh	159470181c	Upgrade dependencies	2020-10-15 08:45:08 +02:00
Linus Groh	b53a0be707	Upgrade dependencies	2020-09-20 21:34:43 +01:00
Linus Groh	4e70d3a3ad	Update dependencies	2020-09-12 13:34:10 +01:00
Linus Groh	b42f6db024	Release 2.5.0	2020-09-07 21:56:37 +01:00
Linus Groh	3fbf0a2ff1	Upgrade dependencies	2020-09-07 21:46:17 +01:00
Linus Groh	206eb268fa	Add onLocationChange.fitView config option It defaults to false now, which is a change - this seems like a sensible choice though. I can see how it would be annoying to have the map change while looking at it just because something moved. Fixes #41.	2020-09-07 21:30:47 +01:00
Linus Groh	d7266f48f1	Upgrade dependencies	2020-07-31 20:44:36 +02:00
Linus Groh	9ec17e3e9c	Replace node-sass with sass (dart-sass)	2020-07-22 13:15:35 +02:00
Linus Groh	e320441b5e	Upgrade dependencies	2020-07-22 13:11:59 +02:00
Linus Groh	1282d93769	Remove datepicker buttons mobile style overrides This has been fixed upstream.	2020-06-24 14:49:30 +01:00
Linus Groh	b8661b11fb	Upgrade dependencies	2020-06-24 14:44:46 +01:00
Linus Groh	4f5bfefc36	Add more badges	2020-06-14 16:27:12 +01:00
Linus Groh	a1faf8153b	Replace Travis CI with GitHub Actions build/lint/test workflows (#39 )	2020-06-14 16:11:20 +01:00
Linus Groh	23d73461bc	Hardcode owntracks/frontend as DOCKER_IMAGE in docker.yml As we were using the DOCKER_USERNAME secret rather than "owntracks", the images all ended up in @jpmens' personal account :)	2020-06-14 15:28:41 +01:00
Linus Groh	90dac4022a	Rename main.yml to docker.yml I'll attempt to switch over from Travis CI to GitHub actions completely, so "main" is not the best naming choice.	2020-06-14 15:24:58 +01:00
Linus Groh	58b22aeebe	Update GitHub action Docker workflow name	2020-06-14 15:23:43 +01:00
wollew	cb79a4de81	Use GitHub Actions to build Docker images for multiple archs (#38 ) Co-authored-by: Wolfgang Miller-Reichling <wolfgang.miller-reichling@1und1.de>	2020-06-14 14:26:01 +01:00
Linus Groh	c5f491b6fb	Upgrade dependencies	2020-06-09 15:41:09 +01:00
dependabot[bot]	49a9b54a5e	Bump websocket-extensions from 0.1.3 to 0.1.4 (#37 ) Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2020-06-07 14:58:07 +01:00
Linus Groh	c449fcaf21	Update features list in README.md	2020-06-03 21:08:45 +01:00
Linus Groh	1746c359f4	Remove additional screenshots They don't really add much value.	2020-06-03 20:37:25 +01:00
Linus Groh	6180e52f71	Fix vertical offset of non-pin popups	2020-06-03 20:33:26 +01:00
Linus Groh	0f0f29fcee	Show regions for location on popup	2020-06-03 20:28:48 +01:00
Linus Groh	cb0694b032	Release 2.4.0	2020-06-01 18:44:07 +01:00
Linus Groh	d0f2a99302	Upgrade dependencies	2020-06-01 18:39:01 +01:00
Linus Groh	c8b0ec8b9e	Upgrade dependencies This includes a major version bump of ESLint and Prettier, so also some reformatting.	2020-05-16 13:58:48 +01:00
Linus Groh	906eb2a1b4	Fix typos causing the minAccuracy filter to work incorrectly	2020-05-16 13:50:57 +01:00
Linus Groh	005aab715f	Improve wording in docs	2020-05-11 19:22:13 +01:00
Linus Groh	b76cbdc2e6	Add filters.minAccuracy config option This allows us to ignore location points which do not meet the configured accuracy requirement. Closes #35.	2020-05-11 19:15:56 +01:00