From 288f7e0522088ce4f91e87dbca879661402a533d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jona=20Kl=C3=A4=C3=9F?= <jonaklaess@gmail.com>
Date: Sat, 4 May 2024 13:59:15 +0200
Subject: [PATCH 1/5] now able to create chats with oneself and print them

---
 src/components/ProtectedData.vue | 54 ++++++++++++++++++++++++++++--
 src/models.ts                    | 23 +++++++++++++
 src/stores/chat-store.ts         | 27 +++++++++++++++
 src/stores/user-store.ts         | 56 +++++++++++++++++---------------
 4 files changed, 130 insertions(+), 30 deletions(-)
 create mode 100644 src/stores/chat-store.ts

diff --git a/src/components/ProtectedData.vue b/src/components/ProtectedData.vue
index 49108f0..a096b8a 100644
--- a/src/components/ProtectedData.vue
+++ b/src/components/ProtectedData.vue
@@ -1,18 +1,29 @@
 <script lang="ts">
 import { defineComponent, onMounted, ref } from 'vue';
-import { useUserStore } from 'stores/user-store';
+
 import { useRouter } from 'vue-router';
-import { ptpUser } from 'src/models';
+import { useUserStore } from 'stores/user-store';
+import { useChatStore } from 'stores/chat-store';
+
+import { ptpUser, chat } from 'src/models';
 
 export default defineComponent({
   name: 'ProtectedData',
   components: {},
   setup() {
     const userStore = useUserStore();
+    const chatStore = useChatStore();
     const router = useRouter();
 
     const user = ref();
     const userLoaded = ref(false);
+
+    const chatName = ref('');
+
+    const chats = ref([] as chat[]);
+    const chatsLoaded = ref(false);
+
+
     const logout = () => {
       userStore.logout();
       router.push('/');
@@ -24,6 +35,20 @@ export default defineComponent({
       usersLoaded.value = true;
       users.value = userStore.users;
     }
+
+    const createChat = async(chatName: string)=>{
+      await chatStore.createChat(chatName, userStore.users.map(u => u.keycloakID));
+    }
+
+    const loadChats = async() => {
+      chats.value = await chatStore.loadChatsByUser();
+      chatsLoaded.value = true;
+
+      users.value = await userStore.loadAllUsers();
+      usersLoaded.value = true;
+      console.log(users.value);
+      console.log(chats.value);
+    }
     onMounted(async () => {
       userLoaded.value = userStore.userLoaded;
       user.value = userStore.user;
@@ -32,10 +57,19 @@ export default defineComponent({
     return {
       user,
       userLoaded,
+
       logout,
+
       loadUsers,
       users,
-      usersLoaded
+      usersLoaded,
+
+      chatName,
+      createChat,
+
+      loadChats,
+      chats,
+      chatsLoaded,
     };
   },
 })
@@ -61,6 +95,20 @@ export default defineComponent({
       <p>{{ user.keycloakID }}</p>
     </div>
   </div>
+  <br>
+  <q-input v-model="chatName" label="Chat Name" clearable />
+  <q-btn @click="createChat(chatName)" label="Create Chat"/>
+  <br>
+  <q-btn @click="loadChats()" label="Load Chats"/>
+  <div v-if="chatsLoaded">
+    <p>Chats:</p>
+    <div v-for="chat in chats" :key="chat.id">
+      <h5>{{ chat.displayName }}</h5>
+      <div v-for="ptpUser in chat.members" :key="ptpUser.keycloakID">
+        <p>{{ ptpUser.keycloakID }}</p>
+      </div>
+    </div>
+  </div>
 </template>
 
 <style scoped>
diff --git a/src/models.ts b/src/models.ts
index 3da2788..cde9182 100644
--- a/src/models.ts
+++ b/src/models.ts
@@ -10,3 +10,26 @@ export interface responseModel {
   message: string;
   response: any;
 }
+
+export interface chat{
+  id: number;
+  members: ptpUser[];
+  messages: message[];
+  displayName: string;
+}
+
+export interface user{
+  id: number;
+  keycloakID: string;
+  firstName: string;
+  lastName: string;
+  username: string;
+  chats: chat[];
+}
+
+export interface message{
+  id: number;
+  chat: chat;
+  sender: user;
+  content: string;
+}
diff --git a/src/stores/chat-store.ts b/src/stores/chat-store.ts
new file mode 100644
index 0000000..297f64f
--- /dev/null
+++ b/src/stores/chat-store.ts
@@ -0,0 +1,27 @@
+import { defineStore } from 'pinia';
+import { chat } from 'src/models';
+import { api } from 'src/boot/axios';
+import { useUserStore } from 'stores/user-store';
+
+const userStore = useUserStore();
+
+export const useChatStore = defineStore('chatStore',{
+  state:() => ({
+    chats: [] as chat[],
+  }),
+  actions: {
+    async getChatsByUser(): Promise<chat[]> {
+      if(!this.chats){
+        await this.loadChatsByUser();
+      }
+      return this.chats;
+    },
+    async loadChatsByUser() : Promise<chat[]>{
+      this.chats = (await api.get("/users/chat/" + userStore.keycloakId)).data.response;
+      return this.chats;
+    },
+    async createChat(chatName: string, members: string[]){
+      return (await api.post("/chats/create/" + chatName, members)).data;
+    }
+  }
+});
diff --git a/src/stores/user-store.ts b/src/stores/user-store.ts
index 3069d12..040ff54 100644
--- a/src/stores/user-store.ts
+++ b/src/stores/user-store.ts
@@ -3,6 +3,29 @@ import { api } from 'src/boot/axios';
 import { ptpUser, responseModel } from 'src/models';
 import Keycloak, { KeycloakInitOptions, KeycloakLoginOptions } from 'keycloak-js';
 
+/**
+ * Variablen für Keycloak Funktionen; sind in quasar.config.js definiert.
+ * @param keycloakPort Port, auf dem Keycloak läuft, hinterlegt in docker-compose.yml
+ * @param frontendPort Port, auf dem das Frontend läuft, hinterlegt in quasar.config.js und realm-export.json von Keycloak für die Redirect-URL
+ * @param realm Name des Realms, hinterlegt in realm-export.json von Keycloak
+ * @param clientId Name des Clients, hinterlegt in realm-export.json von Keycloak
+ */
+const keycloakPort: string = "" + process.env.PORT_KEYCLOAK;
+const frontendPort: string = "" + process.env.PORT_FRONTEND;
+const realm : string= "" + process.env.KEYCLOAK_REALM;
+const clientId: string = "" + process.env.KEYCLOAK_CLIENT_ID;
+const keycloak: Keycloak = new Keycloak({
+  url: 'http://localhost:' + keycloakPort + '/',
+  realm: realm,
+  clientId: clientId
+});
+const initOptions: KeycloakInitOptions = {
+  onLoad: 'login-required', //erzwingt Login
+  redirectUri: 'http://localhost:' + frontendPort + '/',
+  checkLoginIframe: false,
+  locale: 'login-required',
+}
+
 export const useUserStore = defineStore('userStore', {
   state: () => ({
     user: null as ptpUser | null,
@@ -11,7 +34,6 @@ export const useUserStore = defineStore('userStore', {
     keycloakId: "",
     users: [] as ptpUser[],
   }),
-  getters: {},
   actions: {
     async getPtpUserByKeycloakID(keycloakID : string) {
       await this.loadPtpUsersByKeycloakID(keycloakID).then((response : responseModel) => {
@@ -22,32 +44,12 @@ export const useUserStore = defineStore('userStore', {
     async loadPtpUsersByKeycloakID(keycloakID : string) : Promise<responseModel>  {
       return (await api.get("/users/login/"+keycloakID)).data;
     },
-    async loadAllUsers(){
+    async loadAllUsers(): Promise<ptpUser[]> {
       this.users = (await api.get("/users/user")).data;
+      return this.users;
     },
-    async initKeycloak() {
-      /**
-       * Variablen sind in quasar.config.js definiert und werden hier verwendet.
-       * @param keycloakPort Port, auf dem Keycloak läuft, hinterlegt in docker-compose.yml
-       * @param frontendPort Port, auf dem das Frontend läuft, hinterlegt in quasar.config.js und realm-export.json von Keycloak für die Redirect-URL
-       * @param realm Name des Realms, hinterlegt in realm-export.json von Keycloak
-       * @param clientId Name des Clients, hinterlegt in realm-export.json von Keycloak
-       */
-      const keycloakPort: string = "" + process.env.PORT_KEYCLOAK;
-      const frontendPort: string = "" + process.env.PORT_FRONTEND;
-      const realm : string= "" + process.env.KEYCLOAK_REALM;
-      const clientId: string = "" + process.env.KEYCLOAK_CLIENT_ID;
-      const keycloak: Keycloak = new Keycloak({
-        url: 'http://localhost:' + keycloakPort + '/',
-        realm: realm,
-        clientId: clientId
-      });
-      const initOptions: KeycloakInitOptions = {
-        onLoad: 'login-required', //erzwingt Login
-        redirectUri: 'http://localhost:' + frontendPort + '/',
-        checkLoginIframe: false,
-        locale: 'login-required',
-      }
+    async initKeycloak() : Promise<Keycloak>{
+
       try {
         await keycloak.init(initOptions).then( (auth: boolean): void => {
           console.log("Authenticated: " + auth);
@@ -64,7 +66,7 @@ export const useUserStore = defineStore('userStore', {
       }else await this.keycloak?.login( {prompt: 'login'} as KeycloakLoginOptions);
     },
     async logout() {
-      window.location.href= 'http://localhost:' + process.env.PORT_KEYCLOAK + '/realms/' + process.env.KEYCLOAK_REALM + '/protocol/openid-connect/logout?post_logout_redirect_uri=http%3A%2F%2Flocalhost:' + process.env.PORT_FRONTEND + '&client_id=' + process.env.KEYCLOAK_CLIENT_ID;
-    }
+      window.location.href= 'http://localhost:' + keycloakPort + '/realms/' + realm + '/protocol/openid-connect/logout?post_logout_redirect_uri=http%3A%2F%2Flocalhost:' + frontendPort + '&client_id=' + clientId;
+    },
   },
 });

From 6a33629030a291f92458556b2333411482c0a28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jona=20Kl=C3=A4=C3=9F?= <jonaklaess@gmail.com>
Date: Sat, 4 May 2024 23:11:31 +0200
Subject: [PATCH 2/5] now able to create chats with oneself and print them

---
 package-lock.json | 414 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 306 insertions(+), 108 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a04e0b2..62f452d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -351,11 +351,63 @@
         }
       }
     },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -433,9 +485,9 @@
       }
     },
     "node_modules/@quasar/app-vite": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@quasar/app-vite/-/app-vite-1.8.0.tgz",
-      "integrity": "sha512-/2HzIYqjm8AayyEeQq7zJnTiZZUQzHFCwEdIms8l+Po7Lhx4a7MXT7VCfR1M1KHGO0Z/EXItpjYwGryo/XNFoA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@quasar/app-vite/-/app-vite-1.8.5.tgz",
+      "integrity": "sha512-OB5nU9qKIl3p7Ton9fLWkSQTv1I/7slfQl8izhZPPJZRY755Jn4Kz1exYUoEgJJ4cLSaUI/cpnVOL59pw53NEg==",
       "dev": true,
       "dependencies": {
         "@quasar/render-ssr-error": "^1.0.3",
@@ -457,7 +509,7 @@
         "express": "^4.17.3",
         "fast-glob": "3.2.12",
         "fs-extra": "^11.1.0",
-        "html-minifier": "^4.0.0",
+        "html-minifier-terser": "^7.2.0",
         "inquirer": "^8.2.1",
         "isbinaryfile": "^5.0.0",
         "kolorist": "^1.5.1",
@@ -486,6 +538,7 @@
         "url": "https://donate.quasar.dev"
       },
       "peerDependencies": {
+        "@electron/packager": ">= 18",
         "electron-builder": ">= 22",
         "electron-packager": ">= 15",
         "eslint": "^8.11.0",
@@ -497,6 +550,9 @@
         "workbox-build": ">= 6"
       },
       "peerDependenciesMeta": {
+        "@electron/packager": {
+          "optional": true
+        },
         "electron-builder": {
           "optional": true
         },
@@ -1875,6 +1931,12 @@
         "node": "*"
       }
     },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
     "node_modules/bundle-name": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz",
@@ -1955,13 +2017,13 @@
       }
     },
     "node_modules/camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
       "dev": true,
       "dependencies": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
       }
     },
     "node_modules/camelcase": {
@@ -2058,15 +2120,15 @@
       }
     },
     "node_modules/clean-css": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
-      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
       "dev": true,
       "dependencies": {
         "source-map": "~0.6.0"
       },
       "engines": {
-        "node": ">= 4.0"
+        "node": ">= 10.0"
       }
     },
     "node_modules/cli-boxes": {
@@ -2198,10 +2260,13 @@
       }
     },
     "node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      }
     },
     "node_modules/compress-commons": {
       "version": "4.1.2",
@@ -2674,6 +2739,16 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "node_modules/dot-prop": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
@@ -4148,25 +4223,25 @@
         "he": "bin/he"
       }
     },
-    "node_modules/html-minifier": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz",
-      "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==",
+    "node_modules/html-minifier-terser": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
+      "integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==",
       "dev": true,
       "dependencies": {
-        "camel-case": "^3.0.0",
-        "clean-css": "^4.2.1",
-        "commander": "^2.19.0",
-        "he": "^1.2.0",
-        "param-case": "^2.1.1",
+        "camel-case": "^4.1.2",
+        "clean-css": "~5.3.2",
+        "commander": "^10.0.0",
+        "entities": "^4.4.0",
+        "param-case": "^3.0.4",
         "relateurl": "^0.2.7",
-        "uglify-js": "^3.5.1"
+        "terser": "^5.15.1"
       },
       "bin": {
-        "html-minifier": "cli.js"
+        "html-minifier-terser": "cli.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^14.13.1 || >=16.0.0"
       }
     },
     "node_modules/http-cache-semantics": {
@@ -4976,10 +5051,13 @@
       }
     },
     "node_modules/lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
-      "dev": true
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
     },
     "node_modules/lowercase-keys": {
       "version": "3.0.0",
@@ -5198,12 +5276,13 @@
       }
     },
     "node_modules/no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
       "dev": true,
       "dependencies": {
-        "lower-case": "^1.1.1"
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
       }
     },
     "node_modules/node-forge": {
@@ -5462,12 +5541,13 @@
       }
     },
     "node_modules/param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
       "dev": true,
       "dependencies": {
-        "no-case": "^2.2.0"
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
       }
     },
     "node_modules/parent-module": {
@@ -5491,6 +5571,16 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "node_modules/path-browserify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
@@ -6552,6 +6642,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
     "node_modules/stack-trace": {
       "version": "1.0.0-pre2",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-1.0.0-pre2.tgz",
@@ -6727,6 +6827,30 @@
         "node": ">=6"
       }
     },
