@hostlink/nuxt-light 0.0.18 → 0.0.21

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "0.0.18"
+  "version": "0.0.21"
 }

package/dist/module.mjs

@@ -53,7 +53,7 @@ const module = defineNuxtModule({
       { name: "removeObject", from },
       { name: "t", from },
       { name: "updateObject", from },
-      { name: "viewAs", from }
+      { name: "listObject", from }
     ]);
     addPlugin({
       src: resolver.resolve("./runtime/plugin"),

package/dist/runtime/components/l-app-main.vue

@@ -1,8 +1,8 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useLight, q, getCurrentUser, m } from '../light';
+import { useLight, q, getCurrentUser, m } from '../';
 import { ref, computed, reactive, provide, watch } from 'vue';
-import packageJson from '../../package.json'
+//import packageJson from '../../package.json'
 
 const light = useLight();
 const props = defineProps({
@@ -11,7 +11,7 @@ const props = defineProps({
     }
 });
 
-let app = await q("app", ["menus"]);
+let app = await q("app", ["menus", "viewAsMode"]);
 let my = await q("my", ["styles"]);
 const menus = ref(app.menus)
 
@@ -122,6 +122,11 @@ watch(() => style.color, async (value) => {
     });
 })
 
+const exitViewAs = async () => {
+    await m("cancelViewAs");
+    window.location.reload();
+}
+
 </script>
 
 
