@simitgroup/simpleapp-generator 1.6.2-alpha → 1.6.4-alpha

package/templates/nuxt/composables/recently.generate.ts.eta

@@ -0,0 +1,16 @@
+import {RecentlyValue} from "~/types"
+export const getRecently = ()=>useNuxtApp().$recently
+export const setRecentDocument = (key:string, value:RecentlyValue)=>{
+    const recent = getRecently()
+    recent.set(key,value)
+    const tmp:{[key:string]:RecentlyValue}={}
+    recent.forEach((value,key)=>{
+        tmp[key]=value
+    })
+    console.log("JSON.stringify(tmp)",tmp)
+    localStorage.setItem('recently', JSON.stringify(tmp)); // Store keys as an array
+
+}
+export const getRecentDocument = (key:string)=>{
+    getRecently().get(key)
+}

package/templates/nuxt/composables/roles.generate.ts.eta

@@ -10,23 +10,18 @@ type roletype = {resource:string, action:string}
 type grouptype = {[key:string]:roletype[]}            
 
 const allroles:roletype[] = [
-<% for(let i=0;i<it.modules.length; i++){ %>
+    <% for(let i=0;i<it.modules.length; i++){ %>
         <% const m = it.modules[i] %>
+        <% const appconfig = m.schema["x-simpleapp-config"] %>                
         {resource: '<%=m.docname%>', action:'create'},
         {resource: '<%=m.docname%>', action:'update'},
         {resource: '<%=m.docname%>', action:'delete'},
-        {resource: '<%=m.docname%>', action:'search'},
-       
-
-        <% if(m.api && m.api.length >0) {%>
-
-            <% for(let j=0;j<m.api.length; j++){ %>
-                <%let api = m.api[j]%>
-        {resource: '<%=m.docname%>', action:'<%=api.action%>'},
-        
-        
-            <%}%>
-        <%}%>
+        {resource: '<%=m.docname%>', action:'search'},       
+        <% if(Array.isArray(appconfig?.allStatus) && appconfig.allStatus.length>0){%> 
+        <% for(let sindex=0;sindex<appconfig.allStatus.length;sindex++){%> 
+         {resource: '<%=m.docname%>', action:'<%=appconfig.allStatus[sindex].status%>'},       
+        <%}%> 
+        <%}%> 
     <%}%>
 ]
 

package/templates/nuxt/composables/stringHelper.generate.ts.eta

@@ -18,8 +18,61 @@ export const randomUUID = ()=> uuidv4()
 export const md5=(s:string)=>  new Md5().appendStr(s).end()
 
 export const getAvatarLink = (email:string, size:number):string=>{
-  return `https://api.simbiz.cloud/cloudapi/avatar/${md5(email)}?size=${size}`  
+  return `https://gravatar.com/avatar/${md5(email)}?size=${size}`;
+  //return `https://api.simbiz.cloud/cloudapi/avatar/${md5(email)}?size=${size}`  
+}
+export const getAvatarByUid = (id:string, size:number):string=>{
+  const url = `${useRuntimeConfig().public.APP_URL}/api/${getCurrentXorg()}`
+  return `${url}/images/student/${id}`;
+  
 }
 
+export const getDefaultLocale =()=> useNuxtApp().$i18n.defaultLocale
 export const t = (txt:string,options?:any):string => !txt || txt.trim()=='' ? '' : useNuxtApp().$i18n.t(txt,options)
 export const upperFirst = (str:string) => _.upperFirst(str)
+export const labelSorter = (a,b)=>{
+   const nameA = a.label.toUpperCase(); // ignore upper and lowercase
+   const nameB = b.label.toUpperCase(); // ignore upper and lowercase
+    if (nameA < nameB) {
+      return -1;
+    }
+    if (nameA > nameB) {
+      return 1;
+    }
+
+  // names must be equal
+  return 0;
+}
+
+export const valueSorter = (a,b)=>{
+  const vA = a.value
+  const vB = b.value
+   if (vA < vB) {
+     return -1;
+   }
+   if (vA > vB) {
+     return 1;
+   }
+
+ return 0;
+}
+export const valueSorterDesc = (a,b)=>{
+  const vA = a.value
+  const vB = b.value
+   if (vA < vB) {
+     return 1;
+   }
+   if (vA > vB) {
+     return -1;
+   }
+
+ return 0;
+}
+export const numberToMoneyString = (value:number)=>{
+  const options = {
+    style: "decimal", // Other options: 'currency', 'percent', etc.
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+  };
+  return value.toLocaleString(useI18n().defaultLocale, options)
+}

package/templates/nuxt/composables/sysmessage.generate.ts.eta

@@ -11,7 +11,7 @@ export const systemMsgQty = computed(()=>messages.value.filter(item=>!item.read)
 export const sysMessage ={
     download: async ()=> {
         messages.value = await useNuxtApp().$SystemmessageDoc().search({})
-        console.log("Download messages",messages)
+        //console.log("Download messages",messages)
         return messages.value
     },
     getMessages: () => messages.value

package/templates/nuxt/pages/[xorg]/docnoformat.vue.eta

@@ -41,7 +41,7 @@ const doc = useNuxtApp().$DocnoformatDoc()
 const docdata = doc.getReactiveData();
 
 definePageMeta({
-  menuPath: "setting/docnoformat",
+  menuPath: "systemconfig/setting/docnoformat",
 });
 
 const columns = [

package/templates/nuxt/pages/[xorg]/mobile/docnoformat/{index.vue.eta → index.vue.etaxxx}

@@ -41,7 +41,7 @@ const doc = useNuxtApp().$DocnoformatDoc()
 const docdata = doc.getReactiveData();
 
 definePageMeta({
-  menuPath: "setting/docnoformat",
+  menuPath: "systemconfig/setting/docnoformat",
 });
 
 const columns = [

package/templates/nuxt/pages/[xorg]/mobile/user/{index.vue.eta → index.vue.etaxxx}

@@ -226,6 +226,6 @@ onMounted(async () => {
 });
 
 definePageMeta({
-  menuPath: "setting/user",
+  menuPath: "systemconfig/setting/user",
 });
 </script>

package/templates/nuxt/pages/[xorg]/{organization.vue.eta → organization.vue._eta}

@@ -1,7 +1,7 @@
 <template>
   <div class="w-full flex-col flex">
     <title>{{ t("organization") }}</title>
-    <MobileToolbar class="bg-gray-600">
+    <MobileToolbar class="bg-gray-600" v-if="isMobile()">
       <template #center
         ><TextTitle class="text-white">{{
           t("organization")
@@ -18,14 +18,22 @@
       <div class="">
         <!--  -->
         <!-- <div class="border w-12 h-12 md:w-24 md:h24"> -->
-        <ImageOrganization :changable="!doc.isReadOnly()"></ImageOrganization>
+        <ImageOrganization></ImageOrganization>
         <!-- </div> -->
       </div>
       <div class="flex flex-col flex-1">
-        <TextTitle>{{ data.orgName }} / {{ data.orgCode }}</TextTitle>
+        <TextTitle>
+           {{ data.orgName }} / {{ data.orgCode }}
+           
+         </TextTitle>
         <TextSubtitle>
           {{ data.description }}
         </TextSubtitle>
+        <div>
+          <ButtonDefault @click="showEditOrg = true" class="text-sm">
+                <i class="pi pi-pencil mr-1"/> <span>{{t('edit')}}</span>
+          </ButtonDefault>
+        </div>
       </div>
     </div>
 
@@ -41,7 +49,7 @@
       <ListView
         class="border rounded-lg border-gray-400 dark:border-gray-600"
         :list="branchlist"
-        title-field="branchName"
+        title-field="branchName"        
         sub-title-field="branchCode"
         :url="getDocumentUrl('organization', id)"
         #default="{ item }"
@@ -49,7 +57,9 @@
         <div class="flex flex-row">
           <div class="flex-col flex flex-1">
             <TextPrimary>{{ item.branchName }}</TextPrimary>
-            <TextSubtitle>{{ item.description }}</TextSubtitle>
+            <TextSubsubtitle>{{ item.street1 }}</TextSubsubtitle>
+            <TextSubsubtitle>{{ item.street2 }}</TextSubsubtitle>
+            <TextSubsubtitle>{{ item.description }}</TextSubsubtitle>
           </div>
           <div class="flex-col flex text-right">
             <div>{{ item.branchCode }}</div>
@@ -59,16 +69,31 @@
       </ListView>
     </div>
 
-    <OverlaySideBarCrud v-model="showEditOrg" close-event-name="organization">
+    <OverlayPanelWithToolBar v-model="showEditOrg" close-event-name="organization">
+      <template #headerLeft>
+        <ButtonText @click="showEditOrg = false">
+          <i class="pi pi-times"></i>
+        </ButtonText>
+      </template>
+      <template #headerCenter>{{data.orgName}}</template>
+      <template #headerRight></template>
       <FormOrganization
         :_id="getUserProfile()?.orgRecordId"
         @after="afterOrganization"
       ></FormOrganization>
-    </OverlaySideBarCrud>
+    </OverlayPanelWithToolBar>
+
+    <OverlayPanelWithToolBar v-model="showEditBranch" close-event-name="branch">
+      <template #headerLeft>
+        <ButtonText @click="closeBranch">
+          <i class="pi pi-times"></i>
+        </ButtonText>
+      </template>
+      <template #headerCenter>{{t('branch')}}</template>
+      <template #headerRight></template>
 
-    <OverlaySideBarCrud v-model="showEditBranch" close-event-name="branch">
       <NuxtPage :_id="id"></NuxtPage>
-    </OverlaySideBarCrud>
+    </OverlayPanelWithToolBar>
   </div>
 </template>
 
@@ -113,7 +138,7 @@ const fetchRecord = async () => {
 const id = computed((): string => String(useRoute().params.id ?? ""));
 
 definePageMeta({
-  menuPath: "setting/organization",
+  menuPath: "systemconfig/setting/organization",
 });
 
 //branch record update then reload
@@ -124,6 +149,10 @@ $listen("RefreshDocumentList", async (data) => {
   }
 });
 
+const closeBranch = ()=>{
+  showEditBranch.value=false
+  goTo('organization')
+}
 const showBranchDialogIfRequired = () => {
   if (useRoute().path.includes("/new") || id.value) showEditBranch.value = true;
 };

package/templates/nuxt/pages/[xorg]/profile.vue.eta

@@ -10,6 +10,6 @@
  */
 import profile from "../profile.vue";
 definePageMeta({
-  menuPath:'setting/profile'
+//  menuPath:'setting/profile'
 })
 </script>

package/templates/nuxt/pages/[xorg]/user.vue.eta

@@ -1,15 +1,15 @@
 <template>
   <div class="w-full flex flex-col p-3">
+    <div>
+      <TextTitle>{{ t("user") }}</TextTitle>
+    </div>
+    <div class="flex flex-row w-full">
+      <title>{{ t("user") }}</title>
 
-  
-    <div><TextTitle>{{ t('user') }}</TextTitle></div>
-    <div class="flex flex-row w-full ">
-      <title>{{ t("user") }}</title>    
-      
       <div class="w-full md:w-1/2 xl:w-1/3">
         <TabView>
           <TabPanel header="Active">
-            <ul role="list" class="divide-y divide-gray-100">
+            <ul role="list" class="divide-y divide-gray-100 listview-item">
               <li v-for="item in userlist" :key="item.email">
                 <NuxtLink
                   v-if="item.uid && item.active"
@@ -21,7 +21,7 @@
             </ul>
           </TabPanel>
           <TabPanel header="Inactive">
-            <ul role="list" class="divide-y divide-gray-100">
+            <ul role="list" class="divide-y divide-gray-100 listview-item">
               <li v-for="item in userlist" :key="item.email">
                 <NuxtLink
                   v-if="item.uid && !item.active"
@@ -54,9 +54,12 @@
                 </div>
               </form>
             </div>
-            <ul role="list" class="divide-y divide-gray-100">
+            <ul role="list" class="divide-y divide-gray-100 listview-item">
               <li v-for="item in userlist" :key="item.email">
-                <NuxtLink v-if="!item.uid" :to="getDocumentUrl('user', item._id)">
+                <NuxtLink
+                  v-if="!item.uid"
+                  :to="getDocumentUrl('user', item._id)"
+                >
                   <UserProfileListItem :data="item"></UserProfileListItem>
                 </NuxtLink>
               </li>
@@ -226,6 +229,6 @@ onMounted(async () => {
 });
 
 definePageMeta({
-  menuPath: "setting/user",
+  menuPath: "systemconfig/setting/user",
 });
 </script>

package/templates/nuxt/pages/login.vue._eta

@@ -1,6 +1,9 @@
 <template>
   <div class="p-10 m-10 text-3xl border text-center dark:text-white">
-    {{ t('redirectToLoginPage') }}
+    <div class="flex flex-col justify-center">
+      <div class="pi pi-spin pi-spinner" style="font-size: 8rem"></div>
+      <div>{{ t("login")+'...' }}</div>
+    </div>
     <!-- <NuxtPage /> -->
   </div>
 </template>

package/templates/nuxt/plugins/10.simpleapp-event.ts.eta

@@ -10,6 +10,8 @@ import axios, { Axios, AxiosResponse } from 'axios'
 import {Notification,EventType} from '~/types'
 // import PrimeVue from "primevue/config";
 import mitt from 'mitt'
+import { useConfirm } from "primevue/useconfirm";
+import { useDialog } from 'primevue/usedialog';
 
 // import ToastService from 'primevue/toastservice';
 // import ConfirmationService from 'primevue/confirmationservice';
@@ -73,6 +75,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           event: emitter.emit, // Will emit an event
           listen: emitter.on, // Will register a listener for an event
           axios: myaxios,
+          confirm: useConfirm(),
+          dialog: useDialog
         } 
     }
     //other components that you need

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -102,28 +102,43 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           getCurrentXorg(){
             return  (useRoute().params.xorg) ? <String>useRoute().params.xorg : undefined           
           },
-          async pingSession(){
+          async pingSession():Promise<string>{
             let xorg = this.getCurrentXorg() 
             let apiurl=''
+            
             if(!xorg){
               apiurl = `${useRuntimeConfig().public.APP_URL}/api`
             }else{
-            apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
+              const xorgdecode = atob(<string>xorg)
+              if(xorgdecode.includes('-')){
+                apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
+              }else{                 
+                return Promise.reject('wrongxorg')
+              }
+            
             }
             const {$axios} = useNuxtApp()
-            const pingresult = await new PROFILEApi(undefined,apiurl,$axios).getSession()
-            return pingresult
+            try{
+              const pingresult = await new PROFILEApi(undefined,apiurl).getSession()
+              if(pingresult.status<300)
+                return Promise.resolve('ok')
+              else
+                return Promise.reject('relogin')  
+            }catch(e){
+              return Promise.reject('catch go relogin')  
+            }
+            
           },
           async decideInvitation(id:string,decision:string){
             const apiurl = `${useRuntimeConfig().public.APP_URL}/api`
             const {$axios} = useNuxtApp()
-            console.log("decideInvitation",id,decision)
+            // console.log("decideInvitation",id,decision)
             const result = await new PROFILEApi(undefined,apiurl,$axios).decideInvitation(id,decision)
             
             if(result){
-              console.log(result)
+              // console.log(result)
             }else{
-              console.log(result)
+              // console.log(result)
             }
             //().then((res:AxiosResponse)=>{ }
           },
@@ -206,28 +221,32 @@ export default defineNuxtPlugin( async(nuxtApp) => {
     
     
     if( useRoute().meta.auth !==false){
-      
-      if(await useUserStore().pingSession()){
-        await useUserStore().loadRemoteUserInfo()
-        
-      }else{
-        await useUserStore().logout(useRoute().path)        
-      }    
-    }else{
-      // if(await useUserStore().pingSession()){
+      console.log("pingsessionres starat")
 
-      // }else{
+      try{
+        const pingsessionres = await useUserStore().pingSession()
+        console.log("pingsessionres",pingsessionres)
+        if(pingsessionres == 'wrongxorg'){
+          navigateTo('/')
+        }
+        else if(pingsessionres){
+          await useUserStore().loadRemoteUserInfo()        
+        }
+        return {        
+            provide: {
+                userstore:useUserStore()
+              // base64url: Base64URL
+            }
+        }
+      }catch(e){
 
-      // }
+         await useUserStore().logout(useRoute().path)    
+      }
+      
+    }else{
+      
     }
     
-    return {
-
-        
-        provide: {
-            userstore:useUserStore()
-          // base64url: Base64URL
-        }
-    }
+    
     
 });

package/templates/nuxt/plugins/70.recently.ts.eta

@@ -0,0 +1,55 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+import { defineNuxtPlugin } from "#app";
+import { LRUCache } from 'lru-cache'
+import {RecentlyValue} from "~/types"
+export default defineNuxtPlugin( async(nuxtApp) => {
+    const options = {
+        max: 20,
+      
+        // for use with tracking overall storage size
+        maxSize: 5000,
+        sizeCalculation: (value, key) => {
+          return 1
+        },
+      
+        dispose: (value, key) => {
+          //freeFromMemoryOrWhatever(value)
+        },
+      
+        // how long to live in ms
+        ttl: 1000 * 60 * 5,
+      
+        // return stale items before removing from cache?
+        allowStale: false,
+      
+        updateAgeOnGet: false,
+        updateAgeOnHas: false,
+      
+        fetchMethod: async (
+          key,
+          staleValue,
+          { options, signal, context }
+        ) => {},
+      }
+      
+      const recently = new LRUCache<string,RecentlyValue>(options)
+      const tmp = localStorage.getItem('recently' ); // Store keys as an array
+      if(tmp){
+        const histories = JSON.parse(tmp)
+        const keys=Object.keys(histories)
+        keys.forEach(key=>{
+            recently.set(key,histories[key])
+        })            
+      }
+      
+    return {        
+        provide: {
+            recently:recently
+        }
+    }    
+});

package/templates/nuxt/providers/my-provider.ts.eta

@@ -0,0 +1,22 @@
+import { joinURL } from 'ufo'
+import type { ProviderGetImage } from '@nuxt/image'
+import { createOperationsGenerator } from '#image'
+
+const operationsGenerator = createOperationsGenerator()
+
+export const getImage: ProviderGetImage = (
+  src,
+  { modifiers = {}, baseURL } = {}
+) => {
+
+  if (!baseURL) {
+    // also support runtime config 
+    baseURL = useRuntimeConfig().public.API_URL
+  }
+
+  const operations = operationsGenerator(modifiers)
+
+  return {
+    url: joinURL(baseURL, src + (operations ? '?' + operations : '')),
+  }
+}

package/templates/nuxt/server/api/[xorg]/{[...].ts.eta → [...].ts._eta}

@@ -1,6 +1,6 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * --remove-this-line-to-prevent-override--
  * last change 2024-02-23
  * Author: Ks Tan
  */
@@ -9,7 +9,7 @@
 import axios, { AxiosRequestConfig } from 'axios';
 import { getServerSession } from '#auth'
 import type { Session } from 'next-auth';
-
+import * as fs from 'fs'
 export default defineEventHandler(async (event:any) => {
     type additionalprops = {accessToken?:string} 
     let session:any=null
@@ -53,27 +53,44 @@ export default defineEventHandler(async (event:any) => {
             data: bodydata,
             params: querydata,
         }
-        axios(axiosConfig).then((res) => {
+        
+        try{            
+            const res =  await axios(axiosConfig)
             if (res.headers['content-type'] === 'image/png') {
-                // Set the response headers for the image
                 frontEndRes.setHeader('Content-Type', 'image/png');
                 frontEndRes.setHeader('Content-Disposition', 'inline');
-
-                // Send the image data as the response body
                 frontEndRes.end(Buffer.from(res.data, 'binary'));
-            } else {
-                // For non-image responses, set the Content-Type header and send the response body
-                // setHeader(event, 'Content-type', <string>res.headers['Content-Type']);
-
+            }else if(documentLink.includes('images/')){
+                // console.log(documentLink," Resdata of base64 photo",res.data.length)
+                let imageData
+                frontEndRes.setHeader('Content-Type', 'image/png');
+                
+                // console.log("load image for",documentLink)
+                if( res.data.length){
+                    console.log("obtain base64 from server length:",res.data.length)
+                    imageData = base64ToBuffer(res.data);
+                    
+                }else{
+                    // console.log("server no image, use default image")
+                    const folder = 'assets/images/'
+                    let filename = filename='unknown.png';
+                    const fullpath = folder+filename;
+                    if(fs.existsSync(fullpath)){
+                        imageData = fs.readFileSync(fullpath)
+                    }else{
+                        console.log(fullpath,'does not exists')
+                    }                    
+                }
+                 frontEndRes.end(Buffer.from(imageData, 'binary'));                                
+                
+            }else{
                 frontEndRes.statusCode = res.status;
                 if(res.statusText) {
                     frontEndRes.statusMessage = res.statusText;
                 }
-
                 resolve(res.data);
             }
-
-        }).catch((error) => {
+        }catch(error){
             if(!error?.response){
                 console.log("backend server no response ",error.code)              
                 reject({ 
@@ -94,13 +111,22 @@ export default defineEventHandler(async (event:any) => {
                 });         
                 
             }
-
-     
-        })
-
-        // resolve({
-        //     status: 'ok'
-        // })
+        }
     })
     
-})
+})
+
+
+
+function base64ToBuffer(base64String:string) {
+    // Split the base64 string into parts
+    const parts = base64String.split(',');
+    const contentType = parts[0].split(':')[1];
+    const base64Data = parts[1];
+  
+    // Decode the base64 data
+    const binaryString = atob(base64Data);
+    const buffer = new Buffer.from(binaryString, 'binary');
+  
+    return buffer
+  }