53 changed files with 412 additions and 423 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -8,7 +8,6 @@
 !web/src/
 !web/pom.xml
 !pom.xml
-!ui/
-ui/node_modules
-ui/node
-ui/dist
+web/src/ui/node_modules
+web/src/ui/node
+web/src/ui/dist
--- a/.gitignore
+++ b/.gitignore
@ -126,5 +126,3 @@ fabric.properties
 .idea/caches/build_file_checksums.ser

 .env
-
-data/
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@ -0,0 +1,24 @@
+matrix:
+  TARGET:
+    - bot
+    - web
+    - migration
+
+when:
+  branch: main
+
+pipeline:
+  build:
+    image: woodpeckerci/plugin-docker-buildx:2.2.0
+    group: build
+    settings:
+      registry: rg.fr-par.scw.cloud/hamburghammer
+      username: nologin
+      password:
+        from_secret: docker_token
+      dockerfile: Dockerfile
+      target: ${TARGET}
+      repo: rg.fr-par.scw.cloud/hamburghammer/dchat/${TARGET}
+      tags: latest
+      pull_image: false
+      platforms: linux/amd64,linux/arm64
--- a/.woodpecker/java.yml
+++ b/.woodpecker/java.yml
@ -1,26 +0,0 @@
-matrix:
-  MODULE:
-    - db
-    - bot
-    - web
-    - migration
-
-variables:
-  - &image 'docker.io/maven:3.9-eclipse-temurin-21'
-
-steps:
-  compile:
-    image: *image
-    group: compile
-    commands:
-      - mvn --batch-mode --no-transfer-progress -pl ${MODULE} -am compile
-  test:
-    image: *image
-    group: test
-    commands:
-      - mvn --batch-mode --no-transfer-progress -pl ${MODULE} -am test
-  build:
-    image: *image
-    group: build
-    commands:
-      - mvn --batch-mode --no-transfer-progress -Dmaven.test.skip -pl ${MODULE} -am install
--- a/.woodpecker/nodejs.yml
+++ b/.woodpecker/nodejs.yml
@ -1,7 +0,0 @@
-steps:
-  build:
-    image: docker.io/node:18-alpine
-    directory: ui
-    commands:
-      - npm ci
-      - npm run build
--- a/.woodpecker/oci-image-build.yml
+++ b/.woodpecker/oci-image-build.yml
@ -1,52 +0,0 @@
-matrix:
-  TARGET:
-    - bot
-    - web
-    - migration
-    - ui
-  PLATFORM:
-    - linux/amd64
-    - linux/arm64
-
-labels:
-  platform: linux/amd64
-
-depends_on:
-  - java
-  - nodejs
-
-steps:
-  build-only:
-    image: woodpeckerci/plugin-docker-buildx:2.2.1
-    group: build
-    settings:
-      registry: rg.fr-par.scw.cloud/hamburghammer
-      username: nologin
-      password:
-        from_secret: docker_token
-      dockerfile: Dockerfile
-      target: ${TARGET}
-      repo: rg.fr-par.scw.cloud/hamburghammer/dchat/${TARGET}
-      tags: latest
-      pull_image: false
-      platforms: ${PLATFORM}
-      dry-run: true
-    when:
-      - branch:
-          exclude: [main]
-  build:
-    image: woodpeckerci/plugin-docker-buildx:2.2.1
-    group: build
-    settings:
-      registry: rg.fr-par.scw.cloud/hamburghammer
-      username: nologin
-      password:
-        from_secret: docker_token
-      dockerfile: Dockerfile
-      target: ${TARGET}
-      repo: rg.fr-par.scw.cloud/hamburghammer/dchat/${TARGET}
-      tags: latest
-      pull_image: false
-      platforms: ${PLATFORM}
-    when:
-      - branch: main
--- a/40
+++ b/40
@ -1,9 +1,9 @@
-# syntax=docker/dockerfile:1.4.0
+# syntax=docker/dockerfile:1

 ARG MAVEN_CLI_OPTS="--batch-mode --no-transfer-progress -Dmaven.test.skip"

 # Copy all project files
-FROM docker.io/maven:3.9-eclipse-temurin-21 AS setup
+FROM docker.io/maven:3.9-eclipse-temurin-20 AS setup
 WORKDIR /app
 # Copy the dependency specifications
 COPY pom.xml .
@ -46,50 +46,20 @@ RUN --mount=type=cache,target=/root/.m2/ \
    mvn ${MAVEN_CLI_OPTS} -pl migration package

 # Create final web
-FROM docker.io/eclipse-temurin:21-jdk-jammy AS web
+FROM docker.io/eclipse-temurin:20-jdk-jammy AS web
 WORKDIR /app
 COPY --from=web-build /app/web/target/web-*-fat.jar /app/web.jar
 EXPOSE 8080
 CMD ["java", "-jar", "/app/web.jar"]

 # Create final migration
-FROM docker.io/eclipse-temurin:21-jdk-jammy AS migration
+FROM docker.io/eclipse-temurin:20-jdk-jammy AS migration
 WORKDIR /app
 COPY --from=migration-build /app/migration/target/migration-*-fat.jar /app/migration.jar
 CMD ["java", "-jar", "/app/migration.jar"]

 # Create final bot
-FROM docker.io/eclipse-temurin:21-jdk-jammy AS bot
+FROM docker.io/eclipse-temurin:20-jdk-jammy AS bot
 WORKDIR /app
 COPY --from=bot-build /app/bot/target/bot-*-fat.jar /app/bot.jar
 CMD ["java", "-jar", "/app/bot.jar"]