@@ -185,6 +190,13 @@ watch(() => style.color, async (value) => {
                                 <q-item-section>{{ $t('View as') }}</q-item-section>
                             </q-item>
 
+                            <q-item v-close-popup v-if="app.viewAsMode" @click="exitViewAs" clickable>
+                                <q-item-section avatar>
+                                    <q-icon name="sym_o_visibility_off" />
+                                </q-item-section>
+                                <q-item-section>{{ $t('Exit view as') }}</q-item-section>
+                            </q-item>
+
                             <q-separator />
 
                             <q-item v-close-popup to="/logout">
@@ -206,7 +218,7 @@ watch(() => style.color, async (value) => {
             @mouseover="isMouseOnDrawer = true">
             <!-- drawer content -->
             <q-scroll-area class="fit">
-                <l-menu v-for="menu in menus" :value="menu" v-if="isAdmin" :dense="style.dense" />
+                <l-menu v-for="menu in menus" :value="menu" :dense="style.dense" />
             </q-scroll-area>
         </q-drawer>
 
@@ -227,7 +239,17 @@ watch(() => style.color, async (value) => {
                         error }}
                 </q-card-section>
             </q-card>
-            <slot :reload="reloadMenu" />
+
+
+            <router-view v-slot="{ Component }">
+                <template v-if="Component">
+                    <suspense>
+                        <component :is="Component" :reloadMenu="reloadMenu"></component>
+                    </suspense>
+                </template>
+            </router-view>
+
+
         </q-page-container>
 
 

package/dist/runtime/components/l-app.vue

@@ -1,17 +1,21 @@
 <script setup>
-import { q } from '../light';
-const { system } = await q({ system: ['company', 'companyLogo', 'logged'] });
+import { q } from '../';
+const { app } = await q({ app: ['company', 'companyLogo', 'logged', 'twoFactorAuthentication'] });
 </script>
 <template>
-    <q-layout v-if="!system.logged">
+    <q-layout v-if="!app.logged">
         <q-page-container class="bg-grey-2" style="color:#1f1f1f">
             <q-page padding>
-                <l-login :company="system.company" :company-logo="system.companyLogo"></l-login>
+                <l-login 
+                :company="app.company" 
+                :company-logo="app.companyLogo"
+                :twoFactorAuthentication="app.twoFactorAuthentication"
+                ></l-login>
             </q-page>
         </q-page-container>
     </q-layout>
 
-    <l-app-main v-else :company="system.company">
+    <l-app-main v-else :company="app.company">
         <slot></slot>
     </l-app-main>
 </template>

package/dist/runtime/components/l-btn.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref } from "vue";
-import { q, f } from "../light";
+import { q, f } from '../';
 const props = defineProps(["permission"]);
 
 const granted = ref(false);

package/dist/runtime/components/l-date-picker.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, computed } from "vue";
-import { t } from "../light";
+import { t } from '../';
 const props = defineProps({
     modelValue: {
         type: [String, Object],
@@ -15,6 +15,10 @@ const props = defineProps({
         type: String,
         default: ""
     },
+    required: {
+        type: Boolean,
+        default: false
+    },
 });
 
 const emit = defineEmits(["update:modelValue"]);
@@ -29,7 +33,6 @@ const localValue = computed({
         return props.modelValue
     },
     set: (value) => {
-        console.log(value);
         popup.value.hide();
         emit('update:modelValue', value)
     }
@@ -38,23 +41,17 @@ const localValue = computed({
 
 const rules = [];
 
-
-
-rules.push((val) => {
-
-    if (props.range) {
-        return;
-    }
-
-    if (props.required) {
+if (props.required && !props.range) {
+    rules.push((val) => {
+        if (!val) {
+            return "Required";
+        }
         //check val is YYYY-MM-DD
         if (!val.match(/^\d{4}-\d{2}-\d{2}$/)) {
             return "Invalid date format";
         }
-
-    }
-    return;
-});
+    });
+}
 
 const localLabel = computed(() => {
 

package/dist/runtime/components/l-file-manager-move.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, computed, watch } from "vue";
-import { q, m } from "../light";
+import { q, m } from '../';
 const emit = defineEmits(["selected"]);
 const data = await q("fsListFolders", { path: "/" }, ["name", "path"]);
 const folders = ref(data);

package/dist/runtime/components/l-file-manager-preview.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { q } from "../light";
+import { q } from '../';
 const props = defineProps(["modelValue"]);
 
 const file = await q("fsFile", {

package/dist/runtime/components/l-file-manager.vue

@@ -3,7 +3,7 @@ import { VariableType } from "json-to-graphql-query";
 import { useI18n } from "vue-i18n";
 import { ref, watch, computed } from 'vue';
 import { useQuasar } from 'quasar';
-import { q } from "../light";
+import { q } from '../';
 
 const quasar = useQuasar();
 const emit = defineEmits(["input", "close"]);

package/dist/runtime/components/l-form.vue

@@ -2,6 +2,7 @@
 import { ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
 import { useQuasar } from "quasar";
+import { addObject, updateObject } from '../';
 
 const route = useRoute();
 const router = useRouter();

package/dist/runtime/components/l-input.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { computed } from "vue";
-import { t } from "../light";
+import { useI18n } from 'vue-i18n';
+const i18n = useI18n();
 
 const props = defineProps({
     modelValue: {
@@ -17,6 +18,10 @@ const props = defineProps({
         type: String,
         default: ""
     },
+    type: {
+        type: String,
+        default: "text"
+    },
 });
 const emit = defineEmits(["update:modelValue"]);
 
@@ -27,6 +32,14 @@ if (props.required) {
     new_rules.push(val => !!val || 'Required.');
 }
 
+if (props.type == "email") {
+    new_rules.push(val => {
+        if (val && !val.match(/^[^\s@]+@[^\s@]+\.[^\s@]+$/)) {
+            return i18n.t("Invalid email format");
+        }
+    });
+}
+
 
 const localValue = computed({
     get: () => props.modelValue,
@@ -35,9 +48,9 @@ const localValue = computed({
 
 const localLabel = computed(() => {
     if (props.required && !localValue.value) {
-        return t(props.label);
+        return i18n.t(props.label);
     }
-    return t(props.label);
+    return i18n.t(props.label);
 
 });
 
@@ -46,5 +59,5 @@ const localLabel = computed(() => {
 
 </script>
 <template>
-    <q-input :label="localLabel" v-model="localValue" hide-bottom-space :rules="new_rules"></q-input>
+    <q-input :label="localLabel" v-model="localValue" hide-bottom-space :rules="new_rules" :type="type"></q-input>
 </template>

package/dist/runtime/components/l-login.vue

@@ -1,16 +1,17 @@
 <script setup>
 import { ref, reactive } from 'vue'
 import { useQuasar } from 'quasar';
-import { login, m } from '../light';
+import { login, m, notify } from '../';
 defineProps({
   company: String,
-  companyLogo: String
+  companyLogo: String,
+  twoFactorAuthentication: Boolean
 
 })
 
 const form1 = ref(null);
 const data = reactive({
-  username: "", password: ""
+  username: "", password: "", code: ""
 });
 
 const qua = useQuasar()
@@ -18,16 +19,11 @@ const submit = async () => {
   if (await form1.value.validate()) {
 
     try {
-      await login(data.username, data.password)
+      await login(data.username, data.password, data.code)
       window.self.location = "/";
     } catch (e) {
-      qua.notify({
-        message: e.message,
-        color: "negative",
-        icon: "sym_o_error",
-        position: "top",
-        timeout: 2000
-      });
+      notify(e.message, "negative");
+
     }
   }
 }
@@ -120,6 +116,8 @@ const forgetPassword = async () => {
           clearable />
         <q-input v-model="data.password" label="Password" required type="password" clearable
           :rules="[v => !!v || 'Password is required']" />
+        <q-input v-if="twoFactorAuthentication" v-model="data.code" label="2FA code" required type="text" clearable>
+        </q-input>
       </q-form>
     </q-card-section>
     <q-card-actions>

package/dist/runtime/components/l-page.vue

@@ -1,5 +1,6 @@
 <script setup>
 import { useRouter, useRoute } from "vue-router"
+import { removeObject, getID } from '../'
 const router = useRouter();
 const route = useRoute();
 
@@ -72,7 +73,8 @@ const title = props.title || route.path.split("/")[1];
 
 const module = route.path.split("/")[1];
 const onDelete = async () => {
-    if (await removeObject(module, route.params.id)) {
+
+    if (await removeObject(module, getID())) {
         router.push(`/${module}`);
     }
 }

package/dist/runtime/components/l-select.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { computed, ref } from "vue";
-import { t } from "../light"
+import { t } from '../'
 const props = defineProps({
 
     rules: {
@@ -29,7 +29,7 @@ const props = defineProps({
 
 if (props.required) {
     props.rules.push((val) => {
-        if (isNumber(val)) {
+        if (Number.isInteger(val)) {
             return;
         }