Adapt to new OpenStreetMap backend (WIP)

.dockerignore

@@ -1,5 +1,6 @@
 .env
 .env.*
+.git
 !.env.example
 node_modules
 npm-debug.log

.env.example

@@ -1,33 +1,31 @@
 # NOTE: THIS IS DANGEROUS! It exposes your machine to attacks from the websites you visit.
 DANGEROUSLY_DISABLE_HOST_CHECK=true
 
-REACT_APP_AWS_S3_BUCKET_NAME=accessibility-cloud-uploads
-# token used by the NodeJS backend
-ELASTIC_APM_SECRET_TOKEN=
-# URL used by the NodeJS backend
-ELASTIC_APM_SERVER_URL=https://rum.wheelmap.org
-PUBLIC_URL=http://localhost:3000
 BASE_URL=http://localhost:3000
-REACT_APP_ACCESSIBILITY_CLOUD_UNCACHED_BASE_URL=https://www.wheelmap.pro
-REACT_APP_ACCESSIBILITY_CLOUD_APP_TOKEN=27be4b5216aced82122d7cf8f69e4a07
-# REACT_APP_ACCESSIBILITY_CLOUD_APP_TOKEN=90d73be7a3488827d8fca865584b129c
-REACT_APP_ACCESSIBILITY_CLOUD_BASE_URL=https://accessibility-cloud.freetls.fastly.net
-REACT_APP_ACCESSIBILITY_CLOUD_UNCACHED_BASE_URL=https://www.accessibility.cloud
-REACT_APP_ALLOW_ADDITIONAL_DATA_URLS=
-# token userd by the frontend
-REACT_APP_ELASTIC_APM_SECRET_TOKEN=
-# Used by the frontend
-REACT_APP_ELASTIC_APM_SERVER_URL=https://rum.wheelmap.org
-REACT_APP_MAPBOX_GL_ACCESS_TOKEN="pk....."
-# For development, do not set REACT_APP_WHEELMAP_API_BASE_URL here, but use the proxy defined in package.json.
-REACT_APP_WHEELMAP_API_BASE_URL=
-# REACT_APP_LEGACY_API_BASE_URL=https://legacy-api.wheelmap.org
-REACT_APP_LEGACY_API_BASE_URL=http://classic.wheelmap.org
-REACT_APP_WHEELMAP_API_KEY=3s8GNQvBCmwm45zro_jP
+DATABASE_URL=sqlite://localhost/:memory:?synchronize=true
+NEXTAUTH_API_BASE_URL=https://master.apis.dev.openstreetmap.org
+NEXTAUTH_BASE_URL=https://master.apis.dev.openstreetmap.org
+NEXTAUTH_SECRET=...
+NEXTAUTH_URL=http://127.0.0.1:3000
+NEXT_PUBLIC_ACCESSIBILITY_CLOUD_APP_TOKEN=...
+NEXT_PUBLIC_ACCESSIBILITY_CLOUD_BASE_URL=http://localhost:4000
+NEXT_PUBLIC_ACCESSIBILITY_CLOUD_UNCACHED_BASE_URL=http://localhost:4000
+NEXT_PUBLIC_ALLOW_ADDITIONAL_DATA_URLS=
+NEXT_PUBLIC_AWS_S3_BUCKET_NAME=accessibility-cloud-uploads
+NEXT_PUBLIC_MAPBOX_ACCOUNT_ID=sozialhelden
+NEXT_PUBLIC_MAPBOX_GL_ACCESS_TOKEN="pk....."
+NEXT_PUBLIC_MAPBOX_STYLE_ID=ckwdrjpmz4jox16o7libit9p4
+NEXT_PUBLIC_OSM_API_BACKEND_URL=http://localhost:3001/api/v1
+NEXT_PUBLIC_OSM_API_BASE_URL=https://master.apis.dev.openstreetmap.org
+NEXT_PUBLIC_OSM_API_LEGACY_BASE_URL=http://localhost:3001/api/v1/legacy
+NEXT_PUBLIC_OSM_API_TILE_BACKEND_URL=http://localhost:3001/api/v1
+NEXT_PUBLIC_OSM_API_TILE_BACKEND_URL_LEGACY=http://localhost:3001/api/v1/legacy
+OSM_OAUTH2_CLIENT_ID=...
+OSM_OAUTH2_CLIENT_SECRET=...
+PUBLIC_URL=http://localhost:3000
 
