Merge branch 'main' into iss_576-ee-webmaps

Author: MarcelGeo

.github/workflows/checks.yml

@@ -7,11 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
-    # need Node 16 or less to get rid of ERR_OSSL_EVP_UNSUPPORTED
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 20
 
     - name: Generate dist
       run: |
@@ -33,12 +31,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
-    # need Node 16 or less to get rid of ERR_OSSL_EVP_UNSUPPORTED
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
-
+        node-version: 20
+        cache: 'yarn'
     - name: Generate dist
       run: |
         yarn install

.github/workflows/dist-dev.yml

@@ -8,6 +8,7 @@ on:
     paths-ignore:
       - 'scripts/**'
       - 'README.md'
+  workflow_dispatch:
 
 concurrency: 
   group: dist-dev-${{ github.head_ref }}
@@ -18,18 +19,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
-    # need Node 16 or less to get rid of ERR_OSSL_EVP_UNSUPPORTED
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 20
+        cache: 'yarn'
 
     - name: Install
       run: |
        yarn install
 
     - name: Generate dist
+      env:
+          SMARTLOOK_KEY: ${{ secrets.SMARTLOOK_KEY }}
       run: |
+        echo "VITE_SMARTLOOK_KEY=$SMARTLOOK_KEY" > ./src/.env
         yarn build
 
     - name: "Check dist dir consistency"

.github/workflows/dist-prod.yml

@@ -15,18 +15,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-
-    # need Node 16 or less to get rid of ERR_OSSL_EVP_UNSUPPORTED
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 20
+        cache: 'yarn'
 
     - name: Install
       run: |
        yarn install
 
     - name: Generate dist
+      env:
+          SMARTLOOK_KEY: ${{ secrets.SMARTLOOK_KEY }}
       run: |
+        echo "VITE_SMARTLOOK_KEY=$SMARTLOOK_KEY" > ./src/.env
         yarn build
 
     - name: "Check dist dir consistency"

.gitignore

@@ -18,4 +18,7 @@ git-output.txt
 .node-version
 .vscode
 *-snippet.txt
-redirect_test.txt
+redirect_test.txt
+
+src/.vitepress/cache
+src/.vitepress/dist

LICENSE-CODE

@@ -1,10 +1,5 @@
 MIT License
 
-Copyright (c) 2020 Nuxt.js with the contributions of:
-- Sebastien Chopin (NuxtJS Company)
-- Alexandre Chopin (NuxtJS Company)
-- Benjamin Canac (NuxtJS Company)
-- Sergey Bedritsky (NuxtJS Company)
 Copyright (c) 2021 Lutra Consulting Ltd.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

README.md

