@hostlink/nuxt-light 0.0.54 → 0.0.56

package/README.md

@@ -1,106 +1,106 @@
-<!--
-Get your module up and running quickly.
-
-Find and replace all on all files (CMD+SHIFT+F):
-- Name: My Module
-- Package name: my-module
-- Description: My new Nuxt module
--->
-
-# My Module
-
-[![npm version][npm-version-src]][npm-version-href]
-[![npm downloads][npm-downloads-src]][npm-downloads-href]
-[![License][license-src]][license-href]
-[![Nuxt][nuxt-src]][nuxt-href]
-
-My new Nuxt module for doing amazing things.
-
-- [✨ &nbsp;Release Notes](/CHANGELOG.md)
-<!-- - [🏀 Online playground](https://stackblitz.com/github/your-org/my-module?file=playground%2Fapp.vue) -->
-<!-- - [📖 &nbsp;Documentation](https://example.com) -->
-
-## Features
-
-<!-- Highlight some of the features your module provide here -->
-- ⛰ &nbsp;Foo
-- 🚠 &nbsp;Bar
-- 🌲 &nbsp;Baz
-
-## Quick Setup
-
-1. Add `my-module` dependency to your project
-
-```bash
-# Using pnpm
-pnpm add -D my-module
-
-# Using yarn
-yarn add --dev my-module
-
-# Using npm
-npm install --save-dev my-module
-```
-
-2. Add `my-module` to the `modules` section of `nuxt.config.ts`
-
-```js
-export default defineNuxtConfig({
-  modules: [
-    'my-module'
-  ]
-})
-```
-
-That's it! You can now use My Module in your Nuxt app ✨
-
-## Development
-
-```bash
-# Install dependencies
-npm install
-
-# Generate type stubs
-npm run dev:prepare
-
-# Develop with the playground
-npm run dev
-
-# Build the playground
-npm run dev:build
-
-# Run ESLint
-npm run lint
-
-# Run Vitest
-npm run test
-npm run test:watch
-
-# Release new version
-npm run release
-```
-
-<!-- Badges -->
-[npm-version-src]: https://img.shields.io/npm/v/my-module/latest.svg?style=flat&colorA=18181B&colorB=28CF8D
-[npm-version-href]: https://npmjs.com/package/my-module
-
-[npm-downloads-src]: https://img.shields.io/npm/dm/my-module.svg?style=flat&colorA=18181B&colorB=28CF8D
-[npm-downloads-href]: https://npmjs.com/package/my-module
-
-[license-src]: https://img.shields.io/npm/l/my-module.svg?style=flat&colorA=18181B&colorB=28CF8D
-[license-href]: https://npmjs.com/package/my-module
-
-[nuxt-src]: https://img.shields.io/badge/Nuxt-18181B?logo=nuxt.js
-[nuxt-href]: https://nuxt.com
-
-
-
-### app.vue
-```html
-<template>
-  <l-app>
-    <NuxtLoadingIndicator />
-    <NuxtPage />
-  </l-app>
-</template>
-```
+<!--
+Get your module up and running quickly.
+
+Find and replace all on all files (CMD+SHIFT+F):
+- Name: nuxt-light
+- Package name: nuxt-light
+- Description: My new Nuxt module
+-->
+
+# nuxt-light
+
+[![npm version][npm-version-src]][npm-version-href]
+[![npm downloads][npm-downloads-src]][npm-downloads-href]
+[![License][license-src]][license-href]
+[![Nuxt][nuxt-src]][nuxt-href]
+
+This is a Hostlink nuxt-light framework for Nuxt.
+
+- [✨ &nbsp;Release Notes](/CHANGELOG.md)
+<!-- - [🏀 Online playground](https://stackblitz.com/github/your-org/nuxt-light?file=playground%2Fapp.vue) -->
+<!-- - [📖 &nbsp;Documentation](https://example.com) -->
+
+## Features
+
+<!-- Highlight some of the features your module provide here -->
+- HostLink nuxt-light framework
+
+## Quick Setup
+
+1. Add `nuxt-light` dependency to your project
+
+```bash
+# Using npm
+npm install --save-dev @hostlink/nuxt-light
+```
+
+2. Add `@hostlink/nuxt-light` to the `modules` section of `nuxt.config.ts`
+
+```js
+import pkg from './package.json'
+export default defineNuxtConfig({
+  runtimeConfig: {
+    public: {
+      //apiBase: 'your-api-base-url'
+      appVersion: pkg.version
+    }
+  },
+  ssr:false,
+  modules: [
+    '@hostlink/nuxt-light'
+  ]
+})
+```
+
+That's it! You can now use nuxt-light in your Nuxt app ✨
+
+## Development
+
+```bash
+# Install dependencies
+npm install
+
+# Generate type stubs
+npm run dev:prepare
+
+# Develop with the playground
+npm run dev
+
+# Build the playground
+npm run dev:build
+
+# Run ESLint
+npm run lint
+
+# Run Vitest
+npm run test
+npm run test:watch
+
+# Release new version
+npm run release
+```
+
+<!-- Badges -->
+[npm-version-src]: https://img.shields.io/npm/v/@hostlink/nuxt-light/latest.svg?style=flat&colorA=18181B&colorB=28CF8D
+[npm-version-href]: https://npmjs.com/package/@hostlink/nuxt-light
+
+[npm-downloads-src]: https://img.shields.io/npm/dm/@hostlink/nuxt-light.svg?style=flat&colorA=18181B&colorB=28CF8D
+[npm-downloads-href]: https://npmjs.com/package/@hostlink/nuxt-light
+
+[license-src]: https://img.shields.io/npm/l/@hostlink/nuxt-light.svg?style=flat&colorA=18181B&colorB=28CF8D
+[license-href]: https://npmjs.com/package/@hostlink/nuxt-light
+
+[nuxt-src]: https://img.shields.io/badge/Nuxt-18181B?logo=nuxt.js
+[nuxt-href]: https://nuxt.com
+
+
+
+### app.vue
+```html
+<template>
+  <l-app>
+    <NuxtLoadingIndicator />
+    <NuxtPage />
+  </l-app>
+</template>
+```

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "0.0.54"
+  "version": "0.0.56"
 }

package/dist/module.mjs

@@ -45,7 +45,6 @@ const module = defineNuxtModule({
       { name: "id", from },
       { name: "list", from },
       { name: "listData", from },
-      { name: "login", from },
       { name: "m", from },
       { name: "mutation", from },
       { name: "q", from },

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

@@ -3,6 +3,13 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useLight, q, getCurrentUser, m, f } from '../';
 import { ref, computed, reactive, provide, watch } from 'vue';
+import { useRuntimeConfig } from 'nuxt/app';
+
+
+const config = useRuntimeConfig();
+
+const appVersion = config.public.appVersion ?? '0.0.1';
+
 
 const quasar = useQuasar();
 quasar.dark.set(false);
@@ -19,7 +26,6 @@ const tt = await q({
     my: ["styles", "language", f('granted_storage:granted', { right: "system.storage" }, [])],
 })
 
-const allTranslate = ref(await q("allTranslate", []))
 
 let app = tt.app
 let my = tt.my
@@ -35,15 +41,14 @@ const menus = ref(app.menus)
 const i18n = useI18n();
 i18n.locale = my.language || 'en';
 
-const messages = i18n.messages.value[i18n.locale];
+let messages = i18n.messages.value[i18n.locale];
 
-for (const translate of allTranslate.value) {
-    messages[translate.name] = translate[my.language]
+for (let t of app.i18nMessages) {
+    messages[t.name] = t.value;
 }
 
 i18n.setLocaleMessage(i18n.locale, messages);
 
-
 const user = ref(await getCurrentUser());
 
 const leftDrawerOpen = ref(false)
@@ -338,7 +343,7 @@ const storageUsagePercent = computed(() => {
         <q-footer class="bg-white text-grey" bordered>
             <q-item>
                 <q-item-section>
-                    {{ company }} {{ light.getVersion() }} - Copyright 2023 HostLink(HK)
+                    {{ company }} {{ appVersion }} - Copyright 2023 HostLink(HK). Build {{ light.getVersion() }}
                 </q-item-section>
             </q-item>
         </q-footer>

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

@@ -1,5 +1,11 @@
 <script setup>
+import { useRuntimeConfig } from 'nuxt/app';
+import { setApiUrl } from '@hostlink/light'
 import { q } from '../';
+const config = useRuntimeConfig();
+setApiUrl(config?.public?.apiBase ?? '/api/');
+
+
 const { app } = await q({ app: ['company', 'companyLogo', 'logged', 'twoFactorAuthentication'] });
 </script>
 <template>

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 '../';
+import { q, m } from '../';
 
 const i18n = useI18n();
 const quasar = useQuasar();

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

@@ -2,7 +2,10 @@
 import { ref, reactive } from 'vue'
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { login, m, notify } from '../';
+import { m, notify } from '../';
+
+import { login } from '@hostlink/light';
+
 
 defineProps({
   company: String,

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

@@ -20,7 +20,7 @@ if (typeof props.value === "number") {
 
 </script>
 <template>
-    <div>
+    <div class="q-pa-sm">
         <div class="row">
             {{ title }}
         </div>

package/dist/runtime/index.d.ts

@@ -7,4 +7,4 @@ interface Light {
     getVersion(): string;
 }
 export declare function useLight(): Light;
-export { notify, addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, login, m, mutation, q, removeObject, t, updateObject, getID, deleteObject, listObject, getApiBase } from "./lib";
+export { notify, addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, m, mutation, q, removeObject, t, updateObject, getID, deleteObject, listObject, getApiBase } from "./lib";

package/dist/runtime/index.mjs

@@ -39,7 +39,6 @@ export {
   id,
   list,
   listData,
-  login,
   m,
   mutation,
   q,

package/dist/runtime/lib/f.mjs

@@ -1,4 +1,5 @@
 import { jsonToGraphQLQuery } from "json-to-graphql-query";
+import toJson from "./toJson.mjs";
 export default function(operation, args, fields = []) {
   if (arguments.length === 2) {
     fields = args;
@@ -15,11 +16,8 @@ export default function(operation, args, fields = []) {
     if (typeof field === "string") {
       query[operation][field] = true;
     } else if (typeof field === "object") {
-      Object.entries(field).forEach(([key, value]) => {
-        query[operation][key] = {};
-        value.forEach((subField) => {
-          query[operation][key][subField] = true;
-        });
+      Object.entries(toJson(field)).forEach(([key, value]) => {
+        query[operation][key] = value;
       });
     }
   });

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

@@ -6,7 +6,6 @@ import getObject from "./getObject";
 import id from "./id";
 import list from "./list";
 import listData from "./listData";
-import login from "./login";
 import m from "./m";
 import mutation from "./mutation";
 import q from "./q";
@@ -19,4 +18,4 @@ import isGranted from "./isGranted";
 declare const notify: (message: string, color?: string) => void;
 import getID from "./getID";
 declare const getApiBase: () => {};
-export { addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, login, m, mutation, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject, isGranted, getApiBase };
+export { addObject, f, getApiUrl, getCurrentUser, getObject, id, list, listData, m, mutation, q, removeObject, t, updateObject, notify, getID, deleteObject, listObject, isGranted, getApiBase };

package/dist/runtime/lib/index.mjs

@@ -8,7 +8,6 @@ import getObject from "./getObject.mjs";
 import id from "./id.mjs";
 import list from "./list.mjs";
 import listData from "./listData.mjs";
-import login from "./login.mjs";
 import m from "./m.mjs";
 import mutation from "./mutation.mjs";
 import q from "./q.mjs";
@@ -39,7 +38,6 @@ export {
   id,
   list,
   listData,
-  login,
   m,
   mutation,
   q,

package/dist/runtime/lib/m.mjs

@@ -1,9 +1,7 @@
 import axios from "axios";
 import { jsonToGraphQLQuery } from "json-to-graphql-query";
-import { useRuntimeConfig } from "nuxt/app";
 import { getApiBase } from "./index.mjs";
 export default async function(operation, args, fields = []) {
-  const config = useRuntimeConfig();
   const mutation = {
     mutation: {}
   };

package/dist/runtime/lib/q.mjs

@@ -1,36 +1,15 @@
 import axios from "axios";
 import f from "./f.mjs";
 import { jsonToGraphQLQuery } from "json-to-graphql-query";
-import { useRuntimeConfig } from "nuxt/app";
 import { getApiBase } from "./index.mjs";
-const mapping = function(obj) {
-  let q = {};
-  Object.entries(obj).forEach(([key, value]) => {
-    if (value instanceof Array) {
-      q[key] = {};
-      value.forEach((subField) => {
-        if (subField instanceof Object) {
-          Object.entries(mapping(subField)).forEach(([subKey, subValue]) => {
-            q[key][subKey] = subValue;
-          });
-        } else {
-          q[key][subField] = true;
-        }
-      });
-    } else {
-      q[key] = mapping(value);
-    }
-  });
-  return q;
-};
+import toJson from "./toJson.mjs";
 export default async function(operation, args, fields = []) {
-  const config = useRuntimeConfig();
   const service = axios.create({
     withCredentials: true
   });
   let query;
   if (operation instanceof Object) {
-    query = jsonToGraphQLQuery(mapping(operation));
+    query = jsonToGraphQLQuery(toJson(operation));
   } else {
     if (arguments.length === 2) {
       fields = args;

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

@@ -0,0 +1,2 @@
+declare const mapping: (obj: object) => any;
+export default mapping;

package/dist/runtime/lib/toJson.mjs

@@ -0,0 +1,21 @@
+const mapping = function(obj) {
+  let q = {};
+  Object.entries(obj).forEach(([key, value]) => {
+    if (value instanceof Array) {
+      q[key] = {};
+      value.forEach((subField) => {
+        if (subField instanceof Object) {
+          Object.entries(mapping(subField)).forEach(([subKey, subValue]) => {
+            q[key][subKey] = subValue;
+          });
+        } else {
+          q[key][subField] = true;
+        }
+      });
+    } else {
+      q[key] = mapping(value);
+    }
+  });
+  return q;
+};
+export default mapping;

package/dist/runtime/pages/logout.vue

@@ -1,7 +1,8 @@
 <script setup>
-import { m } from '../'
-await m("logout");
 
+import { logout } from '@hostlink/light';
+
+await logout();
 const href = window.self.location.href;
 
 const url = new URL(href);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "0.0.54",
+  "version": "0.0.56",
   "description": "HostLink Nuxt Light Framework",
   "repository": "@hostlink/nuxt-light",
   "license": "MIT",
@@ -35,6 +35,7 @@
   },
   "dependencies": {
     "@formkit/inputs": "^1.1.0",
+    "@hostlink/light": "^0.0.6",
     "@nuxt/kit": "^3.7.0",
     "@quasar/extras": "^1.16.6",
     "axios": "^1.5.0",

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

@@ -1,2 +0,0 @@
-declare const _default: (username: string, password: string, code?: string) => Promise<boolean>;
-export default _default;

package/dist/runtime/lib/login.mjs

@@ -1,9 +0,0 @@
-import m from "./m.mjs";
-export default async (username, password, code) => {
-  await m("login", {
-    username,
-    password,
-    code
-  });
-  return true;
-};