From 1282d67640693f4a66ef2fbd89699feb10de8e85 Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza7@gmail.com>
Date: Sat, 18 Jan 2025 16:03:16 +0100
Subject: [PATCH] qrcode loading data

---
 frontend/src/layouts/modals/Client.vue |  2 +-
 frontend/src/layouts/modals/QrCode.vue | 36 ++++++++++++++++----------
 frontend/src/views/Clients.vue         |  7 +++--
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/frontend/src/layouts/modals/Client.vue b/frontend/src/layouts/modals/Client.vue
index b033009..528622a 100644
--- a/frontend/src/layouts/modals/Client.vue
+++ b/frontend/src/layouts/modals/Client.vue
@@ -85,7 +85,7 @@
                     chips
                     hide-details>
                     <template v-slot:append>
-                      <v-icon style="cursor: hand;" @click="setAllInbounds" icon="mdi-set-all" v-tooltip:top="$t('all')" />
+                      <v-icon @click="setAllInbounds" icon="mdi-set-all" v-tooltip:top="$t('all')" />
                     </template>
                   </v-select>
                 </v-col>
diff --git a/frontend/src/layouts/modals/QrCode.vue b/frontend/src/layouts/modals/QrCode.vue
index 5c42b9e..0753e1b 100644
--- a/frontend/src/layouts/modals/QrCode.vue
+++ b/frontend/src/layouts/modals/QrCode.vue
@@ -1,6 +1,6 @@
 <template>
   <v-dialog transition="dialog-bottom-transition" width="400">
-    <v-card class="rounded-lg" id="qrcode-modal">
+    <v-card class="rounded-lg" id="qrcode-modal" :loading="loading">
       <v-card-title>
         <v-row>
           <v-col>QrCode</v-col>
@@ -9,7 +9,13 @@
         </v-row>
       </v-card-title>
       <v-divider></v-divider>
-      <v-card-text style="overflow-y: auto; padding: 0">
+      <v-skeleton-loader
+          class="mx-auto border"
+          width="80%"
+          type="text, image, divider, text, image"
+          v-if="loading"
+        ></v-skeleton-loader>
+      <v-card-text style="overflow-y: auto; padding: 0" :hidden="loading">
         <v-tabs
           v-model="tab"
           density="compact"
@@ -24,19 +30,19 @@
             <v-row>
               <v-col style="text-align: center;">
                 <v-chip>{{ $t('setting.sub') }}</v-chip><br />
-                <QrcodeVue :value="clientSub" :size="size" @click="copyToClipboard(clientSub)" :margin="1" style="border-radius: 1rem;" />
+                <QrcodeVue :value="clientSub" :size="size" @click="copyToClipboard(clientSub)" :margin="1" style="border-radius: 1rem; cursor: copy;" />
               </v-col>
             </v-row>
             <v-row>
               <v-col style="text-align: center;">
                 <v-chip>{{ $t('setting.jsonSub') }}</v-chip><br />
-                <QrcodeVue :value="clientSub + '?format=json'" :size="size" @click="copyToClipboard(clientSub + '?format=json')" :margin="1" style="border-radius: 1rem;" />
+                <QrcodeVue :value="clientSub + '?format=json'" :size="size" @click="copyToClipboard(clientSub + '?format=json')" :margin="1" style="border-radius: 1rem; cursor: copy;" />
               </v-col>
             </v-row>
             <v-row>
               <v-col style="text-align: center;">
-                <v-chip>SING-BOX</v-chip><br />
-                <QrcodeVue :value="singbox" :size="size" @click="copyToClipboard(singbox)" :margin="1" style="border-radius: .8rem;" />
+                <v-chip>SING-BOX (scan only)</v-chip><br />
+                <QrcodeVue :value="singbox" :size="size" :margin="1" style="border-radius: .8rem; cursor: not-allowed;" />
               </v-col>
             </v-row>
           </v-window-item>
@@ -44,7 +50,7 @@
             <v-row v-for="l in clientLinks">
               <v-col style="text-align: center;">
                 <v-chip>{{ l.remark?? $t('client.' + l.type) }}</v-chip><br />
-                <QrcodeVue :value="l.uri" :size="size" @click="copyToClipboard(l.uri)" :margin="1" style="border-radius: .5rem;" />
+                <QrcodeVue :value="l.uri" :size="size" @click="copyToClipboard(l.uri)" :margin="1" style="border-radius: .5rem; cursor: copy;" />
               </v-col>
             </v-row>
           </v-window-item>
@@ -62,13 +68,21 @@ import { i18n } from '@/locales'
 import { push } from 'notivue'
 
 export default {
-  props: ['index', 'visible'],
+  props: ['id', 'visible'],
   data() {
     return {
       tab: "sub",
+      client: <any>{},
+      loading: false,
     }
   },
   methods: {
+    async load() {
+      this.loading = true
+      const newData = await Data().loadClients(this.$props.id)
+      this.client = newData
+      this.loading = false
+    },
     copyToClipboard(txt:string) {
       const hiddenButton = document.createElement('button')
       hiddenButton.className = 'clipboard-btn'
@@ -101,11 +115,6 @@ export default {
     }
   },
   computed: {
-    clients() { return Data().clients },
-    client() {
-      if ( typeof this.$props.index != 'number' ) return <any>{}
-      return this.clients[this.$props.index]
-    },
     clientSub() {
       return Data().subURI + this.client.name
     },
@@ -126,6 +135,7 @@ export default {
     visible(v) {
       if (v) {
         this.tab = "sub"
+        this.load()
       }
     },
   },
diff --git a/frontend/src/views/Clients.vue b/frontend/src/views/Clients.vue
index 9454aeb..8db55d9 100644
--- a/frontend/src/views/Clients.vue
+++ b/frontend/src/views/Clients.vue
@@ -20,7 +20,7 @@
   <QrCode
     v-model="qrcode.visible"
     :visible="qrcode.visible"
-    :index="qrcode.index"
+    :id="qrcode.id"
     @close="closeQrCode"
   />
   <Stats
@@ -319,12 +319,11 @@ const delClient = async (id: number) => {
 
 const qrcode = ref({
   visible: false,
-  index: 0,
+  id: 0,
 })
 
 const showQrCode = (id: number) => {
-  const clientIndex = clients.value.findIndex(c => c.id === id)
-  qrcode.value.index = clientIndex
+  qrcode.value.id = id
   qrcode.value.visible = true
 }
 const closeQrCode = () => {