@hostlink/nuxt-light 1.17.2 → 1.18.2

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.17.2",
+  "version": "1.18.2",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/module.mjs

@@ -5,11 +5,6 @@ import { quasar } from '@quasar/vite-plugin';
 
 const resolver = createResolver(import.meta.url);
 const routes = [
-  {
-    name: "logout",
-    path: "/logout",
-    file: resolver.resolve("./runtime/pages/logout.vue")
-  },
   {
     name: "EventLog",
     path: "/EventLog",
@@ -249,6 +244,11 @@ const module = defineNuxtModule({
     nuxt.options.imports = nuxt.options.imports || {};
     nuxt.options.imports.presets = nuxt.options.imports.presets || [];
     nuxt.options.imports.presets.push({ from: "quasar", imports: ["useQuasar"] });
+    nuxt.options.vite = nuxt.options.vite || {};
+    nuxt.options.vite.optimizeDeps = nuxt.options.vite.optimizeDeps || {};
+    nuxt.options.vite.optimizeDeps.include = nuxt.options.vite.optimizeDeps.include || [];
+    nuxt.options.vite.optimizeDeps.include.push("axios");
+    nuxt.options.vite.optimizeDeps.include.push("json-to-graphql-query");
     const resolver = createResolver(import.meta.url);
     const { resolve: resolveQuasar } = createResolver(dirname(await resolvePath("quasar/package.json")));
     const importMap = JSON.parse(await await readFile(resolveQuasar("dist/transforms/import-map.json"), "utf-8"));

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

@@ -5,12 +5,15 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { ref, computed, reactive, provide, watch, toRaw } from 'vue';
 import { useRuntimeConfig } from 'nuxt/app';
+import { api } from '#imports';
 
+const emits = defineEmits(["logout"]);
 const $q = useQuasar();
 $q.loading.show()
 
 const config = useRuntimeConfig();
 
+
 const appVersion = config.public.appVersion ?? '0.0.1';
 
 const tt = await q({
@@ -274,6 +277,11 @@ if (route.fullPath == "/" && my.default_page) {
 
 }
 
+const onLogout = async () => {
+    await api.auth.logout();
+    emits('logout');
+}
+
 </script>
 
 <style scoped>
@@ -287,7 +295,7 @@ if (route.fullPath == "/" && my.default_page) {
                 <q-btn dense flat round icon="menu" class="q-mr-sm" @click="toggleLeftDrawer" />
 
                 <q-toolbar-title>
-                    {{ light.getCompany() }}
+                    {{ light.company }}
                     <template v-if="tt.system.devMode">
                         - Development mode
                     </template>
@@ -344,7 +352,7 @@ if (route.fullPath == "/" && my.default_page) {
 
                 <q-btn flat round dense icon="sym_o_person" class="q-mr-sm">
                     <q-menu max-width="250px">
-                        <q-list >
+                        <q-list>
                             <q-item v-close-popup to="/User/profile">
                                 <q-item-section avatar>
                                     <q-icon name="sym_o_person" />
@@ -375,7 +383,7 @@ if (route.fullPath == "/" && my.default_page) {
 
                             <q-separator />
 
-                            <q-item v-close-popup to="/logout">
+                            <q-item @click="onLogout" clickable>
                                 <q-item-section avatar>
                                     <q-icon name="logout" />
                                 </q-item-section>
@@ -451,7 +459,7 @@ if (route.fullPath == "/" && my.default_page) {
         <q-footer bordered v-if="style.footer">
             <q-item>
                 <q-item-section>
-                    {{ light.getCompany() }} {{ appVersion }} - Copyright {{ app.copyrightYear }} {{ app.copyrightName
+                    {{ light.company }} {{ appVersion }} - Copyright {{ app.copyrightYear }} {{ app.copyrightName
                     }}. Build
                     {{ light.getVersion() }}
                 </q-item-section>

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

@@ -15,10 +15,10 @@ watch(route, (to, from) => {
     light.setCurrentRoute(to);
 });
 
+const app = ref(null)
 
-let app = null
 try {
-    app = (await q({
+    app.value = (await q({
         app: {
             company: true,
             companyLogo: true,
@@ -28,8 +28,8 @@ try {
             forgetPasswordEnabled: true
         }
     })).app;
-    light.setCompany(app.company);
-    light.setCompanyLogo(app.companyLogo);
+    light.company = app.value.company;
+    light.companyLogo = app.value.companyLogo;
 } catch (e) {
 
     quasar.dialog({
@@ -50,20 +50,15 @@ provide('color', color)
     <q-layout v-if="!app.logged">
         <q-page-container class="bg-grey-2" style="color:#1f1f1f">
             <q-page padding>
-                <l-login v-bind="app"></l-login>
+                <l-login v-bind="app" @login="app.logged = true"></l-login>
             </q-page>
         </q-page-container>
     </q-layout>
 
-    <l-app-main v-else>
-
+    <l-app-main v-else @logout="app.logged = false">
         <template #header>
             <slot name="header"></slot>
         </template>
 
-
-
-
-
     </l-app-main>
 </template>

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

@@ -1,27 +1,27 @@
 <script setup>
-import { useLight } from "#imports";
 import { ref, reactive, onMounted } from 'vue'
 import { useQuasar } from 'quasar';
-import { useI18n } from 'vue-i18n';
-import { m, api } from '#imports';
+import { api, useHead } from '#imports';
 
-
-const light = useLight();
+const emits = defineEmits(["login"]);
 
 const props = defineProps({
   twoFactorAuthentication: Boolean,
   googleClientId: String,
-  forgetPasswordEnabled: Boolean
+  forgetPasswordEnabled: Boolean,
+  company: String,
+  companyLogo: String
 })
 
-const { t } = useI18n();
+useHead({
+  title: props.company
+})
 
 const form1 = ref(null);
 const data = reactive({
   username: "", password: "", code: ""
 });
 
-
 const $q = useQuasar()
 
 const loginWithCode = (username, password) => {
@@ -48,7 +48,9 @@ const submit = async () => {
 
     try {
       await api.auth.login(data.username, data.password, data.code)
-      window.self.location.reload();
+      //window.self.location.reload();
+      //
+      emits("login");
     } catch (e) {
       data.code = "";
 
@@ -191,13 +193,13 @@ onMounted(() => {
 <template>
   <q-card bordered flat style="min-width:360px" class="fixed-center">
     <q-card-section>
-      <q-img :src="light.getCompanyLogo()" class="full-width">
+      <q-img :src="companyLogo" class="full-width">
         <template v-slot:error>
           <q-img src="https://raw.githubusercontent.com/HostLink/.github/master/profile/logo.webp" class="full-width" />
         </template>
       </q-img>
       <div class="text-h6">
-        {{ light.getCompany() }}
+        {{ company }}
       </div>
       <q-form ref="form1">
         <div class="q-gutter-sm">

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

@@ -50,8 +50,9 @@ const onDelete = async () => {
 
 }
 
+console.log(light)
 useHead({
-    title: light.getCompany() + " - " + title,
+    title: light.company + " - " + title,
 })
 
 const localClass = computed(() => {

package/dist/runtime/index.d.ts

@@ -30,10 +30,6 @@ declare const app: {
     reloadMyFavorites: () => Promise<void>;
     getMyFavorites: () => any[];
     isDarkMode: () => boolean;
-    setCompany: (company: string) => void;
-    getCompany: () => string;
-    setCompanyLogo: (logo: string) => void;
-    getCompanyLogo: () => string;
     getVersion: () => string;
     addError: (err: Error) => void;
     getErrors: () => Error[];
@@ -114,10 +110,6 @@ export declare const useLight: (options?: {
     reloadMyFavorites: () => Promise<void>;
     getMyFavorites: () => any[];
     isDarkMode: () => boolean;
-    setCompany: (company: string) => void;
-    getCompany: () => string;
-    setCompanyLogo: (logo: string) => void;
-    getCompanyLogo: () => string;
     getVersion: () => string;
     addError: (err: Error) => void;
     getErrors: () => Error[];

package/dist/runtime/index.js

@@ -110,18 +110,6 @@ const app = reactive({
   isDarkMode: () => {
     return app.theme == "dark";
   },
-  setCompany: (company) => {
-    app.company = company;
-  },
-  getCompany: () => {
-    return app.company;
-  },
-  setCompanyLogo: (logo) => {
-    app.companyLogo = logo;
-  },
-  getCompanyLogo: () => {
-    return app.companyLogo;
-  },
   getVersion: () => {
     return packageJson.version;
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.17.2",
+  "version": "1.18.2",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",

package/dist/runtime/pages/logout.vue

@@ -1,17 +0,0 @@
-<script setup>
-
-import { api } from '#imports';
-
-await api.auth.logout();
-const href = window.self.location.href;
-
-const url = new URL(href);
-//move up one level
-const newUrl = url.origin + url.pathname.substring(0, url.pathname.lastIndexOf("/"));
-window.self.location = newUrl;
-
-
-
-
-</script>
-<template></template>