@hostlink/nuxt-light 0.0.12 → 0.0.14

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "0.0.12"
+  "version": "0.0.14"
 }

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

@@ -16,7 +16,7 @@ const to = props.to ?? relativePath + "/add";
 
 </script>
 <template>
-    <q-btn rounded outline color="primary" icon="sym_o_add" :to="to">{{ label }}
+    <q-btn rounded outline color="primary" icon="sym_o_add" :to="to" :label="label">
         <q-tooltip>
             {{ label }}
         </q-tooltip>

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

@@ -1,6 +1,6 @@
 <script setup>
 import { q } from '../light';
-const system = await q("system", ['company', 'companyLogo', 'logged']);
+const { system } = await q({ system: ['company', 'companyLogo', 'logged'] });
 </script>
 <template>
     <q-layout v-if="!system.logged">

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

@@ -1,5 +1,6 @@
 <script setup>
 import { ref, computed } from "vue";
+import { t } from "../light";
 const props = defineProps({
     modelValue: {
         type: [String, Object],

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

@@ -1,6 +1,7 @@
 <script setup>
 import { ref } from "vue";
 import { useRouter, useRoute } from "vue-router";
+import { useQuasar } from "quasar";
 
 const route = useRoute();
 const router = useRouter();
@@ -16,7 +17,6 @@ const props = defineProps({
 const que = useQuasar();
 const emit = defineEmits(["save"]);
 const save = async () => {
-    console.log(form.value)
 
     let valid = await form.value.validate();
     if (!valid) return;

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

@@ -1 +1 @@
-export default function listData(name: string, props?: any, fields?: Array<string>): Promise<any>;
+export default function list(name: string, props?: any, fields?: Array<string>): Promise<any>;

package/dist/runtime/lib/list.mjs

@@ -1,6 +1,6 @@
 import q from "./q.mjs";
 import f from "./f.mjs";
-export default async function listData(name, props = {}, fields = []) {
+export default async function list(name, props = {}, fields = []) {
   let v = {};
   if (props.sort) {
     v.sort = props.sort;
@@ -25,11 +25,11 @@ export default async function listData(name, props = {}, fields = []) {
   let data = await q(`list${name}`, v, [f("data", offset_limit, fs), f("meta", ["total", "key", "name"])]);
   if (props.done) {
     props.done({
-      rows: data[`list${name}`].data,
-      total: data[`list${name}`].meta.total,
-      key: data[`list${name}`].meta.key,
-      name: data[`list${name}`].meta.name
+      rows: data.data,
+      total: data.meta.total,
+      key: data.meta.key,
+      name: data.meta.name
     });
   }
-  return data[`list${name}`][`data`];
+  return data.data;
 }

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

@@ -1 +1 @@
-export default function (operation: string, args: any, fields?: Array<any>): Promise<any>;
+export default function (operation: string | object, args: any, fields?: Array<any>): Promise<any>;

package/dist/runtime/lib/q.mjs

@@ -1,19 +1,42 @@
 import axios from "axios";
 import f from "./f.mjs";
+import { jsonToGraphQLQuery } from "json-to-graphql-query";
+const mapping = function(obj) {
+  let q = {};
+  Object.entries(obj).forEach(([key, value]) => {
+    if (value instanceof Array) {
+      q[key] = {};
+      value.forEach((subField) => {
+        q[key][subField] = true;
+      });
+    } else {
+      q[key] = mapping(value);
+    }
+  });
+  return q;
+};
 export default async function(operation, args, fields = []) {
-  if (arguments.length === 2) {
-    fields = args;
-    args = {};
-  }
-  let service = axios.create({
+  const service = axios.create({
     withCredentials: true
   });
-  const query = f(operation, args, fields);
+  let query;
+  if (operation instanceof Object) {
+    query = jsonToGraphQLQuery(mapping(operation));
+  } else {
+    if (arguments.length === 2) {
+      fields = args;
+      args = {};
+    }
+    query = f(operation, args, fields);
+  }
   const resp = (await service.post("/api/", {
     query: `{ ${query} }`
   })).data;
   if (resp.errors) {
     throw resp.errors[0].message;
   }
+  if (operation instanceof Object) {
+    return resp.data;
+  }
   return resp.data[operation];
 }

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

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

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

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

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

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

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

@@ -1,8 +1,9 @@
 <script setup>
-const app = await q("system", ["phpInfo"])
+import { q } from "../../light"
+const { system } = await q({ system: ["phpInfo"] })
 </script>
 <template>
     <l-page>
-        <iframe :srcdoc="app.phpInfo" style="height: 700px;" class="full-width no-border"></iframe>
+        <iframe :srcdoc="system.phpInfo" style="height: 700px;" class="full-width no-border"></iframe>
     </l-page>
 </template>

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

@@ -1,8 +1,13 @@
 <script setup>
+import { useQuasar } from 'quasar'
+import { useRouter } from 'vue-router'
+import { reactive } from "vue"
+import { q, m } from "../../light"
+
 const router = useRouter()
 const que = useQuasar()
 
-const app = await q("app", [f("config", ["name", "value"])])
+const { app } = await q({ app: { config: ["name", "value"] } })
 
 //const system = await q("system", ["passwordPolicy"])
 
@@ -49,6 +54,7 @@ const onSave = async () => {
 <template>
     <l-page>
 
+        {{ test }}
         <l-form @save="onSave">
             <l-input label="Company" v-model="obj.company"></l-input>
             <l-input label="Company logo" v-model="obj.company_logo"></l-input>
@@ -63,6 +69,6 @@ const onSave = async () => {
                     false-value="0"></q-checkbox>
             </q-field>
 
-                 </l-form>
+        </l-form>
     </l-page>
 </template>

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

@@ -1,4 +1,7 @@
 <script setup>
+import { list } from "../../light"
+import { useRouter } from "vue-router"
+
 let users = await list("User", {
     fields: [
         "user_id", "username", "name", "roles"
@@ -41,10 +44,12 @@ const onCickView = async (id) => {
 </script>
 <template>
     <l-page>
+
         <q-table flat :columns="columns" :rows="users">
             <template #body-cell-view="props">
                 <q-td :props="props">
-                    <q-btn rounded outline color="primary" @click="onCickView(props.row.user_id)">view</q-btn>
+                    <q-btn rounded outline color="primary" @click="onCickView(props.row.user_id)" label="view"
+                        icon="sym_o_search"></q-btn>
                 </q-td>
 
             </template>

package/package.json

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