@hostlink/nuxt-light 1.21.1 → 1.21.3

package/dist/runtime/pages/User/profile.vue

@@ -2,34 +2,43 @@
 import { q, getGQLFields, model } from '#imports'
 import { toQuery } from '@hostlink/light';
 
-const { my } = await q(
-    {
-        my: ["user_id", "username", "first_name", "last_name", "email", "phone", "roles", "addr1", "addr2", "addr3", "join_date", {
-            userLog: {
+const { my } = await q({
+    my: {
+        user_id: true,
+        username: true,
+        first_name: true,
+        last_name: true,
+        email: true,
+        phone: true,
+        roles: true,
+        addr1: true,
+        addr2: true,
+        addr3: true,
+        join_date: true,
+        userLog: {
+            __args: {
+                sort: "userlog_id:desc"
+            },
+            data: {
                 __args: {
-                    sort: "userlog_id:desc"
+                    limit: 10
                 },
-                data: {
-                    __args: {
-                        limit: 10
-                    },
-                    ...toQuery(getGQLFields('UserLog', ['login_dt', 'result', "user_agent"]))
-                }
+                ...toQuery(getGQLFields('UserLog', ['login_dt', 'result', "user_agent"]))
+            }
+        },
+        eventLog: {
+            __args: {
+                sort: "eventlog_id:desc"
             },
-            eventLog: {
+            data: {
                 __args: {
-                    sort: "eventlog_id:desc"
+                    limit: 10
                 },
-                data: {
-                    __args: {
-                        limit: 10
-                    },
-                    ...toQuery(getGQLFields('EventLog', ['class', 'id', 'action', "created_time"]))
-                }
+                ...toQuery(getGQLFields('EventLog', ['class', 'id', 'action', "created_time"]))
             }
-        }]
+        }
     }
-)
+})
 
 const userlogColumns = model('UserLog').columns(['login_dt', 'result', 'user_agent']);
 //remove all searchable
@@ -47,7 +56,6 @@ eventLogCols.forEach(col => {
 </script>
 <template>
     <l-page title="User profile" gutter="sm">
-
         <template #header>
             <l-btn icon="sym_o_password" to="setting/password" label="Update password" />
             <l-btn icon="sym_o_key" to="setting/two-factor-auth" label="Two factor auth" />
@@ -55,9 +63,7 @@ eventLogCols.forEach(col => {
 
         <l-row>
             <l-col md="4">
-
                 <l-card>
-
                     <q-card-section class="text-h5 text-center">
                         {{ my.first_name }} {{ my.last_name }}
                     </q-card-section>

package/dist/runtime/pages/User/setting/index.vue

@@ -1,25 +1,16 @@
 <script setup>
-import { reactive } from "vue"
 import { reset } from "@formkit/core"
-import { q, m, notify } from '../../../'
+import { q, m, notify } from '#imports'
 
-const obj = reactive(await q("my", ["username", "email", "first_name", "last_name"]))
-const save = async () => {
-    try {
-        await m("updateMy", {
-            data: {
-                email: obj.email,
-                first_name: obj.first_name,
-                last_name: obj.last_name
-
-            }
-        });
-        notify("Your profile has been updated")
-
-    } catch (e) {
-        notify(e.message, "red")
+const { my } = await q({
+    my: {
+        username: true,
+        email: true,
+        first_name: true,
+        last_name: true
     }
-}
+})
+
 const onSubmit = async (data, form) => {
     return await m("updateMy", {
         data: {
@@ -34,7 +25,7 @@ const onSubmit = async (data, form) => {
 }
 </script>
 <template>
-    <FormKit type="l-form" :value="obj" :bordered="false" @submit="onSubmit">
+    <FormKit type="l-form" :value="my" :bordered="false" @submit="onSubmit">
         <FormKit type="l-input" label="Username" name="username" readonly></FormKit>
         <FormKit type="l-input" label="Email" name="email" validation="required|email"></FormKit>
         <FormKit type="l-input" label="First name" name="first_name" validation="required"></FormKit>

package/dist/runtime/pages/User/setting/information.vue

@@ -1,7 +1,14 @@
 <script setup>
 import { reset } from "@formkit/core"
-import { q, m, notify } from '../../../'
-const obj = await q("my", ["phone", "addr1", "addr2", "addr3"])
+import { q, m, notify } from '#imports'
+const { my } = await q({
+    my: {
+        phone: true,
+        addr1: true,
+        addr2: true,
+        addr3: true
+    }
+})
 const onSubmit = (data, form) => {
     return m("updateMy", {
         data: {
@@ -17,7 +24,7 @@ const onSubmit = (data, form) => {
 }
 </script>
 <template>
-    <FormKit type="l-form" :value="obj" :bordered="false" @submit="onSubmit">
+    <FormKit type="l-form" :value="my" :bordered="false" @submit="onSubmit">
         <FormKit type="l-input" label="Phone" name="phone"></FormKit>
         <FormKit type="l-input" label="Address1" name="addr1"></FormKit>
         <FormKit type="l-input" label="Address2" name="addr2"></FormKit>

package/dist/runtime/pages/User/setting/style.vue

@@ -1,7 +1,11 @@
 <script setup>
 import { q, m } from '#imports'
 import { reactive } from 'vue'
-let my = await q("my", ["styles"]);
+let { my } = await q({
+    my: {
+        styles: true
+    }
+});
 
 const styles = reactive({
 
@@ -155,8 +159,7 @@ const columns = [
                                         { label: 'A', value: 'a' },
                                         { label: 'B', value: 'b' },
                                         { label: 'C', value: 'c' }
-                                    ]" 
-                                    />
+                                    ]" />
 
                                 <q-table :columns="columns" :rows="[
                                     { name: 'A', phone: '123' },

package/dist/runtime/pages/User/setting/two-factor-auth.vue

@@ -1,12 +1,20 @@
 <script setup>
 import { ref, reactive } from "vue"
 import { useQuasar } from "quasar"
-import { q, m, notify } from '#imports'
+import { q, m } from '#imports'
 const $q = useQuasar()
 
-const my = await q("my", ["twoFactorEnabled"])
-const my2FA = await m("my2FA", [])
-const obj = reactive({});
+const { my } = await q({
+    my: {
+        twoFactorEnabled: true,
+        my2FA: true
+    }
+});
+
+const obj = reactive({
+    code: ""
+});
+
 const save = async () => {
 
     try {
@@ -14,10 +22,15 @@ const save = async () => {
             code: obj.code,
             secret: my2FA.secret
         });
-        notify("Your 2FA has been updated")
-
+        $q.notify({
+            message: "Your 2FA is updated",
+            color: "positive"
+        })
     } catch (e) {
-        notify(e.message, "red")
+        $q.notify({
+            message: e.message,
+            color: "negative"
+        })
     }
 }
 
@@ -31,12 +44,12 @@ const onCopy = () => {
     navigator.clipboard.writeText(my2FA.secret).then(() => {
         $q.notify({
             message: "Secret copied",
-            color: "green",
+            color: "positive",
         })
     }, () => {
         $q.notify({
             message: "Failed to copy",
-            color: "red",
+            color: "negative",
         })
 
     })
@@ -75,9 +88,9 @@ const onCopy = () => {
 
             </p>
         </div>
-        <q-img :src="my2FA.image" width="250px" />
+        <q-img :src="my.my2FA.image" width="250px" />
         <p>
-            Secret : <strong>{{ my2FA.secret }}</strong>
+            Secret : <strong>{{ my.my2FA.secret }}</strong>
 
             <q-btn flat round dense icon="sym_o_content_copy" @click="onCopy" />
         </p>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.21.1",
+  "version": "1.21.3",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",
@@ -45,10 +45,9 @@
     "json-to-graphql-query": "^2.2.5",
     "quasar": "^2.17.0",
     "vue-i18n": "^9.2.2",
-    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz"
   },
   "devDependencies": {
-    "@azure/identity": "^4.5.0",
     "@nuxt/devtools": "latest",
     "@nuxt/eslint-config": "^0.2.0",
     "@nuxt/schema": "^3.7.4",