+    "node_modules/terser": {
+      "version": "5.31.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz",
+      "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "bin": {
+        "terser": "bin/terser"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/terser/node_modules/commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
+    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -6876,18 +7000,6 @@
         "node": ">=4.2.0"
       }
     },
-    "node_modules/uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
-      "dev": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/unique-string": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz",
@@ -7000,12 +7112,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
-      "dev": true
-    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -7830,11 +7936,54 @@
         "source-map": "0.6.1"
       }
     },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.2.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true
+    },
+    "@jridgewell/set-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "dev": true
+    },
+    "@jridgewell/source-map": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz",
+      "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25"
+      }
+    },
     "@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
       "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -7896,9 +8045,9 @@
       }
     },
     "@quasar/app-vite": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@quasar/app-vite/-/app-vite-1.8.0.tgz",
-      "integrity": "sha512-/2HzIYqjm8AayyEeQq7zJnTiZZUQzHFCwEdIms8l+Po7Lhx4a7MXT7VCfR1M1KHGO0Z/EXItpjYwGryo/XNFoA==",
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/@quasar/app-vite/-/app-vite-1.8.5.tgz",
+      "integrity": "sha512-OB5nU9qKIl3p7Ton9fLWkSQTv1I/7slfQl8izhZPPJZRY755Jn4Kz1exYUoEgJJ4cLSaUI/cpnVOL59pw53NEg==",
       "dev": true,
       "requires": {
         "@quasar/render-ssr-error": "^1.0.3",
@@ -7920,7 +8069,7 @@
         "express": "^4.17.3",
         "fast-glob": "3.2.12",
         "fs-extra": "^11.1.0",
-        "html-minifier": "^4.0.0",
+        "html-minifier-terser": "^7.2.0",
         "inquirer": "^8.2.1",
         "isbinaryfile": "^5.0.0",
         "kolorist": "^1.5.1",
@@ -8924,6 +9073,12 @@
       "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true
     },
