@hostlink/nuxt-light 0.0.18 → 0.0.21

package/dist/runtime/pages/Permission/add.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { reactive } from 'vue'
-import { q } from "../../light"
+import { q } from '../../'
 import { useRouter } from "vue-router"
 const obj = reactive({
     roles: []

package/dist/runtime/pages/Permission/all.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { reactive } from 'vue'
-import { q, m } from "../../light"
+import { q, m } from '../../'
 const app = await q("app", ["permissions"])
 
 const roles = await q("listRole", ["name", "permissions"])

package/dist/runtime/pages/Permission/index.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { listData } from "../../light";
+import { listData } from '../../';
 const onRequest = async (params) => {
     listData("Permission", params, ["permission_id"]);
 };

package/dist/runtime/pages/Role/add.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { reactive } from 'vue'
-import { q } from "../../light"
+import { q } from '../../'
 const obj = reactive({
     childs: ["Users"],
 })

package/dist/runtime/pages/Role/index.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useQuasar } from 'quasar'
-import { q, m } from "../../light"
+import { q, m } from '../../'
 import { ref } from "vue"
 
 const qua = useQuasar();
@@ -22,7 +22,7 @@ const onDelete = async (role) => {
         persistent: true,
     }).onOk(async () => {
 
-        m("removeRole", { name: role })
+        m("deleteRole", { name: role })
         //refresh
         roles.value = await loadData();
     });

package/dist/runtime/pages/System/database/table.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { q } from "../../../light"
+import { q } from '../../../'
 const { system: { database } } = await q({ system: { database: ["table"] } })
 </script>
 <template>

package/dist/runtime/pages/System/index.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { q } from "../../light"
+import { q } from '../../'
 const system = await q("system", ["server"])
 </script>
 <template>