-
-# Build the ui
-FROM docker.io/node:18-alpine AS ui-build
-WORKDIR /ui
-COPY ui/package.json ui/package-lock.json .
-RUN npm ci
-COPY ui .
-RUN npm run build
-
-# Create final ui
-FROM docker.io/nginx AS ui
-COPY --from=ui-build ui/dist /usr/share/nginx/html
-
-# Create caddy reverse proxy
-FROM docker.io/caddy AS caddy
-RUN <<EOF cat > /etc/caddy/Caddyfile
-{
-    debug
-    auto_https off
-}
-
-:8080 {
-    route {
-        reverse_proxy /api/* web:8080
-        reverse_proxy ui:80
-    }
-}
-EOF
-
-EXPOSE 8080
--- a/README.md
+++ b/README.md
@ -26,6 +26,12 @@ cd dchat
 docker compose build
 ```

+#### Pull the prebuilt images
+
+```shell
+docker compose pull
+```
+
 ### Configure environment

 ```shell
@ -64,11 +70,6 @@ Invite the bot through the link provided in the container logs.
 docker compose logs bot
 ```

-### Permissions
-
-After starting the stack, navigate to [localhost:8081](http://localhost:8081)
-and feel free to configure who and how much they can use the bot :)
-
 ## LICENSE

 The software is licensed under the [MPL-2.0](LICENSE) license.
--- a/build.sh
+++ b/build.sh
@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+AUTHORS="Augusto Dwenger J. <dwenger@posteo.de>"
+URL="https://${REPO}"
+VENDOR="hamburghammer"
+
+build() {
+  CREATED=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+  REVISION=$(git rev-parse HEAD)
+
+  IMAGE_LATEST="${REPO}:latest"
+
+  if [ "$PUSH_LATEST" == "1" ]; then
+    DOCKER_BUILD_ARGS="$DOCKER_BUILD_ARGS --push"
+  fi
+
+  # shellcheck disable=SC2086
+  docker buildx build \
+    $DOCKER_BUILD_ARGS \
+    -t $IMAGE_LATEST \
+    --file Containerfile \
+    --platform linux/amd64,linux/arm64 \
+    --label "org.opencontainers.image.revision=${REVISION}" \
+    --label "org.opencontainers.image.version=${TAG}" \
+    --label "org.opencontainers.image.authors=${AUTHORS}" \
+    --label "org.opencontainers.image.created=${CREATED}" \
+    --label "org.opencontainers.image.source=${URL}" \
+    --label "org.opencontainers.image.vendor=${VENDOR}" \
+    --label "org.opencontainers.image.title=${TITLE}" \
+    --label "org.opencontainers.image.description=${DESCRIPTION}" \
+    . || exit $?
+
+}
+
+echo "start building bot"
+REPO="git.hhhammer.de/hamburghammer/dchat/bot"
+TITLE="dchat-bot"
+DESCRIPTION="A Discord bot to chat with ChatGPT from OpenAI"
+DOCKER_BUILD_ARGS="--target bot"
+build
+
+echo "start building web"
+REPO="git.hhhammer.de/hamburghammer/dchat/web"
+TITLE="dchat-web"
+DESCRIPTION="A web API and UI for the dchat-bot configuration"
+DOCKER_BUILD_ARGS="--target web"
+build
+
+echo "start building migration"
+REPO="git.hhhammer.de/hamburghammer/dchat/migration"
+TITLE="dchat-migration"
+DESCRIPTION="A migration tool for the dchat database"
+DOCKER_BUILD_ARGS="--target migration"
+build
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -10,8 +10,6 @@ services:
      context: .
      target: bot
    restart: unless-stopped
-    networks:
-      - db
    user: 1000:1000
    depends_on:
      - db
@ -34,9 +32,6 @@ services:
      - migration
    ports:
      - 8080:8080
-    networks:
-      - db
-      - web

  migration:
    image: git.hhhammer.de/hamburghammer/dchat/migration:latest
@ -49,39 +44,6 @@ services:
    user: 1000:1000
    depends_on:
      - db
-    networks:
-      - db
-
-  ui:
-    image: git.hhhammer.de/hamburghammer/dchat/ui:latest
-    build:
-      dockerfile: Dockerfile
-      context: .
-      target: ui
-    restart: unless-stopped
-    ports:
-      - 8081:80
-    networks:
-      - ui
-
-  caddy:
-    image: git.hhhammer.de/hamburghammer/dchat/caddy:latest
-    build:
-      dockerfile: Dockerfile
-      context: .
-      target: caddy
-    restart: unless-stopped
-    user: 1000:1000
-    depends_on:
-      - ui
-      - web
-    ports:
-      - 8082:8080
-    networks:
-      - ui
-      - web
-    volumes:
-      - caddy_config:/config

  db:
    image: docker.io/postgres:15-alpine
@ -90,8 +52,6 @@ services:
    restart: unless-stopped
    ports:
      - 127.0.0.1:5432:5432
-    networks:
-      - db
    volumes:
      - ./data/postgres:/var/lib/postgresql/data:rw
    healthcheck:
@ -100,11 +60,3 @@ services:
      timeout: 5s
      retries: 5
      start_period: 60s
-
-volumes:
-  caddy_config:
-
-networks:
-  db:
-  ui:
-  web:
--- a/pom.xml
+++ b/pom.xml
@ -27,10 +27,10 @@
    </licenses>

    <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>20</maven.compiler.source>
+        <maven.compiler.target>20</maven.compiler.target>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jackson.version>2.16.0</jackson.version>
+        <jackson.version>2.15.1</jackson.version>
    </properties>


@ -56,30 +56,30 @@
            <dependency>
                <groupId>org.slf4j</groupId>
                <artifactId>slf4j-api</artifactId>
-                <version>2.0.9</version>
+                <version>2.0.7</version>
            </dependency>
            <dependency>
                <groupId>ch.qos.logback</groupId>
                <artifactId>logback-classic</artifactId>
-                <version>1.4.11</version>
+                <version>1.4.6</version>
                <scope>runtime</scope>
            </dependency>
            <dependency>
                <groupId>org.jetbrains</groupId>
                <artifactId>annotations</artifactId>
-                <version>24.1.0</version>
+                <version>24.0.1</version>
                <scope>provided</scope>
            </dependency>
            <dependency>
                <groupId>org.postgresql</groupId>
                <artifactId>postgresql</artifactId>
-                <version>42.7.0</version>
+                <version>42.6.0</version>
                <scope>runtime</scope>
            </dependency>
            <dependency>
                <groupId>com.zaxxer</groupId>
                <artifactId>HikariCP</artifactId>
-                <version>5.1.0</version>
+                <version>5.0.1</version>
            </dependency>
            <dependency>
                <groupId>com.fasterxml.jackson.core</groupId>
@ -99,7 +99,7 @@
            <dependency>
                <groupId>io.javalin</groupId>
                <artifactId>javalin</artifactId>
-                <version>5.6.0</version>
+                <version>5.5.0</version>
            </dependency>
            <dependency>
                <groupId>org.javacord</groupId>
@ -110,7 +110,7 @@
            <dependency>
                <groupId>org.apache.logging.log4j</groupId>
                <artifactId>log4j-to-slf4j</artifactId>
-                <version>2.22.0</version>
+                <version>2.20.0</version>
                <scope>runtime</scope>
            </dependency>
        </dependencies>
--- a/web/pom.xml
+++ b/web/pom.xml
@ -85,6 +85,50 @@
                    </execution>
                </executions>
            </plugin>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.9.1</version>
+                <configuration>
+                    <nodeVersion>${node.version}</nodeVersion>
+                    <workingDirectory>src/ui</workingDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>Install node and npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <nodeVersion>${node.version}</nodeVersion>
+                            <npmVersion>${npm.version}</npmVersion>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>npm install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>npm build</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <arguments>run build-only</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-resources-plugin</artifactId>
--- a/web/src/main/java/de/hhhammer/dchat/web/App.java
+++ b/web/src/main/java/de/hhhammer/dchat/web/App.java
@ -24,7 +24,6 @@ public class App {

        String apiPortStr = System.getenv("API_PORT") != null ? System.getenv("API_PORT") : "8080";
        int apiPort = Integer.parseInt(apiPortStr);
-        boolean debug = "true".equals(System.getenv("API_DEBUG"));

        var config = new HikariConfig();
        config.setJdbcUrl(postgresUrl);
@ -34,9 +33,8 @@ public class App {
        try (var ds = new HikariDataSource(config)) {
            var serverDBService = new ServerDBService(ds);
            var userDBService = new UserDBService(ds);
-            var appConfig = new AppConfig(apiPort, debug);

-            var webApi = new WebAPI(serverDBService, userDBService, appConfig);
+            var webApi = new WebAPI(serverDBService, userDBService, apiPort);
            webApi.run();
        }
    }
--- a/web/src/main/java/de/hhhammer/dchat/web/AppConfig.java
+++ b/web/src/main/java/de/hhhammer/dchat/web/AppConfig.java
@ -1,4 +0,0 @@
-package de.hhhammer.dchat.web;
-
-public record AppConfig(int port, boolean debug) {
-}
--- a/web/src/main/java/de/hhhammer/dchat/web/WebAPI.java
+++ b/web/src/main/java/de/hhhammer/dchat/web/WebAPI.java
@ -20,21 +20,26 @@ public class WebAPI implements Runnable {
    private static final Logger logger = LoggerFactory.getLogger(WebAPI.class);
    private final ServerDBService serverDBService;
    private final UserDBService userDBService;
-    private final AppConfig appConfig;
+    private final int port;

-    public WebAPI(ServerDBService serverDBService, UserDBService userDBService, AppConfig appConfig) {
+    public WebAPI(ServerDBService serverDBService, UserDBService userDBService, int port) {
        this.serverDBService = serverDBService;
        this.userDBService = userDBService;
-        this.appConfig = appConfig;
+        this.port = port;
    }

    @Override
    public void run() {
        logger.info("Starting web application");
        var app = Javalin.create(config -> {
-            if (appConfig.debug()) config.plugins.enableDevLogging();
+//            config.plugins.enableDevLogging();
            config.http.prefer405over404 = true;  // return 405 instead of 404 if path is mapped to different HTTP method
            config.http.defaultContentType = "application/json";
+            config.staticFiles.add(staticFileConfig -> {
+                staticFileConfig.hostedPath = "/";
+                staticFileConfig.location = Location.CLASSPATH;
+                staticFileConfig.directory = "ui";
+            });
        });
        var waitForShutdown = new CompletableFuture<Void>();
        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
@ -51,6 +56,11 @@ public class WebAPI implements Runnable {
            ctx.header("Access-Control-Allow-Origin", "*");
            ctx.header("Access-Control-Allow-Methods", "*");
        });
+        app.after(ctx -> {
+            if (!ctx.path().startsWith("/api") && (ctx.status().equals(HttpStatus.NOT_FOUND) || ctx.status().equals(HttpStatus.METHOD_NOT_ALLOWED))) {
+                ctx.redirect("/");
+            }
+        });
        app.options("*", ctx -> ctx.status(HttpStatus.OK));

        app.routes(() -> {
@ -64,7 +74,7 @@ public class WebAPI implements Runnable {
            });
        });

-        app.start(appConfig.port());
+        app.start(this.port);
        try {
            waitForShutdown.get();
        } catch (InterruptedException | ExecutionException e) {
--- a/web/src/ui/.gitignore
+++ b/web/src/ui/.gitignore
@ -18,7 +18,7 @@ coverage
 /cypress/screenshots/

 # Editor directories and files
-.vscode/extensions.json
+.vscode/*
 !.vscode/extensions.json
 .idea
 *.suo
--- a/web/src/ui/.vscode/extensions.json
+++ b/web/src/ui/.vscode/extensions.json
@ -0,0 +1,3 @@
+{
+  "recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
+}
--- a/web/src/ui/README.md
+++ b/web/src/ui/README.md
--- a/web/src/ui/build.sh
+++ b/web/src/ui/build.sh
@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+REPO="git.hhhammer.de/hamburghammer/dchat-ui"
+AUTHORS="Augusto Dwenger J. <dwenger@posteo.de>"
+URL="https://${REPO}"
+VENDOR="hamburghammer"
+TITLE="dchat-ui"
+DESCRIPTION="The Web-UI for dchat a Discord bot to chat with ChatGPT from OpenAI"
+CREATED=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
+REVISION=$(git rev-parse HEAD)
+
+IMAGE_LATEST="${REPO}:latest"
+
+# shellcheck disable=SC2086
+podman build \
+        $DOCKER_BUILD_ARGS \
+        -t $IMAGE_LATEST \
+        --label "org.opencontainers.image.revision=${REVISION}" \
+        --label "org.opencontainers.image.version=${TAG}" \
+        --label "org.opencontainers.image.authors=${AUTHORS}" \
+        --label "org.opencontainers.image.created=${CREATED}" \
+        --label "org.opencontainers.image.source=${URL}" \
+        --label "org.opencontainers.image.vendor=${VENDOR}" \
+        --label "org.opencontainers.image.title=${TITLE}" \
+        --label "org.opencontainers.image.description=${DESCRIPTION}" \
+        . || exit $?
+
+if [ "$PUSH_LATEST" == "1" ]; then
+  podman push "${IMAGE_LATEST}"
+fi
+
--- a/web/src/ui/env.d.ts
+++ b/web/src/ui/env.d.ts
--- a/web/src/ui/index.html
+++ b/web/src/ui/index.html
@ -4,7 +4,7 @@
    <meta charset="UTF-8">
    <link rel="icon" href="/favicon.ico">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>dchat</title>
+    <title>Vite App</title>
  </head>
  <body>
    <div id="app"></div>
--- a/web/src/ui/package-lock.json
+++ b/web/src/ui/package-lock.json
@ -7,7 +7,6 @@
    "": {
      "name": "dchat-ui",
      "version": "0.0.0",
-      "license": "MPL-2.0",
      "dependencies": {
        "daisyui": "^2.51.5",
        "vue": "^3.2.47",
@ -38,9 +37,9 @@
      }
    },
    "node_modules/@esbuild/android-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.16.tgz",
+      "integrity": "sha512-baLqRpLe4JnKrUXLJChoTN0iXZH7El/mu58GE3WIA6/H834k0XWvLRmGLG8y8arTRS9hJJibPnF0tiGhmWeZgw==",
      "cpu": [
        "arm"
      ],
@ -54,9 +53,9 @@
      }
    },
    "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.16.tgz",
+      "integrity": "sha512-QX48qmsEZW+gcHgTmAj+x21mwTz8MlYQBnzF6861cNdQGvj2jzzFjqH0EBabrIa/WVZ2CHolwMoqxVryqKt8+Q==",
      "cpu": [
        "arm64"
      ],
@ -70,9 +69,9 @@
      }
    },
    "node_modules/@esbuild/android-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.16.tgz",
+      "integrity": "sha512-G4wfHhrrz99XJgHnzFvB4UwwPxAWZaZBOFXh+JH1Duf1I4vIVfuYY9uVLpx4eiV2D/Jix8LJY+TAdZ3i40tDow==",
      "cpu": [
        "x64"
      ],
@ -86,9 +85,9 @@
      }
    },
    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.16.tgz",
+      "integrity": "sha512-/Ofw8UXZxuzTLsNFmz1+lmarQI6ztMZ9XktvXedTbt3SNWDn0+ODTwxExLYQ/Hod91EZB4vZPQJLoqLF0jvEzA==",
      "cpu": [
        "arm64"
      ],
@ -102,9 +101,9 @@
      }
    },
    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.16.tgz",
+      "integrity": "sha512-SzBQtCV3Pdc9kyizh36Ol+dNVhkDyIrGb/JXZqFq8WL37LIyrXU0gUpADcNV311sCOhvY+f2ivMhb5Tuv8nMOQ==",
      "cpu": [
        "x64"
      ],
@ -118,9 +117,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.16.tgz",
+      "integrity": "sha512-ZqftdfS1UlLiH1DnS2u3It7l4Bc3AskKeu+paJSfk7RNOMrOxmeFDhLTMQqMxycP1C3oj8vgkAT6xfAuq7ZPRA==",
      "cpu": [
        "arm64"
      ],
@ -134,9 +133,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.16.tgz",
+      "integrity": "sha512-rHV6zNWW1tjgsu0dKQTX9L0ByiJHHLvQKrWtnz8r0YYJI27FU3Xu48gpK2IBj1uCSYhJ+pEk6Y0Um7U3rIvV8g==",
      "cpu": [
        "x64"
      ],
@ -150,9 +149,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.16.tgz",
+      "integrity": "sha512-n4O8oVxbn7nl4+m+ISb0a68/lcJClIbaGAoXwqeubj/D1/oMMuaAXmJVfFlRjJLu/ZvHkxoiFJnmbfp4n8cdSw==",
      "cpu": [
        "arm"
      ],
@ -166,9 +165,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.16.tgz",
+      "integrity": "sha512-8yoZhGkU6aHu38WpaM4HrRLTFc7/VVD9Q2SvPcmIQIipQt2I/GMTZNdEHXoypbbGao5kggLcxg0iBKjo0SQYKA==",
      "cpu": [
        "arm64"
      ],
@ -182,9 +181,9 @@
      }
    },
    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.16.tgz",
+      "integrity": "sha512-9ZBjlkdaVYxPNO8a7OmzDbOH9FMQ1a58j7Xb21UfRU29KcEEU3VTHk+Cvrft/BNv0gpWJMiiZ/f4w0TqSP0gLA==",
      "cpu": [
        "ia32"
      ],
@ -198,9 +197,9 @@
      }
    },
    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.16.tgz",
+      "integrity": "sha512-TIZTRojVBBzdgChY3UOG7BlPhqJz08AL7jdgeeu+kiObWMFzGnQD7BgBBkWRwOtKR1i2TNlO7YK6m4zxVjjPRQ==",
      "cpu": [
        "loong64"
      ],
@ -214,9 +213,9 @@
      }
    },
    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.16.tgz",
+      "integrity": "sha512-UPeRuFKCCJYpBbIdczKyHLAIU31GEm0dZl1eMrdYeXDH+SJZh/i+2cAmD3A1Wip9pIc5Sc6Kc5cFUrPXtR0XHA==",
      "cpu": [
        "mips64el"
      ],
@ -230,9 +229,9 @@
      }
    },
    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.16.tgz",
+      "integrity": "sha512-io6yShgIEgVUhExJejJ21xvO5QtrbiSeI7vYUnr7l+v/O9t6IowyhdiYnyivX2X5ysOVHAuyHW+Wyi7DNhdw6Q==",
      "cpu": [
        "ppc64"
      ],
@ -246,9 +245,9 @@
      }
    },
    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.16.tgz",
+      "integrity": "sha512-WhlGeAHNbSdG/I2gqX2RK2gfgSNwyJuCiFHMc8s3GNEMMHUI109+VMBfhVqRb0ZGzEeRiibi8dItR3ws3Lk+cA==",
      "cpu": [
        "riscv64"
      ],
@ -262,9 +261,9 @@
      }
    },
    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.16.tgz",
+      "integrity": "sha512-gHRReYsJtViir63bXKoFaQ4pgTyah4ruiMRQ6im9YZuv+gp3UFJkNTY4sFA73YDynmXZA6hi45en4BGhNOJUsw==",
      "cpu": [
        "s390x"
      ],
@ -278,9 +277,9 @@
      }
    },
    "node_modules/@esbuild/linux-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.16.tgz",
+      "integrity": "sha512-mfiiBkxEbUHvi+v0P+TS7UnA9TeGXR48aK4XHkTj0ZwOijxexgMF01UDFaBX7Q6CQsB0d+MFNv9IiXbIHTNd4g==",
      "cpu": [
        "x64"
      ],
@ -294,9 +293,9 @@
      }
    },
    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.16.tgz",
+      "integrity": "sha512-n8zK1YRDGLRZfVcswcDMDM0j2xKYLNXqei217a4GyBxHIuPMGrrVuJ+Ijfpr0Kufcm7C1k/qaIrGy6eG7wvgmA==",
      "cpu": [
        "x64"
      ],
@ -310,9 +309,9 @@
      }
    },
    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.16.tgz",
+      "integrity": "sha512-lEEfkfsUbo0xC47eSTBqsItXDSzwzwhKUSsVaVjVji07t8+6KA5INp2rN890dHZeueXJAI8q0tEIfbwVRYf6Ew==",
      "cpu": [
        "x64"
      ],
@ -326,9 +325,9 @@
      }
    },
    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.16.tgz",
+      "integrity": "sha512-jlRjsuvG1fgGwnE8Afs7xYDnGz0dBgTNZfgCK6TlvPH3Z13/P5pi6I57vyLE8qZYLrGVtwcm9UbUx1/mZ8Ukag==",
      "cpu": [
        "x64"
      ],
@ -342,9 +341,9 @@
      }
    },
    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.16.tgz",
+      "integrity": "sha512-TzoU2qwVe2boOHl/3KNBUv2PNUc38U0TNnzqOAcgPiD/EZxT2s736xfC2dYQbszAwo4MKzzwBV0iHjhfjxMimg==",
      "cpu": [
        "arm64"
      ],
@ -358,9 +357,9 @@
      }
    },
    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.16.tgz",
+      "integrity": "sha512-B8b7W+oo2yb/3xmwk9Vc99hC9bNolvqjaTZYEfMQhzdpBsjTvZBlXQ/teUE55Ww6sg//wlcDjOaqldOKyigWdA==",
      "cpu": [
        "ia32"
      ],
@ -374,9 +373,9 @@
      }
    },
    "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.16.tgz",
+      "integrity": "sha512-xJ7OH/nanouJO9pf03YsL9NAFQBHd8AqfrQd7Pf5laGyyTt/gToul6QYOA/i5i/q8y9iaM5DQFNTgpi995VkOg==",
      "cpu": [
        "x64"
      ],
@ -1179,9 +1178,9 @@
      }
    },
    "node_modules/esbuild": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
-      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.16.tgz",
+      "integrity": "sha512-aeSuUKr9aFVY9Dc8ETVELGgkj4urg5isYx8pLf4wlGgB0vTFjxJQdHnNH6Shmx4vYYrOTLCHtRI5i1XZ9l2Zcg==",
      "dev": true,
      "hasInstallScript": true,
      "bin": {
@ -1191,28 +1190,28 @@
        "node": ">=12"
      },
      "optionalDependencies": {
-        "@esbuild/android-arm": "0.18.20",
-        "@esbuild/android-arm64": "0.18.20",
-        "@esbuild/android-x64": "0.18.20",
-        "@esbuild/darwin-arm64": "0.18.20",
-        "@esbuild/darwin-x64": "0.18.20",
-        "@esbuild/freebsd-arm64": "0.18.20",
-        "@esbuild/freebsd-x64": "0.18.20",
-        "@esbuild/linux-arm": "0.18.20",
-        "@esbuild/linux-arm64": "0.18.20",
-        "@esbuild/linux-ia32": "0.18.20",
-        "@esbuild/linux-loong64": "0.18.20",
-        "@esbuild/linux-mips64el": "0.18.20",
-        "@esbuild/linux-ppc64": "0.18.20",
-        "@esbuild/linux-riscv64": "0.18.20",
-        "@esbuild/linux-s390x": "0.18.20",
-        "@esbuild/linux-x64": "0.18.20",
-        "@esbuild/netbsd-x64": "0.18.20",
-        "@esbuild/openbsd-x64": "0.18.20",
-        "@esbuild/sunos-x64": "0.18.20",
-        "@esbuild/win32-arm64": "0.18.20",
-        "@esbuild/win32-ia32": "0.18.20",
-        "@esbuild/win32-x64": "0.18.20"
+        "@esbuild/android-arm": "0.17.16",
+        "@esbuild/android-arm64": "0.17.16",
+        "@esbuild/android-x64": "0.17.16",
+        "@esbuild/darwin-arm64": "0.17.16",
+        "@esbuild/darwin-x64": "0.17.16",
+        "@esbuild/freebsd-arm64": "0.17.16",
+        "@esbuild/freebsd-x64": "0.17.16",
+        "@esbuild/linux-arm": "0.17.16",
+        "@esbuild/linux-arm64": "0.17.16",
+        "@esbuild/linux-ia32": "0.17.16",
+        "@esbuild/linux-loong64": "0.17.16",
+        "@esbuild/linux-mips64el": "0.17.16",
+        "@esbuild/linux-ppc64": "0.17.16",
+        "@esbuild/linux-riscv64": "0.17.16",
+        "@esbuild/linux-s390x": "0.17.16",
+        "@esbuild/linux-x64": "0.17.16",
+        "@esbuild/netbsd-x64": "0.17.16",
+        "@esbuild/openbsd-x64": "0.17.16",
+        "@esbuild/sunos-x64": "0.17.16",
+        "@esbuild/win32-arm64": "0.17.16",
+        "@esbuild/win32-ia32": "0.17.16",
+        "@esbuild/win32-x64": "0.17.16"
      }
    },
    "node_modules/escalade": {
@ -2160,9 +2159,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+      "version": "8.4.22",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.22.tgz",
+      "integrity": "sha512-XseknLAfRHzVWjCEtdviapiBtfLdgyzExD50Rg2ePaucEesyh8Wv4VPdW0nbyDa1ydbrAxV19jvMT4+LFmcNUA==",
      "funding": [
        {
          "type": "opencollective",
@ -2397,9 +2396,9 @@
      }
    },
    "node_modules/rollup": {
-      "version": "3.29.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
-      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
+      "version": "3.20.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.3.tgz",
+      "integrity": "sha512-u6/O1X42CAZ79rbk+smyONJQLTpwFBL7InpRa/AVWia5lq60w5J/PUsVHCOgSolN0X9R2GjQ41fZm3x28Hk1lA==",
      "dev": true,
      "bin": {
        "rollup": "dist/bin/rollup"
@ -2449,9 +2448,9 @@
      }
    },
    "node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
      "dev": true,
      "bin": {
        "semver": "bin/semver"
@ -2851,14 +2850,15 @@
      }
    },
    "node_modules/vite": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz",
-      "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.2.1.tgz",
+      "integrity": "sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==",
      "dev": true,
      "dependencies": {
-        "esbuild": "^0.18.10",
-        "postcss": "^8.4.27",
-        "rollup": "^3.27.1"
+        "esbuild": "^0.17.5",
+        "postcss": "^8.4.21",
+        "resolve": "^1.22.1",
+        "rollup": "^3.18.0"
      },
      "bin": {
        "vite": "bin/vite.js"
@ -2866,16 +2866,12 @@
      "engines": {
        "node": "^14.18.0 || >=16.0.0"
      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
      "optionalDependencies": {
        "fsevents": "~2.3.2"
      },
      "peerDependencies": {
        "@types/node": ">= 14",
        "less": "*",
-        "lightningcss": "^1.21.0",
        "sass": "*",
        "stylus": "*",
        "sugarss": "*",
@ -2888,9 +2884,6 @@
        "less": {
          "optional": true
        },
-        "lightningcss": {
-          "optional": true
-        },
        "sass": {
          "optional": true
        },
@ -3026,156 +3019,156 @@
      "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw=="
    },
    "@esbuild/android-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.16.tgz",
+      "integrity": "sha512-baLqRpLe4JnKrUXLJChoTN0iXZH7El/mu58GE3WIA6/H834k0XWvLRmGLG8y8arTRS9hJJibPnF0tiGhmWeZgw==",
      "dev": true,
      "optional": true
    },
    "@esbuild/android-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.16.tgz",
+      "integrity": "sha512-QX48qmsEZW+gcHgTmAj+x21mwTz8MlYQBnzF6861cNdQGvj2jzzFjqH0EBabrIa/WVZ2CHolwMoqxVryqKt8+Q==",
      "dev": true,
      "optional": true
    },
    "@esbuild/android-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.16.tgz",
+      "integrity": "sha512-G4wfHhrrz99XJgHnzFvB4UwwPxAWZaZBOFXh+JH1Duf1I4vIVfuYY9uVLpx4eiV2D/Jix8LJY+TAdZ3i40tDow==",
      "dev": true,
      "optional": true
    },
    "@esbuild/darwin-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.16.tgz",
+      "integrity": "sha512-/Ofw8UXZxuzTLsNFmz1+lmarQI6ztMZ9XktvXedTbt3SNWDn0+ODTwxExLYQ/Hod91EZB4vZPQJLoqLF0jvEzA==",
      "dev": true,
      "optional": true
    },
    "@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.16.tgz",
+      "integrity": "sha512-SzBQtCV3Pdc9kyizh36Ol+dNVhkDyIrGb/JXZqFq8WL37LIyrXU0gUpADcNV311sCOhvY+f2ivMhb5Tuv8nMOQ==",
      "dev": true,
      "optional": true
    },
    "@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.16.tgz",
+      "integrity": "sha512-ZqftdfS1UlLiH1DnS2u3It7l4Bc3AskKeu+paJSfk7RNOMrOxmeFDhLTMQqMxycP1C3oj8vgkAT6xfAuq7ZPRA==",
      "dev": true,
      "optional": true
    },
    "@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.16.tgz",
+      "integrity": "sha512-rHV6zNWW1tjgsu0dKQTX9L0ByiJHHLvQKrWtnz8r0YYJI27FU3Xu48gpK2IBj1uCSYhJ+pEk6Y0Um7U3rIvV8g==",
      "dev": true,
      "optional": true
    },
    "@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.16.tgz",
+      "integrity": "sha512-n4O8oVxbn7nl4+m+ISb0a68/lcJClIbaGAoXwqeubj/D1/oMMuaAXmJVfFlRjJLu/ZvHkxoiFJnmbfp4n8cdSw==",
      "dev": true,
      "optional": true
    },
    "@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.16.tgz",
+      "integrity": "sha512-8yoZhGkU6aHu38WpaM4HrRLTFc7/VVD9Q2SvPcmIQIipQt2I/GMTZNdEHXoypbbGao5kggLcxg0iBKjo0SQYKA==",
      "dev": true,
      "optional": true
    },
    "@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.16.tgz",
+      "integrity": "sha512-9ZBjlkdaVYxPNO8a7OmzDbOH9FMQ1a58j7Xb21UfRU29KcEEU3VTHk+Cvrft/BNv0gpWJMiiZ/f4w0TqSP0gLA==",
      "dev": true,
      "optional": true
    },
    "@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.16.tgz",
+      "integrity": "sha512-TIZTRojVBBzdgChY3UOG7BlPhqJz08AL7jdgeeu+kiObWMFzGnQD7BgBBkWRwOtKR1i2TNlO7YK6m4zxVjjPRQ==",
      "dev": true,
      "optional": true
    },
    "@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.16.tgz",
+      "integrity": "sha512-UPeRuFKCCJYpBbIdczKyHLAIU31GEm0dZl1eMrdYeXDH+SJZh/i+2cAmD3A1Wip9pIc5Sc6Kc5cFUrPXtR0XHA==",
      "dev": true,
      "optional": true
    },
    "@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.16.tgz",
+      "integrity": "sha512-io6yShgIEgVUhExJejJ21xvO5QtrbiSeI7vYUnr7l+v/O9t6IowyhdiYnyivX2X5ysOVHAuyHW+Wyi7DNhdw6Q==",
      "dev": true,
      "optional": true
    },
    "@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.16.tgz",
+      "integrity": "sha512-WhlGeAHNbSdG/I2gqX2RK2gfgSNwyJuCiFHMc8s3GNEMMHUI109+VMBfhVqRb0ZGzEeRiibi8dItR3ws3Lk+cA==",
      "dev": true,
      "optional": true
    },
    "@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.16.tgz",
+      "integrity": "sha512-gHRReYsJtViir63bXKoFaQ4pgTyah4ruiMRQ6im9YZuv+gp3UFJkNTY4sFA73YDynmXZA6hi45en4BGhNOJUsw==",
      "dev": true,
      "optional": true
    },
    "@esbuild/linux-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.16.tgz",
+      "integrity": "sha512-mfiiBkxEbUHvi+v0P+TS7UnA9TeGXR48aK4XHkTj0ZwOijxexgMF01UDFaBX7Q6CQsB0d+MFNv9IiXbIHTNd4g==",
      "dev": true,
      "optional": true
    },
    "@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.16.tgz",
+      "integrity": "sha512-n8zK1YRDGLRZfVcswcDMDM0j2xKYLNXqei217a4GyBxHIuPMGrrVuJ+Ijfpr0Kufcm7C1k/qaIrGy6eG7wvgmA==",
      "dev": true,
      "optional": true
    },
    "@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.16.tgz",
+      "integrity": "sha512-lEEfkfsUbo0xC47eSTBqsItXDSzwzwhKUSsVaVjVji07t8+6KA5INp2rN890dHZeueXJAI8q0tEIfbwVRYf6Ew==",
      "dev": true,
      "optional": true
    },
    "@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.16.tgz",
+      "integrity": "sha512-jlRjsuvG1fgGwnE8Afs7xYDnGz0dBgTNZfgCK6TlvPH3Z13/P5pi6I57vyLE8qZYLrGVtwcm9UbUx1/mZ8Ukag==",
      "dev": true,
      "optional": true
    },
    "@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.16.tgz",
+      "integrity": "sha512-TzoU2qwVe2boOHl/3KNBUv2PNUc38U0TNnzqOAcgPiD/EZxT2s736xfC2dYQbszAwo4MKzzwBV0iHjhfjxMimg==",
      "dev": true,
      "optional": true
    },
    "@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.16.tgz",
+      "integrity": "sha512-B8b7W+oo2yb/3xmwk9Vc99hC9bNolvqjaTZYEfMQhzdpBsjTvZBlXQ/teUE55Ww6sg//wlcDjOaqldOKyigWdA==",
      "dev": true,
      "optional": true
    },
    "@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.16.tgz",
+      "integrity": "sha512-xJ7OH/nanouJO9pf03YsL9NAFQBHd8AqfrQd7Pf5laGyyTt/gToul6QYOA/i5i/q8y9iaM5DQFNTgpi995VkOg==",
      "dev": true,
      "optional": true
    },
@ -3797,33 +3790,33 @@
      }
    },
    "esbuild": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
-      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
+      "version": "0.17.16",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.17.16.tgz",
+      "integrity": "sha512-aeSuUKr9aFVY9Dc8ETVELGgkj4urg5isYx8pLf4wlGgB0vTFjxJQdHnNH6Shmx4vYYrOTLCHtRI5i1XZ9l2Zcg==",
      "dev": true,
      "requires": {
-        "@esbuild/android-arm": "0.18.20",
-        "@esbuild/android-arm64": "0.18.20",
-        "@esbuild/android-x64": "0.18.20",
-        "@esbuild/darwin-arm64": "0.18.20",
-        "@esbuild/darwin-x64": "0.18.20",
-        "@esbuild/freebsd-arm64": "0.18.20",
-        "@esbuild/freebsd-x64": "0.18.20",
-        "@esbuild/linux-arm": "0.18.20",
-        "@esbuild/linux-arm64": "0.18.20",
-        "@esbuild/linux-ia32": "0.18.20",
-        "@esbuild/linux-loong64": "0.18.20",
-        "@esbuild/linux-mips64el": "0.18.20",
-        "@esbuild/linux-ppc64": "0.18.20",
-        "@esbuild/linux-riscv64": "0.18.20",
-        "@esbuild/linux-s390x": "0.18.20",
-        "@esbuild/linux-x64": "0.18.20",
-        "@esbuild/netbsd-x64": "0.18.20",
-        "@esbuild/openbsd-x64": "0.18.20",
-        "@esbuild/sunos-x64": "0.18.20",
-        "@esbuild/win32-arm64": "0.18.20",
-        "@esbuild/win32-ia32": "0.18.20",
-        "@esbuild/win32-x64": "0.18.20"
+        "@esbuild/android-arm": "0.17.16",
+        "@esbuild/android-arm64": "0.17.16",
+        "@esbuild/android-x64": "0.17.16",
+        "@esbuild/darwin-arm64": "0.17.16",
+        "@esbuild/darwin-x64": "0.17.16",
+        "@esbuild/freebsd-arm64": "0.17.16",
+        "@esbuild/freebsd-x64": "0.17.16",
+        "@esbuild/linux-arm": "0.17.16",
+        "@esbuild/linux-arm64": "0.17.16",
+        "@esbuild/linux-ia32": "0.17.16",
+        "@esbuild/linux-loong64": "0.17.16",
+        "@esbuild/linux-mips64el": "0.17.16",
+        "@esbuild/linux-ppc64": "0.17.16",
+        "@esbuild/linux-riscv64": "0.17.16",
+        "@esbuild/linux-s390x": "0.17.16",
+        "@esbuild/linux-x64": "0.17.16",
+        "@esbuild/netbsd-x64": "0.17.16",
+        "@esbuild/openbsd-x64": "0.17.16",
+        "@esbuild/sunos-x64": "0.17.16",
+        "@esbuild/win32-arm64": "0.17.16",
+        "@esbuild/win32-ia32": "0.17.16",
+        "@esbuild/win32-x64": "0.17.16"
      }
    },
    "escalade": {
@ -4496,9 +4489,9 @@
      "integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="
    },
    "postcss": {
-      "version": "8.4.31",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
-      "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
+      "version": "8.4.22",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.22.tgz",
+      "integrity": "sha512-XseknLAfRHzVWjCEtdviapiBtfLdgyzExD50Rg2ePaucEesyh8Wv4VPdW0nbyDa1ydbrAxV19jvMT4+LFmcNUA==",
      "requires": {
        "nanoid": "^3.3.6",
        "picocolors": "^1.0.0",
@ -4625,9 +4618,9 @@
      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
    },
    "rollup": {
-      "version": "3.29.4",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
-      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
+      "version": "3.20.3",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.3.tgz",
+      "integrity": "sha512-u6/O1X42CAZ79rbk+smyONJQLTpwFBL7InpRa/AVWia5lq60w5J/PUsVHCOgSolN0X9R2GjQ41fZm3x28Hk1lA==",
      "dev": true,
      "requires": {
        "fsevents": "~2.3.2"
@ -4653,9 +4646,9 @@
      }
    },
    "semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
      "dev": true
    },
    "shebang-command": {
@ -4951,15 +4944,16 @@
      }
    },
    "vite": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz",
-      "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.2.1.tgz",
+      "integrity": "sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==",
      "dev": true,
      "requires": {
-        "esbuild": "^0.18.10",
+        "esbuild": "^0.17.5",
        "fsevents": "~2.3.2",
-        "postcss": "^8.4.27",
-        "rollup": "^3.27.1"
+        "postcss": "^8.4.21",
+        "resolve": "^1.22.1",
+        "rollup": "^3.18.0"
      }
    },
    "vue": {
--- a/web/src/ui/package.json
+++ b/web/src/ui/package.json
--- a/web/src/ui/postcss.config.js
+++ b/web/src/ui/postcss.config.js
--- a/web/src/ui/public/favicon.ico
+++ b/web/src/ui/public/favicon.ico
--- a/web/src/ui/src/App.vue
+++ b/web/src/ui/src/App.vue
--- a/web/src/ui/src/assets/base.css
+++ b/web/src/ui/src/assets/base.css
--- a/web/src/ui/src/assets/main.css
+++ b/web/src/ui/src/assets/main.css
--- a/web/src/ui/src/components/ModalComponent.vue
+++ b/web/src/ui/src/components/ModalComponent.vue
--- a/web/src/ui/src/components/TableComponent.vue
+++ b/web/src/ui/src/components/TableComponent.vue
--- a/web/src/ui/src/components/TestComponent.vue
+++ b/web/src/ui/src/components/TestComponent.vue
--- a/web/src/ui/src/components/server/AddServerConfig.vue
+++ b/web/src/ui/src/components/server/AddServerConfig.vue
--- a/web/src/ui/src/components/server/DeleteServerConfig.vue
+++ b/web/src/ui/src/components/server/DeleteServerConfig.vue
--- a/web/src/ui/src/components/server/EditServerConfig.vue
+++ b/web/src/ui/src/components/server/EditServerConfig.vue
--- a/web/src/ui/src/components/user/AddUserConfig.vue
+++ b/web/src/ui/src/components/user/AddUserConfig.vue
--- a/web/src/ui/src/components/user/DeleteUserConfig.vue
+++ b/web/src/ui/src/components/user/DeleteUserConfig.vue
--- a/web/src/ui/src/components/user/EditUserConfig.vue
+++ b/web/src/ui/src/components/user/EditUserConfig.vue
--- a/web/src/ui/src/main.ts
+++ b/web/src/ui/src/main.ts
--- a/web/src/ui/src/models/server.ts
+++ b/web/src/ui/src/models/server.ts
--- a/web/src/ui/src/models/user.ts
+++ b/web/src/ui/src/models/user.ts
--- a/web/src/ui/src/router/index.ts
+++ b/web/src/ui/src/router/index.ts
--- a/web/src/ui/src/services/ServerConfigs.ts
+++ b/web/src/ui/src/services/ServerConfigs.ts
--- a/web/src/ui/src/services/UserConfigs.ts
+++ b/web/src/ui/src/services/UserConfigs.ts
--- a/web/src/ui/src/views/HomeView.vue
+++ b/web/src/ui/src/views/HomeView.vue
--- a/web/src/ui/src/views/UsersView.vue
+++ b/web/src/ui/src/views/UsersView.vue
--- a/web/src/ui/src/views/servers/IndexServersView.vue
+++ b/web/src/ui/src/views/servers/IndexServersView.vue
--- a/web/src/ui/src/views/servers/ServerConfigsView.vue
+++ b/web/src/ui/src/views/servers/ServerConfigsView.vue
--- a/web/src/ui/src/views/users/IndexUsersView.vue
+++ b/web/src/ui/src/views/users/IndexUsersView.vue
--- a/web/src/ui/src/views/users/UserConfigsView.vue
+++ b/web/src/ui/src/views/users/UserConfigsView.vue
--- a/web/src/ui/tailwind.config.js
+++ b/web/src/ui/tailwind.config.js
--- a/web/src/ui/tsconfig.json
+++ b/web/src/ui/tsconfig.json
--- a/web/src/ui/tsconfig.node.json
+++ b/web/src/ui/tsconfig.node.json
--- a/web/src/ui/vite.config.ts
+++ b/web/src/ui/vite.config.ts