+    "buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
     "bundle-name": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz",
@@ -8980,13 +9135,13 @@
       "dev": true
     },
     "camel-case": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
-      "integrity": "sha512-+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
       "dev": true,
       "requires": {
-        "no-case": "^2.2.0",
-        "upper-case": "^1.1.1"
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
       }
     },
     "camelcase": {
@@ -9040,9 +9195,9 @@
       "dev": true
     },
     "clean-css": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz",
-      "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
@@ -9140,9 +9295,9 @@
       }
     },
     "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
       "dev": true
     },
     "compress-commons": {
@@ -9486,6 +9641,16 @@
         "esutils": "^2.0.2"
       }
     },
+    "dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "dot-prop": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-6.0.1.tgz",
@@ -10463,19 +10628,19 @@
       "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true
     },
-    "html-minifier": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz",
-      "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==",
+    "html-minifier-terser": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-7.2.0.tgz",
+      "integrity": "sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==",
       "dev": true,
       "requires": {
-        "camel-case": "^3.0.0",
-        "clean-css": "^4.2.1",
-        "commander": "^2.19.0",
-        "he": "^1.2.0",
-        "param-case": "^2.1.1",
+        "camel-case": "^4.1.2",
+        "clean-css": "~5.3.2",
+        "commander": "^10.0.0",
+        "entities": "^4.4.0",
+        "param-case": "^3.0.4",
         "relateurl": "^0.2.7",
-        "uglify-js": "^3.5.1"
+        "terser": "^5.15.1"
       }
     },
     "http-cache-semantics": {
@@ -11069,10 +11234,13 @@
       }
     },
     "lower-case": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