package/dist/runtime/pages/System/mailtest.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { reactive } from 'vue'
-import { m } from "../../light"
+import { m } from '../../'
 const obj = reactive({})
 
 const onSave = async () => {

package/dist/runtime/pages/System/menu/index.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { reactive, ref, computed, inject } from 'vue';
-import { m, q } from "../../../light";
+import { ref, computed, inject } from 'vue';
+import { m, q } from '../../../'
 import { useQuasar } from 'quasar';
 
 

package/dist/runtime/pages/System/package.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { q } from "../../light"
+import { q } from '../../'
 const { system } = await q({ system: ["package"] })
 </script>
 <template>

package/dist/runtime/pages/System/phpinfo.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { q } from "../../light"
+import { q } from '../../'
 const { system } = await q({ system: ["phpInfo"] })
 </script>
 <template>

package/dist/runtime/pages/System/setting.vue

@@ -2,7 +2,7 @@
 import { useQuasar } from 'quasar'
 import { useRouter } from 'vue-router'
 import { reactive } from "vue"
-import { q, m } from "../../light"
+import { q, m } from '../../'
 
 const router = useRouter()
 const que = useQuasar()
@@ -17,7 +17,7 @@ const obj = reactive(app.config.reduce((acc, cur) => {
 }, {}));
 
 const fields = ["company", "company_logo", "password_upper_case", "password_lower_case", "password_number", "password_special_character",
-    "file_manager_show"];
+    "file_manager_show", "two_factor_authentication"];
 
 //filter out fields that are not in the app.config table
 Object.keys(obj).forEach((key) => {
@@ -69,6 +69,16 @@ const onSave = async () => {
                     false-value="0"></q-checkbox>
             </q-field>
 
+
+            <q-field label="File manager" stack-label>
+                <q-checkbox label="Show" v-model="obj.file_manager_show" true-value="1" false-value="0"></q-checkbox>
+            </q-field>
+
+            <q-field label="Two factor authentication" stack-label>
+                <q-checkbox label="Enable" v-model="obj.two_factor_authentication" true-value="1"
+                    false-value="0"></q-checkbox>
+            </q-field>
+
         </l-form>
     </l-page>
 </template>

package/dist/runtime/pages/System/view_as.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { list } from "../../light"
+import { list, m } from '../../'
 import { useRouter } from "vue-router"
 
 let users = await list("User", {
@@ -36,7 +36,7 @@ let columns = [
 const router = useRouter();
 const onCickView = async (id) => {
 
-    if (await viewAs(id)) {
+    if (await m("viewAs", { user_id: id })) {
         router.back();
     }
 

package/dist/runtime/pages/User/_user_id/change-password.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { q } from "../../../light"
+import { q } from '../../../'
 import { useRouter, useRoute } from "vue-router"
 import { reactive } from "vue"
 const system = await q("system", ["passwordPolicy"]);
@@ -9,22 +9,16 @@ const rules = system.passwordPolicy.map((rule) => {
     switch (s[0]) {
         case "required":
             return (v) => !!v || "Required";
-            break;
         case "containUpper":
             return (v) => /[A-Z]/.test(v) || "Must contain at least one uppercase letter";
-            break;
         case "containLower":
             return (v) => /[a-z]/.test(v) || "Must contain at least one lowercase letter";
-            break;
         case "containNumber":
             return (v) => /[0-9]/.test(v) || "Must contain at least one number";
-            break;
         case "containSpecial":
             return (v) => /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(v) || "Must contain at least one special character";
-            break;
         case "minLength":
             return (v) => v.length >= parseInt(s[1]) || `Must be at least ${s[1]} characters`;
-            break;
     }
 })
 const router = useRouter();

package/dist/runtime/pages/User/_user_id/edit.vue

@@ -1,5 +1,6 @@
 <script setup>
-import { reacttive } from 'vue'
+import { reactive } from 'vue'
+import { getObject } from '../../../'
 const obj = reactive(await getObject(["first_name", "last_name", "email", "phone",
     "addr1", "addr2", "addr3", "join_date", "expiry_date", "status", "language", "default_page"
 ]))
@@ -12,7 +13,7 @@ const obj = reactive(await getObject(["first_name", "last_name", "email", "phone
                 <l-col md="6">
                     <l-input label="First name" v-model="obj.first_name" required />
                     <l-input label="Last name" v-model="obj.last_name" />
-                    <l-input label="Email" v-model="obj.email" required />
+                    <l-input label="Email" v-model="obj.email" required type="email" />
                 </l-col>
                 <l-col md="6">
                     <l-input label="Phone" v-model="obj.phone" />
@@ -33,7 +34,7 @@ const obj = reactive(await getObject(["first_name", "last_name", "email", "phone
                     }, {
                         label: '中文',
                         value: 'zh-hk'
-                    }]" v-model="obj.language" emit-value map-options required></l-select>
+                    }]" v-model="obj.language" required></l-select>
 
                     <l-input label="Default page" v-model="obj.default_page"></l-input>
 

package/dist/runtime/pages/User/_user_id/view.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { getObject } from "../../../light";
-const obj = await getObject(["username", "first_name", "last_name", "email", "phone"]);
+import { getObject } from '../../../';
+const obj = await getObject(["username", "first_name", "last_name", "email", "phone", "roles"]);
 
 </script>
 
@@ -16,6 +16,7 @@ const obj = await getObject(["username", "first_name", "last_name", "email", "ph
                 <l-item label="Last name">{{ obj.last_name }}</l-item>
                 <l-item label="Email">{{ obj.email }}</l-item>
                 <l-item label="Phone">{{ obj.phone }}</l-item>
+                <l-item label="Roles">{{ obj.roles.join(",") }}</l-item>
             </l-list>
         </l-card>
     </l-page>

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

@@ -1,10 +1,13 @@
 <script setup>
 import { reactive } from "vue"
-import { q } from "../../light"
+import { q } from '../../'
 const obj = reactive({
     roles: ['Users'],
-    status: 'Active',
-    language: "en"
+    status: 0,
+    language: "en",
+    //YYYY-MM-DD (today)
+    join_date: new Date().toISOString().substring(0, 10),
+
 })
 
 let roles = await q("listRole", ["name"]);
@@ -25,7 +28,7 @@ roles = roles.map((role) => {
                     <l-input label="Password" v-model="obj.password" required type="password" />
                     <l-input label="First name" v-model="obj.first_name" required />
                     <l-input label="Last name" v-model="obj.last_name" />
-                    <l-input label="Email" v-model="obj.email" required />
+                    <l-input label="Email" v-model="obj.email" required type="email" />
 
                 </l-col>
                 <l-col md="6">
@@ -38,14 +41,21 @@ roles = roles.map((role) => {
                     <l-date-picker label="Join date" v-model="obj.join_date" required />
                     <l-date-picker label="Expiry date" v-model="obj.expiry_date" />
 
-                    <l-select label="Status" :options="['Active', 'Inactve']" v-model="obj.status"></l-select>
+                    <l-select label="Status" :options="[{
+                        label: 'Active',
+                        value: 0
+                    }, {
+                        label: 'Inactive',
+                        value: 1
+                    }]" v-model="obj.status" required></l-select>
+
                     <l-select label="Language" :options="[{
                         label: 'English',
                         value: 'en'
                     }, {
                         label: '中文',
                         value: 'zh-hk'
-                    }]" v-model="obj.language" emit-value map-options></l-select>
+                    }]" v-model="obj.language" emit-value map-options required></l-select>
 
                     <l-input label="Default page" v-model="obj.default_page"></l-input>
 

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

@@ -1,9 +1,9 @@
 <script setup>
-import { listData } from "../../light"
 
+const onRequest = async (request) => {
+    //listData("User", params, ["canDelete", "canUpdate", "canRead", "user_id"]);
 
-const onRequest = async (params) => {
-    listData("User", params, ["canDelete", "canUpdate", "canRead", "user_id"]);
+    request.loadData("User", null, ["user_id"]);
 };
 
 const columns = [

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

@@ -1,5 +1,5 @@
 <script setup>
-import { q } from "../../light"
+import { q } from '../../'
 const my = await q("my", ["username", "first_name", "last_name", "email", "phone", "roles", "addr1", "addr2", "addr3", "join_date"])
 
 </script>

package/dist/runtime/pages/User/setting/bio-auth.vue

@@ -1,6 +1,5 @@
 <script setup>
-import { reactive } from "vue"
-import { q, m, notify } from "../../../light"
+import { q } from '../../../'
 const app = q("app"["hasBioAuth"]);
 </script>
 <template>

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

@@ -1,6 +1,6 @@
 <script setup>
 import { reactive } from "vue"
-import { q, m, notify } from "../../../light"
+import { q, m, notify } from '../../../'
 
 const obj = reactive(await q("my", ["username", "email", "first_name", "last_name"]))
 const save = async () => {

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

@@ -1,6 +1,6 @@
 <script setup>
 import { reactive } from "vue"
-import { q, m, notify } from "../../../light"
+import { q, m, notify } from '../../../'
 const obj = reactive(await q("my", ["phone", "addr1", "addr2", "addr3"]))
 const save = async () => {
     try {

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

@@ -1,6 +1,6 @@
 <script setup>
 import { reactive } from "vue"
-import { q, m, notify } from "../../../light"
+import { q, m, notify } from '../../../'
 
 const obj = reactive({
     old_password: "",

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

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, reactive } from "vue"
-import { q, m, notify } from "../../../light"
+import { q, m, notify } from '../../../'
 
 const my = await q("my", ["twoFactorEnabled"])
 const my2FA = await m("my2FA", [])

package/dist/runtime/pages/UserLog/index.vue

@@ -1,9 +1,4 @@
 <script setup>
-import { listData } from "../../light";
-const onRequest = async (params) => {
-    listData("UserLog", params);
-};
-
 const columns = [
     {
         label: "ID",
@@ -37,18 +32,12 @@ const columns = [
         sortable: true,
         searchable: true,
     },
-
-
-
-
-
 ]
 
 </script>
-
 <template>
     <l-page>
-        <l-table @request="onRequest" :columns="columns" sort-by="login_dt:desc">
+        <l-table @request="$event.loadData('UserLog')" :columns="columns" sort-by="login_dt:desc">
         </l-table>
     </l-page>
 </template>

package/dist/runtime/pages/index.vue

@@ -1,20 +1,14 @@
 <script setup>
-import { inject } from "vue";
-
-
-const reloadMenu = inject('reloadMenu')
-
-const onClick = (parent) => {
-    reloadMenu()
-
-}
+import { q } from '../'
+const my = await q("my", ["name", "email"]); 
 </script>
 <template>
     <q-page padding>
         <l-card>
             <q-card-section>
-                Helloas
-                <q-btn label="click" @click="onClick($parent)"></q-btn>
+                Hello
+
+                {{ my }}
             </q-card-section>
         </l-card>
     </q-page>

package/dist/runtime/pages/logout.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { m } from "../light";
+import { m } from '../'
 await m("logout");
 window.self.location = "/";
 

package/dist/runtime/plugin.mjs

@@ -11,7 +11,7 @@ import message_en from "./locales/en.json";
 import message_zh from "./locales/zh-hk.json";
 import routes from "./routes.mjs";
 localStorage.getItem("locale") || localStorage.setItem("locale", "en");
-import { useLight } from "./light.mjs";
+import { useLight } from "./index.mjs";
 export default defineNuxtPlugin((nuxtApp) => {
   let locale = localStorage.getItem("locale") || "en";
   nuxtApp.vueApp.config.errorHandler = (error) => {

package/dist/runtime/routes.mjs

@@ -101,11 +101,6 @@ function User_setting_index() {
     /* webpackChunkName: "User-setting-index" */ './pages/User/setting/index.vue'
   )
 }
-function User_setting_2fa() {
-  return import(
-    /* webpackChunkName: "User-setting-2fa" */ './pages/User/setting/2fa.vue'
-  )
-}
 function User_setting_bio_auth() {
   return import(
     /* webpackChunkName: "User-setting-bio-auth" */ './pages/User/setting/bio-auth.vue'
@@ -282,11 +277,6 @@ export default [
         path: '',
         component: User_setting_index,
       },
-      {
-        name: 'User-setting-2fa',
-        path: '2fa',
-        component: User_setting_2fa,
-      },
       {
         name: 'User-setting-bio-auth',
         path: 'bio-auth',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "description": "HostLink Nuxt Light Framework",
   "repository": "@hostlink/nuxt-light",
   "license": "MIT",

package/dist/runtime/lib/viewAs.d.ts

@@ -1 +0,0 @@
-export default function viewAs(id: Number): Promise<boolean>;

package/dist/runtime/lib/viewAs.mjs

@@ -1,15 +0,0 @@
-export default async function viewAs(id) {
-  let { data } = await mutation({
-    operation: `viewAs`,
-    variables: {
-      user_id: {
-        value: id,
-        required: true
-      }
-    }
-  });
-  if (data.viewAs) {
-    return true;
-  }
-  return false;
-}

package/dist/runtime/pages/User/setting/2fa.vue

@@ -1,60 +0,0 @@
-<script setup>
-import { reactive } from "vue"
-import { m } from "../../light"
-import { useQuasar } from "quasar";
-const quasar = useQuasar()
-const my2FA = await m("my2FA", [])
-const obj = reactive({});
-const save = async () => {
-
-    try {
-        await m("updateMy2FA", {
-            code: obj.code,
-            secret: my2FA.secret
-        });
-
-    } catch (e) {
-        quasar.notify({
-            message: e.message,
-            type: "negative",
-            position: "top"
-        })
-
-        return
-    }
-}
-
-</script>
-<template>
-    <l-page>
-
-        <l-card>
-            <l-form @save="save">
-
-                <div>
-
-                    <p>
-                        Now download the app and scan the qrcode. Input the code to the
-                        following input and submit
-                    </p>
-                    <p>
-                        For Android user, install
-                        <el-link type="primary" target="_blank"
-                            href="https://play.google.com/store/apps/details?id=com.azure.authenticator">Authenticator</el-link>
-                    </p>
-
-                    <p>
-                        For iOS user, install
-                        <el-link type="primary" target="_blank"
-                            href="https://apps.apple.com/us/app/microsoft-authenticator/id983156458">Authenticator</el-link>
-                    </p>
-                </div>
-                <q-img :src="my2FA.image" width="250px" />
-                <l-input v-model="obj.code" label="Code"
-                    hint="Please scan the QR code with your authenticator app, and enter the code" required />
-            </l-form>
-
-        </l-card>
-
-    </l-page>
-</template>