@@ -17,7 +17,7 @@ Use GitHub Pull Requests to propose changes, we will review and merge your chang
 - Check official [vuepress documentation](https://vuepress.vuejs.org/)
 - Check the [Mergin Maps Documentation Guidelines](https://merginmaps.com/docs/misc/write-docs/)
 
-<div><img align="left" width="45" height="45" src="https://raw.githubusercontent.com/MerginMaps/docs/main/src/.vuepress/public/slack.svg"><a href="https://merginmaps.com/community/join">Join our community chat</a><br/>and ask questions!</div>
+<div><img align="left" width="45" height="45" src="https://raw.githubusercontent.com/MerginMaps/docs/main/src/public/slack.svg"><a href="https://merginmaps.com/community/join">Join our community chat</a><br/>and ask questions!</div>
 
 # Development
 
@@ -49,6 +49,8 @@ You can also spin-up a node Docker container using the provided compose file
 docker compose up mm-docs
 ```
 
+The minimum required version of Node.js is 18.
+
 ## Translations
 
 At the moment we do not support translations, see https://github.com/MerginMaps/docs/issues/133
@@ -65,20 +67,6 @@ yarn build
 
 and see the result in `dist` folder
 
-### Error for nodejs 17
-
-If you get `opensslErrorStack: [ 'error:03000086:digital envelope routines::initialization error' ]`, run
- ```bash
- export NODE_OPTIONS=--openssl-legacy-provider
- ```
- 
- or on Windows
- ```bash
- set NODE_OPTIONS=--openssl-legacy-provider
- ```
-  
- or downgrade `nodejs` to 16 or less. More here: https://github.com/webpack/webpack/issues/14532
-
 # License
 
 The Mergin Maps product documentation in the `src` are licensed under a [CC-BY license](LICENSE).

REDIRECTS

@@ -30,7 +30,7 @@ https://help.cloudmergin.com/plugin-new-project	https://merginmaps.com/docs/mana
 https://help.cloudmergin.com/plugin-sync-project	https://merginmaps.com/docs/manage/plugin/
 https://help.cloudmergin.com/plugin-variables	https://merginmaps.com/docs/layer/plugin-variables/
 https://help.cloudmergin.com/project-advanced	https://merginmaps.com/docs/manage/project-advanced/
-https://help.cloudmergin.com/project-details	https://merginmaps.com/docs/manage/project-details/
+https://help.cloudmergin.com/project-details	https://merginmaps.com/docs/manage/project-history/
 https://help.cloudmergin.com/quick-start	https://merginmaps.com/docs/tutorials/capturing-first-data/
 https://help.cloudmergin.com/quick-start.html	N/A - covered by non-html version
 https://help.cloudmergin.com/registration	https://merginmaps.com/docs/setup/sign-up-to-mergin-maps/
@@ -144,7 +144,7 @@ https://merginmaps.com/docs/howto/manage/plugin/plugin-variables/	https://mergin
 https://merginmaps.com/docs/howto/manage/troubleshoot/	https://merginmaps.com/docs/misc/troubleshoot/
 https://merginmaps.com/docs/howto/manage/web/dashboard/	https://merginmaps.com/docs/manage/dashboard/
 https://merginmaps.com/docs/howto/manage/web/project-advanced/	https://merginmaps.com/docs/manage/project-advanced/
-https://merginmaps.com/docs/howto/manage/web/project-details/	https://merginmaps.com/docs/manage/project-details/
+https://merginmaps.com/docs/howto/manage/web/project-details/	https://merginmaps.com/docs/manage/project-history/
 https://merginmaps.com/docs/howto/manage/web/register/	https://merginmaps.com/docs/setup/sign-up-to-mergin-maps/
 https://merginmaps.com/docs/howto/manage/web/subscriptions/	https://merginmaps.com/docs/manage/subscriptions/
 https://merginmaps.com/docs/howto/manage/web/web-create-project/	https://merginmaps.com/docs/manage/create-project/
@@ -174,11 +174,13 @@ https://merginmaps.com/docs/layer/settingup_forms/	https://merginmaps.com/docs/l
 https://merginmaps.com/docs/layer/settingup_forms_photo/	https://merginmaps.com/docs/layer/photos/
 https://merginmaps.com/docs/layer/settingup_forms_settings/	https://merginmaps.com/docs/layer/form-configuration/
 https://merginmaps.com/docs/manage/data_sync/	https://merginmaps.com/docs/manage/plugin/
+https://merginmaps.com/docs/manage/project-details/	https://merginmaps.com/docs/manage/project-history/
 https://merginmaps.com/docs/manage/plugin-multi-server-use/	https://merginmaps.com/docs/server/plugin-mobile-app/
 https://merginmaps.com/docs/manage/plugin-sync-project/	https://merginmaps.com/docs/manage/plugin/
 https://merginmaps.com/docs/misc/privacy/	N/A -- handled by https://merginmaps.com/privacy-policy/
 https://merginmaps.com/docs/reference/licensing/	https://merginmaps.com/docs/misc/licensing/
 https://merginmaps.com/docs/reference/privacy/	N/A -- handled by https://merginmaps.com/privacy-policy/
+https://merginmaps.com/docs/server/administer/environment/	https://merginmaps.com/docs/server/environment/
 https://merginmaps.com/docs/setup/install-input/	https://merginmaps.com/docs/setup/install-mobile-app/
 https://merginmaps.com/docs/setup/subscriptions/	https://merginmaps.com/docs/manage/subscriptions/
 https://merginmaps.com/docs/setup/working-with-organisations/	https://merginmaps.com/docs/manage/workspaces/

docker-compose.yml

@@ -1,7 +1,7 @@
 
 services:
   mm-docs:
-    image: node:16-alpine
+    image: node:20-alpine
     restart: on-failure
     volumes:
       - .:/docs

package.json

@@ -10,20 +10,18 @@
   },
   "repository": "merginmaps/docs",
   "scripts": {
-    "dev": "vuepress dev src",
-    "build": "vuepress build src",
-    "export": "vuepress export src"
+    "dev": "vitepress dev src",
+    "build": "vitepress build src",
+    "preview": "vitepress preview src"
   },
   "devDependencies": {
-    "@vuepress/plugin-medium-zoom": "^1.9.8",
-    "sass": "^1.62.1",
-    "sass-loader": "10",
-    "vuepress": "^1.9.8",
-    "vuepress-plugin-clean-urls": "^1.1.2",
-    "vuepress-plugin-fulltext-search": "^2.2.1"
+    "sass": "^1.86.0",
+    "vitepress": "^1.6.3",
+    "vitepress-plugin-image-viewer": "^1.1.6",
+    "vue": "^3.5.13"
   },
   "dependencies": {
-    "@gtm-support/vue2-gtm": "1.0.0",
+    "@gtm-support/vue-gtm": "^3.1.0",
     "smartlook-client": "^10.0.0"
   }
 }

scripts/broken-link-exceptions.txt

@@ -1 +1 @@
---exclude=https://de.merginmaps.com/* --exclude=https://es.merginmaps.com/* --exclude=https://fr.merginmaps.com/* --exclude=https://it.merginmaps.com/* --exclude=https://pt.merginmaps.com/* --exclude=.*twitter.com/* --exclude=.*x.com/* --exclude=https://www.fauna-flora.org* --exclude=https://download.geofabrik.de* --exclude=https://www.linkedin.com/* --exclude=https://docs.github.com* --exclude=.*openstreetmap.org.* --exclude=.*sqlite.org.* --exclude=.*gnu.org.* --exclude=.*github.com/merginmaps/docs/edit/.* --exclude=.*libtiff.org.* --exclude=https://gis.stackexchange.com/* --exclude=https://www.stackexchange.com/* --exclude=https://www.stackoverflow.com/* --exclude=https://ocw.un-ihe.org/* --exclude=https://merginmaps.com/case-studies/* --exclude=https://merginmaps.com/support/* --exclude=https://merginmaps.com/glossary/* --exclude=https://merginmaps.com/community/join --exclude=https://merginmaps.com/blog/* --exclude=https://apps.apple.com/us/app/input/* --exclude=https://www.maplango.com* --exclude=https://apps.apple.com/* --exclude=https://www.mobilegis.at/* --exclude=https://fonts.googleapis.com* --exclude=https://fonts.gstatic.com* --exclude=https://gispro.com.au/* --exclude=http://www.mobilegis.at* --exclude=http://linkedin.com/* --exclude=https://www.verticalgeo.com/* --exclude=https://mappinggis.com/* --exclude=https://app.termly.io/* --exclude=https://www.apple.com/* --exclude=https://play.google.com/* --exclude=https://www.nginx.com/* --exclude=https://proj.org/* --exclude=https://www.burdgis.com* --exclude=https://www.docker.com* --exclude=https://www.googletagmanager.com* --exclude=https://assets-global.website-files.com --exclude=https://uploads-ssl.webflow.com --exclude=https://www.institut-agro-montpellier.fr/* --exclude=http://bad-elf.com* --exclude=https://bad-elf.com/* --exclude=https://merginmaps.com/hardware-partners --exclude=https://merginmaps.com/partners --exclude=https://merginmaps.com/use-case/* --exclude=https://www.otter.org/ --exclude=https://docs.sqlalchemy.org* --exclude=https://www.facebook.com/* --exclude=.*gdal.org/* --exclude=.*spatialised.net/* --exclude=https://cdn.prod.website-files.com/* --exclude=https://aws.amazon.com/* --exclude=https://support.apple.com/* --exclude=https://www.ordnancesurvey.co.uk/* --exclude=https://www.ardusimple.com/* --exclude=https://exiftool.org/*
+--exclude=https://de.merginmaps.com/* --exclude=https://es.merginmaps.com/* --exclude=https://fr.merginmaps.com/* --exclude=https://it.merginmaps.com/* --exclude=https://pt.merginmaps.com/* --exclude=.*twitter.com/* --exclude=.*x.com/* --exclude=https://www.fauna-flora.org* --exclude=https://download.geofabrik.de* --exclude=https://www.linkedin.com/* --exclude=https://docs.github.com* --exclude=.*openstreetmap.org.* --exclude=.*sqlite.org.* --exclude=.*gnu.org.* --exclude=.*github.com/merginmaps/docs/edit/.* --exclude=.*libtiff.org.* --exclude=https://gis.stackexchange.com/* --exclude=https://www.stackexchange.com/* --exclude=https://www.stackoverflow.com/* --exclude=https://ocw.un-ihe.org/* --exclude=https://merginmaps.com/case-studies/* --exclude=https://merginmaps.com/support/* --exclude=https://merginmaps.com/glossary/* --exclude=https://merginmaps.com/community/join --exclude=https://merginmaps.com/blog/* --exclude=https://apps.apple.com/us/app/input/* --exclude=https://www.maplango.com* --exclude=https://apps.apple.com/* --exclude=https://www.mobilegis.at/* --exclude=https://fonts.googleapis.com* --exclude=https://fonts.gstatic.com* --exclude=https://gispro.com.au/* --exclude=http://www.mobilegis.at* --exclude=http://linkedin.com/* --exclude=https://www.verticalgeo.com/* --exclude=https://mappinggis.com/* --exclude=https://app.termly.io/* --exclude=https://www.apple.com/* --exclude=https://play.google.com/* --exclude=https://www.nginx.com/* --exclude=https://proj.org/* --exclude=https://www.burdgis.com* --exclude=https://www.docker.com* --exclude=https://www.googletagmanager.com* --exclude=https://assets-global.website-files.com --exclude=https://uploads-ssl.webflow.com --exclude=https://www.institut-agro-montpellier.fr/* --exclude=http://bad-elf.com* --exclude=https://bad-elf.com/* --exclude=https://merginmaps.com/hardware-partners --exclude=https://merginmaps.com/partners --exclude=https://merginmaps.com/use-case/* --exclude=https://www.otter.org/ --exclude=https://docs.sqlalchemy.org* --exclude=https://www.facebook.com/* --exclude=.*gdal.org/* --exclude=.*spatialised.net/* --exclude=https://cdn.prod.website-files.com/* --exclude=https://aws.amazon.com/* --exclude=https://support.apple.com/* --exclude=https://www.ordnancesurvey.co.uk/* --exclude=https://www.ardusimple.com/* --exclude=https://exiftool.org/* --exclude=https://pro.arcgis.com/*