-      "integrity": "sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==",
-      "dev": true
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
+      "requires": {
+        "tslib": "^2.0.3"
+      }
     },
     "lowercase-keys": {
       "version": "3.0.0",
@@ -11225,12 +11393,13 @@
       "dev": true
     },
     "no-case": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
-      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
       "dev": true,
       "requires": {
-        "lower-case": "^1.1.1"
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
       }
     },
     "node-forge": {
@@ -11411,12 +11580,13 @@
       }
     },
     "param-case": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
-      "integrity": "sha512-eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
       "dev": true,
       "requires": {
-        "no-case": "^2.2.0"
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
       }
     },
     "parent-module": {
@@ -11434,6 +11604,16 @@
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true
     },
+    "pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dev": true,
+      "requires": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
     "path-browserify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
@@ -12187,6 +12367,16 @@
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
       "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg=="
     },
+    "source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
     "stack-trace": {
       "version": "1.0.0-pre2",
       "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-1.0.0-pre2.tgz",
@@ -12309,6 +12499,26 @@
         "readable-stream": "^3.1.1"
       }
     },
+    "terser": {
+      "version": "5.31.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz",
+      "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
+        "commander": "^2.20.0",
+        "source-map-support": "~0.5.20"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.20.3",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
+        }
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -12420,12 +12630,6 @@
       "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "devOptional": true
     },
