@hostlink/nuxt-light 1.8.0 → 1.8.1

package/dist/module.json

@@ -1,5 +1,5 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.8.0"
+  "version": "1.8.1"
 }

package/dist/runtime/components/L/Revision.vue

@@ -3,6 +3,17 @@ import { Dialog, Notify } from "quasar"
 import { computed, ref, reactive } from "vue";
 import { q, m } from "#imports";
 
+import * as Diff2Html from 'diff2html';
+import 'diff2html/bundles/css/diff2html.min.css';
+
+/* const diffs = '--- a/server/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go\n+++ b/server/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go\n@@ -1035,6 +1035,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (\n \n // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n \n+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {\n+\tr0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))\n+\tn = int(r0)\n+\tif e1 != 0 {\n+\t\terr = errnoErr(e1)\n+\t}\n+\treturn\n+}\n+\n+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n+\n func read(fd int, p []byte) (n int, err error) {\n \tvar _p0 unsafe.Pointer\n \tif len(p) > 0 {\n';
+const html = Diff2Html.html(diffs, {
+    drawFileList: true,
+    matching: 'lines',
+    outputFormat: 'side-by-side',
+});
+ */
+
 const props = defineProps({
     modelId: {
         type: String,
@@ -25,7 +36,8 @@ const { revisionsByModel } = await q({
         revisionBy: true,
         createdTime: true,
         content: true,
-        delta: true
+        delta: true,
+        diff: true
     }
 })
 
@@ -102,28 +114,50 @@ const getFilteredContent = computed(() => {
     } else {
         return selectedRevision.value.content;
     }
-
 })
+
+const outputFormat = ref('side-by-side');
+const getDiffHtml = (diffs) => {
+    if (!diffs) {
+        return '';
+    }
+    return Diff2Html.html(diffs, {
+        drawFileList: false,
+        matching: 'lines',
+        outputFormat: outputFormat.value,
+        highlight: true
+    });
+}
+
+
 </script>
+
 <template>
     <div>
 
-
+        <div v-html="html"></div>
         <q-dialog v-model="showDialog" full-height full-width>
             <q-card>
                 <q-toolbar>
                     <l-btn label="Restore" icon="sym_o_restore" permission="revision.restore" @click="onRestore"
                         :disabled="!isAllowRestore" />
 
-                    <q-checkbox label="Show delta only" v-model="showOnlyDelta" :color="$light.color"></q-checkbox>
+                    <q-checkbox label="Show changed only" v-model="showOnlyDelta" :color="$light.color"></q-checkbox>
+
+                    <q-btn-toggle class="q-mx-md" v-model="outputFormat" :toggle-color="$light.color" :options="[
+            { label: 'side-by-side', value: 'side-by-side' }, { label: 'line-by-line', value: 'line-by-line' }
+        ]" />
                     <q-space />
                     <q-btn flat round dense icon="close" @click="showDialog = false" />
                 </q-toolbar>
 
 
                 <div class="q-pa-md">
-                    <div class="text-h4 q-mb-md">
-                        Revision
+
+                    <div class="text-h6 q-mb-md">
+                        Revision by: {{ selectedRevision.revisionBy }} <br>
+                        Created at: {{ selectedRevision.createdTime }}
+
                     </div>
 
                     <q-markup-table dense separator="cell" flat bordered>
