delete peer and interface

.circleci/config.yml

@@ -0,0 +1,67 @@
+version: 2.1
+
+jobs:
+  build-latest:
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - go-mod-latest-v4-{{ checksum "go.sum" }}
+      - run:
+          name: Build Frontend
+          command: |
+            make frontend
+      - run:
+          name: Install Dependencies
+          command: |
+            make build-dependencies
+      - save_cache:
+          key: go-mod-latest-v4-{{ checksum "go.sum" }}
+          paths:
+            - "~/go/pkg/mod"
+      - run:
+          name: Build AMD64
+          command: |
+            VERSION=$CIRCLE_BRANCH
+            if [ ! -z "${CIRCLE_TAG}" ]; then VERSION=$CIRCLE_TAG; fi
+            make ENV_BUILD_IDENTIFIER=$VERSION ENV_BUILD_VERSION=$(echo $CIRCLE_SHA1 | cut -c1-7) build-amd64
+      - run:
+          name: Install Cross-Platform Dependencies
+          command: |
+            sudo apt-get update
+            sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install gcc-aarch64-linux-gnu libc6-dev-arm64-cross
+            sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
+            sudo ln -s /usr/include/asm-generic /usr/include/asm
+      - run:
+          name: Build ARM64
+          command: |
+            VERSION=$CIRCLE_BRANCH
+            if [ ! -z "${CIRCLE_TAG}" ]; then VERSION=$CIRCLE_TAG; fi
+            make ENV_BUILD_IDENTIFIER=$VERSION ENV_BUILD_VERSION=$(echo $CIRCLE_SHA1 | cut -c1-7) build-arm64
+      - run:
+          name: Build ARM
+          command: |
+            VERSION=$CIRCLE_BRANCH
+            if [ ! -z "${CIRCLE_TAG}" ]; then VERSION=$CIRCLE_TAG; fi
+            make ENV_BUILD_IDENTIFIER=$VERSION ENV_BUILD_VERSION=$(echo $CIRCLE_SHA1 | cut -c1-7) build-arm
+      - store_artifacts:
+          path: ~/repo/dist
+      - run:
+          name: "Publish Release on GitHub"
+          command: |
+            if [ ! -z "${CIRCLE_TAG}" ]; then
+               go install github.com/tcnksm/ghr@latest
+               ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -replace $CIRCLE_TAG ~/repo/dist
+            fi
+    working_directory: ~/repo
+    docker:
+      - image: cimg/go:1.21-node
+
+workflows:
+  build-and-release:
+    jobs:
+      #--------------- BUILD ---------------#
+      - build-latest:
+          filters:
+            tags:
+              only: /^v.*/

.dockerignore

@@ -1,14 +0,0 @@
-# Ignore everything
-*
-
-# Allow backend files
-!cmd/
-!internal/
-!go.mod
-!go.sum
-
-# Allow frontend files
-!frontend/
-
-# Ignore node_modules
-**/node_modules/

.github/dependabot.yml

@@ -1,30 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
-    groups:
-      actions:
-        patterns:
-          - "*"
-
-  - package-ecosystem: gomod
-    directory: /
-    schedule:
-      interval: weekly
-    groups:
-      golang:
-        patterns:
-          - golang.org*
-      gorm:
-        patterns:
-          - gorm.io*
-      patch:
-        update-types:
-          - patch

.github/workflows/chart.yml

@@ -1,75 +0,0 @@
-# Publish chart to the GitHub Container Registry (GHCR) on push to master
-# Run the following tests on PRs:
-# - Check if chart's documentation is up to date
-# - Check chart linting
-# - Check chart installation in a Kind cluster
-# - Check chart packaging
-
-name: Chart
-
-on:
-  pull_request:
-    branches: [master]
-    paths: ['deploy/helm/**']
-  push:
-    branches: [master]
-    paths: ['deploy/helm/**']
-
-jobs:
-  lint-test:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'pull_request' }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Check docs
-        run: |
-          make helm-docs
-          if ! git diff --exit-code; then
-            echo "error::Documentation is not up to date. Please run helm-docs and commit changes."
-            exit 1
-          fi
-
-      # ct lint requires Python 3.x to run following packages:
-      #  - yamale (https://github.com/23andMe/Yamale)
-      #  - yamllint (https://github.com/adrienverge/yamllint)
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-
-      - uses: helm/chart-testing-action@v2
-
-      - name: Run chart-testing (lint)
-        run: ct lint --config ct.yaml
-
-      - uses: nolar/setup-k3d-k3s@v1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Run chart-testing (install)
-        run: ct install --config ct.yaml
-
-      - name: Check chart packaging
-        run: helm package deploy/helm
-
-  publish:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'push' }}
-    permissions:
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Package helm chart
-        run: helm package deploy/helm
-
-      - name: Push chart to GHCR
-        run: helm push wg-portal-*.tgz oci://ghcr.io/${{ github.repository_owner }}/charts

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# 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: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '35 15 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      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@v1
+
+    # ℹ️ 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@v1

.github/workflows/docker-publish.yml

@@ -1,20 +1,26 @@
 name: Docker
 
-on:
+# This workflow uses actions that are not certified by GitHub.
-  pull_request:
+# They are provided by a third-party and are governed by
-    branches: [master]
+# separate terms of service, privacy policy, and support
-  push:
+# documentation.
-    branches: [master, stable]
+
-    # Publish vX.X.X tags as releases.
+on:
-    tags: ["v*.*.*"]
+  push:
+    branches: [ master, stable ]
+    # Publish vX.X.X tags as releases.
+    tags: [ 'v*.*.*' ]
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
 
-permissions:
-  contents: read
-  packages: write
 
 jobs:
-  build-n-push:
+  build-dockerhub:
-    name: Build and Push
+    name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
@@ -28,98 +34,106 @@ jobs:
 
       - name: Get Version
         shell: bash
-        run: echo "BUILD_VERSION=${GITHUB_REF_NAME}-${GITHUB_SHA::7}" >> $GITHUB_ENV
+        run: |
+          echo "::set-output name=identifier::$(echo ${GITHUB_REF##*/})"
+          echo "::set-output name=hash::$(echo ${GITHUB_SHA} | cut -c1-7)"
+        id: get_version
 
-      - name: Login to Docker Hub
+      - name: Log in to Docker Hub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Login to GitHub Container Registry
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: |
+          images: wgportal/wg-portal
-            wgportal/wg-portal
-            ghcr.io/${{ github.repository }}
           flavor: |
-            latest=auto
+            latest=true
             prefix=
             suffix=
           tags: |
-            type=ref,event=tag
             type=ref,event=branch
-            # semver tags, without v prefix
             type=semver,pattern={{version}}
-            # major and major.minor tags are not available for alpha or beta releases
             type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
+            type=semver,pattern=v{{major}}
-            # add v{{major}} tag, even for beta releases
-            type=match,pattern=(v\d),group=1,enable=${{ contains(github.ref, 'beta') }}
-            # add {{major}} tag, even for beta releases
-            type=match,pattern=v(\d),group=1,enable=${{ contains(github.ref, 'beta') }}
-            # set latest tag for default branch
-            type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          annotations: ${{ steps.meta.outputs.annotations }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
           build-args: |
-            BUILD_VERSION=${{ env.BUILD_VERSION }}
+            BUILD_IDENTIFIER=${{ steps.get_version.outputs.identifier }}
+            BUILD_VERSION=${{ steps.get_version.outputs.hash }}
 
-      - name: Export binaries from images
+  build-github:
-        uses: docker/build-push-action@v6
+    name: Push Docker image to Github Container Registry
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Get Version
+        shell: bash
+        run: |
+          echo "::set-output name=identifier::$(echo ${GITHUB_REF##*/})"
+          echo "::set-output name=hash::$(echo ${GITHUB_SHA} | cut -c1-7)"
+        id: get_version
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          flavor: |
+            latest=true
+            prefix=
+            suffix=
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern=v{{major}}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
         with:
           context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          target: binaries
-          outputs: type=local,dest=./binaries
           build-args: |
-            BUILD_VERSION=${{ env.BUILD_VERSION }}
+            BUILD_IDENTIFIER=${{ steps.get_version.outputs.identifier }}
-
+            BUILD_VERSION=${{ steps.get_version.outputs.hash }}
-      - name: Rename binaries
-        run: |
-          for file in binaries/linux*/wg-portal; do
-            mv $file binaries/wg-portal_$(basename $(dirname $file))
-          done
-
-      - name: Upload binaries
-        uses: actions/upload-artifact@v4
-        with:
-          name: binaries
-          path: binaries/wg-portal_linux*
-          retention-days: 10
-
-  release:
-    if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-latest
-    needs: build-n-push
-    permissions:
-      contents: write
-    steps:
-      - name: Download binaries
-        uses: actions/download-artifact@v4
-        with:
-          name: binaries
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: 'wg-portal_linux*'
-          generate_release_notes: true

.github/workflows/pages.yml

@@ -1,29 +1,22 @@
 name: github-pages
 on:
   push:
-    branches: [master]
+    branches:
-    tags: ["v*"]
+      - master
-
 permissions:
   contents: write
-
 jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-        with:
+      - uses: actions/setup-python@v4
-          fetch-depth: 0
-
-      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
-
+      - uses: actions/cache@v3
-      - name: Install dependencies
+        with:
-        run: pip install mike mkdocs-material[imaging] mkdocs-minify-plugin mkdocs-swagger-ui-tag
+          key: ${{ github.ref }}
-
+          path: .cache
-      - name: Publish documentation
+      - run: pip install mkdocs-material
-        run: mike deploy --push --update-aliases ${{ github.ref_name }} latest
+      - run: pip install pillow cairosvg
-        env:
+      - run: mkdocs gh-deploy --force
-          GIT_COMMITTER_NAME: "github-actions[bot]"
-          GIT_COMMITTER_EMAIL: "41898282+github-actions[bot]@users.noreply.github.com"

.gitignore

@@ -32,11 +32,10 @@ ssh.key
 .testCoverage.txt
 wg_portal.db
 sqlite.db
+go.sum
+swagger.json
+swagger.yaml
 /config.yml
 /config/
 venv/
-.cache/
+.cache/
-# ignore local frontend dist directory
-internal/app/api/core/frontend-dist
-# mkdocs output directory
-site/

Dockerfile

@@ -1,69 +1,54 @@
 # Dockerfile References: https://docs.docker.com/engine/reference/builder/
 # This dockerfile uses a multi-stage build system to reduce the image footprint.
 
-######
+######-
-# Build frontend
+# Start from the latest golang base image as builder image (only used to compile the code)
-######
+######-
-FROM --platform=${BUILDPLATFORM} node:lts-alpine AS frontend
+FROM golang:1.21 as builder
-# Set the working directory
+
-WORKDIR /build
+ARG BUILD_IDENTIFIER
-# Download dependencies
+ENV ENV_BUILD_IDENTIFIER=$BUILD_IDENTIFIER
-COPY frontend/package.json frontend/package-lock.json ./
-RUN npm ci
-# Set dist output directory
-ENV DIST_OUT_DIR="dist"
-# Copy the sources to the working directory
-COPY frontend .
-# Build the frontend
-RUN npm run build
 
-######
-# Build backend
-######
-FROM --platform=${BUILDPLATFORM} golang:1.23-alpine AS builder
-# Set the working directory
-WORKDIR /build
-# Download dependencies
-COPY go.mod go.sum ./
-RUN go mod download
-# Copy the sources to the working directory
-COPY ./cmd ./cmd
-COPY ./internal ./internal
-# Copy the frontend build result
-COPY --from=frontend /build/dist/ ./internal/app/api/core/frontend-dist/
-# Set the build version from arguments
 ARG BUILD_VERSION
-# Split to cross-platform build
+ENV ENV_BUILD_VERSION=$BUILD_VERSION
-ARG TARGETARCH
-# Build the application
-RUN CGO_ENABLED=0 GOARCH=${TARGETARCH} go build -o /build/dist/wg-portal \
-  -ldflags "-w -s -extldflags '-static' -X 'github.com/h44z/wg-portal/internal.Version=${BUILD_VERSION}'" \
-  -tags netgo \
-  cmd/wg-portal/main.go
 
-######
+# populated by BuildKit
-# Export binaries
+ARG TARGETPLATFORM
-######
+ENV ENV_TARGETPLATFORM=$TARGETPLATFORM
-FROM scratch AS binaries
-COPY --from=builder /build/dist/wg-portal /
 
-######
+RUN mkdir /build
-# Final image
+
-######
+# Copy the source from the current directory to the Working Directory inside the container
+ADD . /build/
+
+# Set the Current Working Directory inside the container
+WORKDIR /build
+
+# Build the Go app
+RUN echo "Building version '$ENV_BUILD_IDENTIFIER-$ENV_BUILD_VERSION' for platform $ENV_TARGETPLATFORM"; make build
+
+######-
+# Here starts the main image
+######-
 FROM alpine:3.19
+
 # Install OS-level dependencies
-RUN apk add --no-cache bash curl iptables nftables openresolv
+RUN apk add --no-cache bash openresolv
+
 # Setup timezone
-ENV TZ=UTC
+ENV TZ=Europe/Vienna
+
 # Copy binaries
 COPY --from=builder /build/dist/wg-portal /app/wg-portal
+
 # Set the Current Working Directory inside the container
 WORKDIR /app
-# Expose default ports for metrics, web and wireguard
+
-EXPOSE 8787/tcp
+# by default, the web-portal is reachable on port 8888
 EXPOSE 8888/tcp
-EXPOSE 51820/udp
+
 # the database and config file can be mounted from the host
 VOLUME [ "/app/data", "/app/config" ]
+
 # Command to run the executable
 ENTRYPOINT [ "/app/wg-portal" ]

Makefile

@@ -127,15 +127,4 @@ build-docker:
 	docker build --progress=plain \
 	--build-arg BUILD_IDENTIFIER=${ENV_BUILD_IDENTIFIER} --build-arg BUILD_VERSION=${ENV_BUILD_VERSION} \
  	--build-arg TARGETPLATFORM=unknown . \
-	-t h44z/wg-portal:local
+	-t h44z/wg-portal:local
-
-#< helm-docs: Generate the helm chart documentation
-.PHONY: helm-docs
-helm-docs:
-	docker run --rm --volume "${PWD}/deploy:/helm-docs" -u "$$(id -u)" jnorwood/helm-docs -s file
-
-#< run-mkdocs: Run a local instance of MkDocs
-.PHONY: run-mkdocs
-run-mkdocs:
-	python -m venv venv; source venv/bin/activate; pip install mike cairosvg mkdocs-material mkdocs-minify-plugin mkdocs-swagger-ui-tag
-	venv/bin/mkdocs serve

README.md

@@ -1,74 +1,208 @@
 # WireGuard Portal (v2 - testing)
 
-[![Build Status](https://github.com/h44z/wg-portal/actions/workflows/docker-publish.yml/badge.svg?event=push)](https://github.com/h44z/wg-portal/actions/workflows/docker-publish.yml)
+[![Build Status](https://travis-ci.com/h44z/wg-portal.svg?token=q4pSqaqT58Jzpxdx62xk&branch=master)](https://travis-ci.com/h44z/wg-portal)
 [![License: MIT](https://img.shields.io/badge/license-MIT-green.svg)](https://opensource.org/licenses/MIT)
-![GitHub last commit](https://img.shields.io/github/last-commit/h44z/wg-portal/master)
+![GitHub last commit](https://img.shields.io/github/last-commit/h44z/wg-portal)
 [![Go Report Card](https://goreportcard.com/badge/github.com/h44z/wg-portal)](https://goreportcard.com/report/github.com/h44z/wg-portal)
 ![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/h44z/wg-portal)
 ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/h44z/wg-portal)
 [![Docker Pulls](https://img.shields.io/docker/pulls/h44z/wg-portal.svg)](https://hub.docker.com/r/wgportal/wg-portal/)
 
-> [!CAUTION]
+> :warning: **IMPORTANT** Version 2 is currently under development and may contain bugs. It is currently not advised to use this version
-> Version 2 is currently under development and may contain bugs and breaking changes.
+in production. Use version [v1](https://github.com/h44z/wg-portal/tree/stable) instead.
-> It is not advised to use this version in production. Use version [v1](https://github.com/h44z/wg-portal/tree/stable) instead.
 
-> [!IMPORTANT]
+Since the project was accepted by the Docker-Sponsored Open Source Program, the Docker image location has moved to: https://hub.docker.com/r/wgportal/wg-portal.
-> Since the project was accepted by the Docker-Sponsored Open Source Program, the Docker image location has moved to [wgportal/wg-portal](https://hub.docker.com/r/wgportal/wg-portal).
+Please update the Docker image from **h44z/wg-portal** to **wgportal/wg-portal**.
-> Please update the Docker image from **h44z/wg-portal** to **wgportal/wg-portal**.
 
-## Introduction
+A simple, web based configuration portal for [WireGuard](https://wireguard.com).
-<!-- Text from this line # is included in docs/documentation/overview.md -->
-**WireGuard Portal** is a simple, web-based configuration portal for [WireGuard](https://wireguard.com) server management.
 The portal uses the WireGuard [wgctrl](https://github.com/WireGuard/wgctrl-go) library to manage existing VPN
-interfaces. This allows for the seamless activation or deactivation of new users without disturbing existing VPN
+interfaces. This allows for seamless activation or deactivation of new users, without disturbing existing VPN
 connections.
 
-The configuration portal supports using a database (SQLite, MySQL, MsSQL or Postgres), OAuth or LDAP
+The configuration portal supports using a database (SQLite, MySQL, MsSQL or Postgres), OAuth or LDAP (Active Directory or OpenLDAP) as a user source for authentication and profile data.
-(Active Directory or OpenLDAP) as a user source for authentication and profile data.
+
 
 ## Features
+ * Self-hosted - the whole application is a single binary
+ * Responsive web UI written in Vue.JS
+ * Automatically select IP from the network pool assigned to client
+ * QR-Code for convenient mobile client configuration
+ * Sent email to client with QR-code and client config
+ * Enable / Disable clients seamlessly
+ * Generation of wg-quick configuration file (`wgX.conf`) if required
+ * User authentication (database, OAuth or LDAP) 
+ * IPv6 ready
+ * Docker ready
+ * Can be used with existing WireGuard setups
+ * Support for multiple WireGuard interfaces
+ * Peer Expiry Feature
+ * Handle route and DNS settings like wg-quick does
+ * ~~REST API for management and client deployment~~ (coming soon)
 
-* Self-hosted - the whole application is a single binary
+![Screenshot](screenshot.png)
-* Responsive multi-language web UI written in Vue.JS
-* Automatically selects IP from the network pool assigned to the client
-* QR-Code for convenient mobile client configuration
-* Sends email to the client with QR-code and client config
-* Enable / Disable clients seamlessly
-* Generation of wg-quick configuration file (`wgX.conf`) if required
-* User authentication (database, OAuth, or LDAP)
-* IPv6 ready
-* Docker ready
-* Can be used with existing WireGuard setups
-* Support for multiple WireGuard interfaces
-* Peer Expiry Feature
-* Handles route and DNS settings like wg-quick does
-* Exposes Prometheus metrics for monitoring and alertingt
-* REST API for management and client deployment
 
-<!-- Text to this line # is included in docs/documentation/overview.md -->
-![Screenshot](docs/assets/images/screenshot.png)
 
-## Documentation
+## Configuration
+You can configure WireGuard Portal using a yaml configuration file.
+The filepath of the yaml configuration file defaults to **config/config.yml** in the working directory of the executable.
+It is possible to override the configuration filepath using the environment variable **WG_PORTAL_CONFIG**.
+For example: `WG_PORTAL_CONFIG=/home/test/config.yml ./wg-portal-amd64`.
+
+By default, WireGuard Portal uses a SQLite database. The database is stored in **data/sqlite.db** in the working directory of the executable.
+
+### Configuration Options
+The following configuration options are available:
+
+| configuration key         | parent key | default_value                              | description                                                                                                                          |
+|---------------------------|------------|--------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------|
+| admin_user                | core       | admin@wgportal.local                       | The administrator user. This user will be created as default admin if it does not yet exist.                                         |
+| admin_password            | core       | wgportal                                   | The administrator password. If unchanged, a random password will be set on first startup.                                            |
+| editable_keys             | core       | true                                       | Allow to edit key-pairs in the UI.                                                                                                   |
+| create_default_peer       | core       | false                                      | If an LDAP user logs in for the first time, a new WireGuard peer will be created on the WG_DEFAULT_DEVICE if this option is enabled. |
+| self_provisioning_allowed | core       | false                                      | Allow registered users to automatically create peers via their profile page.                                                         |
+| import_existing           | core       | true                                       | Import existing WireGuard interfaces and peers into WireGuard Portal.                                                                |
+| restore_state             | core       | true                                       | Restore the WireGuard interface state after WireGuard Portal has started.                                                            |
+| log_level                 | advanced   | warn                                       | The loglevel, can be one of: trace, debug, info, warn, error.                                                                        |
+| log_pretty                | advanced   | false                                      | Uses pretty, colorized log messages.                                                                                                 |
+| log_json                  | advanced   | false                                      | Logs in JSON format.                                                                                                                 |
+| ldap_sync_interval        | advanced   | 15m                                        | The time interval after which users will be synchronized from LDAP.                                                                  |
+| start_listen_port         | advanced   | 51820                                      | The first port number that will be used as listening port for new interfaces.                                                        |
+| start_cidr_v4             | advanced   | 10.11.12.0/24                              | The first IPv4 subnet that will be used for new interfaces.                                                                          |
+| start_cidr_v6             | advanced   | fdfd:d3ad:c0de:1234::0/64                  | The first IPv6 subnet that will be used for new interfaces.                                                                          |
+| use_ip_v6                 | advanced   | true                                       | Enable IPv6 support.                                                                                                                 |
+| config_storage_path       | advanced   |                                            | If a wg-quick style configuration should be stored to the filesystem, specify a storage directory.                                   |
+| expiry_check_interval     | advanced   | 15m                                        | The interval after which existing peers will be checked if they expired.                                                             |
+| rule_prio_offset          | advanced   | 20000                                      | The default offset for ip route rule priorities.                                                                                     |
+| route_table_offset        | advanced   | 20000                                      | The default offset for ip route table id's.                                                                                          |
+| use_ping_checks           | statistics | true                                       | If enabled, peers will be pinged periodically to check if they are still connected.                                                  |
+| ping_check_workers        | statistics | 10                                         | Number of parallel ping checks that will be executed.                                                                                |
+| ping_unprivileged         | statistics | false                                      | If set to false, the ping checks will run without root permissions (BETA).                                                           |
+| ping_check_interval       | statistics | 1m                                         | The interval time between two ping check runs.                                                                                       |
+| data_collection_interval  | statistics | 10m                                        | The interval between the data collection cycles.                                                                                     |
+| collect_interface_data    | statistics | true                                       | A flag to enable interface data collection like bytes sent and received.                                                             |
+| collect_peer_data         | statistics | true                                       | A flag to enable peer data collection like bytes sent and received, last handshake and remote endpoint address.                      |
+| collect_audit_data        | statistics | true                                       | If enabled, some events, like portal logins, will be logged to the database.                                                         |
+| host                      | mail       | 127.0.0.1                                  | The mail-server address.                                                                                                             |
+| port                      | mail       | 25                                         | The mail-server SMTP port.                                                                                                           |
+| encryption                | mail       | none                                       | SMTP encryption type, allowed values: none, tls, starttls.                                                                           |
+| cert_validation           | mail       | false                                      | Validate the mail server certificate (if encryption tls is used).                                                                    |
+| username                  | mail       |                                            | The SMTP user name.                                                                                                                  |
+| password                  | mail       |                                            | The SMTP password.                                                                                                                   |
+| auth_type                 | mail       | plain                                      | SMTP authentication type, allowed values: plain, login, crammd5.                                                                     |
+| from                      | mail       | Wireguard Portal <noreply@wireguard.local> | The address that is used to send mails.                                                                                              |
+| link_only                 | mail       | false                                      | Only send links to WireGuard Portal instead of the full configuration.                                                               |
+| callback_url_prefix       | auth       | /api/v0                                    | OAuth callback URL prefix. The full callback URL will look like: https://wg.portal.local/callback_url_prefix/provider_name/callback  |
+| oidc                      | auth       | Empty Array - no providers configured      | A list of OpenID Connect providers. See auth/oidc properties to setup a new provider.                                                |
+| oauth                     | auth       | Empty Array - no providers configured      | A list of plain OAuth providers. See auth/oauth properties to setup a new provider.                                                  |
+| ldap                      | auth       | Empty Array - no providers configured      | A list of LDAP providers. See auth/ldap properties to setup a new provider.                                                          |
+| provider_name             | auth/oidc  |                                            | A unique provider name. This name must be unique throughout all authentication providers (even other types).                         |
+| display_name              | auth/oidc  |                                            | The display name is shown at the login page (the login button).                                                                      |
+| base_url                  | auth/oidc  |                                            | The base_url is the URL identifier for the service. For example: "https://accounts.google.com".                                      |
+| client_id                 | auth/oidc  |                                            | The OAuth client id.                                                                                                                 |
+| client_secret             | auth/oidc  |                                            | The OAuth client secret.                                                                                                             |
+| extra_scopes              | auth/oidc  |                                            | Extra scopes that should be used in the OpenID Connect authentication flow.                                                          |
+| field_map                 | auth/oidc  |                                            | Mapping of user fields. Internal fields: user_identifier, email, firstname, lastname, phone, department and is_admin.                |
+| registration_enabled      | auth/oidc  |                                            | If registration is enabled, new user accounts will created in WireGuard Portal.                                                      |
+| provider_name             | auth/oauth |                                            | A unique provider name. This name must be unique throughout all authentication providers (even other types).                         |
+| display_name              | auth/oauth |                                            | The display name is shown at the login page (the login button).                                                                      |
+| base_url                  | auth/oauth |                                            | The base_url is the URL identifier for the service. For example: "https://accounts.google.com".                                      |
+| client_id                 | auth/oauth |                                            | The OAuth client id.                                                                                                                 |
+| client_secret             | auth/oauth |                                            | The OAuth client secret.                                                                                                             |
+| auth_url                  | auth/oauth |                                            | The URL for the authentication endpoint.                                                                                             |
+| token_url                 | auth/oauth |                                            | The URL for the token endpoint.                                                                                                      |
+| redirect_url              | auth/oauth |                                            | The redirect URL.                                                                                                                    |
+| user_info_url             | auth/oauth |                                            | The URL for the user information endpoint.                                                                                           |
+| scopes                    | auth/oauth |                                            | OAuth scopes.                                                                                                                        |
+| field_map                 | auth/oauth |                                            | Mapping of user fields. Internal fields: user_identifier, email, firstname, lastname, phone, department and is_admin.                |
+| registration_enabled      | auth/oauth |                                            | If registration is enabled, new user accounts will created in WireGuard Portal.                                                      |
+| url                       | auth/ldap  |                                            | The LDAP server url. For example: ldap://srv-ad01.company.local:389	                                                                 |
+| start_tls                 | auth/ldap  |                                            | Use STARTTLS to encrypt LDAP requests.                                                                                               |
+| cert_validation           | auth/ldap  |                                            | Validate the LDAP server certificate.                                                                                                |
+| tls_certificate_path      | auth/ldap  |                                            | A path to the TLS certificate.                                                                                                       |
+| tls_key_path              | auth/ldap  |                                            | A path to the TLS key.                                                                                                               |
+| base_dn                   | auth/ldap  |                                            | The base DN for searching users. For example: DC=COMPANY,DC=LOCAL	                                                                   |
+| bind_user                 | auth/ldap  |                                            | The bind user. For example: company\\ldap_wireguard	                                                                                 |
+| bind_pass                 | auth/ldap  |                                            | The bind password.                                                                                                                   |
+| field_map                 | auth/ldap  |                                            | Mapping of user fields. Internal fields: user_identifier, email, firstname, lastname, phone, department and memberof.                |
+| login_filter              | auth/ldap  |                                            | LDAP filters for users that should be allowed to log in. {{login_identifier}} will be replaced with the login username.              |
+| admin_group               | auth/ldap  |                                            | Users in this group are marked as administrators.                                                                                    |
+| synchronize               | auth/ldap  |                                            | Periodically synchronize users (name, department, phone, status, ...) to the WireGuard Portal database.                              |
+| disable_missing           | auth/ldap  |                                            | If synchronization is enabled, missing LDAP users will be disabled in WireGuard Portal.                                              |
+| sync_filter               | auth/ldap  |                                            | LDAP filters for users that should be synchronized to WireGuard Portal.                                                              |
+| registration_enabled      | auth/ldap  |                                            | If registration is enabled, new user accounts will created in WireGuard Portal.                                                      |
+| debug                     | database   | false                                      | Debug database statements (log each statement).                                                                                      |
+| slow_query_threshold      | database   |                                            | A threshold for slow database queries. If the threshold is exceeded, a warning message will be logged.                               |
+| type                      | database   | sqlite                                     | The database type. Allowed values: sqlite, mssql, mysql or postgres.                                                                 |
+| dsn                       | database   | data/sqlite.db                             | The database DSN. For example: user:pass@tcp(1.2.3.4:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local                           |
+| request_logging           | web        | false                                      | Log all HTTP requests.                                                                                                               |
+| external_url              | web        | http://localhost:8888                      | The URL where a client can access WireGuard Portal.                                                                                  |
+| listening_address         | web        | :8888                                      | The listening port of the web server.                                                                                                |
+| session_identifier        | web        | wgPortalSession                            | The session identifier for the web frontend.                                                                                         |
+| session_secret            | web        | very_secret                                | The session secret for the web frontend.                                                                                             |
+| csrf_secret               | web        | extremely_secret                           | The CSRF secret.                                                                                                                     |
+| site_title                | web        | WireGuard Portal                           | The title that is shown in the web frontend.                                                                                         |
+| site_company_name         | web        | WireGuard Portal                           | The company name that is shown at the bottom of the web frontend.                                                                    |
+
+
+## Upgrading from V1
+
+> :warning: Before upgrading from V1, make sure that you have a backup of your currently working configuration files and database!
+
+To start the upgrade process, start the wg-portal binary with the **-migrateFrom** parameter. 
+The configuration (config.yml) for WireGuard Portal must be updated and valid before starting the upgrade.
+
+To upgrade from a previous SQLite database, start wg-portal like:
+
+```shell
+./wg-portal-amd64 -migrateFrom=old_wg_portal.db
+```
+
+You can also specify the database type using the parameter **-migrateFromType**, supported types: mysql, mssql, postgres or sqlite.
+For example:
+
+```shell
+./wg-portal-amd64 -migrateFromType=mysql -migrateFrom=user:pass@tcp(1.2.3.4:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local
+```
+
+The upgrade will transform the old, existing database and store the values in the new database specified in config.yml.
+Ensure that the new database does not contain any data!
 
-For the complete documentation visit [wgportal.org](https://wgportal.org).
 
 ## V2 TODOs
+ * Public REST API
+ * Translations
+ * Documentation
+ * Audit UI
 
-* Audit UI
+
+## Building
+
+To build a standalone application, use the Makefile provided in the repository. 
+Go version 1.20 or higher has to be installed to build WireGuard Portal. 
+If you want to re-compile the frontend, NodeJS 18 and NPM >= 9 is required.
+
+```shell
+# build the frontend (optional)
+make frontend
+
+# build the binary
+make build
+```
 
 ## What is out of scope
+ * Automatic generation or application of any `iptables` or `nftables` rules.
+ * Support for operating systems other than linux.
+ * Automatic import of private keys of an existing WireGuard setup.
 
-* Automatic generation or application of any `iptables` or `nftables` rules.
-* Support for operating systems other than linux.
-* Automatic import of private keys of an existing WireGuard setup.
 
 ## Application stack
 
-* [wgctrl-go](https://github.com/WireGuard/wgctrl-go) and [netlink](https://github.com/vishvananda/netlink) for interface handling
+ * [wgctrl-go](https://github.com/WireGuard/wgctrl-go) and [netlink](https://github.com/vishvananda/netlink) for interface handling
-* [Gin](https://github.com/gin-gonic/gin), HTTP web framework written in Go
+ * [Gin](https://github.com/gin-gonic/gin), HTTP web framework written in Go
-* [Bootstrap](https://getbootstrap.com/), for the HTML templates
+ * [Bootstrap](https://getbootstrap.com/), for the HTML templates
-* [Vue.JS](https://vuejs.org/), for the frontend
+ * [Vue.JS](https://vuejs.org/), for the frontend
+
 
 ## License
 
-* MIT License. [MIT](LICENSE.txt) or <https://opensource.org/licenses/MIT>
+ * MIT License. [MIT](LICENSE.txt) or https://opensource.org/licenses/MIT

SECURITY.md

@@ -1,33 +0,0 @@
-# Security Policy
-
-If you believe you've found a security issue in one of the supported versions of *WireGuard Portal*, please report it to us as described below.
-
-## Supported Versions
-
-| Version | Supported            |
-| ------- | -------------------- |
-| v2.x    | :white_check_mark:   |
-| v1.x    | :white_check_mark:   |
-
-## Reporting a Vulnerability
-
-Please do not report security vulnerabilities through public GitHub issues. 
-
-Instead, we encourage you to submit a report through Github [private vulnerability reporting](https://github.com/h44z/wg-portal/security).
-If you prefer to submit a report without logging in to Github, please email *info (at) wgportal.org*. 
-We will respond as soon as possible, but as only two people currently maintain this project, we cannot guarantee specific response times.
-
-We prefer all communications to be in English.
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
-
- - Type of issue (e.g. SQL injection, cross-site scripting, ...)
- - Full paths of source file(s) related to the manifestation of the issue
- - The location of the affected source code (tag/branch/commit or direct URL)
- - Any special configuration required to reproduce the issue
- - Step-by-step instructions to reproduce the issue
- - Proof-of-concept or exploit code (if possible)
- - Impact of the issue, including how an attacker might exploit the issue
-
-This information will help us triage your report more quickly.
-
-Thank you for helping keep *WireGuard Portal* and its users safe!

cmd/api_build_tool/main.go

@@ -7,15 +7,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/sirupsen/logrus"
 	"github.com/swaggo/swag"
 	"github.com/swaggo/swag/gen"
-	"gopkg.in/yaml.v2"
 )
 
-var apiRootPath = "/internal/app/api"
-var apiDocPath = "core/assets/doc"
-var apiMkDocPath = "/docs/documentation/rest-api"
-
 // this replaces the call to: swag init --propertyStrategy pascalcase --parseDependency --parseInternal --generalInfo base.go
 func main() {
 	wd, err := os.Getwd() // should be the project root
@@ -23,9 +19,10 @@ func main() {
 		panic(err)
 	}
 
-	apiBasePath := filepath.Join(wd, apiRootPath)
+	apiBasePath := filepath.Join(wd, "/internal/app/api")
-	apis := []string{"v0", "v1"}
+	apis := []string{"v0"}
 
+	hasError := false
 	for _, apiVersion := range apis {
 		apiPath := filepath.Join(apiBasePath, apiVersion, "handlers")
 
@@ -36,20 +33,16 @@ func main() {
 
 		err := generateApi(apiBasePath, apiPath, apiVersion)
 		if err != nil {
-			log.Fatalf("failed to generate API docs for %s: %v", apiVersion, err)
+			hasError = true
-		}
+			logrus.Errorf("failed to generate API docs for %s: %v", apiVersion, err)
-
-		// copy the latest version of the API docs for mkdocs
-		if apiVersion == apis[len(apis)-1] {
-			if err = copyDocForMkdocs(wd, apiBasePath, apiVersion); err != nil {
-				log.Printf("failed to copy API docs for mkdocs: %v", err)
-			} else {
-				log.Println("Copied API docs " + apiVersion + " for mkdocs")
-			}
 		}
 
 		log.Println("Generated swagger docs for API", apiVersion)
 	}
+
+	if hasError {
+		os.Exit(1)
+	}
 }
 
 func generateApi(basePath, apiPath, version string) error {
@@ -58,10 +51,10 @@ func generateApi(basePath, apiPath, version string) error {
 		Excludes:            "",
 		MainAPIFile:         "base.go",
 		PropNamingStrategy:  swag.PascalCase,
-		OutputDir:           filepath.Join(basePath, apiDocPath),
+		OutputDir:           filepath.Join(basePath, "core/assets/doc"),
 		OutputTypes:         []string{"json", "yaml"},
 		ParseVendor:         false,
-		ParseDependency:     3,
+		ParseDependency:     true,
 		MarkdownFilesDir:    "",
 		ParseInternal:       true,
 		GeneratedTime:       false,
@@ -75,43 +68,3 @@ func generateApi(basePath, apiPath, version string) error {
 
 	return nil
 }
-
-func copyDocForMkdocs(workingDir, basePath, version string) error {
-	srcPath := filepath.Join(basePath, apiDocPath, fmt.Sprintf("%s_swagger.yaml", version))
-	dstPath := filepath.Join(workingDir, apiMkDocPath, "swagger.yaml")
-
-	// copy the file
-	input, err := os.ReadFile(srcPath)
-	if err != nil {
-		return fmt.Errorf("error while reading swagger doc: %w", err)
-	}
-
-	output, err := removeAuthorizeButton(input)
-	if err != nil {
-		return fmt.Errorf("error while removing authorize button: %w", err)
-	}
-
-	err = os.WriteFile(dstPath, output, 0644)
-	if err != nil {
-		return fmt.Errorf("error while writing swagger doc: %w", err)
-	}
-
-	return nil
-}
-
-func removeAuthorizeButton(input []byte) ([]byte, error) {
-	var swagger map[string]interface{}
-	err := yaml.Unmarshal(input, &swagger)
-	if err != nil {
-		return nil, fmt.Errorf("error while unmarshalling swagger file: %w", err)
-	}
-
-	delete(swagger, "securityDefinitions")
-
-	output, err := yaml.Marshal(&swagger)
-	if err != nil {
-		return nil, fmt.Errorf("error while marshalling swagger file: %w", err)
-	}
-
-	return output, nil
-}

cmd/wg-portal/main.go

@@ -2,15 +2,8 @@ package main
 
 import (
 	"context"
-	"os"
-	"strings"
-	"syscall"
-	"time"
-
 	"github.com/h44z/wg-portal/internal/app/api/core"
 	handlersV0 "github.com/h44z/wg-portal/internal/app/api/v0/handlers"
-	backendV1 "github.com/h44z/wg-portal/internal/app/api/v1/backend"
-	handlersV1 "github.com/h44z/wg-portal/internal/app/api/v1/handlers"
 	"github.com/h44z/wg-portal/internal/app/audit"
 	"github.com/h44z/wg-portal/internal/app/auth"
 	"github.com/h44z/wg-portal/internal/app/configfile"
@@ -18,6 +11,10 @@ import (
 	"github.com/h44z/wg-portal/internal/app/route"
 	"github.com/h44z/wg-portal/internal/app/users"
 	"github.com/h44z/wg-portal/internal/app/wireguard"
+	"os"
+	"strings"
+	"syscall"
+	"time"
 
 	"github.com/h44z/wg-portal/internal"
 	"github.com/h44z/wg-portal/internal/adapters"
@@ -52,8 +49,6 @@ func main() {
 
 	mailer := adapters.NewSmtpMailRepo(cfg.Mail)
 
-	metricsServer := adapters.NewMetricsServer(cfg)
-
 	cfgFileSystem, err := adapters.NewFileSystemRepository(cfg.Advanced.ConfigStoragePath)
 	internal.AssertNoError(err)
 
@@ -74,13 +69,13 @@ func main() {
 	userManager, err := users.NewUserManager(cfg, eventBus, database, database)
 	internal.AssertNoError(err)
 
-	authenticator, err := auth.NewAuthenticator(&cfg.Auth, cfg.Web.ExternalUrl, eventBus, userManager)
+	authenticator, err := auth.NewAuthenticator(&cfg.Auth, eventBus, userManager)
 	internal.AssertNoError(err)
 
 	wireGuardManager, err := wireguard.NewWireGuardManager(cfg, eventBus, wireGuard, wgQuick, database)
 	internal.AssertNoError(err)
 
-	statisticsCollector, err := wireguard.NewStatisticsCollector(cfg, eventBus, database, wireGuard, metricsServer)
+	statisticsCollector, err := wireguard.NewStatisticsCollector(cfg, database, wireGuard)
 	internal.AssertNoError(err)
 
 	cfgFileManager, err := configfile.NewConfigFileManager(cfg, eventBus, database, database, cfgFileSystem)
@@ -105,30 +100,9 @@ func main() {
 
 	apiFrontend := handlersV0.NewRestApi(cfg, backend)
 
-	apiV1BackendUsers := backendV1.NewUserService(cfg, userManager)
+	webSrv, err := core.NewServer(cfg, apiFrontend)
-	apiV1BackendPeers := backendV1.NewPeerService(cfg, wireGuardManager, userManager)
-	apiV1BackendInterfaces := backendV1.NewInterfaceService(cfg, wireGuardManager)
-	apiV1BackendProvisioning := backendV1.NewProvisioningService(cfg, userManager, wireGuardManager, cfgFileManager)
-	apiV1BackendMetrics := backendV1.NewMetricsService(cfg, database, userManager, wireGuardManager)
-	apiV1EndpointUsers := handlersV1.NewUserEndpoint(apiV1BackendUsers)
-	apiV1EndpointPeers := handlersV1.NewPeerEndpoint(apiV1BackendPeers)
-	apiV1EndpointInterfaces := handlersV1.NewInterfaceEndpoint(apiV1BackendInterfaces)
-	apiV1EndpointProvisioning := handlersV1.NewProvisioningEndpoint(apiV1BackendProvisioning)
-	apiV1EndpointMetrics := handlersV1.NewMetricsEndpoint(apiV1BackendMetrics)
-
-	apiV1 := handlersV1.NewRestApi(
-		userManager,
-		apiV1EndpointUsers,
-		apiV1EndpointPeers,
-		apiV1EndpointInterfaces,
-		apiV1EndpointProvisioning,
-		apiV1EndpointMetrics,
-	)
-
-	webSrv, err := core.NewServer(cfg, apiFrontend, apiV1)
 	internal.AssertNoError(err)
 
-	go metricsServer.Run(ctx)
 	go webSrv.Run(ctx, cfg.Web.ListeningAddress)
 
 	// wait until context gets cancelled
@@ -154,7 +128,7 @@ func setupLogging(cfg *config.Config) {
 	case "error":
 		logrus.SetLevel(logrus.ErrorLevel)
 	default:
-		logrus.SetLevel(logrus.InfoLevel)
+		logrus.SetLevel(logrus.WarnLevel)
 	}
 
 	switch {

config.yml.sample

@@ -1,19 +1,16 @@
-# More information about the configuration can be found in the documentation: https://wgportal.org/master/documentation/overview/
-
 advanced:
   log_level: trace
 
 core:
   admin_user: test@test.de
   admin_password: secret
-  create_default_peer: true
-  create_default_peer_on_creation: false
 
 web:
   external_url: http://localhost:8888
   request_logging: true
 
 auth:
+  callback_url_prefix: http://localhost:8888/api/v0
   ldap:
     - id: ldap1
       provider_name: company ldap
@@ -24,7 +21,7 @@ auth:
       base_dn: DC=YOURCOMPANY,DC=LOCAL
       login_filter: (&(objectClass=organizationalPerson)(mail={{login_identifier}})(!userAccountControl:1.2.840.113556.1.4.803:=2))
       admin_group: CN=WireGuardAdmins,OU=it,DC=YOURCOMPANY,DC=LOCAL
-      sync_interval: 0  # sync disabled
+      synchronize: false
       sync_filter: (&(objectClass=organizationalPerson)(!userAccountControl:1.2.840.113556.1.4.803:=2)(mail=*))
       registration_enabled: true
   oidc:
@@ -47,46 +44,4 @@ auth:
       extra_scopes:
         - https://www.googleapis.com/auth/userinfo.email
         - https://www.googleapis.com/auth/userinfo.profile
-      registration_enabled: true
+      registration_enabled: true
-  oauth:
-    - id: google_plain_oauth
-      provider_name: google3
-      display_name: Login with</br>Google3
-      client_id: another-client-id-1234.apps.googleusercontent.com
-      client_secret: A_CLIENT_SECRET
-      auth_url: https://accounts.google.com/o/oauth2/v2/auth
-      token_url: https://oauth2.googleapis.com/token
-      user_info_url: https://openidconnect.googleapis.com/v1/userinfo
-      scopes:
-        - openid
-        - email
-        - profile
-      field_map:
-        email: email
-        firstname: name
-        user_identifier: sub
-        is_admin: this-attribute-must-be-true
-      registration_enabled: true
-    - id: google_plain_oauth_with_groups
-      provider_name: google4
-      display_name: Login with</br>Google4
-      client_id: another-client-id-1234.apps.googleusercontent.com
-      client_secret: A_CLIENT_SECRET
-      auth_url: https://accounts.google.com/o/oauth2/v2/auth
-      token_url: https://oauth2.googleapis.com/token
-      user_info_url: https://openidconnect.googleapis.com/v1/userinfo
-      scopes:
-        - openid
-        - email
-        - profile
-        - i-want-some-groups
-      field_map:
-        email: email
-        firstname: name
-        user_identifier: sub
-        user_groups: groups
-      admin_mapping:
-        admin_value_regex: ^true$
-        admin_group_regex: ^admin-group-name$
-      registration_enabled: true
-      log_user_info: true

ct.yaml

@@ -1,5 +0,0 @@
-# See https://github.com/helm/chart-testing#configuration
-remote: origin
-chart-dirs: deploy
-target-branch: master
-validate-maintainers: false

deploy/helm/.helmignore

@@ -1,23 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*.orig
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/

deploy/helm/Chart.yaml

@@ -1,25 +0,0 @@
-apiVersion: v2
-name: wg-portal
-description: WireGuard Configuration Portal with LDAP, OAuth, OIDC authentication
-# Version is set to ensure compatibility with the chart's Ingress resource.
-kubeVersion: ">=1.19.0"
-type: application
-home: https://wgportal.org
-icon: https://wgportal.org/latest/assets/images/logo.svg
-sources:
-  - https://github.com/h44z/wg-portal
-
-annotations:
-  artifacthub.io/category: networking
-  artifacthub.io/changes: ""
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.7.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "v2"

deploy/helm/README.md

@@ -1,123 +0,0 @@
-# wg-portal
-
-![Version: 0.7.0](https://img.shields.io/badge/Version-0.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2](https://img.shields.io/badge/AppVersion-v2-informational?style=flat-square)
-
-WireGuard Configuration Portal with LDAP, OAuth, OIDC authentication
-
-**Homepage:** <https://wgportal.org>
-
-## Source Code
-
-* <https://github.com/h44z/wg-portal>
-
-## Requirements
-
-Kubernetes: `>=1.19.0`
-
-## Installing the Chart
-
-To install the chart with the release name `wg-portal`:
-
-```console
-helm install wg-portal oci://ghcr.io/h44z/charts/wg-portal
-```
-
-This command deploy wg-portal on the Kubernetes cluster in the default configuration.
-The [Values](#values) section lists the parameters that can be configured during installation.
-
-## Values
-
-| Key | Type | Default | Description |
-|-----|------|---------|-------------|
-| nameOverride | string | `""` | Partially override resource names (adds suffix) |
-| fullnameOverride | string | `""` | Fully override resource names |
-| extraDeploy | list | `[]` | Array of extra objects to deploy with the release |
-| config.advanced | tpl/object | `{}` | [Advanced configuration](https://wgportal.org/latest/documentation/configuration/overview/#advanced) options. |
-| config.auth | tpl/object | `{}` | [Auth configuration](https://wgportal.org/latest/documentation/configuration/overview/#auth) options. |
-| config.core | tpl/object | `{}` | [Core configuration](https://wgportal.org/latest/documentation/configuration/overview/#core) options.<br> If external admins in `auth` are defined and there are no `admin_user` and `admin_password` defined here, the default admin account will be disabled. |
-| config.database | tpl/object | `{}` | [Database configuration](https://wgportal.org/latest/documentation/configuration/overview/#database) options |
-| config.mail | tpl/object | `{}` | [Mail configuration](https://wgportal.org/latest/documentation/configuration/overview/#mail) options |
-| config.statistics | tpl/object | `{}` | [Statistics configuration](https://wgportal.org/latest/documentation/configuration/overview/#statistics) options |
-| config.web | tpl/object | `{}` | [Web configuration](https://wgportal.org/latest/documentation/configuration/overview/#web) options.<br> `listening_address` will be set automatically from `service.web.port`. `external_url` is required to enable ingress and certificate resources. |
-| revisionHistoryLimit | string | `10` | The number of old ReplicaSets to retain to allow rollback. |
-| workloadType | string | `"Deployment"` | Workload type - `Deployment` or `StatefulSet` |
-| strategy | object | `{"type":"RollingUpdate"}` | Update strategy for the workload Valid values are:  `RollingUpdate` or `Recreate` for Deployment,  `RollingUpdate` or `OnDelete` for StatefulSet |
-| image.repository | string | `"ghcr.io/h44z/wg-portal"` | Image repository |
-| image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
-| image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion |
-| imagePullSecrets | list | `[]` | Image pull secrets |
-| podAnnotations | tpl/object | `{}` | Extra annotations to add to the pod |
-| podLabels | object | `{}` | Extra labels to add to the pod |
-| podSecurityContext | object | `{}` | Pod Security Context |
-| securityContext.capabilities.add | list | `["NET_ADMIN"]` | Add capabilities to the container |
-| initContainers | tpl/list | `[]` | Pod init containers |
-| sidecarContainers | tpl/list | `[]` | Pod sidecar containers |
-| dnsPolicy | string | `"ClusterFirst"` | Set DNS policy for the pod. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`. |
-| restartPolicy | string | `"Always"` | Restart policy for all containers within the pod. Valid values are `Always`, `OnFailure` or `Never`. |
-| hostNetwork | string | `false`. | Use the host's network namespace. |
-| resources | object | `{}` | Resources requests and limits |
-| command | list | `[]` | Overwrite pod command |
-| args | list | `[]` | Additional pod arguments |
-| env | tpl/list | `[]` | Additional environment variables |
-| envFrom | tpl/list | `[]` | Additional environment variables from a secret or configMap |
-| livenessProbe | object | `{}` | Liveness probe configuration |
-| readinessProbe | object | `{}` | Readiness probe configuration |
-| startupProbe | object | `{}` | Startup probe configuration |
-| volumes | tpl/list | `[]` | Additional volumes |
-| volumeMounts | tpl/list | `[]` | Additional volumeMounts |
-| nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Node Selector configuration |
-| tolerations | list | `[]` | Tolerations configuration |
-| affinity | object | `{}` | Affinity configuration |
-| service.mixed.enabled | bool | `false` | Whether to create a single service for the web and wireguard interfaces |
-| service.mixed.type | string | `"LoadBalancer"` | Service type |
-| service.web.annotations | object | `{}` | Annotations for the web service |
-| service.web.type | string | `"ClusterIP"` | Web service type |
-| service.web.port | int | `8888` | Web service port Used for the web interface listener |
-| service.web.appProtocol | string | `"http"` | Web service appProtocol. Will be auto set to `https` if certificate is enabled. |
-| service.wireguard.annotations | object | `{}` | Annotations for the WireGuard service |
-| service.wireguard.type | string | `"LoadBalancer"` | Wireguard service type |
-| service.wireguard.ports | list | `[51820]` | Wireguard service ports. Exposes the WireGuard ports for created interfaces. Lowerest port is selected as start port for the first interface. Increment next port by 1 for each additional interface. |
-| service.metrics.port | int | `8787` |  |
-| ingress.enabled | bool | `false` | Specifies whether an ingress resource should be created |
-| ingress.className | string | `""` | Ingress class name |
-| ingress.annotations | object | `{}` | Ingress annotations |
-| ingress.tls | bool | `false` | Ingress TLS configuration. Enable certificate resource or add ingress annotation to create required secret |
-| certificate.enabled | bool | `false` | Specifies whether a certificate resource should be created. If enabled, certificate will be used for the web. |
-| certificate.issuer.name | string | `""` | Certificate issuer name |
-| certificate.issuer.kind | string | `""` | Certificate issuer kind (ClusterIssuer or Issuer) |
-| certificate.issuer.group | string | `"cert-manager.io"` | Certificate issuer group |
-| certificate.duration | string | `""` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.renewBefore | string | `""` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.commonName | string | `""` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.emailAddresses | list | `[]` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.ipAddresses | list | `[]` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.keystores | object | `{}` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.privateKey | object | `{}` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.secretTemplate | object | `{}` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.subject | object | `{}` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.uris | list | `[]` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| certificate.usages | list | `[]` | Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources) |
-| persistence.enabled | bool | `false` | Specifies whether an persistent volume should be created |
-| persistence.annotations | object | `{}` | Persistent Volume Claim annotations |
-| persistence.storageClass | string | `""` | Persistent Volume storage class. If undefined (the default) cluster's default provisioner will be used. |
-| persistence.accessMode | string | `"ReadWriteOnce"` | Persistent Volume Access Mode |
-| persistence.size | string | `"1Gi"` | Persistent Volume size |
-| serviceAccount.create | bool | `true` | Specifies whether a service account should be created |
-| serviceAccount.annotations | object | `{}` | Service account annotations |
-| serviceAccount.automount | bool | `false` | Automatically mount a ServiceAccount's API credentials |
-| serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |
-| monitoring.enabled | bool | `false` | Enable Prometheus monitoring. |
-| monitoring.apiVersion | string | `"monitoring.coreos.com/v1"` | API version of the Prometheus resource. Use `azmonitoring.coreos.com/v1` for Azure Managed Prometheus. |
-| monitoring.kind | string | `"PodMonitor"` | Kind of the Prometheus resource. Could be `PodMonitor` or `ServiceMonitor`. |
-| monitoring.labels | object | `{}` | Resource labels. |
-| monitoring.annotations | object | `{}` | Resource annotations. |
-| monitoring.interval | string | `1m` | Interval at which metrics should be scraped. If not specified `config.statistics.data_collection_interval` interval is used. |
-| monitoring.metricRelabelings | list | `[]` | Relabelings to samples before ingestion. |
-| monitoring.relabelings | list | `[]` | Relabelings to samples before scraping. |
-| monitoring.scrapeTimeout | string | `""` | Timeout after which the scrape is ended If not specified, the Prometheus global scrape interval is used. |
-| monitoring.jobLabel | string | `""` | The label to use to retrieve the job name from. |
-| monitoring.podTargetLabels | object | `{}` | Transfers labels on the Kubernetes Pod onto the target. |
-| monitoring.dashboard.enabled | bool | `false` | Enable Grafana dashboard. |
-| monitoring.dashboard.annotations | object | `{}` | Annotations for the dashboard ConfigMap. |
-| monitoring.dashboard.labels | object | `{}` | Additional labels for the dashboard ConfigMap. |
-| monitoring.dashboard.namespace | string | `""` | Dashboard ConfigMap namespace Overrides the namespace for the dashboard ConfigMap. |

deploy/helm/README.md.gotmpl

@@ -1,27 +0,0 @@
-{{ template "chart.header" . }}
-{{ template "chart.deprecationWarning" . }}
-
-{{ template "chart.badgesSection" . }}
-
-{{ template "chart.description" . }}
-
-{{ template "chart.homepageLine" . }}
-
-{{ template "chart.maintainersSection" . }}
-
-{{ template "chart.sourcesSection" . }}
-
-{{ template "chart.requirementsSection" . }}
-
-## Installing the Chart
-
-To install the chart with the release name `wg-portal`:
-
-```console
-helm install wg-portal oci://ghcr.io/h44z/charts/wg-portal
-```
-
-This command deploy wg-portal on the Kubernetes cluster in the default configuration.
-The [Values](#values) section lists the parameters that can be configured during installation.
-
-{{ template "chart.valuesSection" . }}

deploy/helm/files/dashboard.json

@@ -1,917 +0,0 @@
-{
-  "annotations": {},
-  "description": "WireGuard Portal Dashboard",
-  "panels": [
-    {
-      "datasource": {
-        "default": false,
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": 3600000,
-            "lineInterpolation": "smooth",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 2,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "right",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by (instance, interface) (wireguard_interface_received_bytes_total{instance=\"$instance\", interface=~\"$interface\"})",
-          "fullMetaSearch": false,
-          "hide": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "interval": "",
-          "legendFormat": "Received {{interface}}",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (instance, interface) (wireguard_interface_sent_bytes_total{instance=\"$instance\", interface=~\"$interface\"})",
-          "hide": false,
-          "instant": false,
-          "legendFormat": "Sent {{interface}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Interface Bytes Total",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "default": false,
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": 3600000,
-            "lineInterpolation": "smooth",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "id": 13,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "right",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (instance, interface) (rate(wireguard_interface_received_bytes_total{instance=\"$instance\", interface=~\"$interface\"}[$__rate_interval]))",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "legendFormat": "Received {{interface}}",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (instance, interface) (rate(wireguard_interface_sent_bytes_total{instance=\"$instance\", interface=~\"$interface\"}[$__rate_interval]))",
-          "hide": false,
-          "instant": false,
-          "interval": "",
-          "legendFormat": "Sent {{interface}}",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Interface Bandwidth",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "default": false,
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": 3600000,
-            "lineInterpolation": "smooth",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 9
-      },
-      "id": 16,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "right",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (name, instance, interface) (rate(wireguard_peer_received_bytes_total{instance=\"$instance\", interface=~\"$interface\"}[$__rate_interval]))",
-          "hide": false,
-          "instant": false,
-          "interval": "$interval",
-          "legendFormat": "{{name}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Peer Receive Bandwidth",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "default": false,
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "barWidthFactor": 0.6,
-            "drawStyle": "line",
-            "fillOpacity": 10,
-            "gradientMode": "opacity",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": 3600000,
-            "lineInterpolation": "smooth",
-            "lineStyle": {
-              "fill": "solid"
-            },
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "never",
-            "spanNulls": true,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "bytes"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 9
-      },
-      "id": 17,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "right",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (instance, interface, name) (rate(wireguard_peer_sent_bytes_total{instance=\"$instance\", interface=~\"$interface\"}[$__rate_interval]))",
-          "hide": false,
-          "instant": false,
-          "interval": "$interval",
-          "legendFormat": "{{name}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Peer Transmit Bandwidth",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "default": false,
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "fillOpacity": 60,
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineWidth": 1
-          },
-          "fieldMinMax": false,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 1
-              }
-            ]
-          },
-          "unit": "bool_yes_no"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 11,
-        "w": 24,
-        "x": 0,
-        "y": 18
-      },
-      "id": 12,
-      "options": {
-        "colWidth": 0.85,
-        "legend": {
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": false
-        },
-        "rowHeight": 0.85,
-        "showValue": "never",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(name) (wireguard_peer_up{instance=\"$instance\", interface=~\"$interface\"})",
-          "instant": false,
-          "interval": "$interval",
-          "legendFormat": "{{name}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Peer Connection History",
-      "type": "status-history"
-    },
-    {
-      "datasource": {
-        "default": false,
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic-by-name"
-          },
-          "custom": {
-            "align": "auto",
-            "cellOptions": {
-              "type": "auto",
-              "wrapText": false
-            },
-            "filterable": false,
-            "inspect": false
-          },
-          "fieldMinMax": false,
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "dark-red",
-                "value": null
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byRegexp",
-              "options": "/(Time|instance|interface|name)\\s\\d*/"
-            },
-            "properties": [
-              {
-                "id": "custom.hidden",
-                "value": true
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byRegexp",
-              "options": "/Received|Transmitted/"
-            },
-            "properties": [
-              {
-                "id": "unit",
-                "value": "bytes"
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Last Handshake"
-            },
-            "properties": [
-              {
-                "id": "unit",
-                "value": "s"
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Connected"
-            },
-            "properties": [
-              {
-                "id": "mappings",
-                "value": [
-                  {
-                    "options": {
-                      "0": {
-                        "color": "red",
-                        "index": 0,
-                        "text": "No"
-                      },
-                      "1": {
-                        "color": "green",
-                        "index": 1,
-                        "text": "Yes"
-                      }
-                    },
-                    "type": "value"
-                  }
-                ]
-              },
-              {
-                "id": "custom.cellOptions",
-                "value": {
-                  "type": "color-text"
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 14,
-        "w": 24,
-        "x": 0,
-        "y": 29
-      },
-      "id": 11,
-      "options": {
-        "cellHeight": "sm",
-        "footer": {
-          "countRows": false,
-          "enablePagination": false,
-          "fields": [],
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Sent"
-          }
-        ]
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(id, instance, interface, name, addresses) (increase(wireguard_peer_received_bytes_total{instance=\"$instance\", interface=~\"$interface\"}[$__range]))",
-          "format": "table",
-          "fullMetaSearch": false,
-          "hide": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "interval": "",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A",
-          "useBackend": false
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "disableTextWrap": false,
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by(id, instance, interface, name) (increase(wireguard_peer_sent_bytes_total{instance=\"$instance\", interface=~\"$interface\"}[$__range]))",
-          "format": "table",
-          "fullMetaSearch": false,
-          "includeNullMetadata": true,
-          "instant": false,
-          "interval": "",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B",
-          "useBackend": false
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "time()-sum(wireguard_peer_last_handshake_seconds{instance=\"$instance\", interface=~\"$interface\"}) by(id, instance, interface, name) ",
-          "format": "table",
-          "hide": false,
-          "instant": true,
-          "interval": "",
-          "legendFormat": "__auto",
-          "range": false,
-          "refId": "C"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum(wireguard_peer_up{instance=\"$instance\", interface=~\"$interface\"}) by(id, instance, interface, name) ",
-          "format": "table",
-          "hide": false,
-          "instant": true,
-          "interval": "",
-          "legendFormat": "__auto",
-          "range": false,
-          "refId": "D"
-        }
-      ],
-      "title": "Peer Info",
-      "transformations": [
-        {
-          "id": "joinByField",
-          "options": {
-            "byField": "id",
-            "mode": "outer"
-          }
-        },
-        {
-          "id": "organize",
-          "options": {
-            "excludeByName": {
-              "Time 1": false,
-              "Time 2": false,
-              "Time 3": false,
-              "Time 4": false
-            },
-            "includeByName": {},
-            "indexByName": {
-              "Time 1": 8,
-              "Time 2": 9,
-              "Time 3": 10,
-              "Time 4": 11,
-              "Value #A": 4,
-              "Value #B": 5,
-              "Value #C": 6,
-              "Value #D": 7,
-              "addresses": 2,
-              "id": 3,
-              "instance 1": 12,
-              "instance 2": 13,
-              "instance 3": 16,
-              "instance 4": 19,
-              "interface 1": 0,
-              "interface 2": 14,
-              "interface 3": 17,
-              "interface 4": 20,
-              "name 1": 1,
-              "name 2": 15,
-              "name 3": 18,
-              "name 4": 21
-            },
-            "renameByName": {
-              "Value #A": "Received",
-              "Value #B": "Transmitted",
-              "Value #C": "Last Handshake",
-              "Value #D": "Connected",
-              "addresses": "IP Addresses",
-              "id": "Public Key",
-              "interface": "Interface",
-              "interface 1": "Interface",
-              "name": "Name",
-              "name 1": "Name"
-            }
-          }
-        }
-      ],
-      "type": "table"
-    }
-  ],
-  "refresh": "1m",
-  "tags": [
-    "wireguard",
-    "vpn"
-  ],
-  "templating": {
-    "list": [
-      {
-        "current": {},
-        "hide": 0,
-        "includeAll": false,
-        "label": "Prometheus",
-        "multi": false,
-        "name": "datasource",
-        "options": [],
-        "query": "prometheus",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "type": "datasource"
-      },
-      {
-        "current": {},
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${datasource}"
-        },
-        "definition": "label_values(wireguard_interface_sent_bytes_total,instance)",
-        "hide": 0,
-        "includeAll": false,
-        "label": "Instance",
-        "multi": false,
-        "name": "instance",
-        "options": [],
-        "query": {
-          "qryType": 1,
-          "query": "label_values(wireguard_interface_sent_bytes_total,instance)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {},
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${datasource}"
-        },
-        "definition": "label_values(wireguard_interface_sent_bytes_total{instance=\"$instance\"},interface)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Interface",
-        "multi": true,
-        "name": "interface",
-        "options": [],
-        "query": {
-          "qryType": 1,
-          "query": "label_values(wireguard_interface_sent_bytes_total{instance=\"$instance\"},interface)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {
-          "text": "2m",
-          "value": "2m"
-        },
-        "description": "",
-        "label": "Step Interval",
-        "name": "interval",
-        "options": [
-          {
-            "selected": false,
-            "text": "30s",
-            "value": "30s"
-          },
-          {
-            "selected": false,
-            "text": "1m",
-            "value": "1m"
-          },
-          {
-            "selected": true,
-            "text": "2m",
-            "value": "2m"
-          },
-          {
-            "selected": false,
-            "text": "5m",
-            "value": "5m"
-          },
-          {
-            "selected": false,
-            "text": "10m",
-            "value": "10m"
-          }
-        ],
-        "query": "30s,1m,2m,5m,10m",
-        "type": "custom"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-12h",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "WireGuard Portal",
-  "uid": "wireguard-portal",
-  "weekStart": ""
-}

deploy/helm/templates/NOTES.txt

@@ -1,24 +0,0 @@
-{{- $serviceName := printf "%s-web" (include "wg-portal.fullname" .) -}}
-{{- $servicePort := .Values.service.web.port }}
-
-{{- if not .Values.ingress.enabled }}
-Get the application URL by running these commands:
-{{- if eq "ClusterIP" .Values.service.web.type }}
-  kubectl --namespace {{ .Release.Namespace }} port-forward svc/{{ $serviceName }} {{ $servicePort }}:{{ $servicePort }}
-
-Visit http://127.0.0.1:{{ $servicePort }} to use your application
-
-{{- else if eq "LoadBalancer" .Values.service.web.type }}
-  NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ $serviceName }}'
-  export SERVICE_IP=$(kubectl get --namespace {{ .Release.Namespace }} svc {{ $serviceName }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
-  echo http://$SERVICE_IP:{{ $servicePort }}
-
-{{- else if eq "NodePort" .Values.service.web.type }}
-  export NODE_IP=$(kubectl get --namespace {{ .Release.Namespace }} nodes -o jsonpath="{.items[0].status.addresses[0].address}")
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} svc {{ $serviceName }} -o jsonpath="{.spec.ports[0].nodePort}" )
-  echo http://$NODE_IP:$NODE_PORT
-{{- end }}
-{{- else }}
-Visit http{{ if .Values.ingress.tls }}s{{ end }}://{{ .Values.ingress.host }}{{ .Values.ingress.path }} to use your application
-{{- end }}

deploy/helm/templates/_helpers.tpl

@@ -1,128 +0,0 @@
-{{/*
-Expand the name of the chart
-*/}}
-{{- define "wg-portal.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Create a default fully qualified app name
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "wg-portal.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{/*
-Create chart name and version as used by the chart label
-*/}}
-{{- define "wg-portal.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
-{{- end }}
-
-{{/*
-Common labels
-*/}}
-{{- define "wg-portal.labels" -}}
-helm.sh/chart: {{ include "wg-portal.chart" . }}
-{{ include "wg-portal.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- end }}
-app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- end }}
-
-{{/*
-Selector labels
-*/}}
-{{- define "wg-portal.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "wg-portal.name" . }}
-app.kubernetes.io/instance: {{ .Release.Name }}
-{{- end }}
-
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "wg-portal.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "wg-portal.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
-{{/*
-Disables default admin credentials
-If external auth is enabled and has admin group mappings,
-the admin_user will be set to blank (disabled).
-*/}}
-{{- define "wg-portal.admin" -}}
-{{- $externalAdmin := false -}}
-{{- with .Values.config.auth -}}
-  {{- range (default list .ldap) -}}
-    {{- if hasKey . "admin_group" -}}
-      {{- $externalAdmin = true -}}
-    {{- end -}}
-  {{- end }}
-  {{- range (concat (default list .oidc) (default list .oauth)) -}}
-    {{- if hasKey .field_map "is_admin" -}}
-      {{- $externalAdmin = true -}}
-    {{- end -}}
-  {{- end -}}
-{{- end -}}
-{{- if $externalAdmin -}}
-admin_user: ""
-{{- end -}}
-{{- end -}}
-
-{{/*
-Define PersistentVolumeClaim spec
-*/}}
-{{- define "wg-portal.pvc" -}}
-accessModes: [{{ .Values.persistence.accessMode }}]
-{{- with .Values.persistence.storageClass }}
-storageClassName: {{ . }}
-{{- end }}
-resources:
-  requests:
-    storage: {{ .Values.persistence.size | quote }}
-{{- end -}}
-
-{{/*
-Define hostname
-*/}}
-{{- define "wg-portal.hostname" -}}
-{{- if .Values.config.web.external_url -}}
-  {{- (urlParse (tpl .Values.config.web.external_url .)).hostname -}}
-{{- end -}}
-{{- end -}}
-
-
-{{/*
-wg-portal.util.merge will merge two YAML templates or dict with template and output the result.
-This takes an array of three values:
-- the top context
-- the template name or dict of the overrides (destination)
-- the template name of the base (source)
-{{- include "wg-portal.util.merge" (list $ .Values.podLabels "wg-portal.selectorLabels") }}
-{{- include "wg-portal.util.merge" (list $ "wg-portal.destTemplate" "wg-portal.sourceTemplate") }}
-*/}}
-{{- define "wg-portal.util.merge" -}}
-{{- $top := first . -}}
-{{- $overrides := index . 1 -}}
-{{- $base := fromYaml (include (index . 2) $top) | default (dict) -}}
-{{- if kindIs "string" $overrides -}}
-  {{- $overrides = fromYaml (include $overrides $top) | default (dict) -}}
-{{- end -}}
-{{- toYaml (merge $overrides $base) -}}
-{{- end -}}

deploy/helm/templates/_pod.tpl

@@ -1,119 +0,0 @@
-{{- define "wg-portal.podTemplate" -}}
-metadata:
-  annotations:
-    checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}
-    kubectl.kubernetes.io/default-container: {{ .Chart.Name }}
-    {{- with .Values.podAnnotations }}
-    {{- tpl (toYaml .) $ | nindent 4 }}
-    {{- end }}
-  labels: {{- include "wg-portal.util.merge" (list $ .Values.podLabels "wg-portal.selectorLabels") | nindent 4 }}
-spec:
-  {{- with .Values.affinity }}
-  affinity: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  automountServiceAccountToken: {{ .Values.serviceAccount.automount }}
-  containers:
-    {{- with .Values.sidecarContainers }}
-    {{- tpl (toYaml .) $ | nindent 4 }}
-    {{- end }}
-    - name: {{ .Chart.Name }}
-      image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag}}"
-      imagePullPolicy: {{ .Values.image.pullPolicy }}
-      {{- with .Values.command }}
-      command: {{ . }}
-      {{- end }}
-      {{- with .Values.args }}
-      args: {{ . }}
-      {{- end }}
-      {{- with .Values.env }}
-      env: {{- tpl (toYaml .) $ | nindent 8 }}
-      {{- end }}
-      {{- with .Values.envFrom }}
-      envFrom: {{- tpl (toYaml .) $ | nindent 8 }}
-      {{- end }}
-      ports:
-        - name: metrics
-          containerPort: {{ .Values.service.metrics.port}}
-          protocol: TCP
-        - name: web
-          containerPort: {{ .Values.service.web.port }}
-          protocol: TCP
-        {{- range $index, $port := .Values.service.wireguard.ports }}
-        - name: wg{{ $index }}
-          containerPort: {{ $port }}
-          protocol: UDP
-        {{- end }}
-      {{- with .Values.livenessProbe }}
-      livenessProbe: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.readinessProbe }}
-      readinessProbe: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.startupProbe }}
-      startupProbe: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.securityContext }}
-      securityContext: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.resources}}
-      resources: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      volumeMounts:
-        - name: config
-          mountPath: /app/config
-          readOnly: true
-        - name: data
-          mountPath: /app/data
-        {{- if and .Values.certificate.enabled (include "wg-portal.hostname" .) }}
-        - name: certs
-          mountPath: /app/certs
-        {{- end }}
-        {{- with .Values.volumeMounts }}
-        {{- tpl (toYaml .) $ | nindent 8 }}
-        {{- end }}
-  {{- with .Values.dnsPolicy }}
-  dnsPolicy: {{ . }}
-  {{- end }}
-  {{- with .Values.hostNetwork }}
-  hostNetwork: {{ . }}
-  {{- end }}
-  {{- with .Values.imagePullSecrets }}
-  imagePullSecrets: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.initContainers }}
-  initContainers: {{- tpl (toYaml .) $ | nindent 4 }}
-  {{- end }}
-  {{- with .Values.nodeSelector }}
-  nodeSelector: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.restartPolicy }}
-  restartPolicy: {{ . }}
-  {{- end }}
-  serviceAccountName: {{ include "wg-portal.serviceAccountName" . }}
-  {{- with .Values.podSecurityContext }}
-  securityContext: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.tolerations }}
-  tolerations: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  volumes:
-    - name: config
-      secret:
-        secretName: {{ include "wg-portal.fullname" . }}
-    {{- if and .Values.certificate.enabled (include "wg-portal.hostname" .) }}
-    - name: certs
-      secret:
-        secretName: {{ include "wg-portal.fullname" . }}-tls
-    {{- end }}
-    {{- if not .Values.persistence.enabled }}
-    - name: data
-      emptyDir: {}
-    {{- else if eq .Values.workloadType "Deployment" }}
-    - name: data
-      persistentVolumeClaim:
-        claimName: {{ include "wg-portal.fullname" . }}
-    {{- end }}
-    {{- with .Values.volumes }}
-    {{- tpl (toYaml .) $ | nindent 4 }}
-    {{- end }}
-{{- end -}}

deploy/helm/templates/_service.tpl

@@ -1,66 +0,0 @@
-{{/*
-Define the service template
-{{- include "wg-portal.service" (dict "context" $ "scope" .Values.service.<name> "ports" list "name" "<name>") -}}
-*/}}
-{{- define "wg-portal.service.tpl" -}}
-apiVersion: v1
-kind: Service
-metadata:
-  {{- with .scope.annotations }}
-  annotations: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels: {{- include "wg-portal.labels" .context | nindent 4 }}
-  name: {{ include "wg-portal.fullname" .context }}{{ ternary "" (printf "-%s" .name) (empty .name) }}
-spec:
-  {{- with .scope.clusterIP }}
-  clusterIP: {{ . }}
-  {{- end }}
-  {{- with .scope.externalIPs }}
-  externalIPs: {{ toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .scope.externalName }}
-  externalName: {{ . }}
-  {{- end }}
-  {{- with .scope.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ . }}
-  {{- end }}
-  {{- with .scope.healthCheckNodePort }}
-  healthCheckNodePort: {{ . }}
-  {{- end }}
-  {{- with .scope.loadBalancerIP }}
-  loadBalancerIP: {{ . }}
-  {{- end }}
-  {{- with .scope.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges: {{ toYaml . | nindent 4 }}
-  {{- end }}
-  ports: {{- toYaml .ports | nindent 4 }}
-  {{- with .scope.publishNotReadyAddresses }}
-  publishNotReadyAddresses: {{ . }}
-  {{- end }}
-  {{- with .scope.sessionAffinity }}
-  sessionAffinity: {{ . }}
-  {{- end }}
-  {{- with .scope.sessionAffinityConfig }}
-  sessionAffinityConfig: {{ toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .scope.topologyKeys }}
-  topologyKeys: {{ toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .scope.type }}
-  type: {{ . }}
-  {{- end }}
-  selector: {{- include "wg-portal.selectorLabels" .context | nindent 4 }}
-{{- end -}}
-
-{{/*
-Define the service port template for the web port
-*/}}
-{{- define "wg-portal.service.webPort" -}}
-name: web
-port: {{ .Values.service.web.port }}
-protocol: TCP
-targetPort: web
-{{- if semverCompare ">=1.20-0" .Capabilities.KubeVersion.Version }}
-appProtocol: {{ ternary "https" .Values.service.web.appProtocol .Values.certificate.enabled }}
-{{- end -}}
-{{- end -}}

deploy/helm/templates/certificate.yaml

@@ -1,54 +0,0 @@
-{{/* https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources */}}
-{{- if and .Values.certificate.enabled (include "wg-portal.hostname" .) -}}
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: {{ include "wg-portal.fullname" . }}
-  labels: {{- include "wg-portal.labels" . | nindent 4 }}
-spec:
-  secretName: {{ include "wg-portal.fullname" . }}-tls
-  {{- with .Values.certificate.secretTemplate }}
-  secretTemplate: {{ toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.certificate.privateKey }}
-  privateKey: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.certificate.keystores }}
-  keystores: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.certificate.duration }}
-  duration: {{ . }}
-  {{- end }}
-  {{- with .Values.certificate.renewBefore }}
-  renewBefore: {{ . }}
-  {{- end }}
-  {{- with .Values.certificate.usages }}
-  usages: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.certificate.subject }}
-  subject: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.certificate.commonName }}
-  commonName: {{ . }}
-  {{- end }}
-  dnsNames:
-    - {{ include "wg-portal.hostname" . }}
-  {{- with .Values.certificate.uris }}
-  uris: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.certificate.emailAddresses }}
-  emailAddresses: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.certificate.ipAddresses }}
-  ipAddresses: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  {{- with .Values.certificate.otherNames }}
-  otherNames: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  issuerRef:
-    {{- with .Values.certificate.issuer.group }}
-    group: {{ . }}
-    {{- end }}
-    kind: {{ .Values.certificate.issuer.kind }}
-    name: {{ .Values.certificate.issuer.name }}
-{{- end -}}

deploy/helm/templates/cm-dashboards.yaml

@@ -1,14 +0,0 @@
-{{- with .Values.monitoring.dashboard -}}
-{{- if .enabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  {{- with .annotations }}
-  annotations: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels: {{- include "wg-portal.util.merge" (list $ .labels "wg-portal.labels") | nindent 4 }}
-  name: {{ printf "grafana-dashboards-%s" (include "wg-portal.fullname" $) }}
-  namespace: {{ default $.Release.Namespace .namespace }}
-data: {{ ($.Files.Glob "files/dashboard.json").AsConfig | nindent 2 }}
-{{- end -}}
-{{- end -}}

deploy/helm/templates/deployment.yaml

@@ -1,17 +0,0 @@
-{{- if eq .Values.workloadType "Deployment" -}}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "wg-portal.fullname" . }}
-  labels: {{- include "wg-portal.labels" . | nindent 4 }}
-spec:
-  {{- with .Values.revisionHistoryLimit }}
-  revisionHistoryLimit: {{ . }}
-  {{- end }}
-  {{- with .Values.strategy }}
-  strategy: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  selector:
-    matchLabels: {{- include "wg-portal.selectorLabels" . | nindent 6 }}
-  template: {{- include "wg-portal.podTemplate" . | nindent 4 }}
-{{- end -}}

deploy/helm/templates/extras.yaml

@@ -1,4 +0,0 @@
-{{- range .Values.extraDeploy -}}
-{{- tpl (toYaml .) $ }}
----
-{{- end -}}

deploy/helm/templates/ingress.yaml

@@ -1,30 +0,0 @@
-{{- $hostname := include "wg-portal.hostname" . -}}
-{{- if and .Values.ingress.enabled $hostname -}}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  {{- with .Values.ingress.annotations }}
-  annotations: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  name: {{ include "wg-portal.fullname" . }}
-  labels: {{- include "wg-portal.labels" . | nindent 4 }}
-spec:
-  ingressClassName: {{ .Values.ingress.className }}
-  rules:
-    - host: {{ $hostname }}
-      http:
-        paths:
-          - path: {{ default "/" (urlParse (tpl .Values.config.web.external_url .)).path }}
-            pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend:
-              service:
-                name: {{ include "wg-portal.fullname" . }}
-                port:
-                  name: web
-  {{- if .Values.ingress.tls }}
-  tls:
-    - hosts:
-        - {{ $hostname | quote }}
-      secretName: {{ include "wg-portal.fullname" . }}-tls
-  {{- end }}
-{{- end }}

deploy/helm/templates/monitoring.yaml

@@ -1,44 +0,0 @@
-{{- with .Values.monitoring -}}
-{{- if and .enabled ($.Capabilities.APIVersions.Has .apiVersion) -}}
-{{- $endpointsKey := (eq .kind "PodMonitor") | ternary "podMetricsEndpoints" "endpoints" -}}
-apiVersion: {{ .apiVersion }}
-kind: {{ .kind }}
-metadata:
-  {{- with .annotations }}
-  annotations: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  labels: {{- include "wg-portal.util.merge" (list $ .labels "wg-portal.labels") | nindent 4 }}
-  name: {{ include "wg-portal.fullname" $ }}
-spec:
-  namespaceSelector:
-    matchNames:
-      - {{ $.Release.Namespace }}
-  selector:
-    matchLabels:
-      {{- include "wg-portal.selectorLabels" $ | nindent 6 }}
-  {{ $endpointsKey }}:
-    - port: metrics
-      path: /metrics
-      interval: {{ coalesce .interval ($.Values.config.statistics).data_collection_interval "1m" }}
-      {{- with .metricRelabelings }}
-      metricRelabelings: {{- toYaml . | nindent 8 }}
-      {{- end }}
-      relabelings:
-        - action: replace
-          sourceLabels:
-            - __meta_kubernetes_pod_label_app_kubernetes_io_name
-          targetLabel: instance
-      {{- with .relabelings }}
-      {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .scrapeTimeout }}
-      scrapeTimeout: {{ . }}
-      {{- end }}
-  {{- with .jobLabel }}
-  jobLabel: {{ . }}
-  {{- end }}
-  {{- with .podTargetLabels }}
-  podTargetLabels: {{- toYaml . | nindent 2 }}
-  {{- end }}
-{{- end -}}
-{{- end -}}

deploy/helm/templates/pvc.yaml

@@ -1,11 +0,0 @@
-{{- if and .Values.persistence.enabled (eq .Values.workloadType "Deployment") -}}
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  {{- with .Values.persistence.annotations }}
-  annotations: {{- toYaml . | nindent 4}}
-  {{- end }}
-  name: {{ include "wg-portal.fullname" . }}
-  labels: {{- include "wg-portal.labels" . | nindent 4 }}
-spec: {{- include "wg-portal.pvc" . | nindent 2 }}
-{{- end -}}

deploy/helm/templates/secret.yaml

@@ -1,42 +0,0 @@
-{{- $advanced := dict "start_listen_port" (.Values.service.wireguard.ports | sortAlpha | first | int) -}}
-{{- $statistics := dict "listening_address" (printf ":%v" .Values.service.metrics.port) -}}
-{{- $web:= dict "listening_address" (printf ":%v" .Values.service.web.port) -}}
-{{- if and .Values.certificate.enabled (include "wg-portal.hostname" .) }}
-  {{- $_ := set $web "cert_file" "/app/certs/tls.crt" }}
-  {{- $_ := set $web "key_file" "/app/certs/tls.key" }}
-{{- end }}
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "wg-portal.fullname" . }}
-  labels: {{- include "wg-portal.labels" . | nindent 4 }}
-stringData:
-  config.yml: |
-    {{- with mustMerge $advanced .Values.config.advanced }}
-    advanced: {{- tpl (toYaml .) $ | nindent 6 }}
-    {{- end }}
-
-    {{- with .Values.config.auth }}
-    auth: {{- tpl (toYaml .) $ | nindent 6 }}
-    {{- end }}
-
-    {{- with mustMerge .Values.config.core (include "wg-portal.admin" . | fromYaml) }}
-    core: {{- tpl (toYaml .) $ | nindent 6 }}
-    {{- end }}
-
-    {{- with .Values.config.database }}
-    database: {{- tpl (toYaml .) $ | nindent 6 }}
-    {{- end }}
-
-    {{- with .Values.config.mail }}
-    mail: {{- tpl (toYaml .) $ | nindent 6 }}
-    {{- end }}
-
-    {{- with mustMerge $statistics .Values.config.statistics }}
-    statistics: {{- tpl (toYaml .) $ | nindent 6 }}
-    {{- end }}
-
-    {{- with mustMerge $web .Values.config.web }}
-    web: {{- tpl (toYaml .) $ | nindent 6 }}
-    {{- end }}

deploy/helm/templates/service.yaml

@@ -1,20 +0,0 @@
-{{- $portsWeb := list (include "wg-portal.service.webPort" . | fromYaml) -}}
-{{- $ports := list -}}
-{{- range $idx, $port := .Values.service.wireguard.ports -}}
-{{- $name := printf "wg%d" $idx -}}
-{{- $ports = append $ports (dict "name" $name "port" $port "protocol" "UDP" "targetPort" $name) -}}
-{{- end -}}
-
-{{- if .Values.service.mixed.enabled -}}
-{{ include "wg-portal.service.tpl" (dict "context" . "scope" .Values.service.mixed "ports" (concat $portsWeb $ports)) }}
-{{- else }}
-{{ include "wg-portal.service.tpl" (dict "context" . "scope" .Values.service.web "ports" $portsWeb) }}
----
-{{ include "wg-portal.service.tpl" (dict "context" . "scope" .Values.service.wireguard "ports" $ports "name" "wireguard") }}
-{{- end -}}
-
-{{- if and .Values.monitoring.enabled (eq .Values.monitoring.kind "ServiceMonitor") }}
----
-{{- $portsMetrics := list (dict "name" "metrics" "port" .Values.service.metrics.port "protocol" "TCP" "targetPort" "metrics") -}}
-{{- include "wg-portal.service.tpl" (dict "context" . "scope" .Values.service.metrics "ports" $portsWeb "name" "metrics") }}
-{{- end -}}

deploy/helm/templates/serviceaccount.yaml

@@ -1,10 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ include "wg-portal.serviceAccountName" . }}
-  labels: {{- include "wg-portal.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations: {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

deploy/helm/templates/statefulset.yaml

@@ -1,24 +0,0 @@
-{{- if eq .Values.workloadType "StatefulSet" -}}
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ include "wg-portal.fullname" . }}
-  labels: {{- include "wg-portal.labels" . | nindent 4 }}
-spec:
-  {{- with .Values.revisionHistoryLimit }}
-  revisionHistoryLimit: {{ . }}
-  {{- end }}
-  {{- with .Values.strategy }}
-  updateStrategy: {{- toYaml . | nindent 4 }}
-  {{- end }}
-  serviceName: {{ template "wg-portal.fullname" . }}-web
-  selector:
-    matchLabels: {{- include "wg-portal.selectorLabels" . | nindent 6 }}
-  template: {{- include "wg-portal.podTemplate" . | nindent 4 }}
-  {{- if .Values.persistence.enabled }}
-  volumeClaimTemplates:
-    - metadata:
-        name: data
-      spec: {{- include "wg-portal.pvc" . | nindent 8 }}
-  {{- end -}}
-{{- end -}}

deploy/helm/values.yaml

@@ -1,246 +0,0 @@
-# Default values for wg-portal.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-# -- Partially override resource names (adds suffix)
-nameOverride: ""
-# -- Fully override resource names
-fullnameOverride: ""
-# -- Array of extra objects to deploy with the release
-extraDeploy: []
-
-config:
-  # -- (tpl/object) [Advanced configuration](https://wgportal.org/latest/documentation/configuration/overview/#advanced) options.
-  advanced: {}
-  # -- (tpl/object) [Auth configuration](https://wgportal.org/latest/documentation/configuration/overview/#auth) options.
-  auth: {}
-  # -- (tpl/object) [Core configuration](https://wgportal.org/latest/documentation/configuration/overview/#core) options.<br>
-  # If external admins in `auth` are defined and
-  # there are no `admin_user` and `admin_password` defined here,
-  # the default admin account will be disabled.
-  core: {}
-  # -- (tpl/object) [Database configuration](https://wgportal.org/latest/documentation/configuration/overview/#database) options
-  database: {}
-  # -- (tpl/object) [Mail configuration](https://wgportal.org/latest/documentation/configuration/overview/#mail) options
-  mail: {}
-  # -- (tpl/object) [Statistics configuration](https://wgportal.org/latest/documentation/configuration/overview/#statistics) options
-  statistics: {}
-  # -- (tpl/object) [Web configuration](https://wgportal.org/latest/documentation/configuration/overview/#web) options.<br>
-  # `listening_address` will be set automatically from `service.web.port`.
-  # `external_url` is required to enable ingress and certificate resources.
-  web: {}
-
-# -- The number of old ReplicaSets to retain to allow rollback.
-# @default -- `10`
-revisionHistoryLimit: ""
-# -- Workload type - `Deployment` or `StatefulSet`
-workloadType: Deployment
-# -- Update strategy for the workload
-# Valid values are:
-#  `RollingUpdate` or `Recreate` for Deployment,
-#  `RollingUpdate` or `OnDelete` for StatefulSet
-strategy:
-  type: RollingUpdate
-
-image:
-  # -- Image repository
-  repository: ghcr.io/h44z/wg-portal
-  # -- Image pull policy
-  pullPolicy: IfNotPresent
-  # -- Overrides the image tag whose default is the chart appVersion
-  tag: ""
-
-# -- Image pull secrets
-imagePullSecrets: []
-# -- (tpl/object) Extra annotations to add to the pod
-podAnnotations: {}
-# -- Extra labels to add to the pod
-podLabels: {}
-# -- Pod Security Context
-podSecurityContext: {}
-# Container Security Context
-securityContext:
-  capabilities:
-    # -- Add capabilities to the container
-    add:
-      - NET_ADMIN
-
-# -- (tpl/list) Pod init containers
-initContainers: []
-# -- (tpl/list) Pod sidecar containers
-sidecarContainers: []
-# -- Set DNS policy for the pod.
-# Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`.
-# @default -- `"ClusterFirst"`
-dnsPolicy: ""
-# -- Restart policy for all containers within the pod.
-# Valid values are `Always`, `OnFailure` or `Never`.
-# @default -- `"Always"`
-restartPolicy: ""
-# -- Use the host's network namespace.
-# @default -- `false`.
-hostNetwork: ""
-# -- Resources requests and limits
-resources: {}
-# -- Overwrite pod command
-command: []
-# -- Additional pod arguments
-args: []
-# -- (tpl/list) Additional environment variables
-env: []
-# -- (tpl/list) Additional environment variables from a secret or configMap
-envFrom: []
-# -- Liveness probe configuration
-livenessProbe: {}
-# -- Readiness probe configuration
-readinessProbe: {}
-# -- Startup probe configuration
-startupProbe: {}
-# -- (tpl/list) Additional volumes
-volumes: []
-# -- (tpl/list) Additional volumeMounts
-volumeMounts: []
-# -- Node Selector configuration
-nodeSelector:
-  kubernetes.io/os: linux
-# -- Tolerations configuration
-tolerations: []
-# -- Affinity configuration
-affinity: {}
-
-service:
-  mixed:
-    # -- Whether to create a single service for the web and wireguard interfaces
-    enabled: false
-    # -- Service type
-    type: LoadBalancer
-  web:
-    # -- Annotations for the web service
-    annotations: {}
-    # -- Web service type
-    type: ClusterIP
-    # -- Web service port
-    # Used for the web interface listener
-    port: 8888
-    # -- Web service appProtocol. Will be auto set to `https` if certificate is enabled.
-    appProtocol: http
-  wireguard:
-    # -- Annotations for the WireGuard service
-    annotations: {}
-    # -- Wireguard service type
-    type: LoadBalancer
-    # -- Wireguard service ports.
-    # Exposes the WireGuard ports for created interfaces.
-    # Lowerest port is selected as start port for the first interface.
-    # Increment next port by 1 for each additional interface.
-    ports:
-      - 51820
-  metrics:
-    port: 8787
-
-ingress:
-  # -- Specifies whether an ingress resource should be created
-  enabled: false
-  # -- Ingress class name
-  className: ""
-  # -- Ingress annotations
-  annotations: {}
-  # -- Ingress TLS configuration.
-  # Enable certificate resource or add ingress annotation to create required secret
-  tls: false
-
-certificate:
-  # -- Specifies whether a certificate resource should be created.
-  # If enabled, certificate will be used for the web.
-  enabled: false
-  issuer:
-    # -- Certificate issuer name
-    name: ""
-    # -- Certificate issuer kind (ClusterIssuer or Issuer)
-    kind: ""
-    # -- Certificate issuer group
-    group: cert-manager.io
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  duration: ""
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  renewBefore: ""
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  commonName: ""
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  emailAddresses: []
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  ipAddresses: []
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  keystores: {}
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  privateKey: {}
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  secretTemplate: {}
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  subject: {}
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  uris: []
-  # -- Optional. [Documentation](https://cert-manager.io/docs/usage/certificate/#creating-certificate-resources)
-  usages: []
-
-persistence:
-  # -- Specifies whether an persistent volume should be created
-  enabled: false
-  # -- Persistent Volume Claim annotations
-  annotations: {}
-  # -- Persistent Volume storage class.
-  # If undefined (the default) cluster's default provisioner will be used.
-  storageClass: ""
-  # -- Persistent Volume Access Mode
-  accessMode: ReadWriteOnce
-  # -- Persistent Volume size
-  size: 1Gi
-
-serviceAccount:
-  # -- Specifies whether a service account should be created
-  create: true
-  # -- Service account annotations
-  annotations: {}
-  # -- Automatically mount a ServiceAccount's API credentials
-  automount: false
-  # -- The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-monitoring:
-  # -- Enable Prometheus monitoring.
-  enabled: false
-  # -- API version of the Prometheus resource.
-  # Use `azmonitoring.coreos.com/v1` for Azure Managed Prometheus.
-  apiVersion: monitoring.coreos.com/v1
-  # -- Kind of the Prometheus resource.
-  # Could be `PodMonitor` or `ServiceMonitor`.
-  kind: PodMonitor
-  # -- Resource labels.
-  labels: {}
-  # -- Resource annotations.
-  annotations: {}
-  # -- Interval at which metrics should be scraped. If not specified `config.statistics.data_collection_interval` interval is used.
-  # @default -- `1m`
-  interval: ""
-  # -- Relabelings to samples before ingestion.
-  metricRelabelings: []
-  # -- Relabelings to samples before scraping.
-  relabelings: []
-  # -- Timeout after which the scrape is ended If not specified, the Prometheus global scrape interval is used.
-  scrapeTimeout: ""
-  # -- The label to use to retrieve the job name from.
-  jobLabel: ""
-  # -- Transfers labels on the Kubernetes Pod onto the target.
-  podTargetLabels: {}
-
-  dashboard:
-    # -- Enable Grafana dashboard.
-    enabled: false
-    # -- Annotations for the dashboard ConfigMap.
-    annotations: {}
-    # -- Additional labels for the dashboard ConfigMap.
-    labels: {}
-    # -- Dashboard ConfigMap namespace
-    # Overrides the namespace for the dashboard ConfigMap.
-    namespace: ""

docker-compose.yml

@@ -1,7 +1,8 @@
 ---
+version: '3.6'
 services:
   wg-portal:
-    image: wgportal/wg-portal:latest
+    image: wgportal/wg-portal:v2
     container_name: wg-portal
     restart: unless-stopped
     logging:

docs/documentation/configuration/examples.md

@@ -1,189 +0,0 @@
-Below are some sample YAML configurations demonstrating how to override some default values.
-
-## Basic
-
-```yaml
-core:
-  admin_user: test@example.com
-  admin_password: password
-  import_existing: false
-  create_default_peer: true
-  self_provisioning_allowed: true
-
-web:
-  site_title: My WireGuard Server
-  site_company_name: My Company
-  listening_address: :8080
-  external_url: https://my.externa-domain.com
-  csrf_secret: super-s3cr3t-csrf
-  session_secret: super-s3cr3t-session
-  request_logging: true
-
-advanced:
-  log_level: trace
-  log_pretty: true
-  log_json: false
-  config_storage_path: /etc/wireguard
-  expiry_check_interval: 5m
-
-database:
-  debug: true
-  type: sqlite
-  dsn: data/sqlite.db
-```
-
-## LDAP Authentication and Synchronization
-
-```yaml
-# ... (basic configuration)
-
-auth:
-  ldap:
-    # a sample LDAP provider with user sync enabled
-    - id: ldap
-      provider_name: Active Directory
-      display_name: Login with</br>AD
-      url: ldap://srv-ad1.company.local:389
-      bind_user: ldap_wireguard@company.local
-      bind_pass: super-s3cr3t-ldap
-      base_dn: DC=COMPANY,DC=LOCAL
-      login_filter: (&(objectClass=organizationalPerson)(mail={{login_identifier}})(!userAccountControl:1.2.840.113556.1.4.803:=2))
-      sync_interval: 15m
-      sync_filter: (&(objectClass=organizationalPerson)(!userAccountControl:1.2.840.113556.1.4.803:=2)(mail=*))
-      disable_missing: true
-      field_map:
-        user_identifier: sAMAccountName
-        email: mail
-        firstname: givenName
-        lastname: sn
-        phone: telephoneNumber
-        department: department
-        memberof: memberOf
-      admin_group: CN=WireGuardAdmins,OU=Some-OU,DC=COMPANY,DC=LOCAL
-      registration_enabled: true
-      log_user_info: true
-```
-
-## OpenID Connect (OIDC) Authentication
-
-```yaml
-# ... (basic configuration)
-
-auth:
-  oidc:
-    # a sample Entra ID provider with environment variable substitution
-    - id: azure
-      provider_name: azure
-      display_name: Login with</br>Entra ID
-      registration_enabled: true
-      base_url: "https://login.microsoftonline.com/${AZURE_TENANT_ID}/v2.0"
-      client_id: "${AZURE_CLIENT_ID}"
-      client_secret: "${AZURE_CLIENT_SECRET}"
-      extra_scopes:
-        - profile
-        - email
-
-    # a sample provider where users with the attribute `wg_admin` set to `true` are considered as admins
-    - id: oidc-with-admin-attribute
-      provider_name: google
-      display_name: Login with</br>Google
-      base_url: https://accounts.google.com
-      client_id: the-client-id-1234.apps.googleusercontent.com
-      client_secret: A_CLIENT_SECRET
-      extra_scopes:
-        - https://www.googleapis.com/auth/userinfo.email
-        - https://www.googleapis.com/auth/userinfo.profile
-      field_map:
-        user_identifier: sub
-        email: email
-        firstname: given_name
-        lastname: family_name
-        phone: phone_number
-        department: department
-        is_admin: wg_admin
-      admin_mapping:
-        - admin_value_regex: ^true$
-      registration_enabled: true
-      log_user_info: true
-
-    # a sample provider where users in the group `the-admin-group` are considered as admins
-    - id: oidc-with-admin-group
-      provider_name: google2
-      display_name: Login with</br>Google2
-      base_url: https://accounts.google.com
-      client_id: another-client-id-1234.apps.googleusercontent.com
-      client_secret: A_CLIENT_SECRET
-      extra_scopes:
-        - https://www.googleapis.com/auth/userinfo.email
-        - https://www.googleapis.com/auth/userinfo.profile
-      field_map:
-        user_identifier: sub
-        email: email
-        firstname: given_name
-        lastname: family_name
-        phone: phone_number
-        department: department
-        user_groups: groups
-      admin_mapping:
-        - admin_group_regex: ^the-admin-group$
-      registration_enabled: true
-      log_user_info: true
-```
-
-## Plain OAuth2 Authentication
-
-```yaml
-# ... (basic configuration)
-
-auth:
-  oauth:
-    # a sample provider where users with the attribute `this-attribute-must-be-true` set to `true` or `True`
-    # are considered as admins
-    - id: google_plain_oauth-with-admin-attribute
-      provider_name: google3
-      display_name: Login with</br>Google3
-      client_id: another-client-id-1234.apps.googleusercontent.com
-      client_secret: A_CLIENT_SECRET
-      auth_url: https://accounts.google.com/o/oauth2/v2/auth
-      token_url: https://oauth2.googleapis.com/token
-      user_info_url: https://openidconnect.googleapis.com/v1/userinfo
-      scopes:
-        - openid
-        - email
-        - profile
-      field_map:
-        user_identifier: sub
-        email: email
-        firstname: name
-        is_admin: this-attribute-must-be-true
-      admin_mapping:
-        - admin_value_regex: ^(True|true)$
-      registration_enabled: true
-    
-    # a sample provider where either users with the attribute `this-attribute-must-be-true` set to `true` or 
-    # users in the group `admin-group-name` are considered as admins
-    - id: google_plain_oauth_with_groups
-      provider_name: google4
-      display_name: Login with</br>Google4
-      client_id: another-client-id-1234.apps.googleusercontent.com
-      client_secret: A_CLIENT_SECRET
-      auth_url: https://accounts.google.com/o/oauth2/v2/auth
-      token_url: https://oauth2.googleapis.com/token
-      user_info_url: https://openidconnect.googleapis.com/v1/userinfo
-      scopes:
-        - openid
-        - email
-        - profile
-        - i-want-some-groups
-      field_map:
-        email: email
-        firstname: name
-        user_identifier: sub
-        is_admin: this-attribute-must-be-true
-        user_groups: groups
-      admin_mapping:
-        admin_value_regex: ^true$
-        admin_group_regex: ^admin-group-name$
-      registration_enabled: true
-      log_user_info: true
-```

docs/documentation/configuration/overview.md

@@ -1,589 +0,0 @@
-This page provides an overview of **all available configuration options** for WireGuard Portal.
-
-You can supply these configurations in a **YAML** file (e.g. `config.yaml`) when starting the Portal.
-The path of the configuration file defaults to **config/config.yml** in the working directory of the executable.  
-It is possible to override configuration filepath using the environment variable `WG_PORTAL_CONFIG`.
-For example: `WG_PORTAL_CONFIG=/etc/wg-portal/config.yaml ./wg-portal`.  
-Also, environment variable substitution in config file is supported. Refer to [syntax](https://github.com/a8m/envsubst?tab=readme-ov-file#docs).
-
-Configuration examples are available on the [Examples](./examples.md) page.
-
-<details>
-<summary>Default configuration</summary>
-
-```yaml
-core:
-  admin_user: admin@wgportal.local
-  admin_password: wgportal
-  editable_keys: true
-  create_default_peer: false
-  create_default_peer_on_creation: false
-  re_enable_peer_after_user_enable: true
-  delete_peer_after_user_deleted: false
-  self_provisioning_allowed: false
-  import_existing: true
-  restore_state: true
-
-advanced:
-  log_level: info
-  log_pretty: false
-  log_json: false
-  start_listen_port: 51820
-  start_cidr_v4: 10.11.12.0/24
-  start_cidr_v6: fdfd:d3ad:c0de:1234::0/64
-  use_ip_v6: true
-  config_storage_path: ""
-  expiry_check_interval: 15m
-  rule_prio_offset: 20000
-  api_admin_only: true
-
-database:
-  debug: false
-  slow_query_threshold: 0
-  type: sqlite
-  dsn: data/sqlite.db
-
-statistics:
-  use_ping_checks: true
-  ping_check_workers: 10
-  ping_unprivileged: false
-  ping_check_interval: 1m
-  data_collection_interval: 1m
-  collect_interface_data: true
-  collect_peer_data: true
-  collect_audit_data: true
-  listening_address: :8787
-
-mail:
-  host: 127.0.0.1
-  port: 25
-  encryption: none
-  cert_validation: false
-  username: ""
-  password: ""
-  auth_type: plain
-  from: Wireguard Portal <noreply@wireguard.local>
-  link_only: false
-
-auth:
-  oidc: []
-  oauth: []
-  ldap: []
-
-web:
-  listening_address: :8888
-  external_url: http://localhost:8888
-  site_company_name: WireGuard Portal
-  site_title: WireGuard Portal
-  session_identifier: wgPortalSession
-  session_secret: very_secret
-  csrf_secret: extremely_secret
-  request_logging: false
-  cert_file: ""
-  key_File: ""
-```
-
-</details>
-
-
-Below you will find sections like
-[`core`](#core),
-[`advanced`](#advanced),
-[`database`](#database),
-[`statistics`](#statistics),
-[`mail`](#mail),
-[`auth`](#auth) and
-[`web`](#web).  
-Each section describes the individual configuration keys, their default values, and a brief explanation of their purpose.
-
----
-
-## Core
-
-These are the primary configuration options that control fundamental WireGuard Portal behavior.
-More advanced options are found in the subsequent `Advanced` section.
-
-### `admin_user`
-- **Default:** `admin@wgportal.local`
-- **Description:** The administrator user. This user will be created as a default admin if it does not yet exist.
-
-### `admin_password`
-- **Default:** `wgportal`
-- **Description:** The administrator password. The default password of `wgportal` should be changed immediately.
-
-### `editable_keys`
-- **Default:** `true`
-- **Description:** Allow editing of WireGuard key-pairs directly in the UI.
-
-### `create_default_peer`
-- **Default:** `false`
-- **Description:** If a user logs in for the first time with no existing peers, automatically create a new WireGuard peer for **all** server interfaces.
-
-### `create_default_peer_on_creation`
-- **Default:** `false`
-- **Description:** If an LDAP user is created (e.g., through LDAP sync) and has no peers, automatically create a new WireGuard peer for **all** server interfaces.
-
-### `re_enable_peer_after_user_enable`
-- **Default:** `true`
-- **Description:** Re-enable all peers that were previously disabled if the associated user is re-enabled.
-
-### `delete_peer_after_user_deleted`
-- **Default:** `false`
-- **Description:** If a user is deleted, remove all linked peers. Otherwise, peers remain but are disabled.
-
-### `self_provisioning_allowed`
-- **Default:** `false`
-- **Description:** Allow registered (non-admin) users to self-provision peers from their profile page.
-
-### `import_existing`
-- **Default:** `true`
-- **Description:** On startup, import existing WireGuard interfaces and peers into WireGuard Portal.
-
-### `restore_state`
-- **Default:** `true`
-- **Description:** Restore the WireGuard interface states (up/down) that existed before WireGuard Portal started.
-
----
-
-## Advanced
-
-Additional or more specialized configuration options for logging and interface creation details.
-
-### `log_level`
-- **Default:** `info`
-- **Description:** The log level used by the application. Valid options are: `trace`, `debug`, `info`, `warn`, `error`.
-
-### `log_pretty`
-- **Default:** `false`
-- **Description:** If `true`, log messages are colorized and formatted for readability (pretty-print).
-
-### `log_json`
-- **Default:** `false`
-- **Description:** If `true`, log messages are structured in JSON format.
-
-### `start_listen_port`
-- **Default:** `51820`
-- **Description:** The first port to use when automatically creating new WireGuard interfaces.
-
-### `start_cidr_v4`
-- **Default:** `10.11.12.0/24`
-- **Description:** The initial IPv4 subnet to use when automatically creating new WireGuard interfaces.
-
-### `start_cidr_v6`
-- **Default:** `fdfd:d3ad:c0de:1234::0/64`
-- **Description:** The initial IPv6 subnet to use when automatically creating new WireGuard interfaces.
-
-### `use_ip_v6`
-- **Default:** `true`
-- **Description:** Enable or disable IPv6 support.
-
-### `config_storage_path`
-- **Default:** *(empty)*
-- **Description:** Path to a directory where `wg-quick` style configuration files will be stored (if you need local filesystem configs).
-
-### `expiry_check_interval`
-- **Default:** `15m`
-- **Description:** Interval after which existing peers are checked if they are expired. Format uses `s`, `m`, `h`, `d` for seconds, minutes, hours, days, see [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration).
-
-### `rule_prio_offset`
-- **Default:** `20000`
-- **Description:** Offset for IP route rule priorities when configuring routing.
-
-### `route_table_offset`
-- **Default:** `20000`
-- **Description:** Offset for IP route table IDs when configuring routing.
-
-### `api_admin_only`
-- **Default:** `true`
-- **Description:** If `true`, the public REST API is accessible only to admin users. The API docs live at [`/api/v1/doc.html`](../rest-api/api-doc.md).
-
----
-
-## Database
-
-Configuration for the underlying database used by WireGuard Portal. 
-Supported databases include SQLite, MySQL, Microsoft SQL Server, and Postgres.
-
-### `debug`
-- **Default:** `false`
-- **Description:** If `true`, logs all database statements (verbose).
-
-### `slow_query_threshold`
-- **Default:** 0
-- **Description:** A time threshold (e.g., `100ms`) above which queries are considered slow and logged as warnings. If empty or zero, slow query logging is disabled. Format uses `s`, `ms` for seconds, milliseconds, see [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration).
-
-### `type`
-- **Default:** `sqlite`
-- **Description:** The database type. Valid options: `sqlite`, `mssql`, `mysql`, `postgres`.
-
-### `dsn`
-- **Default:** `data/sqlite.db`
-- **Description:** The Data Source Name (DSN) for connecting to the database.  
-  For example:
-  ```text
-  user:pass@tcp(1.2.3.4:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local
-  ```
-
----
-
-## Statistics
-
-Controls how WireGuard Portal collects and reports usage statistics, including ping checks and Prometheus metrics.
-
-### `use_ping_checks`
-- **Default:** `true`
-- **Description:** Enable periodic ping checks to verify that peers remain responsive.
-
-### `ping_check_workers`
-- **Default:** `10`
-- **Description:** Number of parallel worker processes for ping checks.
-
-### `ping_unprivileged`
-- **Default:** `false`
-- **Description:** If `false`, ping checks run without root privileges. This is currently considered BETA.
-
-### `ping_check_interval`
-- **Default:** `1m`
-- **Description:** Interval between consecutive ping checks for all peers. Format uses `s`, `m`, `h`, `d` for seconds, minutes, hours, days, see [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration).
-
-### `data_collection_interval`
-- **Default:** `1m`
-- **Description:** Interval between data collection cycles (bytes sent/received, handshake times, etc.). Format uses `s`, `m`, `h`, `d` for seconds, minutes, hours, days, see [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration).
-
-### `collect_interface_data`
-- **Default:** `true`
-- **Description:** If `true`, collects interface-level data (bytes in/out) for monitoring and statistics.
-
-### `collect_peer_data`
-- **Default:** `true`
-- **Description:** If `true`, collects peer-level data (bytes, last handshake, endpoint, etc.).
-
-### `collect_audit_data`
-- **Default:** `true`
-- **Description:** If `true`, logs certain portal events (such as user logins) to the database.
-
-### `listening_address`
-- **Default:** `:8787`
-- **Description:** Address and port for the integrated Prometheus metric server (e.g., `:8787`).
-
----
-
-## Mail
-
-Options for configuring email notifications or sending peer configurations via email.
-
-### `host`
-- **Default:** `127.0.0.1`
-- **Description:** Hostname or IP of the SMTP server.
-
-### `port`
-- **Default:** `25`
-- **Description:** Port number for the SMTP server.
-
-### `encryption`
-- **Default:** `none`
-- **Description:** SMTP encryption type. Valid values: `none`, `tls`, `starttls`.
-
-### `cert_validation`
-- **Default:** `false`
-- **Description:** If `true`, validate the SMTP server certificate (relevant if `encryption` = `tls`).
-
-### `username`
-- **Default:** *(empty)*
-- **Description:** Optional SMTP username for authentication.
-
-### `password`
-- **Default:** *(empty)*
-- **Description:** Optional SMTP password for authentication.
-
-### `auth_type`
-- **Default:** `plain`
-- **Description:** SMTP authentication type. Valid values: `plain`, `login`, `crammd5`.
-
-### `from`
-- **Default:** `Wireguard Portal <noreply@wireguard.local>`
-- **Description:** The default "From" address when sending emails.
-
-### `link_only`
-- **Default:** `false`
-- **Description:** If `true`, emails only contain a link to WireGuard Portal, rather than attaching the full configuration.
-
----
-
-## Auth
-
-WireGuard Portal supports multiple authentication strategies, including **OpenID Connect** (`oidc`), **OAuth** (`oauth`), and **LDAP** (`ldap`).
-Each can have multiple providers configured. Below are the relevant keys.
-
----
-
-### OIDC
-
-The `oidc` array contains a list of OpenID Connect providers. 
-Below are the properties for each OIDC provider entry inside `auth.oidc`:
-
-#### `provider_name`
-- **Default:** *(empty)*
-- **Description:** A **unique** name for this provider. Must not conflict with other providers.
-
-#### `display_name`
-- **Default:** *(empty)*
-- **Description:** A user-friendly name shown on the login page (e.g., "Login with Google").
-
-#### `base_url`
-- **Default:** *(empty)*
-- **Description:** The OIDC provider’s base URL (e.g., `https://accounts.google.com`).
-
-#### `client_id`
-- **Default:** *(empty)*
-- **Description:** The OAuth client ID from the OIDC provider.
-
-#### `client_secret`
-- **Default:** *(empty)*
-- **Description:** The OAuth client secret from the OIDC provider.
-
-#### `extra_scopes`
-- **Default:** *(empty)*
-- **Description:** A list of additional OIDC scopes (e.g., `profile`, `email`).
-
-#### `field_map`
-- **Default:** *(empty)*
-- **Description:** Maps OIDC claims to WireGuard Portal user fields. 
-  - Available fields: `user_identifier`, `email`, `firstname`, `lastname`, `phone`, `department`, `is_admin`, `user_groups`.
-
-    | **Field**         | **Typical OIDC Claim**            | **Explanation**                                                                                                                                                                                         |
-    | ----------------- | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-    | `user_identifier` | `sub` or `preferred_username`     | A unique identifier for the user. Often the OIDC `sub` claim is used because it’s guaranteed to be unique for the user within the IdP. Some providers also support `preferred_username` if it’s unique. |
-    | `email`           | `email`                           | The user’s email address as provided by the IdP. Not always verified, depending on IdP settings.                                                                                                        |
-    | `firstname`       | `given_name`                      | The user’s first name, typically provided by the IdP in the `given_name` claim.                                                                                                                         |
-    | `lastname`        | `family_name`                     | The user’s last (family) name, typically provided by the IdP in the `family_name` claim.                                                                                                                |
-    | `phone`           | `phone_number`                    | The user’s phone number. This may require additional scopes/permissions from the IdP to access.                                                                                                         |
-    | `department`      | Custom claim (e.g., `department`) | If the IdP can provide organizational data, it may store it in a custom claim. Adjust accordingly (e.g., `department`, `org`, or another attribute).                                                    |
-    | `is_admin`        | Custom claim or derived role      | If the IdP returns a role or admin flag, you can map that to `is_admin`. Often this is managed through custom claims or group membership.                                                               |
-    | `user_groups`     | `groups` or another custom claim  | A list of group memberships for the user. Some IdPs provide `groups` out of the box; others require custom claims or directory lookups.                                                                 |
-
-#### `admin_mapping`
-- **Default:** *(empty)*
-- **Description:** WgPortal can grant a user admin rights by matching the value of the `is_admin` claim against a regular expression. Alternatively, a regular expression can be used to check if a user is member of a specific group listed in the `user_group` claim. The regular expressions are defined in `admin_value_regex` and `admin_group_regex`.
-    - `admin_value_regex`: A regular expression to match the `is_admin` claim. By default, this expression matches the string "true" (`^true$`).
-    - `admin_group_regex`: A regular expression to match the `user_groups` claim. Each entry in the `user_groups` claim is checked against this regex.
-
-#### `registration_enabled`
-- **Default:** *(empty)*
-- **Description:** If `true`, a new user will be created in WireGuard Portal if not already present.
-
-#### `log_user_info`
-- **Default:** *(empty)*
-- **Description:** If `true`, OIDC user data is logged at the trace level upon login (for debugging).
-
----
-
-### OAuth
-
-The `oauth` array contains a list of plain OAuth2 providers.
-Below are the properties for each OAuth provider entry inside `auth.oauth`:
-
-#### `provider_name`
-- **Default:** *(empty)*
-- **Description:** A **unique** name for this provider. Must not conflict with other providers.
-
-#### `display_name`
-- **Default:** *(empty)*
-- **Description:** A user-friendly name shown on the login page.
-
-#### `client_id`
-- **Default:** *(empty)*
-- **Description:** The OAuth client ID for the provider.
-
-#### `client_secret`
-- **Default:** *(empty)*
-- **Description:** The OAuth client secret for the provider.
-
-#### `auth_url`
-- **Default:** *(empty)*
-- **Description:** URL of the authentication endpoint.
-
-#### `token_url`
-- **Default:** *(empty)*
-- **Description:** URL of the token endpoint.
-
-#### `user_info_url`
-- **Default:** *(empty)*
-- **Description:** URL of the user information endpoint.
-
-#### `scopes`
-- **Default:** *(empty)*
-- **Description:** A list of OAuth scopes.
-
-#### `field_map`
-- **Default:** *(empty)*
-- **Description:** Maps OAuth attributes to WireGuard Portal fields.
-  - Available fields: `user_identifier`, `email`, `firstname`, `lastname`, `phone`, `department`, `is_admin`, `user_groups`.
-
-    | **Field**         | **Typical Claim**                 | **Explanation**                                                                                                                                                                                         |
-    | ----------------- | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-    | `user_identifier` | `sub` or `preferred_username`     | A unique identifier for the user. Often the OIDC `sub` claim is used because it’s guaranteed to be unique for the user within the IdP. Some providers also support `preferred_username` if it’s unique. |
-    | `email`           | `email`                           | The user’s email address as provided by the IdP. Not always verified, depending on IdP settings.                                                                                                        |
-    | `firstname`       | `given_name`                      | The user’s first name, typically provided by the IdP in the `given_name` claim.                                                                                                                         |
-    | `lastname`        | `family_name`                     | The user’s last (family) name, typically provided by the IdP in the `family_name` claim.                                                                                                                |
-    | `phone`           | `phone_number`                    | The user’s phone number. This may require additional scopes/permissions from the IdP to access.                                                                                                         |
-    | `department`      | Custom claim (e.g., `department`) | If the IdP can provide organizational data, it may store it in a custom claim. Adjust accordingly (e.g., `department`, `org`, or another attribute).                                                    |
-    | `is_admin`        | Custom claim or derived role      | If the IdP returns a role or admin flag, you can map that to `is_admin`. Often this is managed through custom claims or group membership.                                                               |
-    | `user_groups`     | `groups` or another custom claim  | A list of group memberships for the user. Some IdPs provide `groups` out of the box; others require custom claims or directory lookups.                                                                 |
-
-#### `admin_mapping`
-- **Default:** *(empty)*
-- **Description:** WgPortal can grant a user admin rights by matching the value of the `is_admin` claim against a regular expression. Alternatively, a regular expression can be used to check if a user is member of a specific group listed in the `user_group` claim. The regular expressions are defined in `admin_value_regex` and `admin_group_regex`.
-  - `admin_value_regex`: A regular expression to match the `is_admin` claim. By default, this expression matches the string "true" (`^true$`).
-  - `admin_group_regex`: A regular expression to match the `user_groups` claim. Each entry in the `user_groups` claim is checked against this regex.
-
-#### `registration_enabled`
-- **Default:** *(empty)*
-- **Description:** If `true`, new users are created automatically on successful login.
-
-#### `log_user_info`
-- **Default:** *(empty)*
-- **Description:** If `true`, logs user info at the trace level upon login.
-
----
-
-### LDAP
-
-The `ldap` array contains a list of LDAP authentication providers.
-Below are the properties for each LDAP provider entry inside `auth.ldap`:
-
-#### `url`
-- **Default:** *(empty)*
-- **Description:** The LDAP server URL (e.g., `ldap://srv-ad01.company.local:389`).
-
-#### `start_tls`
-- **Default:** *(empty)*
-- **Description:** If `true`, use STARTTLS to secure the LDAP connection.
-
-#### `cert_validation`
-- **Default:** *(empty)*
-- **Description:** If `true`, validate the LDAP server’s TLS certificate.
-
-#### `tls_certificate_path`
-- **Default:** *(empty)*
-- **Description:** Path to a TLS certificate if needed for LDAP connections.
-
-#### `tls_key_path`
-- **Default:** *(empty)*
-- **Description:** Path to the corresponding TLS certificate key.
-
-#### `base_dn`
-- **Default:** *(empty)*
-- **Description:** The base DN for user searches (e.g., `DC=COMPANY,DC=LOCAL`).
-
-#### `bind_user`
-- **Default:** *(empty)*
-- **Description:** The bind user for LDAP (e.g., `company\\ldap_wireguard` or `ldap_wireguard@company.local`).
-
-#### `bind_pass`
-- **Default:** *(empty)*
-- **Description:** The bind password for LDAP authentication.
-
-#### `field_map`
-- **Default:** *(empty)*
-- **Description:** Maps LDAP attributes to WireGuard Portal fields.
-    - Available fields: `user_identifier`, `email`, `firstname`, `lastname`, `phone`, `department`, `memberof`.
-  
-      | **WireGuard Portal Field** | **Typical LDAP Attribute** | **Short Description**                                        |
-      | -------------------------- | -------------------------- | ------------------------------------------------------------ |
-      | user_identifier            | sAMAccountName / uid       | Uniquely identifies the user within the LDAP directory.      |
-      | email                      | mail / userPrincipalName   | Stores the user's primary email address.                     |
-      | firstname                  | givenName                  | Contains the user's first (given) name.                      |
-      | lastname                   | sn                         | Contains the user's last (surname) name.                     |
-      | phone                      | telephoneNumber / mobile   | Holds the user's phone or mobile number.                     |
-      | department                 | departmentNumber / ou      | Specifies the department or organizational unit of the user. |
-      | memberof                   | memberOf                   | Lists the groups and roles to which the user belongs.        |
-
-#### `login_filter`
-- **Default:** *(empty)*
-- **Description:** An LDAP filter to restrict which users can log in. Use `{{login_identifier}}` to insert the username.
-  For example:
-  ```text
-  (&(objectClass=organizationalPerson)(mail={{login_identifier}})(!userAccountControl:1.2.840.113556.1.4.803:=2))
-  ```
-
-#### `admin_group`
-- **Default:** *(empty)*
-- **Description:** A specific LDAP group whose members are considered administrators in WireGuard Portal.
-  For example:
-  ```text
-  CN=WireGuardAdmins,OU=Some-OU,DC=YOURDOMAIN,DC=LOCAL
-  ```
-
-#### `sync_interval`
-- **Default:** *(empty)*
-- **Description:** How frequently (in duration, e.g. `30m`) to synchronize users from LDAP. Empty or `0` disables sync. Format uses `s`, `m`, `h`, `d` for seconds, minutes, hours, days, see [time.ParseDuration](https://golang.org/pkg/time/#ParseDuration).
-  Only users that match the `sync_filter` are synchronized, if `disable_missing` is `true`, users not found in LDAP are disabled.
-
-#### `sync_filter`
-- **Default:** *(empty)*
-- **Description:** An LDAP filter to select which users get synchronized into WireGuard Portal.
-  For example:
-  ```text
-  (&(objectClass=organizationalPerson)(!userAccountControl:1.2.840.113556.1.4.803:=2)(mail=*))
-  ```
-
-#### `disable_missing`
-- **Default:** *(empty)*
-- **Description:** If `true`, any user **not** found in LDAP (during sync) is disabled in WireGuard Portal.
-
-#### `auto_re_enable`
-- **Default:** *(empty)*
-- **Description:** If `true`, users that where disabled because they were missing (see `disable_missing`) will be re-enabled once they are found again.
-
-#### `registration_enabled`
-- **Default:** *(empty)*
-- **Description:** If `true`, new user accounts are created in WireGuard Portal upon first login.
-
-#### `log_user_info`
-- **Default:** *(empty)*
-- **Description:** If `true`, logs LDAP user data at the trace level upon login.
-
----
-
-## Web
-
-### `listening_address`
-- **Default:** `:8888`
-- **Description:** The listening port of the web server.
-
-### `external_url`
-- **Default:** `http://localhost:8888`
-- **Description:** The URL where a client can access WireGuard Portal.
-
-### `site_company_name`
-- **Default:** `WireGuard Portal`
-- **Description:** The company name that is shown at the bottom of the web frontend.
-
-### `site_title`
-- **Default:** `WireGuard Portal`
-- **Description:** The title that is shown in the web frontend.
-
-### `session_identifier`
-- **Default:** `wgPortalSession`
-- **Description:** The session identifier for the web frontend.
-
-### `session_secret`
-- **Default:** `very_secret`
-- **Description:** The session secret for the web frontend.
-
-### `csrf_secret`
-- **Default:** `extremely_secret`
-- **Description:** The CSRF secret.
-
-### `request_logging`
-- **Default:** `false`
-- **Description:** Log all HTTP requests.
-
-### `cert_file`
-- **Default:** *(empty)*
-- **Description:** (Optional) Path to the TLS certificate file.
-
-### `key_file`
-- **Default:** *(empty)*
-- **Description:** (Optional) Path to the TLS certificate key file.

docs/documentation/getting-started/binaries.md

@@ -1,34 +0,0 @@
-Starting from v2, each [release](https://github.com/h44z/wg-portal/releases) includes compiled binaries for supported platforms.
-These binary versions can be manually downloaded and installed.
-
-## Download
-
-With `curl`:
-
-  ```shell
-  curl -L -o wg-portal https://github.com/h44z/wg-portal/releases/download/${WG_PORTAL_VERSION}/wg-portal_linux_amd64 
-  ```
-
-With `wget`:
-
-  ```shell
-  wget -O wg-portal https://github.com/h44z/wg-portal/releases/download/${WG_PORTAL_VERSION}/wg-portal_linux_amd64
-  ```
-
-with `gh cli`:
-
-  ```shell
-  gh release download ${WG_PORTAL_VERSION} --repo h44z/wg-portal --output wg-portal --pattern '*amd64'
-  ```
-
-## Install
-
-```shell
-sudo mkdir -p /opt/wg-portal
-sudo install wg-portal /opt/wg-portal/
-```
-
-## Unreleased
-
-Unreleased versions could be downloaded from
-[GitHub Workflow](https://github.com/h44z/wg-portal/actions/workflows/docker-publish.yml?query=branch%3Amaster) artifacs also.

docs/documentation/getting-started/building.md

@@ -0,0 +1,11 @@
+To build a standalone application, use the Makefile provided in the repository.
+Go version **1.21** or higher has to be installed to build WireGuard Portal.
+If you want to re-compile the frontend, NodeJS **18** and NPM >= **9** is required.
+
+```shell
+# build the frontend (optional)
+make frontend
+
+# build the binary
+make build
+```

docs/documentation/getting-started/docker.md

@@ -5,7 +5,20 @@ The preferred way to start WireGuard Portal as Docker container is to use Docker
 A sample docker-compose.yml:
 
 ```yaml
---8<-- "docker-compose.yml::17"
+version: '3.6'
+services:
+  wg-portal:
+    image: wgportal/wg-portal:v2
+    restart: unless-stopped
+    cap_add:
+      - NET_ADMIN
+    network_mode: "host"
+    ports:
+      - "8888:8888"
+    volumes:
+      - /etc/wireguard:/etc/wireguard
+      - ./data:/app/data
+      - ./config:/app/config
 ```
 
 By default, the webserver is listening on port **8888**.
@@ -18,7 +31,6 @@ All images are hosted on Docker Hub at [https://hub.docker.com/r/wgportal/wg-por
 There are three types of tags in the repository:
 
 #### Semantic versioned tags
-
 For example, `1.0.19`.
 
 These are official releases of WireGuard Portal. They correspond to the GitHub tags that we make, and you can see the release notes for them here: [https://github.com/h44z/wg-portal/releases](https://github.com/h44z/wg-portal/releases).
@@ -32,17 +44,16 @@ If you only want to stay at the same major or major+minor version, use either `v
 Version **1** is currently **stable**, version **2** is in **development**.
 
 #### latest
-
 This is the most recent build to master! It changes a lot and is very unstable.
 
 We recommend that you don't use it except for development purposes.
 
 #### Branch tags
-
 For each commit in the master and the stable branch, a corresponding Docker image is build. These images use the `master` or `stable` tags.
 
-## Configuration
 
+
+## Configuration
 You can configure WireGuard Portal using a yaml configuration file.
 The filepath of the yaml configuration file defaults to `/app/config/config.yml`.
 It is possible to override the configuration filepath using the environment variable **WG_PORTAL_CONFIG**.
@@ -50,8 +61,21 @@ It is possible to override the configuration filepath using the environment vari
 By default, WireGuard Portal uses a SQLite database. The database is stored in `/app/data/sqlite.db`.
 
 You should mount those directories as a volume:
-
 - /app/data
 - /app/config
 
-A detailed description of the configuration options can be found [here](../configuration/overview.md).
+### Configuration Options
+All available YAML configuration options are available [here](https://github.com/h44z/wg-portal#configuration).
+
+A very basic example:
+
+```yaml
+core:
+  admin_user: test@wg-portal.local
+  admin_password: secret
+
+web:
+  external_url: http://localhost:8888
+  request_logging: true
+```
+

docs/documentation/getting-started/helm.md

@@ -1 +0,0 @@
---8<-- "./deploy/helm/README.md:16"

docs/documentation/getting-started/sources.md

@@ -1,24 +0,0 @@
-To build the application from source files, use the Makefile provided in the repository.
-
-## Requirements
-
-- [Git](https://git-scm.com/downloads)
-- [Make](https://www.gnu.org/software/make/)
-- [Go](https://go.dev/dl/): `>=1.23.0`
-- [NodeJS with npm](https://nodejs.org/en/download): `node>=18, npm>=9`
-
-## Build
-
-```shell
-# Get source code
-git clone https://github.com/h44z/wg-portal -b ${WG_PORTAL_VERSION:-master} --depth 1
-cd wg-portal
-# Build the frontend
-make frontend
-# Build the backend
-make build
-```
-
-## Install
-
-Compiled binary will be available in `./dist` directory.

docs/documentation/getting-started/upgrade.md

@@ -1,4 +1,4 @@
-For production deployments of WireGuard Portal, we strongly recommend using version 1.
+For production deployments of WireGuard Portal, we strongly recommend using version 1. 
 If you want to use version 2, please be aware that it is still in beta and not feature complete.
 
 ## Upgrade from v1 to v2
@@ -18,19 +18,8 @@ You can also specify the database type using the parameter **-migrateFromType**,
 For example:
 
 ```shell
-./wg-portal-amd64 -migrateFromType=mysql -migrateFrom='user:pass@tcp(1.2.3.4:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local'
+./wg-portal-amd64 -migrateFromType=mysql -migrateFrom=user:pass@tcp(1.2.3.4:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local
 ```
 
 The upgrade will transform the old, existing database and store the values in the new database specified in the **config.yml** configuration file.
-Ensure that the new database does not contain any data!
+Ensure that the new database does not contain any data!
-
-If you are using Docker, you can adapt the docker-compose.yml file to start the upgrade process:
-
-```yaml
-services:
-  wg-portal:
-    image: wgportal/wg-portal:latest
-    # ... other settings
-    restart: no
-    command: ["-migrateFrom=/app/data/wg_portal.db"]
-```

docs/documentation/monitoring/prometheus.md

@@ -1,32 +0,0 @@
-By default WG-Portal exposes Prometheus metrics on port `8787` if interface/peer statistic data collection is enabled.
-
-## Exposed Metrics
-
-| Metric                                     | Type  | Description                                    |
-|--------------------------------------------|-------|------------------------------------------------|
-| `wireguard_interface_received_bytes_total` | gauge | Bytes received through the interface.          |
-| `wireguard_interface_sent_bytes_total`     | gauge | Bytes sent through the interface.              |
-| `wireguard_peer_last_handshake_seconds`    | gauge | Seconds from the last handshake with the peer. |
-| `wireguard_peer_received_bytes_total`      | gauge | Bytes received from the peer.                  |
-| `wireguard_peer_sent_bytes_total`          | gauge | Bytes sent to the peer.                        |
-| `wireguard_peer_up`                        | gauge | Peer connection state (boolean: 1/0).          |
-
-## Prometheus Config
-
-Add following scrape job to your Prometheus config file:
-
-```yaml
-# prometheus.yaml
-scrape_configs:
-  - job_name: wg-portal
-    scrape_interval: 60s
-    static_configs:
-      - targets:
-          - localhost:8787 # Change localhost to IP Address or hostname with WG-Portal
-```
-
-# Grafana Dashboard
-
-You may import [`dashboard.json`](https://github.com/h44z/wg-portal/blob/master/deploy/helm/files/dashboard.json) into your Grafana instance.
-
-![Dashboard](../../assets/images/dashboard.png)

docs/documentation/overview.md

@@ -1 +1,29 @@
---8<-- "README.md:20:47"
+**WireGuard Portal** is a simple, web based configuration portal for [WireGuard](https://wireguard.com).
+The portal uses the WireGuard [wgctrl](https://github.com/WireGuard/wgctrl-go) library to manage existing VPN
+interfaces. This allows for seamless activation or deactivation of new users, without disturbing existing VPN
+connections.
+
+The configuration portal supports using a database (SQLite, MySQL, MsSQL or Postgres), OAuth or LDAP 
+(Active Directory or OpenLDAP) as a user source for authentication and profile data.
+
+## Features
+* Self-hosted - the whole application is a single binary
+* Responsive web UI written in Vue.JS
+* Automatically select IP from the network pool assigned to client
+* QR-Code for convenient mobile client configuration
+* Sent email to client with QR-code and client config
+* Enable / Disable clients seamlessly
+* Generation of wg-quick configuration file (`wgX.conf`) if required
+* User authentication (database, OAuth or LDAP)
+* IPv6 ready
+* Docker ready
+* Can be used with existing WireGuard setups
+* Support for multiple WireGuard interfaces
+* Peer Expiry Feature
+* Handle route and DNS settings like wg-quick does
+* ~~REST API for management and client deployment~~ (coming soon)
+
+## Quick-Start
+
+The easiest way to get started is to use the provided [Docker image](./getting-started/docker.md).
+

docs/documentation/rest-api/api-doc.md

@@ -1 +0,0 @@
-<swagger-ui src="./swagger.yaml"/>

docs/theme-overrides/layouts/home.html

@@ -327,7 +327,7 @@
   <div class="md-container">
     <div class="tx-hero__image">
       <img
-        src="{{config.site_url}}/assets/images/screenshot.png"
+        src="{{config.site_url}}assets/images/screenshot.png"
         alt=""
         draggable="false"
       >
@@ -356,7 +356,7 @@
           <div class="second-column">
             <div class="image-wrapper">
               <img
-                src="{{config.site_url}}/assets/images/wg-tool.png"
+                src="{{config.site_url}}assets/images/wg-tool.png"
                 alt=""
                 draggable="false"
               >

frontend/package.json

@@ -8,27 +8,24 @@
     "preview": "vite preview --port 5050"
   },
   "dependencies": {
-    "@fontsource/nunito-sans": "^5.1.1",
+    "@fortawesome/fontawesome-free": "^6.5.1",
-    "@fortawesome/fontawesome-free": "^6.7.2",
+    "@kyvg/vue3-notification": "^3.1.3",
-    "@kyvg/vue3-notification": "^3.4.1",
     "@popperjs/core": "^2.11.8",
-    "bootstrap": "^5.3.3",
+    "bootstrap": "^5.3.2",
-    "bootswatch": "^5.3.3",
+    "bootswatch": "^5.3.2",
-    "flag-icons": "^7.3.2",
+    "flag-icons": "^7.1.0",
-    "ip-address": "^10.0.1",
+    "is-cidr": "^5.0.3",
-    "is-cidr": "^5.1.0",
     "is-ip": "^5.0.1",
-    "pinia": "^2.3.1",
+    "pinia": "^2.1.7",
     "prismjs": "^1.29.0",
-    "vue": "^3.5.13",
+    "vue": "^3.3.13",
-    "vue-i18n": "^11.0.1",
+    "vue-i18n": "^9.8.0",
     "vue-prism-component": "github:h44z/vue-prism-component",
-    "vue-router": "^4.5.0",
+    "vue-router": "^4.2.5",
     "vue3-tags-input": "^1.0.12"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^5.2.1",
+    "@vitejs/plugin-vue": "^4.5.2",
-    "sass-embedded": "^1.83.4",
+    "vite": "^5.0.10"
-    "vite": "^5.4.12"
   }
 }

frontend/src/App.vue

@@ -1,9 +1,9 @@
 <script setup>
 import { RouterLink, RouterView } from 'vue-router';
-import { computed, getCurrentInstance, onMounted, ref } from "vue";
+import {computed, getCurrentInstance, onMounted, ref} from "vue";
-import { authStore } from "./stores/auth";
+import {authStore} from "./stores/auth";
-import { securityStore } from "./stores/security";
+import {securityStore} from "./stores/security";
-import { settingsStore } from "@/stores/settings";
+import {settingsStore} from "@/stores/settings";
 
 const appGlobal = getCurrentInstance().appContext.config.globalProperties
 const auth = authStore()
@@ -42,15 +42,9 @@ const switchLanguage = function (lang) {
 const languageFlag = computed(() => {
   // `this` points to the component instance
   let lang = appGlobal.$i18n.locale.toLowerCase();
-  if (!appGlobal.$i18n.availableLocales.includes(lang)) {
-    lang = appGlobal.$i18n.fallbackLocale;
-  }
   if (lang === "en") {
     lang = "us";
   }
-  if (lang === "zh") {
-    lang = "cn";
-  }
   return "fi-" + lang;
 })
 
@@ -65,7 +59,7 @@ const currentYear = ref(new Date().getFullYear())
 
   <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
     <div class="container-fluid">
-      <a class="navbar-brand" href="/"><img :alt="companyName" src="/img/header-logo.png" /></a>
+      <a class="navbar-brand" href="/"><img alt="WireGuard Portal" src="/img/header-logo.png" /></a>
       <button aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation" class="navbar-toggler"
         data-bs-target="#navbarTop" data-bs-toggle="collapse" type="button">
         <span class="navbar-toggler-icon"></span>
@@ -86,17 +80,20 @@ const currentYear = ref(new Date().getFullYear())
 
         <div class="navbar-nav d-flex justify-content-end">
           <div v-if="auth.IsAuthenticated" class="nav-item dropdown">
-            <a aria-expanded="false" aria-haspopup="true" class="nav-link dropdown-toggle" data-bs-toggle="dropdown"
+            <a aria-expanded="false" aria-haspopup="true" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"
-              href="#" role="button">{{ auth.User.Firstname }} {{ auth.User.Lastname }}</a>
+              role="button">{{ auth.User.Firstname }} {{ auth.User.Lastname }}</a>
             <div class="dropdown-menu">
               <RouterLink :to="{ name: 'profile' }" class="dropdown-item"><i class="fas fa-user"></i> {{ $t('menu.profile') }}</RouterLink>
-              <RouterLink :to="{ name: 'settings' }" class="dropdown-item" v-if="auth.IsAdmin || !settings.Setting('ApiAdminOnly')"><i class="fas fa-gears"></i> {{ $t('menu.settings') }}</RouterLink>
               <div class="dropdown-divider"></div>
-              <a class="dropdown-item" href="#" @click.prevent="auth.Logout"><i class="fas fa-sign-out-alt"></i> {{ $t('menu.logout') }}</a>
+              <a class="dropdown-item" href="#" @click.prevent="auth.Logout">
+                <i class="fas fa-sign-out-alt"></i> {{ $t('menu.logout') }}
+              </a>
             </div>
           </div>
           <div v-if="!auth.IsAuthenticated" class="nav-item">
-            <RouterLink :to="{ name: 'login' }" class="nav-link"><i class="fas fa-sign-in-alt fa-sm fa-fw me-2"></i>{{ $t('menu.login') }}</RouterLink>
+            <RouterLink :to="{ name: 'login' }" class="nav-link">
+              <i class="fas fa-sign-in-alt fa-sm fa-fw me-2"></i>{{ $t('menu.login') }}
+            </RouterLink>
           </div>
         </div>
       </div>
@@ -114,20 +111,18 @@ const currentYear = ref(new Date().getFullYear())
         <div class="col-6 text-end">
           <div :aria-label="$t('menu.lang')" class="btn-group" role="group">
             <div class="btn-group" role="group">
-              <button aria-expanded="false" aria-haspopup="true" class="btn btn btn-secondary pe-0"
+              <button aria-expanded="false" aria-haspopup="true" class="btn btn btn-secondary pe-0" data-bs-toggle="dropdown" type="button"><span :class="languageFlag" class="fi"></span></button>
-                data-bs-toggle="dropdown" type="button"><span :class="languageFlag" class="fi"></span></button>
               <div aria-labelledby="btnGroupDrop3" class="dropdown-menu" style="">
                 <a class="dropdown-item" href="#" @click.prevent="switchLanguage('en')"><span class="fi fi-us"></span> English</a>
                 <a class="dropdown-item" href="#" @click.prevent="switchLanguage('de')"><span class="fi fi-de"></span> Deutsch</a>
-                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('ru')"><span class="fi fi-ru"></span> Русский</a>
-                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('vi')"><span class="fi fi-vi"></span> Tiếng Việt</a>
-                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('zh')"><span class="fi fi-cn"></span> 中文</a>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-  </footer></template>
+  </footer>
+</template>
 
-<style></style>
+<style>
+</style>

frontend/src/assets/base.css

@@ -1,17 +1,5 @@
 a.disabled {
-  pointer-events: none;
+    pointer-events: none;
-  cursor: default;
+    cursor: default;
-  color: #888888;
+    color: #888888;
-}
+}
-
-.text-wrap {
-  overflow-break: anywhere;
-}
-
-.asc::after {
-  content: " ↑";
-}
-
-.desc::after {
-  content: " ↓";
-}

frontend/src/assets/custom.scss

@@ -1,16 +0,0 @@
-// disable external web fonts
-$web-font-path: false;
-
-@import "bootswatch/dist/lux/variables";
-@import "bootstrap/scss/bootstrap";
-@import "bootswatch/dist/lux/bootswatch";
-
-
-// for future use, once bootswatch supports @use
-/*
-@use "bootswatch/dist/lux/_variables.scss" as lux-vars with (
-  $web-font-path: false
-);
-@use "bootstrap/scss/bootstrap" as bs;
-@use "bootswatch/dist/lux/_bootswatch.scss" as lux-theme;
-*/

frontend/src/components/PeerEditModal.vue

@@ -1,22 +1,20 @@
 <script setup>
 import Modal from "./Modal.vue";
-import { peerStore } from "@/stores/peers";
+import {peerStore} from "@/stores/peers";
-import { interfaceStore } from "@/stores/interfaces";
+import {interfaceStore} from "@/stores/interfaces";
-import { computed, ref, watch } from "vue";
+import {computed, ref, watch} from "vue";
 import { useI18n } from 'vue-i18n';
 import { notify } from "@kyvg/vue3-notification";
 import Vue3TagsInput from "vue3-tags-input";
 import { validateCIDR, validateIP, validateDomain } from '@/helpers/validators';
 import isCidr from "is-cidr";
-import { isIP } from 'is-ip';
+import {isIP} from 'is-ip';
 import { freshPeer, freshInterface } from '@/helpers/models';
-import { profileStore } from "@/stores/profile";
 
 const { t } = useI18n()
 
 const peers = peerStore()
 const interfaces = interfaceStore()
-const profile = profileStore()
 
 const props = defineProps({
   peerId: String,
@@ -26,16 +24,7 @@ const props = defineProps({
 const emit = defineEmits(['close'])
 
 const selectedPeer = computed(() => {
-  let p = peers.Find(props.peerId)
+  return peers.Find(props.peerId)
-
-  if (!p) {
-    if (!!props.peerId || props.peerId.length) {
-      p = profile.peers.find((p) => p.Identifier === props.peerId)
-    } else {
-      p = freshPeer() // dummy peer to avoid 'undefined' exceptions
-    }
-  }
-  return p
 })
 
 const selectedInterface = computed(() => {
@@ -70,119 +59,121 @@ const formData = ref(freshPeer())
 // functions
 
 watch(() => props.visible, async (newValue, oldValue) => {
-  if (oldValue === false && newValue === true) { // if modal is shown
+      if (oldValue === false && newValue === true) { // if modal is shown
-    if (!selectedPeer.value) {
+        console.log(selectedInterface.value)
-      await peers.PreparePeer(selectedInterface.value.Identifier)
+        console.log(selectedPeer.value)
+        if (!selectedPeer.value) {
+          await peers.PreparePeer(selectedInterface.value.Identifier)
 
-      formData.value.Identifier = peers.Prepared.Identifier
+          formData.value.Identifier = peers.Prepared.Identifier
-      formData.value.DisplayName = peers.Prepared.DisplayName
+          formData.value.DisplayName = peers.Prepared.DisplayName
-      formData.value.UserIdentifier = peers.Prepared.UserIdentifier
+          formData.value.UserIdentifier = peers.Prepared.UserIdentifier
-      formData.value.InterfaceIdentifier = peers.Prepared.InterfaceIdentifier
+          formData.value.InterfaceIdentifier = peers.Prepared.InterfaceIdentifier
-      formData.value.Disabled = peers.Prepared.Disabled
+          formData.value.Disabled = peers.Prepared.Disabled
-      formData.value.ExpiresAt = peers.Prepared.ExpiresAt
+          formData.value.ExpiresAt = peers.Prepared.ExpiresAt
-      formData.value.Notes = peers.Prepared.Notes
+          formData.value.Notes = peers.Prepared.Notes
 
-      formData.value.Endpoint = peers.Prepared.Endpoint
+          formData.value.Endpoint = peers.Prepared.Endpoint
-      formData.value.EndpointPublicKey = peers.Prepared.EndpointPublicKey
+          formData.value.EndpointPublicKey = peers.Prepared.EndpointPublicKey
-      formData.value.AllowedIPs = peers.Prepared.AllowedIPs
+          formData.value.AllowedIPs = peers.Prepared.AllowedIPs
-      formData.value.ExtraAllowedIPs = peers.Prepared.ExtraAllowedIPs
+          formData.value.ExtraAllowedIPs = peers.Prepared.ExtraAllowedIPs
-      formData.value.PresharedKey = peers.Prepared.PresharedKey
+          formData.value.PresharedKey = peers.Prepared.PresharedKey
-      formData.value.PersistentKeepalive = peers.Prepared.PersistentKeepalive
+          formData.value.PersistentKeepalive = peers.Prepared.PersistentKeepalive
 
-      formData.value.PrivateKey = peers.Prepared.PrivateKey
+          formData.value.PrivateKey = peers.Prepared.PrivateKey
-      formData.value.PublicKey = peers.Prepared.PublicKey
+          formData.value.PublicKey = peers.Prepared.PublicKey
 
-      formData.value.Mode = peers.Prepared.Mode
+          formData.value.Mode = peers.Prepared.Mode
 
-      formData.value.Addresses = peers.Prepared.Addresses
+          formData.value.Addresses = peers.Prepared.Addresses
-      formData.value.CheckAliveAddress = peers.Prepared.CheckAliveAddress
+          formData.value.CheckAliveAddress = peers.Prepared.CheckAliveAddress
-      formData.value.Dns = peers.Prepared.Dns
+          formData.value.Dns = peers.Prepared.Dns
-      formData.value.DnsSearch = peers.Prepared.DnsSearch
+          formData.value.DnsSearch = peers.Prepared.DnsSearch
-      formData.value.Mtu = peers.Prepared.Mtu
+          formData.value.Mtu = peers.Prepared.Mtu
-      formData.value.FirewallMark = peers.Prepared.FirewallMark
+          formData.value.FirewallMark = peers.Prepared.FirewallMark
-      formData.value.RoutingTable = peers.Prepared.RoutingTable
+          formData.value.RoutingTable = peers.Prepared.RoutingTable
 
-      formData.value.PreUp = peers.Prepared.PreUp
+          formData.value.PreUp = peers.Prepared.PreUp
-      formData.value.PostUp = peers.Prepared.PostUp
+          formData.value.PostUp = peers.Prepared.PostUp
-      formData.value.PreDown = peers.Prepared.PreDown
+          formData.value.PreDown = peers.Prepared.PreDown
-      formData.value.PostDown = peers.Prepared.PostDown
+          formData.value.PostDown = peers.Prepared.PostDown
 
-    } else { // fill existing data
+        } else { // fill existing data
-      formData.value.Identifier = selectedPeer.value.Identifier
+          formData.value.Identifier = selectedPeer.value.Identifier
-      formData.value.DisplayName = selectedPeer.value.DisplayName
+          formData.value.DisplayName = selectedPeer.value.DisplayName
-      formData.value.UserIdentifier = selectedPeer.value.UserIdentifier
+          formData.value.UserIdentifier = selectedPeer.value.UserIdentifier
-      formData.value.InterfaceIdentifier = selectedPeer.value.InterfaceIdentifier
+          formData.value.InterfaceIdentifier = selectedPeer.value.InterfaceIdentifier
-      formData.value.Disabled = selectedPeer.value.Disabled
+          formData.value.Disabled = selectedPeer.value.Disabled
-      formData.value.ExpiresAt = selectedPeer.value.ExpiresAt
+          formData.value.ExpiresAt = selectedPeer.value.ExpiresAt
-      formData.value.Notes = selectedPeer.value.Notes
+          formData.value.Notes = selectedPeer.value.Notes
 
-      formData.value.Endpoint = selectedPeer.value.Endpoint
+          formData.value.Endpoint = selectedPeer.value.Endpoint
-      formData.value.EndpointPublicKey = selectedPeer.value.EndpointPublicKey
+          formData.value.EndpointPublicKey = selectedPeer.value.EndpointPublicKey
-      formData.value.AllowedIPs = selectedPeer.value.AllowedIPs
+          formData.value.AllowedIPs = selectedPeer.value.AllowedIPs
-      formData.value.ExtraAllowedIPs = selectedPeer.value.ExtraAllowedIPs
+          formData.value.ExtraAllowedIPs = selectedPeer.value.ExtraAllowedIPs
-      formData.value.PresharedKey = selectedPeer.value.PresharedKey
+          formData.value.PresharedKey = selectedPeer.value.PresharedKey
-      formData.value.PersistentKeepalive = selectedPeer.value.PersistentKeepalive
+          formData.value.PersistentKeepalive = selectedPeer.value.PersistentKeepalive
 
-      formData.value.PrivateKey = selectedPeer.value.PrivateKey
+          formData.value.PrivateKey = selectedPeer.value.PrivateKey
-      formData.value.PublicKey = selectedPeer.value.PublicKey
+          formData.value.PublicKey = selectedPeer.value.PublicKey
 
-      formData.value.Mode = selectedPeer.value.Mode
+          formData.value.Mode = selectedPeer.value.Mode
 
-      formData.value.Addresses = selectedPeer.value.Addresses
+          formData.value.Addresses = selectedPeer.value.Addresses
-      formData.value.CheckAliveAddress = selectedPeer.value.CheckAliveAddress
+          formData.value.CheckAliveAddress = selectedPeer.value.CheckAliveAddress
-      formData.value.Dns = selectedPeer.value.Dns
+          formData.value.Dns = selectedPeer.value.Dns
-      formData.value.DnsSearch = selectedPeer.value.DnsSearch
+          formData.value.DnsSearch = selectedPeer.value.DnsSearch
-      formData.value.Mtu = selectedPeer.value.Mtu
+          formData.value.Mtu = selectedPeer.value.Mtu
-      formData.value.FirewallMark = selectedPeer.value.FirewallMark
+          formData.value.FirewallMark = selectedPeer.value.FirewallMark
-      formData.value.RoutingTable = selectedPeer.value.RoutingTable
+          formData.value.RoutingTable = selectedPeer.value.RoutingTable
 
-      formData.value.PreUp = selectedPeer.value.PreUp
+          formData.value.PreUp = selectedPeer.value.PreUp
-      formData.value.PostUp = selectedPeer.value.PostUp
+          formData.value.PostUp = selectedPeer.value.PostUp
-      formData.value.PreDown = selectedPeer.value.PreDown
+          formData.value.PreDown = selectedPeer.value.PreDown
-      formData.value.PostDown = selectedPeer.value.PostDown
+          formData.value.PostDown = selectedPeer.value.PostDown
 
-      if (!formData.value.Endpoint.Overridable ||
+          if (!formData.value.Endpoint.Overridable ||
-        !formData.value.EndpointPublicKey.Overridable ||
+              !formData.value.EndpointPublicKey.Overridable ||
-        !formData.value.AllowedIPs.Overridable ||
+              !formData.value.AllowedIPs.Overridable ||
-        !formData.value.PersistentKeepalive.Overridable ||
+              !formData.value.PersistentKeepalive.Overridable ||
-        !formData.value.Dns.Overridable ||
+              !formData.value.Dns.Overridable ||
-        !formData.value.DnsSearch.Overridable ||
+              !formData.value.DnsSearch.Overridable ||
-        !formData.value.Mtu.Overridable ||
+              !formData.value.Mtu.Overridable ||
-        !formData.value.FirewallMark.Overridable ||
+              !formData.value.FirewallMark.Overridable ||
-        !formData.value.RoutingTable.Overridable ||
+              !formData.value.RoutingTable.Overridable ||
-        !formData.value.PreUp.Overridable ||
+              !formData.value.PreUp.Overridable ||
-        !formData.value.PostUp.Overridable ||
+              !formData.value.PostUp.Overridable ||
-        !formData.value.PreDown.Overridable ||
+              !formData.value.PreDown.Overridable ||
-        !formData.value.PostDown.Overridable) {
+              !formData.value.PostDown.Overridable) {
-        formData.value.IgnoreGlobalSettings = true
+            formData.value.IgnoreGlobalSettings = true
+          }
+        }
       }
     }
-  }
-}
 )
 
 watch(() => formData.value.IgnoreGlobalSettings, async (newValue, oldValue) => {
-  formData.value.Endpoint.Overridable = !newValue
+      formData.value.Endpoint.Overridable = !newValue
-  formData.value.EndpointPublicKey.Overridable = !newValue
+      formData.value.EndpointPublicKey.Overridable = !newValue
-  formData.value.AllowedIPs.Overridable = !newValue
+      formData.value.AllowedIPs.Overridable = !newValue
-  formData.value.PersistentKeepalive.Overridable = !newValue
+      formData.value.PersistentKeepalive.Overridable = !newValue
-  formData.value.Dns.Overridable = !newValue
+      formData.value.Dns.Overridable = !newValue
-  formData.value.DnsSearch.Overridable = !newValue
+      formData.value.DnsSearch.Overridable = !newValue
-  formData.value.Mtu.Overridable = !newValue
+      formData.value.Mtu.Overridable = !newValue
-  formData.value.FirewallMark.Overridable = !newValue
+      formData.value.FirewallMark.Overridable = !newValue
-  formData.value.RoutingTable.Overridable = !newValue
+      formData.value.RoutingTable.Overridable = !newValue
-  formData.value.PreUp.Overridable = !newValue
+      formData.value.PreUp.Overridable = !newValue
-  formData.value.PostUp.Overridable = !newValue
+      formData.value.PostUp.Overridable = !newValue
-  formData.value.PreDown.Overridable = !newValue
+      formData.value.PreDown.Overridable = !newValue
-  formData.value.PostDown.Overridable = !newValue
+      formData.value.PostDown.Overridable = !newValue
-}
+    }
 )
 
 watch(() => formData.value.Disabled, async (newValue, oldValue) => {
-  if (oldValue && !newValue && formData.value.ExpiresAt) {
+      if (oldValue && !newValue && formData.value.ExpiresAt) {
-    formData.value.ExpiresAt = "" // reset expiry date
+        formData.value.ExpiresAt = "" // reset expiry date
-  }
+      }
-}
+    }
 )
 
 function close() {
@@ -193,7 +184,7 @@ function close() {
 function handleChangeAddresses(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if (isCidr(tag) === 0) {
+    if(isCidr(tag) === 0) {
       validInput = false
       notify({
         title: "Invalid CIDR",
@@ -202,7 +193,7 @@ function handleChangeAddresses(tags) {
       })
     }
   })
-  if (validInput) {
+  if(validInput) {
     formData.value.Addresses = tags
   }
 }
@@ -210,7 +201,7 @@ function handleChangeAddresses(tags) {
 function handleChangeAllowedIPs(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if (isCidr(tag) === 0) {
+    if(isCidr(tag) === 0) {
       validInput = false
       notify({
         title: "Invalid CIDR",
@@ -219,7 +210,7 @@ function handleChangeAllowedIPs(tags) {
       })
     }
   })
-  if (validInput) {
+  if(validInput) {
     formData.value.AllowedIPs.Value = tags
   }
 }
@@ -227,7 +218,7 @@ function handleChangeAllowedIPs(tags) {
 function handleChangeExtraAllowedIPs(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if (isCidr(tag) === 0) {
+    if(isCidr(tag) === 0) {
       validInput = false
       notify({
         title: "Invalid CIDR",
@@ -236,7 +227,7 @@ function handleChangeExtraAllowedIPs(tags) {
       })
     }
   })
-  if (validInput) {
+  if(validInput) {
     formData.value.ExtraAllowedIPs = tags
   }
 }
@@ -244,7 +235,7 @@ function handleChangeExtraAllowedIPs(tags) {
 function handleChangeDns(tags) {
   let validInput = true
   tags.forEach(tag => {
-    if (!isIP(tag)) {
+    if(!isIP(tag)) {
       validInput = false
       notify({
         title: "Invalid IP",
@@ -253,7 +244,7 @@ function handleChangeDns(tags) {
       })
     }
   })
-  if (validInput) {
+  if(validInput) {
     formData.value.Dns.Value = tags
   }
 }
@@ -264,14 +255,14 @@ function handleChangeDnsSearch(tags) {
 
 async function save() {
   try {
-    if (props.peerId !== '#NEW#') {
+    if (props.peerId!=='#NEW#') {
       await peers.UpdatePeer(selectedPeer.value.Identifier, formData.value)
     } else {
       await peers.CreatePeer(selectedInterface.value.Identifier, formData.value)
     }
     close()
   } catch (e) {
-    // console.log(e)
+    console.log(e)
     notify({
       title: "Failed to save peer!",
       text: e.toString(),
@@ -285,7 +276,7 @@ async function del() {
     await peers.DeletePeer(selectedPeer.value.Identifier)
     close()
   } catch (e) {
-    // console.log(e)
+    console.log(e)
     notify({
       title: "Failed to delete peer!",
       text: e.toString(),
@@ -303,86 +294,87 @@ async function del() {
         <legend class="mt-4">{{ $t('modals.peer-edit.header-general') }}</legend>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.display-name.label') }}</label>
-          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.display-name.placeholder')"
+          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.display-name.placeholder')" v-model="formData.DisplayName">
-            v-model="formData.DisplayName">
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.linked-user.label') }}</label>
-          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.linked-user.placeholder')"
+          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.linked-user.placeholder')" v-model="formData.UserIdentifier">
-            v-model="formData.UserIdentifier">
         </div>
       </fieldset>
       <fieldset>
         <legend class="mt-4">{{ $t('modals.peer-edit.header-crypto') }}</legend>
-        <div class="form-group" v-if="selectedInterface.Mode === 'server'">
+        <div class="form-group" v-if="selectedInterface.Mode==='server'">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.private-key.label') }}</label>
-          <input type="email" class="form-control" :placeholder="$t('modals.peer-edit.private-key.placeholder')" required
+          <input type="email" class="form-control" :placeholder="$t('modals.peer-edit.private-key.placeholder')" required v-model="formData.PrivateKey">
-            v-model="formData.PrivateKey">
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.public-key.label') }}</label>
-          <input type="email" class="form-control" :placeholder="$t('modals.peer-edit.public-key.placeholder')" required
+          <input type="email" class="form-control" :placeholder="$t('modals.peer-edit.public-key.placeholder')" required v-model="formData.PublicKey">
-            v-model="formData.PublicKey">
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.preshared-key.label') }}</label>
-          <input type="email" class="form-control" :placeholder="$t('modals.peer-edit.preshared-key.placeholder')"
+          <input type="email" class="form-control" :placeholder="$t('modals.peer-edit.preshared-key.placeholder')" v-model="formData.PresharedKey">
-            v-model="formData.PresharedKey">
         </div>
-        <div class="form-group" v-if="formData.Mode === 'client'">
+        <div class="form-group" v-if="formData.Mode==='client'">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.endpoint-public-key.label') }}</label>
-          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.endpoint-public-key.placeholder')"
+          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.endpoint-public-key.placeholder')" v-model="formData.EndpointPublicKey.Value">
-            v-model="formData.EndpointPublicKey.Value">
         </div>
       </fieldset>
       <fieldset>
         <legend class="mt-4">{{ $t('modals.peer-edit.header-network') }}</legend>
-        <div class="form-group" v-if="selectedInterface.Mode === 'client'">
+        <div class="form-group" v-if="selectedInterface.Mode==='client'">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.endpoint.label') }}</label>
-          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.endpoint.placeholder')"
+          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.endpoint.placeholder')" v-model="formData.Endpoint.Value">
-            v-model="formData.Endpoint.Value">
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.ip.label') }}</label>
           <vue3-tags-input class="form-control" :tags="formData.Addresses"
-            :placeholder="$t('modals.peer-edit.ip.placeholder')" :add-tag-on-keys="[13, 188, 32, 9]"
+                           :placeholder="$t('modals.peer-edit.ip.placeholder')"
-            :validate="validateCIDR" @on-tags-changed="handleChangeAddresses" />
+                           :add-tag-on-keys="[13, 188, 32, 9]"
+                           :validate="validateCIDR"
+                           @on-tags-changed="handleChangeAddresses"/>
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.allowed-ip.label') }}</label>
           <vue3-tags-input class="form-control" :tags="formData.AllowedIPs.Value"
-            :placeholder="$t('modals.peer-edit.allowed-ip.placeholder')" :add-tag-on-keys="[13, 188, 32, 9]"
+                           :placeholder="$t('modals.peer-edit.allowed-ip.placeholder')"
-            :validate="validateCIDR" @on-tags-changed="handleChangeAllowedIPs" />
+                           :add-tag-on-keys="[13, 188, 32, 9]"
+                           :validate="validateCIDR"
+                           @on-tags-changed="handleChangeAllowedIPs"/>
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.extra-allowed-ip.label') }}</label>
           <vue3-tags-input class="form-control" :tags="formData.ExtraAllowedIPs"
-            :placeholder="$t('modals.peer-edit.extra-allowed-ip.placeholder')" :add-tag-on-keys="[13, 188, 32, 9]"
+                           :placeholder="$t('modals.peer-edit.extra-allowed-ip.placeholder')"
-            :validate="validateCIDR" @on-tags-changed="handleChangeExtraAllowedIPs" />
+                           :add-tag-on-keys="[13, 188, 32, 9]"
+                           :validate="validateCIDR"
+                           @on-tags-changed="handleChangeExtraAllowedIPs"/>
           <small class="form-text text-muted">{{ $t('modals.peer-edit.extra-allowed-ip.description') }}</small>
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.dns.label') }}</label>
           <vue3-tags-input class="form-control" :tags="formData.Dns.Value"
-            :placeholder="$t('modals.peer-edit.dns.placeholder')" :add-tag-on-keys="[13, 188, 32, 9]"
+                           :placeholder="$t('modals.peer-edit.dns.placeholder')"
-            :validate="validateIP" @on-tags-changed="handleChangeDns" />
+                           :add-tag-on-keys="[13, 188, 32, 9]"
+                           :validate="validateIP"
+                           @on-tags-changed="handleChangeDns"/>
         </div>
-        <div hidden class="form-group">
+        <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.dns-search.label') }}</label>
           <vue3-tags-input class="form-control" :tags="formData.DnsSearch.Value"
-            :placeholder="$t('modals.peer-edit.dns-search.label')" :add-tag-on-keys="[13, 188, 32, 9]"
+                           :placeholder="$t('modals.peer-edit.dns-search.label')"
-            :validate="validateDomain" @on-tags-changed="handleChangeDnsSearch" />
+                           :add-tag-on-keys="[13, 188, 32, 9]"
+                           :validate="validateDomain"
+                           @on-tags-changed="handleChangeDnsSearch"/>
         </div>
         <div class="row">
           <div class="form-group col-md-6">
             <label class="form-label mt-4">{{ $t('modals.peer-edit.keep-alive.label') }}</label>
-            <input type="number" class="form-control" :placeholder="$t('modals.peer-edit.keep-alive.label')"
+            <input type="number" class="form-control" :placeholder="$t('modals.peer-edit.keep-alive.label')" v-model="formData.PersistentKeepalive.Value">
-              v-model="formData.PersistentKeepalive.Value">
           </div>
           <div class="form-group col-md-6">
             <label class="form-label mt-4">{{ $t('modals.peer-edit.mtu.label') }}</label>
-            <input type="number" class="form-control" :placeholder="$t('modals.peer-edit.mtu.label')"
+            <input type="number" class="form-control" :placeholder="$t('modals.peer-edit.mtu.label')" v-model="formData.Mtu.Value">
-              v-model="formData.Mtu.Value">
           </div>
         </div>
       </fieldset>
@@ -390,23 +382,19 @@ async function del() {
         <legend class="mt-4">{{ $t('modals.peer-edit.header-hooks') }}</legend>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.pre-up.label') }}</label>
-          <textarea v-model="formData.PreUp.Value" class="form-control" rows="2"
+          <textarea v-model="formData.PreUp.Value" class="form-control" rows="2" :placeholder="$t('modals.peer-edit.pre-up.placeholder')"></textarea>
-            :placeholder="$t('modals.peer-edit.pre-up.placeholder')"></textarea>
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.post-up.label') }}</label>
-          <textarea v-model="formData.PostUp.Value" class="form-control" rows="2"
+          <textarea v-model="formData.PostUp.Value" class="form-control" rows="2" :placeholder="$t('modals.peer-edit.post-up.placeholder')"></textarea>
-            :placeholder="$t('modals.peer-edit.post-up.placeholder')"></textarea>
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.pre-down.label') }}</label>
-          <textarea v-model="formData.PreDown.Value" class="form-control" rows="2"
+          <textarea v-model="formData.PreDown.Value" class="form-control" rows="2" :placeholder="$t('modals.peer-edit.pre-down.placeholder')"></textarea>
-            :placeholder="$t('modals.peer-edit.pre-down.placeholder')"></textarea>
         </div>
         <div class="form-group">
           <label class="form-label mt-4">{{ $t('modals.peer-edit.post-down.label') }}</label>
-          <textarea v-model="formData.PostDown.Value" class="form-control" rows="2"
+          <textarea v-model="formData.PostDown.Value" class="form-control" rows="2" :placeholder="$t('modals.peer-edit.post-down.placeholder')"></textarea>
-            :placeholder="$t('modals.peer-edit.post-down.placeholder')"></textarea>
         </div>
       </fieldset>
       <fieldset>
@@ -415,7 +403,7 @@ async function del() {
           <div class="form-group col-md-6">
             <div class="form-check form-switch">
               <input class="form-check-input" type="checkbox" v-model="formData.Disabled">
-              <label class="form-check-label">{{ $t('modals.peer-edit.disabled.label') }}</label>
+              <label class="form-check-label" >{{ $t('modals.peer-edit.disabled.label') }}</label>
             </div>
             <div class="form-check form-switch">
               <input class="form-check-input" type="checkbox" v-model="formData.IgnoreGlobalSettings">
@@ -424,16 +412,14 @@ async function del() {
           </div>
           <div class="form-group col-md-6">
             <label class="form-label">{{ $t('modals.peer-edit.expires-at.label') }}</label>
-            <input type="date" pattern="\d{4}-\d{2}-\d{2}" class="form-control" min="2023-01-01"
+            <input type="date" pattern="\d{4}-\d{2}-\d{2}" class="form-control" min="2023-01-01" v-model="formData.ExpiresAt">
-              v-model="formData.ExpiresAt">
           </div>
         </div>
       </fieldset>
     </template>
     <template #footer>
       <div class="flex-fill text-start">
-        <button v-if="props.peerId !== '#NEW#'" class="btn btn-danger me-1" type="button" @click.prevent="del">{{
+        <button v-if="props.peerId!=='#NEW#'" class="btn btn-danger me-1" type="button" @click.prevent="del">{{ $t('general.delete') }}</button>
-          $t('general.delete') }}</button>
       </div>
       <button class="btn btn-primary me-1" type="button" @click.prevent="save">{{ $t('general.save') }}</button>
       <button class="btn btn-secondary" type="button" @click.prevent="close">{{ $t('general.close') }}</button>
@@ -441,4 +427,5 @@ async function del() {
   </Modal>
 </template>
 
-<style></style>
+<style>
+</style>

frontend/src/components/PeerViewModal.vue

@@ -1,23 +1,19 @@
 <script setup>
 import Modal from "./Modal.vue";
-import { peerStore } from "@/stores/peers";
+import {peerStore} from "@/stores/peers";
-import { interfaceStore } from "@/stores/interfaces";
+import {interfaceStore} from "@/stores/interfaces";
-import { computed, ref, watch } from "vue";
+import {computed, ref, watch} from "vue";
-import { useI18n } from "vue-i18n";
+import {useI18n} from "vue-i18n";
-import { freshInterface, freshPeer, freshStats } from '@/helpers/models';
+import {freshInterface, freshPeer, freshStats} from '@/helpers/models';
 import Prism from "vue-prism-component";
-import { notify } from "@kyvg/vue3-notification";
+import {notify} from "@kyvg/vue3-notification";
-import { settingsStore } from "@/stores/settings";
+import {settingsStore} from "@/stores/settings";
-import { profileStore } from "@/stores/profile";
-import { base64_url_encode } from '@/helpers/encoding';
-import { apiWrapper } from "@/helpers/fetch-wrapper";
 
 const { t } = useI18n()
 
 const settings = settingsStore()
 const peers = peerStore()
 const interfaces = interfaceStore()
-const profile = profileStore()
 
 const props = defineProps({
   peerId: String,
@@ -36,12 +32,9 @@ const selectedPeer = computed(() => {
   let p = peers.Find(props.peerId)
 
   if (!p) {
-    if (!!props.peerId || props.peerId.length) {
+    p = freshPeer() // dummy peer to avoid 'undefined' exceptions
-      p = profile.peers.find((p) => p.Identifier === props.peerId)
-    } else {
-      p = freshPeer() // dummy peer to avoid 'undefined' exceptions
-    }
   }
+
   return p
 })
 
@@ -49,13 +42,9 @@ const selectedStats = computed(() => {
   let s = peers.Statistics(props.peerId)
 
   if (!s) {
-    if (!!props.peerId || props.peerId.length) {
+    s = freshStats() // dummy peer to avoid 'undefined' exceptions
-      p = profile.Statistics(props.peerId)
-    } else {
-      s = freshStats() // dummy stats to avoid 'undefined' exceptions
-    }
-
   }
+
   return s
 })
 
@@ -65,6 +54,7 @@ const selectedInterface = computed(() => {
   if (!i) {
     i = freshInterface() // dummy interface to avoid 'undefined' exceptions
   }
+
   return i
 })
 
@@ -80,11 +70,11 @@ const title = computed(() => {
 })
 
 watch(() => props.visible, async (newValue, oldValue) => {
-  if (oldValue === false && newValue === true) { // if modal is shown
+      if (oldValue === false && newValue === true) { // if modal is shown
-    await peers.LoadPeerConfig(selectedPeer.value.Identifier)
+        await peers.LoadPeerConfig(selectedPeer.value.Identifier)
-    configString.value = peers.configuration
+        configString.value = peers.configuration
-  }
+      }
-}
+    }
 )
 
 function download() {
@@ -92,15 +82,15 @@ function download() {
   let filename = 'WireGuard-Tunnel.conf'
   if (selectedPeer.value.DisplayName) {
     filename = selectedPeer.value.DisplayName
-      .replace(/ /g, "_")
+        .replace(/ /g,"_")
-      .replace(/[^a-zA-Z0-9-_]/g, "")
+        .replace(/[^a-zA-Z0-9-_]/g,"")
-      .substring(0, 16)
+        .substring(0, 16)
-      + ".conf"
+        + ".conf"
   }
   let text = configString.value
 
   let element = document.createElement('a')
-  element.setAttribute('href', 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(text))
+  element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text))
   element.setAttribute('download', filename)
 
   element.style.display = 'none'
@@ -120,13 +110,6 @@ function email() {
   })
 }
 
-function ConfigQrUrl() {
-  if (props.peerId.length) {
-    return apiWrapper.url(`/peer/config-qr/${base64_url_encode(props.peerId)}`)
-  }
-  return ''
-}
-
 </script>
 
 <template>
@@ -135,30 +118,25 @@ function ConfigQrUrl() {
       <div class="accordion" id="peerInformation">
         <div class="accordion-item">
           <h2 class="accordion-header">
-            <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDetails"
+            <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseDetails" aria-expanded="true" aria-controls="collapseDetails">
-              aria-expanded="true" aria-controls="collapseDetails">
               {{ $t('modals.peer-view.section-info') }}
             </button>
           </h2>
-          <div id="collapseDetails" class="accordion-collapse collapse show" aria-labelledby="headingDetails"
+          <div id="collapseDetails" class="accordion-collapse collapse show" aria-labelledby="headingDetails" data-bs-parent="#peerInformation" style="">
-            data-bs-parent="#peerInformation" style="">
             <div class="accordion-body">
               <div class="row">
                 <div class="col-md-8">
                   <ul>
                     <li>{{ $t('modals.peer-view.identifier') }}: {{ selectedPeer.PublicKey }}</li>
-                    <li>{{ $t('modals.peer-view.ip') }}: <span v-for="ip in selectedPeer.Addresses" :key="ip"
+                    <li>{{ $t('modals.peer-view.ip') }}: <span v-for="ip in selectedPeer.Addresses" :key="ip" class="badge rounded-pill bg-light">{{ ip }}</span></li>
-                        class="badge rounded-pill bg-light">{{ ip }}</span></li>
                     <li>{{ $t('modals.peer-view.user') }}: {{ selectedPeer.UserIdentifier }}</li>
                     <li v-if="selectedPeer.Notes">{{ $t('modals.peer-view.notes') }}: {{ selectedPeer.Notes }}</li>
-                    <li v-if="selectedPeer.ExpiresAt">{{ $t('modals.peer-view.expiry-status') }}: {{
+                    <li v-if="selectedPeer.ExpiresAt">{{ $t('modals.peer-view.expiry-status') }}: {{ selectedPeer.ExpiresAt }}</li>
-                      selectedPeer.ExpiresAt }}</li>
+                    <li v-if="selectedPeer.Disabled">{{ $t('modals.peer-view.disabled-status') }}: {{ selectedPeer.DisabledReason }}</li>
-                    <li v-if="selectedPeer.Disabled">{{ $t('modals.peer-view.disabled-status') }}: {{
-                      selectedPeer.DisabledReason }}</li>
                   </ul>
                 </div>
                 <div class="col-md-4">
-                  <img class="config-qr-img" :src="ConfigQrUrl()" loading="lazy" alt="Configuration QR Code">
+                  <img class="config-qr-img" :src="peers.ConfigQrUrl(props.peerId)" loading="lazy" alt="Configuration QR Code">
                 </div>
               </div>
             </div>
@@ -166,20 +144,16 @@ function ConfigQrUrl() {
         </div>
         <div class="accordion-item">
           <h2 class="accordion-header" id="headingStatus">
-            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseStatus" aria-expanded="false" aria-controls="collapseStatus">
-              data-bs-target="#collapseStatus" aria-expanded="false" aria-controls="collapseStatus">
               {{ $t('modals.peer-view.section-status') }}
             </button>
           </h2>
-          <div id="collapseStatus" class="accordion-collapse collapse" aria-labelledby="headingStatus"
+          <div id="collapseStatus" class="accordion-collapse collapse" aria-labelledby="headingStatus" data-bs-parent="#peerInformation" style="">
-            data-bs-parent="#peerInformation" style="">
             <div class="accordion-body">
               <div class="row">
                 <div class="col-md-12">
                   <h4>{{ $t('modals.peer-view.traffic') }}</h4>
-                  <p><i class="fas fa-long-arrow-alt-down" :title="$t('modals.peer-view.download')"></i> {{
+                  <p><i class="fas fa-long-arrow-alt-down" :title="$t('modals.peer-view.download')"></i> {{ selectedStats.BytesReceived }} Bytes / <i class="fas fa-long-arrow-alt-up" :title="$t('modals.peer-view.upload')"></i> {{ selectedStats.BytesTransmitted }} Bytes</p>
-                    selectedStats.BytesReceived }} Bytes / <i class="fas fa-long-arrow-alt-up"
-                      :title="$t('modals.peer-view.upload')"></i> {{ selectedStats.BytesTransmitted }} Bytes</p>
                   <h4>{{ $t('modals.peer-view.connection-status') }}</h4>
                   <ul>
                     <li>{{ $t('modals.peer-view.pingable') }}: {{ selectedStats.IsPingable }}</li>
@@ -192,15 +166,13 @@ function ConfigQrUrl() {
             </div>
           </div>
         </div>
-        <div v-if="selectedInterface.Mode === 'server'" class="accordion-item">
+        <div v-if="selectedInterface.Mode==='server'" class="accordion-item">
           <h2 class="accordion-header" id="headingConfig">
-            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapseConfig" aria-expanded="false" aria-controls="collapseConfig">
-              data-bs-target="#collapseConfig" aria-expanded="false" aria-controls="collapseConfig">
               {{ $t('modals.peer-view.section-config') }}
             </button>
           </h2>
-          <div id="collapseConfig" class="accordion-collapse collapse" aria-labelledby="headingConfig"
+          <div id="collapseConfig" class="accordion-collapse collapse" aria-labelledby="headingConfig" data-bs-parent="#peerInformation" style="">
-            data-bs-parent="#peerInformation" style="">
             <div class="accordion-body">
               <Prism language="ini" :code="configString"></Prism>
             </div>
@@ -210,17 +182,18 @@ function ConfigQrUrl() {
     </template>
     <template #footer>
       <div class="flex-fill text-start">
-        <button @click.prevent="download" type="button" class="btn btn-primary me-1">{{
+        <button @click.prevent="download" type="button" class="btn btn-primary me-1">{{ $t('modals.peer-view.button-download') }}</button>
-          $t('modals.peer-view.button-download') }}</button>
+        <button @click.prevent="email"  type="button" class="btn btn-primary me-1">{{ $t('modals.peer-view.button-email') }}</button>
-        <button @click.prevent="email" type="button" class="btn btn-primary me-1">{{
-          $t('modals.peer-view.button-email') }}</button>
       </div>
       <button @click.prevent="close" type="button" class="btn btn-secondary">{{ $t('general.close') }}</button>
 
 
-  </template>
+    </template>
-</Modal></template>
+  </Modal>
+</template>
 
-<style>.config-qr-img {
+<style>
+.config-qr-img {
   max-width: 100%;
-}</style>
+}
+</style>

frontend/src/components/UserEditModal.vue

@@ -165,7 +165,7 @@ async function del() {
     </template>
     <template #footer>
       <div class="flex-fill text-start">
-        <button v-if="props.userId!=='#NEW#'" class="btn btn-danger me-1" type="button" @click.prevent="del">{{ $t('general.delete') }}</button>
+        <button v-if="props.userId!=='#NEW#'&&formData.Source==='db'" class="btn btn-danger me-1" type="button" @click.prevent="del">{{ $t('general.delete') }}</button>
       </div>
       <button class="btn btn-primary me-1" type="button" @click.prevent="save">{{ $t('general.save') }}</button>
       <button class="btn btn-secondary" type="button" @click.prevent="close">{{ $t('general.close') }}</button>

frontend/src/components/UserPeerEditModal.vue

@@ -1,294 +0,0 @@
-<script setup>
-import Modal from "./Modal.vue";
-import { peerStore } from "@/stores/peers";
-import { computed, ref, watch } from "vue";
-import { useI18n } from 'vue-i18n';
-import { notify } from "@kyvg/vue3-notification";
-import { freshPeer, freshInterface } from '@/helpers/models';
-import { profileStore } from "@/stores/profile";
-
-const { t } = useI18n()
-
-const peers = peerStore()
-const profile = profileStore()
-
-const props = defineProps({
-  peerId: String,
-  visible: Boolean,
-})
-
-const emit = defineEmits(['close'])
-
-const selectedPeer = computed(() => {
-  let p = peers.Find(props.peerId)
-
-  if (!p) {
-    if (!!props.peerId || props.peerId.length) {
-      p = profile.peers.find((p) => p.Identifier === props.peerId)
-    } else {
-      p = freshPeer() // dummy peer to avoid 'undefined' exceptions
-    }
-  }
-  return p
-})
-
-const selectedInterface = computed(() => {
-  let iId = profile.selectedInterfaceId;
-
-  let i = freshInterface() // dummy interface to avoid 'undefined' exceptions
-  if (iId) {
-    i = profile.interfaces.find((i) => i.Identifier === iId)
-  }
-
-  return i
-})
-
-const title = computed(() => {
-  if (!props.visible) {
-    return ""
-  }
-
-  if (selectedPeer.value) {
-    return t("modals.peer-edit.headline-edit-peer") + " " + selectedPeer.value.Identifier
-  }
-  return t("modals.peer-edit.headline-new-peer")
-})
-
-const formData = ref(freshPeer())
-
-// functions
-
-watch(() => props.visible, async (newValue, oldValue) => {
-  if (oldValue === false && newValue === true) { // if modal is shown
-    if (!selectedPeer.value) {
-      await peers.PreparePeer(selectedInterface.value.Identifier)
-
-      formData.value.Identifier = peers.Prepared.Identifier
-      formData.value.DisplayName = peers.Prepared.DisplayName
-      formData.value.UserIdentifier = peers.Prepared.UserIdentifier
-      formData.value.InterfaceIdentifier = peers.Prepared.InterfaceIdentifier
-      formData.value.Disabled = peers.Prepared.Disabled
-      formData.value.ExpiresAt = peers.Prepared.ExpiresAt
-      formData.value.Notes = peers.Prepared.Notes
-
-      formData.value.Endpoint = peers.Prepared.Endpoint
-      formData.value.EndpointPublicKey = peers.Prepared.EndpointPublicKey
-      formData.value.AllowedIPs = peers.Prepared.AllowedIPs
-      formData.value.ExtraAllowedIPs = peers.Prepared.ExtraAllowedIPs
-      formData.value.PresharedKey = peers.Prepared.PresharedKey
-      formData.value.PersistentKeepalive = peers.Prepared.PersistentKeepalive
-
-      formData.value.PrivateKey = peers.Prepared.PrivateKey
-      formData.value.PublicKey = peers.Prepared.PublicKey
-
-      formData.value.Mode = peers.Prepared.Mode
-
-      formData.value.Addresses = peers.Prepared.Addresses
-      formData.value.CheckAliveAddress = peers.Prepared.CheckAliveAddress
-      formData.value.Dns = peers.Prepared.Dns
-      formData.value.DnsSearch = peers.Prepared.DnsSearch
-      formData.value.Mtu = peers.Prepared.Mtu
-      formData.value.FirewallMark = peers.Prepared.FirewallMark
-      formData.value.RoutingTable = peers.Prepared.RoutingTable
-
-      formData.value.PreUp = peers.Prepared.PreUp
-      formData.value.PostUp = peers.Prepared.PostUp
-      formData.value.PreDown = peers.Prepared.PreDown
-      formData.value.PostDown = peers.Prepared.PostDown
-
-    } else { // fill existing data
-      formData.value.Identifier = selectedPeer.value.Identifier
-      formData.value.DisplayName = selectedPeer.value.DisplayName
-      formData.value.UserIdentifier = selectedPeer.value.UserIdentifier
-      formData.value.InterfaceIdentifier = selectedPeer.value.InterfaceIdentifier
-      formData.value.Disabled = selectedPeer.value.Disabled
-      formData.value.ExpiresAt = selectedPeer.value.ExpiresAt
-      formData.value.Notes = selectedPeer.value.Notes
-
-      formData.value.Endpoint = selectedPeer.value.Endpoint
-      formData.value.EndpointPublicKey = selectedPeer.value.EndpointPublicKey
-      formData.value.AllowedIPs = selectedPeer.value.AllowedIPs
-      formData.value.ExtraAllowedIPs = selectedPeer.value.ExtraAllowedIPs
-      formData.value.PresharedKey = selectedPeer.value.PresharedKey
-      formData.value.PersistentKeepalive = selectedPeer.value.PersistentKeepalive
-
-      formData.value.PrivateKey = selectedPeer.value.PrivateKey
-      formData.value.PublicKey = selectedPeer.value.PublicKey
-
-      formData.value.Mode = selectedPeer.value.Mode
-
-      formData.value.Addresses = selectedPeer.value.Addresses
-      formData.value.CheckAliveAddress = selectedPeer.value.CheckAliveAddress
-      formData.value.Dns = selectedPeer.value.Dns
-      formData.value.DnsSearch = selectedPeer.value.DnsSearch
-      formData.value.Mtu = selectedPeer.value.Mtu
-      formData.value.FirewallMark = selectedPeer.value.FirewallMark
-      formData.value.RoutingTable = selectedPeer.value.RoutingTable
-
-      formData.value.PreUp = selectedPeer.value.PreUp
-      formData.value.PostUp = selectedPeer.value.PostUp
-      formData.value.PreDown = selectedPeer.value.PreDown
-      formData.value.PostDown = selectedPeer.value.PostDown
-
-      if (!formData.value.Endpoint.Overridable ||
-        !formData.value.EndpointPublicKey.Overridable ||
-        !formData.value.AllowedIPs.Overridable ||
-        !formData.value.PersistentKeepalive.Overridable ||
-        !formData.value.Dns.Overridable ||
-        !formData.value.DnsSearch.Overridable ||
-        !formData.value.Mtu.Overridable ||
-        !formData.value.FirewallMark.Overridable ||
-        !formData.value.RoutingTable.Overridable ||
-        !formData.value.PreUp.Overridable ||
-        !formData.value.PostUp.Overridable ||
-        !formData.value.PreDown.Overridable ||
-        !formData.value.PostDown.Overridable) {
-        formData.value.IgnoreGlobalSettings = true
-      }
-    }
-  }
-}
-)
-
-watch(() => formData.value.Disabled, async (newValue, oldValue) => {
-  if (oldValue && !newValue && formData.value.ExpiresAt) {
-    formData.value.ExpiresAt = "" // reset expiry date
-  }
-}
-)
-
-function close() {
-  formData.value = freshPeer()
-  emit('close')
-}
-
-async function save() {
-  try {
-    if (props.peerId !== '#NEW#') {
-      await peers.UpdatePeer(selectedPeer.value.Identifier, formData.value)
-    } else {
-      await peers.CreatePeer(selectedInterface.value.Identifier, formData.value)
-    }
-    close()
-  } catch (e) {
-    // console.log(e)
-    notify({
-      title: "Failed to save peer!",
-      text: e.toString(),
-      type: 'error',
-    })
-  }
-}
-
-async function del() {
-  try {
-    await peers.DeletePeer(selectedPeer.value.Identifier)
-    close()
-  } catch (e) {
-    // console.log(e)
-    notify({
-      title: "Failed to delete peer!",
-      text: e.toString(),
-      type: 'error',
-    })
-  }
-}
-
-</script>
-
-<template>
-  <Modal :title="title" :visible="visible" @close="close">
-    <template #default>
-      <fieldset>
-        <legend class="mt-4">{{ $t('modals.peer-edit.header-general') }}</legend>
-        <div class="form-group">
-          <label class="form-label mt-4">{{ $t('modals.peer-edit.display-name.label') }}</label>
-          <input type="text" class="form-control" :placeholder="$t('modals.peer-edit.display-name.placeholder')"
-            v-model="formData.DisplayName">
-        </div>
-      </fieldset>
-      <fieldset>
-        <legend class="mt-4">{{ $t('modals.peer-edit.header-crypto') }}</legend>
-        <div class="form-group">
-          <label class="form-label mt-4">{{ $t('modals.peer-edit.private-key.label') }}</label>
-          <input type="email" class="form-control" :placeholder="$t('modals.peer-edit.private-key.placeholder')" required
-            v-model="formData.PrivateKey">
-        </div>
-        <div class="form-group">
-          <label class="form-label mt-4">{{ $t('modals.peer-edit.public-key.label') }}</label>
-          <input type="email" class="form-control" :placeholder="$t('modals.peer-edit.public-key.placeholder')" required
-            v-model="formData.PublicKey">
-        </div>
-        <div class="form-group">
-          <label class="form-label mt-4">{{ $t('modals.peer-edit.preshared-key.label') }}</label>
-          <input type="email" class="form-control" :placeholder="$t('modals.peer-edit.preshared-key.placeholder')"
-            v-model="formData.PresharedKey">
-        </div>
-      </fieldset>
-      <fieldset>
-        <legend class="mt-4">{{ $t('modals.peer-edit.header-network') }}</legend>
-        <div class="row">
-          <div class="form-group col-md-6">
-            <label class="form-label mt-4">{{ $t('modals.peer-edit.keep-alive.label') }}</label>
-            <input type="number" class="form-control" :placeholder="$t('modals.peer-edit.keep-alive.label')"
-              v-model="formData.PersistentKeepalive.Value">
-          </div>
-          <div class="form-group col-md-6">
-            <label class="form-label mt-4">{{ $t('modals.peer-edit.mtu.label') }}</label>
-            <input type="number" class="form-control" :placeholder="$t('modals.peer-edit.mtu.label')"
-              v-model="formData.Mtu.Value">
-          </div>
-        </div>
-      </fieldset>
-      <fieldset>
-        <legend class="mt-4">{{ $t('modals.peer-edit.header-hooks') }}</legend>
-        <div class="form-group">
-          <label class="form-label mt-4">{{ $t('modals.peer-edit.pre-up.label') }}</label>
-          <textarea v-model="formData.PreUp.Value" class="form-control" rows="2"
-            :placeholder="$t('modals.peer-edit.pre-up.placeholder')"></textarea>
-        </div>
-        <div class="form-group">
-          <label class="form-label mt-4">{{ $t('modals.peer-edit.post-up.label') }}</label>
-          <textarea v-model="formData.PostUp.Value" class="form-control" rows="2"
-            :placeholder="$t('modals.peer-edit.post-up.placeholder')"></textarea>
-        </div>
-        <div class="form-group">
-          <label class="form-label mt-4">{{ $t('modals.peer-edit.pre-down.label') }}</label>
-          <textarea v-model="formData.PreDown.Value" class="form-control" rows="2"
-            :placeholder="$t('modals.peer-edit.pre-down.placeholder')"></textarea>
-        </div>
-        <div class="form-group">
-          <label class="form-label mt-4">{{ $t('modals.peer-edit.post-down.label') }}</label>
-          <textarea v-model="formData.PostDown.Value" class="form-control" rows="2"
-            :placeholder="$t('modals.peer-edit.post-down.placeholder')"></textarea>
-        </div>
-      </fieldset>
-      <fieldset>
-        <legend class="mt-4">{{ $t('modals.peer-edit.header-state') }}</legend>
-        <div class="row">
-          <div class="form-group col-md-6">
-            <div class="form-check form-switch">
-              <input class="form-check-input" type="checkbox" v-model="formData.Disabled">
-              <label class="form-check-label">{{ $t('modals.peer-edit.disabled.label') }}</label>
-            </div>
-          </div>
-          <div class="form-group col-md-6">
-            <label class="form-label">{{ $t('modals.peer-edit.expires-at.label') }}</label>
-            <input type="date" pattern="\d{4}-\d{2}-\d{2}" class="form-control" min="2023-01-01"
-              v-model="formData.ExpiresAt">
-          </div>
-        </div>
-      </fieldset>
-    </template>
-    <template #footer>
-      <div class="flex-fill text-start">
-        <button v-if="props.peerId !== '#NEW#'" class="btn btn-danger me-1" type="button" @click.prevent="del">{{
-          $t('general.delete') }}</button>
-      </div>
-      <button class="btn btn-primary me-1" type="button" @click.prevent="save">{{ $t('general.save') }}</button>
-      <button class="btn btn-secondary" type="button" @click.prevent="close">{{ $t('general.close') }}</button>
-    </template>
-  </Modal>
-</template>
-
-<style></style>

frontend/src/components/UserViewModal.vue

@@ -88,10 +88,6 @@ function close() {
                   <td>{{ $t('modals.user-view.department') }}:</td>
                   <td>{{selectedUser.Department}}</td>
                 </tr>
-                <tr>
-                  <td>{{ $t('modals.user-view.api-enabled') }}:</td>
-                  <td>{{selectedUser.ApiEnabled}}</td>
-                </tr>
                 <tr v-if="selectedUser.Disabled">
                   <td>{{ $t('modals.user-view.disabled') }}:</td>
                   <td>{{selectedUser.DisabledReason}}</td>

frontend/src/helpers/models.js

@@ -146,8 +146,6 @@ export function freshUser() {
     Locked: false,
     LockedReason: "",
 
-    ApiEnabled: false,
-
     PeerCount: 0
   }
 }

frontend/src/helpers/utils.js

@@ -1,20 +0,0 @@
-import { Address4, Address6 } from "ip-address"
-
-export function ipToBigInt(ip) {
-  // Check if it's an IPv4 address
-  if (ip.includes(".")) {
-    const addr = new Address4(ip)
-    return addr.bigInteger()
-  }
-
-  // Otherwise, assume it's an IPv6 address
-  const addr = new Address6(ip)
-  return addr.bigInteger()
-}
-
-export function humanFileSize(size) {
-  const sizes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"]
-  if (size === 0) return "0B"
-  const i = parseInt(Math.floor(Math.log(size) / Math.log(1024)))
-  return Math.round(size / Math.pow(1024, i), 2) + sizes[i]
-}

frontend/src/lang/index.js

@@ -1,29 +1,27 @@
 // src/lang/index.js
 import de from './translations/de.json';
-import ru from './translations/ru.json';
 import en from './translations/en.json';
-import vi from './translations/vi.json';
-import zh from './translations/zh.json';
 import {createI18n} from "vue-i18n";
 
+function getStoredLanguage() {
+  let initialLang = localStorage.getItem('wgLang');
+  if (!initialLang) {
+    initialLang = "en"
+  }
+  return initialLang
+}
+
 // Create i18n instance with options
 const i18n = createI18n({
   legacy: false,
   globalInjection: true,
   allowComposition: true,
-  locale: (
+  locale: getStoredLanguage(), // set locale
-    localStorage.getItem('wgLang')
-    || (window && window.navigator && (window.navigator.userLanguage || window.navigator.language).split('-')[0])
-    || 'en'
-  ), // set locale
   fallbackLocale: "en", // set fallback locale
   messages: {
     "de": de,
-    "ru": ru,
+    "en": en
-    "en": en,
-    "vi": vi,
-    "zh": zh
   }
 });
 
-export default i18n
+export default i18n

frontend/src/lang/translations/de.json

@@ -1,7 +1,4 @@
 {
-  "languages": {
-    "de": "Deutsch"
-  },
   "general": {
     "pagination": {
       "size": "Anzahl an Elementen",
@@ -37,7 +34,6 @@
     "users": "Benutzer",
     "lang": "Sprache ändern",
     "profile": "Mein Profil",
-    "settings": "Einstellungen",
     "login": "Anmelden",
     "logout": "Abmelden"
   },
@@ -49,7 +45,7 @@
       "box-header": "WireGuard Installation",
       "headline": "Installation",
       "content": "Die Installationsanweisungen für die Client-Software finden Sie auf der offiziellen WireGuard-Website.",
-      "button": "Anleitung öffnen"
+      "btn": "Anleitung öffnen"
     },
     "about-wg": {
       "box-header": "Über WireGuard",
@@ -168,26 +164,6 @@
     "button-show-peer": "Show Peer",
     "button-edit-peer": "Edit Peer"
   },
-  "settings": {
-    "headline": "Einstellungen",
-    "abstract": "Hier finden Sie persönliche Einstellungen für WireGuard Portal.",
-    "api": {
-      "headline": "API Einstellungen",
-      "abstract": "Hier können Sie die  RESTful API verwalten.",
-      "active-description": "Die API ist derzeit für Ihr Benutzerkonto aktiv. Alle API-Anfragen werden mit Basic Auth authentifiziert. Verwenden Sie zur Authentifizierung die folgenden Anmeldeinformationen.",
-      "inactive-description": "Die API ist derzeit inaktiv. Klicken Sie auf die Schaltfläche unten, um sie zu aktivieren.",
-      "user-label": "API Benutzername:",
-      "user-placeholder": "API Benutzer",
-      "token-label": "API Passwort:",
-      "token-placeholder": "API Token",
-      "token-created-label": "API-Zugriff gewährt seit: ",
-      "button-disable-title": "Deaktivieren Sie die API. Dadurch wird der aktuelle Token ungültig.",
-      "button-disable-text": "API deaktivieren",
-      "button-enable-title": "Aktivieren Sie die API, dadurch wird ein neuer Token generiert.",
-      "button-enable-text": "API aktivieren",
-      "api-link": "API Dokumentation"
-    }
-  },
   "modals": {
     "user-view": {
       "headline": "User Account:",
@@ -354,7 +330,7 @@
         "endpoint": {
           "label": "Endpoint Address",
           "placeholder": "Endpoint Address",
-          "description": "The endpoint address that peers will connect to. (e.g. wg.example.com or wg.example.com:51820)"
+          "description": "The endpoint address that peers will connect to."
         },
         "networks": {
           "label": "IP Networks",
@@ -510,4 +486,4 @@
       }
     }
   }
-}
+}

frontend/src/lang/translations/en.json

@@ -1,7 +1,4 @@
 {
-  "languages": {
-    "en": "English"
-  },
   "general": {
     "pagination": {
       "size": "Number of Elements",
@@ -37,7 +34,6 @@
     "users": "Users",
     "lang": "Toggle Language",
     "profile": "My Profile",
-    "settings": "Settings",
     "login": "Login",
     "logout": "Logout"
   },
@@ -49,7 +45,7 @@
       "box-header": "WireGuard Installation",
       "headline": "Installation",
       "content": "Installation instructions for client software can be found on the official WireGuard website.",
-      "button": "Open Instructions"
+      "btn": "Open Instructions"
     },
     "about-wg": {
       "box-header": "About WireGuard",
@@ -168,26 +164,6 @@
     "button-show-peer": "Show Peer",
     "button-edit-peer": "Edit Peer"
   },
-  "settings": {
-    "headline": "Settings",
-    "abstract": "Here you can change your personal settings.",
-    "api": {
-      "headline": "API Settings",
-      "abstract": "Here you can configure the RESTful API settings.",
-      "active-description": "The API is currently active for your user account. All API requests are authenticated with Basic Auth. Use the following credentials for authentication.",
-      "inactive-description": "The API is currently inactive. Press the button below to activate it.",
-      "user-label": "API Username:",
-      "user-placeholder": "The API user",
-      "token-label": "API Password:",
-      "token-placeholder": "The API token",
-      "token-created-label": "API access granted at: ",
-      "button-disable-title": "Disable API, this will invalidate the current token.",
-      "button-disable-text": "Disable API",
-      "button-enable-title": "Enable API, this will generate a new token.",
-      "button-enable-text": "Enable API",
-      "api-link": "API Documentation"
-    }
-  },
   "modals": {
     "user-view": {
       "headline": "User Account:",
@@ -198,9 +174,8 @@
       "email": "E-Mail",
       "firstname": "Firstname",
       "lastname": "Lastname",
-      "phone": "Phone Number",
+      "phone": "Phone number",
       "department": "Department",
-      "api-enabled": "API Access",
       "disabled": "Account Disabled",
       "locked": "Account Locked",
       "no-peers": "User has no associated peers.",
@@ -355,7 +330,7 @@
         "endpoint": {
           "label": "Endpoint Address",
           "placeholder": "Endpoint Address",
-          "description": "The endpoint address that peers will connect to. (e.g. wg.example.com or wg.example.com:51820)"
+          "description": "The endpoint address that peers will connect to."
         },
         "networks": {
           "label": "IP Networks",

frontend/src/lang/translations/ru.json

@@ -1,492 +0,0 @@
-{
-  "languages": {
-    "ru": "Русский"
-  },
-  "general": {
-    "pagination": {
-      "size": "Количество элементов",
-      "all": "Все (медленно)"
-    },
-    "search": {
-      "placeholder": "Поиск...",
-      "button": "Поиск"
-    },
-    "select-all": "Выбрать все",
-    "yes": "Да",
-    "no": "Нет",
-    "cancel": "Отмена",
-    "close": "Закрыть",
-    "save": "Сохранить",
-    "delete": "Удалить"
-  },
-  "login": {
-    "headline": "Пожалуйста, войдите в систему",
-    "username": {
-      "label": "Имя пользователя",
-      "placeholder": "Пожалуйста, введите ваше имя пользователя"
-    },
-    "password": {
-      "label": "Пароль",
-      "placeholder": "Пожалуйста, введите ваш пароль"
-    },
-    "button": "Войти"
-  },
-  "menu": {
-    "home": "Главная",
-    "interfaces": "Интерфейсы",
-    "users": "Пользователи",
-    "lang": "Сменить язык",
-    "profile": "Мой профиль",
-    "login": "Вход",
-    "logout": "Выход"
-  },
-  "home": {
-    "headline": "Портал VPN WireGuard®",
-    "info-headline": "Дополнительная информация",
-    "abstract": "WireGuard® - это чрезвычайно простой, но быстрый и современный VPN, использующий передовую криптографию. Он стремится быть быстрее, проще, компактнее и полезнее, чем IPsec, избегая при этом значительных сложностей. Он предназначен для значительного повышения производительности по сравнению с OpenVPN.",
-    "installation": {
-      "box-header": "Установка WireGuard",
-      "headline": "Установка",
-      "content": "Инструкции по установке клиентского программного обеспечения можно найти на официальном сайте WireGuard.",
-      "btn": "Открыть инструкции",
-      "button": "Открыть инструкции"
-    },
-    "about-wg": {
-      "box-header": "О WireGuard",
-      "headline": "О программе",
-      "content": "WireGuard® - это чрезвычайно простой, но быстрый и современный VPN, использующий передовую криптографию.",
-      "button": "Подробнее"
-    },
-    "about-portal": {
-      "box-header": "О портале WireGuard",
-      "headline": "Портал WireGuard",
-      "content": "Портал WireGuard - это простой веб-портал для настройки WireGuard.",
-      "button": "Подробнее"
-    },
-    "profiles": {
-      "headline": "VPN Профили",
-      "abstract": "Вы можете получить доступ и загрузить свои личные конфигурации VPN через свой пользовательский профиль.",
-      "content": "Чтобы найти все сконфигурированные профили, нажмите на кнопку ниже.",
-      "button": "Открыть мой профиль"
-    },
-    "admin": {
-      "headline": "Административная зона",
-      "abstract": "В административной зоне вы можете управлять узлами и серверным интерфейсом WireGuard, а также пользователями, которым разрешен вход в портал WireGuard.",
-      "content": "",
-      "button-admin": "Открыть администрирование сервера",
-      "button-user": "Открыть администрирование пользователей"
-    }
-  },
-  "interfaces": {
-    "headline": "Администрирование интерфейсов",
-    "headline-peers": "Текущие VPN пиры",
-    "headline-endpoints": "Текущие конечные точки",
-    "no-interface": {
-      "default-selection": "Интерфейсы отсутствуют",
-      "headline": "Интерфейсы не найдены...",
-      "abstract": "Нажмите на кнопку со знаком плюса выше, чтобы создать новый интерфейс WireGuard."
-    },
-    "no-peer": {
-      "headline": "Пиры отсутствуют",
-      "abstract": "В настоящее время для выбранного интерфейса WireGuard нет доступных пиров."
-    },
-    "table-heading": {
-      "name": "Имя",
-      "user": "Пользователь",
-      "ip": "IP-адреса",
-      "endpoint": "Конечная точка",
-      "status": "Статус"
-    },
-    "interface": {
-      "headline": "Статус интерфейса для",
-      "mode": "режим",
-      "key": "Публичный ключ",
-      "endpoint": "Публичная конечная точка",
-      "port": "Порт прослушивания",
-      "peers": "Активные пиры",
-      "total-peers": "Всего пиров",
-      "endpoints": "Активные конечные точки",
-      "total-endpoints": "Всего конечных точек",
-      "ip": "IP-адрес",
-      "default-allowed-ip": "Разрешенные IP по умолчанию",
-      "dns": "DNS-серверы",
-      "mtu": "MTU",
-      "default-keep-alive": "Интервал поддержания активности по умолчанию",
-      "button-show-config": "Показать конфигурацию",
-      "button-download-config": "Скачать конфигурацию",
-      "button-store-config": "Сохранить конфигурацию для wg-quick",
-      "button-edit": "Редактировать интерфейс"
-    },
-    "button-add-interface": "Добавить интерфейс",
-    "button-add-peer": "Добавить пира",
-    "button-add-peers": "Добавить несколько пиров",
-    "button-show-peer": "Показать пира",
-    "button-edit-peer": "Редактировать пира",
-    "peer-disabled": "Пир отключен, причина:",
-    "peer-expiring": "Пир истекает в",
-    "peer-connected": "Подключено",
-    "peer-not-connected": "Не подключено",
-    "peer-handshake": "Последнее рукопожатие:"
-  },
-  "users": {
-    "headline": "Администрирование пользователей",
-    "table-heading": {
-      "id": "ID",
-      "email": "Электронная почта",
-      "firstname": "Имя",
-      "lastname": "Фамилия",
-      "source": "Источник",
-      "peers": "Пиры",
-      "admin": "Админ"
-    },
-    "no-user": {
-      "headline": "Пользователи отсутствуют",
-      "abstract": "В настоящее время в портале WireGuard не зарегистрировано ни одного пользователя."
-    },
-    "button-add-user": "Добавить пользователя",
-    "button-show-user": "Показать пользователя",
-    "button-edit-user": "Редактировать пользователя",
-    "user-disabled": "Пользователь отключен, причина:",
-    "user-locked": "Учетная запись заблокирована, причина:",
-    "admin": "Пользователь имеет права администратора",
-    "no-admin": "Пользователь не имеет прав администратора"
-  },
-  "profile": {
-    "headline": "Мои VPN пиры",
-    "table-heading": {
-      "name": "Имя",
-      "ip": "IP-адреса",
-      "stats": "Статус",
-      "interface": "Интерфейс сервера"
-    },
-    "no-peer": {
-      "headline": "Пиров нет",
-      "abstract": "В настоящее время у вашего профиля пользователя нет связанных пиров."
-    },
-    "peer-connected": "Подключено",
-    "button-add-peer": "Добавить пира",
-    "button-show-peer": "Показать пира",
-    "button-edit-peer": "Редактировать пира"
-  },
-  "modals": {
-    "user-view": {
-      "headline": "Учетная запись пользователя:",
-      "tab-user": "Информация",
-      "tab-peers": "Пиры",
-      "headline-info": "Информация о пользователе:",
-      "headline-notes": "Заметки:",
-      "email": "Электронная почта",
-      "firstname": "Имя",
-      "lastname": "Фамилия",
-      "phone": "Номер телефона",
-      "department": "Отдел",
-      "disabled": "Учетная запись отключена",
-      "locked": "Учетная запись заблокирована",
-      "no-peers": "У пользователя нет связанных пиров.",
-      "peers": {
-        "name": "Имя",
-        "interface": "Интерфейс",
-        "ip": "IP-адреса"
-      }
-    },
-    "user-edit": {
-      "headline-edit": "Редактировать пользователя:",
-      "headline-new": "Новый пользователь",
-      "header-general": "Общее",
-      "header-personal": "Информация о пользователе",
-      "header-notes": "Заметки",
-      "header-state": "Состояние",
-      "identifier": {
-        "label": "Идентификатор",
-        "placeholder": "Уникальный идентификатор пользователя"
-      },
-      "source": {
-        "label": "Источник",
-        "placeholder": "Источник пользователя"
-      },
-      "password": {
-        "label": "Пароль",
-        "placeholder": "Надежный пароль",
-        "description": "Оставьте это поле пустым, чтобы сохранить текущий пароль."
-      },
-      "email": {
-        "label": "Электронная почта",
-        "placeholder": "Адрес электронной почты"
-      },
-      "phone": {
-        "label": "Телефон",
-        "placeholder": "Номер телефона"
-      },
-      "department": {
-        "label": "Отдел",
-        "placeholder": "Отдел"
-      },
-      "firstname": {
-        "label": "Имя",
-        "placeholder": "Имя"
-      },
-      "lastname": {
-        "label": "Фамилия",
-        "placeholder": "Фамилия"
-      },
-      "notes": {
-        "label": "Заметки",
-        "placeholder": ""
-      },
-      "disabled": {
-        "label": "Отключен (нет возможности подключения к WireGuard и входа в систему)"
-      },
-      "locked": {
-        "label": "Заблокирован (вход в систему невозможен, подключения WireGuard работают)"
-      },
-      "admin": {
-        "label": "Является администратором"
-      }
-    },
-    "interface-view": {
-      "headline": "Конфигурация интерфейса:"
-    },
-    "interface-edit": {
-      "headline-edit": "Редактировать интерфейс:",
-      "headline-new": "Новый интерфейс",
-      "tab-interface": "Интерфейс",
-      "tab-peerdef": "Настройки пира по умолчанию",
-      "header-general": "Общие",
-      "header-network": "Сеть",
-      "header-crypto": "Криптография",
-      "header-hooks": "Хуки интерфейса",
-      "header-peer-hooks": "Хуки",
-      "header-state": "Состояние",
-      "identifier": {
-        "label": "Идентификатор",
-        "placeholder": "Уникальный идентификатор интерфейса"
-      },
-      "mode": {
-        "label": "Режим интерфейса",
-        "server": "Режим сервера",
-        "client": "Режим клиента",
-        "any": "Неизвестный режим"
-      },
-      "display-name": {
-        "label": "Отображаемое имя",
-        "placeholder": "Описательное имя для интерфейса"
-      },
-      "private-key": {
-        "label": "Приватный ключ",
-        "placeholder": "Приватный ключ"
-      },
-      "public-key": {
-        "label": "Публичный ключ",
-        "placeholder": "Публичный ключ"
-      },
-      "ip": {
-        "label": "IP-адреса",
-        "placeholder": "IP-адреса (в формате CIDR)"
-      },
-      "listen-port": {
-        "label": "Порт прослушивания",
-        "placeholder": "Порт для прослушивания"
-      },
-      "dns": {
-        "label": "DNS-сервер",
-        "placeholder": "Используемые DNS-серверы"
-      },
-      "dns-search": {
-        "label": "Поисковые домены DNS",
-        "placeholder": "Префиксы поиска DNS"
-      },
-      "mtu": {
-        "label": "MTU",
-        "placeholder": "MTU интерфейса (0 = использовать значение по умолчанию)"
-      },
-      "firewall-mark": {
-        "label": "Метка брандмауэра",
-        "placeholder": "Метка брандмауэра, применяемая к исходящему трафику (0 = автоматически)"
-      },
-      "routing-table": {
-        "label": "Таблица маршрутизации",
-        "placeholder": "ID таблицы маршрутизации",
-        "description": "Особые случаи: off = не управлять маршрутами, 0 = автоматически"
-      },
-      "pre-up": {
-        "label": "Pre-Up",
-        "placeholder": "Одна или несколько команд bash, разделенных ;"
-      },
-      "post-up": {
-        "label": "Post-Up",
-        "placeholder": "Одна или несколько команд bash, разделенных ;"
-      },
-      "pre-down": {
-        "label": "Pre-Down",
-        "placeholder": "Одна или несколько команд bash, разделенных ;"
-      },
-      "post-down": {
-        "label": "Post-Down",
-        "placeholder": "Одна или несколько команд bash, разделенных ;"
-      },
-      "disabled": {
-        "label": "Интерфейс отключен"
-      },
-      "save-config": {
-        "label": "Автоматически сохранять конфигурацию wg-quick"
-      },
-      "defaults": {
-        "endpoint": {
-          "label": "Адрес конечной точки",
-          "placeholder": "Адрес конечной точки",
-          "description": "Адрес конечной точки, к которой будут подключаться пиры."
-        },
-        "networks": {
-          "label": "IP-сети",
-          "placeholder": "Сетевые адреса",
-          "description": "Пиры будут получать IP-адреса из этих подсетей."
-        },
-        "allowed-ip": {
-          "label": "Разрешенные IP-адреса",
-          "placeholder": "Разрешенные IP-адреса по умолчанию"
-        },
-        "mtu": {
-          "label": "MTU",
-          "placeholder": "MTU клиента (0 = использовать значение по умолчанию)"
-        },
-        "keep-alive": {
-          "label": "Интервал поддержания активности",
-          "placeholder": "Постоянное поддержание активности (0 = значение по умолчанию)"
-        }
-      },
-      "button-apply-defaults": "Применить настройки пира по умолчанию"
-    },
-    "peer-view": {
-      "headline-peer": "Пир:",
-      "headline-endpoint": "Конечная точка:",
-      "section-info": "Информация о пире",
-      "section-status": "Текущий статус",
-      "section-config": "Конфигурация",
-      "identifier": "Идентификатор",
-      "ip": "IP-адреса",
-      "user": "Связанный пользователь",
-      "notes": "Заметки",
-      "expiry-status": "Истекает в",
-      "disabled-status": "Отключено в",
-      "traffic": "Трафик",
-      "connection-status": "Статус соединения",
-      "upload": "Загружено байт (от сервера к пиру)",
-      "download": "Скачано байт (от пира к серверу)",
-      "pingable": "Доступность пинга",
-      "handshake": "Последнее рукопожатие",
-      "connected-since": "Подключен с",
-      "endpoint": "Конечная точка",
-      "button-download": "Скачать конфигурацию",
-      "button-email": "Отправить конфигурацию по электронной почте"
-    },
-    "peer-edit": {
-      "headline-edit-peer": "Редактировать пира:",
-      "headline-edit-endpoint": "Редактировать конечную точку:",
-      "headline-new-peer": "Создать пира",
-      "headline-new-endpoint": "Создать конечную точку",
-      "header-general": "Общее",
-      "header-network": "Сеть",
-      "header-crypto": "Криптография",
-      "header-hooks": "Хуки (Выполняются на пире)",
-      "header-state": "Состояние",
-      "display-name": {
-        "label": "Отображаемое имя",
-        "placeholder": "Описательное имя для пира"
-      },
-      "linked-user": {
-        "label": "Связанный пользователь",
-        "placeholder": "Учетная запись пользователя, которой принадлежит этот пир"
-      },
-      "private-key": {
-        "label": "Приватный ключ",
-        "placeholder": "Приватный ключ"
-      },
-      "public-key": {
-        "label": "Публичный ключ",
-        "placeholder": "Публичный ключ"
-      },
-      "preshared-key": {
-        "label": "Предварительно разделяемый ключ",
-        "placeholder": "Необязательный предварительно разделяемый ключ"
-      },
-      "endpoint-public-key": {
-        "label": "Публичный ключ конечной точки",
-        "placeholder": "Публичный ключ удаленной конечной точки"
-      },
-      "endpoint": {
-        "label": "Адрес конечной точки",
-        "placeholder": "Адрес удаленной конечной точки"
-      },
-      "ip": {
-        "label": "IP-адреса",
-        "placeholder": "IP-адреса (в формате CIDR)"
-      },
-      "allowed-ip": {
-        "label": "Разрешенные IP-адреса",
-        "placeholder": "Разрешенные IP-адреса (в формате CIDR)"
-      },
-      "extra-allowed-ip": {
-        "label": "Дополнительно разрешенные IP-адреса",
-        "placeholder": "Дополнительные разрешенные IP-адреса (на стороне сервера)",
-        "description": "Эти IP-адреса будут добавлены в удаленный интерфейс WireGuard как разрешенные IP-адреса."
-      },
-      "dns": {
-        "label": "DNS Server",
-        "placeholder": "The DNS servers that should be used"
-      },
-      "dns-search": {
-        "label": "DNS Search Domains",
-        "placeholder": "DNS search prefixes"
-      },
-      "keep-alive": {
-        "label": "Keep Alive Interval",
-        "placeholder": "Persistent Keepalive (0 = default)"
-      },
-      "mtu": {
-        "label": "MTU",
-        "placeholder": "The client MTU (0 = keep default)"
-      },
-      "pre-up": {
-        "label": "Pre-Up",
-        "placeholder": "One or multiple bash commands separated by ;"
-      },
-      "post-up": {
-        "label": "Post-Up",
-        "placeholder": "One or multiple bash commands separated by ;"
-      },
-      "pre-down": {
-        "label": "Pre-Down",
-        "placeholder": "One or multiple bash commands separated by ;"
-      },
-      "post-down": {
-        "label": "Post-Down",
-        "placeholder": "One or multiple bash commands separated by ;"
-      },
-      "disabled": {
-        "label": "Peer Disabled"
-      },
-      "ignore-global": {
-        "label": "Ignore global settings"
-      },
-      "expires-at": {
-        "label": "Expiry date"
-      }
-    },
-    "peer-multi-create": {
-      "headline-peer": "Create multiple peers",
-      "headline-endpoint": "Create multiple endpoints",
-      "identifiers": {
-        "label": "User Identifiers",
-        "placeholder": "User Identifiers",
-        "description": "A user identifier (the username) for which a peer should be created."
-      },
-      "prefix": {
-        "headline-peer": "Peer:",
-        "headline-endpoint": "Endpoint:",
-        "label": "Display Name Prefix",
-        "placeholder": "The prefix",
-        "description": "A prefix that is added to the peers display name."
-      }
-    }
-  }
-}

frontend/src/lang/translations/vi.json

@@ -1,492 +0,0 @@
-{
-  "languages": {
-    "vi": "Tiếng Việt"
-  },
-  "general": {
-    "pagination": {
-      "size": "Số mục",
-      "all": "Tất (chậm)"
-    },
-    "search": {
-      "placeholder": "Tìm...",
-      "button": "Tìm kiếm"
-    },
-    "select-all": "Chọn tất",
-    "yes": "Có",
-    "no": "Không",
-    "cancel": "Hủy",
-    "close": "Đóng",
-    "save": "Lưu",
-    "delete": "Xóa"
-  },
-  "login": {
-    "headline": "Vui lòng đăng nhập",
-    "username": {
-      "label": "Tài khoản",
-      "placeholder": "Vui lòng nhập tài khoản"
-    },
-    "password": {
-      "label": "Mật khẩu",
-      "placeholder": "Vui lòng nhập mật khẩu"
-    },
-    "button": "Đăng nhập"
-  },
-  "menu": {
-    "home": "Trang chủ",
-    "interfaces": "Giao diện",
-    "users": "Người dùng",
-    "lang": "Chuyển ngữ",
-    "profile": "Hồ sơ của tôi",
-    "login": "Đăng nhập",
-    "logout": "Đăng xuất"
-  },
-  "home": {
-    "headline": "Cổng VPN WireGuard®",
-    "info-headline": "Thêm thông tin",
-    "abstract": "WireGuard® là một VPN cực kỳ đơn giản nhưng nhanh chóng và hiện đại, sử dụng mật mã tiên tiến. Nó hướng đến mục tiêu nhanh hơn, đơn giản hơn, gọn nhẹ hơn và hữu ích hơn IPsec, cũng đỡ nhức đầu hơn. Nó có hiệu suất dự kiến là cao hơn đáng kể so với OpenVPN.",
-    "installation": {
-      "box-header": "Cài đặt WireGuard",
-      "headline": "Cài đặt",
-      "content": "Bạn có thể tìm thấy hướng dẫn cài đặt phần mềm máy khách trên trang web chính thức của WireGuard.",
-      "button": "Mở hướng dẫn"
-    },
-    "about-wg": {
-      "box-header": "Nói về WireGuard",
-      "headline": "Về",
-      "content": "WireGuard® là một VPN cực kỳ đơn giản nhưng nhanh chóng và hiện đại, sử dụng công nghệ mật mã tiên tiến.",
-      "button": "Thêm"
-    },
-    "about-portal": {
-      "box-header": "Giới thiệu về Cổng thông tin WireGuard",
-      "headline": "Cổng thông tin WireGuard",
-      "content": "Cổng thông tin WireGuard là một cổng cấu hình đơn giản, dựa trên web cho WireGuard.",
-      "button": "Tìm hiểu thêm"
-    },
-    "profiles": {
-      "headline": "Hồ sơ VPN",
-      "abstract": "Bạn có thể truy cập và tải xuống các cấu hình VPN cá nhân của mình qua hồ sơ người dùng của bạn.",
-      "content": "Để tìm tất cả các hồ sơ đã cấu hình của bạn, hãy nhấp vào nút dưới đây.",
-      "button": "Mở hồ sơ của tôi"
-    },
-    "admin": {
-      "headline": "Khu vực Quản trị",
-      "abstract": "Trong khu vực quản trị, bạn có thể quản lý các peer WireGuard và giao diện máy chủ cũng như người dùng được phép đăng nhập vào Cổng thông tin WireGuard.",
-      "content": "",
-      "button-admin": "Mở Quản trị Máy chủ",
-      "button-user": "Mở Quản trị Người dùng"
-    }
-  },
-  "interfaces": {
-    "headline": "Quản trị Giao diện",
-    "headline-peers": "Các Peer VPN Hiện tại",
-    "headline-endpoints": "Các Điểm cuối Hiện tại",
-    "no-interface": {
-      "default-selection": "Không có giao diện nào",
-      "headline": "Không tìm thấy giao diện...",
-      "abstract": "Nhấp vào nút cộng trên để tạo một giao diện WireGuard mới."
-    },
-    "no-peer": {
-      "headline": "Không có peer nào",
-      "abstract": "Hiện tại, không có peer nào khả dụng cho giao diện WireGuard đã chọn."
-    },
-    "table-heading": {
-      "name": "Tên",
-      "user": "Người dùng",
-      "ip": "Địa chỉ IP",
-      "endpoint": "Điểm cuối",
-      "status": "Trạng thái"
-    },
-    "interface": {
-      "headline": "Trạng thái giao diện cho",
-      "mode": "chế độ",
-      "key": "Khóa Công khai",
-      "endpoint": "Điểm cuối Công khai",
-      "port": "Cổng Nghe",
-      "peers": "Các Peer Được Kích hoạt",
-      "total-peers": "Tổng số Peer",
-      "endpoints": "Các Điểm cuối Được Kích hoạt",
-      "total-endpoints": "Tổng số Điểm cuối",
-      "ip": "Địa chỉ IP",
-      "default-allowed-ip": "IP được phép mặc định",
-      "dns": "Máy chủ DNS",
-      "mtu": "MTU",
-      "default-keep-alive": "Khoảng thời gian giữ kết nối mặc định",
-      "button-show-config": "Hiển thị cấu hình",
-      "button-download-config": "Tải xuống cấu hình",
-      "button-store-config": "Lưu cấu hình cho wg-quick",
-      "button-edit": "Chỉnh sửa giao diện"
-    },
-    "button-add-interface": "Thêm Giao diện",
-    "button-add-peer": "Thêm Peer",
-    "button-add-peers": "Thêm Nhiều Peer",
-    "button-show-peer": "Hiển thị Peer",
-    "button-edit-peer": "Chỉnh sửa Peer",
-    "peer-disabled": "Peer đã bị vô hiệu hóa, lý do:",
-    "peer-expiring": "Peer sẽ hết hạn vào",
-    "peer-connected": "Đã kết nối",
-    "peer-not-connected": "Chưa kết nối",
-    "peer-handshake": "Lần bắt tay cuối cùng:"
-  },
-  "users": {
-    "headline": "Quản trị Người dùng",
-    "table-heading": {
-      "id": "ID",
-      "email": "E-Mail",
-      "firstname": "Tên",
-      "lastname": "Họ",
-      "source": "Nguồn",
-      "peers": "Peers",
-      "admin": "Quản trị viên"
-    },
-    "no-user": {
-      "headline": "Không có người dùng nào",
-      "abstract": "Hiện tại, không có người dùng nào được đăng ký với WireGuard Portal."
-    },
-    "button-add-user": "Thêm Người dùng",
-    "button-show-user": "Hiển thị Người dùng",
-    "button-edit-user": "Chỉnh sửa Người dùng",
-    "user-disabled": "Người dùng đã bị vô hiệu hóa, lý do:",
-    "user-locked": "Tài khoản bị khóa, lý do:",
-    "admin": "Người dùng có quyền quản trị",
-    "no-admin": "Người dùng không có quyền quản trị"
-  },
-  "profile": {
-    "headline": "Các Peer VPN của Tôi",
-    "table-heading": {
-      "name": "Tên",
-      "ip": "Địa chỉ IP",
-      "stats": "Trạng thái",
-      "interface": "Giao diện Máy chủ"
-    },
-    "no-peer": {
-      "headline": "Không có peer nào",
-      "abstract": "Hiện tại, không có peer nào liên kết với hồ sơ người dùng của bạn."
-    },
-    "peer-connected": "Đã kết nối",
-    "button-add-peer": "Thêm Peer",
-    "button-show-peer": "Hiển thị Peer",
-    "button-edit-peer": "Chỉnh sửa Peer"
-  },
-  "modals": {
-    "user-view": {
-      "headline": "Tài khoản Người dùng:",
-      "tab-user": "Thông tin",
-      "tab-peers": "Peers",
-      "headline-info": "Thông tin Người dùng:",
-      "headline-notes": "Ghi chú:",
-      "email": "E-Mail",
-      "firstname": "Tên",
-      "lastname": "Họ",
-      "phone": "Số điện thoại",
-      "department": "Phòng ban",
-      "disabled": "Tài khoản bị vô hiệu hóa",
-      "locked": "Tài khoản bị khóa",
-      "no-peers": "Người dùng không có peers liên kết.",
-      "peers": {
-        "name": "Tên",
-        "interface": "Giao diện",
-        "ip": "Địa chỉ IP"
-      }
-    },
-    "user-edit": {
-      "headline-edit": "Chỉnh sửa người dùng:",
-      "headline-new": "Người dùng mới",
-      "header-general": "Chung",
-      "header-personal": "Thông tin Người dùng",
-      "header-notes": "Ghi chú",
-      "header-state": "Trạng thái",
-      "identifier": {
-        "label": "Mã định danh",
-        "placeholder": "Mã định danh người dùng duy nhất"
-      },
-      "source": {
-        "label": "Nguồn",
-        "placeholder": "Nguồn gốc của người dùng"
-      },
-      "password": {
-        "label": "Mật khẩu",
-        "placeholder": "Mật khẩu siêu bí mật",
-        "description": "Để trống trường này để giữ nguyên mật khẩu hiện tại."
-      },
-      "email": {
-        "label": "Email",
-        "placeholder": "Địa chỉ email"
-      },
-      "phone": {
-        "label": "Điện thoại",
-        "placeholder": "Số điện thoại"
-      },
-      "department": {
-        "label": "Phòng ban",
-        "placeholder": "Phòng ban"
-      },
-      "firstname": {
-        "label": "Tên",
-        "placeholder": "Tên"
-      },
-      "lastname": {
-        "label": "Họ",
-        "placeholder": "Họ"
-      },
-      "notes": {
-        "label": "Ghi chú",
-        "placeholder": "Chú thích thêm"
-      },
-      "disabled": {
-        "label": "Vô hiệu hóa (không thể kết nối WireGuard và không thể đăng nhập)"
-      },
-      "locked": {
-        "label": "Khóa (không thể đăng nhập, kết nối WireGuard vẫn hoạt động)"
-      },
-      "admin": {
-        "label": "Là Quản trị viên"
-      }
-    },
-    "interface-view": {
-      "headline": "Cấu hình cho Giao diện:"
-    },
-    "interface-edit": {
-      "headline-edit": "Chỉnh sửa Giao diện:",
-      "headline-new": "Giao diện Mới",
-      "tab-interface": "Giao diện",
-      "tab-peerdef": "Cài đặt Mặc định của Peer",
-      "header-general": "Chung",
-      "header-network": "Mạng",
-      "header-crypto": "Mã hóa",
-      "header-hooks": "Kẹp Giao diện",
-      "header-peer-hooks": "Kẹp Peer",
-      "header-state": "Trạng thái",
-      "identifier": {
-        "label": "Mã định danh",
-        "placeholder": "Mã định danh giao diện duy nhất"
-      },
-      "mode": {
-        "label": "Chế độ Giao diện",
-        "server": "Chế độ Máy chủ",
-        "client": "Chế độ Khách hàng",
-        "any": "Chế độ Không xác định"
-      },
-      "display-name": {
-        "label": "Tên Hiển thị",
-        "placeholder": "Tên mô tả cho giao diện"
-      },
-      "private-key": {
-        "label": "Khóa Riêng",
-        "placeholder": "Khóa riêng"
-      },
-      "public-key": {
-        "label": "Khóa Công khai",
-        "placeholder": "Khóa công khai"
-      },
-      "ip": {
-        "label": "Địa chỉ IP",
-        "placeholder": "Địa chỉ IP (định dạng CIDR)"
-      },
-      "listen-port": {
-        "label": "Cổng Nghe",
-        "placeholder": "Cổng nghe"
-      },
-      "dns": {
-        "label": "Máy chủ DNS",
-        "placeholder": "Các máy chủ DNS sẽ được sử dụng"
-      },
-      "dns-search": {
-        "label": "Tên miền Tìm kiếm DNS",
-        "placeholder": "Tiền tố tìm kiếm DNS"
-      },
-      "mtu": {
-        "label": "MTU",
-        "placeholder": "MTU của giao diện (0 = giữ mặc định)"
-      },
-      "firewall-mark": {
-        "label": "Đánh dấu Tường lửa",
-        "placeholder": "Đánh dấu tường lửa áp dụng cho lưu lượng đi. (0 = tự động)"
-      },
-      "routing-table": {
-        "label": "Bảng Định tuyến",
-        "placeholder": "ID bảng định tuyến",
-        "description": "Các trường hợp đặc biệt: off = không quản lý các tuyến đường, 0 = tự động"
-      },
-      "pre-up": {
-        "label": "Trước khi Bật",
-        "placeholder": "Một hoặc nhiều lệnh bash ngăn cách bằng ;"
-      },
-      "post-up": {
-        "label": "Sau khi Bật",
-        "placeholder": "Một hoặc nhiều lệnh bash ngăn cách bằng ;"
-      },
-      "pre-down": {
-        "label": "Trước khi Tắt",
-        "placeholder": "Một hoặc nhiều lệnh bash ngăn cách bằng ;"
-      },
-      "post-down": {
-        "label": "Sau khi Tắt",
-        "placeholder": "Một hoặc nhiều lệnh bash ngăn cách bằng ;"
-      },
-      "disabled": {
-        "label": "Giao diện Bị vô hiệu hóa"
-      },
-      "save-config": {
-        "label": "Tự động lưu cấu hình wg-quick"
-      },
-      "defaults": {
-        "endpoint": {
-          "label": "Địa chỉ Endpoint",
-          "placeholder": "Địa chỉ Endpoint",
-          "description": "Địa chỉ endpoint mà các peer sẽ kết nối tới."
-        },
-        "networks": {
-          "label": "Mạng IP",
-          "placeholder": "Địa chỉ Mạng",
-          "description": "Các peer sẽ nhận địa chỉ IP từ những mạng con này."
-        },
-        "allowed-ip": {
-          "label": "Địa chỉ IP Được phép",
-          "placeholder": "Địa chỉ IP Được phép mặc định"
-        },
-        "mtu": {
-          "label": "MTU",
-          "placeholder": "MTU của client (0 = giữ mặc định)"
-        },
-        "keep-alive": {
-          "label": "Khoảng thời gian Giữ kết nối",
-          "placeholder": "Giữ kết nối liên tục (0 = mặc định)"
-        }
-      },
-
-      "button-apply-defaults": "Áp dụng Cài đặt Mặc định của Peer"
-    },
-    "peer-view": {
-      "headline-peer": "Peer:",
-      "headline-endpoint": "Endpoint:",
-      "section-info": "Thông tin Peer",
-      "section-status": "Trạng thái Hiện tại",
-      "section-config": "Cấu hình",
-      "identifier": "Mã định danh",
-      "ip": "Địa chỉ IP",
-      "user": "Người dùng Liên kết",
-      "notes": "Ghi chú",
-      "expiry-status": "Hết hạn vào",
-      "disabled-status": "Bị Vô hiệu hóa vào",
-      "traffic": "Lưu lượng",
-      "connection-status": "Thông tin Kết nối",
-      "upload": "Số Byte Tải lên (từ Máy chủ đến Peer)",
-      "download": "Số Byte Tải xuống (từ Peer đến Máy chủ)",
-      "pingable": "Có thể Ping",
-      "handshake": "Lần bắt tay cuối cùng",
-      "connected-since": "Kết nối từ",
-      "endpoint": "Endpoint",
-      "button-download": "Tải cấu hình",
-      "button-email": "Gửi cấu hình qua Email"
-    },
-    "peer-edit": {
-      "headline-edit-peer": "Chỉnh sửa Peer:",
-      "headline-edit-endpoint": "Chỉnh sửa Endpoint:",
-      "headline-new-peer": "Tạo Peer mới",
-      "headline-new-endpoint": "Tạo Endpoint mới",
-      "header-general": "Chung",
-      "header-network": "Mạng",
-      "header-crypto": "Mã hóa",
-      "header-hooks": "Kẹp (Thực thi trên Peer)",
-      "header-state": "Trạng thái",
-      "display-name": {
-        "label": "Tên Hiển thị",
-        "placeholder": "Tên mô tả cho peer"
-      },
-      "linked-user": {
-        "label": "Người dùng Liên kết",
-        "placeholder": "Tài khoản người dùng sở hữu peer này"
-      },
-      "private-key": {
-        "label": "Khóa Riêng",
-        "placeholder": "Khóa riêng"
-      },
-      "public-key": {
-        "label": "Khóa Công khai",
-        "placeholder": "Khóa công khai"
-      },
-      "preshared-key": {
-        "label": "Khóa Preshared",
-        "placeholder": "Khóa chia sẻ trước (tuỳ chọn)"
-      },
-      "endpoint-public-key": {
-        "label": "Khóa Công khai của Endpoint",
-        "placeholder": "Khóa công khai của endpoint từ xa"
-      },
-      "endpoint": {
-        "label": "Địa chỉ Endpoint",
-        "placeholder": "Địa chỉ của endpoint từ xa"
-      },
-      "ip": {
-        "label": "Địa chỉ IP",
-        "placeholder": "Địa chỉ IP (định dạng CIDR)"
-      },
-      "allowed-ip": {
-        "label": "Địa chỉ IP Được phép",
-        "placeholder": "Địa chỉ IP Được phép (định dạng CIDR)"
-      },
-      "extra-allowed-ip": {
-        "label": "Địa chỉ IP Được phép Thêm",
-        "placeholder": "Địa chỉ IP Thêm (Phía Máy chủ)",
-        "description": "Những địa chỉ IP này sẽ được thêm vào giao diện WireGuard từ xa dưới dạng địa chỉ IP được phép."
-      },
-      "dns": {
-        "label": "Máy chủ DNS",
-        "placeholder": "Các máy chủ DNS sẽ được sử dụng"
-      },
-      "dns-search": {
-        "label": "Tên miền Tìm kiếm DNS",
-        "placeholder": "Tiền tố tìm kiếm DNS"
-      },
-      "keep-alive": {
-        "label": "Khoảng thời gian Giữ kết nối",
-        "placeholder": "Giữ kết nối liên tục (0 = mặc định)"
-      },
-      "mtu": {
-        "label": "MTU",
-        "placeholder": "MTU của client (0 = giữ mặc định)"
-      },
-      "pre-up": {
-        "label": "Trước khi Bật",
-        "placeholder": "Một hoặc nhiều lệnh bash ngăn cách bằng ;"
-      },
-      "post-up": {
-        "label": "Sau khi Bật",
-        "placeholder": "Một hoặc nhiều lệnh bash ngăn cách bằng ;"
-      },
-      "pre-down": {
-        "label": "Trước khi Tắt",
-        "placeholder": "Một hoặc nhiều lệnh bash ngăn cách bằng ;"
-      },
-      "post-down": {
-        "label": "Sau khi Tắt",
-        "placeholder": "Một hoặc nhiều lệnh bash ngăn cách bằng ;"
-      },
-      "disabled": {
-        "label": "Peer Bị Vô hiệu hóa"
-      },
-      "ignore-global": {
-        "label": "Bỏ qua cài đặt toàn cầu"
-      },
-      "expires-at": {
-        "label": "Ngày hết hạn"
-      }
-    },
-    "peer-multi-create": {
-      "headline-peer": "Tạo nhiều peer",
-      "headline-endpoint": "Tạo nhiều endpoint",
-      "identifiers": {
-        "label": "Mã định danh Người dùng",
-        "placeholder": "Mã định danh Người dùng",
-        "description": "Một mã định danh người dùng (tên người dùng) cho mà một peer sẽ được tạo ra."
-      },
-      "prefix": {
-        "headline-peer": "Peer:",
-        "headline-endpoint": "Endpoint:",
-        "label": "Tiền tố Tên Hiển thị",
-        "placeholder": "Tiền tố",
-        "description": "Một tiền tố được thêm vào tên hiển thị của các peer."
-      }
-    }
-  }
-}

frontend/src/lang/translations/zh.json

@@ -1,492 +0,0 @@
-{
-    "languages": {
-      "zh": "中文"
-    },
-    "general": {
-      "pagination": {
-        "size": "每页显示数量",
-        "all": "全部 (较慢)"
-      },
-      "search": {
-        "placeholder": "搜索...",
-        "button": "搜索"
-      },
-      "select-all": "全选",
-      "yes": "是",
-      "no": "否",
-      "cancel": "取消",
-      "close": "关闭",
-      "save": "保存",
-      "delete": "删除"
-    },
-    "login": {
-      "headline": "请登录",
-      "username": {
-        "label": "用户名",
-        "placeholder": "请输入用户名"
-      },
-      "password": {
-        "label": "密码",
-        "placeholder": "请输入密码"
-      },
-      "button": "登录"
-    },
-    "menu": {
-      "home": "首页",
-      "interfaces": "接口",
-      "users": "用户",
-      "lang": "切换语言",
-      "profile": "个人资料",
-      "login": "登录",
-      "logout": "注销"
-    },
-    "home": {
-      "headline": "WireGuard® VPN Portal",
-      "info-headline": "更多信息",
-      "abstract": "WireGuard® 是一种极其简单但又快速现代的 VPN，采用先进的加密技术。它旨在比 IPsec 更快、更简单、更轻量、更实用，同时避免了大量的麻烦。它的性能显著优于 OpenVPN。",
-      "installation": {
-        "box-header": "WireGuard 安装",
-        "headline": "安装",
-        "content": "客户端软件的安装说明可在官方 WireGuard 网站上找到。",
-        "button": "打开说明"
-      },
-      "about-wg": {
-        "box-header": "关于 WireGuard",
-        "headline": "关于",
-        "content": "WireGuard® 是一种极其简单但又快速现代的 VPN，采用先进的加密技术。",
-        "button": "更多"
-      },
-      "about-portal": {
-        "box-header": "关于 WireGuard Portal",
-        "headline": "WireGuard Portal",
-        "content": "WireGuard Portal 是一个简单的基于网页的 WireGuard 配置平台。",
-        "button": "更多"
-      },
-      "profiles": {
-        "headline": "VPN 配置文件",
-        "abstract": "您可以通过您的用户个人资料访问并下载个人 VPN 配置。",
-        "content": "要查找您所有的配置文件，请点击下面的按钮。",
-        "button": "打开我的个人资料"
-      },
-      "admin": {
-        "headline": "后台管理",
-        "abstract": "在后台管理，您可以管理 WireGuard 节点和服务器接口，以及允许登录 WireGuard Portal 的用户。",
-        "content": "",
-        "button-admin": "打开服务器管理",
-        "button-user": "打开用户管理"
-      }
-    },
-    "interfaces": {
-      "headline": "接口管理",
-      "headline-peers": "当前 VPN 节点",
-      "headline-endpoints": "当前节点",
-      "no-interface": {
-        "default-selection": "没有可用接口",
-        "headline": "未找到接口...",
-        "abstract": "点击上面的加号按钮以创建新的 WireGuard 接口。"
-      },
-      "no-peer": {
-        "headline": "没有可用节点",
-        "abstract": "当前没有可用的节点与所选的 WireGuard 接口关联。"
-      },
-      "table-heading": {
-        "name": "名称",
-        "user": "用户",
-        "ip": "IP 地址",
-        "endpoint": "节点",
-        "status": "状态"
-      },
-      "interface": {
-        "headline": "接口状态",
-        "mode": "模式",
-        "key": "公钥",
-        "endpoint": "公开节点",
-        "port": "监听端口",
-        "peers": "启用节点",
-        "total-peers": "节点总数",
-        "endpoints": "启用节点",
-        "total-endpoints": "节点总数",
-        "ip": "IP 地址",
-        "default-allowed-ip": "默认允许的 IP",
-        "dns": "DNS 服务器",
-        "mtu": "MTU",
-        "default-keep-alive": "默认心跳包间隔",
-        "button-show-config": "显示配置",
-        "button-download-config": "下载配置",
-        "button-store-config": "为 wg-quick 保存配置",
-        "button-edit": "编辑接口"
-      },
-      "button-add-interface": "添加接口",
-      "button-add-peer": "添加节点",
-      "button-add-peers": "添加多个节点",
-      "button-show-peer": "显示节点",
-      "button-edit-peer": "编辑节点",
-      "peer-disabled": "节点已禁用，原因: ",
-      "peer-expiring": "节点将在以下时间过期: ",
-      "peer-connected": "已连接",
-      "peer-not-connected": "未连接",
-      "peer-handshake": "最后一次握手: "
-    },
-    "users": {
-      "headline": "用户管理",
-      "table-heading": {
-        "id": "ID",
-        "email": "电子邮件",
-        "firstname": "名",
-        "lastname": "姓",
-        "source": "来源",
-        "peers": "节点",
-        "admin": "管理员"
-      },
-      "no-user": {
-        "headline": "没有可用用户",
-        "abstract": "当前没有用户注册 WireGuard 门户。"
-      },
-      "button-add-user": "添加用户",
-      "button-show-user": "显示用户",
-      "button-edit-user": "编辑用户",
-      "user-disabled": "用户已禁用, 原因: ",
-      "user-locked": "账户已锁定, 原因: ",
-      "admin": "用户具有管理员权限",
-      "no-admin": "用户没有管理员权限"
-    },
-    "profile": {
-      "headline": "我的 VPN 节点列表",
-      "table-heading": {
-        "name": "名称",
-        "ip": "IP 地址",
-        "stats": "状态",
-        "interface": "服务器接口"
-      },
-      "no-peer": {
-        "headline": "没有可用节点",
-        "abstract": "当前没有与您的用户个人资料关联的节点。"
-      },
-      "peer-connected": "已连接",
-      "button-add-peer": "添加节点",
-      "button-show-peer": "显示节点",
-      "button-edit-peer": "编辑节点"
-    },
-    "modals": {
-      "user-view": {
-        "headline": "用户账户: ",
-        "tab-user": "信息",
-        "tab-peers": "节点",
-        "headline-info": "用户信息: ",
-        "headline-notes": "备注: ",
-        "email": "电子邮件",
-        "firstname": "名",
-        "lastname": "姓",
-        "phone": "电话号码",
-        "department": "部门",
-        "disabled": "账户已禁用",
-        "locked": "账户已锁定",
-        "no-peers": "用户没有关联的节点。",
-        "peers": {
-          "name": "名称",
-          "interface": "接口",
-          "ip": "IP 地址"
-        }
-      },
-      "user-edit": {
-        "headline-edit": "编辑用户: ",
-        "headline-new": "新用户",
-        "header-general": "常规",
-        "header-personal": "用户信息",
-        "header-notes": "备注",
-        "header-state": "状态",
-        "identifier": {
-          "label": "标识符",
-          "placeholder": "唯一用户标识符"
-        },
-        "source": {
-          "label": "来源",
-          "placeholder": "用户来源"
-        },
-        "password": {
-          "label": "密码",
-          "placeholder": "一个复杂的密码",
-          "description": "留空保持当前密码不变。"
-        },
-        "email": {
-          "label": "电子邮件",
-          "placeholder": "电子邮件地址"
-        },
-        "phone": {
-          "label": "电话",
-          "placeholder": "电话号码"
-        },
-        "department": {
-          "label": "部门",
-          "placeholder": "部门"
-        },
-        "firstname": {
-          "label": "名",
-          "placeholder": "名"
-        },
-        "lastname": {
-          "label": "姓",
-          "placeholder": "姓"
-        },
-        "notes": {
-          "label": "备注",
-          "placeholder": ""
-        },
-        "disabled": {
-          "label": "禁用 (无法连接 WireGuard 和登录)"
-        },
-        "locked": {
-          "label": "锁定 (无法登录，但 WireGuard 仍然可以连接)"
-        },
-        "admin": {
-          "label": "管理员"
-        }
-      },
-      "interface-view": {
-        "headline": "接口配置: "
-      },
-      "interface-edit": {
-        "headline-edit": "编辑接口: ",
-        "headline-new": "新接口",
-        "tab-interface": "接口",
-        "tab-peerdef": "节点默认值",
-        "header-general": "常规",
-        "header-network": "网络",
-        "header-crypto": "加密",
-        "header-hooks": "接口 Hooks",
-        "header-peer-hooks": "Hooks",
-        "header-state": "状态",
-        "identifier": {
-          "label": "标识符",
-          "placeholder": "唯一接口标识符"
-        },
-        "mode": {
-          "label": "接口模式",
-          "server": "服务器模式",
-          "client": "客户端模式",
-          "any": "未知模式"
-        },
-        "display-name": {
-          "label": "显示名称",
-          "placeholder": "接口的描述性名称"
-        },
-        "private-key": {
-          "label": "私钥",
-          "placeholder": "私钥"
-        },
-        "public-key": {
-          "label": "公钥",
-          "placeholder": "公钥"
-        },
-        "ip": {
-          "label": "IP 地址",
-          "placeholder": "IP 地址 (CIDR 格式)"
-        },
-        "listen-port": {
-          "label": "监听端口",
-          "placeholder": "监听端口"
-        },
-        "dns": {
-          "label": "DNS 服务器",
-          "placeholder": "应使用的 DNS 服务器"
-        },
-        "dns-search": {
-          "label": "DNS 搜索域",
-          "placeholder": "DNS 搜索前缀"
-        },
-        "mtu": {
-          "label": "MTU",
-          "placeholder": "接口 MTU (0 = 保持默认)"
-        },
-        "firewall-mark": {
-          "label": "防火墙掩码",
-          "placeholder": "应用于出站流量的防火墙掩码 (0 = 自动)"
-        },
-        "routing-table": {
-          "label": "路由表",
-          "placeholder": "路由表 ID",
-          "description": "特殊情况: off = 不管理路由, 0 = 自动"
-        },
-        "pre-up": {
-          "label": "启动前脚本",
-          "placeholder": "一个或多个用分号分隔的 bash 命令"
-        },
-        "post-up": {
-          "label": "启动后脚本",
-          "placeholder": "一个或多个用分号分隔的 bash 命令"
-        },
-        "pre-down": {
-          "label": "停止前脚本",
-          "placeholder": "一个或多个用分号分隔的 bash 命令"
-        },
-        "post-down": {
-          "label": "停止后脚本",
-          "placeholder": "一个或多个用分号分隔的 bash 命令"
-        },
-        "disabled": {
-          "label": "接口已禁用"
-        },
-        "save-config": {
-          "label": "自动保存 wg-quick 配置"
-        },
-        "defaults": {
-          "endpoint": {
-            "label": "服务器地址",
-            "placeholder": "服务器地址",
-            "description": "节点将连接到服务器的地址。"
-          },
-          "networks": {
-            "label": "IP 地址",
-            "placeholder": "IP 地址",
-            "description": "节点将从这些子网获取 IP 地址。"
-          },
-          "allowed-ip": {
-            "label": "允许的 IP 地址",
-            "placeholder": "默认允许的 IP 地址"
-          },
-          "mtu": {
-            "label": "MTU",
-            "placeholder": "客户端 MTU (0 = 保持默认)"
-          },
-          "keep-alive": {
-            "label": "心跳包间隔",
-            "placeholder": "持久保持连接 (0 = 默认)"
-          }
-        },
-        "button-apply-defaults": "应用节点默认值"
-      },
-      "peer-view": {
-        "headline-peer": "节点: ",
-        "headline-endpoint": "节点: ",
-        "section-info": "节点信息",
-        "section-status": "当前状态",
-        "section-config": "配置",
-        "identifier": "标识符",
-        "ip": "IP 地址",
-        "user": "关联用户",
-        "notes": "备注",
-        "expiry-status": "过期时间",
-        "disabled-status": "禁用时间",
-        "traffic": "流量",
-        "connection-status": "连接状态",
-        "upload": "上传字节 (服务器到节点)",
-        "download": "下载字节 (节点到服务器)",
-        "pingable": "连通状态",
-        "handshake": "最后握手",
-        "connected-since": "首次成功连接",
-        "endpoint": "节点地址",
-        "button-download": "下载配置",
-        "button-email": "通过电子邮件发送配置"
-      },
-      "peer-edit": {
-        "headline-edit-peer": "编辑节点: ",
-        "headline-edit-endpoint": "编辑节点: ",
-        "headline-new-peer": "创建节点",
-        "headline-new-endpoint": "创建节点",
-        "header-general": "常规",
-        "header-network": "网络",
-        "header-crypto": "加密",
-        "header-hooks": "Hooks (在节点执行)",
-        "header-state": "状态",
-        "display-name": {
-          "label": "显示名称",
-          "placeholder": "节点的描述性名称"
-        },
-        "linked-user": {
-          "label": "关联用户",
-          "placeholder": "拥有此节点的用户账户"
-        },
-        "private-key": {
-          "label": "私钥",
-          "placeholder": "私钥"
-        },
-        "public-key": {
-          "label": "公钥",
-          "placeholder": "公钥"
-        },
-        "preshared-key": {
-          "label": "预共享密钥",
-          "placeholder": "可选的预共享密钥"
-        },
-        "endpoint-public-key": {
-          "label": "节点公钥",
-          "placeholder": "远程节点的公钥"
-        },
-        "endpoint": {
-          "label": "节点地址",
-          "placeholder": "远程节点的地址"
-        },
-        "ip": {
-          "label": "IP 地址",
-          "placeholder": "IP 地址(CIDR 格式)"
-        },
-        "allowed-ip": {
-          "label": "允许的 IP 地址",
-          "placeholder": "允许的 IP 地址(CIDR 格式)"
-        },
-        "extra-allowed-ip": {
-          "label": "额外允许的 IP 地址",
-          "placeholder": "额外允许的 IP 地址(服务器端)",
-          "description": "这些 IP 将作为允许的 IP 添加到远程 WireGuard 接口。"
-        },
-        "dns": {
-          "label": "DNS 服务器",
-          "placeholder": "要使用的 DNS 服务器"
-        },
-        "dns-search": {
-          "label": "DNS 搜索域",
-          "placeholder": "DNS 搜索前缀"
-        },
-        "keep-alive": {
-          "label": "心跳包间隔",
-          "placeholder": "持久保持连接 (0 = 默认)"
-        },
-        "mtu": {
-          "label": "MTU",
-          "placeholder": "客户端 MTU (0 = 保持默认)"
-        },
-        "pre-up": {
-          "label": "启动前脚本",
-          "placeholder": "一个或多个用分号分隔的 bash 命令"
-        },
-        "post-up": {
-          "label": "启动后脚本",
-          "placeholder": "一个或多个用分号分隔的 bash 命令"
-        },
-        "pre-down": {
-          "label": "停止前脚本",
-          "placeholder": "一个或多个用分号分隔的 bash 命令"
-        },
-        "post-down": {
-          "label": "停止后脚本",
-          "placeholder": "一个或多个用分号分隔的 bash 命令"
-        },
-        "disabled": {
-          "label": "节点已禁用"
-        },
-        "ignore-global": {
-          "label": "忽略全局设置"
-        },
-        "expires-at": {
-          "label": "过期日期"
-        }
-      },
-      "peer-multi-create": {
-        "headline-peer": "创建多个节点",
-        "headline-endpoint": "创建多个节点",
-        "identifiers": {
-          "label": "用户标识符",
-          "placeholder": "用户标识符",
-          "description": "要为其创建节点 的用户标识符(用户名)。"
-        },
-        "prefix": {
-          "headline-peer": "节点: ",
-          "headline-endpoint": "节点: ",
-          "label": "显示名称前缀",
-          "placeholder": "前缀",
-          "description": "添加到节点 显示名称的前缀。"
-        }
-      }
-    }
-  }
-  

frontend/src/main.js

@@ -9,14 +9,13 @@ import i18n from "./lang";
 import Notifications from '@kyvg/vue3-notification'
 
 // Bootstrap (and theme)
-import "@/assets/custom.scss";
+//import "bootstrap/dist/css/bootstrap.min.css"
+import "bootswatch/dist/lux/bootstrap.min.css";
 import "bootstrap";
 import "./assets/base.css";
 
-// Fonts
+// Fontawesome
 import "@fortawesome/fontawesome-free/js/all.js"
-import "@fontsource/nunito-sans/400.css";
-import "@fontsource/nunito-sans/600.css";
 
 // Flags
 import "flag-icons/css/flag-icons.min.css"

frontend/src/router/index.js

@@ -47,14 +47,6 @@ const router = createRouter({
       // this generates a separate chunk (About.[hash].js) for this route
       // which is lazy-loaded when the route is visited.
       component: () => import('../views/ProfileView.vue')
-    },
-    {
-      path: '/settings',
-      name: 'settings',
-      // route level code-splitting
-      // this generates a separate chunk (About.[hash].js) for this route
-      // which is lazy-loaded when the route is visited.
-      component: () => import('../views/SettingsView.vue')
     }
   ],
   linkActiveClass: "active",

frontend/src/stores/peers.js

@@ -4,7 +4,6 @@ import {notify} from "@kyvg/vue3-notification";
 import {interfaceStore} from "./interfaces";
 import {freshPeer, freshStats} from '@/helpers/models';
 import { base64_url_encode } from '@/helpers/encoding';
-import { ipToBigInt } from '@/helpers/utils';
 
 const baseUrl = `/peer`
 
@@ -22,8 +21,6 @@ export const peerStore = defineStore({
     pageOffset: 0,
     pages: [],
     fetching: false,
-    sortKey: 'IsConnected', // Default sort key
-    sortOrder: -1, // 1 for ascending, -1 for descending
   }),
   getters: {
     Find: (state) => {
@@ -42,30 +39,8 @@ export const peerStore = defineStore({
         return p.DisplayName.includes(state.filter) || p.Identifier.includes(state.filter)
       })
     },
-    Sorted: (state) => {
-      return state.Filtered.slice().sort((a, b) => {
-        let aValue = a[state.sortKey];
-        let bValue = b[state.sortKey];
-        if (state.sortKey === 'Addresses') {
-          aValue = aValue.length > 0 ? ipToBigInt(aValue[0]) : 0;
-          bValue = bValue.length > 0 ? ipToBigInt(bValue[0]) : 0;
-        }
-        if (state.sortKey === 'IsConnected') {
-          aValue = state.statsEnabled && state.stats[a.Identifier]?.IsConnected ? 1 : 0;
-          bValue = state.statsEnabled && state.stats[b.Identifier]?.IsConnected ? 1 : 0;
-        }
-        if (state.sortKey === 'Traffic') {
-          aValue = state.statsEnabled ? (state.stats[a.Identifier].BytesReceived + state.stats[a.Identifier].BytesTransmitted) : 0;
-          bValue = state.statsEnabled ? (state.stats[b.Identifier].BytesReceived + state.stats[b.Identifier].BytesTransmitted) : 0;
-        }
-        let result = 0;
-        if (aValue > bValue) result = 1;
-        if (aValue < bValue) result = -1;
-        return state.sortOrder === 1 ? result : -result;
-      });
-    },
     FilteredAndPaged: (state) => {
-      return state.Sorted.slice(state.pageOffset, state.pageOffset + state.pageSize);
+      return state.Filtered.slice(state.pageOffset, state.pageOffset + state.pageSize)
     },
     ConfigQrUrl: (state) => {
       return (id) => state.peers.find((p) => p.Identifier === id) ? apiWrapper.url(`${baseUrl}/config-qr/${base64_url_encode(id)}`) : ''

frontend/src/stores/profile.js

@@ -4,7 +4,6 @@ import {notify} from "@kyvg/vue3-notification";
 import {authStore} from "@/stores/auth";
 import { base64_url_encode } from '@/helpers/encoding';
 import {freshStats} from "@/helpers/models";
-import { ipToBigInt } from '@/helpers/utils';
 
 const baseUrl = `/user`
 
@@ -12,8 +11,6 @@ export const profileStore = defineStore({
   id: 'profile',
   state: () => ({
     peers: [],
-    interfaces: [],
-    selectedInterfaceId: "",
     stats: {},
     statsEnabled: false,
     user: {},
@@ -22,8 +19,6 @@ export const profileStore = defineStore({
     pageOffset: 0,
     pages: [],
     fetching: false,
-    sortKey: 'IsConnected', // Default sort key
-    sortOrder: -1, // 1 for ascending, -1 for descending
   }),
   getters: {
     FindPeers: (state) => {
@@ -40,30 +35,8 @@ export const profileStore = defineStore({
         return p.DisplayName.includes(state.filter) || p.Identifier.includes(state.filter)
       })
     },
-    Sorted: (state) => {
-      return state.FilteredPeers.slice().sort((a, b) => {
-        let aValue = a[state.sortKey];
-        let bValue = b[state.sortKey];
-        if (state.sortKey === 'Addresses') {
-          aValue = aValue.length > 0 ? ipToBigInt(aValue[0]) : 0;
-          bValue = bValue.length > 0 ? ipToBigInt(bValue[0]) : 0;
-        }
-        if (state.sortKey === 'IsConnected') {
-          aValue = state.statsEnabled && state.stats[a.Identifier]?.IsConnected ? 1 : 0;
-          bValue = state.statsEnabled && state.stats[b.Identifier]?.IsConnected ? 1 : 0;
-        }
-        if (state.sortKey === 'Traffic') {
-          aValue = state.statsEnabled ? (state.stats[a.Identifier].BytesReceived + state.stats[a.Identifier].BytesTransmitted) : 0;
-          bValue = state.statsEnabled ? (state.stats[b.Identifier].BytesReceived + state.stats[b.Identifier].BytesTransmitted) : 0;
-        }
-        let result = 0;
-        if (aValue > bValue) result = 1;
-        if (aValue < bValue) result = -1;
-        return state.sortOrder === 1 ? result : -result;
-      });
-    },
     FilteredAndPagedPeers: (state) => {
-      return state.Sorted.slice(state.pageOffset, state.pageOffset + state.pageSize);
+      return state.FilteredPeers.slice(state.pageOffset, state.pageOffset + state.pageSize)
     },
     isFetching: (state) => state.fetching,
     hasNextPage: (state) => state.pageOffset < (state.FilteredPeerCount - state.pageSize),
@@ -73,7 +46,6 @@ export const profileStore = defineStore({
       return (id) => state.statsEnabled && (id in state.stats) ? state.stats[id] : freshStats()
     },
     hasStatistics: (state) => state.statsEnabled,
-    CountInterfaces: (state) => state.interfaces.length,
   },
   actions: {
     afterPageSizeChange() {
@@ -119,39 +91,6 @@ export const profileStore = defineStore({
       this.stats = statsResponse.Stats
       this.statsEnabled = statsResponse.Enabled
     },
-    setInterfaces(interfaces) {
-      this.interfaces = interfaces
-      this.selectedInterfaceId = interfaces.length > 0 ? interfaces[0].Identifier : ""
-      this.fetching = false
-    },
-    async enableApi() {
-      this.fetching = true
-      let currentUser = authStore().user.Identifier
-      return apiWrapper.post(`${baseUrl}/${base64_url_encode(currentUser)}/api/enable`)
-          .then(this.setUser)
-          .catch(error => {
-            this.setPeers([])
-            console.log("Failed to activate API for ", currentUser, ": ", error)
-            notify({
-              title: "Backend Connection Failure",
-              text: "Failed to activate API!",
-            })
-          })
-    },
-    async disableApi() {
-      this.fetching = true
-      let currentUser = authStore().user.Identifier
-      return apiWrapper.post(`${baseUrl}/${base64_url_encode(currentUser)}/api/disable`)
-          .then(this.setUser)
-          .catch(error => {
-            this.setPeers([])
-            console.log("Failed to deactivate API for ", currentUser, ": ", error)
-            notify({
-              title: "Backend Connection Failure",
-              text: "Failed to deactivate API!",
-            })
-          })
-    },
     async LoadPeers() {
       this.fetching = true
       let currentUser = authStore().user.Identifier
@@ -194,19 +133,5 @@ export const profileStore = defineStore({
           })
         })
     },
-    async LoadInterfaces() {
-      this.fetching = true
-      let currentUser = authStore().user.Identifier
-      return apiWrapper.get(`${baseUrl}/${base64_url_encode(currentUser)}/interfaces`)
-          .then(this.setInterfaces)
-          .catch(error => {
-            this.setInterfaces([])
-            console.log("Failed to load interfaces for ", currentUser, ": ", error)
-            notify({
-              title: "Backend Connection Failure",
-              text: "Failed to load interfaces!",
-            })
-          })
-    },
   }
 })

frontend/src/views/HomeView.vue

@@ -1,8 +1,8 @@
 <script setup>
-import { authStore } from "@/stores/auth";
+  import {authStore} from "@/stores/auth";
-import { RouterLink } from "vue-router";
+  import {RouterLink} from "vue-router";
 
-const auth = authStore()
+  const auth = authStore()
 </script>
 
 <template>
@@ -29,8 +29,7 @@ const auth = authStore()
     <hr class="my-4">
     <p>{{ $t('home.admin.content') }}</p>
     <p class="lead">
-      <RouterLink :to="{ name: 'interfaces' }" class="btn btn-primary btn-lg me-2">{{ $t('home.admin.button-admin') }}
+      <RouterLink :to="{ name: 'interfaces' }" class="btn btn-primary btn-lg me-2">{{ $t('home.admin.button-admin') }}</RouterLink>
-      </RouterLink>
       <RouterLink :to="{ name: 'users' }" class="btn btn-primary btn-lg">{{ $t('home.admin.button-user') }}</RouterLink>
     </p>
   </div>

frontend/src/views/InterfaceView.vue

@@ -10,7 +10,6 @@ import {peerStore} from "@/stores/peers";
 import {interfaceStore} from "@/stores/interfaces";
 import {notify} from "@kyvg/vue3-notification";
 import {settingsStore} from "@/stores/settings";
-import {humanFileSize} from '@/helpers/utils';
 
 const settings = settingsStore()
 const interfaces = interfaceStore()
@@ -22,20 +21,6 @@ const multiCreatePeerId = ref("")
 const editInterfaceId = ref("")
 const viewedInterfaceId = ref("")
 
-const sortKey = ref("");
-const sortOrder = ref(1);
-
-function sortBy(key) {
-  if (sortKey.value === key) {
-    sortOrder.value = sortOrder.value * -1; // Toggle sort order
-  } else {
-    sortKey.value = key;
-    sortOrder.value = 1; // Default to ascending
-  }
-  peers.sortKey = sortKey.value;
-  peers.sortOrder = sortOrder.value;
-}
-
 function calculateInterfaceName(id, name) {
   let result = id
   if (name) {
@@ -52,7 +37,7 @@ async function download() {
   let text = interfaces.configuration
 
   let element = document.createElement('a')
-  element.setAttribute('href', 'data:application/octet-stream;charset=utf-8,' + encodeURIComponent(text))
+  element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text))
   element.setAttribute('download', filename)
 
   element.style.display = 'none'
@@ -109,7 +94,7 @@ onMounted(async () => {
           <button class="input-group-text btn btn-primary" :title="$t('interfaces.button-add-interface')" @click.prevent="editInterfaceId='#NEW#'">
             <i class="fa-solid fa-plus-circle"></i>
           </button>
-          <select v-model="interfaces.selected" :disabled="interfaces.Count===0" class="form-select" @change="() => { peers.LoadPeers(); peers.LoadStats() }">
+          <select v-model="interfaces.selected" :disabled="interfaces.Count===0" class="form-select" @change="peers.LoadPeers()">
             <option v-if="interfaces.Count===0" value="nothing">{{ $t('interfaces.no-interface.default-selection') }}</option>
             <option v-for="iface in interfaces.All" :key="iface.Identifier" :value="iface.Identifier">{{ calculateInterfaceName(iface.Identifier,iface.DisplayName) }}</option>
           </select>
@@ -153,7 +138,7 @@ onMounted(async () => {
                 <tbody>
                 <tr>
                   <td>{{ $t('interfaces.interface.key') }}:</td>
-                  <td class="text-wrap">{{interfaces.GetSelected.PublicKey}}</td>
+                  <td>{{interfaces.GetSelected.PublicKey}}</td>
                 </tr>
                 <tr>
                   <td>{{ $t('interfaces.interface.endpoint') }}:</td>
@@ -207,7 +192,7 @@ onMounted(async () => {
                 <tbody>
                 <tr>
                   <td>{{ $t('interfaces.interface.key') }}:</td>
-                  <td class="text-wrap">{{interfaces.GetSelected.PublicKey}}</td>
+                  <td>{{interfaces.GetSelected.PublicKey}}</td>
                 </tr>
                 <tr>
                   <td>{{ $t('interfaces.interface.endpoints') }}:</td>
@@ -245,7 +230,7 @@ onMounted(async () => {
                 <tbody>
                 <tr>
                   <td>{{ $t('interfaces.interface.key') }}:</td>
-                  <td class="text-wrap">{{interfaces.GetSelected.PublicKey}}</td>
+                  <td>{{interfaces.GetSelected.PublicKey}}</td>
                 </tr>
                 <tr>
                   <td>{{ $t('interfaces.interface.endpoint') }}:</td>
@@ -329,28 +314,11 @@ onMounted(async () => {
           <input id="flexCheckDefault" class="form-check-input" :title="$t('general.select-all')" type="checkbox" value="">
         </th><!-- select -->
         <th scope="col"></th><!-- status -->
-        <th scope="col" @click="sortBy('DisplayName')">
+        <th scope="col">{{ $t('interfaces.table-heading.name') }}</th>
-          {{ $t("interfaces.table-heading.name") }}
+        <th scope="col">{{ $t('interfaces.table-heading.user') }}</th>
-          <i v-if="sortKey === 'DisplayName'" :class="sortOrder === 1 ? 'asc' : 'desc'"></i>
+        <th scope="col">{{ $t('interfaces.table-heading.ip') }}</th>
-        </th>
+        <th v-if="interfaces.GetSelected.Mode==='client'" scope="col">{{ $t('interfaces.table-heading.endpoint') }}</th>
-        <th scope="col" @click="sortBy('UserIdentifier')">
+        <th v-if="peers.hasStatistics" scope="col">{{ $t('interfaces.table-heading.status') }}</th>
-          {{ $t("interfaces.table-heading.user") }}
-          <i v-if="sortKey === 'UserIdentifier'" :class="sortOrder === 1 ? 'asc' : 'desc'"></i>
-        </th>
-        <th scope="col" @click="sortBy('Addresses')">
-          {{ $t("interfaces.table-heading.ip") }}
-          <i v-if="sortKey === 'Addresses'" :class="sortOrder === 1 ? 'asc' : 'desc'"></i>
-        </th>
-        <th v-if="interfaces.GetSelected.Mode === 'client'" scope="col">
-          {{ $t("interfaces.table-heading.endpoint") }}
-        </th>
-        <th v-if="peers.hasStatistics" scope="col" @click="sortBy('IsConnected')">
-          {{ $t("interfaces.table-heading.status") }}
-          <i v-if="sortKey === 'IsConnected'" :class="sortOrder === 1 ? 'asc' : 'desc'"></i>
-        </th>
-        <th v-if="peers.hasStatistics" scope="col" @click="sortBy('Traffic')">RX/TX
-          <i v-if="sortKey === 'Traffic'" :class="sortOrder === 1 ? 'asc' : 'desc'"></i>
-        </th>
         <th scope="col"></th><!-- Actions -->
       </tr>
       </thead>
@@ -377,9 +345,6 @@ onMounted(async () => {
               <span class="badge rounded-pill bg-light" :title="$t('interfaces.peer-not-connected')"><i class="fa-solid fa-link-slash"></i></span>
             </div>
           </td>
-          <td v-if="peers.hasStatistics" >
-            <span class="text-center" >{{ humanFileSize(peers.Statistics(peer.Identifier).BytesReceived) }} / {{ humanFileSize(peers.Statistics(peer.Identifier).BytesTransmitted) }}</span>
-          </td>
           <td class="text-center">
             <a href="#" :title="$t('interfaces.button-show-peer')" @click.prevent="viewedPeerId=peer.Identifier"><i class="fas fa-eye me-2"></i></a>
             <a href="#" :title="$t('interfaces.button-edit-peer')" @click.prevent="editPeerId=peer.Identifier"><i class="fas fa-cog"></i></a>

frontend/src/views/ProfileView.vue

@@ -1,11 +1,10 @@
 <script setup>
 import PeerViewModal from "../components/PeerViewModal.vue";
 
-import { onMounted, ref } from "vue";
+import {onMounted, ref} from "vue";
-import { profileStore } from "@/stores/profile";
+import {profileStore} from "@/stores/profile";
-import UserPeerEditModal from "@/components/UserPeerEditModal.vue";
+import PeerEditModal from "@/components/PeerEditModal.vue";
-import { settingsStore } from "@/stores/settings";
+import {settingsStore} from "@/stores/settings";
-import { humanFileSize } from "@/helpers/utils";
 
 const settings = settingsStore()
 const profile = profileStore()
@@ -13,40 +12,16 @@ const profile = profileStore()
 const viewedPeerId = ref("")
 const editPeerId = ref("")
 
-const sortKey = ref("");
-const sortOrder = ref(1);
-
-function sortBy(key) {
-  if (sortKey.value === key) {
-    sortOrder.value = sortOrder.value * -1; // Toggle sort order
-  } else {
-    sortKey.value = key;
-    sortOrder.value = 1; // Default to ascending
-  }
-  profile.sortKey = sortKey.value;
-  profile.sortOrder = sortOrder.value;
-}
-
-function friendlyInterfaceName(id, name) {
-  if (name) {
-    return name
-  }
-  return id
-}
-
 onMounted(async () => {
   await profile.LoadUser()
   await profile.LoadPeers()
   await profile.LoadStats()
-  await profile.LoadInterfaces()
-  await profile.calculatePages(); // Forces to show initial page number
 })
-
 </script>
 
 <template>
-  <PeerViewModal :peerId="viewedPeerId" :visible="viewedPeerId !== ''" @close="viewedPeerId = ''"></PeerViewModal>
+  <PeerViewModal :peerId="viewedPeerId" :visible="viewedPeerId!==''" @close="viewedPeerId=''"></PeerViewModal>
-  <UserPeerEditModal :peerId="editPeerId" :visible="editPeerId !== ''" @close="editPeerId = ''; profile.LoadPeers()"></UserPeerEditModal>
+  <PeerEditModal :peerId="editPeerId" :visible="editPeerId!==''" @close="editPeerId=''"></PeerEditModal>
 
   <!-- Peer list -->
   <div class="mt-4 row">
@@ -56,58 +31,33 @@ onMounted(async () => {
     <div class="col-12 col-lg-4 text-lg-end">
       <div class="form-group d-inline">
         <div class="input-group mb-3">
-          <input v-model="profile.filter" class="form-control" :placeholder="$t('general.search.placeholder')" type="text"
+          <input v-model="profile.filter" class="form-control" :placeholder="$t('general.search.placeholder')" type="text" @keyup="profile.afterPageSizeChange">
-            @keyup="profile.afterPageSizeChange">
+          <button class="input-group-text btn btn-primary" :title="$t('general.search.button')"><i class="fa-solid fa-search"></i></button>
-          <button class="input-group-text btn btn-primary" :title="$t('general.search.button')"><i
-              class="fa-solid fa-search"></i></button>
         </div>
       </div>
     </div>
     <div class="col-12 col-lg-3 text-lg-end">
-      <div class="form-group" v-if="settings.Setting('SelfProvisioning')">
+      <a v-if="settings.Setting('SelfProvisioning')" class="btn btn-primary ms-2" href="#" :title="$t('general.search.button-add-peer')" @click.prevent="editPeerId='#NEW#'"><i class="fa fa-plus me-1"></i><i class="fa fa-user"></i></a>
-        <div class="input-group mb-3">
-          <button class="input-group-text btn btn-primary" :title="$t('interfaces.button-add-peer')" @click.prevent="editPeerId = '#NEW#'">
-            <i class="fa fa-plus me-1"></i><i class="fa fa-user"></i>
-          </button>
-          <select v-model="profile.selectedInterfaceId" :disabled="profile.CountInterfaces===0" class="form-select">
-            <option v-if="profile.CountInterfaces===0" value="nothing">{{ $t('interfaces.no-interface.default-selection') }}</option>
-            <option v-for="iface in profile.interfaces" :key="iface.Identifier" :value="iface.Identifier">{{ friendlyInterfaceName(iface.Identifier,iface.DisplayName) }}</option>
-          </select>
-        </div>
-      </div>
     </div>
   </div>
   <div class="mt-2 table-responsive">
-    <div v-if="profile.CountPeers === 0">
+    <div v-if="profile.CountPeers===0">
-      <h4>{{ $t('profile.no-peer.headline') }}</h4>
+    <h4>{{ $t('profile.no-peer.headline') }}</h4>
-      <p>{{ $t('profile.no-peer.abstract') }}</p>
+    <p>{{ $t('profile.no-peer.abstract') }}</p>
     </div>
-    <table v-if="profile.CountPeers !== 0" id="peerTable" class="table table-sm">
+    <table v-if="profile.CountPeers!==0" id="peerTable" class="table table-sm">
       <thead>
-        <tr>
+      <tr>
-          <th scope="col">
+        <th scope="col">
-            <input id="flexCheckDefault" class="form-check-input" :title="$t('general.select-all')" type="checkbox"
+          <input id="flexCheckDefault" class="form-check-input" :title="$t('general.select-all')" type="checkbox" value="">
-              value="">
+        </th><!-- select -->
-          </th><!-- select -->
+        <th scope="col"></th><!-- status -->
-          <th scope="col"></th><!-- status -->
+        <th scope="col">{{ $t('profile.table-heading.name') }}</th>
-          <th scope="col" @click="sortBy('DisplayName')">
+        <th scope="col">{{ $t('profile.table-heading.ip') }}</th>
-            {{ $t("profile.table-heading.name") }}
+        <th v-if="profile.hasStatistics" scope="col">{{ $t('profile.table-heading.stats') }}</th>
-            <i v-if="sortKey === 'DisplayName'" :class="sortOrder === 1 ? 'asc' : 'desc'"></i>
+        <th scope="col">{{ $t('profile.table-heading.interface') }}</th>
-          </th>
+        <th scope="col"></th><!-- Actions -->
-          <th scope="col" @click="sortBy('Addresses')">
+      </tr>
-            {{ $t("profile.table-heading.ip") }}
-            <i v-if="sortKey === 'Addresses'" :class="sortOrder === 1 ? 'asc' : 'desc'"></i>
-          </th>
-          <th v-if="profile.hasStatistics" scope="col" @click="sortBy('IsConnected')">
-            {{ $t("profile.table-heading.stats") }}
-            <i v-if="sortKey === 'IsConnected'" :class="sortOrder === 1 ? 'asc' : 'desc'"></i>
-          </th>
-          <th v-if="profile.hasStatistics" scope="col" @click="sortBy('Traffic')">RX/TX
-            <i v-if="sortKey === 'Traffic'" :class="sortOrder === 1 ? 'asc' : 'desc'"></i>
-          </th>
-          <th scope="col">{{ $t('profile.table-heading.interface') }}</th>
-          <th scope="col"></th><!-- Actions -->
-        </tr>
       </thead>
       <tbody>
         <tr v-for="peer in profile.FilteredAndPagedPeers" :key="peer.Identifier">
@@ -115,34 +65,25 @@ onMounted(async () => {
             <input id="flexCheckDefault" class="form-check-input" type="checkbox" value="">
           </th>
           <td class="text-center">
-            <span v-if="peer.Disabled" class="text-danger"><i class="fa fa-circle-xmark"
+            <span v-if="peer.Disabled" class="text-danger"><i class="fa fa-circle-xmark" :title="peer.DisabledReason"></i></span>
-                :title="peer.DisabledReason"></i></span>
+            <span v-if="!peer.Disabled && peer.ExpiresAt" class="text-warning"><i class="fas fa-hourglass-end" :title="peer.ExpiresAt"></i></span>
-            <span v-if="!peer.Disabled && peer.ExpiresAt" class="text-warning"><i class="fas fa-hourglass-end"
-                :title="peer.ExpiresAt"></i></span>
           </td>
-          <td><span v-if="peer.DisplayName" :title="peer.Identifier">{{ peer.DisplayName }}</span><span v-else
+          <td><span v-if="peer.DisplayName" :title="peer.Identifier">{{peer.DisplayName}}</span><span v-else :title="peer.Identifier">{{$filters.truncate(peer.Identifier, 10)}}</span></td>
-              :title="peer.Identifier">{{ $filters.truncate(peer.Identifier, 10) }}</span></td>
           <td>
             <span v-for="ip in peer.Addresses" :key="ip" class="badge rounded-pill bg-light">{{ ip }}</span>
           </td>
           <td v-if="profile.hasStatistics">
             <div v-if="profile.Statistics(peer.Identifier).IsConnected">
-              <span class="badge rounded-pill bg-success"><i class="fa-solid fa-link"></i></span>
+              <span class="badge rounded-pill bg-success"><i class="fa-solid fa-link"></i></span> <span :title="peers.Statistics(peer.Identifier).LastHandshake">{{ $t('profile.peer-connected') }}</span>
-              <span :title="profile.Statistics(peer.Identifier).LastHandshake">{{ $t('profile.peer-connected') }}</span>
             </div>
             <div v-else>
               <span class="badge rounded-pill bg-light"><i class="fa-solid fa-link-slash"></i></span>
             </div>
           </td>
-          <td v-if="profile.hasStatistics" >
+          <td>{{peer.InterfaceIdentifier}}</td>
-            <span class="text-center" >{{ humanFileSize(profile.Statistics(peer.Identifier).BytesReceived) }} / {{ humanFileSize(profile.Statistics(peer.Identifier).BytesTransmitted) }}</span>
-          </td>
-          <td>{{ peer.InterfaceIdentifier }}</td>
           <td class="text-center">
-            <a href="#" :title="$t('profile.button-show-peer')" @click.prevent="viewedPeerId = peer.Identifier"><i
+            <a href="#" :title="$t('profile.button-show-peer')" @click.prevent="viewedPeerId=peer.Identifier"><i class="fas fa-eye me-2"></i></a>
-                class="fas fa-eye me-2"></i></a>
+            <a href="#" :title="$t('profile.button-edit-peer')" @click.prevent="editPeerId=peer.Identifier"><i class="fas fa-cog"></i></a>
-            <a href="#" :title="$t('profile.button-edit-peer')" @click.prevent="editPeerId = peer.Identifier"><i
-                class="fas fa-cog"></i></a>
           </td>
         </tr>
       </tbody>
@@ -153,34 +94,33 @@ onMounted(async () => {
     <div class="row">
       <div class="col-6">
         <ul class="pagination pagination-sm">
-          <li :class="{ disabled: profile.pageOffset === 0 }" class="page-item">
+          <li :class="{disabled:profile.pageOffset===0}" class="page-item">
             <a class="page-link" @click="profile.previousPage">&laquo;</a>
           </li>
 
-          <li v-for="page in profile.pages" :key="page" :class="{ active: profile.currentPage === page }" class="page-item">
+          <li v-for="page in profile.pages" :key="page" :class="{active:profile.currentPage===page}" class="page-item">
-            <a class="page-link" @click="profile.gotoPage(page)">{{ page }}</a>
+            <a class="page-link" @click="profile.gotoPage(page)">{{page}}</a>
           </li>
 
-          <li :class="{ disabled: !profile.hasNextPage }" class="page-item">
+          <li :class="{disabled:!profile.hasNextPage}" class="page-item">
             <a class="page-link" @click="profile.nextPage">&raquo;</a>
           </li>
         </ul>
       </div>
       <div class="col-6">
         <div class="form-group row">
-          <label class="col-sm-6 col-form-label text-end" for="paginationSelector">
+          <label class="col-sm-6 col-form-label text-end" for="paginationSelector">{{ $t('general.pagination.size') }}:</label>
-            {{ $t('general.pagination.size')}}:
-          </label>
           <div class="col-sm-6">
             <select v-model.number="profile.pageSize" class="form-select" @click="profile.afterPageSizeChange()">
               <option value="10">10</option>
               <option value="25">25</option>
               <option value="50">50</option>
-            <option value="100">100</option>
+              <option value="100">100</option>
-            <option value="999999999">{{ $t('general.pagination.all') }}</option>
+              <option value="999999999">{{ $t('general.pagination.all') }}</option>
-          </select>
+            </select>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div></template>
+</template>

frontend/src/views/SettingsView.vue

@@ -1,77 +0,0 @@
-<script setup>
-import PeerViewModal from "../components/PeerViewModal.vue";
-
-import { onMounted, ref } from "vue";
-import { profileStore } from "@/stores/profile";
-import PeerEditModal from "@/components/PeerEditModal.vue";
-import { settingsStore } from "@/stores/settings";
-import { humanFileSize } from "@/helpers/utils";
-import {RouterLink} from "vue-router";
-import {authStore} from "../stores/auth";
-
-const profile = profileStore()
-const settings = settingsStore()
-const auth = authStore()
-
-onMounted(async () => {
-  await profile.LoadUser()
-})
-
-</script>
-
-<template>
-  <div class="page-header">
-    <h1>{{ $t('settings.headline') }}</h1>
-  </div>
-
-  <p class="lead">{{ $t('settings.abstract') }}</p>
-
-  <div v-if="auth.IsAdmin || !settings.Setting('ApiAdminOnly')">
-    <div class="bg-light p-5" v-if="profile.user.ApiToken">
-      <h2 class="display-7">{{ $t('settings.api.headline') }}</h2>
-      <p class="lead">{{ $t('settings.api.abstract') }}</p>
-      <hr class="my-4">
-      <p>{{ $t('settings.api.active-description') }}</p>
-      <div class="row">
-        <div class="col-6">
-          <div class="form-group">
-            <label class="form-label mt-4">{{ $t('settings.api.user-label') }}</label>
-            <input v-model="profile.user.Identifier" class="form-control" :placeholder="$t('settings.api.user-placeholder')" type="text" readonly>
-          </div>
-        </div>
-        <div class="col-6">
-          <div class="form-group">
-            <label class="form-label mt-4">{{ $t('settings.api.token-label') }}</label>
-            <input v-model="profile.user.ApiToken" class="form-control" :placeholder="$t('settings.api.token-placeholder')" type="text" readonly>
-          </div>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-12">
-          <div class="form-group">
-            <p class="form-label mt-4">{{ $t('settings.api.token-created-label') }} {{profile.user.ApiTokenCreated}}</p>
-          </div>
-        </div>
-      </div>
-      <div class="row mt-5">
-        <div class="col-6">
-          <button class="input-group-text btn btn-primary" :title="$t('settings.api.button-disable-title')" @click.prevent="profile.disableApi()" :disabled="profile.isFetching">
-            <i class="fa-solid fa-minus-circle"></i> {{ $t('settings.api.button-disable-text') }}
-          </button>
-        </div>
-        <div class="col-6">
-          <a href="/api/v1/doc.html" target="_blank" :alt="$t('settings.api.api-link')">{{ $t('settings.api.api-link') }}</a>
-        </div>
-      </div>
-    </div>
-    <div class="bg-light p-5" v-else>
-      <h2 class="display-7">{{ $t('settings.api.headline') }}</h2>
-      <p class="lead">{{ $t('settings.api.abstract') }}</p>
-      <hr class="my-4">
-      <p>{{ $t('settings.api.inactive-description') }}</p>
-      <button class="input-group-text btn btn-primary" :title="$t('settings.api.button-enable-title')" @click.prevent="profile.enableApi()" :disabled="profile.isFetching">
-        <i class="fa-solid fa-plus-circle"></i> {{ $t('settings.api.button-enable-text') }}
-      </button>
-    </div>
-  </div>
-</template>

frontend/vite.config.js

@@ -12,8 +12,7 @@ export default defineConfig({
     }
   },
   build: {
-    //
+    outDir: '../internal/app/api/core/frontend-dist',
-    outDir: process.env.DIST_OUT_DIR || '../internal/app/api/core/frontend-dist',
     emptyOutDir: true
   },
   // local dev api (proxy to avoid cors problems)

go.mod

@@ -1,118 +1,108 @@
 module github.com/h44z/wg-portal
 
-go 1.23
+go 1.21
 
 require (
-	github.com/a8m/envsubst v1.4.2
+	github.com/coreos/go-oidc/v3 v3.9.0
-	github.com/coreos/go-oidc/v3 v3.12.0
+	github.com/gin-contrib/cors v1.5.0
-	github.com/gin-contrib/cors v1.7.3
+	github.com/gin-contrib/sessions v0.0.5
-	github.com/gin-contrib/sessions v1.0.2
+	github.com/gin-gonic/gin v1.9.1
-	github.com/gin-gonic/gin v1.10.0
+	github.com/glebarez/sqlite v1.10.0
-	github.com/glebarez/sqlite v1.11.0
+	github.com/go-ldap/ldap/v3 v3.4.6
-	github.com/go-ldap/ldap/v3 v3.4.10
+	github.com/prometheus-community/pro-bing v0.3.0
-	github.com/google/uuid v1.6.0
-	github.com/prometheus-community/pro-bing v0.5.0
-	github.com/prometheus/client_golang v1.20.5
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.10.0
+	github.com/stretchr/testify v1.8.4
-	github.com/swaggo/swag v1.16.4
+	github.com/swaggo/swag v1.16.2
 	github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f
 	github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca
 	github.com/vardius/message-bus v1.1.5
-	github.com/vishvananda/netlink v1.3.0
+	github.com/vishvananda/netlink v1.1.0
 	github.com/xhit/go-simple-mail/v2 v2.16.0
-	github.com/yeqown/go-qrcode/v2 v2.2.4
+	github.com/yeqown/go-qrcode/v2 v2.2.2
-	golang.org/x/crypto v0.32.0
+	golang.org/x/crypto v0.17.0
-	golang.org/x/oauth2 v0.25.0
+	golang.org/x/oauth2 v0.15.0
-	golang.org/x/sys v0.29.0
+	golang.org/x/sys v0.15.0
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10
+	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
 	gopkg.in/yaml.v2 v2.4.0
-	gorm.io/driver/mysql v1.5.7
+	gorm.io/driver/mysql v1.5.2
-	gorm.io/driver/postgres v1.5.11
+	gorm.io/driver/postgres v1.5.4
-	gorm.io/driver/sqlserver v1.5.4
+	gorm.io/driver/sqlserver v1.5.2
-	gorm.io/gorm v1.25.12
+	gorm.io/gorm v1.25.5
 )
 
 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bytedance/sonic v1.10.2 // indirect
-	github.com/bytedance/sonic v1.12.7 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
-	github.com/bytedance/sonic/loader v0.2.2 // indirect
+	github.com/chenzhuoyu/iasm v0.9.1 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dchest/uniuri v1.2.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
-	github.com/gin-contrib/sse v1.0.0 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/glebarez/go-sqlite v1.22.0 // indirect
+	github.com/glebarez/go-sqlite v1.21.2 // indirect
-	github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
+	github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
-	github.com/go-jose/go-jose/v4 v4.0.4 // indirect
+	github.com/go-jose/go-jose/v3 v3.0.1 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.20.4 // indirect
-	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/spec v0.20.13 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/swag v0.22.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.24.0 // indirect
+	github.com/go-playground/validator/v10 v10.16.0 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
-	github.com/go-test/deep v1.1.1 // indirect
+	github.com/go-test/deep v1.1.0 // indirect
-	github.com/goccy/go-json v0.10.4 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/gorilla/context v1.1.2 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
-	github.com/gorilla/sessions v1.4.0 // indirect
+	github.com/gorilla/sessions v1.2.2 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
-	github.com/jackc/pgx/v5 v5.7.2 // indirect
+	github.com/jackc/pgx/v5 v5.5.1 // indirect
-	github.com/jackc/puddle/v2 v2.2.2 // indirect
+	github.com/jackc/puddle/v2 v2.2.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/josharian/native v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.6 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mdlayher/genetlink v1.3.2 // indirect
 	github.com/mdlayher/netlink v1.7.2 // indirect
-	github.com/mdlayher/socket v0.5.1 // indirect
+	github.com/mdlayher/socket v0.5.0 // indirect
-	github.com/microsoft/go-mssqldb v1.8.0 // indirect
+	github.com/microsoft/go-mssqldb v1.6.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
-	github.com/ncruces/go-strftime v0.1.9 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.61.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/stretchr/objx v0.5.1 // indirect
-	github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92 // indirect
+	github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
-	github.com/vishvananda/netns v0.0.5 // indirect
+	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/yeqown/reedsolomon v1.0.0 // indirect
-	golang.org/x/arch v0.13.0 // indirect
+	golang.org/x/arch v0.6.0 // indirect
-	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
+	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sync v0.5.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/tools v0.16.1 // indirect
-	golang.org/x/tools v0.29.0 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
-	google.golang.org/protobuf v1.36.2 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.61.7 // indirect
+	modernc.org/libc v1.38.0 // indirect
-	modernc.org/mathutil v1.7.1 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
-	modernc.org/memory v1.8.1 // indirect
+	modernc.org/memory v1.7.2 // indirect
-	modernc.org/sqlite v1.34.4 // indirect
+	modernc.org/sqlite v1.28.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )

go.sum

@@ -1,51 +1,43 @@
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0/go.mod h1:ON4tFdPTwRcgWEaVDrN3584Ef+b7GgSJaXxe5fW9t4M=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1 h1:/iHxaJhsFr0+xVFfbMr5vxz848jyiWuIEDhYq3y5odY=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1/go.mod h1:RKUqNu35KJYcVG/fqTRqmuXJZYNhYkBrnC/hX7yGbTA=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 h1:E+OJmp2tPvt1W+amx48v1eqbjDYsgN+RzP4q16yV5eM=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U=
-github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1/go.mod h1:uE9zaUfEQT/nbQjVi2IblCG9iaLtZsuYZ8ne+PuQ02M=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.2.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMivxiS2iYFZsgDbU9OnnJ163x5UGVKYo=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 h1:U2rTu3Ef+7w9FHKIAXM6ZyqF3UOWJZ12zIm8zECAFfg=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.0 h1:yfJe15aSwEQ6Oo6J+gdfdulPNoZ3TEhmbhLIoxZcA+U=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.0/go.mod h1:Q28U+75mpCaSCDowNEmhIo/rmgdkqmkmzI7N6TGR4UY=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v0.8.0 h1:T028gtTPiYt/RMUfs8nVsAL7FDQrfLlrm/NnRG/zcC4=
-github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1 h1:MyVTgWR8qd/Jw1Le0NZebGBUCLbtak3bJ3z1OlqZBpw=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v0.8.0/go.mod h1:cw4zVQgBby0Z5f2v0itn6se2dDP17nTjbZFXW5uPyHA=
-github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY=
-github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occbWoio4EBLkbkevetNMAVX197GkzbUMtqjGWn80=
-github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
 github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0 h1:HCc0+LpPfpCKs6LGGLAhwBARt9632unrVcI6i8s/8os=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
-github.com/a8m/envsubst v1.4.2 h1:4yWIHXOLEJHQEFd4UjrWDrYeYlV7ncFWJOCBRLOZHQg=
+github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 h1:Kk6a4nehpJ3UuJRqlA3JxYxBZEqCeOmATOvrbT4p9RA=
-github.com/a8m/envsubst v1.4.2/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
+github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
-github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
-github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw=
 github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=
 github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
-github.com/bytedance/sonic v1.12.7 h1:CQU8pxOy9HToxhndH0Kx/S1qU/CuS9GnKYrGioDcU1Q=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.12.7/go.mod h1:tnbal4mxOMju17EGfknm2XyYcpyCnIROYOEYuemj13I=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
-github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
+github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
-github.com/bytedance/sonic/loader v0.2.2 h1:jxAJuN9fOot/cyz5Q6dUuMJF5OqQ6+5GfA8FjjQ0R4o=
+github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
-github.com/bytedance/sonic/loader v0.2.2/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
-github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
-github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
-github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
+github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
-github.com/coreos/go-oidc/v3 v3.12.0 h1:sJk+8G2qq94rDI6ehZ71Bol3oUHy63qNYmkiSjrc/Jo=
+github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
-github.com/coreos/go-oidc/v3 v3.12.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
+github.com/coreos/go-oidc/v3 v3.9.0 h1:0J/ogVOd4y8P0f0xUh8l9t07xRP/d8tccvjHl2dcsSo=
+github.com/coreos/go-oidc/v3 v3.9.0/go.mod h1:rTKz2PYwftcrtoCzV5g5kvfJoWcm0Mk8AF8y1iAQro4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -56,76 +48,82 @@ github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
+github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
-github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
+github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
 github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
-github.com/gin-contrib/cors v1.7.3 h1:hV+a5xp8hwJoTw7OY+a70FsL8JkVVFTXw9EcfrYUdns=
+github.com/gin-contrib/cors v1.5.0 h1:DgGKV7DDoOn36DFkNtbHrjoRiT5ExCe+PC9/xp7aKvk=
-github.com/gin-contrib/cors v1.7.3/go.mod h1:M3bcKZhxzsvI+rlRSkkxHyljJt1ESd93COUvemZ79j4=
+github.com/gin-contrib/cors v1.5.0/go.mod h1:TvU7MAZ3EwrPLI2ztzTt3tqgvBCq+wn8WpZmfADjupI=
 github.com/gin-contrib/sessions v0.0.0-20190101140330-dc5246754963/go.mod h1:4lkInX8nHSR62NSmhXM3xtPeMSyfiR58NaEz+om1lHM=
-github.com/gin-contrib/sessions v1.0.2 h1:UaIjUvTH1cMeOdj3in6dl+Xb6It8RiKRF9Z1anbUyCA=
+github.com/gin-contrib/sessions v0.0.5 h1:CATtfHmLMQrMNpJRgzjWXD7worTh7g7ritsQfmF+0jE=
-github.com/gin-contrib/sessions v1.0.2/go.mod h1:KxKxWqWP5LJVDCInulOl4WbLzK2KSPlLesfZ66wRvMs=
+github.com/gin-contrib/sessions v0.0.5/go.mod h1:vYAuaUPqie3WUSsft6HUlCjlwwoJQs97miaG2+7neKY=
 github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
-github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y=
-github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
-github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
+github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
-github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
+github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
-github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
+github.com/glebarez/sqlite v1.10.0 h1:u4gt8y7OND/cCei/NMHmfbLxF6xP2wgKcT/BJf2pYkc=
-github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
+github.com/glebarez/sqlite v1.10.0/go.mod h1:IJ+lfSOmiekhQsFTJRx/lHtGYmCdtAiTaf5wI9u5uHA=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/go-asn1-ber/asn1-ber v1.5.7 h1:DTX+lbVTWaTw1hQ+PbZPlnDZPEIs0SS/GCZAl535dDk=
+github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA=
-github.com/go-asn1-ber/asn1-ber v1.5.7/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E=
+github.com/go-jose/go-jose/v3 v3.0.1 h1:pWmKFVtt+Jl0vBZTIpz/eAKwsm6LkIxDVVbFHKkchhA=
-github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc=
+github.com/go-jose/go-jose/v3 v3.0.1/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
-github.com/go-ldap/ldap/v3 v3.4.10 h1:ot/iwPOhfpNVgB1o+AVXljizWZ9JTp7YF5oeyONmcJU=
+github.com/go-ldap/ldap/v3 v3.4.6 h1:ert95MdbiG7aWo/oPYp9btL3KJlMPKnP58r09rI8T+A=
-github.com/go-ldap/ldap/v3 v3.4.10/go.mod h1:JXh4Uxgi40P6E9rdsYqpUtbW46D9UTjJ9QSwGRznplY=
+github.com/go-ldap/ldap/v3 v3.4.6/go.mod h1:IGMQANNtxpsOzj7uUAMjpGBaOVTC4DYyIy8VsTdxmtc=
-github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
+github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
-github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
+github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
-github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
+github.com/go-openapi/jsonreference v0.20.4 h1:bKlDxQxQJgwpUSgOENiMPzCTBVuc7vTdXSSgNeAhojU=
-github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
+github.com/go-openapi/jsonreference v0.20.4/go.mod h1:5pZJyJP2MnYCpoeoMAql78cCHauHj0V9Lhc506VOpw4=
-github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
+github.com/go-openapi/spec v0.20.13 h1:XJDIN+dLH6vqXgafnl5SUIMnzaChQ6QTo0/UPMbkIaE=
-github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
+github.com/go-openapi/spec v0.20.13/go.mod h1:8EOhTpBoFiask8rrgwbLC3zmJfz4zsCUueRuPM6GNkw=
-github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
+github.com/go-openapi/swag v0.22.6 h1:dnqg1XfHXL9aBxSbktBqFR5CxVyVI+7fYWhAf1JOeTw=
-github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
+github.com/go-openapi/swag v0.22.6/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.24.0 h1:KHQckvo8G6hlWnrPX4NJJ+aBfWNAE/HH+qdL2cBpCmg=
+github.com/go-playground/validator/v10 v10.16.0 h1:x+plE831WK4vaKHO/jpgUGsvLKIqRRkz6M78GuJAfGE=
-github.com/go-playground/validator/v10 v10.24.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus=
+github.com/go-playground/validator/v10 v10.16.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
+github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
-github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
+github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
-github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
+github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
+github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
-github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
-github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
 github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
-github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
 github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/context v1.1.2 h1:WRkNAv2uoa03QNIc1A6u4O7DAGMUVoopZhkiXWA2V1o=
 github.com/gorilla/context v1.1.2/go.mod h1:KDPwT9i/MeWHiLl90fuTgrt4/wPcv75vFAZLaOOcbxM=
@@ -135,30 +133,23 @@ github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pw
 github.com/gorilla/sessions v1.1.1/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
+github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
-github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
+github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.7.2 h1:mLoDLV6sonKlvjIEsV56SkWNCnuNv531l94GaIzO+XI=
+github.com/jackc/pgx/v5 v5.5.1 h1:5I9etrGkLrN+2XPCsi6XLlV5DITbSL/xBZdmAxFcXPI=
-github.com/jackc/pgx/v5 v5.7.2/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsbsfGQ=
+github.com/jackc/pgx/v5 v5.5.1/go.mod h1:Ig06C2Vu0t5qXC60W8sqIthScaEnFvojjj9dSljmHRA=
-github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
+github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
-github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
 github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
-github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
 github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
-github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg=
 github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
-github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
 github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
-github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
 github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
-github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
 github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
@@ -172,11 +163,9 @@ github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kidstuff/mongostore v0.0.0-20181113001930-e650cd85ee4b/go.mod h1:g2nVr8KZVXJSS97Jo8pJ0jgq29P6H7dG0oplUA86MQw=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -187,10 +176,10 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
-github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
@@ -198,12 +187,11 @@ github.com/mdlayher/genetlink v1.3.2 h1:KdrNKe+CTu+IbZnm/GVUMXSqBBLqcGpRDa0xkQy5
 github.com/mdlayher/genetlink v1.3.2/go.mod h1:tcC3pkCrPUGIKKsCsp0B3AdaaKuHtaxoJRz3cc+528o=
 github.com/mdlayher/netlink v1.7.2 h1:/UtM3ofJap7Vl4QWCPDGXY8d3GIY2UGSDbK+QWmY8/g=
 github.com/mdlayher/netlink v1.7.2/go.mod h1:xraEF7uJbxLhc5fpHL4cPe221LI2bdttWlU+ZGLfQSw=
-github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
+github.com/mdlayher/socket v0.5.0 h1:ilICZmJcQz70vrWVes1MFera4jGiWNocSkykwwoy3XI=
-github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
+github.com/mdlayher/socket v0.5.0/go.mod h1:WkcBFfvyG8QENs5+hfQPl1X6Jpd2yeLIYgrGFmJiJxI=
 github.com/memcachier/mc v2.0.1+incompatible/go.mod h1:7bkvFE61leUBvXz+yxsOnGBQSZpBSPIMUQSmmSHvuXc=
-github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
+github.com/microsoft/go-mssqldb v1.6.0 h1:mM3gYdVwEPFrlg/Dvr2DNVEgYFG7L42l+dGc67NNNpc=
-github.com/microsoft/go-mssqldb v1.8.0 h1:7cyZ/AT7ycDsEoWPIXibd+aVKFtteUNhDGf3aobP+tw=
+github.com/microsoft/go-mssqldb v1.6.0/go.mod h1:00mDtPbeQCRGC1HwOOR5K/gr30P1NcEG0vx6Kbv2aJU=
-github.com/microsoft/go-mssqldb v1.8.0/go.mod h1:6znkekS3T2vp0waiMhen4GPU1BiAsrP+iXHcE7a7rFo=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721 h1:RlZweED6sbSArvlE924+mUcZuXKLBHA35U7LN621Bws=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -214,27 +202,14 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
 github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/pelletier/go-toml/v2 v2.1.1 h1:LWAJwfNvjQZCFIDKWYQaM62NcYeYViCmWIwmOStowAI=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/pelletier/go-toml/v2 v2.1.1/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
-github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
+github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
-github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
-github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
-github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus-community/pro-bing v0.5.0 h1:Fq+4BUXKIvsPtXUY8K+04ud9dkAuFozqGmRAyNUpffY=
+github.com/prometheus-community/pro-bing v0.3.0 h1:SFT6gHqXwbItEDJhTkzPWVqU6CLEtqEfNAPp47RUON4=
-github.com/prometheus-community/pro-bing v0.5.0/go.mod h1:1joR9oXdMEAcAJJvhs+8vNDvTg5thfAZcRFhcUozG2g=
+github.com/prometheus-community/pro-bing v0.3.0/go.mod h1:p9dLb9zdmv+eLxWfCT6jESWuDrS+YzpPkQBgysQF8a0=
-github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
-github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
-github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/quasoft/memstore v0.0.0-20180925164028-84a050167438/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg=
 github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b h1:aUNXCGgukb4gtY99imuIeoh8Vr0GSwAlYxPAhqZrpFc=
 github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg=
@@ -247,25 +222,25 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0=
-github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/swaggo/swag v1.16.2 h1:28Pp+8DkQoV+HLzLx8RGJZXNGKbFqnuvSbAAtoxiY04=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/swaggo/swag v1.16.2/go.mod h1:6YzXnDcpr0767iOejs318CwYkCQqyGer6BizOg03f+E=
-github.com/swaggo/swag v1.16.4 h1:clWJtd9LStiG3VeijiCfOVODP6VpHtKdQy9ELFG3s1A=
-github.com/swaggo/swag v1.16.4/go.mod h1:VBsHJRsDvfYvqoiMKnsdwhNV9LEMHgEDZcyVYX0sxPg=
 github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f h1:oqdnd6OGlOUu1InG37hWcCB3a+Jy3fwjylyVboaNMwY=
 github.com/toorop/gin-logrus v0.0.0-20210225092905-2c785434f26f/go.mod h1:X3Dd1SB8Gt1V968NTzpKFjMM6O8ccta2NPC6MprOxZQ=
+github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 h1:PM5hJF7HVfNWmCjMdEfbuOBNXSVF2cMFGgQTPdKCbwM=
 github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns=
-github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92 h1:flbMkdl6HxQkLs6DDhH1UkcnFpNBOu70391STjMS0O4=
-github.com/toorop/go-dkim v0.0.0-20240103092955-90b7d1423f92/go.mod h1:BzWtXXrXzZUvMacR0oF/fbDDgUPO8L36tDMmRAf14ns=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
@@ -275,142 +250,112 @@ github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca h1:lpvAjPK+PcxnbcB
 github.com/utrack/gin-csrf v0.0.0-20190424104817-40fb8d2c8fca/go.mod h1:XXKxNbpoLihvvT7orUZbs/iZayg1n4ip7iJakJPAwA8=
 github.com/vardius/message-bus v1.1.5 h1:YSAC2WB4HRlwc4neFPTmT88kzzoiQ+9WRRbej/E/LZc=
 github.com/vardius/message-bus v1.1.5/go.mod h1:6xladCV2lMkUAE4bzzS85qKOiB5miV7aBVRafiTJGqw=
-github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=
+github.com/vishvananda/netlink v1.1.0 h1:1iyaYNBLmP6L0220aDnYQpo1QEV4t4hJ+xEEhhJH8j0=
-github.com/vishvananda/netlink v1.3.0/go.mod h1:i6NetklAujEcC6fK0JPjT8qSwWyO0HLn4UKG+hGqeJs=
+github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
+github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
+github.com/vishvananda/netns v0.0.4 h1:Oeaw1EM2JMxD51g9uhtC0D7erkIjgmj8+JZc26m1YX8=
 github.com/vishvananda/netns v0.0.4/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
-github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
-github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
 github.com/xhit/go-simple-mail/v2 v2.16.0 h1:ouGy/Ww4kuaqu2E2UrDw7SvLaziWTB60ICLkIkNVccA=
 github.com/xhit/go-simple-mail/v2 v2.16.0/go.mod h1:b7P5ygho6SYE+VIqpxA6QkYfv4teeyG4MKqB3utRu98=
-github.com/yeqown/go-qrcode/v2 v2.2.4 h1:cXdYlrhzHzVAnJHiwr/T6lAUmS9MtEStjEZBjArrvnc=
+github.com/yeqown/go-qrcode/v2 v2.2.2 h1:0comk6jEwi0oWNhKEmzx4JI+Q7XIneAApmFSMKWmSVc=
-github.com/yeqown/go-qrcode/v2 v2.2.4/go.mod h1:uHpt9CM0V1HeXLz+Wg5MN50/sI/fQhfkZlOM+cOTHxw=
+github.com/yeqown/go-qrcode/v2 v2.2.2/go.mod h1:2Qsk2APUCPne0TsRo40DIkI5MYnbzYKCnKGEFWrxd24=
 github.com/yeqown/reedsolomon v1.0.0 h1:x1h/Ej/uJnNu8jaX7GLHBWmZKCAWjEJTetkqaabr4B0=
 github.com/yeqown/reedsolomon v1.0.0/go.mod h1:P76zpcn2TCuL0ul1Fso373qHRc69LKwAw/Iy6g1WiiM=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-golang.org/x/arch v0.13.0 h1:KCkqVVV1kGg0X87TFysjCJ8MxtZEIU4Ja/yXGeoECdA=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.13.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
+golang.org/x/arch v0.6.0 h1:S0JTfE48HbRj80+4tbvZDYsJ3tGv6BUU3XxyZ7CirAc=
+golang.org/x/arch v0.6.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
-golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA=
-golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM=
-golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
-golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
-golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
 golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
-golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
-golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
-golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE=
-golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 h1:/jFs0duh4rdb8uIfPMv78iAJGcPKDeqAFnaLBropIC4=
 golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173/go.mod h1:tkCQ4FQXmpAgYVh++1cq16/dH4QJtmvpRv19DWGAHSA=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10 h1:3GDAcqdIg1ozBNLgPy4SLT84nfcBjr6rhGtXYtrkWLU=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 h1:CawjfCvYQH2OU3/TnxLx97WDSUDRABfT18pCOYwc2GE=
-golang.zx2c4.com/wireguard/wgctrl v0.0.0-20241231184526-a9ab2273dd10/go.mod h1:T97yPqesLiNrOYxkwmhMI0ZIlJDm+p0PMR8eRVeR5tQ=
+golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6/go.mod h1:3rxYc4HtVcSG9gVaTs2GEBdehh+sYPOwKtyUWEOTb80=
-google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
+google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
-google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
+google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -426,40 +371,25 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
+gorm.io/driver/mysql v1.5.2 h1:QC2HRskSE75wBuOxe0+iCkyJZ+RqpudsQtqkp+IMuXs=
-gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/driver/mysql v1.5.2/go.mod h1:pQLhh1Ut/WUAySdTHwBpBv6+JKcj+ua4ZFx1QQTBzb8=
-gorm.io/driver/postgres v1.5.11 h1:ubBVAfbKEUld/twyKZ0IYn9rSQh448EdelLYk9Mv314=
+gorm.io/driver/postgres v1.5.4 h1:Iyrp9Meh3GmbSuyIAGyjkN+n9K+GHX9b9MqsTL4EJCo=
-gorm.io/driver/postgres v1.5.11/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
+gorm.io/driver/postgres v1.5.4/go.mod h1:Bgo89+h0CRcdA33Y6frlaHHVuTdOf87pmyzwW9C/BH0=
-gorm.io/driver/sqlserver v1.5.4 h1:xA+Y1KDNspv79q43bPyjDMUgHoYHLhXYmdFcYPobg8g=
+gorm.io/driver/sqlserver v1.5.2 h1:+o4RQ8w1ohPbADhFqDxeeZnSWjwOcBnxBckjTbcP4wk=
-gorm.io/driver/sqlserver v1.5.4/go.mod h1:+frZ/qYmuna11zHPlh5oc2O6ZA/lS88Keb0XSH1Zh/g=
+gorm.io/driver/sqlserver v1.5.2/go.mod h1:gaKF0MO0cfTq9Q3/XhkowSw4g6nIwHPGAs4hzKCmvBo=
-gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.2-0.20230610234218-206613868439/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
-gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
+gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
-modernc.org/cc/v4 v4.24.4 h1:TFkx1s6dCkQpd6dKurBNmpo+G8Zl4Sq/ztJ+2+DEsh0=
+modernc.org/libc v1.38.0 h1:o4Lpk0zNDSdsjfEXnF1FGXWQ9PDi1NOdWcLP5n13FGo=
-modernc.org/cc/v4 v4.24.4/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/libc v1.38.0/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
-modernc.org/ccgo/v4 v4.23.10 h1:DnDZT/H6TtoJvQmVf7d8W+lVqEZpIJY/+0ENFh1LIHE=
+modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
-modernc.org/ccgo/v4 v4.23.10/go.mod h1:vdN4h2WR5aEoNondUx26K7G8X+nuBscYnAEWSRmN2/0=
+modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
+modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
-modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
+modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
-modernc.org/gc/v2 v2.6.1 h1:+Qf6xdG8l7B27TQ8D8lw/iFMUj1RXRBOuMUWziJOsk8=
+modernc.org/sqlite v1.28.0 h1:Zx+LyDDmXczNnEQdvPuEfcFVA2ZPyaD7UCZDjef3BHQ=
-modernc.org/gc/v2 v2.6.1/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
+modernc.org/sqlite v1.28.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
-modernc.org/libc v1.61.7 h1:exz8rasFniviSgh3dH7QBnQHqYh9lolA5hVYfsiwkfo=
-modernc.org/libc v1.61.7/go.mod h1:xspSrXRNVSfWfcfqgvZDVe/Hw5kv4FVC6IRfoms5v/0=
-modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
-modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
-modernc.org/memory v1.8.1 h1:HS1HRg1jEohnuONobEq2WrLEhLyw8+J42yLFTnllm2A=
-modernc.org/memory v1.8.1/go.mod h1:ZbjSvMO5NQ1A2i3bWeDiVMxIorXwdClKE/0SZ+BMotU=
-modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
-modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
-modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
-modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
-modernc.org/sqlite v1.34.4 h1:sjdARozcL5KJBvYQvLlZEmctRgW9xqIZc2ncN7PU0P8=
-modernc.org/sqlite v1.34.4/go.mod h1:3QQFCG2SEMtc2nv+Wq4cQCH7Hjcg+p/RMlS1XK+zwbk=
-modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
-modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
-modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
-modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
 sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

internal/adapters/database.go

@@ -4,15 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
 	"github.com/sirupsen/logrus"
 	"gorm.io/gorm/clause"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/utils"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
 
 	"github.com/glebarez/sqlite"
 	"github.com/h44z/wg-portal/internal/config"
@@ -205,8 +204,7 @@ func (r *SqlRepo) preCheck() error {
 		return nil // we probably don't have a V1 database =)
 	}
 
-	return fmt.Errorf("detected a WireGuard Portal V1 database (version: %s) - please migrate first",
+	return fmt.Errorf("detected a WireGuard Portal V1 database (version: %s) - please migrate first", lastVersion.Version)
-		lastVersion.Version)
 }
 
 func (r *SqlRepo) migrate() error {
@@ -251,11 +249,7 @@ func (r *SqlRepo) GetInterface(ctx context.Context, id domain.InterfaceIdentifie
 	return &in, nil
 }
 
-func (r *SqlRepo) GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (
+func (r *SqlRepo) GetInterfaceAndPeers(ctx context.Context, id domain.InterfaceIdentifier) (*domain.Interface, []domain.Peer, error) {
-	*domain.Interface,
-	[]domain.Peer,
-	error,
-) {
 	in, err := r.GetInterface(ctx, id)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to load interface: %w", err)
@@ -295,30 +289,6 @@ func (r *SqlRepo) GetAllInterfaces(ctx context.Context) ([]domain.Interface, err
 	return interfaces, nil
 }
 
-func (r *SqlRepo) GetInterfaceStats(ctx context.Context, id domain.InterfaceIdentifier) (
-	*domain.InterfaceStatus,
-	error,
-) {
-	if id == "" {
-		return nil, nil
-	}
-
-	var stats []domain.InterfaceStatus
-
-	err := r.db.WithContext(ctx).Where("identifier = ?", id).Find(&stats).Error
-	if err != nil {
-		return nil, err
-	}
-
-	if len(stats) == 0 {
-		return nil, domain.ErrNotFound
-	}
-
-	stat := stats[0]
-
-	return &stat, nil
-}
-
 func (r *SqlRepo) FindInterfaces(ctx context.Context, search string) ([]domain.Interface, error) {
 	var users []domain.Interface
 
@@ -335,11 +305,7 @@ func (r *SqlRepo) FindInterfaces(ctx context.Context, search string) ([]domain.I
 	return users, nil
 }
 
-func (r *SqlRepo) SaveInterface(
+func (r *SqlRepo) SaveInterface(ctx context.Context, id domain.InterfaceIdentifier, updateFunc func(in *domain.Interface) (*domain.Interface, error)) error {
-	ctx context.Context,
-	id domain.InterfaceIdentifier,
-	updateFunc func(in *domain.Interface) (*domain.Interface, error),
-) error {
 	userInfo := domain.GetUserInfo(ctx)
 	err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		in, err := r.getOrCreateInterface(userInfo, tx, id)
@@ -367,11 +333,7 @@ func (r *SqlRepo) SaveInterface(
 	return nil
 }
 
-func (r *SqlRepo) getOrCreateInterface(
+func (r *SqlRepo) getOrCreateInterface(ui *domain.ContextUserInfo, tx *gorm.DB, id domain.InterfaceIdentifier) (*domain.Interface, error) {
-	ui *domain.ContextUserInfo,
-	tx *gorm.DB,
-	id domain.InterfaceIdentifier,
-) (*domain.Interface, error) {
 	var in domain.Interface
 
 	// interfaceDefaults will be applied to newly created interface records
@@ -487,10 +449,7 @@ func (r *SqlRepo) GetInterfacePeers(ctx context.Context, id domain.InterfaceIden
 	return peers, nil
 }
 
-func (r *SqlRepo) FindInterfacePeers(ctx context.Context, id domain.InterfaceIdentifier, search string) (
+func (r *SqlRepo) FindInterfacePeers(ctx context.Context, id domain.InterfaceIdentifier, search string) ([]domain.Peer, error) {
-	[]domain.Peer,
-	error,
-) {
 	var peers []domain.Peer
 
 	searchValue := "%" + strings.ToLower(search) + "%"
@@ -533,11 +492,7 @@ func (r *SqlRepo) FindUserPeers(ctx context.Context, id domain.UserIdentifier, s
 	return peers, nil
 }
 
-func (r *SqlRepo) SavePeer(
+func (r *SqlRepo) SavePeer(ctx context.Context, id domain.PeerIdentifier, updateFunc func(in *domain.Peer) (*domain.Peer, error)) error {
-	ctx context.Context,
-	id domain.PeerIdentifier,
-	updateFunc func(in *domain.Peer) (*domain.Peer, error),
-) error {
 	userInfo := domain.GetUserInfo(ctx)
 	err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		peer, err := r.getOrCreatePeer(userInfo, tx, id)
@@ -565,10 +520,7 @@ func (r *SqlRepo) SavePeer(
 	return nil
 }
 
-func (r *SqlRepo) getOrCreatePeer(ui *domain.ContextUserInfo, tx *gorm.DB, id domain.PeerIdentifier) (
+func (r *SqlRepo) getOrCreatePeer(ui *domain.ContextUserInfo, tx *gorm.DB, id domain.PeerIdentifier) (*domain.Peer, error) {
-	*domain.Peer,
-	error,
-) {
 	var peer domain.Peer
 
 	// interfaceDefaults will be applied to newly created interface records
@@ -649,10 +601,7 @@ func (r *SqlRepo) GetPeerIps(ctx context.Context) (map[domain.PeerIdentifier][]d
 	return result, nil
 }
 
-func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr) (
+func (r *SqlRepo) GetUsedIpsPerSubnet(ctx context.Context, subnets []domain.Cidr) (map[domain.Cidr][]domain.Cidr, error) {
-	map[domain.Cidr][]domain.Cidr,
-	error,
-) {
 	var peerIps []struct {
 		domain.Cidr
 		PeerId domain.PeerIdentifier `gorm:"column:peer_identifier"`
@@ -722,30 +671,6 @@ func (r *SqlRepo) GetUser(ctx context.Context, id domain.UserIdentifier) (*domai
 	return &user, nil
 }
 
-func (r *SqlRepo) GetUserByEmail(ctx context.Context, email string) (*domain.User, error) {
-	var users []domain.User
-
-	err := r.db.WithContext(ctx).Where("email = ?", email).Find(&users).Error
-	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, domain.ErrNotFound
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	if len(users) == 0 {
-		return nil, domain.ErrNotFound
-	}
-
-	if len(users) > 1 {
-		return nil, fmt.Errorf("found multiple users with email %s: %w", email, domain.ErrNotUnique)
-	}
-
-	user := users[0]
-
-	return &user, nil
-}
-
 func (r *SqlRepo) GetAllUsers(ctx context.Context) ([]domain.User, error) {
 	var users []domain.User
 
@@ -774,11 +699,7 @@ func (r *SqlRepo) FindUsers(ctx context.Context, search string) ([]domain.User,
 	return users, nil
 }
 
-func (r *SqlRepo) SaveUser(
+func (r *SqlRepo) SaveUser(ctx context.Context, id domain.UserIdentifier, updateFunc func(u *domain.User) (*domain.User, error)) error {
-	ctx context.Context,
-	id domain.UserIdentifier,
-	updateFunc func(u *domain.User) (*domain.User, error),
-) error {
 	userInfo := domain.GetUserInfo(ctx)
 
 	err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
@@ -816,10 +737,7 @@ func (r *SqlRepo) DeleteUser(ctx context.Context, id domain.UserIdentifier) erro
 	return nil
 }
 
-func (r *SqlRepo) getOrCreateUser(ui *domain.ContextUserInfo, tx *gorm.DB, id domain.UserIdentifier) (
+func (r *SqlRepo) getOrCreateUser(ui *domain.ContextUserInfo, tx *gorm.DB, id domain.UserIdentifier) (*domain.User, error) {
-	*domain.User,
-	error,
-) {
 	var user domain.User
 
 	// userDefaults will be applied to newly created user records
@@ -859,11 +777,7 @@ func (r *SqlRepo) upsertUser(ui *domain.ContextUserInfo, tx *gorm.DB, user *doma
 
 // region statistics
 
-func (r *SqlRepo) UpdateInterfaceStatus(
+func (r *SqlRepo) UpdateInterfaceStatus(ctx context.Context, id domain.InterfaceIdentifier, updateFunc func(in *domain.InterfaceStatus) (*domain.InterfaceStatus, error)) error {
-	ctx context.Context,
-	id domain.InterfaceIdentifier,
-	updateFunc func(in *domain.InterfaceStatus) (*domain.InterfaceStatus, error),
-) error {
 	err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		in, err := r.getOrCreateInterfaceStatus(tx, id)
 		if err != nil {
@@ -890,10 +804,7 @@ func (r *SqlRepo) UpdateInterfaceStatus(
 	return nil
 }
 
-func (r *SqlRepo) getOrCreateInterfaceStatus(tx *gorm.DB, id domain.InterfaceIdentifier) (
+func (r *SqlRepo) getOrCreateInterfaceStatus(tx *gorm.DB, id domain.InterfaceIdentifier) (*domain.InterfaceStatus, error) {
-	*domain.InterfaceStatus,
-	error,
-) {
 	var in domain.InterfaceStatus
 
 	// defaults will be applied to newly created record
@@ -919,11 +830,7 @@ func (r *SqlRepo) upsertInterfaceStatus(tx *gorm.DB, in *domain.InterfaceStatus)
 	return nil
 }
 
-func (r *SqlRepo) UpdatePeerStatus(
+func (r *SqlRepo) UpdatePeerStatus(ctx context.Context, id domain.PeerIdentifier, updateFunc func(in *domain.PeerStatus) (*domain.PeerStatus, error)) error {
-	ctx context.Context,
-	id domain.PeerIdentifier,
-	updateFunc func(in *domain.PeerStatus) (*domain.PeerStatus, error),
-) error {
 	err := r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 		in, err := r.getOrCreatePeerStatus(tx, id)
 		if err != nil {
@@ -976,15 +883,6 @@ func (r *SqlRepo) upsertPeerStatus(tx *gorm.DB, in *domain.PeerStatus) error {
 	return nil
 }
 
-func (r *SqlRepo) DeletePeerStatus(ctx context.Context, id domain.PeerIdentifier) error {
-	err := r.db.WithContext(ctx).Delete(&domain.PeerStatus{}, id).Error
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 // endregion statistics
 
 // region audit

internal/adapters/metrics.go

@@ -1,135 +0,0 @@
-package adapters
-
-import (
-	"context"
-	"net/http"
-	"time"
-
-	"github.com/h44z/wg-portal/internal"
-	"github.com/h44z/wg-portal/internal/config"
-	"github.com/h44z/wg-portal/internal/domain"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/sirupsen/logrus"
-)
-
-type MetricsServer struct {
-	*http.Server
-
-	ifaceReceivedBytesTotal  *prometheus.GaugeVec
-	ifaceSendBytesTotal      *prometheus.GaugeVec
-	peerIsConnected          *prometheus.GaugeVec
-	peerLastHandshakeSeconds *prometheus.GaugeVec
-	peerReceivedBytesTotal   *prometheus.GaugeVec
-	peerSendBytesTotal       *prometheus.GaugeVec
-}
-
-// Wireguard metrics labels
-var (
-	ifaceLabels = []string{"interface"}
-	peerLabels  = []string{"interface", "addresses", "id", "name"}
-)
-
-// NewMetricsServer returns a new prometheus server
-func NewMetricsServer(cfg *config.Config) *MetricsServer {
-	reg := prometheus.NewRegistry()
-
-	mux := http.NewServeMux()
-	mux.Handle("/metrics", promhttp.HandlerFor(reg, promhttp.HandlerOpts{Registry: reg}))
-
-	return &MetricsServer{
-		Server: &http.Server{
-			Addr:    cfg.Statistics.ListeningAddress,
-			Handler: mux,
-		},
-
-		ifaceReceivedBytesTotal: promauto.With(reg).NewGaugeVec(
-			prometheus.GaugeOpts{
-				Name: "wireguard_interface_received_bytes_total",
-				Help: "Bytes received througth the interface.",
-			}, ifaceLabels,
-		),
-		ifaceSendBytesTotal: promauto.With(reg).NewGaugeVec(
-			prometheus.GaugeOpts{
-				Name: "wireguard_interface_sent_bytes_total",
-				Help: "Bytes sent through the interface.",
-			}, ifaceLabels,
-		),
-
-		peerIsConnected: promauto.With(reg).NewGaugeVec(
-			prometheus.GaugeOpts{
-				Name: "wireguard_peer_up",
-				Help: "Peer connection state (boolean: 1/0).",
-			}, peerLabels,
-		),
-		peerLastHandshakeSeconds: promauto.With(reg).NewGaugeVec(
-			prometheus.GaugeOpts{
-				Name: "wireguard_peer_last_handshake_seconds",
-				Help: "Seconds from the last handshake with the peer.",
-			}, peerLabels,
-		),
-		peerReceivedBytesTotal: promauto.With(reg).NewGaugeVec(
-			prometheus.GaugeOpts{
-				Name: "wireguard_peer_received_bytes_total",
-				Help: "Bytes received from the peer.",
-			}, peerLabels,
-		),
-		peerSendBytesTotal: promauto.With(reg).NewGaugeVec(
-			prometheus.GaugeOpts{
-				Name: "wireguard_peer_sent_bytes_total",
-				Help: "Bytes sent to the peer.",
-			}, peerLabels,
-		),
-	}
-}
-
-// Run starts the metrics server
-func (m *MetricsServer) Run(ctx context.Context) {
-	// Run the metrics server in a goroutine
-	go func() {
-		if err := m.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-			logrus.Errorf("metrics service on %s exited: %v", m.Addr, err)
-		}
-	}()
-
-	logrus.Infof("started metrics service on %s", m.Addr)
-
-	// Wait for the context to be done
-	<-ctx.Done()
-
-	// Create a context with timeout for the shutdown process
-	shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	// Attempt to gracefully shutdown the metrics server
-	if err := m.Shutdown(shutdownCtx); err != nil {
-		logrus.Errorf("metrics service on %s shutdown failed: %v", m.Addr, err)
-	} else {
-		logrus.Infof("metrics service on %s shutdown gracefully", m.Addr)
-	}
-}
-
-// UpdateInterfaceMetrics updates the metrics for the given interface
-func (m *MetricsServer) UpdateInterfaceMetrics(status domain.InterfaceStatus) {
-	labels := []string{string(status.InterfaceId)}
-	m.ifaceReceivedBytesTotal.WithLabelValues(labels...).Set(float64(status.BytesReceived))
-	m.ifaceSendBytesTotal.WithLabelValues(labels...).Set(float64(status.BytesTransmitted))
-}
-
-// UpdatePeerMetrics updates the metrics for the given peer
-func (m *MetricsServer) UpdatePeerMetrics(peer *domain.Peer, status domain.PeerStatus) {
-	labels := []string{
-		string(peer.InterfaceIdentifier),
-		string(peer.Interface.AddressStr()),
-		string(status.PeerId),
-		string(peer.DisplayName),
-	}
-
-	if status.LastHandshake != nil {
-		m.peerLastHandshakeSeconds.WithLabelValues(labels...).Set(float64(status.LastHandshake.Unix()))
-	}
-	m.peerReceivedBytesTotal.WithLabelValues(labels...).Set(float64(status.BytesReceived))
-	m.peerSendBytesTotal.WithLabelValues(labels...).Set(float64(status.BytesTransmitted))
-	m.peerIsConnected.WithLabelValues(labels...).Set(internal.BoolToFloat64(status.IsConnected()))
-}

internal/adapters/wgquick.go

@@ -3,12 +3,11 @@ package adapters
 import (
 	"bytes"
 	"fmt"
-	"os/exec"
-	"strings"
-
 	"github.com/h44z/wg-portal/internal"
 	"github.com/h44z/wg-portal/internal/domain"
 	"github.com/sirupsen/logrus"
+	"os/exec"
+	"strings"
 )
 
 // WgQuickRepo implements higher level wg-quick like interactions like setting DNS, routing tables or interface hooks.
@@ -29,7 +28,6 @@ func (r *WgQuickRepo) ExecuteInterfaceHook(id domain.InterfaceIdentifier, hookCm
 		return nil
 	}
 
-	logrus.Tracef("interface %s: executing hook %s", id, hookCmd)
 	err := r.exec(hookCmd, id)
 	if err != nil {
 		return fmt.Errorf("failed to exec hook: %w", err)
@@ -58,10 +56,7 @@ func (r *WgQuickRepo) SetDNS(id domain.InterfaceIdentifier, dnsStr, dnsSearchStr
 
 	err := r.exec(dnsCommand, id, dnsCommandInput...)
 	if err != nil {
-		return fmt.Errorf(
+		return fmt.Errorf("failed to set dns settings: %w", err)
-			"failed to set dns settings (is resolvconf available?, for systemd create this symlink: ln -s /usr/bin/resolvectl /usr/local/bin/resolvconf): %w",
-			err,
-		)
 	}
 
 	return nil

internal/adapters/wireguard.go

@@ -4,13 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
-
 	"github.com/h44z/wg-portal/internal/domain"
 	"github.com/h44z/wg-portal/internal/lowlevel"
 	"github.com/vishvananda/netlink"
 	"golang.zx2c4.com/wireguard/wgctrl"
 	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"os"
 )
 
 // WgRepo implements all low-level WireGuard interactions.
@@ -75,11 +74,7 @@ func (r *WgRepo) GetPeers(_ context.Context, deviceId domain.InterfaceIdentifier
 	return peers, nil
 }
 
-func (r *WgRepo) GetPeer(
+func (r *WgRepo) GetPeer(_ context.Context, deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) (*domain.PhysicalPeer, error) {
-	_ context.Context,
-	deviceId domain.InterfaceIdentifier,
-	id domain.PeerIdentifier,
-) (*domain.PhysicalPeer, error) {
 	return r.getPeer(deviceId, id)
 }
 
@@ -95,7 +90,7 @@ func (r *WgRepo) convertWireGuardInterface(device *wgtypes.Device) (domain.Physi
 		ListenPort:    device.ListenPort,
 		Addresses:     nil,
 		Mtu:           0,
-		FirewallMark:  uint32(device.FirewallMark),
+		FirewallMark:  int32(device.FirewallMark),
 		DeviceUp:      false,
 		ImportSource:  "wgctrl",
 		DeviceType:    device.Type.String(),
@@ -156,11 +151,7 @@ func (r *WgRepo) convertWireGuardPeer(peer *wgtypes.Peer) (domain.PhysicalPeer,
 	return peerModel, nil
 }
 
-func (r *WgRepo) SaveInterface(
+func (r *WgRepo) SaveInterface(_ context.Context, id domain.InterfaceIdentifier, updateFunc func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error)) error {
-	_ context.Context,
-	id domain.InterfaceIdentifier,
-	updateFunc func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error),
-) error {
 	physicalInterface, err := r.getOrCreateInterface(id)
 	if err != nil {
 		return err
@@ -333,12 +324,7 @@ func (r *WgRepo) deleteLowLevelInterface(id domain.InterfaceIdentifier) error {
 	return nil
 }
 
-func (r *WgRepo) SavePeer(
+func (r *WgRepo) SavePeer(_ context.Context, deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier, updateFunc func(pp *domain.PhysicalPeer) (*domain.PhysicalPeer, error)) error {
-	_ context.Context,
-	deviceId domain.InterfaceIdentifier,
-	id domain.PeerIdentifier,
-	updateFunc func(pp *domain.PhysicalPeer) (*domain.PhysicalPeer, error),
-) error {
 	physicalPeer, err := r.getOrCreatePeer(deviceId, id)
 	if err != nil {
 		return err
@@ -356,10 +342,7 @@ func (r *WgRepo) SavePeer(
 	return nil
 }
 
-func (r *WgRepo) getOrCreatePeer(deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) (
+func (r *WgRepo) getOrCreatePeer(deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) (*domain.PhysicalPeer, error) {
-	*domain.PhysicalPeer,
-	error,
-) {
 	peer, err := r.getPeer(deviceId, id)
 	if err == nil {
 		return peer, nil
@@ -369,13 +352,9 @@ func (r *WgRepo) getOrCreatePeer(deviceId domain.InterfaceIdentifier, id domain.
 	}
 
 	// create new peer
-	err = r.wg.ConfigureDevice(string(deviceId), wgtypes.Config{
+	err = r.wg.ConfigureDevice(string(deviceId), wgtypes.Config{Peers: []wgtypes.PeerConfig{{
-		Peers: []wgtypes.PeerConfig{
+		PublicKey: id.ToPublicKey(),
-			{
+	}}})
-				PublicKey: id.ToPublicKey(),
-			},
-		},
-	})
 
 	peer, err = r.getPeer(deviceId, id)
 	return peer, nil

internal/adapters/wireguard_mikrotik.go

@@ -0,0 +1,413 @@
+package adapters
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"github.com/h44z/wg-portal/internal/domain"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+)
+
+var MikrotikDeviceType = "mikrotik"
+
+// WgMikrotikRepo implements all low-level WireGuard interactions using the Mikrotik REST API.
+// It uses the API endpoints described in https://help.mikrotik.com/docs/display/ROS/REST+API
+type WgMikrotikRepo struct {
+	apiClient *http.Client
+	baseUrl   string
+	user      string
+	pass      string
+}
+
+func NewWgMikrotikRepo(baseUrl, user, pass string) *WgMikrotikRepo {
+	apiClient := &http.Client{
+		Timeout: 30 * time.Second,
+	}
+
+	return &WgMikrotikRepo{
+		apiClient: apiClient,
+		baseUrl:   baseUrl,
+		user:      user,
+		pass:      pass,
+	}
+}
+
+func (w *WgMikrotikRepo) getFullUrl(endpoint string) string {
+	return w.baseUrl + endpoint
+}
+
+func (w *WgMikrotikRepo) getRequest(ctx context.Context, method, endpoint string) (*http.Request, error) {
+	url := w.getFullUrl(endpoint)
+	req, err := http.NewRequestWithContext(ctx, method, url, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to build REST request: %w", err)
+	}
+	req.SetBasicAuth(w.user, w.pass)
+	req.Header.Set("Accept", "application/json")
+
+	return req, nil
+}
+
+func closeHttpResponse(response *http.Response) {
+	if response != nil && response.Body != nil {
+		_ = response.Body.Close()
+	}
+}
+
+func parseResponseError(response *http.Response) map[string]string {
+	var restData map[string]string
+	_ = json.NewDecoder(response.Body).Decode(&restData)
+	return restData
+}
+
+func (w *WgMikrotikRepo) fetchList(ctx context.Context, endpoint string) ([]map[string]string, error) {
+	req, err := w.getRequest(ctx, http.MethodGet, endpoint)
+	if err != nil {
+		return nil, fmt.Errorf("failed to build REST request for endpoint %s: %w", endpoint, err)
+	}
+
+	response, err := w.apiClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to execute REST request %s: %w", req.URL.String(), err)
+	}
+	defer closeHttpResponse(response)
+
+	if response.StatusCode != http.StatusOK {
+		errData := parseResponseError(response)
+		return nil, fmt.Errorf("REST request %s returned status %d: %v", req.URL.String(), response.StatusCode, errData)
+	}
+
+	var restData []map[string]string // mikrotik API always returns values as strings
+	err = json.NewDecoder(response.Body).Decode(&restData)
+	if err != nil {
+		return nil, fmt.Errorf("failed to decode REST response: %w", err)
+	}
+
+	return restData, nil
+}
+
+func (w *WgMikrotikRepo) fetchObject(ctx context.Context, endpoint string) (map[string]string, error) {
+	req, err := w.getRequest(ctx, http.MethodGet, endpoint)
+	if err != nil {
+		return nil, fmt.Errorf("failed to build REST request for endpoint %s: %w", endpoint, err)
+	}
+
+	response, err := w.apiClient.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to execute REST request %s: %w", req.URL.String(), err)
+	}
+	defer closeHttpResponse(response)
+
+	if response.StatusCode != http.StatusOK {
+		errData := parseResponseError(response)
+		return nil, fmt.Errorf("REST request %s returned status %d: %v", req.URL.String(), response.StatusCode, errData)
+	}
+
+	var restData map[string]string // mikrotik API always returns values as strings
+	err = json.NewDecoder(response.Body).Decode(&restData)
+	if err != nil {
+		return nil, fmt.Errorf("failed to decode REST response: %w", err)
+	}
+
+	return restData, nil
+}
+
+func (w *WgMikrotikRepo) deleteObject(ctx context.Context, endpoint string) error {
+	req, err := w.getRequest(ctx, http.MethodDelete, endpoint)
+	if err != nil {
+		return fmt.Errorf("failed to build REST request for endpoint %s: %w", endpoint, err)
+	}
+
+	response, err := w.apiClient.Do(req)
+	if err != nil {
+		return fmt.Errorf("failed to execute REST request %s: %w", req.URL.String(), err)
+	}
+	defer closeHttpResponse(response)
+
+	if response.StatusCode != http.StatusNoContent {
+		errData := parseResponseError(response)
+		return fmt.Errorf("REST request %s returned status %d: %v", req.URL.String(), response.StatusCode, errData)
+	}
+
+	return nil
+}
+
+func (w *WgMikrotikRepo) createObject(ctx context.Context, endpoint string, data map[string]string) (map[string]string, error) {
+	panic("implement me")
+}
+
+func (w *WgMikrotikRepo) GetInterfaces(ctx context.Context) ([]domain.PhysicalInterface, error) {
+	restInterfaces, err := w.fetchList(ctx, "/interface/wireguard")
+	if err != nil {
+		return nil, fmt.Errorf("failed to get interfaces: %w", err)
+	}
+
+	restIPv4, err := w.fetchList(ctx, "/ip/address")
+	if err != nil {
+		return nil, fmt.Errorf("failed to get IPv4 addresses: %w", err)
+	}
+
+	restIPv6, err := w.fetchList(ctx, "/ipv6/address")
+	if err != nil {
+		return nil, fmt.Errorf("failed to get IPv6 addresses: %w", err)
+	}
+
+	var interfaces []domain.PhysicalInterface
+	for _, restInterface := range restInterfaces {
+		iface, err := w.parseInterfaceData(restInterface, restIPv4, restIPv6)
+		if err != nil {
+			continue
+		}
+
+		interfaces = append(interfaces, iface)
+	}
+
+	return interfaces, nil
+}
+
+func (w *WgMikrotikRepo) GetInterface(ctx context.Context, id domain.InterfaceIdentifier) (*domain.PhysicalInterface, error) {
+	restInterface, err := w.fetchObject(ctx, "/interface/wireguard/"+string(id))
+	if err != nil {
+		return nil, fmt.Errorf("failed to get interface %s: %w", id, err)
+	}
+
+	restIPv4, err := w.fetchList(ctx, "/ip/address")
+	if err != nil {
+		return nil, fmt.Errorf("failed to get IPv4 addresses: %w", err)
+	}
+
+	restIPv6, err := w.fetchList(ctx, "/ipv6/address")
+	if err != nil {
+		return nil, fmt.Errorf("failed to get IPv6 addresses: %w", err)
+	}
+
+	iface, err := w.parseInterfaceData(restInterface, restIPv4, restIPv6)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse interface data: %w", err)
+	}
+
+	return &iface, nil
+}
+
+func (w *WgMikrotikRepo) parseInterfaceData(restInterface map[string]string, restIPv4, restIPv6 []map[string]string) (domain.PhysicalInterface, error) {
+	mtu, err := strconv.Atoi(restInterface["mtu"])
+	if err != nil {
+		mtu = 0 // ignore invalid mtu value, use default
+	}
+	listenPort, err := strconv.Atoi(restInterface["listen-port"])
+	if err != nil {
+		mtu = 0 // ignore invalid mtu value, use default
+	}
+	deviceDisabled, err := strconv.ParseBool(restInterface["disabled"])
+	if err != nil {
+		deviceDisabled = true // ignore invalid device-up value, use default
+	}
+	deviceRunning, err := strconv.ParseBool(restInterface["running"])
+	if err != nil {
+		deviceRunning = false // ignore invalid device-up value, use default
+	}
+
+	var addresses []domain.Cidr
+	for _, addr := range restIPv4 {
+		if addr["interface"] == restInterface["name"] {
+			cidr, err := domain.CidrFromString(addr["address"])
+			if err != nil {
+				continue
+			}
+			addresses = append(addresses, cidr)
+		}
+	}
+	for _, addr := range restIPv6 {
+		if addr["interface"] == restInterface["name"] {
+			if strings.HasPrefix(addr["address"], "fe80:") {
+				continue // ignore link-local addresses
+			}
+			cidr, err := domain.CidrFromString(addr["address"])
+			if err != nil {
+				continue
+			}
+			addresses = append(addresses, cidr)
+		}
+	}
+
+	iface := domain.PhysicalInterface{
+		Identifier: domain.InterfaceIdentifier(restInterface["name"]),
+		KeyPair: domain.KeyPair{
+			PrivateKey: restInterface["private-key"],
+			PublicKey:  restInterface["public-key"],
+		},
+		ListenPort:    listenPort,
+		Addresses:     addresses,
+		Mtu:           mtu,
+		FirewallMark:  0,
+		DeviceUp:      !deviceDisabled && deviceRunning,
+		ImportSource:  "",
+		DeviceType:    MikrotikDeviceType,
+		BytesUpload:   0,
+		BytesDownload: 0,
+	}
+	return iface, nil
+}
+
+func (w *WgMikrotikRepo) GetPeers(ctx context.Context, deviceId domain.InterfaceIdentifier) ([]domain.PhysicalPeer, error) {
+	restPeers, err := w.fetchList(ctx, "/interface/wireguard/peers?interface="+string(deviceId))
+	if err != nil {
+		return nil, fmt.Errorf("failed to get peers for %s: %w", deviceId, err)
+	}
+
+	var peers []domain.PhysicalPeer
+	for _, restPeer := range restPeers {
+		peer, err := w.parsePeerData(restPeer)
+		if err != nil {
+			continue
+		}
+
+		peers = append(peers, peer)
+	}
+
+	return peers, nil
+}
+
+func (w *WgMikrotikRepo) GetPeer(ctx context.Context, deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) (*domain.PhysicalPeer, error) {
+	restPeers, err := w.fetchList(ctx, "/interface/wireguard/peers?interface="+string(deviceId)+"&public-key="+string(id))
+	if err != nil {
+		return nil, fmt.Errorf("failed to get peers for %s: %w", deviceId, err)
+	}
+	if len(restPeers) != 1 {
+		return nil, fmt.Errorf("failed to get peer %s on device %s: got %d entries", id, deviceId, len(restPeers))
+	}
+	restPeer := restPeers[0]
+
+	peer, err := w.parsePeerData(restPeer)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse peer data: %w", err)
+	}
+
+	return &peer, nil
+}
+
+func (w *WgMikrotikRepo) parsePeerData(restPeer map[string]string) (domain.PhysicalPeer, error) {
+	endpoint := restPeer["current-endpoint-address"]
+	if restPeer["current-endpoint-port"] != "" && restPeer["current-endpoint-port"] != "0" {
+		endpoint = endpoint + ":" + restPeer["current-endpoint-port"]
+	}
+
+	keepAlive, _ := time.ParseDuration(restPeer["persistent-keepalive"])
+	lastHandshake, _ := time.ParseDuration(restPeer["last-handshake"])
+	var lastHandshakeTime time.Time
+	if lastHandshake > 0 {
+		lastHandshakeTime = time.Now().Add(-lastHandshake)
+	}
+
+	rxBytes, _ := strconv.ParseUint(restPeer["rx"], 10, 64)
+	txBytes, _ := strconv.ParseUint(restPeer["tx"], 10, 64)
+
+	peerDisabled, err := strconv.ParseBool(restPeer["disabled"])
+	if err != nil {
+		peerDisabled = true // ignore invalid device-up value, use default
+	}
+
+	if peerDisabled {
+		return domain.PhysicalPeer{}, fmt.Errorf("peer is disabled")
+	}
+
+	allowedIPs, _ := domain.CidrsFromString(restPeer["allowed-address"])
+
+	peer := domain.PhysicalPeer{
+		Identifier: domain.PeerIdentifier(restPeer["public-key"]),
+		Endpoint:   endpoint,
+		AllowedIPs: allowedIPs,
+		KeyPair: domain.KeyPair{
+			PrivateKey: restPeer["private-key"],
+			PublicKey:  restPeer["public-key"],
+		},
+		PresharedKey:        domain.PreSharedKey(restPeer["preshared-key"]),
+		PersistentKeepalive: int(keepAlive.Seconds()),
+		LastHandshake:       lastHandshakeTime,
+		ProtocolVersion:     0,
+		BytesUpload:         rxBytes,
+		BytesDownload:       txBytes,
+	}
+
+	return peer, nil
+}
+
+func (w *WgMikrotikRepo) SaveInterface(_ context.Context, id domain.InterfaceIdentifier, updateFunc func(pi *domain.PhysicalInterface) (*domain.PhysicalInterface, error)) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (w *WgMikrotikRepo) DeleteInterface(ctx context.Context, id domain.InterfaceIdentifier) error {
+	restIPv4, err := w.fetchList(ctx, "/ip/address?interface="+string(id))
+	if err != nil {
+		return fmt.Errorf("failed to get IPv4 addresses: %w", err)
+	}
+	for _, addr := range restIPv4 {
+		err = w.deleteObject(ctx, "/ip/address/"+addr[".id"])
+		if err != nil {
+			return fmt.Errorf("failed to delete IPv4 address %s: %w", addr["address"], err)
+		}
+	}
+
+	restIPv6, err := w.fetchList(ctx, "/ipv6/address?interface="+string(id))
+	if err != nil {
+		return fmt.Errorf("failed to get IPv6 addresses: %w", err)
+	}
+	for _, addr := range restIPv6 {
+		err = w.deleteObject(ctx, "/ipv6/address/"+addr[".id"])
+		if err != nil {
+			return fmt.Errorf("failed to delete IPv6 address %s: %w", addr["address"], err)
+		}
+	}
+
+	restPeers, err := w.fetchList(ctx, "/interface/wireguard/peers?interface="+string(id))
+	if err != nil {
+		return fmt.Errorf("failed to get peers for %s: %w", id, err)
+	}
+	for _, restPeer := range restPeers {
+		err = w.DeletePeer(ctx, id, domain.PeerIdentifier(restPeer["public-key"]))
+		if err != nil {
+			return fmt.Errorf("failed to delete peer %s: %w", restPeer["public-key"], err)
+		}
+	}
+
+	restInterface, err := w.fetchObject(ctx, "/interface/wireguard/"+string(id)+"?.proplist=.id")
+	if err != nil {
+		return fmt.Errorf("failed to get interface %s: %w", id, err)
+	}
+
+	err = w.deleteObject(ctx, "/interface/wireguard/"+restInterface[".id"])
+	if err != nil {
+		return fmt.Errorf("failed to delete interface %s: %w", id, err)
+	}
+
+	return nil
+}
+
+func (w *WgMikrotikRepo) SavePeer(_ context.Context, deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier, updateFunc func(pp *domain.PhysicalPeer) (*domain.PhysicalPeer, error)) error {
+	//TODO implement me
+	panic("implement me")
+}
+
+func (w *WgMikrotikRepo) DeletePeer(_ context.Context, deviceId domain.InterfaceIdentifier, id domain.PeerIdentifier) error {
+	restPeers, err := w.fetchList(context.Background(), "/interface/wireguard/peers?interface="+string(deviceId)+"&public-key="+string(id)+"&.proplist=.id")
+	if err != nil {
+		return fmt.Errorf("failed to get peer %s on device %s: %w", id, deviceId, err)
+	}
+
+	if len(restPeers) != 1 {
+		return fmt.Errorf("failed to get peer %s on device %s: got %d entries", id, deviceId, len(restPeers))
+	}
+
+	restPeer := restPeers[0]
+
+	err = w.deleteObject(context.Background(), "/interface/wireguard/peers/"+restPeer[".id"])
+	if err != nil {
+		return fmt.Errorf("failed to delete peer %s on device %s: %w", id, deviceId, err)
+	}
+
+	return nil
+}

internal/adapters/wireguard_mikrotik_integration_test.go

@@ -0,0 +1,56 @@
+//go:build integration
+
+package adapters
+
+import (
+	"context"
+	"github.com/h44z/wg-portal/internal/domain"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+var (
+	MikrotikUrl  = "http://10.234.2.1/rest"
+	MikrotikUser = "integtest"
+	MikrotikPass = "SuperS3cret!"
+)
+
+func TestWgMikrotikRepo_GetInterfaces(t *testing.T) {
+	w := NewWgMikrotikRepo(MikrotikUrl, MikrotikUser, MikrotikPass)
+	got, err := w.GetInterfaces(context.Background())
+	assert.NoError(t, err)
+	assert.Equalf(t, 3, len(got), "GetInterfaces()")
+}
+
+func TestWgMikrotikRepo_GetInterface(t *testing.T) {
+	w := NewWgMikrotikRepo(MikrotikUrl, MikrotikUser, MikrotikPass)
+	got, err := w.GetInterface(context.Background(), "wgUser")
+	assert.NoError(t, err)
+	assert.Equalf(t, domain.InterfaceIdentifier("wgUser"), got.Identifier, "GetInterface()")
+}
+
+func TestWgMikrotikRepo_GetPeers(t *testing.T) {
+	w := NewWgMikrotikRepo(MikrotikUrl, MikrotikUser, MikrotikPass)
+	got, err := w.GetPeers(context.Background(), "wgUser")
+	assert.NoError(t, err)
+	assert.Equalf(t, 4, len(got), "GetPeers()")
+}
+
+func TestWgMikrotikRepo_GetPeer(t *testing.T) {
+	w := NewWgMikrotikRepo(MikrotikUrl, MikrotikUser, MikrotikPass)
+	got, err := w.GetPeer(context.Background(), "wgUser", "Ytfq6plqkOo95HAUYGrjiG3GU352NahLYLnE1cItDkI=")
+	assert.NoError(t, err)
+	assert.Equalf(t, domain.PeerIdentifier("Ytfq6plqkOo95HAUYGrjiG3GU352NahLYLnE1cItDkI="), got.Identifier, "GetPeer()")
+}
+
+func TestWgMikrotikRepo_DeleteInterface(t *testing.T) {
+	w := NewWgMikrotikRepo(MikrotikUrl, MikrotikUser, MikrotikPass)
+	err := w.DeleteInterface(context.Background(), "wgTest")
+	assert.NoError(t, err)
+}
+
+func TestWgMikrotikRepo_DeletePeer(t *testing.T) {
+	w := NewWgMikrotikRepo(MikrotikUrl, MikrotikUser, MikrotikPass)
+	err := w.DeletePeer(context.Background(), "wgTest", "qlFPZUOwt+SheTatRdIr0yGrTffyPEvzE3EeKVArgn8=")
+	assert.NoError(t, err)
+}

internal/app/api/core/assets/doc/v0_swagger.json

@@ -1,8 +1,8 @@
 {
     "swagger": "2.0",
     "info": {
-        "description": "WireGuard Portal API - UI Endpoints",
+        "description": "WireGuard Portal API - a testing API endpoint",
-        "title": "WireGuard Portal SPA-UI API",
+        "title": "WireGuard Portal API",
         "contact": {
             "name": "WireGuard Portal Developers",
             "url": "https://github.com/h44z/wg-portal"
@@ -175,26 +175,6 @@
                 }
             }
         },
-        "/config/settings": {
-            "get": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Configuration"
-                ],
-                "summary": "Get the frontend settings object.",
-                "operationId": "config_handleSettingsGet",
-                "responses": {
-                    "200": {
-                        "description": "The JavaScript contents",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        },
         "/csrf": {
             "get": {
                 "produces": [
@@ -519,91 +499,6 @@
                 }
             }
         },
-        "/interface/{id}/apply-peer-defaults": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Interface"
-                ],
-                "summary": "Apply all peer defaults to the available peers.",
-                "operationId": "interfaces_handleApplyPeerDefaultsPost",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "The interface identifier",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "description": "The interface data",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/model.Interface"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "No content if applying peer defaults was successful"
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    }
-                }
-            }
-        },
-        "/interface/{id}/save-config": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Interface"
-                ],
-                "summary": "Save the interface configuration in wg-quick format to a file.",
-                "operationId": "interfaces_handleSaveConfigPost",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "The interface identifier",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "No content if saving the configuration was successful"
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    }
-                }
-            }
-        },
         "/now": {
             "get": {
                 "description": "Nothing more to describe...",
@@ -631,50 +526,9 @@
                 }
             }
         },
-        "/peer/config-mail": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Peer"
-                ],
-                "summary": "Send peer configuration via email.",
-                "operationId": "peers_handleEmailPost",
-                "parameters": [
-                    {
-                        "description": "The peer mail request data",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/model.PeerMailRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "No content if mail sending was successful"
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    }
-                }
-            }
-        },
         "/peer/config-qr/{id}": {
             "get": {
                 "produces": [
-                    "image/png",
                     "application/json"
                 ],
                 "tags": [
@@ -682,20 +536,11 @@
                 ],
                 "summary": "Get peer configuration as qr code.",
                 "operationId": "peers_handleQrCodeGet",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "The peer identifier",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "type": "file"
+                            "type": "string"
                         }
                     },
                     "400": {
@@ -723,15 +568,6 @@
                 ],
                 "summary": "Get peer configuration as string.",
                 "operationId": "peers_handleConfigGet",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "The peer identifier",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -798,59 +634,6 @@
                 }
             }
         },
-        "/peer/iface/{iface}/multiplenew": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Peer"
-                ],
-                "summary": "Create multiple new peers for the given interface.",
-                "operationId": "peers_handleCreateMultiplePost",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "The interface identifier",
-                        "name": "iface",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "description": "The peer creation request data",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/model.MultiPeerRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "array",
-                            "items": {
-                                "$ref": "#/definitions/model.Peer"
-                            }
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    }
-                }
-            }
-        },
         "/peer/iface/{iface}/new": {
             "post": {
                 "produces": [
@@ -942,47 +725,6 @@
                 }
             }
         },
-        "/peer/iface/{iface}/stats": {
-            "get": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Peer"
-                ],
-                "summary": "Get peer stats for the given interface.",
-                "operationId": "peers_handleStatsGet",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "The interface identifier",
-                        "name": "iface",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/model.PeerStats"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    }
-                }
-            }
-        },
         "/peer/{id}": {
             "get": {
                 "produces": [
@@ -1299,70 +1041,6 @@
                 }
             }
         },
-        "/user/{id}/api/disable": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Users"
-                ],
-                "summary": "Disable the REST API for the given user.",
-                "operationId": "users_handleApiDisablePost",
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/model.User"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    }
-                }
-            }
-        },
-        "/user/{id}/api/enable": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Users"
-                ],
-                "summary": "Enable the REST API for the given user.",
-                "operationId": "users_handleApiEnablePost",
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/model.User"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    }
-                }
-            }
-        },
         "/user/{id}/peers": {
             "get": {
                 "produces": [
@@ -1383,44 +1061,6 @@
                             }
                         }
                     },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    }
-                }
-            }
-        },
-        "/user/{id}/stats": {
-            "get": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Users"
-                ],
-                "summary": "Get peer stats for the given user.",
-                "operationId": "users_handleStatsGet",
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/model.PeerStats"
-                        }
-                    },
-                    "400": {
-                        "description": "Bad Request",
-                        "schema": {
-                            "$ref": "#/definitions/model.Error"
-                        }
-                    },
                     "500": {
                         "description": "Internal Server Error",
                         "schema": {
@@ -1432,53 +1072,6 @@
         }
     },
     "definitions": {
-        "model.ConfigOption-array_string": {
-            "type": "object",
-            "properties": {
-                "Overridable": {
-                    "type": "boolean"
-                },
-                "Value": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            }
-        },
-        "model.ConfigOption-int": {
-            "type": "object",
-            "properties": {
-                "Overridable": {
-                    "type": "boolean"
-                },
-                "Value": {
-                    "type": "integer"
-                }
-            }
-        },
-        "model.ConfigOption-string": {
-            "type": "object",
-            "properties": {
-                "Overridable": {
-                    "type": "boolean"
-                },
-                "Value": {
-                    "type": "string"
-                }
-            }
-        },
-        "model.ConfigOption-uint32": {
-            "type": "object",
-            "properties": {
-                "Overridable": {
-                    "type": "boolean"
-                },
-                "Value": {
-                    "type": "integer"
-                }
-            }
-        },
         "model.Error": {
             "type": "object",
             "properties": {
@@ -1490,11 +1083,25 @@
                 }
             }
         },
-        "model.ExpiryDate": {
+        "model.Int32ConfigOption": {
             "type": "object",
             "properties": {
-                "time.Time": {
+                "Overridable": {
-                    "type": "string"
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "integer"
+                }
+            }
+        },
+        "model.IntConfigOption": {
+            "type": "object",
+            "properties": {
+                "Overridable": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "integer"
                 }
             }
         },
@@ -1683,20 +1290,6 @@
                 }
             }
         },
-        "model.MultiPeerRequest": {
-            "type": "object",
-            "properties": {
-                "Identifiers": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "Suffix": {
-                    "type": "string"
-                }
-            }
-        },
         "model.Peer": {
             "type": "object",
             "properties": {
@@ -1711,7 +1304,7 @@
                     "description": "all allowed ip subnets, comma seperated",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-array_string"
+                            "$ref": "#/definitions/model.StringSliceConfigOption"
                         }
                     ]
                 },
@@ -1735,7 +1328,7 @@
                     "description": "the dns server that should be set if the interface is up, comma separated",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-array_string"
+                            "$ref": "#/definitions/model.StringSliceConfigOption"
                         }
                     ]
                 },
@@ -1743,7 +1336,7 @@
                     "description": "the dns search option string that should be set if the interface is up, will be appended to DnsStr",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-array_string"
+                            "$ref": "#/definitions/model.StringSliceConfigOption"
                         }
                     ]
                 },
@@ -1751,7 +1344,7 @@
                     "description": "the endpoint address",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-string"
+                            "$ref": "#/definitions/model.StringConfigOption"
                         }
                     ]
                 },
@@ -1759,17 +1352,13 @@
                     "description": "the endpoint public key",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-string"
+                            "$ref": "#/definitions/model.StringConfigOption"
                         }
                     ]
                 },
                 "ExpiresAt": {
                     "description": "expiry dates for peers",
-                    "allOf": [
+                    "type": "string"
-                        {
-                            "$ref": "#/definitions/model.ExpiryDate"
-                        }
-                    ]
                 },
                 "ExtraAllowedIPs": {
                     "description": "all allowed ip subnets on the server side, comma seperated",
@@ -1782,7 +1371,7 @@
                     "description": "a firewall mark",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-uint32"
+                            "$ref": "#/definitions/model.Int32ConfigOption"
                         }
                     ]
                 },
@@ -1803,7 +1392,7 @@
                     "description": "the device MTU",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-int"
+                            "$ref": "#/definitions/model.IntConfigOption"
                         }
                     ]
                 },
@@ -1815,7 +1404,7 @@
                     "description": "the persistent keep-alive interval",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-int"
+                            "$ref": "#/definitions/model.IntConfigOption"
                         }
                     ]
                 },
@@ -1823,7 +1412,7 @@
                     "description": "action that is executed after the device is down",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-string"
+                            "$ref": "#/definitions/model.StringConfigOption"
                         }
                     ]
                 },
@@ -1831,7 +1420,7 @@
                     "description": "action that is executed after the device is up",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-string"
+                            "$ref": "#/definitions/model.StringConfigOption"
                         }
                     ]
                 },
@@ -1839,7 +1428,7 @@
                     "description": "action that is executed before the device is down",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-string"
+                            "$ref": "#/definitions/model.StringConfigOption"
                         }
                     ]
                 },
@@ -1847,7 +1436,7 @@
                     "description": "action that is executed before the device is up",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-string"
+                            "$ref": "#/definitions/model.StringConfigOption"
                         }
                     ]
                 },
@@ -1869,7 +1458,7 @@
                     "description": "the routing table",
                     "allOf": [
                         {
-                            "$ref": "#/definitions/model.ConfigOption-string"
+                            "$ref": "#/definitions/model.StringConfigOption"
                         }
                     ]
                 },
@@ -1879,66 +1468,6 @@
                 }
             }
         },
-        "model.PeerMailRequest": {
-            "type": "object",
-            "properties": {
-                "Identifiers": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "LinkOnly": {
-                    "type": "boolean"
-                }
-            }
-        },
-        "model.PeerStatData": {
-            "type": "object",
-            "properties": {
-                "BytesReceived": {
-                    "type": "integer"
-                },
-                "BytesTransmitted": {
-                    "type": "integer"
-                },
-                "EndpointAddress": {
-                    "type": "string"
-                },
-                "IsConnected": {
-                    "type": "boolean"
-                },
-                "IsPingable": {
-                    "type": "boolean"
-                },
-                "LastHandshake": {
-                    "type": "string"
-                },
-                "LastPing": {
-                    "type": "string"
-                },
-                "LastSessionStart": {
-                    "type": "string"
-                }
-            }
-        },
-        "model.PeerStats": {
-            "type": "object",
-            "properties": {
-                "Enabled": {
-                    "description": "peer stats tracking enabled",
-                    "type": "boolean",
-                    "example": true
-                },
-                "Stats": {
-                    "description": "stats, map key = Peer identifier",
-                    "type": "object",
-                    "additionalProperties": {
-                        "$ref": "#/definitions/model.PeerStatData"
-                    }
-                }
-            }
-        },
         "model.SessionInfo": {
             "type": "object",
             "properties": {
@@ -1962,35 +1491,34 @@
                 }
             }
         },
-        "model.Settings": {
+        "model.StringConfigOption": {
             "type": "object",
             "properties": {
-                "ApiAdminOnly": {
+                "Overridable": {
                     "type": "boolean"
                 },
-                "MailLinkOnly": {
+                "Value": {
+                    "type": "string"
+                }
+            }
+        },
+        "model.StringSliceConfigOption": {
+            "type": "object",
+            "properties": {
+                "Overridable": {
                     "type": "boolean"
                 },
-                "PersistentConfigSupported": {
+                "Value": {
-                    "type": "boolean"
+                    "type": "array",
-                },
+                    "items": {
-                "SelfProvisioning": {
+                        "type": "string"
-                    "type": "boolean"
+                    }
                 }
             }
         },
         "model.User": {
             "type": "object",
             "properties": {
-                "ApiEnabled": {
-                    "type": "boolean"
-                },
-                "ApiToken": {
-                    "type": "string"
-                },
-                "ApiTokenCreated": {
-                    "type": "string"
-                },
                 "Department": {
                     "type": "string"
                 },
@@ -2017,14 +1545,6 @@
                 "Lastname": {
                     "type": "string"
                 },
-                "Locked": {
-                    "description": "if this field is set, the user is locked",
-                    "type": "boolean"
-                },
-                "LockedReason": {
-                    "description": "the reason why the user has been locked",
-                    "type": "string"
-                },
                 "Notes": {
                     "type": "string"
                 },

internal/app/api/core/assets/doc/v0_swagger.yaml

@@ -1,35 +1,5 @@
 basePath: /api/v0
 definitions:
-  model.ConfigOption-array_string:
-    properties:
-      Overridable:
-        type: boolean
-      Value:
-        items:
-          type: string
-        type: array
-    type: object
-  model.ConfigOption-int:
-    properties:
-      Overridable:
-        type: boolean
-      Value:
-        type: integer
-    type: object
-  model.ConfigOption-string:
-    properties:
-      Overridable:
-        type: boolean
-      Value:
-        type: string
-    type: object
-  model.ConfigOption-uint32:
-    properties:
-      Overridable:
-        type: boolean
-      Value:
-        type: integer
-    type: object
   model.Error:
     properties:
       Code:
@@ -37,10 +7,19 @@ definitions:
       Message:
         type: string
     type: object
-  model.ExpiryDate:
+  model.Int32ConfigOption:
     properties:
-      time.Time:
+      Overridable:
-        type: string
+        type: boolean
+      Value:
+        type: integer
+    type: object
+  model.IntConfigOption:
+    properties:
+      Overridable:
+        type: boolean
+      Value:
+        type: integer
     type: object
   model.Interface:
     properties:
@@ -181,15 +160,6 @@ definitions:
         example: /auth/google/login
         type: string
     type: object
-  model.MultiPeerRequest:
-    properties:
-      Identifiers:
-        items:
-          type: string
-        type: array
-      Suffix:
-        type: string
-    type: object
   model.Peer:
     properties:
       Addresses:
@@ -199,7 +169,7 @@ definitions:
         type: array
       AllowedIPs:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-array_string'
+        - $ref: '#/definitions/model.StringSliceConfigOption'
         description: all allowed ip subnets, comma seperated
       CheckAliveAddress:
         description: optional ip address or DNS name that is used for ping checks
@@ -215,26 +185,25 @@ definitions:
         type: string
       Dns:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-array_string'
+        - $ref: '#/definitions/model.StringSliceConfigOption'
         description: the dns server that should be set if the interface is up, comma
           separated
       DnsSearch:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-array_string'
+        - $ref: '#/definitions/model.StringSliceConfigOption'
         description: the dns search option string that should be set if the interface
           is up, will be appended to DnsStr
       Endpoint:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-string'
+        - $ref: '#/definitions/model.StringConfigOption'
         description: the endpoint address
       EndpointPublicKey:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-string'
+        - $ref: '#/definitions/model.StringConfigOption'
         description: the endpoint public key
       ExpiresAt:
-        allOf:
-        - $ref: '#/definitions/model.ExpiryDate'
         description: expiry dates for peers
+        type: string
       ExtraAllowedIPs:
         description: all allowed ip subnets on the server side, comma seperated
         items:
@@ -242,7 +211,7 @@ definitions:
         type: array
       FirewallMark:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-uint32'
+        - $ref: '#/definitions/model.Int32ConfigOption'
         description: a firewall mark
       Identifier:
         description: peer unique identifier
@@ -256,30 +225,30 @@ definitions:
         type: string
       Mtu:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-int'
+        - $ref: '#/definitions/model.IntConfigOption'
         description: the device MTU
       Notes:
         description: a note field for peers
         type: string
       PersistentKeepalive:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-int'
+        - $ref: '#/definitions/model.IntConfigOption'
         description: the persistent keep-alive interval
       PostDown:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-string'
+        - $ref: '#/definitions/model.StringConfigOption'
         description: action that is executed after the device is down
       PostUp:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-string'
+        - $ref: '#/definitions/model.StringConfigOption'
         description: action that is executed after the device is up
       PreDown:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-string'
+        - $ref: '#/definitions/model.StringConfigOption'
         description: action that is executed before the device is down
       PreUp:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-string'
+        - $ref: '#/definitions/model.StringConfigOption'
         description: action that is executed before the device is up
       PresharedKey:
         description: the pre-shared Key of the peer
@@ -294,52 +263,12 @@ definitions:
         type: string
       RoutingTable:
         allOf:
-        - $ref: '#/definitions/model.ConfigOption-string'
+        - $ref: '#/definitions/model.StringConfigOption'
         description: the routing table
       UserIdentifier:
         description: the owner
         type: string
     type: object
-  model.PeerMailRequest:
-    properties:
-      Identifiers:
-        items:
-          type: string
-        type: array
-      LinkOnly:
-        type: boolean
-    type: object
-  model.PeerStatData:
-    properties:
-      BytesReceived:
-        type: integer
-      BytesTransmitted:
-        type: integer
-      EndpointAddress:
-        type: string
-      IsConnected:
-        type: boolean
-      IsPingable:
-        type: boolean
-      LastHandshake:
-        type: string
-      LastPing:
-        type: string
-      LastSessionStart:
-        type: string
-    type: object
-  model.PeerStats:
-    properties:
-      Enabled:
-        description: peer stats tracking enabled
-        example: true
-        type: boolean
-      Stats:
-        additionalProperties:
-          $ref: '#/definitions/model.PeerStatData'
-        description: stats, map key = Peer identifier
-        type: object
-    type: object
   model.SessionInfo:
     properties:
       IsAdmin:
@@ -355,25 +284,24 @@ definitions:
       UserLastname:
         type: string
     type: object
-  model.Settings:
+  model.StringConfigOption:
     properties:
-      ApiAdminOnly:
+      Overridable:
         type: boolean
-      MailLinkOnly:
+      Value:
-        type: boolean
+        type: string
-      PersistentConfigSupported:
+    type: object
-        type: boolean
+  model.StringSliceConfigOption:
-      SelfProvisioning:
+    properties:
+      Overridable:
         type: boolean
+      Value:
+        items:
+          type: string
+        type: array
     type: object
   model.User:
     properties:
-      ApiEnabled:
-        type: boolean
-      ApiToken:
-        type: string
-      ApiTokenCreated:
-        type: string
       Department:
         type: string
       Disabled:
@@ -392,12 +320,6 @@ definitions:
         type: boolean
       Lastname:
         type: string
-      Locked:
-        description: if this field is set, the user is locked
-        type: boolean
-      LockedReason:
-        description: the reason why the user has been locked
-        type: string
       Notes:
         type: string
       Password:
@@ -415,8 +337,8 @@ info:
   contact:
     name: WireGuard Portal Developers
     url: https://github.com/h44z/wg-portal
-  description: WireGuard Portal API - UI Endpoints
+  description: WireGuard Portal API - a testing API endpoint
-  title: WireGuard Portal SPA-UI API
+  title: WireGuard Portal API
   version: "0.0"
 paths:
   /auth/{provider}/callback:
@@ -526,19 +448,6 @@ paths:
       summary: Get the dynamic frontend configuration javascript.
       tags:
       - Configuration
-  /config/settings:
-    get:
-      operationId: config_handleSettingsGet
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: The JavaScript contents
-          schema:
-            type: string
-      summary: Get the frontend settings object.
-      tags:
-      - Configuration
   /csrf:
     get:
       operationId: base_handleCsrfGet
@@ -627,62 +536,6 @@ paths:
       summary: Update the interface record.
       tags:
       - Interface
-  /interface/{id}/apply-peer-defaults:
-    post:
-      operationId: interfaces_handleApplyPeerDefaultsPost
-      parameters:
-      - description: The interface identifier
-        in: path
-        name: id
-        required: true
-        type: string
-      - description: The interface data
-        in: body
-        name: request
-        required: true
-        schema:
-          $ref: '#/definitions/model.Interface'
-      produces:
-      - application/json
-      responses:
-        "204":
-          description: No content if applying peer defaults was successful
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/model.Error'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/model.Error'
-      summary: Apply all peer defaults to the available peers.
-      tags:
-      - Interface
-  /interface/{id}/save-config:
-    post:
-      operationId: interfaces_handleSaveConfigPost
-      parameters:
-      - description: The interface identifier
-        in: path
-        name: id
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "204":
-          description: No content if saving the configuration was successful
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/model.Error'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/model.Error'
-      summary: Save the interface configuration in wg-quick format to a file.
-      tags:
-      - Interface
   /interface/all:
     get:
       operationId: interfaces_handleAllGet
@@ -909,49 +762,16 @@ paths:
       summary: Update the given peer record.
       tags:
       - Peer
-  /peer/config-mail:
-    post:
-      operationId: peers_handleEmailPost
-      parameters:
-      - description: The peer mail request data
-        in: body
-        name: request
-        required: true
-        schema:
-          $ref: '#/definitions/model.PeerMailRequest'
-      produces:
-      - application/json
-      responses:
-        "204":
-          description: No content if mail sending was successful
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/model.Error'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/model.Error'
-      summary: Send peer configuration via email.
-      tags:
-      - Peer
   /peer/config-qr/{id}:
     get:
       operationId: peers_handleQrCodeGet
-      parameters:
-      - description: The peer identifier
-        in: path
-        name: id
-        required: true
-        type: string
       produces:
-      - image/png
       - application/json
       responses:
         "200":
           description: OK
           schema:
-            type: file
+            type: string
         "400":
           description: Bad Request
           schema:
@@ -966,12 +786,6 @@ paths:
   /peer/config/{id}:
     get:
       operationId: peers_handleConfigGet
-      parameters:
-      - description: The peer identifier
-        in: path
-        name: id
-        required: true
-        type: string
       produces:
       - application/json
       responses:
@@ -1019,41 +833,6 @@ paths:
       summary: Get peers for the given interface.
       tags:
       - Peer
-  /peer/iface/{iface}/multiplenew:
-    post:
-      operationId: peers_handleCreateMultiplePost
-      parameters:
-      - description: The interface identifier
-        in: path
-        name: iface
-        required: true
-        type: string
-      - description: The peer creation request data
-        in: body
-        name: request
-        required: true
-        schema:
-          $ref: '#/definitions/model.MultiPeerRequest'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            items:
-              $ref: '#/definitions/model.Peer'
-            type: array
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/model.Error'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/model.Error'
-      summary: Create multiple new peers for the given interface.
-      tags:
-      - Peer
   /peer/iface/{iface}/new:
     post:
       operationId: peers_handleCreatePost
@@ -1114,33 +893,6 @@ paths:
       summary: Prepare a new peer for the given interface.
       tags:
       - Peer
-  /peer/iface/{iface}/stats:
-    get:
-      operationId: peers_handleStatsGet
-      parameters:
-      - description: The interface identifier
-        in: path
-        name: iface
-        required: true
-        type: string
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/model.PeerStats'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/model.Error'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/model.Error'
-      summary: Get peer stats for the given interface.
-      tags:
-      - Peer
   /user/{id}:
     delete:
       operationId: users_handleDelete
@@ -1220,48 +972,6 @@ paths:
       summary: Update the user record.
       tags:
       - Users
-  /user/{id}/api/disable:
-    post:
-      operationId: users_handleApiDisablePost
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/model.User'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/model.Error'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/model.Error'
-      summary: Disable the REST API for the given user.
-      tags:
-      - Users
-  /user/{id}/api/enable:
-    post:
-      operationId: users_handleApiEnablePost
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/model.User'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/model.Error'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/model.Error'
-      summary: Enable the REST API for the given user.
-      tags:
-      - Users
   /user/{id}/peers:
     get:
       operationId: users_handlePeersGet
@@ -1274,10 +984,6 @@ paths:
             items:
               $ref: '#/definitions/model.Peer'
             type: array
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/model.Error'
         "500":
           description: Internal Server Error
           schema:
@@ -1285,27 +991,6 @@ paths:
       summary: Get peers for the given user.
       tags:
       - Users
-  /user/{id}/stats:
-    get:
-      operationId: users_handleStatsGet
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/model.PeerStats'
-        "400":
-          description: Bad Request
-          schema:
-            $ref: '#/definitions/model.Error'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/model.Error'
-      summary: Get peer stats for the given user.
-      tags:
-      - Users
   /user/all:
     get:
       operationId: users_handleAllGet

internal/app/api/core/assets/tpl/rapidoc.gohtml

@@ -8,16 +8,10 @@
     <rapi-doc
             spec-url="{{ $.ApiSpecUrl }}"
             theme="dark"
-            render-style="focused"
             allow-server-selection="false"
-            allow-authentication="true"
+            allow-authentication="false"
             load-fonts="false"
-            schema-style="table"
             schema-expand-level="1"
-            default-schema-tab="model"
-            fill-request-fields-with-example="true"
-            show-method-in-nav-bar="as-colored-block"
-            show-components="true"
             allow-spec-url-load="false"
             allow-spec-file-load="false"
             allow-spec-file-download="true"

internal/app/api/core/frontend-dist/assets/ad-TqPrTyOF.svg

@@ -0,0 +1,150 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-ad" viewBox="0 0 640 480">
+  <path fill="#d0103a" d="M0 0h640v480H0z"/>
+  <path fill="#fedf00" d="M0 0h435.2v480H0z"/>
+  <path fill="#0018a8" d="M0 0h204.8v480H0z"/>
+  <path fill="#c7b37f" d="M300.4 136.6c7.7 0 10.9 6.6 18.6 6.6 4.7 0 7.5-1.5 11.7-3.9 2.9-1.6 4.7-2.5 8-2.5 3.4 0 5.5 1 7.3 4 1 1.6 1.8 4.9 1.3 6.7a40 40 0 0 1-2.7 8.3c-.7 1.6-1.3 2.5-1.3 4.2 0 4.1 5.6 5.5 9.4 5.6.8 0 7.7 0 12-4.2-2.3-.1-4.9-2-4.9-4.3 0-2.6 1.8-4.3 4.3-5.1.5-.1 1.3.3 1.7 0 .7-.3.4-1 1-1.4 1.2-1 2-1.6 3.6-1.6 1 0 1.6.1 2.5.7.4.4.6.8 1 .8 1.2 0 1.8-.8 3-.8a5 5 0 0 1 2.3.6c.6.3.6 1.5 1.4 1.5.4 0 2.4-.9 3.5-.9 2.2 0 3.4.8 4.8 2.5.4.5.6 1.4 1 1.4a6.2 6.2 0 0 1 4.8 3c.3.4.7 1.4 1.1 1.5.6.3 1 .2 1.7.7a6 6 0 0 1 2.8 4.8c0 .7-.3 1.6-.5 2.2-1.8 6.5-6.3 8.6-10.8 14.3-2 2.4-3.5 4.3-3.5 7.4 0 .7 1 2.1 1.3 2.7-.2-1.4.5-3.2 2-3.3a4 4 0 0 1 4 3.6 4.5 4.5 0 0 1-.3 1.8 9.6 9.6 0 0 1 4-1.4h1.9c3.3 0 7 1.9 9.3 3.8a21 21 0 0 1 7.3 16.8c-.8 5.2-.3 14.8-13.8 18.6 2.5 1 4.2 3 4.2 5.2a4.5 4.5 0 0 1-4.4 4.7 4.4 4.4 0 0 1-3.5-1.4c-2.8 2.8-3.3 5.7-3.3 9.7 0 2.4.4 3.8 1.4 6 1 2.2 1.8 3.5 3.7 5.1 1-1.5 2.1-2.6 4-2.6 1.7 0 3.2.6 3.9 2.2.2.5 0 .9.3 1.4.3.6.8.7 1.1 1.3.5 1 0 1.8.5 2.7.3.7.9.8 1.2 1.4.4 1 .5 1.6.5 2.7 0 3-2.7 5.2-5.7 5.2-1 0-1.4-.4-2.3-.3 1.7 1.7 3 2.5 4.3 4.5a17.7 17.7 0 0 1 3 10.3 22 22 0 0 1-2.8 11.2 20 20 0 0 1-7 8.5 35 35 0 0 1-16 6.4 74.4 74.4 0 0 1-11 1.4l-14.1.8c-7.2.4-12.2 1.5-17.3 6.6 2.4 1.7 4 3.5 4 6.4 0 3-1.8 5.3-4.7 6.2-.7.2-1.2 0-1.9.4s-.7 1.3-1.4 1.7a6.2 6.2 0 0 1-3.8 1 8 8 0 0 1-6.4-2.5c-2.2 1.8-3 3.4-5.5 4.9-.8.4-1.2 1-2.1 1-1.5 0-2.2-1-3.4-1.8a23 23 0 0 1-4.4-4c-2.3 1.3-3.6 2.4-6.3 2.4a7 7 0 0 1-4-1c-.6-.5-.8-1.2-1.5-1.6-.7-.5-1.3-.3-2.1-.7-3-1.3-5-3.5-5-6.8 0-2.9 1.8-4.7 4.4-6-5-5-10-5.8-17-6.2l-14-.8c-4.4-.3-6.8-.7-11-1.4-3.3-.5-5.2-.7-8.2-2.1-10.2-4.8-16.8-11.3-18-22.5-.2-1-.2-1.5-.2-2.5 0-5.8 2.3-9.4 6.4-13.5-1-.3-1.7 0-2.8-.3-2.5-1-4.4-2.7-4.4-5.5 0-1 0-1.7.5-2.6.4-.6 1-.7 1.2-1.4.2-1 0-1.6.4-2.5.3-.5.8-.6 1-1.2 1-1.9 2-3.4 4.1-3.4 1.8 0 3 1 3.8 2.5 1.8-.8 2.2-2.1 3.2-3.7a15.5 15.5 0 0 0 1.4-13.3c-.4-1.5-.6-2.5-1.8-3.7-1 1-2 1.4-3.4 1.4-2.9 0-5-2.5-5-5.3a4.8 4.8 0 0 1 3-4.6c-1.6-1.4-3-1.5-4.7-2.6-2.6-1.6-3.5-3.4-5.2-6-1.2-1.6-1.5-2.8-2-4.7a19 19 0 0 1-1-7.8c.6-5 1.5-8 4.6-11.9 1.8-2.3 3-3.7 5.8-4.9 2.3-1 3.7-1.7 6.2-1.7l2 .1a6.9 6.9 0 0 1 2.8.8c.4.2 1.1.9 1.1.4s-.3-.8-.3-1.3c0-2 1.5-4 3.6-4 1.5 0 2.1 1.4 2.9 2.7.4-.8.7-1.4.7-2.3 0-3.4-1.9-5.2-4-7.9-4.7-5.8-10.5-8.5-10.5-16 0-2.2 1-3.7 3-4.9.5-.3 1.3 0 1.8-.3s.4-1 .7-1.4c.5-.7 1-1 1.6-1.6 1-1 2-.6 3.1-1.5.6-.4.8-1 1.2-1.4 1.3-1.6 2.5-2.4 4.6-2.4 1 0 1.6 0 2.5.4l1 .5c.3-.2.8-.8 1.5-1.1a4 4 0 0 1 2.2-.6c1.1 0 1.8.6 3 .6.3 0 .4-.4.8-.6 1-.7 1.5-1 2.7-1 1.2 0 1.8.3 2.8 1 1 .5 1 1.3 2 1.8.5.3 1 .2 1.5.4 2.6.9 4.5 2.6 4.5 5.3 0 1.5-.3 2.5-1.4 3.5-.9.7-1.7.6-2.8 1a16 16 0 0 0 11.3 3.5c4.2 0 9.3-1.7 9.3-5.9 0-2-1-3-1.8-4.8a18.8 18.8 0 0 1-2.1-8.5c0-2.8.3-4.5 1.9-6.7 1.6-2.3 3.6-2.9 6.5-2.9"/>
+  <g fill="none" stroke="#703d29">
+    <path stroke-linejoin="round" stroke-width=".7" d="M272.4 159a3.6 3.6 0 0 0 2.4 2.4c.8.3 2.7.2 3.8-1.4 1-1.2 1-2.8.6-4a4.7 4.7 0 0 0-1.7-2.2z"/>
+    <path stroke-linecap="round" stroke-width=".7" d="M401 236.1c-1.2-2.9-4.3-1.6-4.4 0-.5 3.7 2.7 4.8 5 4.2a4 4 0 0 0 2.5-2c.6-1 .8-2.4.4-3.7a4.9 4.9 0 0 0-.8-1.6 5 5 0 0 0-1.3-1.2c-.9-.6-1.9-.6-3.4-.6-5.5 0-10.4 6.5-12 13.4-.6 2.2-1.3 7.3-.3 12a22.4 22.4 0 0 0 5.9 11.3 25.7 25.7 0 0 0 9.9 5.8 7.9 7.9 0 0 0 4 .1c3.2-.7 4.7-3.8 3-7-1.3-2.5-5.3-4-7.2-.6-.1.3-.4.9-.4 1.5 0 .9.4 2 1 2.4 1.5.9 3.8.6 3.7-2"/>
+    <path stroke-width=".8" d="M383.8 274a11.3 11.3 0 0 1 6.6-3.7c3-.4 5.6.5 8.2 2a18.5 18.5 0 0 1 10.8 17c0 3.6-1 7.5-2 9.4-.8 1.7-3 9-15.3 14-7.1 3-18 3.6-25.7 4-10.4.3-20 .7-25.5 7.6"/>
+    <g stroke-width=".7">
+      <path d="M386.4 285.7c-.3-1 0-2.1.8-3.3 1.2-1.6 3.7-2.1 6-1a7.4 7.4 0 0 1 2.5 2.2l1.1 1.6c.7 1.1 1 2 1 2.5 2.5 7-1.4 14.5-6.5 17.6-4 2.4-8.7 3.4-14.4 4-2.5.4-4 .3-6.5.5h-9.6a70.1 70.1 0 0 0-7.2 0c-2.9.3-5 .4-7.6.8-1.6.2-3.4.5-5.4 1-.6 0-1.2.2-1.8.4l-1.2.3c-3.6 1.1-7 2.4-9.8 4.2-.8.5-1.8 1-2.5 1.7l-1.3 1.2c-2 2-3.9 4-4.4 6.7v1.6c0 1.8 1.4 4.3 5.4 5m5.5-170c.8 1.4 1.3 2.3.8 3.9-.6 1.7-1.8 2.8-3.6 2.8-4 0-6.3-4.8-4.5-7.8 3.2-5.3 9.3-2.3 15 .3-.3-1.3-.8-1.8-.7-3.5.1-4.2 3.2-6 4.5-10 .7-2.3 1-4.3-.7-6-1.5-1.3-3.2-1.3-5.1-.6-3.8 1.5-8.5 5.9-16.6 6-8.2-.1-12.8-4.5-16.7-6-2-.7-3.6-.7-5.1.7-1.7 1.6-1.4 3.6-.7 6 1.3 3.8 4.4 5.7 4.5 10 0 1.6-.4 2-.7 3.4 5.7-2.6 12-5.9 15-.3 1.7 3.2-.5 7.7-4.5 7.7-1.8 0-3-1-3.6-2.7-.4-1.5 0-2.8.8-4"/>
+      <path stroke-linecap="round" d="M314.6 159.9a5.3 5.3 0 0 1 2.4 5c-.2 2.5-.8 3.1-2.8 4.5m2.4-3.8c-.1 1.5-.7 2.5-2.3 3.1"/>
+    </g>
+    <path fill="#c7b37f" stroke="none" d="m276.7 153.3.7.5.8.8.5 1 .2.8v1.9l-.2.8-.5.6-.6.6-.9.5-1 .2-1 .2-1-.5-.9-.6-.5-.8-.4-1v-.4z"/>
+    <path stroke-linecap="round" stroke-width=".7" d="M275.2 157.2c-.3-1.7-2.2-2-3-1-1.1 1.5-.3 4 2 4.7a4 4 0 0 0 3.9-1.4c1-1.3.9-2.8.5-4a4.5 4.5 0 0 0-1.7-2.2c-2.7-2-7.1-1.6-8.6 2-1.8 4.4 2.2 7.8 6 10.3 4.6 3.2 10 3.8 14 3.8 9.2-.1 16.2-4.5 20.7-7 1-.6 2.1-.5 2.7.2a2 2 0 0 1-.3 2.7"/>
+    <path stroke-width=".7" d="m248 281.2-2 .7-2 1.6-1 1.3-1.1 2-.5 1.5-.4 1.8-.2 1.4m19-10.1-.1 1.8-.3 1.2-1 2.2-1.3 1.8-1.5 1.2-1.1.5-1.6.4"/>
+    <path stroke-width=".8" d="M319.7 329.1c-.3 1.7-1.9 3.6-5.3 4.2l-.6.2"/>
+    <path stroke-width=".9" d="M404.2 276.2a18.3 18.3 0 0 1 5.6 13.5c0 3.6-1 7.5-2 9.4-.8 1.7-3 9-15.3 14a85 85 0 0 1-25.6 4c-10.3.3-19.8.7-25.4 7.3"/>
+    <path stroke-width=".6" d="M387.5 282.9c.8-1 3.5-2.4 5.8-1.1a6.2 6.2 0 0 1 2.3 2"/>
+    <path stroke-width=".9" d="m401.6 273.8 1.4.5a7 7 0 0 0 4 0c2.8-.8 4.6-3.4 3.2-6.9a6 6 0 0 0-1.8-2.1"/>
+    <path stroke-linecap="round" stroke-width=".7" d="M240.3 199.8c-2 1.1-3.3 1.4-4.8 3.1a28.1 28.1 0 0 0-2.6 6.8m46-51.7c0 1.8-1.2 2.8-3 3.2"/>
+    <path stroke-width=".6" d="M397.1 192a19 19 0 0 1 18.6 19.8c0 16-9.9 18.5-13.8 19.6"/>
+    <path stroke-width=".7" d="M398.4 192c8.1-.3 16.5 5.7 16.9 20.7.3 11.7-8 17-12 18"/>
+    <path stroke-width=".6" d="m393.8 248.4.1-1.6.6-2.5.7-2 .9-1.6 1-1.3m7.8-3.4v1.5l-.5 1-.7 1.1-.8.6-1.2.5h-1.1l-.8-.1m-14.3-52.8.3-1.7.8-1.6 1-1.5 1.6-2.2 1.4-1.4 2-2.2 2-1.9 1.1-1.3 1.5-1.9 1.4-2 .8-1.7.5-2.2.1-2.7-.2-.8m-12.3 128.2 1.6-.4 1.2-.6.7-.7.5-.8.3-1.2v-.9m-158.2-12.1h2.7l1.6-.6m5-36.5-.2 1.4-.4.6-.4.6-.7.5-.7.3-1 .1h-.6m9.9-15.5-.3 2.1-.5 1-.8 1.2-1.2.9-1.2.6-2.3.5m15.3-39.7-.5 1.3-.5 1-.8 1-1 1-1.2.5-1.1.3-.6-.1m.3-6.2v1"/>
+    <g stroke-width=".6">
+      <path stroke-linecap="round" d="M254.3 224a6.9 6.9 0 0 1-2.1 1.4m150.5 44.8.5.2c1.4.8 4.2-.2 3.4-2.4"/>
+      <path d="M397.8 239.6c1 1.3 2.9 1.7 4.4 1.3a4 4 0 0 0 2.5-2c.6-1 .8-2.4.4-3.7a4.9 4.9 0 0 0-.9-1.6 6.8 6.8 0 0 0-1.3-1.5l-.4-.2m6.4 34a4 4 0 0 0 .1-.7 4 4 0 0 0-1.3-3l-.8-.8m.4.5c0-1.8-1.5-3.2-3.4-3.5m-4.2 2.8-1.3-1a15.7 15.7 0 0 1-4.3-10.7c0-4.2 1.6-8.4 3.6-10M341.2 324l1.8-1.6 1.2-1 2.3-1.4 2.2-1 1.6-.5 3-.6 3.6-.6m-29.5 19.4a17 17 0 0 1-7.6 6.1 17.7 17.7 0 0 1-7.6-6.1"/>
+      <path stroke-linecap="round" d="M314.4 332.6a10 10 0 0 1-2.2 4.2"/>
+      <path d="m314.7 330.5-.4 2.2M312 337l-1 1-1.7.9-2 .6m-5.6-177.8c.3-.8.5-1.4.5-2.6-.1-4.2-3.2-6.1-4.5-10-.7-2.3-1-4.3.7-6 1.4-1.4 3.2-1.4 5-.6 4 1.5 8.6 5.8 16.7 6-8.1-.2-12.8-4.5-16.6-6-2-.8-3.8-1-5.3.5-1.7 1.6-1.2 3.8-.5 6.1 1.3 3.9 4.2 5.8 4.3 10 0 1.2-.3 1.8-.5 2.6M320 148c8-.4 14.9-5.8 17.1-6.3 2-.4 3-.2 4.5 1.1-1.4-1.3-3-1.2-5-.5-3.8 1.5-8.4 5.8-16.6 6m79.6 112.9a15.5 15.5 0 0 1-6.2-12.4c0-4.1 1.7-8.4 3.6-10m-70 97.6c-1.3 2-4.3 5-7.6 6.2a17.7 17.7 0 0 1-7.6-6.2"/>
+      <path stroke-linecap="round" d="m306.7 163.7 2.3-1.3c1-.6 2.3-.5 2.9.2.6.7.7 2-.2 2.8"/>
+      <path d="M294.7 169.3c5.5-1.2 10-3.6 13.4-5.5M340.3 328c.5.3.8 1 .8 1 .1.2.3.5.3.8.3 1.5-.7 2.4-2 2.6-1.7.2-3-.8-3.5-2M294.4 169c5.5-1.1 10-3.6 13.4-5.5m97.6 106.9c-1 .4-1.6.3-3-.2l-1.8-1a20.7 20.7 0 0 1-8.4-9 18.8 18.8 0 0 1-1.7-4.6 12 12 0 0 1-.5-3.3 25.6 25.6 0 0 1 4.7-15.3c1.1-1.6 2.1-2.5 4.2-2.6m-143.7-39.3a7.1 7.1 0 0 1 2.7 5.7c0 3.1-2.6 8.2-9 10a8.3 8.3 0 0 1-6.3-.8"/>
+      <path d="M256.3 205.6c1.1.8 1.6 1.7 1.6 3.3 0 1-.7 2.4-1.9 3.7a12.4 12.4 0 0 1-8.8 4c-2 0-4-.4-6-1.7a9 9 0 0 1-3.8-5.4"/>
+      <path d="M256.2 212.3c1.3 1.2 1.7 2.7 1.7 4.6 0 2.7-1.1 4.8-3.7 7-.6.6-1.2 1-2 1.5m129.5-22.1v3.5m-.3-4.4v5m.3-15.8v6.6m-.3-8v8.9m-1.9 82a18.7 18.7 0 0 1-4.2 5.6 19.6 19.6 0 0 1-5.8 4.1 24.6 24.6 0 0 1-6.6 2.2 33 33 0 0 1-6.8.9c-2.5 0-3.9 0-6.4-.2-2.6-.2-4-.6-6.7-.8-2.2-.2-3.4-.4-5.6-.3a28.3 28.3 0 0 0-11 1.8c-2.6 1-5.7 3-6.3 3.8a22 22 0 0 0-6.4-3.8 22 22 0 0 0-5.1-1.4c-2.3-.4-3.5-.4-5.8-.4-2.2 0-3.4.1-5.6.3-2.6.3-4 .6-6.7.8-2.5.2-3.9.3-6.4.2a33 33 0 0 1-13.4-3 19.5 19.5 0 0 1-6.4-4.8m42.1 53.4 1.8-.2m30.3-2.4 1.8-.1 1.7-.7 1.2-.8 1.7-2 .3-.6.3-1.7v-.8m47-136.7c.7-2.6-.2-5.4-2.8-5.3m-132 46.5a8.2 8.2 0 0 1-3.5 4.7m3.6-46.7a6.5 6.5 0 0 1-3.6 4c-1.9.8-4 0-5.2-.8"/>
+      <path stroke-linecap="round" d="M243.8 202.4c1.5.8 3.1-.4 2.8-2.4a2.9 2.9 0 0 0-2.5-2.2"/>
+      <path d="M250.2 286.6c.3.3.4.7.8.8.7.2 1.2.4 1.9-.5.8-1.1.3-2.8-.5-3.9a5 5 0 0 0-5.8-1c-.8.5-1.7 1-2.6 2.2l-1.1 1.6c-.7 1.1-1 2-1.1 2.4-2 5.9.4 12 4.1 15.7"/>
+      <path stroke-linecap="round" d="m340.2 327.8.7.8.2.9c.3 1.5-.7 2.4-2 2.6-1.6.2-2.8-.8-3.3-2"/>
+      <path d="M389.4 154.8a7.4 7.4 0 0 1 6.3 7c0 4.4-1.5 6-3.8 9.2-2.5 3.4-10.7 9.6-10.7 16.7 0 4.3 1.2 7 4.3 8.4 2 1 4.3 0 5.4-1 2.6-2.4 1.5-6.5-1.2-7-3.2-.6-3.9 4.6-.7 4.3m17.9 69a3.7 3.7 0 0 0-3.6-3 3.7 3.7 0 0 0-3.7 3.7c0 1 .4 2 1 2.6"/>
+      <path d="M383.9 195.1a7.1 7.1 0 0 0-2.7 5.7c0 3.1 2.6 8.2 9 10 2.4.7 4.8.6 6.2-.3m-156-10.3a9.4 9.4 0 0 0-4.8 3.5 16.9 16.9 0 0 0-2.2 12.7 15.8 15.8 0 0 0 2.3 5.6 8 8 0 0 0 1 1.2l1.2 1m64 92c4.9 2.1 8.4 3.7 11.4 8.5a10 10 0 0 1 1.2 4.9c0 2.7-1 5.7-3.3 7.6a8.3 8.3 0 0 1-6.7 2c-1.9-.2-3.7-1.6-4-2.6M254 224.1c2.7 2.2 3.9 4.2 3.9 7.5a8.4 8.4 0 0 1-4 7.5"/>
+      <path stroke-linecap="round" d="M251.5 236.4c4 5.1 6.3 8.1 6.4 14.1.1 5.7-1.7 9.6-5 13.7"/>
+      <path d="M329.8 169.3a4.1 4.1 0 0 0 1.5-2.2c.5-1.5.5-2.8-.2-4 1 1.4 1 2.5.7 4-.1 1-.8 1.5-1.6 2.3m51.5 86.1v16.2l-.1 2.5a34.4 34.4 0 0 1-.3 1.7"/>
+      <path d="M381.4 254v19.9l-.5 2.6m.5-43v14.6m.3-13.4v11.8m0-26.8v8.8m-.3-9.9v11m.3-19v3.5m-.3-4.2v5m-1.8 65.2-.4.7a18.7 18.7 0 0 1-4.1 5.7 19.6 19.6 0 0 1-5.9 4 24.6 24.6 0 0 1-6.5 2.2c-2.7.6-4.2.8-6.9.9-2.5 0-3.9 0-6.3-.2-2.7-.2-4.1-.5-6.8-.8-2.2-.2-3.4-.3-5.6-.3-2.2 0-3.5 0-5.7.4a22 22 0 0 0-5.2 1.4c-2.7 1.1-5.7 3-6.4 3.8-.6-.8-3.7-2.7-6.3-3.8a22 22 0 0 0-5.2-1.4c-2.2-.4-3.5-.4-5.8-.4-2.2 0-3.4.1-5.6.3-2.6.3-4 .6-6.7.8-2.5.2-3.9.3-6.3.2a33 33 0 0 1-13.5-3 19.5 19.5 0 0 1-5.8-4.1 22 22 0 0 1-2.5-2.8m-2-3.2a10.1 10.1 0 0 1-2.3 7.7c-.8.9-2.6 2.6-5 2.6-3.7 0-4.8-2.5-5-3.2"/>
+      <path d="M255.6 278.9c.7.7 1.3 1.5 1.9 2.5 1 1.8.6 4.8-.1 6.2a4.4 4.4 0 0 1-.3.4m-20.3 18c2.3 2.4 5.7 5 10.9 7.1 7.1 3 18.1 3.6 25.7 4 10 .3 19.3.7 25 7m17.3-4a12 12 0 0 1 4 5.5m-7.3 11.5a8.2 8.2 0 0 1-.7.7 8.3 8.3 0 0 1-6.6 2c-2-.2-3.8-1.6-4.3-2.6m-5.4-2.9.3.4a7.6 7.6 0 0 0 5.1 2.4m27 0a18 18 0 0 1-7.7 6.1 17.7 17.7 0 0 1-7.6-6.1l-.3-.5m15.6.4.7.7a8.3 8.3 0 0 0 6.7 2 5.5 5.5 0 0 0 4-2.5l.5-.7"/>
+      <path d="m339 336.6-.7 1.2-1.1 1-1.7.7h-1.6"/>
+      <path d="M343 325.3a7.7 7.7 0 0 1 2.4 2.9c.3.7.4 1.5.5 2.3a5.8 5.8 0 0 1-1.5 4.2 7.5 7.5 0 0 1-5.4 2.4 5.5 5.5 0 0 1-.4 0m.2-.2a6.8 6.8 0 0 1-5.2-2.2m63.7-67.9a23.8 23.8 0 0 1-4.8-6.4 18.8 18.8 0 0 1-1.7-4.5 12 12 0 0 1-.5-3.3 26 26 0 0 1 4.6-15.3c.7-.8 1.4-1.8 2.1-2.2m-1.3-75.9c2.5.2 4.8 3 4.8 5.7 0 3.8-1.3 5.5-4.4 9.3-2.6 3.2-10.6 9-10.3 14.5 0 1 .5 2 1.1 2.8m-3.2 3.5a7 7 0 0 0 2 1.4 5 5 0 0 0 4.3-.3M369 153a6 6 0 0 1 2.2 2.6c1.8 4.5-2.2 7.9-6 10.4a21.3 21.3 0 0 1-8.3 3.3"/>
+      <path d="M364.6 161.6a4.2 4.2 0 0 1-3.1-1.5 3.4 3.4 0 0 1-.7-1m-15 4.9a4.6 4.6 0 0 1-1.2-1c-1-1-1.5-2.3-.8-4.4.6-1.9 3.7-7.2 3.8-10.9.2-5.6-2-9-5.3-10.2"/>
+      <path stroke-linecap="round" d="m347.3 146.5-.1 2-.6 2.2-1 3-1 1.9-.8 1.9-.4 1.3-.2 1 .1.9m38 126.3.6.8c.7 1 3.2 3 5.5 3 3.7 0 4.6-2.6 4.7-3.2.5-2.9-.5-3.6-2-4.5 0 0-.8-.4-1.9-.2"/>
+      <path d="M237 274.4a6.9 6.9 0 0 1-3.7 0c-2.9-.9-5.2-3.6-4-7m13.4-31.8c.3.3.4.7.4 1 .4 3.8-2.8 4.8-5 4.2a5.6 5.6 0 0 1-3-2.3 4.7 4.7 0 0 1-.7-2.3m22-23.6c.6.5 1 1 1.3 1.7m-1.1-8.5c.5.4.9.9 1.1 1.3"/>
+      <path stroke-linecap="round" d="M257.9 210.5a8.5 8.5 0 0 1-1.6 2.4 12.4 12.4 0 0 1-8.8 4c-2 0-4-.4-6-1.7a9.5 9.5 0 0 1-4-5.6"/>
+      <path d="M255.4 195.3a7.8 7.8 0 0 1 2.4 3.4"/>
+      <path stroke-linecap="round" d="M257.8 203.2c-.9 3-3.5 6.6-8.6 7.9-2.4.6-5.6-.2-6.6-1"/>
+      <path d="M240 202.6c.3 2.6 2 4.6 5.4 4.6 4.7.1 7.6-6.7 3.4-11.5"/>
+      <path stroke-linecap="round" d="M229.4 225.5c.7.9 1.5 1.7 2.4 2.4a16.8 16.8 0 0 0 6 3.3m5.2.5c4.2-.5 6.6-3.7 6-7.3-.3-2.8-2.8-5-4.6-5.1"/>
+      <path d="M249.8 188.1c1.9 0 3 1.6 2.9 3"/>
+      <path stroke-linecap="round" d="M249.4 163a11.5 11.5 0 0 0 5 5.9m144.2 31c1.7 2.3.6 7-4 7a5.2 5.2 0 0 1-4.5-2.5"/>
+      <path d="M381.7 169.1V185"/>
+      <path stroke-linecap="round" d="M243.8 202.3c1.4 1 3.3-.7 2.5-2.6-.5-1.2-2.2-2.6-4.7-.9-2.8 1.9-2 7.8 3.2 7.9 4.7 0 7.6-6.8 3.4-11.6-4-4.6-11.3-3.6-16 .2A21.4 21.4 0 0 0 225 207a22.5 22.5 0 0 0 0 9.2 20.9 20.9 0 0 0 3 7.5l1.3 1.7c.8.8 1 1.2 2 2a15 15 0 0 0 10.4 3.7c4.6-.2 7.3-3.4 6.8-7.3-.4-3.8-4.2-5.7-6.7-3.9-1.7 1.2-2.3 4.9.7 5.8 1.6.5 3.1-1.7 2-3M374 150.9c2.7-1.4 4.8-1.2 6.3 1a9.9 9.9 0 0 1 1.6 7.2 9.2 9.2 0 0 1-3.5 5.8"/>
+      <path stroke-linecap="round" d="M380.5 152c3.1-2 6.5-1.1 8.3 1.6 1.3 2 1.7 3.6 1.6 6.1a11.2 11.2 0 0 1-5.7 9.2"/>
+      <path d="M395 159.2c2.6.2 4.6 2.5 4.6 5.1 0 3.8-1 5.5-4 9.3-2.7 3.3-10.6 9-10.4 14.6 0 2.1 1.8 4 3.3 4.2"/>
+      <path stroke-linecap="round" d="M395.4 202.3c-1.5 1-3.3-.6-2.5-2.4.5-1.2 2.2-2.8 4.7-1.1 2.7 1.9 2 7.8-3.3 7.9-4.7 0-8-6.6-3.4-11.6 4-4.6 11.7-3.7 16.5.1 2 1.6 6.1 6 7 12 1 7 .9 15.6-6.4 21-3 2.1-7 3.1-10.6 3-4.6-.2-7.3-3.5-6.8-7.4.5-3.8 4-5.4 6.7-3.9 2.8 1.5 2.3 5.4-.7 5.8-1.7.2-3.1-1.7-2-3"/>
+      <path d="M392.9 199.9c.8-3.5 3.7-3.8 6.2-3.8 6.5.1 11.1 8 11.2 15.5 0 9.5-4 15.2-11 15.5-1.9 0-5-.8-5-3"/>
+      <path stroke-linecap="square" d="M397 198.3c6.9 1.6 9.3 7.8 9.3 13.8 0 4.9-.5 11.6-10 13.9"/>
+      <path d="M408.4 265.3a3.9 3.9 0 1 0-6.3 2.4"/>
+      <path stroke-linecap="round" d="M394.4 259.4c1.4 2 3 4.1 6.3 6m-1.3 10.5c-3.2-2.2-9.5-5-15-2.2a7.6 7.6 0 0 0-4.4 4.4 10 10 0 0 0 1.8 9.5c.9 1 2.7 2.6 5 2.7 3.8 0 4.7-2.6 4.8-3.2.4-2.8-1.2-3.9-2-4.1-.7-.3-2.8-.2-3.2 1.3-.2.5-.2 1.3.2 2"/>
+      <path stroke-linecap="round" d="M340.5 328.4c1 2.2-.2 3.2-1.6 3.4-2.2.3-3.3-1.4-3.4-3a4.4 4.4 0 0 1 4.3-4.7c2.3 0 4.1 1.5 5 3.5.3.7.5 1.5.5 2.4a5.8 5.8 0 0 1-1.4 4.1 7.5 7.5 0 0 1-5.4 2.5c-4.2.1-7.5-3.8-7.5-7.8 0-7.7 11.4-12 16-13a84 84 0 0 1 17.9-2.4c3.5-.1 6.2 0 10.1-.5 3.5-.3 5.4-.5 9-1.3a27.2 27.2 0 0 0 12.6-6.4c2.9-2.7 4.5-4.5 5.9-8.2a17 17 0 0 0-1.3-13.9 14.3 14.3 0 0 0-10.3-6.8c-3.7-.5-7 1.1-9 4.8-1 1.8-.6 4.8.1 6.2a6 6 0 0 0 4.8 3c3.8 0 4.7-2.6 4.8-3.2.4-2.8-1.2-3.9-2-4.2-.7-.2-2.8-.1-3.2 1.4-.2.5-.2 1.3.2 2"/>
+      <path stroke-linecap="round" d="M337.2 316.2c-4.8 2.1-8.4 3.7-11.4 8.5a9.9 9.9 0 0 0-1.2 4.9c0 2.7 1.1 5.7 3.3 7.6a8.3 8.3 0 0 0 6.7 2c2-.2 3.7-1.6 4-2.6"/>
+      <path d="M385.1 224.1c-2.3.8-3.9 4.2-3.9 7.5a8.4 8.4 0 0 0 4 7.5"/>
+      <path stroke-linecap="round" d="M387.6 236.4c-4 5.1-6.3 8.1-6.4 14.1 0 5.7 1.7 9.6 5.1 13.7"/>
+      <path d="m365.9 152 .3-.5c1.7-2.4 4.7-3.1 6.9-1.5 2.6 2 3.3 5.4 2.6 9-.5 2.2-2 4.1-4 5.5"/>
+      <path stroke-linecap="round" d="M265.1 150.8c-2.6-1.2-4.7-1-6.3 1a8.7 8.7 0 0 0-1.6 7.2c.6 2.7 1.4 3.8 3.5 5.8"/>
+      <path d="M258.6 152a5.8 5.8 0 0 0-8.3 1.6 9.1 9.1 0 0 0-1.6 6.1c.2 4.2 2.8 7.6 5.8 9.2"/>
+      <path d="M249.7 154.8a6.8 6.8 0 0 0-6 6.6c0 4.5 1 6.3 3.5 9.6 2.5 3.4 10.7 9.6 10.7 16.7 0 4.3-1.2 7-4.3 8.4-2 1-4.3 0-5.4-1-2.6-2.4-1.5-6.5 1.2-7 3.3-.6 3.9 4.6.7 4.3"/>
+      <path d="M244 159.2c-2.5.2-5 2.3-5 5 0 3.8 1.5 5.6 4.6 9.4 2.6 3.3 10.1 9 9.9 14.5 0 2-1.5 4.6-2.9 4.3"/>
+      <path stroke-linecap="round" d="M238 236.1c1.3-2.9 4.4-1.6 4.6 0 .4 3.7-2.8 4.8-5.1 4.2a4 4 0 0 1-2.5-2 4.8 4.8 0 0 1-.4-3.7 4.9 4.9 0 0 1 .9-1.6 5 5 0 0 1 1.2-1.2c1-.6 1.9-.6 3.4-.6 5.5 0 10.4 6.5 12 13.4.6 2.2 1.3 7.3.3 12a22.4 22.4 0 0 1-5.8 11.3 25.8 25.8 0 0 1-10 5.8 7 7 0 0 1-3.9.1c-2.8-.9-4.6-3.5-3.2-7 1.2-2.6 5.4-4 7.3-.6.2.3.4.9.4 1.5 0 .9-.4 2-1 2.4-1.4.9-3.7.6-3.6-2"/>
+      <path d="M233.8 270.4c1 .4 1.6.3 2.9-.2l1.8-1c2.6-1.5 5.6-3.8 8.4-9.1a18.8 18.8 0 0 0 1.7-4.5c.3-1 .5-2.2.6-3.3a25.6 25.6 0 0 0-4.8-15.3c-1.1-1.6-2-2.5-4.2-2.6m-9.5 31a3.9 3.9 0 1 1 6.3 2.3"/>
+      <path d="M232.2 261.4a3.7 3.7 0 0 1 3.7-3 3.7 3.7 0 0 1 3.6 3.7 3.8 3.8 0 0 1-1 2.6"/>
+      <path d="M239.4 261.3a15.5 15.5 0 0 0 6.2-12.4c0-4.1-1.6-8.4-3.6-10"/>
+      <path stroke-linecap="round" d="M244.7 259.4a16.5 16.5 0 0 1-6.3 6"/>
+      <path d="M254.6 273.7c-1-2.2-2.8-3.2-5.8-3.5-3-.3-5.5.5-8.2 1.9a18.6 18.6 0 0 0-10.8 17 25 25 0 0 0 2 9.5c.9 1.6 3 9 15.3 14a86.1 86.1 0 0 0 25.7 3.9c10.4.4 20 .8 25.6 7.6"/>
+      <path stroke-linecap="round" d="M239.7 275.9c3.3-2.2 9.5-5 15.1-2.2a8 8 0 0 1 4.3 4.4 10 10 0 0 1-1.8 9.5c-.9 1-2.7 2.6-5 2.7-3.8 0-4.7-2.6-4.8-3.2-.4-2.8 1.2-3.9 2-4.2.7-.2 2.8-.1 3.2 1.4.2.5.2 1.3-.2 2"/>
+      <path d="M252.7 285.7c.3-1 .2-2.2-.8-3.3a5.1 5.1 0 0 0-6-1c-.7.5-1.6 1-2.4 2.2-.4.4-1 1.1-1.2 1.6-.7 1.1-1 2-1 2.5-2.5 7 1.5 14.4 6.5 17.6 4.4 2.8 8.8 3.6 14.4 4 2.5.3 4 .3 6.5.5h9.6a70.1 70.1 0 0 1 7.2 0c3 .3 5.1.4 7.6.8 1.6.2 3.5.5 5.4 1 .6 0 1.2.2 1.8.4l1.2.3c3.6 1.1 7 2.4 9.8 4.2.8.5 1.8 1 2.5 1.7l1.3 1.2c2 2 4 4 4.4 6.7v1.6c0 1.8-1.4 4.3-5.3 5"/>
+      <path d="M298.6 328.4c-1 2.2.2 3.2 1.6 3.4 2.2.3 3.3-1.4 3.5-3a4.4 4.4 0 0 0-4.4-4.7 5.5 5.5 0 0 0-5 3.5 6.9 6.9 0 0 0-.5 2.4 5.8 5.8 0 0 0 1.4 4.1 7.5 7.5 0 0 0 5.4 2.5c4.2.1 7.5-3.8 7.5-7.8 0-7.7-11.4-12-16-13a84 84 0 0 0-17.9-2.4c-3.5-.1-6.2 0-10.1-.5-3.5-.3-5.4-.5-9-1.3a27.2 27.2 0 0 1-12.5-6.4 17 17 0 0 1-4.7-22 14.3 14.3 0 0 1 10.3-6.9c3.8-.5 7 1.1 9 4.8 1 1.8.6 4.8-.1 6.2a6 6 0 0 1-4.8 3c-3.8 0-4.7-2.6-4.8-3.2-.4-2.8 1.2-3.9 2-4.2.7-.2 2.8-.1 3.2 1.4.2.5.2 1.3-.2 2"/>
+      <path stroke-linecap="round" d="m273.3 152-.4-.5c-1.7-2.4-4.7-3.1-6.9-1.5-2.6 2-3.3 5.4-2.5 9a9 9 0 0 0 4 5.5"/>
+      <path d="M366.8 159.6c-4 4.4-8.1 5.8-14.1 6-2 0-5.5-.6-7.6-2.1-1.3-1-2.8-2.6-1.9-5.5.6-1.9 3.7-7.2 3.8-10.9.3-5.6-1.9-8.7-5.3-9.9-6.2-2.2-13 4-17 5.4-2.1.7-3.2.8-5.1.8-2 0-3-.1-5.2-.8-4-1.4-10.7-7.6-17-5.4-3.4 1.2-5.5 4.3-5.3 10 .1 3.6 3.2 9 3.8 10.8 1 2.9-.5 4.5-1.9 5.5-2 1.5-5.7 2.1-7.5 2-6-.1-10.1-1.5-14.1-5.9"/>
+      <path stroke-linecap="round" d="M297.3 314.4c.8.3.2-.2 5.3 2a22 22 0 0 1 11.3 8.9 10.5 10.5 0 0 1 .9 7.3"/>
+      <path d="M297.7 336a8 8 0 0 0 3.2.9c4.2.1 7.5-3.8 7.5-7.8 0-2.8-1.5-5.2-3.6-7"/>
+      <path stroke-linecap="round" d="M298.6 328.4c-1 2.3.4 3.5 1.8 3.7 2.2.2 3.4-1.4 3.6-3a4.5 4.5 0 0 0-2.2-4.2"/>
+      <path d="M390.1 154.8c3.2 0 6 3.6 6 7.2 0 4.3-2.2 6.9-3.9 8.8-1.3 1.6-2.7 3-4.4 4.7"/>
+      <path stroke-linecap="round" d="M386.3 151.4a9 9 0 0 1 2.8 2.4c1.3 2 1.7 3.7 1.6 6.2-.2 4.2-3.2 7.1-6 9m-4.7-17.6.6.7c1.9 2.2 2 5.4 1.6 7.2a8.2 8.2 0 0 1-3.8 5.4m-5-14.4c2.6 2 3.4 5.4 2.5 9-.6 2.5-2.2 4-4.2 5.2m11.1 41.1c.3 1 .9 1.3 1.5 2a13.5 13.5 0 0 0 6.2 3.5c2.4.7 4.6.2 6.3-.9m-163 54c1.2 0 2.5.9 3.3 2.3.1.2.4.8.4 1.5 0 .9-.4 1.8-1 2.2-1.5 1-4 .5-4-2"/>
+      <path d="M241.5 231.3c5 1 9.7 6.9 11.2 13.3.6 2.3 1.3 7.3.3 12a22.4 22.4 0 0 1-6 11.4 16.5 16.5 0 0 1-2.1 1.9l-1 .7m-8-12.1c2 0 3.8 1.9 3.8 4a3.8 3.8 0 0 1-1 2.6"/>
+      <path d="M234.6 260.7c2.1 0 4.1 2 4.1 4.2a3.9 3.9 0 0 1-1.4 3"/>
+      <path stroke-linecap="round" d="M254 239.5a18 18 0 0 1 3.8 7.7m0 8.5a17.3 17.3 0 0 1-1.5 4 17.8 17.8 0 0 1-3.6 4.7"/>
+      <path d="M254.3 224.3c1.8 1.5 3 3 3.5 4.8"/>
+      <path stroke-linecap="round" d="M257.9 219.5a10 10 0 0 1-3.4 4.6m-9.2-17.2 2.2-.6 1.3-1 .8-1.1.7-1.8.3-1.5"/>
+      <path d="M241 199.3c-.7.2-1.6.4-2.5.8a9 9 0 0 0-3.5 3 17 17 0 0 0-2.2 12.7 15.8 15.8 0 0 0 2.3 5.6l1 1.4c1.4 1.3 2.6 2 4.6 1.7"/>
+      <path stroke-linecap="round" d="M253 189.8c-.3 1.3-1 2.9-3 2.7"/>
+      <path d="M245.7 198.5c-2-1.9-6-2.4-10.1.2L234 200a8.8 8.8 0 0 0-1.4 1.6 17.5 17.5 0 0 0-2.4 5c-.7 3-.7 5.6-.6 6.3 0 1 .2 1.9.3 2.7.6 2.8 1.4 4.8 2.3 6.2.9 1.5 3 5 7.7 5.4 1.8.1 4.8-.7 5-3"/>
+      <path stroke-linecap="round" d="M363.8 157c.3-1.6 2.3-1.9 3-1 1.2 1.6.4 4.2-2 4.9a4 4 0 0 1-3.8-1.4c-1-1.3-.9-2.8-.5-4 .2-.8.9-1.5 1.7-2.2 2.7-2 7.1-1.6 8.6 2 1.8 4.4-2.2 7.8-6 10.3-4.6 3.2-10 3.8-14 3.7-9.2 0-16.1-4.4-20.7-7-1-.5-2.1-.4-2.7.3a2 2 0 0 0 .3 2.7"/>
+      <path stroke-linecap="round" d="M365.6 155.5c1 0 1.2.4 1.5.8 1.2 1.5.3 4.1-2 4.9m17.8 51.5c-3.5 3.8-.2 10.3 2.4 11.8.9.7 1.3.3 2 .7"/>
+      <path d="M383.1 205.4c-1.1.8-1.5 1.7-1.6 3.3a5.3 5.3 0 0 0 1.4 4 14 14 0 0 0 9.3 3.7c2 0 4-.4 6-1.7a9 9 0 0 0 3.8-5.4m-20.8 61.8-.2 2.5a18.9 18.9 0 0 1-2 7 18.7 18.7 0 0 1-4.2 5.6 19.6 19.6 0 0 1-5.9 4 24.6 24.6 0 0 1-6.5 2.3 43.8 43.8 0 0 1-13.2.6c-2.7-.2-4.1-.5-6.8-.8-2.2-.1-3.4-.3-5.6-.3a28.3 28.3 0 0 0-10.9 1.9c-2.7 1-5.7 3-6.4 3.8-.6-.9-3.7-2.8-6.3-3.8a22 22 0 0 0-5.2-1.5c-2.2-.4-3.5-.4-5.8-.4-2.2 0-3.4.2-5.6.4-2.6.2-4 .6-6.7.7-2.5.2-3.9.3-6.3.2a33 33 0 0 1-7-.8 24.6 24.6 0 0 1-6.5-2.2 19.6 19.6 0 0 1-5.8-4.1 18.7 18.7 0 0 1-4.2-5.7 19 19 0 0 1-2-6.9c-.2-1-.2-2.5-.2-2.5V169.3h123.2z"/>
+    </g>
+    <g fill="#c7b37f" stroke="#c7b37f">
+      <path stroke-width=".3" d="M248 285.6a2.5 2.5 0 1 1 5 0 2.5 2.5 0 0 1-5 0zM232.5 268c0-1.3.8-2.3 1.8-2.3s1.7 1 1.7 2.3c0 1.2-.8 2.2-1.7 2.2-1 0-1.8-1-1.8-2.2z"/>
+      <path stroke="none" d="M241.3 223.6c0-1 .8-1.8 1.7-1.8 1 0 1.7.8 1.7 1.8s-.7 1.8-1.7 1.8-1.7-.8-1.7-1.8M272 158c0-1 .5-2 1.4-2 .9-.1 1.7.6 1.8 1.6 0 1-.5 2-1.4 2-.9.1-1.6-.6-1.8-1.6"/>
+    </g>
+    <g stroke="#c7b37f" stroke-linecap="round" stroke-width=".6">
+      <path d="M239.3 234c-.4.1-.6.2-.8.5-.3.3-.4.4-.6.9l-.2 1.2m4.7 26.7 1-1 .6-1 .5-1 .7-1.3m-1.3 14-1.5.7-1.1.6a17.4 17.4 0 0 0-1.3.8l-1.2 1m15-37.9-.8-.8-1-.8-.9-.8"/>
+      <path stroke-linecap="butt" d="m254.2 225-1.2.5a5.1 5.1 0 0 1-1.5.3"/>
+      <path d="M237.4 208.4c.2.6.2 1 .5 1.5.2.7.5 1.1.9 1.7a8.3 8.3 0 0 0 2.6 2.7l1.5.8m-1-5.8 1.3.6a7.4 7.4 0 0 0 3 .6l1.8-.1m7.2-40.7-2-1.2c-.9-.5-1.3-.9-2-1.5a9.3 9.3 0 0 1-1.1-1.3l-.8-1.3m7.5-4.6.6 1.7a7.8 7.8 0 0 0 1.4 2c1 1 1.7 1.3 2.8 2.2m1.4-6c.3.7.3 1 .7 1.6.2.5.4.8.8 1.2l1.3 1.3c.7.6 1.2.7 2 1.1"/>
+    </g>
+    <path fill="#703d29" stroke-width=".2" d="M333.3 151.6c0-1.7-1.7-1.8-2.4-1.8-1.8 0-2.3 1.1-4.6 2.3a11.9 11.9 0 0 1-6.7 2 12 12 0 0 1-6.7-2c-2.3-1.2-2.7-2.3-4.6-2.3a2.3 2.3 0 0 0-2.2 2.4v.9l.3.2c0-.8.1-1.2.5-1.7a2.2 2.2 0 0 1 1.6-.8c1.8 0 2.5 1.2 4.8 2.4 3 1.6 4.2 1.9 6.7 2a12 12 0 0 0 6.8-2c2.3-1.2 3-2.5 4.8-2.5.6 0 1 .4 1.3 1v.9l.2.1c0-.3.2-.4.2-1z"/>
+  </g>
+  <g fill="#703d29">
+    <path d="M264.4 294c.5-.5.9-.3 1-.6 0-.2 0-.2-.3-.3l-.9-.2-.8-.4c-.1 0-.4-.2-.5 0-.1.4 1 .4.6 1.4a3.7 3.7 0 0 1-.8 1.2l-2.6 3-.2.1v-4.3l.1-1.8c.2-.4.8 0 .9-.4 0-.1 0-.2-.3-.3-.2 0-.5 0-1.1-.3l-1-.5c-.2 0-.5-.2-.6 0l.1.3c.4.2.5.4.5 1v7.4c0 .5.1.6.2.7.1 0 .2 0 .4-.3z"/>
+    <path d="M267.5 295.2c.3-1.1 1-.4 1-.8.1-.2 0-.2-.2-.3l-1.3-.4c-.4 0-.8-.3-1.2-.4 0 0-.3-.1-.4 0-.1.5 1.1.5.8 1.5l-1.7 5.5c-.3 1-1 .6-1.1 1v.1l1.2.4 1.6.5h.3c.2-.4-1.2-.3-.7-1.7zm3.7 1c.2-.6.5-.5.9-.4 1 .3 1.4 1.3 1 2.5-.2.6-.4 1.2-2 .8-.3-.1-.7-.2-.6-.5l.7-2.3zm-2.8 5c-.5 1.4-1.2.8-1.3 1.2 0 .2.2.2.3.3l1.6.4.8.3h.4c.1-.5-1-.3-.7-1.5l.6-2c.1-.4.1-.5.6-.3.6.1.7.3.8.8l.3 2c.2.9.3 1.7 1 2 .5 0 1.2 0 1.4-.4l-.2-.2h-.3s-.3 0-.3-.3l-.7-3.6c0-.2.4-.2.8-.3a2 2 0 0 0 1-1.3c.1-.5.4-2.2-1.8-2.9l-2.1-.5-1.2-.4h-.3c-.1.5 1.1.4.7 1.7zm8.4 2.5c-.4 1.4-1.4.5-1.5 1 0 .2.1.3.3.3l1.5.3 1.4.4c.3 0 .5.2.6-.1 0-.3-1.3-.3-1-1.8l1.3-5.2c0-.6.2-.6.6-.5l1 .2c1.1.3.5 1.5 1 1.6.2 0 .2-.4.2-.6l.1-1v-.4l-3.3-.7-3.2-.8c-.1 0-.2 0-.2.2l-.5 1.5c-.1.1-.2.4 0 .4.5.1.5-1.5 1.7-1.2l.9.2c.4.1.5.2.4.8zm12.7-3.3c.4-.6.8-.5.9-.7 0-.2-.2-.2-.4-.3h-.9l-.9-.3c-.1 0-.4-.1-.4.1-.1.4 1 .2.8 1.3 0 .2-.1.6-.6 1.3l-2 3.3-.3.2v-.2l-.7-4a5.4 5.4 0 0 1-.1-1.8c0-.5.7-.2.7-.5 0-.2 0-.2-.4-.3l-1.1-.1c-.4 0-.7-.2-1-.3-.2 0-.5-.1-.6.1l.1.2c.5.2.6.4.7.9l1.3 7.3c.1.5.2.7.3.7.1 0 .2 0 .4-.3zm.6 6.8c0 .3 0 .3.2.5.6.2 1 .6 1.7.7 1.4.2 2.6-.7 2.8-2.2.3-1.5-.3-2.1-1.4-2.9-1.3-.9-1.8-1.1-1.7-2 .1-.7.7-1 1.4-1 1.8.3 1.6 2.6 1.8 2.6.3 0 .3-.1.3-.4l.2-1.6v-.4h-.6c-.4 0-.7-.5-1.6-.7-1.2-.2-2.3.7-2.5 2-.2 1.2.4 1.8 1.2 2.4 1.6 1.1 2.2 1.4 2 2.4-.1 1-.9 1.4-1.7 1.3-1.2-.2-1.6-1.4-1.8-2.6 0-.2 0-.3-.2-.3s-.2.3-.2.5v1.7zm15.8-4.5c.3-.7.8-.6.8-.9 0-.2-.1-.1-.4-.2h-.9l-.9-.1c-.1 0-.4 0-.4.2 0 .4 1 0 1 1.1 0 .2-.1.6-.5 1.4l-1.8 3.5-.1.3-.1-.3-1.1-4a5.4 5.4 0 0 1-.3-1.6c0-.5.7-.3.7-.6 0-.2 0-.2-.4-.2h-1.2l-1-.2c-.2 0-.5-.1-.6.1l.2.2c.4.2.6.3.7.8l2.1 7.1.4.7c.1 0 .2 0 .3-.4z"/>
+    <path d="M307.6 308.5c0 1.2-1 1-1 1.5 0 .2.1.1.3.1h2.2l.4-.1c0-.6-1.4.2-1.4-2v-4.2l.1-.1.2.1 5.1 6.3.3.1.2-.3v-6.7c0-1.3 1-1 1-1.3 0 0 0-.2-.3-.2h-2.3c-.2 0-.2.1-.2.2 0 .4 1.3.2 1.3 1.3v4l-.1.4-.4-.3-4.2-5.3c-.2-.3-.1-.3-.4-.3h-1.8l-.2.1c0 .6 1.2-.2 1.2 2.1zM318 303c0-1.1.8-.7.8-1.1 0-.1 0-.2-.4-.2h-2.6s-.3 0-.3.2c0 .4 1.1 0 1.1 1.2v5.7c0 1.1-.8.8-.8 1.2 0 0 0 .2.2.2h2.8c.2 0 .3 0 .3-.2 0-.4-1.2.2-1.2-1.3zm4.5 5.5c0 1.5-1.2 1-1.2 1.4 0 .2.2.2.4.2h3c.3 0 .5 0 .5-.3s-1.4 0-1.4-1.4V303c0-.6 0-.6.5-.6h1c1.2-.1.8 1.2 1.3 1.2.2 0 .1-.4.1-.6l-.1-1c0-.2 0-.4-.2-.4l-3.3.1h-3.3l-.2.3-.1 1.6.1.4c.5 0 .2-1.6 1.4-1.6h.9c.4 0 .5 0 .6.6v5.6zm6.3-2.2h-.4l.1-.5.7-2.2v-.2l.2.1 1 2.1.2.4c0 .2-.2.2-.4.2zm1.8.5c.3 0 .3 0 .8 1l.2.8c0 .7-.7.6-.7 1 0 .1.2.1.4 0h1.2l1.3-.1c.3 0 .4 0 .4-.2 0-.4-.6 0-1-.7l-3.4-7-.3-.4c-.2 0-.2.2-.3.4L327 309c-.2.7-.8.7-.7 1h2.3c.2-.1.5 0 .5-.3s-1.2 0-1.3-.9l.2-1c.2-.8.4-.8.6-.8l2.1-.2zm8.3-5c-.1-.8 0-.8 1.2-1 2-.2 1.4 1.3 2 1.2.2 0 0-.4 0-.6l-.1-1.1c0-.1-.1-.2-.3-.2-1 0-1.7.2-2.4.3l-2.8.4c-.2 0-.3 0-.3.2.1.5 1.3 0 1.4 1l.7 5.5c.2 1.5-.7 1-.6 1.5 0 0 0 .1.2 0l1.4-.1 1.2-.1c.3 0 .5 0 .5-.3s-1.2.1-1.4-1.2l-.2-1.7c-.1-.7-.1-.9.3-1h.8c1.1-.2 1 1.1 1.3 1 .3 0 .2-.4.1-.5l-.3-2.1c0-.3-.2-.3-.2-.3-.3 0-.1 1.1-1 1.2l-.7.1c-.5.1-.5 0-.6-.5zm4 2.8c.4 2.3 2.1 3.7 4.2 3.3 3.4-.7 3.5-3.6 3.2-5.3-.5-2.5-2.3-3.7-4.4-3.3-2.5.5-3.5 2.7-3 5.3m1.1-1c-.3-1.6 0-3.4 1.7-3.7 1.4-.3 3 .8 3.4 3.4.3 2 0 3.6-1.8 4-1.9.4-3-2-3.3-3.6zm8.3-4.1c-.1-.7.2-.8.6-.9 1-.2 1.8.5 2.1 1.6.2.7.3 1.4-1.3 1.8-.3 0-.7.1-.8-.2l-.5-2.3zm0 5.7c.4 1.4-.5 1.3-.5 1.6.1.3.3.2.4.1.6 0 1-.3 1.6-.4l1-.2c.2 0 .2-.1.2-.2 0-.4-1 .3-1.3-1l-.5-2c0-.4-.2-.4.4-.5.5-.2.7-.1 1.1.3l1.3 1.6c.5.6 1 1.3 1.8 1.1.5-.1 1-.5 1-.9l-.2-.1-.3.1s-.3.1-.4 0l-2.4-2.9.5-.6c.2-.4.4-.9.2-1.6-.1-.5-.7-2.1-3-1.6l-2.1.6-1.2.2c-.2 0-.3.1-.2.2 0 .5 1.1-.2 1.4 1zm8.7-2c.3 1.4-1 1.2-.9 1.6 0 .3.3.2.5.2l1.4-.5 1.5-.3c.3 0 .5 0 .4-.4 0-.3-1.3.4-1.7-1l-1.3-5.3c-.2-.5 0-.6.3-.7l1-.2c1.1-.4 1.1 1 1.5.9.3 0 0-.5 0-.7l-.4-1s0-.3-.2-.2l-3.2.9-3.2.7v.3l.1 1.6c0 .2 0 .4.3.4.5-.1-.3-1.6 1-1.9l.8-.2c.4-.1.6 0 .7.5zm5.5-7.3c-.3-1 .6-.9.4-1.3h-.3l-1.4.4-1.2.3s-.3 0-.3.2c.1.4 1.2-.2 1.5.8l1.6 5.6c.2 1-.6 1-.5 1.3 0 .1 0 .2.2.1l1.1-.3 1.6-.4c.3 0 .3-.1.3-.3-.1-.3-1.1.5-1.5-.9zm2.3 2.7c.7 2.3 2.6 3.4 4.7 2.7 3.2-1.1 3-4.1 2.4-5.7-.8-2.4-2.8-3.3-4.8-2.7-2.4.9-3.2 3.2-2.3 5.7m1-1c-.6-1.7-.6-3.5 1.1-4 1.3-.5 3 .4 3.9 2.9.6 1.8.5 3.6-1.2 4.2-1.8.6-3.2-1.5-3.8-3.2zm7.6-5.5c-.2-.7 0-.8.4-1 1-.3 2 .3 2.4 1.4.2.6.4 1.3-1.1 1.9-.3 0-.7.2-.8 0zm.8 5.6c.6 1.4-.4 1.4-.2 1.7 0 .3.2.1.4.1l1.5-.7.9-.2c.2-.1.2-.2.2-.3-.2-.4-1 .4-1.4-.8l-.8-1.9c-.2-.4-.2-.5.3-.7.5-.2.7-.1 1.1.3l1.6 1.4c.5.5 1.1 1.1 2 .8.3-.2.9-.7.7-1l-.2-.1-.2.2h-.5l-2.8-2.5.4-.7a2 2 0 0 0 0-1.6c-.1-.6-1-2-3.1-1.2l-2 .9-1.2.4-.2.2c.2.4 1.1-.4 1.6.8l2 5z"/>
+  </g>
+  <g fill="#fedf00" transform="matrix(.64 0 0 .64 0 16)">
+    <path fill="#d52b1e" d="M412.7 249.3h82.1v82h-82.1z"/>
+    <path id="ad-a" fill="#fff" d="M451.2 313.8s0 3-.8 5.3c-1 2.7-1 2.7-1.9 4a13.2 13.2 0 0 1-3.8 4c-2 1.2-4 1.8-6 1.6-5.4-.4-8-6.4-9.2-11.2-1.3-5.1-5-8-7.5-6-1.4 1-1.4 2.8-.3 4.6a9 9 0 0 0 4.1 2.8l-2.9 3.7s-6.3-.8-7.5-7.4c-.5-2.5.7-7.1 4.9-8.5 5.3-1.8 8.6 2 10.3 5.2 2.2 4.4 3.2 12.4 9.4 11.2 3.4-.7 5-5.6 5-7.9l2.4-2.6 3.7 1.2z"/>
+    <use xlink:href="#ad-a" width="100%" height="100%" transform="matrix(-1 0 0 1 907.5 0)"/>
+    <path d="m461.1 279 10.8-11.7s1.6-1.3 1.6-3.4l-2.2.4-.5-1.2-.1-1.1 3-.7V260l.3-1.3-3.2.2.3-1.4.5-1 1.9-.4h1.9c1.8-3.4 9.2-6.4 14.4-1 3.8 4 3 11.2-2 13.2a6.3 6.3 0 0 1-6.8-1.1l2-4c2.7 1.7 5-.3 4.8-2.4-.2-2.7-2-4.3-4.3-4.5-2.3-.2-4 1-5 3-.6 1.3-.3 2.2-.5 3.6-.2 1.5 0 2.3-.5 3.8a8.8 8.8 0 0 1-2.4 3.6l-11 12-43 46.4-3.2-3z"/>
+    <path fill="#fff" d="M429.5 283s2.7 13.4 11.9 33.5c4.7-1.7 7.4-2.8 12.4-2.8 4.9 0 7.6 1 12.3 2.8A171 171 0 0 0 478 283l-24.2-31z"/>
+    <path d="m456.1 262.4 16.8 21.7s-2.2 10.5-9 26.3c-2.7-.6-5-1.1-7.8-1.3zm-4.7 0-16.8 21.7s2.2 10.5 9 26.3c2.7-.6 5-1.1 7.8-1.3z"/>
+  </g>
+  <g fill="#d52b1e">
+    <path fill="#fedf00" d="M322.3 175.5h52.6V228h-52.6z"/>
+    <path d="M329.7 175.5h7.8V228h-7.8zm15 0h7.8V228h-7.8zm15 0h7.9V228h-7.9z"/>
+  </g>
+  <g fill="#d52b1e" stroke="#d52b1e" stroke-width=".5">
+    <path fill="#fedf00" stroke="none" d="M264.3 273.5c.1 1 .5 2.6 1.4 4.3 1 1.5.6 1.4 2.7 3.8a15.3 15.3 0 0 0 4 2.9 32.7 32.7 0 0 0 15 2.6c2.7-.1 4.8-.4 6.6-.7a71 71 0 0 1 11-.6c1.5 0 3 .3 4.7.6 3.5.7 7 2 7 2v-54.7h-52.6V271l.2 2.4z"/>
+    <path stroke-width=".3" d="m270.4 283.1 2.5 1.5 3.4 1.2v-52.2h-5.9zm29.2 2.4v-51.9h-5.8v52.8l5.8-.7zm11.7-51.9h-5.8v52.1c1.9.2 3.8.6 5.8 1zm-23.4 0V287s-3.8.2-5.8 0v-53.4z"/>
+  </g>
+  <g transform="matrix(.64 0 0 .64 0 16)">
+    <path fill="#fedf00" d="M585.5 402.4a20.8 20.8 0 0 1-2.2 6.6c-1.5 2.3-1 2.3-4.3 6a26.3 26.3 0 0 1-13 7 51.8 51.8 0 0 1-16.6 1.6c-4.3-.2-7.5-.7-10.3-1-3.8-.6-6.7-.9-11-1a62.9 62.9 0 0 0-6.2 0 83.3 83.3 0 0 0-18.3 4.2V340h82.2v58.5z"/>
+    <g id="ad-b">
+      <path fill="#d52b1e" d="m524.6 347-.6.2-.8.8c-.4.4-.7.5-1.2.8l-.6.5c-.3.3 0 .6-.3 1-.1.4-.3.6-.6 1-.4.4-.7.5-1 1l-1.2 1-.3.1h-.6c-.4.2-.5.6-.8.8l.3.6.8 1.4c.2.3.2.7.5.8.5.2.9.2 1.3.1.8.2 1.3.2 2 .5l1.5.8c.5.3.8.4 1.3.5h1.8v.3l2 1a1.7 1.7 0 0 0-.1.4c-.1.3-.2.7-.1.8.6 1.9 1.2 3 1.5 3.2.6.2.8.9 1.1 1.5l-.3.3c-.6.6-1.2 1-1.7 1.8-.7 1.2-1.2 1.2-.3 2.8l1.5 2.4c.4.7.6 1.2.8 2 .2.7.3 1.2.3 2l1 .3.7-.6.6-1.2v-1c-.2-.1-.3-.4-.2-.7 0-.4.5-.3.7-.6.3-.5-.4-.8-.7-1.1-.6-.7-1.4-.9-1.6-1.9 0-.2 0-.4.4-.7l2-1.8c.2.1.6.2 1 .1l1.3.4c.6.2.9 0 1.2 0h.4l.1.6c.1 1-.1 3 .2 3.5l.3.6.2.6v2l-.2 1.7c0 .4-.2.7-.5 1-.2.4-.6.4-1 .7v1l1.1.5 1.3.3.7-.3.1-.6.5-.5c.4-.2.8 0 .9-.1.2-.3 0-.4 0-.8 0-.6-.2-1-.3-1.6a11.8 11.8 0 0 1-.1-2.8c0-.6 0-1 .2-1.5.1-1 .4-1.4.6-2.2.3-1 .3-1.6.4-2.5a24.4 24.4 0 0 0 10.1-.6c.8.7 1.7 1.2 2.7 1.6v1c0 .3 0 .4.2.7l.3.3c.3 0 .5 0 .7-.2.2-.2.2-.4.2-.7v-.7h1.8v1.1c.1.3.3.4.5.4a.7.7 0 0 0 .6 0c.3-.2.2-.6.3-1v-.7l1-.4a5.1 5.1 0 0 1 0 .9l-.3.9c-.2.6-.5.8-.8 1.4-.4.6-.5 1-1 1.5l-.6.7-.6.9-.9 1c-.7.6-1.2.2-2 .9l-.3 1 1.4.6 1.3.2.4-.2c0-.3 0-.6.3-.8.2-.3.4-.3.7-.4.4 0 .8 0 1-.2.4-.3.4-1 .7-1.5a12.7 12.7 0 0 1 3-3.9l1.7-1.4c.2-.4.5-.5.5-1l-.2-.6-.2-1c1.5.7 1 .7 1.2 1.4.3.6 0 1 .1 1.7.1.8.5 1.1.5 1.9.1.9-.1 1.4-.3 2.3-.1.8-.1 1.3-.5 2a3.8 3.8 0 0 1-1.1 1.5l-.6.5-.1 1 1.1.4 1.6.4.4-.3c.2-.7 0-1.7.4-1.7.4-.1.7 0 .8-.3v-.7l.7-4.5.4-1.9.4-1.7c.7-2-.2-2.3-1-3.6-.5-.7-.7-1-.7-1.5V362a42.7 42.7 0 0 1 0-2.8l.4-.2c1.2-.7 1.7-.9 2.4-2.5a3.4 3.4 0 0 0 .3-1.5v-1l-.4-1a3.2 3.2 0 0 0-.6-.8c-.7-1-1.7-1.1-2.7-1.5-1.5-.5-2.5-.4-4-.5-1.8-.2-2.7-.2-4.4 0-2 0-3.1.4-5.1.7l-4.9.4c-2.3 0-4.4-.5-5.8-.4-2.4.2-2.5.8-6.2 1.1a67 67 0 0 1-3.8.2l-2.2-.7c.9-.3 1.1-.5 1.5-1 .3-.4.2-.7.6-1.1l.7-1a2.2 2.2 0 0 0-.9-.4h-1a3 3 0 0 0-1.2.3l-.8.6-2.2-1.2a8.8 8.8 0 0 0-3-.9zm2 11.8"/>
+      <g fill="none" stroke="#fedf00" stroke-linecap="round">
+        <path d="m568.8 359.5-.8.3c-.9.4-1.6.4-2.6.5-2.6.2-4.3-1.1-7-.9-1.4.1-2 1.2-3.5 1.6a9.3 9.3 0 0 1-1.7.2l.5-1s-1.2.3-2 .3a7.5 7.5 0 0 1-1.6-.2l1-1-1.3-.2a4 4 0 0 1-1-.7 20.5 20.5 0 0 0 1.7-.3c1.5-.4 2-1.2 3.9-1.4 1.1 0 3 0 7.6.8 3 .5 4.4.2 5.5-.3.8-.3 1-1 1.1-1.8.1-.8-.4-1.4-.8-1.8-.1 0-.5-.3-1.1-.4"/>
+        <path fill="#fcd900" stroke-linecap="butt" stroke-width=".5" d="M524.8 350.6c-.5 0-.9 0-1.3.3-.5.3-.6.7-1 1.1.5.1.8.4 1.2.3.4 0 .5-.2.8-.5.3-.4.4-.7.4-1.2z"/>
+        <path d="M536 363.8a13.6 13.6 0 0 0 1 2.3c.2.8 0 1.2.2 2v1.6m6.8-7-.3 1.3-1 3.5v.7m-11-4c.9.2.6 3.3 1.9 4"/>
+        <path stroke-linecap="butt" d="m560.1 369.8.4-.3a8.2 8.2 0 0 0 2.7-1.8"/>
+        <path d="M552.4 368c3.5-.9 5.9-2.6 7.6-2.9m-4-1.5h.8c1.5-.3 1.7.6 2.7 1.2 1.9 1 2.1 2.3 4.3 3.4l.4.1.8.4"/>
+        <path fill="#fcd900" stroke-linecap="butt" stroke-width=".5" d="M517.7 354.5h.7l.8-.2c.3 0 .5 0 .7.2.2 0 .2.1.3.3 0 .2.2.3.1.5 0 .2-.3.4-.6.4-.2 0-.4 0-.5-.3a.5.5 0 0 1 0-.4 1 1 0 0 1-.9 0 1 1 0 0 1-.6-.5z"/>
+      </g>
+      <path fill="#0065bd" d="m525.1 364.2-2-.9c.4-.2.7-.2 1-.5.3-.4.3-.8.5-1.3s.2-1 .7-1.4c.3-.2.8-.2 1.1-.1.4 0 .8.4.9.7 0 .6-.2 1-.3 1.5 0 .6-.3.9-.2 1.4 0 .4.2.6.4 1l-2-.4zm-1 1a.6.6 0 1 1 .7.5.6.6 0 0 1-.7-.6zm-1.7-16.6h-.2c-.4-.4-.4-.8-.6-1.2a4 4 0 0 1-.3-1.2v-2c0-.3 0-.6-.2-.9 0-.2-.4-.3-.3-.4 0-.1.3 0 .4 0 .4 0 .6.1 1 .4.3.3.5.6.6 1l.4 1.5.3.8.5.6-.7.8zm3.6 10.6 2.2 1a9.2 9.2 0 0 0 3.5-3.8c.9-1.8 1-2.7 1.4-4.4l-1.8-.5h-.4c-.5 1.8-.7 2.7-1.6 4.2-.8 1.3-1.7 2.3-2.6 3zm5 18.2.8-1.3 1.4-1.1h.4a8.7 8.7 0 0 1-.5 2.8l-.4 1-.5.5c-.5-.8-1.3-1.3-1.3-2zm33 1.8 1.4.6 1.5.9v.5l-1.5.2a8.4 8.4 0 0 1-1.3 0h-1l-.6-.4c.5-.7.8-1.6 1.4-1.8zm-9.8-2 1.4.5 1.5 1c0 .1.1.3 0 .4a9 9 0 0 1-2.7.3l-1-.1-.7-.3c.6-.7.9-1.7 1.5-1.8m-17.4 2.1 1.5.5 1.5 1v.5a9 9 0 0 1-2.8.2h-1l-.6-.4c.5-.7.8-1.6 1.4-1.8m-9-29.8c-.6-.3-1-1-.6-1.6.1-.2.4-.2.6-.4.2-.3.1-.5 0-.8l-.1-1-.2-1c0-.6 0-1 .4-1.6.2-.3.7-.6.8-.6.2.1 0 .5 0 .8 0 .5.1.7.3 1.2l.7 1.3c.2.6.4.8.4 1.4 0 .5 0 .7-.2 1.2a2 2 0 0 1-.6.8 2 2 0 0 1-.8.4 1.1 1.1 0 0 1-.6 0z"/>
+    </g>
+    <use xlink:href="#ad-b" width="100%" height="100%" y="36.6"/>
+  </g>
+  <path fill="none" stroke="#703d29" stroke-width=".5" d="M264.1 175.5h52.6V228h-52.6zm58.2 0h52.6V228h-52.6zm-58 98c.1 1 .5 2.6 1.4 4.3 1 1.5.6 1.4 2.7 3.8a15.3 15.3 0 0 0 4 2.9 32.7 32.7 0 0 0 15 2.6c2.7-.1 4.8-.4 6.6-.7a71 71 0 0 1 11-.6c1.5 0 3 .3 4.7.6 3.5.7 7 2 7 2v-54.7h-52.6V271l.2 2.4zm110.4 0a13 13 0 0 1-1.4 4.3c-1 1.5-.6 1.4-2.7 3.8a15.4 15.4 0 0 1-4 2.9c-1.3.7-2.3 1-4.4 1.6a32.6 32.6 0 0 1-10.6 1c-2.7-.1-4.8-.5-6.5-.7a71 71 0 0 0-7.2-.6 40.5 40.5 0 0 0-3.9 0c-1.5 0-3 .3-4.7.6-3.5.7-7 2-7 2v-54.8H375v37.5l-.2 2.4z"/>
+</svg>

internal/app/api/core/frontend-dist/assets/ad-g7Vp50gE.svg

@@ -0,0 +1,148 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-ad" viewBox="0 0 512 512">
+  <path fill="#d0103a" d="M0 0h512v512H0z"/>
+  <path fill="#fedf00" d="M0 0h348.2v512H0z"/>
+  <path fill="#0018a8" d="M0 0h163.8v512H0z"/>
+  <path fill="#c7b37f" d="M240.3 173.3c6.2 0 8.7 5.3 14.9 5.3 3.8 0 6-1.2 9.3-3.1 2.4-1.3 3.8-2 6.5-2s4.4.8 5.8 3.1a9 9 0 0 1 1 5.4 32 32 0 0 1-2.1 6.7c-.5 1.2-1 2-1 3.3 0 3.3 4.4 4.4 7.4 4.5.7 0 6.3 0 9.7-3.4-1.9 0-4-1.5-4-3.4 0-2 1.5-3.5 3.5-4.1.4-.1 1 .2 1.4 0 .5-.2.2-.8.7-1.1 1-.8 1.6-1.3 2.9-1.3a3 3 0 0 1 2 .6c.3.2.5.6.9.6 1 0 1.4-.6 2.3-.6.7 0 1.2 0 1.8.4.6.3.6 1.2 1.2 1.2.3 0 1.9-.6 2.8-.6 1.7 0 2.7.6 3.8 2 .3.3.5 1 .8 1a5 5 0 0 1 3.9 2.4c.2.3.5 1.1.9 1.3.4.1.7.1 1.3.5a4.8 4.8 0 0 1 2.3 3.9c0 .5-.3 1.2-.4 1.7-1.5 5.2-5.1 7-8.7 11.4-1.6 2-2.8 3.5-2.8 6 0 .6.8 1.7 1 2.2-.1-1.2.4-2.6 1.6-2.7 1.7 0 3 1.2 3.2 2.8 0 .4 0 1.1-.2 1.5.9-.6 2-1 3.2-1.1a9.9 9.9 0 0 1 1.5 0 13 13 0 0 1 7.4 3 16.9 16.9 0 0 1 5.9 13.4c-.7 4.3-.3 11.9-11 15 2 .8 3.3 2.3 3.3 4.1 0 2-1.5 3.8-3.5 3.8a3.5 3.5 0 0 1-2.8-1.1c-2.2 2.2-2.7 4.5-2.7 7.7 0 1.9.4 3 1.2 4.7a9 9 0 0 0 3 4.2c.8-1.2 1.6-2 3-2 1.5 0 2.7.4 3.3 1.7.1.3 0 .7.2 1 .2.5.7.6 1 1.1.3.8 0 1.4.3 2.2.2.5.7.6 1 1 .3.9.4 1.4.4 2.3 0 2.4-2.2 4-4.6 4-.8 0-1.2-.2-1.9-.1 1.4 1.3 2.4 2 3.5 3.6a14.1 14.1 0 0 1 2.3 8.2c0 3.6-.6 5.8-2.2 9a16 16 0 0 1-5.6 6.8 28 28 0 0 1-12.8 5c-3.4.7-5.3 1-8.8 1.2l-11.3.6c-5.7.4-9.7 1.2-13.8 5.3 2 1.4 3.3 2.8 3.3 5.2 0 2.4-1.5 4.2-3.9 5-.5.1-1 0-1.4.2-.6.3-.6 1-1.2 1.4a5 5 0 0 1-3 .8c-2.2 0-3.6-.5-5.2-2-1.7 1.4-2.3 2.7-4.3 3.9-.7.3-1 .8-1.7.8-1.2 0-1.8-.7-2.7-1.4a18.4 18.4 0 0 1-3.6-3.3c-1.8 1.1-2.9 2-5 2a5.2 5.2 0 0 1-3.1-.9c-.6-.3-.7-.9-1.3-1.2-.6-.4-1-.2-1.7-.5-2.4-1-4-2.8-4-5.5 0-2.3 1.5-3.8 3.6-4.7-4-4-8-4.7-13.6-5-4.4-.4-7-.4-11.3-.7-3.4-.2-5.4-.6-8.8-1.1-2.6-.4-4.1-.6-6.5-1.7-8.2-3.8-13.4-9-14.5-18v-2c0-4.7 1.8-7.5 5-10.8-.8-.2-1.3 0-2.2-.2-2-.8-3.5-2.2-3.5-4.4 0-.8 0-1.4.4-2 .3-.6.8-.7 1-1.2.1-.8 0-1.3.3-2 .2-.5.6-.5.8-1 .7-1.5 1.6-2.7 3.3-2.7 1.4 0 2.3.8 3 2 1.4-.7 1.8-1.7 2.6-3 1.3-2.2 1.8-3.7 1.8-6.2a11 11 0 0 0-.7-4.4c-.4-1.2-.5-2-1.4-3a3.5 3.5 0 0 1-2.8 1.2c-2.3 0-4-2-4-4.3 0-1.7.8-3 2.4-3.7-1.3-1-2.4-1.2-3.7-2-2.1-1.4-2.9-2.7-4.2-4.8-1-1.4-1.2-2.3-1.6-3.8a15 15 0 0 1-.9-5v-1.3c.6-3.9 1.3-6.4 3.8-9.5a11 11 0 0 1 4.6-3.9 11.6 11.6 0 0 1 6.5-1.3c1 .2 1.5.2 2.3.7.3.2.9.7.9.3l-.2-1c0-1.7 1.2-3.2 2.8-3.2 1.2 0 1.7 1 2.3 2 .4-.6.6-1 .6-1.7 0-2.8-1.5-4.2-3.2-6.3-3.7-4.7-8.4-6.9-8.4-12.8 0-1.8.9-3 2.4-4 .4-.2 1 0 1.5-.2.3-.3.3-.7.5-1.1a4 4 0 0 1 1.3-1.3c.8-.8 1.6-.5 2.5-1.2.5-.3.6-.7 1-1.2 1-1.2 2-1.8 3.6-1.8.8 0 1.3 0 2 .3.3 0 .8.5.9.4.1-.2.6-.7 1.1-1 .7-.3 1-.4 1.8-.4.9 0 1.4.5 2.3.5.4 0 .4-.3.7-.5.8-.5 1.2-.8 2.2-.8 1 0 1.4.3 2.2.8.7.4.8 1 1.6 1.5l1.2.3c2 .6 3.6 2 3.6 4.2 0 1.2-.2 2-1.1 2.8-.7.6-1.4.5-2.3.8a13 13 0 0 0 9 2.8c3.5 0 7.6-1.3 7.6-4.7 0-1.6-.9-2.4-1.5-3.8a15 15 0 0 1-1.7-6.9c0-2.2.2-3.5 1.5-5.3 1.3-1.9 3-2.3 5.2-2.3"/>
+  <g fill="none" stroke="#703d29">
+    <path stroke-linejoin="round" stroke-width=".5" d="M217.9 191.2c.2.9.9 1.6 2 2a3 3 0 0 0 3-1.1c.8-1 .7-2.3.5-3.3a3.8 3.8 0 0 0-1.4-1.8z"/>
+    <path stroke-linecap="round" stroke-width=".5" d="M320.8 252.9c-1-2.3-3.4-1.3-3.6 0-.3 3 2.3 3.8 4.1 3.3.9-.2 1.6-.8 2-1.5.5-.8.6-2 .3-3a4 4 0 0 0-.7-1.3 4 4 0 0 0-1-1c-.7-.4-1.5-.5-2.7-.5-4.4 0-8.3 5.3-9.6 10.8a23.6 23.6 0 0 0-.2 9.6 18 18 0 0 0 4.7 9 20 20 0 0 0 7.9 4.7c1.1.3 2.2.3 3.1 0 2.7-.5 3.9-3 2.6-5.5-1.1-2-4.3-3.2-5.8-.6a2.6 2.6 0 0 0-.4 1.3c0 .7.3 1.5.8 1.8 1.2.8 3 .6 3-1.5"/>
+    <path stroke-width=".7" d="M307 283.2a9 9 0 0 1 5.3-3c2.4-.2 4.5.5 6.6 1.6a14.9 14.9 0 0 1 8.6 13.6c0 3-.8 6-1.5 7.6-.7 1.3-2.5 7.1-12.3 11.2a67.4 67.4 0 0 1-20.5 3c-8.4.4-16 .7-20.5 6.2"/>
+    <g stroke-width=".6">
+      <path d="M309.1 292.6c-.2-.9 0-1.7.7-2.7 1-1.3 2.9-1.7 4.7-.7.6.3 1.3.8 2 1.7l1 1.2.8 2c2 5.6-1.2 11.7-5.2 14.1-3.2 2-7 2.8-11.5 3.3l-5.3.3h-7.6a56.3 56.3 0 0 0-5.8 0l-6 .6-4.4.8-1.5.4-1 .3a31.9 31.9 0 0 0-7.7 3.3c-.7.4-1.5.9-2 1.4l-1.1 1c-1.5 1.4-3.1 3-3.5 5.3v1.3c0 1.4 1.1 3.4 4.3 4m4.4-136.1c.6 1.2 1 2 .6 3.1-.4 1.4-1.4 2.3-2.8 2.3-3.2 0-5-3.8-3.6-6.2 2.5-4.3 7.4-1.9 12 .2-.3-1-.7-1.4-.6-2.8 0-3.3 2.6-4.8 3.6-8 .6-1.8.8-3.4-.6-4.7-1.1-1.2-2.5-1.1-4-.5-3.1 1.2-6.8 4.6-13.3 4.7-6.5 0-10.3-3.5-13.4-4.7-1.5-.6-2.9-.7-4 .5-1.4 1.3-1.2 3-.6 4.8 1 3 3.5 4.6 3.6 8 0 1.3-.3 1.6-.6 2.7 4.6-2 9.7-4.7 12-.2 1.3 2.5-.4 6.2-3.6 6.2-1.4 0-2.4-1-2.8-2.3-.4-1.1 0-2.2.6-3.1"/>
+      <path stroke-linecap="round" d="M251.7 191.9c1.2 1 2 2.1 1.9 4-.1 2-.7 2.5-2.2 3.6m1.9-3c-.1 1.2-.6 2-1.8 2.5"/>
+    </g>
+    <path fill="#c7b37f" stroke="none" d="m221.4 186.6.5.4.6.7.4.8.2.6v1.5l-.2.7-.4.5-.4.5-.7.3-.9.2-.7.2-.8-.4-.8-.5-.4-.7-.3-.8v-.3z"/>
+    <path stroke-linecap="round" stroke-width=".5" d="M220.2 189.7c-.3-1.3-1.8-1.6-2.4-.8-1 1.2-.3 3.2 1.6 3.8a3 3 0 0 0 3-1.1c.8-1 .8-2.3.5-3.2-.2-.7-.7-1.2-1.4-1.7-2.2-1.7-5.7-1.3-6.8 1.5-1.5 3.6 1.7 6.3 4.7 8.3 3.8 2.5 8 3 11.3 3 7.3-.1 12.9-3.6 16.5-5.6.8-.5 1.7-.4 2.1.2.5.6.5 1.5-.2 2.2"/>
+    <path stroke-width=".5" d="m198.4 289-1.6.5-1.7 1.3-.7 1-.9 1.6-.4 1.2-.3 1.5-.2 1m15.2-8v1.4l-.3 1-.7 1.7-1.1 1.5-1.2 1-1 .4-1.2.3"/>
+    <path stroke-width=".6" d="M255.8 327.3c-.3 1.3-1.5 2.8-4.3 3.4h-.5"/>
+    <path stroke-width=".7" d="M323.4 285a14.6 14.6 0 0 1 4.5 10.8c-.1 2.8-.8 6-1.6 7.5-.7 1.3-2.5 7.2-12.3 11.2a67.7 67.7 0 0 1-20.5 3.1c-8.2.4-15.8.7-20.3 6"/>
+    <path stroke-width=".5" d="M310 290.3c.6-.9 2.8-1.9 4.6-1a5 5 0 0 1 2 1.7"/>
+    <path stroke-width=".7" d="m321.3 283 1.1.4a5.6 5.6 0 0 0 3.2 0c2.2-.6 3.7-2.7 2.5-5.5a4.5 4.5 0 0 0-1.4-1.7"/>
+    <path stroke-linecap="round" stroke-width=".5" d="M192.2 223.8c-1.5 1-2.6 1.2-3.8 2.5a22.5 22.5 0 0 0-2.1 5.5m36.9-41.4c0 1.4-1 2.3-2.4 2.6"/>
+    <path stroke-width=".5" d="M317.7 217.6c3.8 0 14.8 2.9 14.9 15.8 0 12.8-8 14.9-11.1 15.7"/>
+    <path stroke-width=".5" d="M318.7 217.6c6.5-.3 13.2 4.5 13.5 16.5.3 9.4-6.4 13.6-9.6 14.5m-7.6 14.1.2-1.2.4-2 .6-1.7.7-1.3.8-1m6.3-2.7-.1 1.2-.4.9-.5.8-.7.5-1 .3h-1.5m-11.4-42.3.3-1.3.6-1.3.7-1.2 1.4-1.7 1-1.2 1.7-1.7 1.5-1.5 1-1.1 1.2-1.5 1-1.7.7-1.3.4-1.8.1-2.1-.2-.7M310 296.7l1.3-.3 1-.5.5-.5.4-.7.2-1v-.6M187 283.3l.9.1h1.2l1.3-.5m4-29.3-.2 1.2-.2.4-.4.5-.5.4-.6.3-.8.1h-.5m8-12.5-.3 1.8-.4.7-.7 1-1 .7-.9.5-1.8.4m12.2-31.8-.3 1-.5.8-.6.9-.8.7-1 .5-.8.2h-.6m.3-5v.8"/>
+    <g stroke-width=".5">
+      <path stroke-linecap="round" d="M203.4 243.3a5.5 5.5 0 0 1-1.6 1M322.2 280l.4.2c1 .7 3.3-.2 2.7-2"/>
+      <path d="M318.2 255.7c.8 1 2.4 1.3 3.6 1 .9-.2 1.5-.8 2-1.6.4-.8.6-1.9.3-3a4 4 0 0 0-.7-1.3 5.4 5.4 0 0 0-1.1-1.1l-.3-.2m5.2 27.2a3.1 3.1 0 0 0 0-.6c0-.9-.4-1.7-1-2.3-.2-.2-.4-.5-.7-.6m.4.3c0-1.5-1.3-2.5-2.8-2.8m-3.3 2.3c-.4-.3-.8-.5-1-.9a12.6 12.6 0 0 1-3.5-8.5c0-3.3 1.3-6.7 2.8-8M273 323.3l1.5-1.3 1-.8 1.8-1.1 1.8-.9 1.2-.3 2.5-.5 2.9-.5M262 333.4a14.1 14.1 0 0 1-6.1 5 14.1 14.1 0 0 1-6.1-5"/>
+      <path stroke-linecap="round" d="M251.5 330.1a8 8 0 0 1-1.7 3.3"/>
+      <path d="m251.8 328.4-.4 1.8m-1.8 3.3-.8.8-1.4.7-1.5.5m-4.5-142.2c.2-.6.4-1.1.3-2.1 0-3.4-2.5-4.9-3.5-8-.6-1.8-.9-3.4.5-4.8 1.2-1.1 2.5-1 4-.5 3.2 1.2 6.9 4.7 13.4 4.8-6.5-.1-10.2-3.6-13.3-4.8-1.6-.6-3-.8-4.2.4-1.4 1.3-1 3-.4 5 1 3 3.3 4.5 3.4 7.9 0 1-.2 1.5-.4 2m14.9-10.7c6.4-.4 11.9-4.7 13.7-5 1.6-.3 2.4-.2 3.6.9-1.2-1.1-2.5-1-4-.5-3 1.2-6.8 4.7-13.3 4.8m63.7 90.3a12.4 12.4 0 0 1-5-9.9c0-3.3 1.3-6.7 2.9-8m-56 78a14.1 14.1 0 0 1-6 5 14 14 0 0 1-6.2-5"/>
+      <path stroke-linecap="round" d="m245.3 195 1.9-1c.8-.6 1.9-.5 2.3 0 .5.7.6 1.7-.1 2.3"/>
+      <path d="M235.8 199.4c4.4-.9 8-2.9 10.6-4.4m25.9 131.4.6.7.2.7c.2 1.2-.6 2-1.5 2.1a2.7 2.7 0 0 1-2.8-1.6m-33.3-129.1c4.4-1 8-2.9 10.7-4.4m78 85.5c-.7.3-1.2.3-2.2-.2l-1.5-.8c-2-1.1-4.5-3-6.8-7.2a15 15 0 0 1-1.3-3.6c-.2-.9-.4-1.8-.4-2.7a20.5 20.5 0 0 1 .5-5 16.2 16.2 0 0 1 3.2-7.2c1-1.3 1.7-2 3.5-2m-115-31.5a5.7 5.7 0 0 1 2.1 4.6c0 2.5-2 6.5-7.2 8-2 .5-3.8 0-5-.7"/>
+      <path d="M205 228.5c1 .6 1.3 1.4 1.3 2.6 0 .8-.5 2-1.5 3a9.9 9.9 0 0 1-7 3.2 8.2 8.2 0 0 1-4.8-1.4 7.3 7.3 0 0 1-3-4.3"/>
+      <path d="M205 233.8c1 1 1.3 2.2 1.3 3.7 0 2.2-.9 3.9-3 5.7a5 5 0 0 1-1.5 1m103.6-17.6v2.9m-.3-3.6v4m.3-12.6v5.2m-.3-6.3v7m-1.5 65.7c-1 2-1.8 3-3.3 4.5a15.7 15.7 0 0 1-4.7 3.3 19.7 19.7 0 0 1-5.2 1.7c-2.1.5-3.4.6-5.5.7-2 0-3.1 0-5.1-.2-2.1 0-3.3-.4-5.4-.6-1.7-.1-2.7-.3-4.5-.3a22.8 22.8 0 0 0-8.7 1.5c-2.2.9-4.6 2.4-5.1 3-.5-.6-3-2.1-5.1-3a22.8 22.8 0 0 0-8.8-1.5c-1.7 0-2.7.2-4.4.3-2.1.2-3.3.5-5.4.6a37.3 37.3 0 0 1-10.6-.5c-2.1-.5-3.3-.8-5.3-1.8a15.7 15.7 0 0 1-5-3.7m33.6 42.7 1.5-.2m24.2-1.9 1.4-.1 1.4-.6 1-.5 1.3-1.6.3-.6.2-1.3v-.6M314 218.8c.6-2.1-.2-4.3-2.2-4.3m-105.6 37.3a6.5 6.5 0 0 1-2.9 3.7m3-37.4a5.2 5.2 0 0 1-3 3.2c-1.4.7-3.2 0-4-.6"/>
+      <path stroke-linecap="round" d="M195 225.9c1.3.6 2.5-.3 2.3-1.9a2.3 2.3 0 0 0-2-1.8"/>
+      <path d="M200.1 293.3c.3.3.4.6.7.6.5.1 1 .3 1.5-.4.7-.9.3-2.2-.4-3.1a4 4 0 0 0-4.7-.7c-.5.3-1.3.7-2 1.6l-.9 1.3-.9 2c-1.6 4.6.3 9.5 3.4 12.5"/>
+      <path stroke-linecap="round" d="m272.2 326.3.5.6.2.7c.2 1.2-.6 2-1.6 2-1.3.2-2.2-.6-2.7-1.6"/>
+      <path d="M311.6 187.8a6 6 0 0 1 5 5.6c0 3.6-1.2 4.9-3.1 7.4-2 2.7-8.5 7.7-8.5 13.4 0 3.4 1 5.6 3.4 6.7 1.6.7 3.5 0 4.3-.8 2-1.9 1.3-5.2-1-5.6-2.5-.4-3 3.7-.5 3.4m14.3 55.3a3 3 0 0 0-2.9-2.5 3 3 0 0 0-3 3c0 .8.4 1.5.9 2"/>
+      <path d="M307.1 220.1a5.7 5.7 0 0 0-2.1 4.6c0 2.5 2 6.5 7.2 8 1.9.5 3.8.4 5-.3m-124.9-8.2a7.5 7.5 0 0 0-3.8 2.7 13.5 13.5 0 0 0-1.9 4.9c-.1.7-.3 3 .1 5.3a12.7 12.7 0 0 0 1.9 4.5l.8 1 .9.7m51.2 73.6c3.9 1.8 6.7 3 9.2 6.9a8.2 8.2 0 0 1-1.7 10 6.6 6.6 0 0 1-5.4 1.6c-1.5-.2-3-1.3-3.2-2m-37.2-90a6.6 6.6 0 0 1 3.1 6c0 3-1.5 4.8-3.2 5.9"/>
+      <path stroke-linecap="round" d="M201.2 253.1c3.3 4.1 5 6.5 5.1 11.3.1 4.6-1.4 7.7-4 11"/>
+      <path d="M263.8 199.5a3.3 3.3 0 0 0 1.3-1.8c.4-1.2.4-2.2-.3-3.1.8 1 .9 1.9.7 3.1-.2.8-.7 1.2-1.3 1.8m41.2 69v12.8a19.6 19.6 0 0 1-.3 3.4m0-17.5V283l-.4 2.1m.4-34.3v11.6m.3-10.7v9.4m0-21.5v7.1m-.3-7.9v8.8m.3-15.2v2.8m-.3-3.4v4m-1.4 52.2-.3.5a15 15 0 0 1-3.4 4.6 15.7 15.7 0 0 1-4.6 3.2 19.7 19.7 0 0 1-5.3 1.8c-2 .5-3.3.6-5.5.7-2 0-3 0-5-.2-2.2-.1-3.3-.4-5.4-.6-1.8-.1-2.8-.3-4.5-.3a22.9 22.9 0 0 0-8.8 1.5c-2.1.9-4.5 2.4-5 3a17 17 0 0 0-5.1-3 22.9 22.9 0 0 0-8.8-1.5c-1.7 0-2.7.2-4.5.3-2 .2-3.2.5-5.4.6a37.3 37.3 0 0 1-10.5-.5 19.8 19.8 0 0 1-10-5 17.6 17.6 0 0 1-1.9-2.3m-1.6-2.5a8 8 0 0 1-1.8 6.2c-.7.7-2.2 2-4 2-3 .1-4-2-4.1-2.5"/>
+      <path d="M204.5 287a8.2 8.2 0 0 1 1.5 2.1c.7 1.4.5 3.8-.1 5a3.7 3.7 0 0 1-.3.3m-16.1 14.4c1.8 2 4.5 4 8.7 5.7a67.4 67.4 0 0 0 20.5 3.1c8 .3 15.5.7 20 5.7m13.9-3.3a12 12 0 0 1 3.2 4.5m-5.9 9.2a7 7 0 0 1-.5.5 6.6 6.6 0 0 1-5.3 1.6 5 5 0 0 1-3.5-2m-4.3-2.4.3.3a6 6 0 0 0 4 2m21.6 0a14.1 14.1 0 0 1-6.1 4.9 14.1 14.1 0 0 1-6.1-5l-.2-.3m12.4.3.6.6a6.6 6.6 0 0 0 5.3 1.6 4.4 4.4 0 0 0 3.3-2l.4-.6"/>
+      <path d="m271.2 333.3-.6 1-.9.7-1.3.6H267"/>
+      <path d="M274.4 324.2a6.1 6.1 0 0 1 1.9 2.3c.2.6.4 1.3.4 2a4.7 4.7 0 0 1-1.1 3.2 6 6 0 0 1-4.4 2 4.4 4.4 0 0 1-.3 0m.1-.2a5.5 5.5 0 0 1-4.1-1.7m51-54.3a19 19 0 0 1-4-5.2 15 15 0 0 1-1.3-3.6c-.2-.9-.4-1.7-.4-2.6 0-1.6.1-3.2.5-5a16.7 16.7 0 0 1 3.3-7.3c.5-.6 1-1.4 1.6-1.8m-1-60.6c2 .2 3.8 2.3 3.8 4.5 0 3.1-1 4.4-3.5 7.4-2.1 2.7-8.5 7.3-8.3 11.7 0 .8.5 1.6 1 2.2M307 220c.4.5 1 .8 1.6 1.1a4 4 0 0 0 3.4-.2m-16.9-34.6a4.8 4.8 0 0 1 1.8 2.1c1.4 3.6-1.8 6.3-4.8 8.3a17 17 0 0 1-6.6 2.6"/>
+      <path d="M291.7 193.2c-.7 0-1.6-.2-2.5-1.2a2.7 2.7 0 0 1-.6-.7m-11.9 3.9a3.7 3.7 0 0 1-1-.8c-.7-.8-1.2-1.9-.7-3.5.5-1.5 3-5.8 3-8.7.3-4.5-1.5-7.2-4.2-8.2"/>
+      <path stroke-linecap="round" d="m277.9 181.2-.1 1.7-.5 1.7-.9 2.3-.7 1.6-.7 1.5-.3 1-.2.8.1.8m30.5 101c0 .3.4.6.4.6a6.2 6.2 0 0 0 4.4 2.5c3 0 3.7-2.1 3.8-2.6.4-2.3-.4-3-1.6-3.6 0 0-.7-.3-1.5-.2"/>
+      <path d="M189.6 283.5a5.5 5.5 0 0 1-3 0c-2.3-.7-4-2.9-3.1-5.5m10.7-25.5c.2.2.3.6.3.8.3 3-2.2 3.8-4 3.4a4.5 4.5 0 0 1-2.5-1.9 3.8 3.8 0 0 1-.5-1.8m17.7-19c.4.5.8 1 1 1.5m-1-6.8c.5.3.8.6 1 1"/>
+      <path stroke-linecap="round" d="M206.3 232.4a6.8 6.8 0 0 1-1.3 2 9.9 9.9 0 0 1-7 3.1 8.2 8.2 0 0 1-4.8-1.4 7.6 7.6 0 0 1-3.3-4.4"/>
+      <path d="M204.3 220.2a6.2 6.2 0 0 1 2 2.7"/>
+      <path stroke-linecap="round" d="M206.3 226.6a9.4 9.4 0 0 1-7 6.3 7 7 0 0 1-5.2-.9"/>
+      <path d="M192 226c.2 2.1 1.7 3.7 4.3 3.8 3.8 0 6-5.4 2.7-9.3"/>
+      <path stroke-linecap="round" d="M183.6 244.4c.5.7 1.2 1.3 1.8 1.9a13.4 13.4 0 0 0 4.8 2.6m4.2.4c3.4-.4 5.3-2.9 4.9-5.8-.3-2.3-2.4-4-3.8-4"/>
+      <path d="M199.9 214.5c1.4 0 2.3 1.3 2.2 2.4"/>
+      <path stroke-linecap="round" d="M199.5 194.5a9.2 9.2 0 0 0 4 4.6M319 224a3.7 3.7 0 0 1-3.3 5.7 4.2 4.2 0 0 1-3.5-2"/>
+      <path d="M305.4 199.3v12.6"/>
+      <path stroke-linecap="round" d="M195 225.9c1.2.8 2.6-.6 2-2.1-.3-1-1.8-2.1-3.8-.8-2.1 1.5-1.5 6.3 2.7 6.3 3.7.1 6-5.4 2.7-9.2-3.2-3.7-9-2.9-13 .2a17.1 17.1 0 0 0-5.6 9.3 17 17 0 0 0 0 7.4 16.7 16.7 0 0 0 2.4 6l1 1.3 1.6 1.6a12 12 0 0 0 8.3 3c3.8-.1 6-2.8 5.5-5.9-.4-3-3.4-4.5-5.4-3-1.3.9-1.8 3.8.6 4.5 1.3.4 2.5-1.3 1.6-2.3m103.6-57.5c2.2-1.2 3.8-1 5 .7a7.9 7.9 0 0 1 1.3 5.8c-.4 2.2-1 3-2.8 4.6"/>
+      <path stroke-linecap="round" d="M304.4 185.6c2.5-1.6 5.2-1 6.6 1.3a7.3 7.3 0 0 1 1.3 4.9 9 9 0 0 1-4.6 7.3"/>
+      <path d="M316 191.3c2 .2 3.7 2 3.7 4.2 0 3-.8 4.4-3.3 7.4-2.1 2.6-8.4 7.2-8.3 11.7 0 1.6 1.5 3.2 2.7 3.3"/>
+      <path stroke-linecap="round" d="M316.3 225.9c-1.2.8-2.6-.5-2-2 .4-1 1.8-2.2 3.7-.9 2.2 1.5 1.6 6.3-2.6 6.3-3.7.1-6.3-5.2-2.7-9.2 3.3-3.7 9.4-3 13.2 0 1.6 1.4 5 5 5.6 9.6.9 5.6.7 12.6-5 16.8a13.8 13.8 0 0 1-8.5 2.4c-3.8-.1-6-2.8-5.5-5.9.4-3 3.3-4.3 5.4-3 2.2 1.1 1.8 4.3-.6 4.5-1.4.2-2.5-1.3-1.6-2.3"/>
+      <path d="M314.3 224c.6-2.9 3-3.1 5-3.1 5.2 0 8.9 6.3 9 12.4 0 7.6-3.3 12.1-9 12.3-1.3.1-3.8-.6-3.9-2.3"/>
+      <path stroke-linecap="square" d="M317.5 222.7c5.6 1.2 7.6 6.2 7.6 11 0 3.9-.4 9.2-8 11"/>
+      <path d="M326.7 276.3a3.1 3.1 0 1 0-5 1.8"/>
+      <path stroke-linecap="round" d="M315.6 271.5a13.3 13.3 0 0 0 5 4.8m-1 8.4c-2.7-1.7-7.7-4-12.2-1.8a6.3 6.3 0 0 0-3.4 3.5 8 8 0 0 0 1.5 7.7 6 6 0 0 0 4 2.1c3 0 3.7-2 3.8-2.5.3-2.2-1-3.1-1.6-3.3-.6-.2-2.2-.2-2.6 1-.1.4-.1 1.1.2 1.6"/>
+      <path stroke-linecap="round" d="M272.4 326.7c.8 1.8-.1 2.6-1.3 2.7-1.7.2-2.6-1.1-2.7-2.3-.2-2 1.5-3.9 3.5-3.8a4.4 4.4 0 0 1 4 2.8c.2.6.3 1.2.3 1.9a4.7 4.7 0 0 1-1.1 3.3 6 6 0 0 1-4.3 2c-3.4.1-6-3-6-6.3 0-6.1 9.1-9.5 12.8-10.4a67 67 0 0 1 14.3-1.8c2.9-.2 5-.1 8.1-.4 2.8-.3 4.3-.5 7.2-1.1a22 22 0 0 0 10-5.2 13.7 13.7 0 0 0 3.7-17.7 11.5 11.5 0 0 0-8.2-5.3c-3-.5-5.6.8-7.2 3.8a6.2 6.2 0 0 0 .1 5c.5.9 2 2.3 3.8 2.3 3 0 3.8-2 3.9-2.5.3-2.2-1-3.1-1.6-3.3-.6-.2-2.2-.2-2.6 1-.1.4-.1 1.1.2 1.6"/>
+      <path stroke-linecap="round" d="M269.8 317c-4 1.7-6.8 3-9.2 6.7a7.9 7.9 0 0 0-1 4c0 2.1 1 4.5 2.7 6a6.6 6.6 0 0 0 5.4 1.7c1.5-.2 3-1.3 3.2-2"/>
+      <path d="M308 243.3c-1.7.6-3 3.4-3 6 0 3 1.4 5 3.2 6"/>
+      <path stroke-linecap="round" d="M310 253.1c-3.2 4.1-5 6.5-5 11.3-.1 4.6 1.3 7.7 4 11"/>
+      <path d="m292.7 185.6.3-.4c1.3-2 3.7-2.5 5.5-1.2 2 1.6 2.6 4.3 2 7.2a7 7 0 0 1-3.2 4.4"/>
+      <path stroke-linecap="round" d="M212 184.7c-2-1-3.7-.8-5 .7a7.5 7.5 0 0 0-1.2 5.8c.4 2.1 1 3 2.8 4.6"/>
+      <path d="M206.9 185.6c-2.5-1.6-5.2-1-6.6 1.3a7.3 7.3 0 0 0-1.3 4.9 9 9 0 0 0 4.6 7.3"/>
+      <path d="M199.7 187.8a5.5 5.5 0 0 0-4.8 5.3c0 3.6.9 5 2.9 7.7s8.5 7.7 8.5 13.4c0 3.4-1 5.6-3.4 6.7-1.6.7-3.5 0-4.3-.8-2-1.9-1.2-5.2.9-5.6 2.6-.4 3.1 3.7.6 3.4"/>
+      <path d="M195.2 191.3c-2 .2-4 2-4 4 0 3.1 1.2 4.5 3.7 7.6 2 2.6 8 7.2 7.9 11.6 0 1.6-1.2 3.7-2.3 3.4"/>
+      <path stroke-linecap="round" d="M190.5 252.9c1-2.3 3.4-1.3 3.5 0 .4 3-2.2 3.8-4 3.3-1-.2-1.6-.8-2-1.5a3.9 3.9 0 0 1 .4-4.3 4 4 0 0 1 1-1c.7-.4 1.5-.5 2.7-.5 4.4 0 8.3 5.3 9.6 10.8a23.6 23.6 0 0 1 .2 9.6 18 18 0 0 1-4.7 9 20.1 20.1 0 0 1-7.9 4.7 5.6 5.6 0 0 1-3.2 0c-2.2-.6-3.7-2.8-2.5-5.5 1-2.1 4.3-3.2 5.8-.6.1.3.3.7.3 1.3 0 .7-.3 1.5-.8 1.8-1.1.8-3 .6-2.9-1.5"/>
+      <path d="M187 280.3c.8.3 1.3.3 2.3-.2l1.5-.8c2-1.1 4.5-3 6.7-7.2a15.1 15.1 0 0 0 1.4-3.6c.2-.9.4-1.8.4-2.7a20.5 20.5 0 0 0-.5-5 16.2 16.2 0 0 0-3.2-7.2c-1-1.3-1.7-2-3.5-2m-7.5 24.7a3.1 3.1 0 1 1 5 1.8"/>
+      <path d="M185.8 273.2a3 3 0 0 1 2.9-2.5 3 3 0 0 1 3 3 3 3 0 0 1-1 2"/>
+      <path d="M191.5 273a12.4 12.4 0 0 0 5-9.9c0-3.3-1.3-6.7-2.9-8"/>
+      <path stroke-linecap="round" d="M195.7 271.5a13.2 13.2 0 0 1-5 4.8"/>
+      <path d="M203.7 283c-.8-1.8-2.2-2.6-4.6-2.9a11 11 0 0 0-6.6 1.6 14.8 14.8 0 0 0-8 9 13.7 13.7 0 0 0-.6 4.6c0 2.9.8 6 1.6 7.5.6 1.4 2.4 7.2 12.2 11.2a67.7 67.7 0 0 0 20.6 3.2c8.3.3 16 .6 20.4 6.1"/>
+      <path stroke-linecap="round" d="M191.7 284.7c2.7-1.7 7.6-4 12.1-1.8a7 7 0 0 1 3.5 3.5 8 8 0 0 1-1.5 7.7c-.7.7-2.1 2-4 2.1-3 0-3.7-2-3.8-2.5-.3-2.2 1-3.1 1.6-3.3.5-.2 2.2-.2 2.6 1 .1.4.1 1.1-.2 1.6"/>
+      <path d="M202.2 292.6a2.7 2.7 0 0 0-.7-2.7 4.1 4.1 0 0 0-4.7-.7 5 5 0 0 0-2 1.7l-1 1.2-.8 2c-2 5.6 1.2 11.6 5.2 14.1a24 24 0 0 0 11.5 3.3l5.3.3h13.4l6 .6 4.4.8 1.5.4 1 .3a31.9 31.9 0 0 1 7.7 3.3c.7.4 1.5.8 2 1.4l1.1 1c1.5 1.4 3.1 3 3.5 5.3v1.3c0 1.4-1.1 3.4-4.3 4"/>
+      <path d="M239 326.7c-1 1.8 0 2.6 1.2 2.7 1.7.2 2.6-1.1 2.7-2.3.2-2-1.5-3.9-3.5-3.8a4.4 4.4 0 0 0-4 2.8 5.5 5.5 0 0 0-.3 1.9 4.7 4.7 0 0 0 1 3.3 6 6 0 0 0 4.4 2c3.4.1 6-3 6-6.3 0-6.1-9.1-9.5-12.8-10.4a67 67 0 0 0-14.3-1.8c-2.9-.2-5-.1-8.1-.4-2.8-.3-4.3-.5-7.2-1.1a22 22 0 0 1-10-5.2 13.7 13.7 0 0 1-3.7-17.7 11.5 11.5 0 0 1 8.2-5.3c3-.5 5.6.8 7.1 3.8.8 1.4.6 3.8 0 5a4.8 4.8 0 0 1-3.9 2.3c-3 0-3.7-2-3.8-2.5-.3-2.2 1-3.1 1.6-3.3.5-.2 2.2-.2 2.6 1 .1.4.1 1.1-.2 1.6"/>
+      <path stroke-linecap="round" d="M218.6 185.6a97 97 0 0 0-.3-.4c-1.3-2-3.7-2.5-5.5-1.2-2 1.6-2.6 4.3-2 7.2a7 7 0 0 0 3.2 4.4"/>
+      <path d="M293.4 191.7c-3.2 3.5-6.5 4.6-11.3 4.8-1.5 0-4.4-.5-6-1.7-1-.8-2.3-2-1.5-4.4.5-1.5 3-5.7 3-8.7.2-4.5-1.5-7-4.2-7.9-5-1.8-10.4 3.2-13.6 4.3a11 11 0 0 1-4.1.6c-1.6 0-2.5 0-4.2-.6-3.2-1.1-8.6-6-13.6-4.3-2.7 1-4.4 3.4-4.2 8 0 2.9 2.5 7.1 3 8.6.8 2.3-.4 3.6-1.5 4.4a11.6 11.6 0 0 1-6 1.7c-4.9-.2-8-1.3-11.3-4.8"/>
+      <path stroke-linecap="round" d="M237.9 315.5c.6.3.1-.1 4.2 1.7 3.8 1.7 6.6 3.2 9 7a8.5 8.5 0 0 1 .7 5.9"/>
+      <path d="M238.1 332.8a6.4 6.4 0 0 0 2.6.7c3.4.1 6-3 6-6.3 0-2.2-1.2-4-2.9-5.6"/>
+      <path stroke-linecap="round" d="M238.9 326.7c-.9 1.9.3 2.8 1.5 3 1.7.2 2.6-1.2 2.8-2.4a3.6 3.6 0 0 0-1.7-3.3"/>
+      <path d="M312 187.8c2.6 0 4.9 2.9 4.9 5.8 0 3.4-1.8 5.5-3.1 7-1 1.3-2.2 2.4-3.6 3.8"/>
+      <path stroke-linecap="round" d="M309 185.1a5 5 0 0 1 2.3 2 7.3 7.3 0 0 1 1.2 4.9c-.1 3.4-2.5 5.7-4.7 7.1m-3.8-14 .5.6a7 7 0 0 1 1.2 5.7 6.5 6.5 0 0 1-3 4.4m-4-11.6c2 1.6 2.7 4.4 2 7.2-.5 2-1.8 3.3-3.3 4.2m8.9 32.9c.2.7.6 1 1.2 1.5a10.8 10.8 0 0 0 4.9 2.9 6.2 6.2 0 0 0 5-.7M187 275.4c1 0 2 .6 2.7 1.8a2.6 2.6 0 0 1 .3 1.2c0 .7-.3 1.4-.8 1.8-1.2.7-3.2.4-3.1-1.7"/>
+      <path d="M193.2 249c4 .8 7.7 5.5 9 10.7a23.6 23.6 0 0 1 .2 9.6 18 18 0 0 1-4.7 9c-.5.6-1 1-1.7 1.5l-.9.6m-6.3-9.7c1.6 0 3 1.5 3 3.2a3 3 0 0 1-.8 2"/>
+      <path d="M187.7 272.6c1.7 0 3.3 1.6 3.3 3.3a3.1 3.1 0 0 1-1.2 2.5"/>
+      <path stroke-linecap="round" d="M203.2 255.6c1.5 2 2.6 3.9 3 6.2m0 6.8a13.8 13.8 0 0 1-1.2 3.2 14.2 14.2 0 0 1-2.8 3.7"/>
+      <path d="M203.4 243.5a7.5 7.5 0 0 1 2.8 3.8"/>
+      <path stroke-linecap="round" d="M206.3 239.6a8.7 8.7 0 0 1-2.7 3.7m-7.3-13.8 1.7-.4 1-.8.7-1 .5-1.4.3-1.2"/>
+      <path d="m192.8 223.4-2 .7a7 7 0 0 0-2.8 2.4 13.5 13.5 0 0 0-1.8 4.8c-.2.7-.4 3 0 5.3a12.6 12.6 0 0 0 2 4.6l.8 1c1 1 2 1.7 3.5 1.4"/>
+      <path stroke-linecap="round" d="M202.4 215.8c-.2 1-.8 2.3-2.4 2.2"/>
+      <path d="M196.5 222.8c-1.5-1.5-4.8-1.9-8 .2-.5.2-.9.6-1.3 1a7 7 0 0 0-1.1 1.2l-1.2 2a10 10 0 0 0-.7 2c-.6 2.3-.6 4.5-.6 5l.3 2.2a15 15 0 0 0 1.8 5 8.2 8.2 0 0 0 6.2 4.3c1.4.1 3.9-.6 4-2.4"/>
+      <path stroke-linecap="round" d="M291 189.7c.2-1.4 1.8-1.6 2.4-.8 1 1.2.4 3.2-1.5 3.8a3 3 0 0 1-3-1.1c-.9-1-.8-2.2-.5-3.2.2-.7.7-1.2 1.4-1.7 2.1-1.7 5.7-1.3 6.8 1.5 1.5 3.6-1.7 6.3-4.7 8.3-3.8 2.5-8 3-11.3 3-7.3-.1-12.9-3.6-16.5-5.6-.8-.5-1.7-.4-2.1.2-.5.6-.5 1.5.2 2.1"/>
+      <path stroke-linecap="round" d="M292.5 188.4c.8 0 1 .4 1.2.7 1 1.2.3 3.2-1.6 3.8m14.3 41.2c-2.8 3-.3 8.3 1.8 9.5.7.5 1 .2 1.6.6"/>
+      <path d="M306.5 228.3c-1 .7-1.2 1.4-1.3 2.6a4.2 4.2 0 0 0 1.2 3.2 11.2 11.2 0 0 0 7.3 3 8.2 8.2 0 0 0 4.9-1.4 7.3 7.3 0 0 0 3-4.3M305 281v2c-.4 2.2-.7 3.5-1.7 5.5a15 15 0 0 1-3.4 4.5 15.7 15.7 0 0 1-4.7 3.3 19.7 19.7 0 0 1-5.2 1.8 33 33 0 0 1-5.5.6h-5l-5.5-.7c-1.7-.2-2.7-.3-4.4-.3a22.8 22.8 0 0 0-8.8 1.5 17 17 0 0 0-5 3c-.6-.6-3-2.2-5.2-3a17.6 17.6 0 0 0-4.1-1.2c-1.8-.3-2.8-.3-4.6-.3-1.8 0-2.7.1-4.5.3-2 .2-3.3.5-5.4.6-2 .1-3 .2-5 .1-2.2 0-3.4-.2-5.6-.6a19.7 19.7 0 0 1-5.2-1.8c-2-1-3-1.7-4.7-3.3a15 15 0 0 1-3.3-4.5 15.1 15.1 0 0 1-1.7-5.5v-83.4H305z"/>
+    </g>
+    <g fill="#c7b37f" stroke="#c7b37f">
+      <path stroke-width=".3" d="M198.3 292.5a2 2 0 1 1 4 0 2 2 0 0 1-4 0zm-12.2-14.1c0-1 .6-1.8 1.4-1.8.8 0 1.4.8 1.4 1.8s-.6 1.8-1.4 1.8c-.8 0-1.4-.8-1.4-1.8z"/>
+      <path stroke="none" d="M193 242.9c0-.8.7-1.5 1.4-1.5.8 0 1.4.7 1.4 1.5s-.6 1.4-1.4 1.4c-.7 0-1.3-.6-1.3-1.4zm24.6-52.5c-.1-.9.4-1.6 1-1.6.7-.1 1.4.5 1.5 1.3 0 .8-.4 1.5-1.1 1.6-.7 0-1.4-.5-1.4-1.3"/>
+    </g>
+    <g stroke="#c7b37f" stroke-linecap="round" stroke-width=".5">
+      <path d="M191.4 251.2a1.8 1.8 0 0 0-.6.4l-.5.7-.2 1m3.8 21.3.7-.8.6-.8.4-.7.5-1m-1 11-1.2.6-.9.5a14 14 0 0 0-1 .7l-1 .8m12-30.3-.6-.7-.7-.7-.8-.5"/>
+      <path stroke-linecap="butt" d="m203.3 244-1 .4a4 4 0 0 1-1.1.2"/>
+      <path d="M190 230.8c0 .4.1.7.3 1.1l.7 1.4a6.8 6.8 0 0 0 2.2 2.1l1.2.7m-.9-4.7 1 .5a6 6 0 0 0 2.4.5l1.5-.1m5.7-32.5-1.6-1a9.6 9.6 0 0 1-2.4-2.3l-.7-1m6-3.6.5 1.3 1.2 1.7c.7.8 1.3 1 2.2 1.6m1.1-4.7.5 1.2.7 1 1 1c.6.5 1 .6 1.6 1"/>
+    </g>
+    <path fill="#703d29" stroke-width=".1" d="M266.6 185.3c0-1.4-1.3-1.5-1.9-1.5-1.4 0-1.8 1-3.7 2a9.5 9.5 0 0 1-5.3 1.4 9 9 0 0 1-5.4-1.5c-1.9-1-2.2-1.9-3.6-1.9-.8 0-1.9.7-1.8 2v.7s.2 0 .2.2c0-.7.1-1 .4-1.4a1.8 1.8 0 0 1 1.3-.7c1.5 0 2 1 3.9 2a9.5 9.5 0 0 0 5.3 1.5c2 0 3.1-.3 5.4-1.5 1.9-1 2.4-2 3.9-2 .5 0 .8.3 1 .8v.7h.2c0-.1.2-.2.1-.8z"/>
+  </g>
+  <g fill="#703d29">
+    <path d="M211.5 299.2c.4-.4.8-.3.8-.5l-.2-.2-.7-.2-.7-.3s-.3-.2-.4 0c0 .3.9.3.5 1.1 0 .2-.1.5-.6 1l-2.1 2.3-.2.2V299l.1-1.4c.2-.4.6 0 .7-.3 0-.2 0-.2-.2-.3-.2 0-.4 0-1-.3l-.7-.3c-.1 0-.4-.2-.5 0l.1.2c.3.2.4.3.4.7v6c0 .4.1.6.2.6l.3-.2 4.2-4.6z"/>
+    <path d="M214 300.1c.3-.8.8-.3.9-.6l-.3-.2-1-.3-1-.4h-.3c0 .4 1 .4.7 1.3l-1.4 4.4c-.3.8-.8.4-.9.7v.1l1 .3 1.2.4h.3c.1-.3-1-.2-.6-1.3zm3 1c.1-.6.4-.6.7-.5.8.3 1 1.1.8 2-.2.5-.4 1-1.6.7-.3-.1-.6-.2-.5-.4zm-2.3 3.9c-.4 1.1-1 .6-1 1l.2.1 1.3.4.7.2h.3c0-.4-.9-.2-.6-1.2l.5-1.6c0-.3 0-.4.5-.3.4.2.5.3.6.7l.3 1.7c0 .6.2 1.3.8 1.4.3.2 1 .1 1-.2v-.1h-.3l-.3-.3-.5-3 .6-.2c.3-.2.6-.4.8-1 .1-.4.3-1.7-1.5-2.3l-1.6-.4-1-.3h-.2c-.1.4.9.3.6 1.3l-1.2 4zm6.7 2c-.2 1-1 .4-1.2.7 0 .2.1.3.3.3l1.2.2 1.1.4.5-.1c0-.3-1.1-.3-.8-1.4l1-4.2c0-.5.2-.5.5-.4l.7.2c1 .2.5 1.1.8 1.2.3 0 .2-.3.3-.5v-1.1l-2.6-.6-2.5-.6c-.2 0-.2 0-.2.2l-.5 1.2v.3c.5.1.5-1.2 1.4-1l.7.2c.4.1.5.2.4.6l-1 4.3zm10.2-2.7c.3-.5.7-.4.7-.6l-.3-.2h-.7l-.7-.2c-.1 0-.4-.1-.4 0 0 .4.9.2.7 1 0 .2-.1.6-.5 1.1l-1.7 2.7-.1.2v-.3l-.6-3.2a4.3 4.3 0 0 1-.1-1.3c0-.4.5-.2.6-.5l-.3-.2-1-.1-.8-.2c-.1 0-.4-.1-.4 0l.1.2c.4.2.5.3.5.7l1.1 5.9c.1.4.2.5.3.5l.2-.2zm.5 5.4.1.4 1.4.6c1.1.2 2-.5 2.3-1.7.2-1.2-.3-1.7-1.2-2.3-1-.8-1.5-1-1.3-1.6 0-.6.5-1 1-.8 1.5.2 1.4 2 1.6 2 .1 0 .2 0 .2-.3l.1-1.3v-.3h-.5c-.3 0-.5-.4-1.2-.5-1-.2-1.8.5-2 1.6-.2 1 .2 1.4 1 1.9 1.2.9 1.7 1 1.6 1.9-.2.7-.8 1.1-1.4 1-1-.2-1.3-1.1-1.5-2l-.1-.3c-.2 0-.2.3-.2.4v1.3zm12.6-3.5c.3-.6.6-.5.7-.7 0-.2-.2-.2-.3-.2h-.8l-.7-.1-.4.1c0 .4 1 0 .8 1 0 .1 0 .5-.3 1l-1.4 2.9-.2.2v-.2l-1-3.2a4.3 4.3 0 0 1-.2-1.3c0-.4.6-.3.6-.5s0-.2-.3-.2h-1l-.8-.1c-.1 0-.4-.1-.4 0l.1.2c.4.2.5.3.6.6l1.7 5.8c.1.4.2.5.3.5l.2-.3z"/>
+    <path d="M246 310.8c0 1-.8.8-.8 1.2h1l1 .1.4-.1c0-.5-1.1.2-1.1-1.7v-3.4s.2 0 .3.2l4 5h.3v-.2l.1-5.3c0-1 .8-.8.8-1.1l-.2-.1h-2v.1c0 .3 1 .2 1 1v3.2l-.1.4-.3-.3-3.4-4.2c-.1-.2 0-.3-.3-.3h-1.4l-.1.2c0 .4 1-.2.9 1.7v3.6zm8.4-4.3c0-1 .6-.6.6-.9l-.3-.1h-2.3c0 .4.9.1.9 1v4.6c0 1-.6.7-.6 1v.1h2.3l.3-.1c0-.3-1 .1-1-1zm3.6 4.4c0 1.2-1 .7-1 1 0 .3.2.3.3.3h2.4c.3 0 .5 0 .5-.2 0-.3-1.1 0-1.1-1.2v-4.3c0-.5 0-.5.3-.5h.8c1 0 .7 1 1 1 .3 0 .2-.4.2-.5l-.1-.9s0-.2-.2-.2H256c-.2 0-.2.2-.2.3l-.1 1.2.1.4c.4 0 .1-1.3 1.1-1.3h.7c.4 0 .5 0 .5.5v4.4zm5-1.8h-.3v-.4l.6-1.8h.1l1 1.7v.3l-.2.1zm1.5.4c.2 0 .3 0 .6.8l.2.6c0 .6-.6.6-.6.8 0 .2.2.1.3.1h1l1-.1c.3 0 .4 0 .4-.2 0-.3-.5.1-.8-.6l-2.8-5.6-.2-.3-.2.4-1.9 5.9c-.2.5-.6.5-.6.7 0 .2.2.1.3.1h1.5c.2-.1.5 0 .5-.3 0-.2-1 0-1-.7l.1-.7c.2-.7.3-.7.5-.7zm6.6-4c0-.6 0-.6 1-.7 1.6-.3 1.1 1 1.5.9.2 0 .1-.4.1-.5l-.1-1h-.2l-2 .2-2.2.3c-.2 0-.2 0-.2.2 0 .3 1 0 1 .8l.6 4.4c.2 1.2-.5.7-.5 1.2h.2l1.1-.1 1-.1c.2 0 .4 0 .4-.2 0-.3-1 0-1.1-1l-.2-1.4c0-.5-.1-.6.3-.7h.6c.9-.2.8.9 1 .8.3 0 .2-.3.1-.5l-.2-1.6c0-.3-.2-.3-.2-.3-.2 0-.1 1-.8 1l-.6.1c-.4 0-.4 0-.4-.4zm3.2 2.2c.3 2 1.7 3 3.4 2.7 2.7-.5 2.8-3 2.5-4.2-.3-2-1.8-3-3.5-2.7-2 .4-2.8 2.2-2.4 4.2m.9-.7c-.3-1.4 0-2.7 1.4-3 1-.3 2.3.6 2.7 2.7.3 1.6 0 3-1.4 3.2-1.5.3-2.4-1.5-2.7-2.9m6.7-3.3c-.2-.6.1-.7.4-.7.8-.2 1.5.3 1.7 1.3.1.5.2 1-1 1.3-.3.1-.6.2-.7 0l-.4-2zm0 4.5c.3 1.2-.5 1-.4 1.3 0 .2.2.2.3.1l1.3-.3.7-.1c.2 0 .2-.2.2-.2 0-.4-.8.2-1-.8l-.4-1.6c-.1-.3-.2-.4.3-.5.4 0 .6 0 .9.3l1 1.3c.4.5.8 1 1.5.9.3-.1.8-.5.7-.7 0-.1 0-.2-.1-.1h-.6l-2-2.3.5-.5c.1-.3.3-.7.2-1.3-.1-.4-.6-1.7-2.5-1.2l-1.6.4-1 .2-.2.2c.1.4 1-.2 1.2.8zm6.9-1.5c.3 1-.8.9-.7 1.2 0 .2.2.2.3.2l1.2-.4 1.2-.3c.2 0 .4 0 .3-.2 0-.3-1 .2-1.3-.9l-1.1-4.2c-.1-.4 0-.5.3-.6l.7-.2c1-.3 1 .8 1.3.8.2 0 0-.4 0-.5l-.4-.9s0-.2-.2-.2l-2.5.7-2.5.7c-.2 0-.1.1-.1.2l.2 1.3c0 .1 0 .3.2.3.3-.1-.2-1.3.7-1.5l.7-.2c.3 0 .4 0 .6.4l1 4.3zm4.4-5.9c-.3-.9.4-.7.3-1h-.3c-.4 0-.7.2-1 .3l-1 .2s-.3 0-.2.2c0 .3 1-.2 1.2.6l1.2 4.4c.2 1-.4.8-.3 1.2l1-.2 1.3-.3c.2-.1.2-.2.2-.3 0-.3-.9.4-1.2-.7zm1.8 2.1c.6 1.9 2.1 2.7 3.8 2.2 2.6-.9 2.3-3.3 1.9-4.5-.6-2-2.3-2.7-3.8-2.2-2 .7-2.6 2.6-1.9 4.5m.8-.8c-.4-1.3-.4-2.7 1-3.2 1-.4 2.3.3 3 2.4.5 1.5.5 2.8-1 3.3-1.4.5-2.5-1.2-3-2.5m6.1-4.3c-.2-.6 0-.7.4-.8.8-.3 1.5.2 1.8 1 .2.6.4 1-.8 1.6-.3 0-.6.2-.7 0zm.7 4.5c.4 1-.4 1-.2 1.3 0 .2.2.1.3 0 .4 0 .8-.3 1.2-.4l.7-.3c.2 0 .2-.1.2-.2-.1-.3-.8.3-1.2-.6l-.6-1.5c0-.4-.2-.4.3-.6.4-.1.5-.1.9.2l1.2 1.2c.5.4 1 .8 1.6.6.3-.1.7-.5.6-.8 0 0 0-.1-.1 0h-.6l-2.2-2 .3-.5c.1-.3.2-.7 0-1.3-.2-.4-.8-1.6-2.6-.9l-1.6.7-1 .3v.2c.1.3.8-.4 1.2.6z"/>
+  </g>
+  <g fill="#fedf00" transform="translate(0 76.8)scale(.512)">
+    <path fill="#d52b1e" d="M412.7 249.3h82.1v82h-82.1z"/>
+    <path id="ad-a" fill="#fff" d="M451.2 313.8s0 3-.8 5.3c-1 2.7-1 2.7-1.9 4a13.2 13.2 0 0 1-3.8 4c-2 1.2-4 1.8-6 1.6-5.4-.4-8-6.4-9.2-11.2-1.3-5.1-5-8-7.5-6-1.4 1-1.4 2.8-.3 4.6a9 9 0 0 0 4.1 2.8l-2.9 3.7s-6.3-.8-7.5-7.4c-.5-2.5.7-7.1 4.9-8.5 5.3-1.8 8.6 2 10.3 5.2 2.2 4.4 3.2 12.4 9.4 11.2 3.4-.7 5-5.6 5-7.9l2.4-2.6 3.7 1.2z"/>
+    <use xlink:href="#ad-a" width="100%" height="100%" transform="matrix(-1 0 0 1 907.5 0)"/>
+    <path d="m461.1 279 10.8-11.7s1.6-1.3 1.6-3.4l-2.2.4-.5-1.2-.1-1.1 3-.7V260l.3-1.3-3.2.2.3-1.4.5-1 1.9-.4h1.9c1.8-3.4 9.2-6.4 14.4-1 3.8 4 3 11.2-2 13.2a6.3 6.3 0 0 1-6.8-1.1l2-4c2.7 1.7 5-.3 4.8-2.4-.2-2.7-2-4.3-4.3-4.5-2.3-.2-4 1-5 3-.6 1.3-.3 2.2-.5 3.6-.2 1.5 0 2.3-.5 3.8a8.8 8.8 0 0 1-2.4 3.6l-11 12-43 46.4-3.2-3z"/>
+    <path fill="#fff" d="M429.5 283s2.7 13.4 11.9 33.5c4.7-1.7 7.4-2.8 12.4-2.8 4.9 0 7.6 1 12.3 2.8A171 171 0 0 0 478 283l-24.2-31z"/>
+    <path d="m456.1 262.4 16.8 21.7s-2.2 10.5-9 26.3c-2.7-.6-5-1.1-7.8-1.3zm-4.7 0-16.8 21.7s2.2 10.5 9 26.3c2.7-.6 5-1.1 7.8-1.3z"/>
+  </g>
+  <g fill="#d52b1e">
+    <path fill="#fedf00" d="M257.8 204.4H300v42h-42z"/>
+    <path d="M263.7 204.4h6.3v42h-6.3zm12 0h6.3v42h-6.2zm12 0h6.3v42h-6.2z"/>
+  </g>
+  <g fill="#d52b1e" stroke="#d52b1e" stroke-width=".5">
+    <path fill="#fedf00" stroke="none" d="M211.4 282.8c.2.8.4 2 1.1 3.4.8 1.2.5 1.2 2.2 3a13.8 13.8 0 0 0 6.7 3.6c3.4 1 5.7 1 8.5.9 2.2-.1 3.9-.4 5.3-.6 2-.2 3.4-.4 5.7-.5a32.4 32.4 0 0 1 3.1 0c1.2 0 2.4.3 3.7.5 2.8.6 5.6 1.7 5.6 1.7v-43.9h-42v30z"/>
+    <path stroke-width=".3" d="m216.3 290.5 2 1.2 2.7 1v-41.8h-4.7zm23.4 2v-41.6H235v42.2l4.7-.5zm9.3-41.6h-4.6v41.7a31 31 0 0 1 4.6.8zm-18.6 0v42.7h-4.7v-42.7z"/>
+  </g>
+  <g transform="translate(0 76.8)scale(.512)">
+    <path fill="#fedf00" d="M585.5 402.4a20.8 20.8 0 0 1-2.2 6.6c-1.5 2.3-1 2.3-4.3 6a26.3 26.3 0 0 1-13 7 51.8 51.8 0 0 1-16.6 1.6c-4.3-.2-7.5-.7-10.3-1-3.8-.6-6.7-.9-11-1a62.9 62.9 0 0 0-6.2 0 83.3 83.3 0 0 0-18.3 4.2V340h82.2v58.5z"/>
+    <g id="ad-b">
+      <path fill="#d52b1e" d="m524.6 347-.6.2-.8.8c-.4.4-.7.5-1.2.8l-.6.5c-.3.3 0 .6-.3 1-.1.4-.3.6-.6 1-.4.4-.7.5-1 1l-1.2 1-.3.1h-.6c-.4.2-.5.6-.8.8l.3.6.8 1.4c.2.3.2.7.5.8.5.2.9.2 1.3.1.8.2 1.3.2 2 .5l1.5.8c.5.3.8.4 1.3.5h1.8v.3l2 1a1.7 1.7 0 0 0-.1.4c-.1.3-.2.7-.1.8.6 1.9 1.2 3 1.5 3.2.6.2.8.9 1.1 1.5l-.3.3c-.6.6-1.2 1-1.7 1.8-.7 1.2-1.2 1.2-.3 2.8l1.5 2.4c.4.7.6 1.2.8 2 .2.7.3 1.2.3 2l1 .3.7-.6.6-1.2v-1c-.2-.1-.3-.4-.2-.7 0-.4.5-.3.7-.6.3-.5-.4-.8-.7-1.1-.6-.7-1.4-.9-1.6-1.9 0-.2 0-.4.4-.7l2-1.8c.2.1.6.2 1 .1l1.3.4c.6.2.9 0 1.2 0h.4l.1.6c.1 1-.1 3 .2 3.5l.3.6.2.6v2l-.2 1.7c0 .4-.2.7-.5 1-.2.4-.6.4-1 .7v1l1.1.5 1.3.3.7-.3.1-.6.5-.5c.4-.2.8 0 .9-.1.2-.3 0-.4 0-.8 0-.6-.2-1-.3-1.6a11.8 11.8 0 0 1-.1-2.8c0-.6 0-1 .2-1.5.1-1 .4-1.4.6-2.2.3-1 .3-1.6.4-2.5a24.4 24.4 0 0 0 10.1-.6c.8.7 1.7 1.2 2.7 1.6v1c0 .3 0 .4.2.7l.3.3c.3 0 .5 0 .7-.2.2-.2.2-.4.2-.7v-.7h1.8v1.1c.1.3.3.4.5.4a.7.7 0 0 0 .6 0c.3-.2.2-.6.3-1v-.7l1-.4a5.1 5.1 0 0 1 0 .9l-.3.9c-.2.6-.5.8-.8 1.4-.4.6-.5 1-1 1.5l-.6.7-.6.9-.9 1c-.7.6-1.2.2-2 .9l-.3 1 1.4.6 1.3.2.4-.2c0-.3 0-.6.3-.8.2-.3.4-.3.7-.4.4 0 .8 0 1-.2.4-.3.4-1 .7-1.5a12.7 12.7 0 0 1 3-3.9l1.7-1.4c.2-.4.5-.5.5-1l-.2-.6-.2-1c1.5.7 1 .7 1.2 1.4.3.6 0 1 .1 1.7.1.8.5 1.1.5 1.9.1.9-.1 1.4-.3 2.3-.1.8-.1 1.3-.5 2a3.8 3.8 0 0 1-1.1 1.5l-.6.5-.1 1 1.1.4 1.6.4.4-.3c.2-.7 0-1.7.4-1.7.4-.1.7 0 .8-.3v-.7l.7-4.5.4-1.9.4-1.7c.7-2-.2-2.3-1-3.6-.5-.7-.7-1-.7-1.5V362a42.7 42.7 0 0 1 0-2.8l.4-.2c1.2-.7 1.7-.9 2.4-2.5a3.4 3.4 0 0 0 .3-1.5v-1l-.4-1a3.2 3.2 0 0 0-.6-.8c-.7-1-1.7-1.1-2.7-1.5-1.5-.5-2.5-.4-4-.5-1.8-.2-2.7-.2-4.4 0-2 0-3.1.4-5.1.7l-4.9.4c-2.3 0-4.4-.5-5.8-.4-2.4.2-2.5.8-6.2 1.1a67 67 0 0 1-3.8.2l-2.2-.7c.9-.3 1.1-.5 1.5-1 .3-.4.2-.7.6-1.1l.7-1a2.2 2.2 0 0 0-.9-.4h-1a3 3 0 0 0-1.2.3l-.8.6-2.2-1.2a8.8 8.8 0 0 0-3-.9zm2 11.8"/>
+      <g fill="none" stroke="#fedf00" stroke-linecap="round">
+        <path d="m568.8 359.5-.8.3c-.9.4-1.6.4-2.6.5-2.6.2-4.3-1.1-7-.9-1.4.1-2 1.2-3.5 1.6a9.3 9.3 0 0 1-1.7.2l.5-1s-1.2.3-2 .3a7.5 7.5 0 0 1-1.6-.2l1-1-1.3-.2a4 4 0 0 1-1-.7 20.5 20.5 0 0 0 1.7-.3c1.5-.4 2-1.2 3.9-1.4 1.1 0 3 0 7.6.8 3 .5 4.4.2 5.5-.3.8-.3 1-1 1.1-1.8.1-.8-.4-1.4-.8-1.8-.1 0-.5-.3-1.1-.4"/>
+        <path fill="#fcd900" stroke-linecap="butt" stroke-width=".5" d="M524.8 350.6c-.5 0-.9 0-1.3.3-.5.3-.6.7-1 1.1.5.1.8.4 1.2.3.4 0 .5-.2.8-.5.3-.4.4-.7.4-1.2z"/>
+        <path d="M536 363.8a13.6 13.6 0 0 0 1 2.3c.2.8 0 1.2.2 2v1.6m6.8-7-.3 1.3-1 3.5v.7m-11-4c.9.2.6 3.3 1.9 4"/>
+        <path stroke-linecap="butt" d="m560.1 369.8.4-.3a8.2 8.2 0 0 0 2.7-1.8"/>
+        <path d="M552.4 368c3.5-.9 5.9-2.6 7.6-2.9m-4-1.5h.8c1.5-.3 1.7.6 2.7 1.2 1.9 1 2.1 2.3 4.3 3.4l.4.1.8.4"/>
+        <path fill="#fcd900" stroke-linecap="butt" stroke-width=".5" d="M517.7 354.5h.7l.8-.2c.3 0 .5 0 .7.2.2 0 .2.1.3.3 0 .2.2.3.1.5 0 .2-.3.4-.6.4-.2 0-.4 0-.5-.3a.5.5 0 0 1 0-.4 1 1 0 0 1-.9 0 1 1 0 0 1-.6-.5z"/>
+      </g>
+      <path fill="#0065bd" d="m525.1 364.2-2-.9c.4-.2.7-.2 1-.5.3-.4.3-.8.5-1.3s.2-1 .7-1.4c.3-.2.8-.2 1.1-.1.4 0 .8.4.9.7 0 .6-.2 1-.3 1.5 0 .6-.3.9-.2 1.4 0 .4.2.6.4 1l-2-.4zm-1 1a.6.6 0 1 1 .7.5.6.6 0 0 1-.7-.6zm-1.7-16.6h-.2c-.4-.4-.4-.8-.6-1.2a4 4 0 0 1-.3-1.2v-2c0-.3 0-.6-.2-.9 0-.2-.4-.3-.3-.4 0-.1.3 0 .4 0 .4 0 .6.1 1 .4.3.3.5.6.6 1l.4 1.5.3.8.5.6-.7.8zm3.6 10.6 2.2 1a9.2 9.2 0 0 0 3.5-3.8c.9-1.8 1-2.7 1.4-4.4l-1.8-.5h-.4c-.5 1.8-.7 2.7-1.6 4.2-.8 1.3-1.7 2.3-2.6 3zm5 18.2.8-1.3 1.4-1.1h.4a8.7 8.7 0 0 1-.5 2.8l-.4 1-.5.5c-.5-.8-1.3-1.3-1.3-2zm33 1.8 1.4.6 1.5.9v.5l-1.5.2a8.4 8.4 0 0 1-1.3 0h-1l-.6-.4c.5-.7.8-1.6 1.4-1.8zm-9.8-2 1.4.5 1.5 1c0 .1.1.3 0 .4a9 9 0 0 1-2.7.3l-1-.1-.7-.3c.6-.7.9-1.7 1.5-1.8m-17.4 2.1 1.5.5 1.5 1v.5a9 9 0 0 1-2.8.2h-1l-.6-.4c.5-.7.8-1.6 1.4-1.8m-9-29.8c-.6-.3-1-1-.6-1.6.1-.2.4-.2.6-.4.2-.3.1-.5 0-.8l-.1-1-.2-1c0-.6 0-1 .4-1.6.2-.3.7-.6.8-.6.2.1 0 .5 0 .8 0 .5.1.7.3 1.2l.7 1.3c.2.6.4.8.4 1.4 0 .5 0 .7-.2 1.2a2 2 0 0 1-.6.8 2 2 0 0 1-.8.4 1.1 1.1 0 0 1-.6 0z"/>
+    </g>
+    <use xlink:href="#ad-b" width="100%" height="100%" y="36.6"/>
+  </g>
+  <path fill="none" stroke="#703d29" stroke-width=".4" d="M211.3 204.4h42v42h-42zm46.5 0H300v42h-42zm-46.4 78.4c.2.8.4 2 1.1 3.4.8 1.2.5 1.2 2.2 3a13.8 13.8 0 0 0 6.7 3.6c3.4 1 5.7 1 8.5.9 2.2-.1 3.9-.4 5.3-.6 2-.2 3.4-.4 5.7-.5a32.4 32.4 0 0 1 3.1 0c1.2 0 2.4.3 3.7.5 2.8.6 5.6 1.7 5.6 1.7v-43.9h-42v30zm88.4 0c-.1.8-.4 2-1.1 3.4-.8 1.2-.5 1.2-2.2 3a13.8 13.8 0 0 1-6.7 3.6 26.1 26.1 0 0 1-8.5.9c-2.2-.1-3.9-.4-5.3-.6a55.6 55.6 0 0 0-5.6-.5 32.4 32.4 0 0 0-3.2 0c-1.2 0-2.4.3-3.7.5-2.8.6-5.7 1.7-5.7 1.7v-43.9H300v30z"/>
+</svg>

internal/app/api/core/frontend-dist/assets/af-UXkm7E6o.svg

@@ -0,0 +1,81 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-af" viewBox="0 0 640 480">
+  <g fill-rule="evenodd" stroke-width="1pt">
+    <path fill="#000001" d="M0 0h640v480H0z"/>
+    <path fill="#090" d="M426.7 0H640v480H426.7z"/>
+    <path fill="#bf0000" d="M213.3 0h213.4v480H213.3z"/>
+  </g>
+  <g fill="#fff" fill-rule="evenodd" stroke="#bd6b00" stroke-width=".5" transform="translate(1 27.3)scale(1.06346)">
+    <path d="M319.5 225.8h8.3c0 3.2 2 6.6 4.5 8.5h-16c2.5-2.2 3.2-5 3.2-8.5z"/>
+    <path stroke="none" d="m266.7 178.5 4.6 5 57 .2 4.6-5-14.6-.3-7-5h-23l-6.6 5.1z"/>
+    <path d="M290 172.7h19.7c2.6-1.4 3.5-5.9 3.5-8.4 0-7.4-5.3-11-10.5-11.2-.8 0-1.7-.6-1.9-1.3-.5-1.6-.4-2.7-1-2.6-.4 0-.3 1-.7 2.4-.3.8-1.1 1.5-2 1.6-6.4.3-10.6 5-10.5 11.1.1 4 .6 6.4 3.4 8.4z"/>
+    <path stroke="none" d="M257.7 242.8H342l-7.5-6.1h-69.4z"/>
+    <path d="m296.4 219.7 1.5 4.6h3.5l-2.8-4.6zm-2 4.6 1 4.6h4l-1.5-4.6zm7 0 2.8 4.6h5.9l-4.6-4.6zm-34.5 10.4c3.1-2.9 5.1-5.3 5.1-8.8h7.6c0 2 .7 3.1 1.8 3h7.7v-4.5h-5.6v-24.7c-.2-8.8 10.6-13.8 15-13.8h-26.3v-.8h55.3v.8H301c7.9 0 15.5 7.5 15.6 13.8v7h-1l-.1-6.9c0-6.9-8.7-13.3-15.7-13.1-6 .1-15.4 5.9-15.3 13v2.2l14.3.1-.1 2.5 2.2 1.4 4.5 1.4v3.8l3.2.9v3.7l3.8 1.7v3.8l2.5 1.5-.1 3.9 3.3 2.3h-7.8l4.9 5.5h-7.3l-3.6-5.5h-4.7l2.1 5.4h-5l-1.3-5.4h-6.2v5.8H267zm22.2-15v4.6h5.3l-1-4.6H289z"/>
+    <path fill="none" d="M289.4 211.7h3.3v7.6h-3.3z"/>
+    <path fill="none" d="M284.7 219.8h3.2v-5.6c0-2.4 2.2-4.9 3.2-5 1.2 0 2.9 2.3 3 4.8v5.8h3.4v-14.4h-12.8zm25.6 3.3h4v3.2h-4zm-2.4-5.3h4v3.1h-4zm-3.9-5.4h4v3.1h-4zm-3.3-4.5h4v3.1h-4z"/>
+    <path fill="none" d="m298 219.8 4.2.2 7.3 6.4v-3.8l-2.5-1.8v-3l-3.6-2v-3.3l-3.5-1.2V207l-1.7-1.5z"/>
+    <path d="M315.4 210.3h1v7.1h-1z"/>
+    <g id="af-a">
+      <path d="M257.3 186.5c-1.2-2-2.7 2.8-7.8 6.3-2.3 1.6-4 5.9-4 8.7 0 2 .2 3.9 0 5.8-.1 1.1-1.4 3.8-.5 4.5 2.2 1.6 5.1 5.4 6.4 6.7 1.2 1 2.2-5.3 3-8 1-3 .6-6.7 3.2-9.4 1.8-2 6.4-3.8 6-4.6z"/>
+      <path fill="#bf0000" d="M257 201.9a10 10 0 0 0-1.6-2.6 6.1 6.1 0 0 0-2.4-1.8 5.3 5.3 0 0 1-2.4-1.5 3.6 3.6 0 0 1-.8-1.5 5.9 5.9 0 0 1 0-2l-.3.3c-2.3 1.6-4 5.9-4 8.7a28.5 28.5 0 0 0 0 2.3c.2.5.3 1 .6 1.3l1.1.8 2.7.7a7.1 7.1 0 0 1 2.6 2 10.5 10.5 0 0 1 1.8 2.6l.2-.8c.8-2.7.7-5.9 2.6-8.5z"/>
+      <path fill="none" d="M249.8 192.4c-.5 3.3 1.4 4.5 3.2 5.1 1.8.7 3.3 2.6 4 4.4m-11.7 1.5c.8 3 2.8 2.6 4.6 3.2 1.8.7 3.7 3 4.5 4.8"/>
+      <path d="m255.6 184.5 1-.6 17.7 29.9-1 .6z"/>
+      <path d="M257.5 183.3a2 2 0 1 1-4 0 2 2 0 1 1 4 0zm15.2-24h7.2v1.6h-7.2zm0 3.1h7.2v13.8h-7.2zm-.4-5h8c.2-2.7-2.5-5.6-4-5.6-1.6.1-4.1 3-4 5.6z"/>
+      <path fill="#bd6b00" stroke="none" d="M292.6 155.8c-1.5.6-2.7 2.3-3.4 4.3-.7 2-1 4.3-.6 6.1 0 .7.3 1.1.5 1.5.2.3.4.5.6.5.3 0 .6 0 .7-.3l.2-.8c-.1-2-.1-3.8.3-5.4a7.7 7.7 0 0 1 3-4.4c.3-.2.4-.5.5-.7a1 1 0 0 0-.3-.7c-.4-.3-1-.4-1.5-.1m.2.4c.4-.2.8 0 1 .1l.1.2c0 .1 0 .2-.3.4a8.2 8.2 0 0 0-3.1 4.6 16.7 16.7 0 0 0-.3 5.6 1 1 0 0 1-.2.6s0 .1-.2 0c0 0-.2 0-.4-.3a3.9 3.9 0 0 1-.4-1.2c-.3-1.8 0-4 .7-6 .7-1.8 1.8-3.4 3-4z"/>
+      <path fill="#bd6b00" stroke="none" d="M295.2 157.7c-1.5.7-2.5 2.3-3 4.2a13.6 13.6 0 0 0-.3 5.9c.2 1.3 1 2 1.6 2 .3.1.6 0 .8-.3.2-.3.3-.6.2-1-.4-1.6-.5-3.4-.3-5.1.3-1.7 1-3.2 2.2-4.1.3-.3.5-.5.5-.8a.8.8 0 0 0-.2-.6c-.4-.3-1-.4-1.5-.2m.2.5c.4-.2.8-.1 1 0l.1.3-.3.4a6.5 6.5 0 0 0-2.4 4.4c-.3 1.8-.1 3.7.2 5.2.1.4 0 .6 0 .8l-.5.1c-.3 0-1-.5-1.2-1.7-.3-1.7-.2-3.9.3-5.7.5-1.8 1.5-3.3 2.8-3.8"/>
+      <path d="M272.3 187.4h8v11h-8zm.5 17.4h7.7v2.4h-7.7zm-.2 4.1h8v8.7h-8zm-.6 10.5h8.7v4.9H272zm1.1-16.6h7l1.4-2.4h-9.6zm9.4-8.6.1-6h4.8a17.4 17.4 0 0 0-4.9 6z"/>
+      <path fill="none" d="M273.6 196.7c0 1.3 1.5.8 1.5.1v-5.6c0-1 2.4-.8 2.4-.1v6c0 1 1.7.9 1.6 0v-7c0-2.2-5.5-2.1-5.5-.1zm0 13.3h5.7v7h-5.7z"/>
+      <path d="M277.2 213h2v1h-2zm-3.5 0h2v1h-2zm2-3h1.5v3h-1.5zm0 4h1.5v3.1h-1.5zM244 139c.4 5.5-1.4 8.6-4.3 8.1-.8-3 1-5.1 4.3-8.1zm-6.5 12.3c-2.6-1.3-.7-11.5.3-15.8.7 5.5 2 13.3-.3 15.8z"/>
+      <path d="M238.4 151.8c4.4 1.5 8-3.2 9.1-8.7-3.6 5-9.5 5-9 8.7zm-3.3 5.1c-3.4-.9-1.4-11.7-.7-16 .7 4.5 3.1 14.5.7 16zm1.2-.3c.2-3.7 3.9-2.7 6.5-4.7-.5 2-2 5.2-6.5 4.7zm-4.2 5c-3.4-1-1.4-12.6-1.6-17.4 1 4.2 4.2 16.3 1.6 17.4zm1.6-.5c2.8.9 6.5-1 6.8-4.3-2.5 1.7-6.3.4-6.8 4.3z"/>
+      <path d="M229.5 166.7c-3.2.3-1.8-9.6-1.8-18.8 1.2 8.6 4.5 16.5 1.8 18.8z"/>
+      <path d="M230.7 166.3c2.2 1 6.1-.7 7.2-4.4-4 1.7-6.6 0-7.2 4.4zm25.6-22.2c-.6 4.9-2.6 7.7-5.5 7.2-.8-3 1.6-5 5.5-7.2zm-7.8 12.4c4.9.7 6.6-3 10-7.9-4.7 3.4-10.2 4-10 8z"/>
+      <path d="M247 156c-2.6-3.2 0-7.3 2-10.7-.4 5.1 1.3 8-2 10.7zm-1 5.3c-.4-3.2 5-3.9 7.4-5.6-.9 1.8-2 6.7-7.5 5.6z"/>
+      <path d="M244.8 161.3c-3.7-.4-2.2-6.7.5-10.1-1.1 4.8 2 8.1-.5 10.1z"/>
+      <path d="M242 166.6c-4.2-2-1.5-7.2 0-10.3-.6 4.1 2.8 7.2 0 10.2z"/>
+      <path d="M242.8 166c2.2 3 6.5-.8 7.4-5.2-3.7 3.1-6.5 2.6-7.4 5.3zm-9.6 20.3c-.4-4.3 2.8-12 .5-16.2-.3-.6.7-2.1 1.4-1.2 1 1.5 2 5.7 2.5 4.1.4-1.7.5-4.6 2-5.2 1-.3 2.3-.6 1.9 1-.4 1.4-1.2 3.4-.3 3.5.5 0 2-2 3.3-3 1-.8 2.6.6 1 1.8-4.8 4-9.5 5.9-12.3 15.2zm-8.7 64.5c-.6 0-1.3-.3-.6.6 5.7 7 7.3 9 15.6 8 8.3-1.1 10.3-3.4 16.2-6.7a14.6 14.6 0 0 1 11.2-1c1.6.5 2.6.5 1.4-.7-1.2-1.1-2.5-2.7-4-3.8a17.5 17.5 0 0 0-12.7-2.7c-6 1-11.1 4.9-17.2 6.4a25 25 0 0 1-9.9 0zm47.8 12.5c1 .2 1.7 2.2 2.3.9.8-2.3.2-4-.8-3.9-1.2.3-3.1 3-1.5 3z"/>
+      <path stroke="none" d="M220.6 183c-1.2-1.4-.9-1.8 1-1.9 1.4 0 4.2 1 5.3.1 1-.7.5-3.7 1-5 .2-.9.7-2 2-.2 3.6 5.8 8 12.8 10 19.6 1 3.8 0 9.8-3.4 13.8 0-3.4-1.2-5.7-2.7-8.6-2-3.7-9.1-14-13.2-17.9z"/>
+      <path d="M235.5 213.4c4 0 4.7-5.3 4.7-6.8-2 .4-5.4 3.7-4.7 6.8zm34.5 51.9c2.8.6 2.7-6.2-.2-9.1 1.3 4.4-2 8.4.1 9zm-1.2-.1c.2 3.2-8-.4-10-3 4.8 2.1 9.8.4 10 3zm-3.5-4.6c.3 3.1-7 .3-9.3-2.1 4.9 1.6 9-.5 9.3 2zm1.3.4c2.9.7 2.4-6.4-.4-8.8 1.4 4.7-1.8 8.1.4 8.8zm-3-4.3c2.9.7 1.2-5.4-.9-7.8.4 4.4-1 7.5 1 7.8zm-1.5 0c.3 3.2-5.4.8-7.6-2.3 4.8 1.5 7.3-.3 7.6 2.3zm-1.5-2.5c1.8-1.3-.1-4.8-3.7-4.6.4 2.1 1.6 5.9 3.7 4.6zm14 14.7c.1 3.2-8 1.6-10.6-1.8 5.2 1 10.3-.8 10.5 1.8zm-32.4-5.8c.3 3.2-8.6-.4-10.8-3.4 4.7 1.6 10.5.8 10.8 3.4zm5.4 1.3c1.9-1.3-1.9-4.7-5-5.5.4 2.1 3 6.8 5 5.6zm.6 2.3c.2 2.9-9.5 1.3-12-1.4 8.3 1.5 11.7-1.1 12 1.4z"/>
+      <path d="M252.8 268.6c1 2.7-8.3 2-11.6.5 5.3 0 10.8-2.4 11.6-.5z"/>
+      <path d="M257.1 270.6c1 2.4-7.6 2.4-11.8 1 5.6 0 10.8-3.4 11.8-1zm6.3 1.3c1.6 2.9-7.6 3.1-10.5 1.7 5.2-.7 9.2-4 10.5-1.7zm-10.7-4.9c-2.9 1.8-2.7-3.6-5-7.3 3.6 3.3 7 5.6 5 7.3z"/>
+      <path d="M257.9 269c-2.4 2.1-4.4-5.3-6.6-9.5 3.6 4 8.8 7.7 6.6 9.4zm6.8 2c-2 2.4-8-7-10.2-12 3.3 3.9 11.8 10 10.2 12zm-5.8 7.2c-1 3.6-16.2-3.4-18-7.1 8.8 4.6 18.2 3.6 18 7zm-48.7-73.8c-.4-.5-1.4 0-1.2 1.1.3 1.5 2.5 9.2 6.3 11.8 2.7 2 17 5.1 23.4 6.5 3.6.7 6.5 2.5 8.9 5.3a94.4 94.4 0 0 0-3-9.8c-1.2-3-4.4-6.2-7.8-6.3-6.1-.3-14.1-.8-20-3.3a16 16 0 0 1-6.7-5.3z"/>
+      <path d="M245.5 234.9c2 1.4 4.1-3.7 1.7-8.6-.1 4.7-3.8 6.3-1.7 8.6z"/>
+      <path d="M247.4 239.6c2.7.8 3.5-4 1.8-7.8.3 4.1-4.3 6.6-1.8 7.8z"/>
+      <path d="M249.5 243.4c2.6 1.3 3.5-3.6 1.7-7.1.2 4.5-3.7 5.9-1.7 7z"/>
+      <path d="M248.4 243.7c-1 3-7-2.7-8-5.8 3.7 3.7 8.7 3.2 8 5.7z"/>
+      <path d="M245.7 239c-1.2 3-8.7-5-10.4-8.7 3.7 3.7 11.2 6.5 10.4 8.6z"/>
+      <path d="M244.2 234.3c-1.2 3.5-9.3-5.8-11.7-9.1 4 3.6 12.6 6.6 11.7 9.1zm-.3-3.4c3-.6-.1-3-3.7-6.9-.1 4.1.5 7 3.7 6.9z"/>
+      <path d="M239 228.5c1.3-1.3-1.1-1.9-4.1-5.3-.5 2.3 2.8 6.5 4.2 5.3zm14 15.2c1.6 1 2.6-2.3.7-5.2-.5 3.2-2.1 4-.7 5.2zm-34.2-20.3c-3.3 2-8.6-6-10-9.3 2.9 3.8 10.6 7.2 10 9.3z"/>
+      <path d="M221.7 228c-1.9 2-7.7-3.5-9.7-6.3 3 2.7 10.5 3 9.7 6.3z"/>
+      <path d="M224.8 232.2c-.6 2.8-9-3.5-11-6.5 3.6 3.5 11.6 3.2 11 6.5z"/>
+      <path d="M223.5 235.3c-1.3 2.5-8.2-3.8-9.9-7 4.3 3.6 11 4.5 10 7zM220 223c2.1-2.3 1.2-3.4-.4-7-.8 3.7-2.1 5.2.4 7zm2.9 4.3c4 .2 0-4.6-1-8.7.4 4.6-1 8.3 1 8.7z"/>
+      <path d="M225.4 231.1c2.7-.6 2-4.5-.2-9.2.5 5.1-2.3 8 .2 9.2zm-1 7.7c-1 3-8.8-4-10-6.8 4 3.4 10.7 4.5 10 6.8z"/>
+      <path d="M229.1 243.6c-1.1 3-9.3-3.2-11.8-6.6 4.9 4 12.4 3.6 11.8 6.6z"/>
+      <path d="M233.9 248.5c-1.3 4.3-9.9-2.6-12.4-6 5.4 4.2 13 3 12.4 6zm-8-11c2.3 1.1 3.2-5.4 1.9-10.1 0 5-4.7 8.8-2 10z"/>
+      <path d="M229.8 242.7c2.8.8 2-6.3-.5-11-.3 4.7-2.3 9 .5 11zm5 4.9c3 .1 1-6.1-1.6-9.6.4 4.5-1 9 1.6 9.6zm-5.5 2.6c-1 1.6-3.2-1.3-7-3.5 3.4 1 7.4 2 7 3.5zm-1.8-52.7c3-2.2.7-6.2 0-10-1 3.6-3.4 8.4 0 10zm0 5.3c-4.5-.5-3.8-6.1-4-9.7 1.4 4.9 5 5.7 4 9.8zm.6-.7c3.7-.2 3.5-4.4 3.7-8.6-1.9 3.9-4 4.5-3.7 8.6z"/>
+      <path d="M228 207.3c-3 .3-4.4-2.6-5-7 2.7 4.1 5.1 2.8 5 7zm1-.3c3.7.5 3-3.8 3-7-1.2 3-4.2 4-3 7z"/>
+      <path d="M223.2 205.2c.3 2.8 2.1 7.6 5 6.5 1.1-3.4-2.6-4.1-5-6.5z"/>
+      <path d="M229 212c-1.2-2.4 3-3.7 3.8-6.9.5 4.6.1 7.6-3.8 7zm-11.9-29.2c2.3-2.4.3-6.4-.4-10.2-1 3.6-2.5 8.4.4 10.2zm0 4.6c-4 .5-5-7.7-5.5-11.3 1.4 4.9 6 7 5.5 11.4zm.8 0c2.8-1.5 2.2-4.7 3-7-1.8 2.9-3.6 3.3-3 7z"/>
+      <path d="M217 192.8c-4.1.3-6.6-8.8-6.8-12.4 1.3 4.9 7.4 7.5 6.9 12.4zm.9-.2c4-.9 3.5-3.5 2.9-7.6-1.3 4.2-3.5 3.3-2.9 7.6z"/>
+      <path d="M217 198c-4.6.8-4.3-6.6-8-11.9 3.2 4 9 9 8 11.9zm1-.3c3.6.2 4-5.1 3.8-7.3-.9 2.2-5 4.2-3.7 7.4z"/>
+      <path d="M209.8 192.3c1.7 5.7 4.2 11.4 7.2 11 1.5-3.3-2.9-3.7-7.2-11z"/>
+      <path d="M218.1 202.4c-1.2-2.5 3-3.7 3.8-6.9.5 4.6.1 7.6-3.8 6.9zm-7.1-3.6c2.5 5.1 3.6 11 7 10.1 1.3-4-3.8-4.8-7-10.1z"/>
+      <path d="M218.7 208c-1.5-2.8 2.7-3.7 3.8-7.4.5 4.8 0 8.3-3.8 7.3zm7.2-34.5c2.4.6 5-2.1 4.1-6.2-2.8.6-4 3.2-4.1 6.2zm-7.9-2.1c.2 1.2 1.7 1.3 1.2-.4a5.3 5.3 0 0 1 0-3.4 7.5 7.5 0 0 0 0-4.6c-.4-1-1.8-.4-1.2.4.6.9.7 2.8.2 3.7-.6 1.3-.4 3-.2 4.3zm22.9 16c-1 1.3-2.9.4-1.4-1.5 1.2-1.5 3-2.8 3-4.4.2-2 1.3-5 2.4-6.1 1.1-1.1 2.4.4 1.2 1.2-1.3.8-2.2 4.4-2.1 5.8-.1 2-2 3.5-3.1 5zm-3-2.3c-1 1.4-2.4.5-1.6-1.7.7-1.5.8-3.5 1.6-4.6 1.2-1.7 3-3.1 4.1-4.2 1.2-1 2 0 1 1a27 27 0 0 0-3.3 4c-1.4 2.2-.8 4-1.8 5.5zm-15.7-7.2c-.1 2 1.5 2.4 1.4-.4 0-3-2.2-5.8-1-10.3.8-2.2.8-6.3.4-8.4-.4-2.2-2-.8-1.3.9.6 2-.1 5.6-.6 7.5-1.5 5.4 1.2 8 1 10.7zm4.3-11c-.2 1.9-1.8 2-1.3-.5.4-2 .4-3.6 0-5.3-.6-2.1-.4-5.7 0-7.2.5-1.6 2-.7 1.4.5a9.9 9.9 0 0 0-.3 5.9c.6 2 .5 4.8.2 6.7zM210.9 204c.8.9 2 .3 1-1-1-1-.7-1.2-1.3-2.4-.6-1.4-.5-2.1-1.2-3-.7-1-1.6 0-1 .7.8 1 .6 1.6 1 2.5 1 1.5.7 2.3 1.5 3.2zm20.4 24.6a8.6 8.6 0 0 1 4.4 6.7 16 16 0 0 0 2 7.1c-2-.5-3-3.7-3.3-6.8-.3-3.2-2-4.5-3-7zm5.1 5.9c1.7 3.1 4 4.3 4.2 6.6.2 2.7.4 2.8 1.1 5.4-2-.5-2.5-.7-3-4.7-.3-2.8-2.6-4.7-2.3-7.3z"/>
+      <path stroke="none" d="M289 263.3c1 1.8 2 4.5 4 4 0-1.3-2.1-2.3-4-4m3 .6c3.7 1.6 7 1.2 7.5 3.6-3.6.4-5-1-7.6-3.6zm-16.1-12.7a14 14 0 0 1 5 7.7 29 29 0 0 0 3.6 7.8 13 13 0 0 1-5.3-7.4c-.7-3-1.6-5.3-3.3-8zm3.1 0c2.8 2.2 5.4 4.8 6.2 7.9.8 2.9 1.3 5.1 3.2 8-3-1.9-4.1-4.7-5-7.8-.7-3-2.5-5.2-4.4-8zm9.2 7.3a1.1 1.1 0 0 1 .7-1.2 33.4 33.4 0 0 1 2.6-.8c1-.3 1.6.4 1.6.9v2c0 .7-.2.8-.7.9-.7.1-1.7.2-2.4.7-.6.4-1.2.1-1.5-.5zm10.6 0c0-.6-.2-1.1-.6-1.2a5.4 5.4 0 0 0-2.4-.4c-1 0-1.1.2-1.1.6v2.1c0 .8 0 .8.4 1 .7 0 1.8 0 2.5.6.5.3 1 0 1.1-.6z"/>
+    </g>
+    <use xlink:href="#af-a" width="100%" height="100%" x="-600" transform="scale(-1 1)"/>
+    <g stroke="none">
+      <path d="M328.5 286.6c0 1.2.2 2.2 1 3.1a19 19 0 0 0-13.8 1.1c-1.8.8-4-1-1.9-2.7 3-2.3 9.7-1 14.7-1.5m-57.5 0a7 7 0 0 1-.4 3c4.4-1.7 9.1-.2 13.6 1.6 3 1.3 3.3-1 2.8-1.7a6.5 6.5 0 0 0-5-2.9zm3.8-21.7c-1.3-.5-2.7 0-4 1.4-4.3 4.2-9.4 8.3-13.5 11.6-1.5 1.3-3 3.7 3.4 6 .3.2 5 2 8 2 1.3 0 1.3 1.8 1 2.3-.5 1-.1 1.4-1.1 2.3-1.1 1 0 2.1 1 1.3 3.6-3.2 9.6-1.1 15.3.7 1.4.4 3.8.3 3.8-1.6 0-2 1.5-3.4 2.4-3.5 2.4.4 14 .5 17.5.1 2-.3 2.2 2.9 3.3 4 .8.9 3.7 1.1 5.8.2 4-1.8 10-1.8 12.5 0 1 .7 1.9 0 1.3-.7-.8-1-.7-1.6-1.1-2.4-1-2-.2-2.4.8-2.5 11-1.5 14.6-5.2 11.2-8.3-4.4-3.8-9.2-7.7-13.4-12.2-1.2-1.2-2-1.7-4.3-.7a66.5 66.5 0 0 1-25.3 5.9 76 76 0 0 1-24.6-5.8z"/>
+      <path fill="#bd6b00" d="m326.6 265.5-1.6.4c-9 3.2-17.2 5.4-25.7 5.4-8.3 0-17-2.4-24.9-5.6a2.3 2.3 0 0 0-1.5 0c-.5.1-1 .4-1.3.7a115.5 115.5 0 0 1-11.8 10.3c-.7.5-.6 1.8.5 2.2 8.3 3 16.4 8.5 39.6 8.3 23.5-.2 31.8-5.6 39.2-8.1.5-.2 1-.5 1.3-1a1 1 0 0 0 .1-.8 2 2 0 0 0-.6-.8c-4.3-3.5-8.8-6.3-11.8-10.4-.3-.5-.9-.6-1.5-.5zm0 .5c.5 0 1 0 1.1.3 3 4.3 7.7 7 11.9 10.5l.4.7a.5.5 0 0 1 0 .4c-.1.3-.6.6-1 .7-7.6 2.6-15.7 8-39 8.2-23.2.2-31.2-5.3-39.5-8.3-.8-.4-.7-1.2-.4-1.4 4.2-3.2 8.2-6.8 11.8-10.4a2.5 2.5 0 0 1 1.1-.6h1.2a68 68 0 0 0 25 5.6c8.7 0 17-2.2 26-5.3a6.7 6.7 0 0 1 1.5-.4z"/>
+      <path d="M269.7 114.6c0-1.4 2-1.5 1.8.4-.3 2.3 4.5 8.3 4.9 12 .3 2.5-1.5 4.6-3.2 6a6.6 6.6 0 0 1-6.8.5c-.9-.8-1.7-3.3-1-4.3.2-.3 1.3 3.7 3.7 3.7 3.3 0 6-2.5 6-4.7.2-3.8-5.3-9.8-5.4-13.6m9.5 9.4c.6-.4 1.4 1.3.8 1.7-.5.3-1.5-1.3-.8-1.8zm1.5-3.5c-.3.2-.8 0-.7-.2a12 12 0 0 1 3.6-3.3c.4-.2 1 .4.8.7a11 11 0 0 1-3.7 2.8m12.6-10c.3-.6 2.1-1.3 2.6-1.7.4-.5.6.4.4.7-.3.7-1.9 1.7-2.6 1.8-.3 0-.6-.4-.4-.7zm4.3.3a8.3 8.3 0 0 1 2.5-3.4c.5-.3 1.3 0 1.1.4a9 9 0 0 1-2.9 3.3c-.3.3-.8 0-.7-.3m-3.7 2.7c-.3.2-.1.7.1.8.6.2 1.5.2 2 0 .6-.4.3-2.9-.5-1.6-.6.8-1 .6-1.6.8m-7.3 5.6c-1.3-1 .4-2.4 1.7-1.4 2.7 2-4 9.8-7.6 13.4-.7.7-1.3-1-.4-1.9a33.7 33.7 0 0 0 6.7-7.6c.4-.5.7-1.6-.4-2.5m15.3-6.6c.1-1-1.6 0-1.6-1.3 0-.7 1.9-1.2 2.7-.4 1.3 1.4.3 3.7-2 3.9-1.8 0-5 2.7-4.5 3.2.5.7 5.4 1.1 8.3.7 1.8-.3 1.4 1.3-.4 1.5-1.8.2-3.2 0-4.8.6-2 .5-2.8 3-3.9 4-.2.2-.8-.8-.6-1.2.8-1.2 2-3 3.4-3.6.8-.3-2.4-.4-3.4-.7-.8-.2-.6-1.3-.3-1.9.4-.8 3.4-3.9 4.7-3.8 1.1 0 2.3-.3 2.4-1m5 .2c.6-.5 1-1.3 1.5-1.8.3-.3.9 0 .8.8-.1.7-1 1.2-1.5 1.7-.5.3-1-.4-.7-.7zm6.5-2.3c.9 0 1 1.6.2 1.8-.6.2-1-1.7-.2-1.8m-2.1 5c0 1.5.7 1.4 2 1.3 1.3 0 2.4 0 2.4-1.2 0-1.3-.7-2.5-1-1.6-.1.8-.3 2.2-.8 1.6-.4-.5-.2-.6-1 .2-.5.5-.5-.2-.8-.6-.2-.3-.8.2-.8.4zm-9.2 7.2c-.3 1.9 0 4.5.9 4.5 1.2 0 3.6-4 4.8-6.2.7-1.2 1.8-1.4 1.3-.1-.7 1.9-.6 6 0 7.2.4.6 3-.6 3.4-1.5.8-1.7.1-4.8.4-6.7.1-1.2 1.3-1.5 1.2-.3a75.6 75.6 0 0 0-.1 7.5c0 1 2.9 2.4 3.3-.6.2-1.8 1.2-3.7 0-5.7-.8-1.3 1.1-1.2 2.1.6.7 1.2-.6 3.2-.5 4.7 0 2.4-1.8 3.8-3.1 3.8-1.2 0-2-1.5-3-1.5s-2.2 1.7-3 1.6c-3.6-.2-1.7-5.3-2.8-5.4-1.2 0-2.5 5-4 4.9-1.4-.2-3-4.2-2.3-5.8.5-1.6 1.5-2 1.4-1m16.9-8c-1.7-1 0-3.7.9-2.8 1.6 2 3.2 6.5 4.4 6.9.7.2.6-3.4 1.1-5 .4-1.3 1.8-.9 1.6.7-.1.5-2 6.4-1.8 6.6a47.1 47.1 0 0 1 3.3 7.8c.3 1.2-1.1.4-1.3.2-.9-1.4-2.4-6.5-2.4-6.2l-1.7 7.7c-.2 1-1.7.8-1.3-1 .3-1.4 2.3-8.3 2.2-8.6a17.2 17.2 0 0 0-5-6.3"/>
+      <path d="M322 131.2c-.4 0-1.2 1 1.2 1.5 3.1.6 6.6-.5 7.6-3.6 1.3-3.7 2-7.2 2.7-8.5.8-1.5 1.8-1.4 1-3.6-.5-1.7-1.5-1.2-1.7-.3-.5 2.3-2.6 10-3.3 11.3-1.2 2.6-3.7 3.6-7.5 3.2"/>
+      <path d="M328.4 119c-.4-.7-1.2 0-1 .7a1.2 1.2 0 0 0 1.2 1c.7 0 2.2.1 2.2-1 0-.8-.7-1.5-1.1-.6-.5.8-1 .7-1.3 0zm.7-3c-.2.2 0 1.1.3 1a7 7 0 0 0 3.3-.8c.2-.2.1-.7-.2-.7-1 0-2.6 0-3.4.5m8.8 2.3c.8-1.2 2.8-1.3 2 .4a614.3 614.3 0 0 1-6.3 12.3c-.8 1.4-1.4.7-.8-.4.7-1.4 4.9-12 5.1-12.3"/>
+      <path d="M330.2 133c-.2-.8-1.5-2-1.3.2.2 3.8 5.5 2.6 7 1.3s.3 4.3 2.2 4.9c1 .3 3-1.1 4-2.4 2.7-3.5 4.5-8.6 7-12 1-1.4-.5-2.4-1-1.3-2.4 3.8-5.2 11.6-8.3 13.6-2.5 1.6-1.7-2-1.8-3.2-.1-.8-1.1-2-2.4-.9a5.5 5.5 0 0 1-3.7 1.2c-.7 0-1.4 0-1.7-1.4"/>
+      <path d="M339.6 126c0-.3-1.1-.4-1 .7 0 .8 1 1 1.1 1 1.5-1.2-.3-.6-.1-1.8zm-2.3 4.4c-.3 0-.6 1 .2 1.1l3.9-.2c.4 0 .6-.9-.4-.8-1.2 0-2.7-.3-3.7 0zm-62-16.6c.5 0 1.6 1.4 1.5 1.9 0 .2-1.2 0-1.5-.3-.3-.3-.2-1.6 0-1.6m-5.3 10.4c-1 .6.2 1.7 1 1.2 2.8-1.9 7-3.8 8-7.5.3-1.2 1.4-3.1 2.5-3.5 1-.5 2.6 1.9 3.6 0 .6-1 2.7.7 3.2-.4.6-1.3.3-2 .3-3.4 0-.8-.7-1-1.2.3-.2.6 0 1.2-.1 1.6-.2.2-.6.4-1 .2-.2-.2 0-.7-.6-1-.2 0-.6-.1-.8.2-.7 1.3-1 2.5-2.1 1-.9-1-1.4-3.1-2-.3-.2 1-1.7 2.4-2.6 2.4-1.1 0-.8-3-3.2-2.5-1.3.3-1.2 2.7-1 3.5.3 1.3 4 .4 3.7 1.2-.6 2.7-4.4 5.4-7.7 7m-22.7 13.2c-.1.5.5 1.7 1.1 1.8.6 0 1-1.3.8-1.8-.2-.3-1.8-.3-1.9 0m3.3 4.9c-.4-.4-1.6.7-.6 1.5.5.5 2.5 1.1 3 .2.8-1.2-.7-5.5 0-6 .5-.5 2.8 2.8 4 3 2.7.4 2-4.6 5-4.2 1.9.2 2.1-2.2 1.8-3.8-.2-1.5-2.6-3.6-3.7-4.6-1.4-1.2-2.1 1-1.2 1.6 1.2 1 3.3 2.9 3.6 4.1.1.6-1.4 1.8-2 1.5-1.4-.8-2.6-4-3.8-4.7-.4-.2-1.4.3-1 1.3.6 1.1 3 2.7 3.1 3.9.1 1-1 3.2-1.8 3.2-.9 0-3-2.7-3.7-4-.4-.5-1.5-.5-1.7.4a22 22 0 0 0 .5 5.5c.2 1.6-.9 1.7-1.5 1.1m-4-8.6c-.4.4.8 1.2 1 1 .4-.4 2.1-2.3 1.8-3-.3-.6-2.6-2-3-1.3-.7 1.1 2.2 1.7 1.7 2a7 7 0 0 0-1.5 1.3m4.1-8.4s.8 2.5 1.4 1.4c.4-.7-1.4-1.4-1.4-1.4m1.2 4c-.2 0-1 .7-.5 1 .8.4 2.9.8 2.4-.7-.3-.9 3.2 0 2.3-2.4a3.7 3.7 0 0 0-1.7-1.7c-.4 0-1.5.5-.8.9.5.2 2 1.1 1.5 1.7-.7.6-1.1-.3-1.9-.1-.4 0-.1 1.2-.4 1.5 0 .2-.7-.4-.9-.3zm5.5-9.5a3.5 3.5 0 0 0-1.2 2c0 .2.3.6.5.5a3.2 3.2 0 0 0 1.2-1.9c0-.3-.2-.8-.5-.6m2.8-.3c-.8-1 1-2.6 1.7-.5.5 1.3 5.5 7.9 6.5 10.1.8 1.5 0 2.1-.9 1-2.5-3.2-4.6-7.2-7.3-10.6m5.2.1c.9-1 2.7-3 2.2-4-.4-1-1.5-1-1.7-.7-1 1.3.8 1 .5 1.4-.5 1-1 1.6-1.3 2.6-.1.3.1.9.3.7m77.8 3.2c-.7-.5.6-3 1.5-2 2.3 2.7 3.4 11.6 4.1 18.3 0 0-1 .9-1 .7 0-3.5-1.5-14.4-4.6-17m-53.1-8.6c-.8-1.8 1.1-2.4 1.4-1.2 1.3 5.8 4.5 10.2 7 14.1.7 1.2 0 2-1.7.8-1.2-.8-2.5-3.9-3-4-1.2-.2-3.8 5-9.1 3.5-1.4-.4-1.3-4.5-1.4-6.3 0-.9 1-1 1 0 0 1.7 0 5.2 2.1 5.4 1.8 0 5.6-2.4 6.4-4.4.8-2-1.9-5.9-2.7-8z"/>
+      <path d="M344.6 138.4c.4-1.2 6.1-10.8 6.9-12.9.4-1 2 1.8.4 3.3-1.4 1.2-5.5 8-6.3 10.4-.4 1-1.4.5-1-.8"/>
+      <path d="M354.3 129.3c1-4 3.6.6 1.3 2.8-3.4 3.4-4.5 9.9-10 10.9-1.4.3-4-.7-4.8-1.3-.3-.2.2-1.6 1.1-.9 1.3 1 4.1 1.3 5.6.1a25.4 25.4 0 0 0 6.8-11.6m-57 12.7c-.3.3-1 .3-1.1.7-.3 1.4 0 2.2-.3 3.6s-1.3 1.4-1.2.3c0-1.4 1.3-3.5.4-3.6-.6-.1-1-.9-.4-1.3 1.1-.7 1.7-.6 2.4-.4.3.1.4.5.2.7"/>
+      <path d="M296.5 140c-1.4 1.4-2.8 1.9-4.1 3.5-.6.6-.5 1.5-.9 2.4-.3.9-1.4 1-1.7.9-.5-.4-.4-2-1-1.2-.6.9-.9 2-1.7 2-.7 0-2-1.5-1.3-1.5 2.3-.3 2.2-2 3-2.2 1-.1 1 1.5 1.7 1.2.4-.2.7-2.1 1.2-2.6 1.5-1.6 2.7-2.4 4.3-3.6.7-.6 1.3.5.5 1.2zm5.3 5c-1.2.2-1 1.7-.6 1.8.5.3 1.4.4 1.7-1.3.2-.7.3 3.5 1.8 1.9 1-1 3.1.2 4-1 .7-.9 1-1.5.4-2.7-.2-.3-1-.2-1 .7 0 .8-.5 1.7-1.3 1.6-.4-.1.2-1.9-.2-2.4a.5.5 0 0 0-.7 0c-.3.4.3 2.2-.6 2.4-1.2.2-.6-1.2-1-1.4-1.7-.8-1.8.2-2.5.3zm9-3c.9-.2.6-.2 2-1.3.5-.4.6.8.5 1.3 0 .7-1 .2-1.3.9-.4.9-.2 3-.4 3.8 0 .4-.8.4-.8 0-.2-1 .1-2 0-3.3 0-.4-.5-1.1 0-1.3zm-5-2.5c-.2.9-.2 1.6-.2 2.3 0 .5 1 .2 1 .1 0-.8.2-2 0-2.3-.2-.1-.7-.3-.8-.1"/>
+      <path d="m299.5 130.2-1.4 5.6-2-3.8v3.9l-4.4-5.2 1.5 5.6-4-3.4 2.2 3.8-7-4.5 4.4 5.2-5.6-2.8 4 3.4-9-3.4 8.7 4.3a29 29 0 0 1 12.6-2.6c4.9 0 9.3 1 12.5 2.6l8.8-4.3-9 3.4 4-3.4-5.5 2.8 4.3-5.2-7 4.5 2.2-3.8-4 3.3 1.5-5.5-4.3 5.2V132l-2 3.8z"/>
+    </g>
+  </g>
+  <path fill="#fff" d="m311.3 295-.3 2.6h-.4l-.1-1.8a9.3 9.3 0 0 0-.5-1.6 7.3 7.3 0 0 0-.5-1.3l-1-1.4.8-2.2a6.6 6.6 0 0 1 1.5 2.4 9.4 9.4 0 0 1 .5 3.2m7-4.2c0 .7-.2 1.2-.5 1.5-.2.3-.6.6-1.3.7l.4 1.5a6.7 6.7 0 0 1 0 2 22.5 22.5 0 0 1-.1 1.3h-.4a8.2 8.2 0 0 0-.1-1.3 5.5 5.5 0 0 0-.2-1l-.4-1a10.5 10.5 0 0 0-.7-1.4l-1-1.7.6-2 1 1c.3.2.6.3 1 .3.8 0 1.2-.4 1.2-1.3h.4v1.4m6.4 4.8-.5 2.1c-.4 0-.6-.3-.8-.7l-.4-1.3a12.4 12.4 0 0 1-.1-1.7 4 4 0 0 1-1 .2 2 2 0 0 1-1.3-.4 1.3 1.3 0 0 1-.5-1c0-.9.3-1.7.7-2.3.5-.7 1-1 1.5-1.1.5 0 .8.1 1 .4a2 2 0 0 1 .3.9v2c0 .9.1 1.5.3 1.9 0 .3.3.6.8 1m-2-3.5c0-.6-.3-.8-.8-.8a1 1 0 0 0-.6.1c-.2.1-.2.2-.2.3 0 .3.3.5 1 .5zm8.7 3-.3 2.6c-.5-.4-1-1-1.4-2a25.4 25.4 0 0 1-1.3-4.1 52.8 52.8 0 0 1-1.8 5.5 2.9 2.9 0 0 1-.8.7v-2.5c.6-.7.9-1.1 1-1.5a7.6 7.6 0 0 0 .8-1.7l.5-2.7h.4l.9 2.7c.2.6.5 1.2.9 1.6l1 1.4"/>
+  <path fill="#bf0000" d="M350.8 319.4c.4.4.6.8.7 1.2l.4 1.6-.8.1a7.8 7.8 0 0 0-1-1.5 18.8 18.8 0 0 0-1.1-1.2 46 46 0 0 0-1.7-1.5 34.4 34.4 0 0 0-2-1.7c-.4-.2-.6-.4-.6-.5a1.9 1.9 0 0 1-.3-.8 11.2 11.2 0 0 1-.2-1.6l2.7 2.2a44.3 44.3 0 0 1 2.5 2.2zm-9.5-5.8-.2 2H338l.3-2zm8.4 8.9-7.6 2.3-1.3-2 6.5-2-.7-.8a2.8 2.8 0 0 0-.9-.6 1.4 1.4 0 0 1-.4 1 2 2 0 0 1-1 .6 3.4 3.4 0 0 1-1.8 0 2 2 0 0 1-1.3-.7 4 4 0 0 1-.7-2.2c0-1 .3-1.6.9-1.8.7-.2 1.8 0 3 .7a8.1 8.1 0 0 1 3 2.4zm-5.8-4a3.8 3.8 0 0 0-.8-.3 1.1 1.1 0 0 0-.6 0 .7.7 0 0 0-.5.3.5.5 0 0 0 0 .6l.5.2h.6l.4-.3zm-8-1.6-.5 2-3.2-.3.5-2 3.1.3m7.5 7.7-1.7.4a5.3 5.3 0 0 1-1.7 0 3.6 3.6 0 0 1-1.5-.4c-.3.5-.8 1-1.5 1.2a7.4 7.4 0 0 1-1.6.6l-1.2.3-1-2 1.1-.3a9.1 9.1 0 0 0 1.3-.4l.9-.5-1-.5h-.7a.4.4 0 0 0-.2 0 .6.6 0 0 0-.2.3h-.5c-.5-.8-.6-1.5-.3-2s.9-.8 2-1a6.8 6.8 0 0 1 2.6-.2c.8.1 1.3.4 1.5.9.2.2.2.5.2.7l-.4 1.2h.5a2 2 0 0 0 .6 0l1.7-.3zm-8 1.8-1.6.3a3 3 0 0 1-2.2-.4 5.5 5.5 0 0 1-1.7-2.6l-.8-2.2a2 2 0 0 0-.8-1 4.6 4.6 0 0 0-.9-.5l.6-2.1c.6.3 1 .6 1.4 1l1 1.7.5 1.5 1.1 2.2c.3.3.7.4 1 .3l1.7-.2zm-7-7.5-1 1.9-3-.7 1-1.9zm1.8 8.4-7.5.7-.4-2 6.2-.7a2.3 2.3 0 0 0-.6-.8 8.3 8.3 0 0 0-1-.6l.5-2c.7.4 1.2.9 1.6 1.3.3.5.6 1.2.8 2.1zm-6 1a17 17 0 0 1-2.2-.2 10.5 10.5 0 0 1-1.7-.5 5.6 5.6 0 0 1-1.3.4 9.9 9.9 0 0 1-1.7 0h-2a2.5 2.5 0 0 1-1.2-.3c-.3-.2-.5-.5-.8-1a4.1 4.1 0 0 1-1.5 1l-1.7.1h-1.7l.2-2.1h1.7c.8 0 1.5 0 2.1-.4a2 2 0 0 0 1.3-1.8l.7.1a30.2 30.2 0 0 0-.1 1.3c0 .3 0 .5.3.7.3.2.6.3 1 .3h1.5c1 0 1.6 0 2-.2.6-.2.9-.5 1-1.1l.1-.4s.3 0 .5-.2l.5-.2v.4a8.9 8.9 0 0 1 0 .3l-.3 1.1a12.4 12.4 0 0 0 2 .5c.1-.2 0-.4-.1-.7l-.3-.6a.5.5 0 0 1 .1-.3l.3-.2 1-.9.5 1v1zm-11.3-8.7-2 1.3-1.3-.9-1.4 1-1.9-1 1.8-1.3 1.5.8 1.5-1 1.8 1m-3 8.2-7.3-1.2.8-2 6.2 1c0-.4 0-.7-.2-1a5.2 5.2 0 0 0-.5-.8l1.6-1.7c.4.6.6 1 .7 1.6 0 .5-.2 1.2-.5 2.1zm-6.1-1-1.6-.3c-.9-.2-1.4-.6-1.5-1.2-.2-.6.1-1.5.8-2.8l1.2-2c.3-.5.4-.9.3-1.2a2.2 2.2 0 0 0-.3-.7l2.2-1.6c.3.5.3 1 .3 1.4 0 .5-.3 1.1-.7 1.8l-.8 1.4a5.8 5.8 0 0 0-.9 2.2c0 .4.2.6.5.7l1.6.4zm-3.8-8-2.5 1.1-1.8-1.7 2.6-1zm-1 6.6a6.8 6.8 0 0 1-1.6 1.4 4.2 4.2 0 0 1-1.7.6l-2.4-.1a14.8 14.8 0 0 1-2.8-.7 7.7 7.7 0 0 1-3.4-2c-.6-.8-.6-1.5 0-2.2a7 7 0 0 1 2-1.6c.8-.5 2-1 3.8-1.6l.4.5-2.8 1.2c-.5.3-1 .6-1.3 1-.4.4-.3 1 .2 1.6a10.5 10.5 0 0 0 6.3 2.2c1.2 0 2-.3 2.3-.7.3-.3.4-.6.5-1l.2-1.6 2.5-1.5a8 8 0 0 1-.1 1.5 4.4 4.4 0 0 1-1 1.6z"/>
+</svg>

internal/app/api/core/frontend-dist/assets/af-nN9n7Awd.svg

@@ -0,0 +1,81 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="flag-icons-af" viewBox="0 0 512 512">
+  <g fill-rule="evenodd" stroke-width="1pt">
+    <path fill="#000001" d="M0 0h512v512H0z"/>
+    <path fill="#090" d="M341.3 0H512v512H341.3z"/>
+    <path fill="#bf0000" d="M170.7 0h170.6v512H170.7z"/>
+  </g>
+  <g fill="#fff" fill-rule="evenodd" stroke="#bd6b00" stroke-width=".5" transform="translate(2.2 86.8)scale(.84611)">
+    <path d="M319.5 225.8h8.3c0 3.2 2 6.6 4.5 8.5h-16c2.5-2.2 3.2-5 3.2-8.5z"/>
+    <path stroke="none" d="m266.7 178.5 4.6 5 57 .2 4.6-5-14.6-.3-7-5h-23l-6.6 5.1z"/>
+    <path d="M290 172.7h19.7c2.6-1.4 3.5-5.9 3.5-8.4 0-7.4-5.3-11-10.5-11.2-.8 0-1.7-.6-1.9-1.3-.5-1.6-.4-2.7-1-2.6-.4 0-.3 1-.7 2.4-.3.8-1.1 1.5-2 1.6-6.4.3-10.6 5-10.5 11.1.1 4 .6 6.4 3.4 8.4z"/>
+    <path stroke="none" d="M257.7 242.8H342l-7.5-6.1h-69.4z"/>
+    <path d="m296.4 219.7 1.5 4.6h3.5l-2.8-4.6zm-2 4.6 1 4.6h4l-1.5-4.6zm7 0 2.8 4.6h5.9l-4.6-4.6zm-34.5 10.4c3.1-2.9 5.1-5.3 5.1-8.8h7.6c0 2 .7 3.1 1.8 3h7.7v-4.5h-5.6v-24.7c-.2-8.8 10.6-13.8 15-13.8h-26.3v-.8h55.3v.8H301c7.9 0 15.5 7.5 15.6 13.8v7h-1l-.1-6.9c0-6.9-8.7-13.3-15.7-13.1-6 .1-15.4 5.9-15.3 13v2.2l14.3.1-.1 2.5 2.2 1.4 4.5 1.4v3.8l3.2.9v3.7l3.8 1.7v3.8l2.5 1.5-.1 3.9 3.3 2.3h-7.8l4.9 5.5h-7.3l-3.6-5.5h-4.7l2.1 5.4h-5l-1.3-5.4h-6.2v5.8H267zm22.2-15v4.6h5.3l-1-4.6H289z"/>
+    <path fill="none" d="M289.4 211.7h3.3v7.6h-3.3z"/>
+    <path fill="none" d="M284.7 219.8h3.2v-5.6c0-2.4 2.2-4.9 3.2-5 1.2 0 2.9 2.3 3 4.8v5.8h3.4v-14.4h-12.8zm25.6 3.3h4v3.2h-4zm-2.4-5.3h4v3.1h-4zm-3.9-5.4h4v3.1h-4zm-3.3-4.5h4v3.1h-4z"/>
+    <path fill="none" d="m298 219.8 4.2.2 7.3 6.4v-3.8l-2.5-1.8v-3l-3.6-2v-3.3l-3.5-1.2V207l-1.7-1.5z"/>
+    <path d="M315.4 210.3h1v7.1h-1z"/>
+    <g id="af-a">
+      <path d="M257.3 186.5c-1.2-2-2.7 2.8-7.8 6.3-2.3 1.6-4 5.9-4 8.7 0 2 .2 3.9 0 5.8-.1 1.1-1.4 3.8-.5 4.5 2.2 1.6 5.1 5.4 6.4 6.7 1.2 1 2.2-5.3 3-8 1-3 .6-6.7 3.2-9.4 1.8-2 6.4-3.8 6-4.6z"/>
+      <path fill="#bf0000" d="M257 201.9a10 10 0 0 0-1.6-2.6 6.1 6.1 0 0 0-2.4-1.8 5.3 5.3 0 0 1-2.4-1.5 3.6 3.6 0 0 1-.8-1.5 5.9 5.9 0 0 1 0-2l-.3.3c-2.3 1.6-4 5.9-4 8.7a28.5 28.5 0 0 0 0 2.3c.2.5.3 1 .6 1.3l1.1.8 2.7.7a7.1 7.1 0 0 1 2.6 2 10.5 10.5 0 0 1 1.8 2.6l.2-.8c.8-2.7.7-5.9 2.6-8.5z"/>
+      <path fill="none" d="M249.8 192.4c-.5 3.3 1.4 4.5 3.2 5.1 1.8.7 3.3 2.6 4 4.4m-11.7 1.5c.8 3 2.8 2.6 4.6 3.2 1.8.7 3.7 3 4.5 4.8"/>
+      <path d="m255.6 184.5 1-.6 17.7 29.9-1 .6z"/>
+      <path d="M257.5 183.3a2 2 0 1 1-4 0 2 2 0 1 1 4 0zm15.2-24h7.2v1.6h-7.2zm0 3.1h7.2v13.8h-7.2zm-.4-5h8c.2-2.7-2.5-5.6-4-5.6-1.6.1-4.1 3-4 5.6z"/>
+      <path fill="#bd6b00" stroke="none" d="M292.6 155.8c-1.5.6-2.7 2.3-3.4 4.3-.7 2-1 4.3-.6 6.1 0 .7.3 1.1.5 1.5.2.3.4.5.6.5.3 0 .6 0 .7-.3l.2-.8c-.1-2-.1-3.8.3-5.4a7.7 7.7 0 0 1 3-4.4c.3-.2.4-.5.5-.7a1 1 0 0 0-.3-.7c-.4-.3-1-.4-1.5-.1m.2.4c.4-.2.8 0 1 .1l.1.2c0 .1 0 .2-.3.4a8.2 8.2 0 0 0-3.1 4.6 16.7 16.7 0 0 0-.3 5.6 1 1 0 0 1-.2.6s0 .1-.2 0c0 0-.2 0-.4-.3a3.9 3.9 0 0 1-.4-1.2c-.3-1.8 0-4 .7-6 .7-1.8 1.8-3.4 3-4z"/>
+      <path fill="#bd6b00" stroke="none" d="M295.2 157.7c-1.5.7-2.5 2.3-3 4.2a13.6 13.6 0 0 0-.3 5.9c.2 1.3 1 2 1.6 2 .3.1.6 0 .8-.3.2-.3.3-.6.2-1-.4-1.6-.5-3.4-.3-5.1.3-1.7 1-3.2 2.2-4.1.3-.3.5-.5.5-.8a.8.8 0 0 0-.2-.6c-.4-.3-1-.4-1.5-.2m.2.5c.4-.2.8-.1 1 0l.1.3-.3.4a6.5 6.5 0 0 0-2.4 4.4c-.3 1.8-.1 3.7.2 5.2.1.4 0 .6 0 .8l-.5.1c-.3 0-1-.5-1.2-1.7-.3-1.7-.2-3.9.3-5.7.5-1.8 1.5-3.3 2.8-3.8"/>
+      <path d="M272.3 187.4h8v11h-8zm.5 17.4h7.7v2.4h-7.7zm-.2 4.1h8v8.7h-8zm-.6 10.5h8.7v4.9H272zm1.1-16.6h7l1.4-2.4h-9.6zm9.4-8.6.1-6h4.8a17.4 17.4 0 0 0-4.9 6z"/>
+      <path fill="none" d="M273.6 196.7c0 1.3 1.5.8 1.5.1v-5.6c0-1 2.4-.8 2.4-.1v6c0 1 1.7.9 1.6 0v-7c0-2.2-5.5-2.1-5.5-.1zm0 13.3h5.7v7h-5.7z"/>
+      <path d="M277.2 213h2v1h-2zm-3.5 0h2v1h-2zm2-3h1.5v3h-1.5zm0 4h1.5v3.1h-1.5zM244 139c.4 5.5-1.4 8.6-4.3 8.1-.8-3 1-5.1 4.3-8.1zm-6.5 12.3c-2.6-1.3-.7-11.5.3-15.8.7 5.5 2 13.3-.3 15.8z"/>
+      <path d="M238.4 151.8c4.4 1.5 8-3.2 9.1-8.7-3.6 5-9.5 5-9 8.7zm-3.3 5.1c-3.4-.9-1.4-11.7-.7-16 .7 4.5 3.1 14.5.7 16zm1.2-.3c.2-3.7 3.9-2.7 6.5-4.7-.5 2-2 5.2-6.5 4.7zm-4.2 5c-3.4-1-1.4-12.6-1.6-17.4 1 4.2 4.2 16.3 1.6 17.4zm1.6-.5c2.8.9 6.5-1 6.8-4.3-2.5 1.7-6.3.4-6.8 4.3z"/>
+      <path d="M229.5 166.7c-3.2.3-1.8-9.6-1.8-18.8 1.2 8.6 4.5 16.5 1.8 18.8z"/>
+      <path d="M230.7 166.3c2.2 1 6.1-.7 7.2-4.4-4 1.7-6.6 0-7.2 4.4zm25.6-22.2c-.6 4.9-2.6 7.7-5.5 7.2-.8-3 1.6-5 5.5-7.2zm-7.8 12.4c4.9.7 6.6-3 10-7.9-4.7 3.4-10.2 4-10 8z"/>
+      <path d="M247 156c-2.6-3.2 0-7.3 2-10.7-.4 5.1 1.3 8-2 10.7zm-1 5.3c-.4-3.2 5-3.9 7.4-5.6-.9 1.8-2 6.7-7.5 5.6z"/>
+      <path d="M244.8 161.3c-3.7-.4-2.2-6.7.5-10.1-1.1 4.8 2 8.1-.5 10.1z"/>
+      <path d="M242 166.6c-4.2-2-1.5-7.2 0-10.3-.6 4.1 2.8 7.2 0 10.2z"/>
+      <path d="M242.8 166c2.2 3 6.5-.8 7.4-5.2-3.7 3.1-6.5 2.6-7.4 5.3zm-9.6 20.3c-.4-4.3 2.8-12 .5-16.2-.3-.6.7-2.1 1.4-1.2 1 1.5 2 5.7 2.5 4.1.4-1.7.5-4.6 2-5.2 1-.3 2.3-.6 1.9 1-.4 1.4-1.2 3.4-.3 3.5.5 0 2-2 3.3-3 1-.8 2.6.6 1 1.8-4.8 4-9.5 5.9-12.3 15.2zm-8.7 64.5c-.6 0-1.3-.3-.6.6 5.7 7 7.3 9 15.6 8 8.3-1.1 10.3-3.4 16.2-6.7a14.6 14.6 0 0 1 11.2-1c1.6.5 2.6.5 1.4-.7-1.2-1.1-2.5-2.7-4-3.8a17.5 17.5 0 0 0-12.7-2.7c-6 1-11.1 4.9-17.2 6.4a25 25 0 0 1-9.9 0zm47.8 12.5c1 .2 1.7 2.2 2.3.9.8-2.3.2-4-.8-3.9-1.2.3-3.1 3-1.5 3z"/>
+      <path stroke="none" d="M220.6 183c-1.2-1.4-.9-1.8 1-1.9 1.4 0 4.2 1 5.3.1 1-.7.5-3.7 1-5 .2-.9.7-2 2-.2 3.6 5.8 8 12.8 10 19.6 1 3.8 0 9.8-3.4 13.8 0-3.4-1.2-5.7-2.7-8.6-2-3.7-9.1-14-13.2-17.9z"/>
+      <path d="M235.5 213.4c4 0 4.7-5.3 4.7-6.8-2 .4-5.4 3.7-4.7 6.8zm34.5 51.9c2.8.6 2.7-6.2-.2-9.1 1.3 4.4-2 8.4.1 9zm-1.2-.1c.2 3.2-8-.4-10-3 4.8 2.1 9.8.4 10 3zm-3.5-4.6c.3 3.1-7 .3-9.3-2.1 4.9 1.6 9-.5 9.3 2zm1.3.4c2.9.7 2.4-6.4-.4-8.8 1.4 4.7-1.8 8.1.4 8.8zm-3-4.3c2.9.7 1.2-5.4-.9-7.8.4 4.4-1 7.5 1 7.8zm-1.5 0c.3 3.2-5.4.8-7.6-2.3 4.8 1.5 7.3-.3 7.6 2.3zm-1.5-2.5c1.8-1.3-.1-4.8-3.7-4.6.4 2.1 1.6 5.9 3.7 4.6zm14 14.7c.1 3.2-8 1.6-10.6-1.8 5.2 1 10.3-.8 10.5 1.8zm-32.4-5.8c.3 3.2-8.6-.4-10.8-3.4 4.7 1.6 10.5.8 10.8 3.4zm5.4 1.3c1.9-1.3-1.9-4.7-5-5.5.4 2.1 3 6.8 5 5.6zm.6 2.3c.2 2.9-9.5 1.3-12-1.4 8.3 1.5 11.7-1.1 12 1.4z"/>
+      <path d="M252.8 268.6c1 2.7-8.3 2-11.6.5 5.3 0 10.8-2.4 11.6-.5z"/>
+      <path d="M257.1 270.6c1 2.4-7.6 2.4-11.8 1 5.6 0 10.8-3.4 11.8-1zm6.3 1.3c1.6 2.9-7.6 3.1-10.5 1.7 5.2-.7 9.2-4 10.5-1.7zm-10.7-4.9c-2.9 1.8-2.7-3.6-5-7.3 3.6 3.3 7 5.6 5 7.3z"/>
+      <path d="M257.9 269c-2.4 2.1-4.4-5.3-6.6-9.5 3.6 4 8.8 7.7 6.6 9.4zm6.8 2c-2 2.4-8-7-10.2-12 3.3 3.9 11.8 10 10.2 12zm-5.8 7.2c-1 3.6-16.2-3.4-18-7.1 8.8 4.6 18.2 3.6 18 7zm-48.7-73.8c-.4-.5-1.4 0-1.2 1.1.3 1.5 2.5 9.2 6.3 11.8 2.7 2 17 5.1 23.4 6.5 3.6.7 6.5 2.5 8.9 5.3a94.4 94.4 0 0 0-3-9.8c-1.2-3-4.4-6.2-7.8-6.3-6.1-.3-14.1-.8-20-3.3a16 16 0 0 1-6.7-5.3z"/>
+      <path d="M245.5 234.9c2 1.4 4.1-3.7 1.7-8.6-.1 4.7-3.8 6.3-1.7 8.6z"/>
+      <path d="M247.4 239.6c2.7.8 3.5-4 1.8-7.8.3 4.1-4.3 6.6-1.8 7.8z"/>
+      <path d="M249.5 243.4c2.6 1.3 3.5-3.6 1.7-7.1.2 4.5-3.7 5.9-1.7 7z"/>
+      <path d="M248.4 243.7c-1 3-7-2.7-8-5.8 3.7 3.7 8.7 3.2 8 5.7z"/>
+      <path d="M245.7 239c-1.2 3-8.7-5-10.4-8.7 3.7 3.7 11.2 6.5 10.4 8.6z"/>
+      <path d="M244.2 234.3c-1.2 3.5-9.3-5.8-11.7-9.1 4 3.6 12.6 6.6 11.7 9.1zm-.3-3.4c3-.6-.1-3-3.7-6.9-.1 4.1.5 7 3.7 6.9z"/>
+      <path d="M239 228.5c1.3-1.3-1.1-1.9-4.1-5.3-.5 2.3 2.8 6.5 4.2 5.3zm14 15.2c1.6 1 2.6-2.3.7-5.2-.5 3.2-2.1 4-.7 5.2zm-34.2-20.3c-3.3 2-8.6-6-10-9.3 2.9 3.8 10.6 7.2 10 9.3z"/>
+      <path d="M221.7 228c-1.9 2-7.7-3.5-9.7-6.3 3 2.7 10.5 3 9.7 6.3z"/>
+      <path d="M224.8 232.2c-.6 2.8-9-3.5-11-6.5 3.6 3.5 11.6 3.2 11 6.5z"/>
+      <path d="M223.5 235.3c-1.3 2.5-8.2-3.8-9.9-7 4.3 3.6 11 4.5 10 7zM220 223c2.1-2.3 1.2-3.4-.4-7-.8 3.7-2.1 5.2.4 7zm2.9 4.3c4 .2 0-4.6-1-8.7.4 4.6-1 8.3 1 8.7z"/>
+      <path d="M225.4 231.1c2.7-.6 2-4.5-.2-9.2.5 5.1-2.3 8 .2 9.2zm-1 7.7c-1 3-8.8-4-10-6.8 4 3.4 10.7 4.5 10 6.8z"/>
+      <path d="M229.1 243.6c-1.1 3-9.3-3.2-11.8-6.6 4.9 4 12.4 3.6 11.8 6.6z"/>
+      <path d="M233.9 248.5c-1.3 4.3-9.9-2.6-12.4-6 5.4 4.2 13 3 12.4 6zm-8-11c2.3 1.1 3.2-5.4 1.9-10.1 0 5-4.7 8.8-2 10z"/>
+      <path d="M229.8 242.7c2.8.8 2-6.3-.5-11-.3 4.7-2.3 9 .5 11zm5 4.9c3 .1 1-6.1-1.6-9.6.4 4.5-1 9 1.6 9.6zm-5.5 2.6c-1 1.6-3.2-1.3-7-3.5 3.4 1 7.4 2 7 3.5zm-1.8-52.7c3-2.2.7-6.2 0-10-1 3.6-3.4 8.4 0 10zm0 5.3c-4.5-.5-3.8-6.1-4-9.7 1.4 4.9 5 5.7 4 9.8zm.6-.7c3.7-.2 3.5-4.4 3.7-8.6-1.9 3.9-4 4.5-3.7 8.6z"/>
+      <path d="M228 207.3c-3 .3-4.4-2.6-5-7 2.7 4.1 5.1 2.8 5 7zm1-.3c3.7.5 3-3.8 3-7-1.2 3-4.2 4-3 7z"/>
+      <path d="M223.2 205.2c.3 2.8 2.1 7.6 5 6.5 1.1-3.4-2.6-4.1-5-6.5z"/>
+      <path d="M229 212c-1.2-2.4 3-3.7 3.8-6.9.5 4.6.1 7.6-3.8 7zm-11.9-29.2c2.3-2.4.3-6.4-.4-10.2-1 3.6-2.5 8.4.4 10.2zm0 4.6c-4 .5-5-7.7-5.5-11.3 1.4 4.9 6 7 5.5 11.4zm.8 0c2.8-1.5 2.2-4.7 3-7-1.8 2.9-3.6 3.3-3 7z"/>
+      <path d="M217 192.8c-4.1.3-6.6-8.8-6.8-12.4 1.3 4.9 7.4 7.5 6.9 12.4zm.9-.2c4-.9 3.5-3.5 2.9-7.6-1.3 4.2-3.5 3.3-2.9 7.6z"/>
+      <path d="M217 198c-4.6.8-4.3-6.6-8-11.9 3.2 4 9 9 8 11.9zm1-.3c3.6.2 4-5.1 3.8-7.3-.9 2.2-5 4.2-3.7 7.4z"/>
+      <path d="M209.8 192.3c1.7 5.7 4.2 11.4 7.2 11 1.5-3.3-2.9-3.7-7.2-11z"/>
+      <path d="M218.1 202.4c-1.2-2.5 3-3.7 3.8-6.9.5 4.6.1 7.6-3.8 6.9zm-7.1-3.6c2.5 5.1 3.6 11 7 10.1 1.3-4-3.8-4.8-7-10.1z"/>
+      <path d="M218.7 208c-1.5-2.8 2.7-3.7 3.8-7.4.5 4.8 0 8.3-3.8 7.3zm7.2-34.5c2.4.6 5-2.1 4.1-6.2-2.8.6-4 3.2-4.1 6.2zm-7.9-2.1c.2 1.2 1.7 1.3 1.2-.4a5.3 5.3 0 0 1 0-3.4 7.5 7.5 0 0 0 0-4.6c-.4-1-1.8-.4-1.2.4.6.9.7 2.8.2 3.7-.6 1.3-.4 3-.2 4.3zm22.9 16c-1 1.3-2.9.4-1.4-1.5 1.2-1.5 3-2.8 3-4.4.2-2 1.3-5 2.4-6.1 1.1-1.1 2.4.4 1.2 1.2-1.3.8-2.2 4.4-2.1 5.8-.1 2-2 3.5-3.1 5zm-3-2.3c-1 1.4-2.4.5-1.6-1.7.7-1.5.8-3.5 1.6-4.6 1.2-1.7 3-3.1 4.1-4.2 1.2-1 2 0 1 1a27 27 0 0 0-3.3 4c-1.4 2.2-.8 4-1.8 5.5zm-15.7-7.2c-.1 2 1.5 2.4 1.4-.4 0-3-2.2-5.8-1-10.3.8-2.2.8-6.3.4-8.4-.4-2.2-2-.8-1.3.9.6 2-.1 5.6-.6 7.5-1.5 5.4 1.2 8 1 10.7zm4.3-11c-.2 1.9-1.8 2-1.3-.5.4-2 .4-3.6 0-5.3-.6-2.1-.4-5.7 0-7.2.5-1.6 2-.7 1.4.5a9.9 9.9 0 0 0-.3 5.9c.6 2 .5 4.8.2 6.7zM210.9 204c.8.9 2 .3 1-1-1-1-.7-1.2-1.3-2.4-.6-1.4-.5-2.1-1.2-3-.7-1-1.6 0-1 .7.8 1 .6 1.6 1 2.5 1 1.5.7 2.3 1.5 3.2zm20.4 24.6a8.6 8.6 0 0 1 4.4 6.7 16 16 0 0 0 2 7.1c-2-.5-3-3.7-3.3-6.8-.3-3.2-2-4.5-3-7zm5.1 5.9c1.7 3.1 4 4.3 4.2 6.6.2 2.7.4 2.8 1.1 5.4-2-.5-2.5-.7-3-4.7-.3-2.8-2.6-4.7-2.3-7.3z"/>
+      <path stroke="none" d="M289 263.3c1 1.8 2 4.5 4 4 0-1.3-2.1-2.3-4-4m3 .6c3.7 1.6 7 1.2 7.5 3.6-3.6.4-5-1-7.6-3.6zm-16.1-12.7a14 14 0 0 1 5 7.7 29 29 0 0 0 3.6 7.8 13 13 0 0 1-5.3-7.4c-.7-3-1.6-5.3-3.3-8zm3.1 0c2.8 2.2 5.4 4.8 6.2 7.9.8 2.9 1.3 5.1 3.2 8-3-1.9-4.1-4.7-5-7.8-.7-3-2.5-5.2-4.4-8zm9.2 7.3a1.1 1.1 0 0 1 .7-1.2 33.4 33.4 0 0 1 2.6-.8c1-.3 1.6.4 1.6.9v2c0 .7-.2.8-.7.9-.7.1-1.7.2-2.4.7-.6.4-1.2.1-1.5-.5zm10.6 0c0-.6-.2-1.1-.6-1.2a5.4 5.4 0 0 0-2.4-.4c-1 0-1.1.2-1.1.6v2.1c0 .8 0 .8.4 1 .7 0 1.8 0 2.5.6.5.3 1 0 1.1-.6z"/>
+    </g>
+    <use xlink:href="#af-a" width="100%" height="100%" x="-600" transform="scale(-1 1)"/>
+    <g stroke="none">
+      <path d="M328.5 286.6c0 1.2.2 2.2 1 3.1a19 19 0 0 0-13.8 1.1c-1.8.8-4-1-1.9-2.7 3-2.3 9.7-1 14.7-1.5m-57.5 0a7 7 0 0 1-.4 3c4.4-1.7 9.1-.2 13.6 1.6 3 1.3 3.3-1 2.8-1.7a6.5 6.5 0 0 0-5-2.9zm3.8-21.7c-1.3-.5-2.7 0-4 1.4-4.3 4.2-9.4 8.3-13.5 11.6-1.5 1.3-3 3.7 3.4 6 .3.2 5 2 8 2 1.3 0 1.3 1.8 1 2.3-.5 1-.1 1.4-1.1 2.3-1.1 1 0 2.1 1 1.3 3.6-3.2 9.6-1.1 15.3.7 1.4.4 3.8.3 3.8-1.6 0-2 1.5-3.4 2.4-3.5 2.4.4 14 .5 17.5.1 2-.3 2.2 2.9 3.3 4 .8.9 3.7 1.1 5.8.2 4-1.8 10-1.8 12.5 0 1 .7 1.9 0 1.3-.7-.8-1-.7-1.6-1.1-2.4-1-2-.2-2.4.8-2.5 11-1.5 14.6-5.2 11.2-8.3-4.4-3.8-9.2-7.7-13.4-12.2-1.2-1.2-2-1.7-4.3-.7a66.5 66.5 0 0 1-25.3 5.9 76 76 0 0 1-24.6-5.8z"/>
+      <path fill="#bd6b00" d="m326.6 265.5-1.6.4c-9 3.2-17.2 5.4-25.7 5.4-8.3 0-17-2.4-24.9-5.6a2.3 2.3 0 0 0-1.5 0c-.5.1-1 .4-1.3.7a115.5 115.5 0 0 1-11.8 10.3c-.7.5-.6 1.8.5 2.2 8.3 3 16.4 8.5 39.6 8.3 23.5-.2 31.8-5.6 39.2-8.1.5-.2 1-.5 1.3-1a1 1 0 0 0 .1-.8 2 2 0 0 0-.6-.8c-4.3-3.5-8.8-6.3-11.8-10.4-.3-.5-.9-.6-1.5-.5zm0 .5c.5 0 1 0 1.1.3 3 4.3 7.7 7 11.9 10.5l.4.7a.5.5 0 0 1 0 .4c-.1.3-.6.6-1 .7-7.6 2.6-15.7 8-39 8.2-23.2.2-31.2-5.3-39.5-8.3-.8-.4-.7-1.2-.4-1.4 4.2-3.2 8.2-6.8 11.8-10.4a2.5 2.5 0 0 1 1.1-.6h1.2a68 68 0 0 0 25 5.6c8.7 0 17-2.2 26-5.3a6.7 6.7 0 0 1 1.5-.4z"/>
+      <path d="M269.7 114.6c0-1.4 2-1.5 1.8.4-.3 2.3 4.5 8.3 4.9 12 .3 2.5-1.5 4.6-3.2 6a6.6 6.6 0 0 1-6.8.5c-.9-.8-1.7-3.3-1-4.3.2-.3 1.3 3.7 3.7 3.7 3.3 0 6-2.5 6-4.7.2-3.8-5.3-9.8-5.4-13.6m9.5 9.4c.6-.4 1.4 1.3.8 1.7-.5.3-1.5-1.3-.8-1.8zm1.5-3.5c-.3.2-.8 0-.7-.2a12 12 0 0 1 3.6-3.3c.4-.2 1 .4.8.7a11 11 0 0 1-3.7 2.8m12.6-10c.3-.6 2.1-1.3 2.6-1.7.4-.5.6.4.4.7-.3.7-1.9 1.7-2.6 1.8-.3 0-.6-.4-.4-.7zm4.3.3a8.3 8.3 0 0 1 2.5-3.4c.5-.3 1.3 0 1.1.4a9 9 0 0 1-2.9 3.3c-.3.3-.8 0-.7-.3m-3.7 2.7c-.3.2-.1.7.1.8.6.2 1.5.2 2 0 .6-.4.3-2.9-.5-1.6-.6.8-1 .6-1.6.8m-7.3 5.6c-1.3-1 .4-2.4 1.7-1.4 2.7 2-4 9.8-7.6 13.4-.7.7-1.3-1-.4-1.9a33.7 33.7 0 0 0 6.7-7.6c.4-.5.7-1.6-.4-2.5m15.3-6.6c.1-1-1.6 0-1.6-1.3 0-.7 1.9-1.2 2.7-.4 1.3 1.4.3 3.7-2 3.9-1.8 0-5 2.7-4.5 3.2.5.7 5.4 1.1 8.3.7 1.8-.3 1.4 1.3-.4 1.5-1.8.2-3.2 0-4.8.6-2 .5-2.8 3-3.9 4-.2.2-.8-.8-.6-1.2.8-1.2 2-3 3.4-3.6.8-.3-2.4-.4-3.4-.7-.8-.2-.6-1.3-.3-1.9.4-.8 3.4-3.9 4.7-3.8 1.1 0 2.3-.3 2.4-1m5 .2c.6-.5 1-1.3 1.5-1.8.3-.3.9 0 .8.8-.1.7-1 1.2-1.5 1.7-.5.3-1-.4-.7-.7zm6.5-2.3c.9 0 1 1.6.2 1.8-.6.2-1-1.7-.2-1.8m-2.1 5c0 1.5.7 1.4 2 1.3 1.3 0 2.4 0 2.4-1.2 0-1.3-.7-2.5-1-1.6-.1.8-.3 2.2-.8 1.6-.4-.5-.2-.6-1 .2-.5.5-.5-.2-.8-.6-.2-.3-.8.2-.8.4zm-9.2 7.2c-.3 1.9 0 4.5.9 4.5 1.2 0 3.6-4 4.8-6.2.7-1.2 1.8-1.4 1.3-.1-.7 1.9-.6 6 0 7.2.4.6 3-.6 3.4-1.5.8-1.7.1-4.8.4-6.7.1-1.2 1.3-1.5 1.2-.3a75.6 75.6 0 0 0-.1 7.5c0 1 2.9 2.4 3.3-.6.2-1.8 1.2-3.7 0-5.7-.8-1.3 1.1-1.2 2.1.6.7 1.2-.6 3.2-.5 4.7 0 2.4-1.8 3.8-3.1 3.8-1.2 0-2-1.5-3-1.5s-2.2 1.7-3 1.6c-3.6-.2-1.7-5.3-2.8-5.4-1.2 0-2.5 5-4 4.9-1.4-.2-3-4.2-2.3-5.8.5-1.6 1.5-2 1.4-1m16.9-8c-1.7-1 0-3.7.9-2.8 1.6 2 3.2 6.5 4.4 6.9.7.2.6-3.4 1.1-5 .4-1.3 1.8-.9 1.6.7-.1.5-2 6.4-1.8 6.6a47.1 47.1 0 0 1 3.3 7.8c.3 1.2-1.1.4-1.3.2-.9-1.4-2.4-6.5-2.4-6.2l-1.7 7.7c-.2 1-1.7.8-1.3-1 .3-1.4 2.3-8.3 2.2-8.6a17.2 17.2 0 0 0-5-6.3"/>
+      <path d="M322 131.2c-.4 0-1.2 1 1.2 1.5 3.1.6 6.6-.5 7.6-3.6 1.3-3.7 2-7.2 2.7-8.5.8-1.5 1.8-1.4 1-3.6-.5-1.7-1.5-1.2-1.7-.3-.5 2.3-2.6 10-3.3 11.3-1.2 2.6-3.7 3.6-7.5 3.2"/>
+      <path d="M328.4 119c-.4-.7-1.2 0-1 .7a1.2 1.2 0 0 0 1.2 1c.7 0 2.2.1 2.2-1 0-.8-.7-1.5-1.1-.6-.5.8-1 .7-1.3 0zm.7-3c-.2.2 0 1.1.3 1a7 7 0 0 0 3.3-.8c.2-.2.1-.7-.2-.7-1 0-2.6 0-3.4.5m8.8 2.3c.8-1.2 2.8-1.3 2 .4a614.3 614.3 0 0 1-6.3 12.3c-.8 1.4-1.4.7-.8-.4.7-1.4 4.9-12 5.1-12.3"/>
+      <path d="M330.2 133c-.2-.8-1.5-2-1.3.2.2 3.8 5.5 2.6 7 1.3s.3 4.3 2.2 4.9c1 .3 3-1.1 4-2.4 2.7-3.5 4.5-8.6 7-12 1-1.4-.5-2.4-1-1.3-2.4 3.8-5.2 11.6-8.3 13.6-2.5 1.6-1.7-2-1.8-3.2-.1-.8-1.1-2-2.4-.9a5.5 5.5 0 0 1-3.7 1.2c-.7 0-1.4 0-1.7-1.4"/>
+      <path d="M339.6 126c0-.3-1.1-.4-1 .7 0 .8 1 1 1.1 1 1.5-1.2-.3-.6-.1-1.8zm-2.3 4.4c-.3 0-.6 1 .2 1.1l3.9-.2c.4 0 .6-.9-.4-.8-1.2 0-2.7-.3-3.7 0zm-62-16.6c.5 0 1.6 1.4 1.5 1.9 0 .2-1.2 0-1.5-.3-.3-.3-.2-1.6 0-1.6m-5.3 10.4c-1 .6.2 1.7 1 1.2 2.8-1.9 7-3.8 8-7.5.3-1.2 1.4-3.1 2.5-3.5 1-.5 2.6 1.9 3.6 0 .6-1 2.7.7 3.2-.4.6-1.3.3-2 .3-3.4 0-.8-.7-1-1.2.3-.2.6 0 1.2-.1 1.6-.2.2-.6.4-1 .2-.2-.2 0-.7-.6-1-.2 0-.6-.1-.8.2-.7 1.3-1 2.5-2.1 1-.9-1-1.4-3.1-2-.3-.2 1-1.7 2.4-2.6 2.4-1.1 0-.8-3-3.2-2.5-1.3.3-1.2 2.7-1 3.5.3 1.3 4 .4 3.7 1.2-.6 2.7-4.4 5.4-7.7 7m-22.7 13.2c-.1.5.5 1.7 1.1 1.8.6 0 1-1.3.8-1.8-.2-.3-1.8-.3-1.9 0m3.3 4.9c-.4-.4-1.6.7-.6 1.5.5.5 2.5 1.1 3 .2.8-1.2-.7-5.5 0-6 .5-.5 2.8 2.8 4 3 2.7.4 2-4.6 5-4.2 1.9.2 2.1-2.2 1.8-3.8-.2-1.5-2.6-3.6-3.7-4.6-1.4-1.2-2.1 1-1.2 1.6 1.2 1 3.3 2.9 3.6 4.1.1.6-1.4 1.8-2 1.5-1.4-.8-2.6-4-3.8-4.7-.4-.2-1.4.3-1 1.3.6 1.1 3 2.7 3.1 3.9.1 1-1 3.2-1.8 3.2-.9 0-3-2.7-3.7-4-.4-.5-1.5-.5-1.7.4a22 22 0 0 0 .5 5.5c.2 1.6-.9 1.7-1.5 1.1m-4-8.6c-.4.4.8 1.2 1 1 .4-.4 2.1-2.3 1.8-3-.3-.6-2.6-2-3-1.3-.7 1.1 2.2 1.7 1.7 2a7 7 0 0 0-1.5 1.3m4.1-8.4s.8 2.5 1.4 1.4c.4-.7-1.4-1.4-1.4-1.4m1.2 4c-.2 0-1 .7-.5 1 .8.4 2.9.8 2.4-.7-.3-.9 3.2 0 2.3-2.4a3.7 3.7 0 0 0-1.7-1.7c-.4 0-1.5.5-.8.9.5.2 2 1.1 1.5 1.7-.7.6-1.1-.3-1.9-.1-.4 0-.1 1.2-.4 1.5 0 .2-.7-.4-.9-.3zm5.5-9.5a3.5 3.5 0 0 0-1.2 2c0 .2.3.6.5.5a3.2 3.2 0 0 0 1.2-1.9c0-.3-.2-.8-.5-.6m2.8-.3c-.8-1 1-2.6 1.7-.5.5 1.3 5.5 7.9 6.5 10.1.8 1.5 0 2.1-.9 1-2.5-3.2-4.6-7.2-7.3-10.6m5.2.1c.9-1 2.7-3 2.2-4-.4-1-1.5-1-1.7-.7-1 1.3.8 1 .5 1.4-.5 1-1 1.6-1.3 2.6-.1.3.1.9.3.7m77.8 3.2c-.7-.5.6-3 1.5-2 2.3 2.7 3.4 11.6 4.1 18.3 0 0-1 .9-1 .7 0-3.5-1.5-14.4-4.6-17m-53.1-8.6c-.8-1.8 1.1-2.4 1.4-1.2 1.3 5.8 4.5 10.2 7 14.1.7 1.2 0 2-1.7.8-1.2-.8-2.5-3.9-3-4-1.2-.2-3.8 5-9.1 3.5-1.4-.4-1.3-4.5-1.4-6.3 0-.9 1-1 1 0 0 1.7 0 5.2 2.1 5.4 1.8 0 5.6-2.4 6.4-4.4.8-2-1.9-5.9-2.7-8z"/>
+      <path d="M344.6 138.4c.4-1.2 6.1-10.8 6.9-12.9.4-1 2 1.8.4 3.3-1.4 1.2-5.5 8-6.3 10.4-.4 1-1.4.5-1-.8"/>
+      <path d="M354.3 129.3c1-4 3.6.6 1.3 2.8-3.4 3.4-4.5 9.9-10 10.9-1.4.3-4-.7-4.8-1.3-.3-.2.2-1.6 1.1-.9 1.3 1 4.1 1.3 5.6.1a25.4 25.4 0 0 0 6.8-11.6m-57 12.7c-.3.3-1 .3-1.1.7-.3 1.4 0 2.2-.3 3.6s-1.3 1.4-1.2.3c0-1.4 1.3-3.5.4-3.6-.6-.1-1-.9-.4-1.3 1.1-.7 1.7-.6 2.4-.4.3.1.4.5.2.7"/>
+      <path d="M296.5 140c-1.4 1.4-2.8 1.9-4.1 3.5-.6.6-.5 1.5-.9 2.4-.3.9-1.4 1-1.7.9-.5-.4-.4-2-1-1.2-.6.9-.9 2-1.7 2-.7 0-2-1.5-1.3-1.5 2.3-.3 2.2-2 3-2.2 1-.1 1 1.5 1.7 1.2.4-.2.7-2.1 1.2-2.6 1.5-1.6 2.7-2.4 4.3-3.6.7-.6 1.3.5.5 1.2zm5.3 5c-1.2.2-1 1.7-.6 1.8.5.3 1.4.4 1.7-1.3.2-.7.3 3.5 1.8 1.9 1-1 3.1.2 4-1 .7-.9 1-1.5.4-2.7-.2-.3-1-.2-1 .7 0 .8-.5 1.7-1.3 1.6-.4-.1.2-1.9-.2-2.4a.5.5 0 0 0-.7 0c-.3.4.3 2.2-.6 2.4-1.2.2-.6-1.2-1-1.4-1.7-.8-1.8.2-2.5.3zm9-3c.9-.2.6-.2 2-1.3.5-.4.6.8.5 1.3 0 .7-1 .2-1.3.9-.4.9-.2 3-.4 3.8 0 .4-.8.4-.8 0-.2-1 .1-2 0-3.3 0-.4-.5-1.1 0-1.3zm-5-2.5c-.2.9-.2 1.6-.2 2.3 0 .5 1 .2 1 .1 0-.8.2-2 0-2.3-.2-.1-.7-.3-.8-.1"/>
+      <path d="m299.5 130.2-1.4 5.6-2-3.8v3.9l-4.4-5.2 1.5 5.6-4-3.4 2.2 3.8-7-4.5 4.4 5.2-5.6-2.8 4 3.4-9-3.4 8.7 4.3a29 29 0 0 1 12.6-2.6c4.9 0 9.3 1 12.5 2.6l8.8-4.3-9 3.4 4-3.4-5.5 2.8 4.3-5.2-7 4.5 2.2-3.8-4 3.3 1.5-5.5-4.3 5.2V132l-2 3.8z"/>
+    </g>
+  </g>
+  <path fill="#fff" d="m249 299.7-.1 2.2h-.4v-1.5a7.4 7.4 0 0 0-.4-1.3 5.8 5.8 0 0 0-.5-1 11.3 11.3 0 0 0-.8-1.1l.7-1.8a5.3 5.3 0 0 1 1.1 2 7.5 7.5 0 0 1 .5 2.5m5.5-3.4c0 .6-.1 1-.3 1.2-.2.3-.6.5-1 .6l.2 1.1a5.3 5.3 0 0 1 0 1.7v1h-.4v-1a4.4 4.4 0 0 0-.2-.8 28.8 28.8 0 0 0-.3-.8 8.4 8.4 0 0 0-.6-1.2l-.8-1.3.5-1.6.8.9.7.2c.7 0 1-.3 1-1h.3a8 8 0 0 0 0 .5v.5m5.1 3.9-.4 1.7-.6-.6a3.5 3.5 0 0 1-.3-1 9.9 9.9 0 0 1 0-1.4 3 3 0 0 1-.9.1c-.4 0-.7 0-1-.3a1 1 0 0 1-.4-.8c0-.7.2-1.3.6-1.8.3-.6.7-.9 1.2-.9.3 0 .6.1.7.3l.3.8v1.6c0 .7 0 1.2.2 1.4 0 .3.3.5.6.9m-1.5-2.9c0-.4-.3-.6-.7-.6a.8.8 0 0 0-.4.1c-.2.1-.2.2-.2.3 0 .2.2.3.8.3a2.2 2.2 0 0 0 .5 0m6.9 2.3-.2 2.1c-.4-.3-.8-.8-1.1-1.5a20 20 0 0 1-1.1-3.3 41.3 41.3 0 0 1-.8 3l-.6 1.3a2 2 0 0 1-.6.6v-2l.8-1.2a6 6 0 0 0 .6-1.4 16 16 0 0 0 .3-2h.4l.7 2a6.7 6.7 0 0 0 1.6 2.4"/>
+  <path fill="#bf0000" d="M280.5 319.2c.3.3.5.6.6 1l.2 1.2h-.6a6.2 6.2 0 0 0-.7-1.1 15.2 15.2 0 0 0-1-1l-1.3-1.2a27.3 27.3 0 0 0-1.6-1.3l-.5-.4-.2-.6a9 9 0 0 1-.1-1.3l2.1 1.7a35.3 35.3 0 0 1 2 1.8zm-7.6-4.6-.1 1.6-2.5-.1.2-1.6h2.4m6.7 7.1-6 1.9-1.2-1.6 5.2-1.5a6.3 6.3 0 0 0-.5-.7l-.7-.5a1.1 1.1 0 0 1-.4.8 2 2 0 0 1-.8.5 2.7 2.7 0 0 1-1.4 0c-.5 0-.8-.3-1-.6a3.1 3.1 0 0 1-.5-1.7c0-.8.2-1.3.6-1.5.6-.2 1.4 0 2.5.5a6.5 6.5 0 0 1 2.4 2zm-4.7-3.2a3.1 3.1 0 0 0-.6-.2.9.9 0 0 0-.5 0 .5.5 0 0 0-.4.3.4.4 0 0 0 0 .4l.4.2h.5a.9.9 0 0 0 .3-.3zm-6.4-1.2-.4 1.6-2.5-.3.4-1.5zm6 6-1.4.4a4.2 4.2 0 0 1-1.4 0 2.8 2.8 0 0 1-1.2-.3c-.2.4-.6.7-1.1 1a5.9 5.9 0 0 1-1.3.4l-1 .3-.8-1.6 1-.2 1-.3.6-.4a4.7 4.7 0 0 0-.7-.4 1 1 0 0 0-.6-.1.3.3 0 0 0-.2 0 .5.5 0 0 0 0 .3h-.5c-.4-.7-.5-1.2-.3-1.6.3-.4.8-.7 1.6-.9.8-.2 1.5-.2 2.1 0 .6 0 1 .3 1.2.6.1.2.2.4.1.6 0 .2 0 .5-.3 1a1.6 1.6 0 0 0 1 0l1.3-.3zm-6.4 1.5-1.3.2c-.7 0-1.3 0-1.8-.4a4.3 4.3 0 0 1-1.3-2l-.6-1.7a2 2 0 0 0-.6-1l-.8-.3.5-1.7 1.1.9.8 1.3.4 1.2a5 5 0 0 0 1 1.7c.2.3.4.4.7.3l1.3-.2zm-5.5-6-.9 1.5-2.3-.6.8-1.5zm1.4 6.7-6 .5-.3-1.6 5-.5a1.9 1.9 0 0 0-.6-.7 6 6 0 0 0-.8-.5l.5-1.5c.5.3 1 .6 1.2 1 .2.4.5 1 .6 1.7zm-4.8.8a13 13 0 0 1-1.8-.2 8.3 8.3 0 0 1-1.3-.4 4.5 4.5 0 0 1-1 .3h-3c-.5 0-.8 0-1-.2l-.6-.8a3.3 3.3 0 0 1-1.3.7 4 4 0 0 1-1.3.2h-1.4l.2-1.8 1.3.1c.7 0 1.3 0 1.7-.3.6-.3 1-.8 1-1.4h.6a22.9 22.9 0 0 0-.1 1c0 .3 0 .5.3.6l.7.2h2.9c.4-.2.6-.5.7-1l.1-.3a2.6 2.6 0 0 1 .4-.2l.4-.1v.6l-.3.8a6.4 6.4 0 0 0 1.7.4c0-.1 0-.3-.2-.5 0-.3-.2-.4-.2-.5a.4.4 0 0 1 .1-.2l.3-.2.8-.7.3.7c0 .2.1.5 0 .8l-.1 2.4m-9-7-1.5 1-1.1-.6-1.1.8-1.5-.9 1.4-1 1.2.7 1.1-.9zm-2.4 6.4-5.8-1 .7-1.6 4.8.8a1.3 1.3 0 0 0 0-.8 4 4 0 0 0-.5-.6l1.3-1.3c.3.4.5.8.5 1.2 0 .4 0 1-.4 1.7zm-4.9-.8-1.2-.3c-.7-.1-1.1-.4-1.2-.9-.1-.5.1-1.2.7-2.2l1-1.7.2-.9-.3-.6 1.8-1.2.2 1.1c0 .4-.2.9-.6 1.4l-.6 1.2a4 4 0 0 0-.7 1.7c0 .3.1.5.4.5l1.2.3zm-3-6.3-2 .9-1.4-1.4 2-.8zm-.9 5.3a4 4 0 0 1-1.2 1.1c-.4.3-.9.4-1.4.5a7 7 0 0 1-1.9 0 11.8 11.8 0 0 1-2.2-.6 6 6 0 0 1-2.7-1.6c-.5-.6-.5-1.2 0-1.8a5.6 5.6 0 0 1 1.5-1.3 18.8 18.8 0 0 1 3-1.2l.4.4c-1 .4-1.8.7-2.2 1a3.3 3.3 0 0 0-1 .7c-.3.4-.3.8.1 1.3a8.4 8.4 0 0 0 5 1.8c1 0 1.6-.3 1.9-.6l.4-.7.1-1.4 2-1.2-.1 1.2c-.1.4-.4.8-.8 1.3z"/>
+</svg>

internal/app/api/core/frontend-dist/assets/arab-8DaG-UKN.svg

@@ -0,0 +1,109 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" version="1.0" id="flag-icons-arab" viewBox="0 0 640 480">
+  <path fill="#006233" d="M0 0v480h640V0Z" class="arab-fil0 arab-str0"/>
+  <g fill="#fff" fill-rule="evenodd" stroke="#fff">
+    <path stroke-width=".4" d="M1071.9 2779.7c-25.9 38.9-7.2 64.2 19.5 66 17.6 1.3 54.2-24.9 54.1-55.7l-10-5.6c5.6 15.8-.2 20.8-12.1 31.6-23.5 21.3-71.5 22.8-51.5-36.3z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path d="M1277.2 2881.7c145.8 4.1 192.2-137 102.2-257.8l-8.9 13.3c5.8 56.3 14.2 111.8 15 169.5-17.6 20.7-43.2 13-48.3-10 .3-31.2-9.9-57.6-22.8-82.8l-7.2 13.3c8.4 20.7 17.5 44 19.4 69.5-41.6 49.9-87.6 60-70.5-5.6-32.9 57.5 16.9 98 73.3 9.5 12.1 60.4 58.9 22.9 61.7 9.9 5.1-39.6 2.5-103.4-7.8-153.8 40.6 70.3 42 121 20.4 154.9-24 37.7-76.2 55.3-126.5 70.1z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path d="M1359.9 2722.2c-31.2 2.3-47.2-4.1-30.3-27.2 16.7-22.6 32.3-4.6 36.5 25.6 3.9 28.3-54.8 64.4-75.1 64.4-30.7 0-44.9-39.5-16.6-75-36.4 103.6 78.6 43.5 85.5 12.2zm-21.6-24c-3.8-.2-6.6 6.5-4.7 7.8 5.5 3.8 14.2 1.5 15.1-.4 1.9-4.2-5.1-7.2-10.4-7.4z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path d="M1190.5 2771.1c-30 59-.1 83.4 38.4 76.6 22.4-4.1 50.8-20 67.2-41.7.3-47.8-.4-95.2-4.6-141.5 15-17.9-1.3-17.8-7-37-2.6 11.2-8.9 23.3-2.8 32 4.3 46.7 6.7 94 6.6 142.2-30.2 24.3-52.9 33.3-69.1 33.1-33.5-.3-40.7-28.5-28.7-63.7z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path d="M1251.8 2786.7c-.5-44.5-1.2-95-5.2-126.1 15.6-17.3-.8-17.7-5.9-37.1-3 11-9.6 23-3.8 31.9 2.6 47.6 5.1 95.2 5.6 142.8 3.6-2.3 7.7-3.2 9.3-11.5z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path stroke-width=".4" d="M1135.4 2784.6c-3.8-4.8-6.5-10.2-9.6-14.9-.5-6.7 4-12.9 4.6-16.3 5.1 7.9 8.1 13.9 12.2 17.8m5.4 3.1c7.5 3 16.7 3 25.2 3.2 32.8.6 67.3-4.8 63.6 39.6a66.2 66.2 0 0 1-65.2 61.9c-41.7-.4-77.3-46.4-13-131.1 6.2-1 14.3.7 21 1.3 11.5.9 23.3-.2 36.8-11-1.6-27.9-1.6-54.3-5-79.5-5.8-8.9.8-20.8 3.8-31.9 5.1 19.4 21.4 19.8 5.9 37.2 3.7 28 4.1 56.5 4.1 73.5-7.8 11.9-13.9 24.5-36.7 29.3-23.3-3.4-33.8-36-58.1-25.2 6.7-29.4 68.4-36.1 74.6-12.9-4.1 24.2-61.7 14.5-77 92.7-4.7 24.1 20.7 46.3 46.8 44.5 25.5-1.7 52.7-19.4 55.4-49.2 2.1-24.9-33-22-47.7-21.7-21.4.5-34.9-2.8-43-7.5m21.9-53.9c3.8-3.6 17.1-6.1 21.9-.3-3.6 2.4-7.1 5-10 8.1-5-2.6-8.3-5.2-11.9-7.8z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path d="M1194 2650.9a49 49 0 0 1 5.3 21c-2.2 10.4-11.1 20.1-20.3 20.4-5.7.2-12.1-1.4-16.6-10.3-.5-1.1-2.9-3.7-5.2-2.5-10.1 16.6-17.6 23.6-26.7 23.5-18.2-.3-12.8-16.5-29.6-21.5-7-.2-18.5 6.9-24.4 20.8-22.4 63.5-42.8-.2-34.1-29.8 1.3 28.3 8.1 45.1 15.1 44.6 5.1-.5 9.6-12.3 16.1-24.7 5-9.5 17-26.6 29.7-26.6 11.6.3 4.3 21.6 27.5 21.3 11.2-.2 21.5-8.8 31.9-26 2.3-.4 2.9 3.7 3.4 5.1 1.6 5.9 11.8 22.1 25.6 7.3-.7-3.2-.4-8.5-3.9-9.6z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path stroke-width=".4" d="M1266.9 2598.3c-12.3 6.1-21.3.5-26.4-4.9 8.9-1.8 15.8-5 17.8-12-4-9-13.5-12.9-26.9-13-17.9.5-27.1 7.7-28.2 17.6 8.3.3 15.8-2 19 6-14.7 7.2-32 9.8-50.8 9.7-30.8 1.6-35.3-12.3-43.4-24.5-.6-.8-3.3-2.1-4.7-1.9-9.5 0-16.5 33.2-27.2 33.1-10.7-1.4-8.3-21.4-11.4-32.8-2.6 17.9 3.3 84.5 36.4 12.2 1-2.4 2.4-1.7 3.3.3 8.9 20.2 27 27.2 46.5 28.2 16.3.9 37.1-6.2 59.4-18.8 5.9 6.5 10.6 13.9 23 15.3 14.5.7 30-9.8 33.5-22.8 1.8-6.7 2.1-19.9-5-20.1-9.9-.3-17.1 23.7-14.8 45.3.2-.3 1.3-5.4 1.3-5.4m-43.8-28.8c6.5-3 12.8-4.4 17.8 2.2a27.4 27.4 0 0 0-8.4 4c-2.8-2.2-6.6-3.3-9.4-6.2zm47.8 14.9c1.6-7.1 2.5-12.8 8.3-16.5 1.2 7.5 1.4 11.7-8.3 16.5zm39 11c-1.9-6.1-3.8-11.4-4.4-18-1.4-13.4 10.1-21 20.5-19.9 10.7 1.1 17.8 5.1 28 8.6 8 2.7 18.8 4.8 29.1 7.7 5.8 2.6 0 9.4-1.5 10.3-25.8 10.1-44.1 26.1-60.5 26.8-9.8.5-18.5-5.9-26.4-19-.5-25.4-1.4-55.2-3.9-73.9 3.8-3.8 4.6-6.6 6.4-9.7 2 24.7 2.8 50.7 3.3 76.9 2.1 4.5 4.7 8.3 9.4 10.2zm16.5 2c-13.8 3.9-12.1-7.8-13.4-15-1.5-8.4-.5-17.9 10.2-15.5 13.9 3.7 26.6 8.6 38.9 13.8z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path stroke-width=".4" d="m1314.3 2621.3 1.9 9.3h1.5l-.6-8.7" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path stroke-linecap="round" stroke-linejoin="round" stroke-width="4" d="m1094.2 2718.5 7-7.2 8.1 6.9-7.5 6.7zm17.8-2.4 7.1-7.2 8.1 6.9-7.5 6.7zm-49.5-74.6 7.1-7.2 8.1 6.9-7.5 6.7zm3.2 21.2 7.1-7.2 8 6.9-7.5 6.7zm128.5 35.5 6.5-5.3 6 6.5-6.8 4.8zm-85.8-135.7 4.6-4.7 5.3 4.5-4.9 4.4zm11.7-1.5 4.6-4.8 5.3 4.6-4.9 4.3zm245.6 53.7-4.4 3.7-4.2-4.3 4.6-3.4z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path stroke-width=".4" d="m1158.7 2747.4-.5 7.9 12.6 1.2 10.1-7.6z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+    <path d="m1265.2 2599.8 3.7-.8-.4 10.3-2.3.9z" transform="matrix(.36355 0 0 .3308 -130 -670.9)"/>
+  </g>
+  <path fill="#fff" d="M320 326.3c51.6 0 93.6-38.2 93.6-85.2a81.9 81.9 0 0 0-32.6-64.4 70.2 70.2 0 0 1 19.2 48c0 40.8-35.9 73.9-80.2 73.9-44.3 0-80.2-33.1-80.2-74 0-18.3 7.2-35.1 19.2-48a81.8 81.8 0 0 0-32.6 64.6c0 46.9 42 85.1 93.6 85.1" class="arab-fil2"/>
+  <g fill="#fff" stroke="#000" stroke-width="8">
+    <path d="M-54 1623c-88 44-198 32-291-28-4-2-6 1-2 12 10 29 18 52-12 95-13 19 2 22 24 20 112-11 222-36 275-57zm-2 52c-35 14-95 31-162 43-27 4-26 21 22 27 49 5 112-30 150-61z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M0 1579c12 0 34-5 56-8 41-7 11 56-56 56v21c68 0 139-74 124-107-21-48-79-7-124-7s-103-41-124 7c-15 33 56 107 124 107v-21c-67 0-97-63-56-56 22 3 44 8 56 8z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M54 1623c88 44 198 32 291-28 4-2 6 1 2 12-10 29-18 52 12 95 13 19-2 22-24 20-112-11-222-36-275-57zm2 52c35 14 94 31 162 43 27 4 26 21-22 27-49 5-112-30-150-61z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M3 1665c2 17 5 54 28 38 31-21 38-37 38-67 0-19-23-47-69-47s-69 28-69 47c0 30 7 46 38 67 23 16 25-21 28-38 1-6 6-4 6 0z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+  </g>
+  <g fill="#fff" stroke="#000" stroke-width="8">
+    <path d="M-29 384c-13-74-122-79-139-91-20-13-17 0-10 20 20 52 88 73 119 79 25 4 33 6 30-8z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M4 386c11-76-97-112-110-129-15-18-17-7-10 14 13 45 60 98 88 112 23 12 30 17 32 3z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M93 430c10-91-78-105-101-134-15-18-16-8-11 13 10 46 54 100 81 117 21 13 30 18 31 4z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M66 410c-91-59-155-26-181-29-25-3-33 13 10 37 53 29 127 25 156 14 30-12 21-18 15-22zm137 40c-28-98-93-82-112-94s-21-9-17 13c8 39 75 82 108 95 12 4 27 10 21-14z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M190 467c-78-63-139-16-163-23-18-5-10 7-3 12 50 35 112 54 160 32 19-8 20-10 6-21zm169 64c1-62-127-88-154-126-16-23-30-11-22 26 12 48 100 101 148 111 29 6 28-4 28-11z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M355 542c-81-73-149-49-174-56-25-6-35 9 4 39 48 36 122 43 153 36s23-14 17-19zm145 107c-23-106-96-128-114-148-17-20-35-14-20 34 18 57 77 107 108 119 30 13 28 3 26-5z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M499 663c-59-95-136-92-160-105-23-14-39-2-8 39 36 50 110 78 144 80s28-7 24-14z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M575 776c34-108-44-148-52-166-9-18-18-18-23 1-22 77 49 152 60 167 11 14 13 7 15-2z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M559 806c-27-121-98-114-114-131-17-17-19-5-16 17 8 59 79 99 111 119 10 6 22 13 19-5zm68 142c49-114-9-191-27-208-18-16-29-23-23 0 8 35-20 125 23 191 14 22 16 43 27 17z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M601 971c11-70-29-134-72-159-25-15-26-11-26 10 2 65 63 119 81 149 17 28 16 7 17 0z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M590 1153c-36-132 39-208 62-223 22-16 36-22 26 3-15 37 1 140-56 205-18 22-25 45-32 15z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M598 1124c30-115-35-180-55-193-19-13-31-18-22 3 12 32-1 122 49 178 16 19 22 38 28 12z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M561 1070c-54 58-55 143-31 193 15 29 17 27 31 6 38-61 15-149 17-188 1-37-11-17-17-11z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M650 1162c0 80-49 145-101 165-30 11-30 8-26-16 14-90 83-123 108-152 24-28 19-5 19 3z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M464 1400c88-80 41-136 45-188 2-28-9-21-19-11-56 55-59 153-47 191 5 17 13 15 21 8z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M582 1348c-29 88-106 142-171 145-38 2-37-1-24-27 49-94 136-105 175-129 36-22 23 2 20 11z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M343 1513c114-57 91-152 112-176 15-17-3-15-12-9-67 39-121 101-122 167 0 25 2 28 22 18z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M187 1619c144 23 211-86 253-96 22-5 6-14-5-15-96-11-218 34-255 84-15 20-15 24 7 27z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M333 1448c-29 95-137 173-218 179-38 3-38-1-24-26 65-118 178-138 218-168 34-26 27 6 24 15zM29 384c13-74 122-79 139-91 20-13 17 0 10 20-20 52-88 73-119 79-25 4-33 6-30-8z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-4 386c-11-76 97-112 110-129 15-18 17-7 10 14-13 45-60 98-88 112-23 12-30 17-32 3z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-93 430c-10-91 78-105 101-134 15-18 16-8 11 13-10 46-54 100-81 117-21 13-30 18-31 4z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-66 410c91-59 155-26 181-29 25-3 33 13-10 37-53 29-127 25-156 14-30-12-21-18-15-22zm-137 40c28-98 93-82 112-94s21-9 17 13c-8 39-75 82-108 95-12 4-27 10-21-14z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-190 467c78-63 139-16 163-23 18-5 10 7 3 12-50 35-112 54-160 32-19-8-20-10-6-21zm-169 64c-1-62 127-88 154-126 16-23 30-11 22 26-12 48-100 101-148 111-29 6-28-4-28-11z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-355 542c81-73 149-49 174-56 25-6 35 9-4 39-48 36-122 43-153 36s-23-14-17-19zm-145 107c23-106 96-128 114-148 17-20 35-14 20 34-18 57-77 107-108 119-30 13-28 3-26-5z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-499 663c59-95 136-92 160-105 23-14 39-2 8 39-36 50-110 78-144 80s-28-7-24-14z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-575 776c-34-108 44-148 52-166 9-18 18-18 23 1 22 77-49 152-60 167-11 14-13 7-15-2z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-559 806c27-121 98-114 114-131 17-17 19-5 16 17-8 59-79 99-111 119-10 6-22 13-19-5zm-68 142c-49-114 9-191 27-208 18-16 29-23 23 0-8 35 20 125-23 191-14 22-16 43-27 17z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-601 971c-11-70 29-134 72-159 25-15 26-11 26 10-2 65-63 119-81 149-17 28-16 7-17 0z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-590 1153c36-132-39-208-62-223-22-16-36-22-26 3 15 37-1 140 56 205 18 22 24 45 32 15z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-598 1124c-30-115 35-180 55-193 19-13 31-18 22 3-12 32 1 122-49 178-16 19-22 38-28 12z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-561 1070c54 58 55 143 31 193-15 29-17 27-31 6-38-61-15-149-17-188-1-37 11-17 17-11z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-650 1162c0 80 49 145 101 165 30 11 30 8 26-16-14-90-83-123-108-152-24-28-19-5-19 3z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-464 1400c-88-80-41-136-45-188-2-28 9-21 19-11 56 55 59 153 47 191-5 17-13 15-21 8z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-582 1348c29 88 106 142 171 145 38 2 37-1 24-27-49-94-136-105-175-129-36-22-23 2-20 11z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-343 1513c-114-57-91-152-112-176-15-17 3-15 12-9 67 39 121 101 122 167 0 25-2 28-22 18z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-187 1619c-144 23-211-86-253-96-22-5-6-14 5-15 96-11 218 34 255 84 15 20 15 24-7 27z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+    <path d="M-333 1448c29 95 137 173 218 179 38 3 38-1 24-26-65-118-178-138-218-168-34-26-27 6-24 15z" class="arab-fil2 arab-str2" transform="matrix(.23458 0 0 .21345 320 27.3)"/>
+  </g>
+  <path fill="#006233" d="M359.6 128.9c-4.4-3-20.8-1.3-23.9-3.3 5.9 4.5 19 1.3 24 3.3zm39.7 7.6c-3.5-5.7-24.4-9.6-27.5-14.7 5.5 9.8 21.6 8.5 27.5 14.7m-3 6.6c-7.8-6.8-25.8-4-31.3-8 12.7 10.4 19.7 2.3 31.2 8zM351 112.8c4.9 2.4 11 4.7 14 10.3-3.5-4.3-9.8-6-15-9.6.3 0 .7-.4 1-.7m77 44c-3.1-6.4-14-13.4-14.9-15.8 3 8.3 12 10.3 14.8 15.8zm2.7 11.3c-9.4-13.4-24.1-12-30-17 4.5 4.9 21.4 8 30 17m21.8 20.7c.7-14.3-11-19.6-11.4-27.7-.3 9.6 12 22.6 11.4 27.7m-5.8 7.7c-2.4-12.4-18.3-13.2-21.1-20.5 0 6.8 18.7 13.9 21 20.5zm13.1-7c8.5 9.4 2.6 23.7 6.1 34.1-4.2-7.7-2.1-26.9-6-34.1zm-13.8 40c12.6 12.5 7.5 26.3 12.6 32.3-6.3-8.3-5.4-24.5-12.6-32.2zm26.3 1.8c-10.9 10.9-4.3 27.3-10 35 6.4-6.6 5.5-27 10-35m-13.7 0c-1.4-12.6-14.3-19.2-15.4-26-1.5 6.8 12.4 17.5 15.4 26m-6.5 30c2 8.8-5.7 27.6-3.3 33.4-5.2-10 4.4-29 3.3-33.3zm16.6 20.1c-5.1 15.6-15.5 14.6-18.7 24 2.3-9 16-17.1 18.7-24m-33.5 7.3c-6.8 10.5-1.2 22.4-6.8 29.9 8-7.5 3.7-21.4 6.8-29.9m16.4 28.6c-8.2 13.9-25.1 12.6-31.9 22.6 6.8-12.6 27.7-14.7 32-22.6zm-29.8-1.7c-14.5 9.2-10 18.8-21.1 29 13.8-10.2 12.7-21.5 21.1-29m-6.8 37.2c-14-.5-34.2 16.2-46.4 14.9 12.2 2.4 34.7-12.6 46.4-15zm-22.7-15c-1 13-37.6 21.4-41.5 30.1 4.4-11.5 36.6-20 41.5-30zm-82.8-240c-4.7-3.7-10.4-6.7-12-10.3 1.2 4.7 5.8 8 10.5 11.3.5-.2 1-.9 1.5-1.1zm-8 3.7c-7.3-3.2-15.7-3-19.5-7.4 2.4 4.4 10.3 6.1 17.1 8.5.7-.4 1.7-.9 2.4-1zm-21.1 27.3c4.4-3 20.8-1.2 23.9-3.2-5.9 4.5-19 1.3-24 3.2zm-39.7 7.7c3.5-5.7 24.4-9.6 27.5-14.7-5.4 9.8-21.6 8.5-27.5 14.7m3 6.6c7.8-6.8 25.9-4 31.3-8-12.7 10.4-19.7 2.3-31.2 8zm31.3-20c4.4-8.6 17-9.6 20.4-14.8-5 7.7-15.7 9-20.4 14.8m36-7.5c13-5.5 25.7-.8 31.8-3.4-7.5 3.6-25.4 1.9-31.7 3.4zm-98.9 41.2c3-6.4 13.8-13.5 14.8-15.8-3 8.3-12 10.3-14.8 15.8m-2.8 11.3c9.4-13.4 24.1-12 30-17-4.4 4.9-21.3 8-30 17m-21.8 20.7c-.7-14.3 11-19.6 11.5-27.7.2 9.6-12 22.6-11.5 27.7m5.8 7.7c2.4-12.4 18.3-13.2 21.1-20.5 0 6.8-18.7 13.9-21 20.5zm-13.1-7c-8.4 9.4-2.6 23.6-6 34.1 4.1-7.7 2-26.9 6-34.1m13.8 40c-12.6 12.5-7.5 26.3-12.6 32.3 6.3-8.3 5.4-24.5 12.6-32.2zm-26.2 1.8c10.8 10.9 4.2 27.3 9.8 35-6.3-6.6-5.4-27-9.8-35m13.6 0c1.4-12.6 14.3-19.2 15.4-26 1.5 6.8-12.4 17.5-15.4 26m6.5 30c-2 8.8 5.7 27.6 3.3 33.4 5.2-10-4.4-29-3.3-33.3zm-16.6 20.1c5.2 15.6 15.5 14.6 18.8 24-2.4-9-16-17.1-18.8-24m33.5 7.3c6.8 10.5 1.2 22.4 6.8 29.9-8-7.5-3.7-21.4-6.8-29.9m-16.4 28.6c8.2 13.9 25.1 12.6 32 22.6-6.9-12.6-27.8-14.7-32-22.6m29.8-1.7c14.5 9.2 10.1 18.8 21.1 29-13.8-10.2-12.6-21.5-21.1-29m6.8 37.1c14-.4 34.3 16.3 46.4 15-12.1 2.3-34.7-12.6-46.4-15m22.8-15c.9 13.1 37.5 21.4 41.5 30.2-4.5-11.5-36.6-20-41.6-30.1zM301 116c2.8-11.5 17-13.6 18.8-20.5-.7 7.3-17.4 15.4-18.8 20.5m41.5-28.6c-2 8.8-17.3 13.7-19.4 20.3.7-9 16.4-14 19.4-20.3m-12 20.8c7.3-10.7 22.3-8 27.5-14.1-3.8 7.2-22.3 7.4-27.5 14z" class="arab-fil0"/>
+  <path fill="none" stroke="#f7c608" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8" d="M429.8 240c0 55.5-49.3 100.4-110.3 100.4-60.9 0-110.3-44.9-110.3-100.3 0-55.5 49.4-100.4 110.3-100.4 61 0 110.3 45 110.3 100.4z"/>
+  <path fill="#f7c608" d="m298 340.5-.5 1.2c-.3.8-1.1 1.3-2.1 1.2l-8-1.9 2.6-7.7 8 1.7c.9.2 1.4 1 1 1.8l-.2 1m-19-4.8.4-1.2c.2-.9 1.1-1.3 2-1a95 95 0 0 0 7.8 2.5l-2.5 7.7c-2.8-.7-5.4-1.4-7.9-2.3-.8-.4-1-2-.7-2.9"/>
+  <path fill="#006233" d="m296.4 339.8-.3.9c-.2.6-1 .9-1.7.8l-6.6-1.6 1.8-5.6c2.4.7 4.9 1.2 6.6 1.5.8.2 1.2.8 1 1.4l-.2.7m-15.8-4 .3-1c.2-.5.9-.8 1.6-.6 1.9.6 4 1.4 6.5 2l-1.8 5.6a98.9 98.9 0 0 1-6.5-1.9c-.7-.4-1-1.5-.7-2.1"/>
+  <path fill="#f7c608" d="m267.7 330.8-.7 1c-.5.8-1.5 1-2.4.7-2-1.2-4.7-2.5-7-3.9l4.8-6.8a80.3 80.3 0 0 0 7.1 3.7c.8.4 1 1.3.5 2l-.6 1m-16.7-9.6.7-1c.5-.8 1.5-1 2.3-.5 1.8 1.3 4.1 2.9 6.7 4.4l-4.9 6.8a91.1 91.1 0 0 1-6.7-4.2c-.7-.7-.4-2.3 0-3"/>
+  <path fill="#006233" d="m266.5 329.7-.6.8c-.3.5-1.1.6-1.9.3-1.6-1-3.8-2-5.8-3.2l3.5-4.9c2 1.3 4.3 2.4 5.9 3.1.6.4.9 1 .5 1.6l-.5.6m-13.8-7.9.5-.8c.4-.5 1.1-.6 1.8-.2a89.5 89.5 0 0 0 5.6 3.6l-3.5 4.9c-2-1.2-4-2.3-5.6-3.5-.6-.5-.5-1.7-.1-2.2"/>
+  <path fill="#f7c608" d="m241.8 313.7-1 .8c-.8.6-1.8.5-2.6 0-1.5-1.6-3.7-3.5-5.5-5.5l6.7-5.3c2 2.1 4.2 4 5.7 5.4.7.6.6 1.5-.1 2l-.9.8m-13-13.4 1-.9c.7-.5 1.7-.5 2.3.2a73 73 0 0 0 5 6l-6.7 5.2c-1.9-2-3.7-3.9-5.2-5.8-.5-.8.3-2.2 1-2.8"/>
+  <path fill="#006233" d="m240.9 312.4-.8.6c-.5.4-1.2.3-1.9-.2l-4.6-4.6 4.9-3.8a77 77 0 0 0 4.7 4.5c.5.6.5 1.3 0 1.7l-.7.5m-10.8-11.2.7-.6c.6-.4 1.3-.3 1.8.2 1.2 1.5 2.6 3.2 4.3 5l-4.9 3.7-4.3-4.8c-.4-.6.1-1.7.6-2.1"/>
+  <path fill="#f7c608" d="m222.2 290.7-1.3.5c-.8.4-1.8 0-2.4-.6l-3.6-6.8 8.1-3.3c1.3 2.5 2.7 5 3.8 6.6.4.8 0 1.6-.8 2l-1 .4m-8.4-16.2 1.2-.6c.9-.3 1.8 0 2.2.8a70.6 70.6 0 0 0 3 7l-8 3.3a60.2 60.2 0 0 1-3.3-6.8c-.2-1 1-2.1 1.9-2.5"/>
+  <path fill="#006233" d="m221.7 289.2-.9.3c-.6.3-1.3 0-1.8-.6l-3-5.6 5.8-2.4a67.8 67.8 0 0 0 3.2 5.5c.3.7.1 1.4-.5 1.6l-.8.3m-7-13.5 1-.3c.6-.3 1.3 0 1.6.6a77 77 0 0 0 2.5 5.8l-5.7 2.4a58 58 0 0 1-2.7-5.7c-.2-.7.6-1.6 1.2-1.9"/>
+  <path fill="#f7c608" d="m210.5 263.5-1.4.2a2 2 0 0 1-2-1.2l-1.5-7.4 8.8-1.1a63.7 63.7 0 0 0 1.7 7.3c.1.9-.5 1.6-1.4 1.7l-1.2.2m-3-17.7 1.4-.2c.9-.2 1.7.4 1.8 1.2.1 2.2.3 4.7.7 7.5l-8.8 1.1a75 75 0 0 1-1-7.4c.2-.9 1.7-1.7 2.6-1.8"/>
+  <path fill="#006233" d="m210.5 262-1 .1c-.6.1-1.2-.3-1.5-1l-1.1-6.2 6.3-.8a64.4 64.4 0 0 0 1.3 6.1c.1.7-.3 1.3-1 1.4l-.8.1m-2.5-14.7 1-.2c.7 0 1.3.4 1.3 1.1.2 1.8.3 4 .7 6.2l-6.3.8c-.4-2-.7-4.2-.8-6.1 0-.7 1.1-1.4 1.8-1.5"/>
+  <path fill="#f7c608" d="m207.7 234.5-1.4-.2c-1 0-1.5-.8-1.6-1.7.3-2 .5-4.8 1-7.4l8.7 1.2a64.7 64.7 0 0 0-.7 7.4c-.1.9-.9 1.4-1.8 1.3l-1.2-.2m2.6-17.7 1.4.1c.9.2 1.5.9 1.4 1.7a68.7 68.7 0 0 0-1.7 7.4l-8.8-1.2c.4-2.5.8-5 1.4-7.4.4-.8 2.1-1.2 3-1"/>
+  <path fill="#006233" d="M208.2 233h-1c-.7-.2-1-.8-1.1-1.5l.8-6.1 6.3.8a65 65 0 0 0-.6 6.2c-.1.7-.7 1.1-1.4 1h-.8m2.1-14.9 1 .2c.7 0 1.1.7 1 1.4-.4 1.7-1 3.8-1.3 6l-6.3-.7 1.1-6.2c.3-.7 1.5-1 2.2-1"/>
+  <path fill="#f7c608" d="m214 206-1.3-.6c-.9-.3-1.2-1.1-1-2 1-2 2-4.6 3.2-6.9l8 3.4a69.8 69.8 0 0 0-3 7c-.3.7-1.2 1-2 .7l-1.2-.5m8-16.4 1.3.6c.8.3 1.2 1.2.8 2a72.5 72.5 0 0 0-3.8 6.6l-8.1-3.4c1.1-2.3 2.3-4.7 3.6-6.7.6-.7 2.4-.7 3.2-.3"/>
+  <path fill="#006233" d="m215 204.7-1-.4c-.6-.2-.8-1-.6-1.6l2.6-5.7 5.8 2.4a66.3 66.3 0 0 0-2.5 5.8c-.3.6-1 .9-1.6.6l-.8-.3m6.7-13.6.9.4c.6.2.8.9.5 1.6a71.3 71.3 0 0 0-3.2 5.5l-5.7-2.4c1-2 1.9-4 3-5.6.4-.6 1.7-.7 2.3-.4"/>
+  <path fill="#f7c608" d="m228.9 180.2-1.1-.9c-.7-.5-.8-1.4-.4-2.2 1.6-1.6 3.4-3.9 5.2-5.8l6.8 5.3a72 72 0 0 0-5 6 1.7 1.7 0 0 1-2.4 0l-.9-.6m12.8-13.7 1 .8c.8.6.8 1.5.2 2.2a78.4 78.4 0 0 0-5.7 5.3l-6.8-5.3c1.9-2 3.7-3.9 5.6-5.5.8-.5 2.5 0 3.2.5"/>
+  <path fill="#006233" d="m230.2 179.2-.8-.6c-.5-.4-.5-1.1-.1-1.7l4.3-4.9 4.8 3.8a71.3 71.3 0 0 0-4.2 5c-.5.5-1.2.6-1.8.2l-.6-.5m10.6-11.4.8.6c.5.4.5 1.1 0 1.6a80 80 0 0 0-4.8 4.6l-4.8-3.8c1.6-1.7 3-3.3 4.6-4.6.7-.5 2-.2 2.4.2"/>
+  <path fill="#f7c608" d="m251 159.2-.7-1c-.5-.8-.3-1.6.4-2.3 2-1.1 4.4-2.8 6.8-4.2l4.8 6.8a78 78 0 0 0-6.7 4.4 1.7 1.7 0 0 1-2.2-.4l-.7-1m16.5-9.8.7 1c.6.8.3 1.7-.4 2.1-2.2 1-4.6 2.2-7.2 3.7l-4.8-6.8c2.3-1.4 4.7-2.8 7-3.9 1-.2 2.4.7 2.9 1.4"/>
+  <path fill="#006233" d="m252.7 158.6-.6-.7c-.3-.6-.1-1.2.4-1.7 1.7-1 3.7-2.4 5.7-3.5l3.4 4.8a97 97 0 0 0-5.5 3.7c-.7.4-1.4.3-1.8-.3l-.5-.6m13.7-8.2.6.8c.3.5.1 1.2-.5 1.5a83.3 83.3 0 0 0-6 3.1l-3.4-4.8 5.8-3.3c.8-.2 1.9.4 2.3.9"/>
+  <path fill="#f7c608" d="m279 144.9-.5-1.3c-.2-.8.2-1.6 1-2l7.9-2.3 2.5 7.7a82.5 82.5 0 0 0-7.8 2.6c-.9.2-1.7-.2-2-1l-.3-1m18.8-5.4.4 1.3c.3.8-.2 1.6-1 1.8a88.9 88.9 0 0 0-8.1 1.7l-2.5-7.7a85 85 0 0 1 8-2c.9 0 2 1.3 2.3 2"/>
+  <path fill="#006233" d="m280.6 144.7-.3-1c-.1-.5.3-1 1-1.4l6.5-2 1.8 5.6a81.2 81.2 0 0 0-6.5 2c-.7.3-1.4 0-1.6-.6l-.3-.7m15.7-4.4.3.9c.2.6-.2 1.2-1 1.4-1.9.3-4.2.8-6.6 1.4l-1.8-5.5a90 90 0 0 1 6.6-1.6c.8-.1 1.6.8 1.8 1.4"/>
+  <path fill="#f7c608" d="M310 138.2v-1.3c0-.8.8-1.5 1.7-1.7l8.2-.2v8.1a84 84 0 0 0-8.2.4c-1 0-1.6-.6-1.6-1.5v-1m19.7-.2v1.2c0 .9-.7 1.5-1.7 1.5a90 90 0 0 0-8.2-.4V135c2.8 0 5.7 0 8.2.2 1 .2 1.7 1.7 1.7 2.6"/>
+  <path fill="#006233" d="M311.8 138.5v-1c0-.6.5-1 1.3-1.2l6.9-.1v5.8c-2.6 0-5.1.1-6.9.3-.7 0-1.3-.5-1.3-1v-.9m16.3-.1v.9c0 .6-.5 1-1.3 1a82.4 82.4 0 0 0-6.8-.2v-5.8l6.8.1c.8.2 1.3 1.2 1.3 1.9"/>
+  <path fill="#f7c608" d="m340 139.6.3-1.2c.3-.8 1.1-1.2 2.1-1.2l8 1.8-2.5 7.8a84.5 84.5 0 0 0-8-1.6c-.9-.3-1.4-1-1.1-1.9l.3-1m19 4.7-.4 1.2c-.2.9-1.1 1.3-2 1a87.5 87.5 0 0 0-7.8-2.4l2.5-7.8c2.7.7 5.4 1.4 7.8 2.3.8.4 1 2 .8 2.8"/>
+  <path fill="#006233" d="m341.5 140.3.2-.9c.2-.6 1-.9 1.7-.8l6.6 1.5-1.7 5.6a83.5 83.5 0 0 0-6.7-1.4c-.7-.2-1.1-.8-1-1.4l.3-.7m15.8 4-.3.8c-.2.6-.9 1-1.6.7a86.6 86.6 0 0 0-6.5-2l1.7-5.6c2.3.6 4.6 1.2 6.6 1.9.7.3 1 1.5.7 2"/>
+  <path fill="#f7c608" d="m370.2 149.1.7-1c.5-.8 1.5-1 2.4-.7 2 1.1 4.7 2.4 7.1 3.8l-4.7 6.9a80.6 80.6 0 0 0-7.3-3.6c-.7-.5-1-1.4-.5-2.1l.7-1m16.8 9.5-.8 1a1.7 1.7 0 0 1-2.2.5 82.3 82.3 0 0 0-6.7-4.3l4.7-6.9c2.4 1.4 4.8 2.7 6.8 4.2.7.6.4 2.2-.1 3"/>
+  <path fill="#006233" d="m371.5 150.2.5-.8c.4-.5 1.1-.6 1.9-.4 1.6 1 3.8 2 5.8 3.2l-3.4 5a79.3 79.3 0 0 0-6-3.1c-.6-.4-.8-1-.4-1.6l.4-.7m14 7.9-.6.8c-.4.5-1 .6-1.8.2a81.5 81.5 0 0 0-5.6-3.6l3.4-4.9 5.7 3.4c.6.6.5 1.7.1 2.3"/>
+  <path fill="#f7c608" d="m396.3 166 1-.9c.7-.5 1.7-.5 2.5 0l5.6 5.5-6.6 5.3a74.7 74.7 0 0 0-5.8-5.3c-.6-.6-.6-1.5.1-2l.9-.8m13.2 13.3-1 .9a1.7 1.7 0 0 1-2.4-.2 72 72 0 0 0-5-5.9l6.7-5.3c1.8 2 3.7 3.8 5.2 5.7.4.8-.3 2.3-1 2.8"/>
+  <path fill="#006233" d="m397.2 167.3.7-.6c.5-.4 1.3-.3 2 .1 1.2 1.4 3 3 4.6 4.6l-4.8 3.8a73.6 73.6 0 0 0-4.8-4.5c-.5-.5-.5-1.2 0-1.6l.7-.5m11 11-.8.7c-.5.4-1.3.3-1.8-.2a75.1 75.1 0 0 0-4.3-4.9l4.8-3.8 4.4 4.7c.4.7-.1 1.8-.6 2.2"/>
+  <path fill="#f7c608" d="m416.1 188.9 1.3-.6c.8-.3 1.8 0 2.4.7l3.7 6.6-8.1 3.5c-1.3-2.6-2.8-5-4-6.6-.3-.8 0-1.6.9-2l1-.5m8.6 16.2-1.3.5c-.8.4-1.8 0-2.1-.7a70.7 70.7 0 0 0-3.1-7l8-3.4a81.1 81.1 0 0 1 3.3 6.9c.2.9-1 2-1.8 2.4"/>
+  <path fill="#006233" d="m416.6 190.4.9-.4c.6-.3 1.3 0 1.8.6l3 5.5-5.8 2.5a74.4 74.4 0 0 0-3.2-5.5c-.3-.6-.1-1.3.5-1.6l.8-.3m7 13.5-.8.3c-.7.3-1.3 0-1.7-.6-.7-1.7-1.5-3.7-2.6-5.8l5.8-2.5 2.8 5.7c.1.8-.7 1.7-1.3 2"/>
+  <path fill="#f7c608" d="m428 215.9 1.4-.2a2 2 0 0 1 2.1 1.2l1.5 7.3-8.8 1.3a65.4 65.4 0 0 0-1.7-7.3c-.1-.9.4-1.6 1.4-1.7l1.1-.2m3.2 17.7-1.4.2c-.9.1-1.7-.4-1.8-1.3a71 71 0 0 0-.8-7.4l8.8-1.3c.4 2.6.8 5.1 1 7.5 0 .9-1.6 1.7-2.5 1.8"/>
+  <path fill="#006233" d="m428 217.4 1-.1c.7-.1 1.3.4 1.5 1 .3 1.8.9 4 1.2 6.1l-6.3 1a64.5 64.5 0 0 0-1.3-6.2c-.1-.7.2-1.3 1-1.3l.8-.2m2.6 14.7-1 .2c-.7 0-1.3-.4-1.4-1a67.2 67.2 0 0 0-.7-6.3l6.3-.9c.4 2.2.8 4.3.9 6.2 0 .7-1.1 1.4-1.8 1.5"/>
+  <path fill="#f7c608" d="m431.1 244.9 1.4.1c1 .1 1.6.9 1.7 1.8l-.9 7.4-8.8-1.1c.4-2.7.6-5.5.6-7.5.1-.8 1-1.4 1.9-1.2l1.1.1m-2.4 17.8-1.4-.2c-1 0-1.5-.8-1.4-1.7.6-2 1.2-4.6 1.6-7.3l8.8 1c-.4 2.6-.8 5.2-1.3 7.4-.4.9-2.1 1.3-3 1.2"/>
+  <path fill="#006233" d="M430.6 246.4h1c.7.2 1.1.8 1.2 1.5l-.8 6.2-6.3-.8.6-6.2c0-.7.6-1.2 1.3-1.1h.9m-2 14.9-1-.1c-.7-.1-1.1-.7-1-1.4.4-1.8.9-3.8 1.2-6.1l6.3.8a76.8 76.8 0 0 1-1 6c-.3.8-1.6 1.2-2.2 1"/>
+  <path fill="#f7c608" d="m425.1 273.5 1.3.5c.9.4 1.2 1.2 1 2l-3 7-8.2-3.3a66 66 0 0 0 3-7c.3-.8 1.2-1.1 2-.8l1.2.4m-7.9 16.5-1.2-.5c-.9-.4-1.3-1.2-.9-2 1.2-1.8 2.6-4.1 3.8-6.6l8.1 3.3a78.3 78.3 0 0 1-3.5 6.7c-.6.7-2.4.7-3.3.3"/>
+  <path fill="#006233" d="m424.2 274.8 1 .3c.5.3.7 1 .6 1.7l-2.6 5.7-5.9-2.3a66.2 66.2 0 0 0 2.5-5.8c.3-.7 1-1 1.6-.8l.8.4m-6.5 13.6-1-.3c-.6-.3-.8-1-.4-1.6a71.2 71.2 0 0 0 3-5.5l5.9 2.3a80.7 80.7 0 0 1-3 5.6c-.5.6-1.8.7-2.4.4"/>
+  <path fill="#f7c608" d="m410.5 299.4 1.1.8c.7.6.8 1.5.4 2.3-1.6 1.6-3.4 3.8-5.2 5.8L400 303c2-2 3.8-4.3 5-6 .6-.6 1.6-.6 2.3-.1l.9.7m-12.6 13.8-1-.8c-.8-.6-.9-1.5-.3-2.1 1.7-1.5 3.7-3.3 5.7-5.5l6.8 5.3a88.2 88.2 0 0 1-5.5 5.6c-.8.5-2.5 0-3.2-.6"/>
+  <path fill="#006233" d="m409.2 300.4.8.6c.5.4.5 1 .1 1.7l-4.3 4.8-4.9-3.7c1.7-1.8 3.2-3.6 4.2-5 .5-.5 1.3-.6 1.8-.2l.6.5m-10.4 11.5-.8-.6c-.5-.4-.5-1.1 0-1.7a77 77 0 0 0 4.6-4.5l5 3.7c-1.6 1.7-3.1 3.3-4.7 4.7-.6.4-1.8.1-2.4-.3"/>
+  <path fill="#f7c608" d="m388.5 320.5.7 1c.5.8.3 1.7-.3 2.3l-6.7 4.3-5-6.8a77.9 77.9 0 0 0 6.7-4.4 1.7 1.7 0 0 1 2.2.4l.7.9m-16.4 10-.7-1c-.6-.8-.4-1.7.4-2.2a84.3 84.3 0 0 0 7.2-3.7l4.8 6.8-7 4c-.9.2-2.3-.7-2.9-1.4"/>
+  <path fill="#006233" d="m386.9 321.1.5.8c.4.5.2 1.2-.4 1.7l-5.6 3.5-3.5-4.8 5.6-3.7c.6-.4 1.4-.3 1.7.2l.5.7m-13.6 8.3-.6-.8c-.3-.5-.1-1.2.5-1.6a83 83 0 0 0 6-3.1l3.4 4.8c-2 1.2-4 2.4-5.8 3.3-.7.3-1.9-.3-2.2-.8"/>
+  <path fill="#f7c608" d="m360.8 335.1.4 1.2c.3.8-.2 1.7-1 2l-7.8 2.5-2.6-7.8a75.4 75.4 0 0 0 7.7-2.6c.9-.2 1.8.2 2 1l.4 1m-18.8 5.5-.4-1.3c-.3-.8.2-1.6 1-1.8 2.4-.4 5.1-1 8-1.8l2.7 7.8c-2.7.7-5.4 1.5-8 2-1 0-2-1.3-2.3-2"/>
+  <path fill="#006233" d="m359 335.3.4.9c.2.6-.3 1.2-1 1.5l-6.4 2-1.9-5.6a82.2 82.2 0 0 0 6.4-2c.8-.3 1.5 0 1.7.6l.2.7m-15.6 4.5-.3-.9c-.2-.6.2-1.2 1-1.4a82.4 82.4 0 0 0 6.6-1.5l1.9 5.6a99.4 99.4 0 0 1-6.6 1.6c-.8 0-1.7-.8-2-1.4"/>
+  <path fill="#f7c608" d="M329.7 342v1.3c0 .9-.7 1.5-1.6 1.7-2.4 0-5.4.3-8.2.3l-.1-8.1a82.2 82.2 0 0 0 8.2-.5c1 0 1.6.6 1.6 1.5v1m-19.6.4v-1.2c0-.9.6-1.5 1.6-1.5 2.3.1 5.1.3 8.2.3v8.1l-8.2-.1c-.9-.2-1.6-1.7-1.6-2.6"/>
+  <path fill="#006233" d="M328 341.8v.9c0 .6-.6 1-1.4 1.2l-6.8.2v-5.7c2.5 0 5-.3 6.8-.4.8 0 1.3.4 1.4 1v.8m-16.4.3v-1c0-.5.5-1 1.3-1 2 .1 4.3.3 6.9.2v5.8H313c-.8-.2-1.4-1.3-1.4-1.9"/>
+</svg>