-    "uglify-js": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
-      "dev": true
-    },
     "unique-string": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz",
@@ -12493,12 +12697,6 @@
         }
       }
     },
-    "upper-case": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
-      "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==",
-      "dev": true
-    },
     "uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",

From fbfbfb77be986175dfc95ca5f56a0b3a628af337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jona=20Kl=C3=A4=C3=9F?= <jonaklaess@gmail.com>
Date: Sun, 5 May 2024 21:58:09 +0200
Subject: [PATCH 3/5] now able to create chats with multiple users

---
 src/components/ProtectedData.vue | 72 ++++++++++++++++++++++++++++++--
 src/stores/chat-store.ts         | 12 ++++++
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/src/components/ProtectedData.vue b/src/components/ProtectedData.vue
index a096b8a..1c99b11 100644
--- a/src/components/ProtectedData.vue
+++ b/src/components/ProtectedData.vue
@@ -19,10 +19,25 @@ export default defineComponent({
     const userLoaded = ref(false);
 
     const chatName = ref('');
+    const userSearch = ref('');
 
     const chats = ref([] as chat[]);
     const chatsLoaded = ref(false);
 
+    const matchingUsers = ref([] as ptpUser[]);
+    const usersForChat = ref([] as string[]);
+
+    const usersForChatOptions = ref([] as {label: string, value: string}[]);
+    const updateUsersForChatOptions = async () =>{
+      if(!usersLoaded.value){
+        await loadUsers();
+      }
+      usersForChatOptions.value = users.value
+        .filter((u, index) => u.keycloakID !== user.value.keycloakID && index < 5)
+        .map((u) => {
+        return {label: u.firstName + ' ' + u.lastName, value: u.keycloakID};
+      });
+    }
 
     const logout = () => {
       userStore.logout();
@@ -34,10 +49,13 @@ export default defineComponent({
       await userStore.loadAllUsers();
       usersLoaded.value = true;
       users.value = userStore.users;
-    }
+    };
 
     const createChat = async(chatName: string)=>{
-      await chatStore.createChat(chatName, userStore.users.map(u => u.keycloakID));
+      if(chatName == ""){
+        chatName = "Chat";
+      }
+      await chatStore.createChat(chatName, usersForChat.value);
     }
 
     const loadChats = async() => {
@@ -48,7 +66,7 @@ export default defineComponent({
       usersLoaded.value = true;
       console.log(users.value);
       console.log(chats.value);
-    }
+    };
     onMounted(async () => {
       userLoaded.value = userStore.userLoaded;
       user.value = userStore.user;
@@ -70,6 +88,12 @@ export default defineComponent({
       loadChats,
       chats,
       chatsLoaded,
+
+      userSearch,
+      matchingUsers,
+      usersForChatOptions,
+      usersForChat,
+      updateUsersForChatOptions,
     };
   },
 })
@@ -96,7 +120,45 @@ export default defineComponent({
     </div>
   </div>
   <br>
-  <q-input v-model="chatName" label="Chat Name" clearable />
+  <q-input
+    v-model="chatName"
+    label="Chat Name"
+    clearable
+  />
+  <div class="q-gutter-y-md" style="max-width: 300px">
+    <q-input
+      standout
+      bottom-slots
+      v-model="userSearch"
+      label="Search User"
+      clearable
+      filled
+      color="orange"
+      @update:model-value="updateUsersForChatOptions()"
+    >
+      <template v-slot:after>
+        <q-btn
+          round
+          dense
+          flat
+          icon="search"
+          @click="updateUsersForChatOptions()"
+        />
+      </template>
+    </q-input>
+  </div>
+  <div class="q-pa-lg">
+    <q-option-group
+      v-model="usersForChat"
+      rules="[val => val.length > 0 || 'Please select at least one user']"
+      :options="usersForChatOptions"
+      type="checkbox"
+      color="primary"
+      inline
+    >
+
+    </q-option-group>
+  </div>
   <q-btn @click="createChat(chatName)" label="Create Chat"/>
   <br>
   <q-btn @click="loadChats()" label="Load Chats"/>
@@ -109,6 +171,8 @@ export default defineComponent({
       </div>
     </div>
   </div>
+
+
 </template>
 
 <style scoped>
diff --git a/src/stores/chat-store.ts b/src/stores/chat-store.ts
index 297f64f..6295501 100644
--- a/src/stores/chat-store.ts
+++ b/src/stores/chat-store.ts
@@ -21,6 +21,18 @@ export const useChatStore = defineStore('chatStore',{
       return this.chats;
     },
     async createChat(chatName: string, members: string[]){
+      if(userStore.keycloakId) {
+        console.log("keycloakId is defined");
+        if (!members.includes(userStore.keycloakId)) {
+          members.push(userStore.keycloakId);
+        }
+      }else if(userStore.user?.keycloakID){
+        console.log("user is defined");
+        if (! members.includes(userStore.user.keycloakID)) {
+          members.push(userStore.user.keycloakID);
+        }
+      }
+      console.log(members);
       return (await api.post("/chats/create/" + chatName, members)).data;
     }
   }

From ec91c9f04a4ed80fa45c1352af224d90bbe60662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jona=20Kl=C3=A4=C3=9F?= <jonaklaess@gmail.com>
Date: Fri, 10 May 2024 15:24:19 +0200
Subject: [PATCH 4/5] updated db structure

---
 src/components/ProtectedData.vue | 14 +++++++-------
 src/main.ts                      | 11 +++--------
 src/models.ts                    |  5 ++---
 src/stores/chat-store.ts         | 16 +++++++---------
 src/stores/user-store.ts         | 10 +++++-----
 5 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/components/ProtectedData.vue b/src/components/ProtectedData.vue
index 1c99b11..43c8976 100644
--- a/src/components/ProtectedData.vue
+++ b/src/components/ProtectedData.vue
@@ -33,9 +33,9 @@ export default defineComponent({
         await loadUsers();
       }
       usersForChatOptions.value = users.value
-        .filter((u, index) => u.keycloakID !== user.value.keycloakID && index < 5)
+        .filter((u, index) => u.id !== user.value.id && index < 5)
         .map((u) => {
-        return {label: u.firstName + ' ' + u.lastName, value: u.keycloakID};
+        return {label: u.firstName + ' ' + u.lastName, value: u.id};
       });
     }
 
@@ -106,17 +106,17 @@ export default defineComponent({
     <p>{{ user.firstName }}</p>
     <p>{{ user.lastName }}</p>
     <p>{{ user.username }}</p>
-    <p>{{ user.keycloakID }}</p>
+    <p>{{ user.id }}</p>
   </div>
   <q-btn @click="logout()" label="Logout"/>
   <q-btn @click="loadUsers()" label="Print Users"/>
   <div v-if="usersLoaded">
     <p>Users:</p>
-    <div v-for="user in users" :key="user.keycloakID">
+    <div v-for="user in users" :key="user.id">
       <p>{{ user.firstName }}</p>
       <p>{{ user.lastName }}</p>
       <p>{{ user.username }}</p>
-      <p>{{ user.keycloakID }}</p>
+      <p>{{ user.id }}</p>
     </div>
   </div>
   <br>
@@ -166,8 +166,8 @@ export default defineComponent({
     <p>Chats:</p>
     <div v-for="chat in chats" :key="chat.id">
       <h5>{{ chat.displayName }}</h5>
-      <div v-for="ptpUser in chat.members" :key="ptpUser.keycloakID">
-        <p>{{ ptpUser.keycloakID }}</p>
+      <div v-for="ptpUser in chat.members" :key="ptpUser.id">
+        <p>{{ ptpUser.id }}</p>
       </div>
     </div>
   </div>
diff --git a/src/main.ts b/src/main.ts
index b7024a8..06f019a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,14 +18,9 @@ const keycloak: Keycloak = await userStore.initKeycloak();
 // Anfrage ans Backend
 
 if (keycloak.subject) {
-  userStore.keycloakId = keycloak.subject;
-  //userStore.loadPtpUsersByKeycloakID(keycloak.subject);
-  await userStore.getPtpUserByKeycloakID(keycloak.subject);
-  /*console.log(userStore.userLoaded);
-  if(userStore.userLoaded) {
-    console.log("Hier ist der Bruder: " + JSON.stringify(userStore.user));
-  }*/
-  userStore.loadPtpUsersByKeycloakID(keycloak.subject).then(user  => {
+  userStore.id = keycloak.subject;
+  await userStore.getPtpUserById(keycloak.subject);
+  userStore.loadPtpUsersById(keycloak.subject).then(user  => {
     console.log(JSON.stringify(user));
   })
 } else {
diff --git a/src/models.ts b/src/models.ts
index cde9182..3357866 100644
--- a/src/models.ts
+++ b/src/models.ts
@@ -1,5 +1,5 @@
 export interface ptpUser {
-  keycloakID: string;
+  id: string;
   firstName: string;
   lastName: string;
   username: string;
@@ -19,8 +19,7 @@ export interface chat{
 }
 
 export interface user{
-  id: number;
-  keycloakID: string;
+  id: string;
   firstName: string;
   lastName: string;
   username: string;
diff --git a/src/stores/chat-store.ts b/src/stores/chat-store.ts
index 6295501..9b7a8f6 100644
--- a/src/stores/chat-store.ts
+++ b/src/stores/chat-store.ts
@@ -17,19 +17,17 @@ export const useChatStore = defineStore('chatStore',{
       return this.chats;
     },
     async loadChatsByUser() : Promise<chat[]>{
-      this.chats = (await api.get("/users/chat/" + userStore.keycloakId)).data.response;
+      this.chats = (await api.get("/users/chat/" + userStore.id)).data.response;
       return this.chats;
     },
     async createChat(chatName: string, members: string[]){
-      if(userStore.keycloakId) {
-        console.log("keycloakId is defined");
-        if (!members.includes(userStore.keycloakId)) {
-          members.push(userStore.keycloakId);
+      if(userStore.id) {
+        if (!members.includes(userStore.id)) {
+          members.push(userStore.id);
         }
-      }else if(userStore.user?.keycloakID){
-        console.log("user is defined");
-        if (! members.includes(userStore.user.keycloakID)) {
-          members.push(userStore.user.keycloakID);
+      }else if(userStore.user?.id){
+        if (! members.includes(userStore.user.id)) {
+          members.push(userStore.user.id);
         }
       }
       console.log(members);
diff --git a/src/stores/user-store.ts b/src/stores/user-store.ts
index 040ff54..0744ed0 100644
--- a/src/stores/user-store.ts
+++ b/src/stores/user-store.ts
@@ -31,18 +31,18 @@ export const useUserStore = defineStore('userStore', {
     user: null as ptpUser | null,
     userLoaded: false,
     keycloak: null as Keycloak | null,
-    keycloakId: "",
+    id: "",
     users: [] as ptpUser[],
   }),
   actions: {
-    async getPtpUserByKeycloakID(keycloakID : string) {
-      await this.loadPtpUsersByKeycloakID(keycloakID).then((response : responseModel) => {
+    async getPtpUserById(id : string) {
+      await this.loadPtpUsersById(id).then((response : responseModel) => {
         this.user = response.response;
         this.userLoaded = true;
       });
     },
-    async loadPtpUsersByKeycloakID(keycloakID : string) : Promise<responseModel>  {
-      return (await api.get("/users/login/"+keycloakID)).data;
+    async loadPtpUsersById(id : string) : Promise<responseModel>  {
+      return (await api.get("/users/login/"+id)).data;
     },
     async loadAllUsers(): Promise<ptpUser[]> {
       this.users = (await api.get("/users/user")).data;

From 9a92c2e4b12abe99076c71699b4cd0e9530de9b2 Mon Sep 17 00:00:00 2001
From: JonaKl <jonaklaess@gmail.com>
Date: Mon, 13 May 2024 08:09:13 +0200
Subject: [PATCH 5/5] search

---
 src/components/ProtectedData.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/ProtectedData.vue b/src/components/ProtectedData.vue
index 43c8976..9a686f2 100644
--- a/src/components/ProtectedData.vue
+++ b/src/components/ProtectedData.vue
@@ -1,5 +1,5 @@
 <script lang="ts">
-import { defineComponent, onMounted, ref } from 'vue';
+import { defineComponent, onMounted, Ref, ref } from 'vue';
 
 import { useRouter } from 'vue-router';
 import { useUserStore } from 'stores/user-store';
@@ -32,13 +32,26 @@ export default defineComponent({
       if(!usersLoaded.value){
         await loadUsers();
       }
+      console.log(user.value);
+      console.log(users.value);
       usersForChatOptions.value = users.value
-        .filter((u, index) => u.id !== user.value.id && index < 5)
+        .sort((a, b) => compare(a.firstName + ' ' + a.lastName, userSearch) - compare(b.firstName + ' ' + b.lastName, userSearch))
+        .filter((u, index) => u.id != user.value.id && index < 5)
         .map((u) => {
         return {label: u.firstName + ' ' + u.lastName, value: u.id};
       });
     }
 
+    const compare = (a: string, match: Ref<string>): number => {
+      if(a == match.value){
+        return 2;
+      }
+      if(a.includes(match.value)){
+        return 1;
+      }
+      return 0;
+    };
+
     const logout = () => {
       userStore.logout();
       router.push('/');