-# Test Vars
 BROWSERSTACK_USERNAME=
 BROWSERSTACK_ACCESS_KEY=
-# Expected Values: Chrome, Firefox, IE, Safari, Edge, Opera
 BROWSERSTACK_TEST_BROWSER=
-TEST_DEPLOYMENT_BASE_URL=
+TEST_DEPLOYMENT_BASE_URL=
+

.eslintrc.json

@@ -1,8 +1,5 @@
 {
-  "extends": ["eslint:recommended", "react-app", "plugin:jsx-a11y/recommended"],
-  "plugins": ["jsx-a11y"],
-  "rules": {
-    "no-console": [0],
-    "jsx-a11y/href-no-hash": [0]
-  }
+  "extends": ["next/core-web-vitals", "plugin:jsx-a11y/recommended"],
+  "plugins": ["jsx-a11y"]
 }
+

.vscode/settings.json

@@ -1,6 +1,5 @@
 {
   "editor.tabSize": 2,
-  "flow.useNPMPackagedFlow": true,
   "search.exclude": {
     "build/**/*": true,
     "lib/**/*": true,
@@ -9,12 +8,12 @@
   // Custom formatting rules
   "editor.wordWrapColumn": 100,
   "javascript.validate.enable": false,
-  "editor.formatOnSave": true,
-  "eslint.autoFixOnSave": false,
-  "prettier.requireConfig": true,
   "eslint.enable": true,
-  "tslint.jsEnable": false,
-  "tslint.autoFixOnSave": false,
   "javascript.format.enable": false,
-  "typescript.format.enable": false
+  "typescript.format.enable": false,
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.codeActionsOnSave": {
+    "source.fixAll": "explicit",
+    "source.organizeImports": "explicit"
+  }
 }

Dockerfile

@@ -17,11 +17,6 @@ COPY package-lock.json .
 FROM base AS buildenv
 RUN apt-get update && apt-get install -y --no-install-recommends \
   ca-certificates \
-  g++ \
-  build-essential \
-  make \
-  gnupg2 \
-  dumb-init \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
@@ -49,9 +44,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # copy production node_modules to /usr/app
 
 COPY --from=buildenv /usr/app/package.json .
-COPY --from=buildenv /usr/app/.env .
-COPY --from=buildenv /usr/app/.env.example .
 COPY --from=buildenv /usr/app/dist ./dist
+COPY --from=buildenv /usr/app/.next ./.next
 COPY --from=buildenv /usr/app/public ./public
 COPY --from=buildenv /usr/app/node_modules ./node_modules
 COPY --from=buildenv /usr/app/tests ./tests

README.md

@@ -32,7 +32,7 @@ npm run dev
 
 You will get some error messages from the Elastic APM client (our error collector for both [server](https://www.elastic.co/products/apm) and [client](https://www.elastic.co/guide/en/apm/agent/rum-js/4.x/getting-started.html)). If you want to test/develop the Elastic APM integration, you can get a valid token from the project maintainers.
 
-You can configure the app using process environment variables or a `.env` file. Process environment variables override values set in the `.env` file. Note that the build configuration [deviates from Webpack’s default behavior](https://github.com/sozialhelden/twelve-factor-dotenv) to improve build and bug reproducibility.
+You can configure the app using process environment variables or a `.env` file. Process environment variables override values set in the `.env` file.
 
 ### Recompile SVG
 
@@ -65,7 +65,7 @@ The app disallows embedding via `<iframe>` if you provide no valid `embedToken`
 
 ## Translation process
 
-Ensure the transifex client is setup https://docs.transifex.com/client/client-configuration#-transifexrc
+Ensure the transifex client is setup <https://docs.transifex.com/client/client-configuration#-transifexrc>
 
 Use `npm run push-translations` to push a new translation resource to our translation service [transifex](http://transifex.com).