@@ -135,23 +169,34 @@ const getFilteredContent = computed(() => {
                                 </th>
                                 <th>Field</th>
                                 <th>Value</th>
-                                <th>Delta</th>
+                                <th>Changed</th>
                             </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="(value, key) in getFilteredContent" :key="key">
-                                
-                                <td><q-checkbox v-model="restore_fields" :val="key" :color="$light.color"></q-checkbox>
-                                </td>
-                                <td :class="{ 'bg-yellow-3': selectedRevision.delta[key] != undefined }">
-                                    {{ key }}</td>
-                                <td>
-                                    <pre>{{ value }}</pre>
-                                </td>
-                                <td>
-                                    <pre>{{ selectedRevision.delta[key] }}</pre>
-                                </td>
-                            </tr>
+                            <template v-for="(value, key) in getFilteredContent" :key="key">
+
+                                <tr>
+
+                                    <td><q-checkbox v-model="restore_fields" :val="key"
+                                            :color="$light.color"></q-checkbox>
+                                    </td>
+                                    <td :class="{ 'bg-yellow-3': selectedRevision.delta[key] != undefined }">{{ key }}
+                                    </td>
+                                    <td>
+                                        <pre>{{ value }}</pre>
+                                    </td>
+                                    <td>
+                                        <pre>{{ selectedRevision.delta[key] }}</pre>
+                                    </td>
+
+                                </tr>
+
+                                <tr v-if="getDiffHtml(selectedRevision.diff[key])">
+                                    <td colspan="4">
+                                        <div v-html="getDiffHtml(selectedRevision.diff[key])"></div>
+                                    </td>
+                                </tr>
+                            </template>
                         </tbody>
 
 

package/dist/runtime/components/L/Storage.vue

@@ -0,0 +1,36 @@
+<script setup>
+import { computed } from 'vue';
+import { format } from "quasar"
+const { humanStorageSize } = format
+const props = defineProps({
+    storage: {
+        type: Object,
+        required: true
+    },
+})
+
+
+const usagePercent = computed(() => {
+    return Math.round((props.storage.totalSpace - props.storage.freeSpace) / props.storage.totalSpace)
+})
+
+const progressColor = computed(() => {
+    if (usagePercent.value > 0.95) {
+        return "negative"
+    }
+    if (usagePercent.value > 0.9) {
+        return "warning"
+    }
+    return "primary"
+})
+
+</script>
+<template>
+    <q-card>
+        <q-card-section>
+            {{ $t("Storage") }}
+            <q-linear-progress rounded size="20px" :value="usagePercent" :color="progressColor" class="q-mt-sm" />
+            {{ $t('storage_usage', [humanStorageSize(storage.freeSpace), humanStorageSize(storage.totalSpace)]) }}
+        </q-card-section>
+    </q-card>
+</template>

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

@@ -3,29 +3,56 @@ import { useRoute, useRouter } from 'vue-router';
 import { useLight, q, m } from "#imports";
 import { useQuasar, Loading, Dialog } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { ref, computed, reactive, provide, watch, toRaw, inject } from 'vue';
+import { ref, computed, reactive, provide, watch, toRaw } from 'vue';
 import { useRuntimeConfig } from 'nuxt/app';
 
 Loading.show()
-//download system value
-/* import { download } from './../lib/SystemValue'
-await download();
- */
+
 const config = useRuntimeConfig();
 
 const appVersion = config.public.appVersion ?? '0.0.1';
 
 const quasar = useQuasar();
 const tt = await q({
-    system: ["devMode", "time"],
-    app: ["menus", "viewAsMode", "languages",
-        "copyrightYear",
-        "copyrightName",
-        "hasFavorite",
-        { i18nMessages: ["name", "value"] }],
-    my: ['username', 'first_name', 'last_name', 'roles', "styles", "language", "permissions", "default_page", { myFavorites: ["my_favorite_id", "label", "path", "icon"] }],
+    system: {
+        devMode: true,
+        time: true,
+        storage: {
+            freeSpace: true,
+            usageSpace: true,
+            totalSpace: true,
+        }
+    },
+    app: {
+        menus: true,
+        viewAsMode: true,
+        languages: true,
+        copyrightName: true,
+        copyrightYear: true,
+        hasFavorite: true,
+        i18nMessages: {
+            name: true,
+            value: true
+        }
+    }, my: {
+        username: true,
+        first_name: true,
+        last_name: true,
+        roles: true,
+        styles: true,
+        language: true,
+        permissions: true,
+        default_page: true,
+        myFavorites: {
+            my_favorite_id: true,
+            label: true,
+            path: true,
+            icon: true
+        }
+    }
 })
 
+
 let app = tt.app
 let my = reactive(tt.my)
 
@@ -54,13 +81,6 @@ i18n.locale = my.language || 'en';
 
 let system = tt.system;
 
-if (light.isGranted("system.storage")) {
-    let s = await q("system", ["diskFreeSpace", "diskUsageSpace", "diskTotalSpace", "diskFreeSpacePercent"]);
-    //merge system value
-    system = { ...system, ...s };
-
-}
-
 // message
 let messages = i18n.messages.value[i18n.locale];
 for (let t of app.i18nMessages) {
@@ -168,35 +188,17 @@ const exitViewAs = async () => {
 }
 
 const storageColor = computed(() => {
-    if (system) {
-        if (system.diskFreeSpacePercent < 0.05) {
+    if (system.storage) {
+        const percent = system.storage.freeSpace / system.storage.totalSpace;
+        if (percent < 0.05) {
             return "negative"
         }
-        if (system.diskFreeSpacePercent < 0.1) {
+        if (percent < 0.1) {
             return "warning"
         }
     }
 })
 
-const storageProgressColor = computed(() => {
-    if (system) {
-        if (system.diskFreeSpacePercent < 0.05) {
-            return "negative"
-        }
-        if (system.diskFreeSpacePercent < 0.1) {
-            return "warning"
-        }
-    }
-    return "primary"
-})
-
-const storageUsagePercent = computed(() => {
-    if (system) {
-        return 1 - system.diskFreeSpacePercent;
-    }
-    return 0;
-})
-
 const containerClass = computed(() => {
     return (light.theme == 'dark') ? {} : { 'bg-grey-2': true }
 })
@@ -223,8 +225,6 @@ const onToggleFav = async () => {
 
         //reload my.myFavorites
         light.reloadMyFavorites();
-
-
         return;
     }
 
@@ -320,24 +320,13 @@ if (route.fullPath == "/" && my.default_page) {
                             </q-item>
                         </q-list>
                     </q-menu>
-
-
                 </q-btn>
 
-                <q-btn icon="sym_o_storage" flat round dense class="q-mr-sm" v-if="system" :color="storageColor">
+                <q-btn icon="sym_o_storage" flat round dense class="q-mr-sm" v-if="system.storage"
+                    :color="storageColor">
                     <q-menu>
-                        <q-card style="width:250px">
-                            <q-card-section>
-                                {{ $t("Storage") }}
-                                <q-linear-progress rounded size="20px" :value="storageUsagePercent"
-                                    :color="storageProgressColor" class="q-mt-sm" />
-                                {{ $t('storage_usage', [system.diskFreeSpace, system.diskTotalSpace]) }}
-                            </q-card-section>
-
-                        </q-card>
+                        <l-storage :storage="system.storage" style="width:250px" />
                     </q-menu>
-
-
                 </q-btn>
 
                 <div class="q-mx-sm" v-if="$q.screen.gt.xs">
@@ -422,7 +411,8 @@ if (route.fullPath == "/" && my.default_page) {
             </q-scroll-area>
         </q-drawer>
 
-        <q-page-container :class="containerClass" :style="containerStyle">  <!-- Error message -->
+        <q-page-container :class="containerClass" :style="containerStyle"> <!-- Error message -->
+            <slot name="header"></slot>
             <q-banner dense inline-actions class="bg-grey-4 q-ma-md" v-for=" error  in  errors " rounded>
                 {{ error }}
 
@@ -448,9 +438,8 @@ if (route.fullPath == "/" && my.default_page) {
             <q-item>
                 <q-item-section>
                     {{ light.getCompany() }} {{ appVersion }} - Copyright {{ app.copyrightYear }} {{ app.copyrightName
-                    }}.
-                    Build {{
-        light.getVersion() }}
+                    }}. Build
+                    {{ light.getVersion() }}
                 </q-item-section>
             </q-item>
         </q-footer>

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

@@ -48,7 +48,13 @@ provide('color', color)
     </q-layout>
 
     <l-app-main v-else>
+
+        <template #header>
+            <slot name="header"></slot>
+        </template>
+
         <slot></slot>
+
+
     </l-app-main>
 </template>
-  

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "HostLink Nuxt Light Framework",
   "repository": "@hostlink/nuxt-light",
   "license": "MIT",
@@ -40,6 +40,7 @@
     "@nuxt/module-builder": "^0.5.2",
     "@quasar/extras": "^1.16.6",
     "axios": "^1.5.0",
+    "diff2html": "^3.4.47",
     "formkit-quasar": "^0.0.15",
     "json-to-graphql-query": "^2.2.5",
     "quasar": "^2.12.5",