Bump @vite-pwa/assets-generator from 0.0.10 to 0.2.4

.github/buildkitd.toml

@@ -0,0 +1,2 @@
+[worker.oci]
+  max-parallelism = 4

.github/dependabot.yml

@@ -1,17 +1,16 @@
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# Docs: <https://docs.github.com/en/free-pro-team@latest/github/administering-a-repository/customizing-dependency-updates>
 
 version: 2
+
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      # Check for updates to GitHub Actions every weekday
-      interval: "monthly"
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    commit-message:
-      # Prefix all commit messages with "npm: "
-      prefix: "npm"
+  - package-ecosystem: npm
+    directory: /
+    schedule: { interval: monthly }
+    reviewers: [freifunkMUC/webseite]
+    assignees: [freifunkMUC/webseite]
+
+  - package-ecosystem: github-actions
+    directory: /
+    schedule: { interval: monthly }
+    reviewers: [freifunkMUC/webseite]
+    assignees: [freifunkMUC/webseite]

.github/workflows/build.yml

@@ -0,0 +1,49 @@
+name: Build Docker image
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          config: .github/buildkitd.toml
+      - name: Retrieve author data
+        run: |
+          echo AUTHOR=$(curl -sSL ${{ github.event.repository.owner.url }} | jq -r '.name') >> $GITHUB_ENV
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          labels: |
+            org.opencontainers.image.authors=${{ env.AUTHOR }}
+      - name: Build Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64
+          push: false
+          load: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Inspect Docker image
+        run: docker image inspect ${{ steps.meta.outputs.tags }}

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [main]
+  schedule:
+    - cron: "30 16 * * 6"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ["javascript"]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
+
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
+
+      #- run: |
+      #   make bootstrap
+      #   make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3

.github/workflows/deploy.yml

@@ -0,0 +1,31 @@
+name: DEPLOY
+on:
+  push:
+    branches:
+      - main
+jobs:
+  map-deploy:
+    strategy:
+      fail-fast: false
+      matrix:
+        target: [webfrontend03, webfrontend04, webfrontend05, webfrontend06]
+        node-version: [20.x]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: npm install
+      - run: npm run build
+      - run: cp config.json build/
+      - name: rsync deployments
+        uses: burnett01/[email protected]
+        with:
+          switches: -avzr --delete --exclude .ssh
+          path: build/
+          remote_path: /srv/www/map.ffmuc.net/
+          remote_host: ${{ matrix.target }}.ext.ffmuc.net
+          remote_user: deploy-map
+          remote_key: ${{ secrets.DEPLOY_KEY }}

.github/workflows/docker.yml

@@ -0,0 +1,56 @@
+name: Publish Docker image
+on:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "v*.*.*"
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to GitHub Packages
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          config: .github/buildkitd.toml
+      - name: Login to DockerHub
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Retrieve author data
+        run: |
+          echo AUTHOR=$(curl -sSL ${{ github.event.repository.owner.url }} | jq -r '.name') >> $GITHUB_ENV
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          labels: |
+            org.opencontainers.image.authors=${{ env.AUTHOR }}
+      - name: Build container image
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64/v8,linux/arm/v7,linux/ppc64le,linux/s390x
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

CODEOWNERS

@@ -0,0 +1 @@
+*       @freifunkMUC/webseite

Dockerfile

@@ -0,0 +1,13 @@
+### Build stage for the website frontend
+FROM --platform=$BUILDPLATFORM node:20-bookworm-slim as build
+RUN apt-get update && \
+apt-get install -y python3
+WORKDIR /code
+COPY . ./
+RUN npm install
+RUN npm run build
+
+FROM nginx:1.25.4-alpine
+COPY --from=build /code/build/ /usr/share/nginx/html
+COPY --from=build /code/config.example.json /usr/share/nginx/html/
+EXPOSE 80

README.md

@@ -1,16 +1,18 @@
 # Meshviewer
 
-[![Build Status](https://img.shields.io/github/actions/workflow/status/freifunk/meshviewer/build-meshviewer.yml?branch=main&style=flat-square)](https://github.com/freifunk/meshviewer/actions?query=workflow%3A%22Build+Meshviewer%22)
-[![Release](https://img.shields.io/github/v/release/freifunk/meshviewer?style=flat-square)](https://github.com/freifunk/meshviewer/releases)
-[![License: AGPL v3](https://img.shields.io/github/license/freifunk/meshviewer.svg?style=flat-square)](https://www.gnu.org/licenses/agpl-3.0)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/freifunkmuc/meshviewer/build-meshviewer.yml?branch=main&style=flat-square)](https://github.com/freifunkMUC/meshviewer/actions?query=workflow%3A%22Build+Meshviewer%22)
+[![Release](https://img.shields.io/github/v/release/freifunkMUC/meshviewer?style=flat-square)](https://github.com/freifunkMUC/meshviewer/releases)
+[![License: AGPL v3](https://img.shields.io/github/license/freifunkMUC/meshviewer.svg?style=flat-square)](https://www.gnu.org/licenses/agpl-3.0)
 
 Meshviewer is an online visualization app to represent nodes and links on a map for Freifunk open mesh network.
 
+** This is a fork of https://github.com/freifunkMUC/meshviewer with some adjustments **
+
 ## Installation
 
-It is recommended to use the latest release:
+This fork of the new meshviewer has a new installation method:
 
-- Go to the [release page](https://github.com/freifunk/meshviewer/releases) and download the current build
+- Go to the [release page](https://github.com/freifunkMUC/meshviewer/releases) and download the current build
 - Let your webserver serve this build
 - Add a config.json to the webdir (based on config.example.json)
 
@@ -53,11 +55,11 @@ docker run -it --rm --name meshviewer-dev \
 
 The configuration documentation is nowhere near finished.
 
-### Deprecation Warning
+### Deprecation and EOL Warning
 
-The deprecation warning can be turned of with `"deprecation_enabled": false` - but we wouldn't suggest it.
+Both the deprecation and the EOL warning can be turned off with `"deprecation_enabled": false` - but we wouldn't suggest it.
 
-You can insert your own HTML into the deprecation warning via `"deprecation_text":""`.
+You can insert custom HTML into the deprecation and eol warning via `"deprecation_text":""` and `"eol_text":""` respectively.
 
 ## Development
 

config.example.json

@@ -71,5 +71,6 @@
   "devicePicturesLicense": "CC-BY-NC-SA 4.0",
   "node_custom": "/[^a-z0-9\\-\\.]/ig",
   "deprecation_text": "Hier kann ein eigener Text für die Deprecation Warning (inkl. HTML) stehen!",
+  "eol_text": "Hier kann ein eigener Text für die End-of-Life Warnung (inkl. HTML) stehen!",
   "deprecation_enabled": true
 }