@simitgroup/simpleapp-generator 1.6.6-i-alpha → 1.6.6-k-alpha

package/templates/nuxt/components/simpleApp/SimpleAppUserPicker.vue.eta

@@ -1,22 +1,20 @@
 <template>
   <div
     v-if="readonly"
-    class="p-3 border rounded-lg border-gray-300 dark:border-blue-900/40"
+    class="px-3 py-1.5 border rounded-lg border-gray-300 dark:border-blue-900/40 h-input"
   >
-    <div>
-      {{ modelValue && modelValue.fullName ? modelValue.fullName : "-" }}
-    </div>
+    {{ modelValue && modelValue.fullName ? modelValue.fullName : "-" }}
   </div>
   <div
     v-else-if="modelValue !== undefined"
-    class="p-3 border rounded-lg border-gray-300 dark:border-blue-900/40 relative"
+    class="py-1.5 px-3 border rounded-lg border-gray-300 dark:border-blue-900/40 relative h-input"
   >
     <div ref="autocompleteinput" readonly>
       {{ modelValue && modelValue.fullName ? modelValue.fullName : "-" }}
     </div>
 
     <div
-      class="absolute h-full top-0 right-0 text-right text-white z-10 align-middle p-3"
+      class="absolute h-full top-0 right-0 text-right text-white z-10 align-middle py-1.5 pr-3"
     >
       <a
         class="pi pi-times rounded-full bg-slate-500 p-1 cursor-pointer text-xs"
@@ -62,7 +60,7 @@
     >
       <template #header>
         <slot name="header">
-          <div class="flex flex-row font font-bold dark:text-white">
+          <div class="flex flex-row font font-bold">
             <div>{{ t("user") }}</div>
           </div>
         </slot>
@@ -72,7 +70,7 @@
       </template>
       <template #option="{ index, option }">
         <slot name="option" :index="index" :option="option">
-          <div class="flex flex-row dark:text-white">
+          <div class="flex flex-row">
             <div>{{ option.label }}</div>
           </div>
         </slot>
@@ -90,7 +88,7 @@
         <InputGroupAddon
           @click="showAutocompleteDialog(true)"
           v-ripple
-          class="bg bg-primary-600 dark:bg-primary-700 text-white rounded-r-lg p-3"
+          class="bg bg-primary-600 text-white rounded-r-lg p-3"
         >
           <i :class="`pi ${modelValue ? 'pi-link' : 'pi-angle-down'}`"></i>
         </InputGroupAddon>
@@ -261,7 +259,7 @@ const getListFromAutocompleteApi = (event: any) => {
   getDocumentApi("user")
     .autoComplete(keyword, morefilter)
     .then((res: any) => {
-      console.log("Run autocomplete?");
+      // console.log("Run autocomplete?");
       list.value = res.data;
 
       if (props.allowAddNew) {
@@ -364,7 +362,7 @@ const afterRenderMobileForm = async (
   data: any,
   result: any,
 ) => {
-  console.log("afterRenderMobileForm", eventType);
+  // console.log("afterRenderMobileForm", eventType);
   if (eventType == FormCrudEvent.create || eventType == FormCrudEvent.update) {
     autocompleteitem.value = {
       _id: data._id,
@@ -381,7 +379,7 @@ const afterRenderMobileForm = async (
 };
 
 const clickAutocomplete = (a, b) => {
-  console.log("clickAutocomplete", a, b);
+  // console.log("clickAutocomplete", a, b);
   return false;
 };
 </script>

package/templates/nuxt/components/table/{TableDocuments.vue.eta → TableDocuments.vue._eta}

@@ -97,8 +97,8 @@
 </template>
 <script setup lang="ts" generic="T">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/user/{UserButtonPermissionInfo.vue.eta → UserButtonPermissionInfo.vue._eta}

@@ -3,7 +3,7 @@
     <button class="" @click="previewPermission">
       <i class="pi pi-question-circle"></i>
     </button>
-    <Sidebar
+    <Drawer
       v-model:visible="showpermissioninfo"
       modal
       :pt="{ root: { class: 'w-2/3' } }"
@@ -86,13 +86,13 @@
           </div>
         </div>
       </div>
-    </Sidebar>
+    </Drawer>
   </div>
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/user/{UserInvitation.vue.eta → UserInvitation.vue._eta}

@@ -27,8 +27,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/user/{UserProfileListItem.vue.eta → UserProfileListItem.vue._eta}

@@ -33,8 +33,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nuxt/components/user/{UserTenantPicker.vue.eta → UserTenantPicker.vue._eta}

@@ -31,8 +31,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

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

@@ -6,7 +6,7 @@
  */
  
 import * as o from "../simpleapp/generate/openapi";
-import axios from 'axios'
+import axios, { AxiosInstance } from 'axios'
 
 
 export const getAxiosConfig = () => {
@@ -15,15 +15,23 @@ export const getAxiosConfig = () => {
 
   const suffix = xorgdecode.includes('-') ?  '/'+getCurrentXorg() : ''
   const config: o.Configuration = {
-    basePath: `${useRuntimeConfig().public.APP_URL}/api${suffix}`,
+    basePath: `${useRuntimeConfig().public.appUrl}/api${suffix}`,
     isJsonMime: () => true,
   };
   return config
 }
 
+export const getDocumentApiClass = <T>(ApiClass: new (config: o.Configuration, basePath?: string, axios?: AxiosInstance) => T): T => {
+  const config = getAxiosConfig();
+  const axios = useNuxtApp().$axios;
+  const api = new ApiClass(config, undefined, axios);
+  return api;
+}
+
+
 //get apisession exclude from shared axios to separate handle session
 export const getApiSession = async ()=> {
-  console.log("getApiSession from computable")
+  // console.log("getApiSession from computable")
   return getUserStore().pingSession()
   //,useNuxtApp().$axios)
   // const  profileapi = new o.PROFILEApi(getAxiosConfig(),undefined)

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

@@ -1,4 +1,4 @@
-import { getUserProfile } from './getUserStore.generate';
+// import { getUserProfile } from './getUserStore.generate';
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR

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

@@ -10,7 +10,7 @@ import { createHttpLink, } from '@apollo/client/core';
 export const setGraphqlServer=()=>{
     const apolloclient = useNuxtApp().$apollo.defaultClient
     const newlink = createHttpLink({
-        uri: `${useRuntimeConfig().public.API_URL}/${getCurrentXorg()}/graphql`,
+        uri: `${useRuntimeConfig().public.apiUrl}/${getCurrentXorg()}/graphql`,
       })
       apolloclient.setLink(newlink)
       apolloclient.defaultOptions={

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

@@ -7,7 +7,6 @@ export const setRecentDocument = (key:string, value: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
 
 }

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

@@ -23,7 +23,7 @@ export const md5=(s:string)=>  new Md5().appendStr(s).end()
 // }
 export const getAvatarByUid = (id:string, size?:number):string=>{  
   if(size===undefined)size=160
-  return `${useRuntimeConfig().public.AVATAR_URL}/${md5(id)}?size=${size}`
+  return `${useRuntimeConfig().public.avatarUrl}/${md5(id)}?size=${size}`
 }
 export const updateAvatarVersion = ()=>{
   myAvatarVersion.value++
@@ -32,7 +32,10 @@ export const updateAvatarVersion = ()=>{
 export const getAvatarVersion = ()=>myAvatarVersion
 
 export const getDefaultLocale =()=> useNuxtApp().$i18n.defaultLocale
-export const t = (txt:string,options?:any):string => typeof txt !='string' ?'' : useNuxtApp().$i18n.t(txt.trim(),options)
+export const t = (txt:string,options?:any):string => {
+  if (!txt || typeof txt !='string') return ''
+  return useNuxtApp().$i18n.t(txt.trim(),options)
+}
 export const upperFirst = (str:string) => _.upperFirst(str)
 export const labelSorter = (a,b)=>{
    const nameA = a.label.toUpperCase(); // ignore upper and lowercase

package/templates/nuxt/nuxt.config.ts._eta

@@ -72,7 +72,7 @@ export default defineNuxtConfig({
         '@nuxtjs/i18n',
         'dayjs-nuxt',
         '@sidebase/nuxt-auth',
-        'nuxt-primevue',
+        '@primevue/nuxt-module',
         '@nuxtjs/apollo',
         // '@nuxtjs/pwa', //cannot turn on, will cause nuxt cant start
         // "nuxt-security",     //temporary avoid nuxt-security cause cors
@@ -125,7 +125,10 @@ export default defineNuxtConfig({
         options: {
             ripple: true,
             inputStyle: 'filled',
-
+            unstyled: true,
+            ptOptions: {
+                mergeProps: true,
+            },
         },
         components: {
             include: '*',
@@ -134,9 +137,7 @@ export default defineNuxtConfig({
         directives: {
             include: ['Ripple', 'Tooltip', 'Badge', 'FocusTrap']
         },
-        cssLayerOrder: 'tailwind-base, primevue, tailwind-utilities',
-        importPT: { as: 'SimpleAppPT', from: path.resolve(__dirname, './assets/primevue/passthrough.ts') },
-
+        importPT: { from: '../presets/lara/'},
 
     },
     // pinia: {

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

@@ -14,7 +14,6 @@ const doc = useNuxtApp().$DocnoformatDoc();
 
 const props = defineProps<{ _id: string }>();
 const after = (actionName: string, data: Docnoformat) => {
-  console.log("Docnoformat capture after emits ", actionName);
   switch (actionName) {
     case "new":
       goTo(doc.getDocName(), "new");

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

@@ -32,6 +32,7 @@
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp generator.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-09-09
  * author: Ks Tan
  */

package/templates/nuxt/pages/[xorg]/organization/[id].vue.eta

@@ -14,24 +14,28 @@ const doc = useNuxtApp().$BranchDoc();
 
 const props = defineProps<{ _id: string }>();
 const after = (actionName: string, data: Branch) => {
-  console.log("Branch capture after emits ", actionName,doc.getDocName().toLowerCase());
+  // console.log(
+  //   "Branch capture after emits ",
+  //   actionName,
+  //   doc.getDocName().toLowerCase(),
+  // );
   switch (actionName) {
     case "new":
-      goTo('organization');
+      goTo("organization");
       break;
     case "create":
-      goTo('organization');
-      refreshDocumentList('branch');
+      goTo("organization");
+      refreshDocumentList("branch");
       useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());
       break;
     case "update":
-      goTo('organization');
-      refreshDocumentList('branch');
-      useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());      
+      goTo("organization");
+      refreshDocumentList("branch");
+      useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());
       break;
     case "delete":
-      goTo('organization');
-      refreshDocumentList('branch');
+      goTo("organization");
+      refreshDocumentList("branch");
       useNuxtApp().$event("CloseDialog", doc.getDocName().toLowerCase());
       break;
   }

package/templates/nuxt/pages/[xorg]/organization/new.vue.eta

@@ -12,26 +12,24 @@
 import { Branch } from "~/simpleapp/generate/types";
 const doc = useNuxtApp().$BranchDoc();
 
-
 const after = (actionName: string, data: Branch) => {
-  console.log("Branch capture after emits ", actionName,'branch');
+  // console.log("Branch capture after emits ", actionName, "branch");
   switch (actionName) {
     case "create":
-      goTo('organization');
-      refreshDocumentList('branch');
-      useNuxtApp().$event("CloseDialog", 'branch');
+      goTo("organization");
+      refreshDocumentList("branch");
+      useNuxtApp().$event("CloseDialog", "branch");
       break;
     case "update":
-      goTo('organization');
-      refreshDocumentList('branch');
-      useNuxtApp().$event("CloseDialog", 'branch');
-      
+      goTo("organization");
+      refreshDocumentList("branch");
+      useNuxtApp().$event("CloseDialog", "branch");
 
       break;
     case "delete":
-      goTo('organization');
-      refreshDocumentList('branch');
-      useNuxtApp().$event("CloseDialog", 'branch');
+      goTo("organization");
+      refreshDocumentList("branch");
+      useNuxtApp().$event("CloseDialog", "branch");
       break;
   }
 };

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

@@ -83,8 +83,8 @@
 
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

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

@@ -7,7 +7,7 @@
  */
 const alltenants = ref<any[]>([])
 const totaltenant = ref(0)
-  const list = (await getPorfileApi().getAllTenants()).data as any[];
+  const list = (await getProfileApi().getAllTenants()).data as any[];
   if(list.length==0 || list.length>1) navigateTo('/picktenant')
   else navigateTo (`/${list[0].permissions[0].xOrg}`)
   

package/templates/nuxt/pages/{profile.vue.eta → profile.vue._eta}

@@ -123,8 +123,8 @@
 </template>
 <script setup lang="ts">
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator during initialization. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

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

@@ -69,6 +69,12 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           console.error("unknown error")
           throw createError({statusCode:500,statusMessage:"Internal server error"}) 
         }
+        //   if (error.response) {
+      //     console.error("Backend error response:", error.response.data);
+      // } else {
+      //     console.error("Network error:", error);
+      // }
+      return Promise.reject(error);
       });      
     return {
         provide: {

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

@@ -39,7 +39,12 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           branches:ref([]),
           invites : ref([]),
           time:ref(''),
-          moreProps:ref()
+          moreProps:ref(),
+          package: ref(),
+          appintegration: ref({
+            einvoice: false,
+            simbiz6: false
+          })
         }),
         
         actions:{    
@@ -52,9 +57,9 @@ export default defineNuxtPlugin( async(nuxtApp) => {
             
             let apiurl=''
             if(xorg===undefined){
-              apiurl = `${useRuntimeConfig().public.APP_URL}/api`
+              apiurl = `${useRuntimeConfig().public.appUrl}/api`
             }else{
-              apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
+              apiurl = `${useRuntimeConfig().public.appUrl}/api/${xorg}`
             }
           
             return await new PROFILEApi(undefined,apiurl,$axios).getProfile().then((res:AxiosResponse)=>{            
@@ -85,14 +90,15 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               this.time = res.data.time              
               this.invites = res.data.invites
               this.moreProps = res.data.moreProps
-
+              this.package = res.data.moreProps.package;
+              this.appintegration.einvoice = res.data.appintegration.einvoice;
+              this.appintegration.simbiz6 = res.data.appintegration.simbiz6;
               let cachegroup = useCookie('currentGroup').value  ?? ''                            
               if(!this.groups || !this.groups.includes(cachegroup)){
                 cachegroup=''                
               }
               this.currentGroup = cachegroup
               useNuxtApp().$event('pickGroup',cachegroup)
-
               return Promise.resolve(true)
                 // return true
             }).catch((err:any)=>{            
@@ -107,12 +113,12 @@ export default defineNuxtPlugin( async(nuxtApp) => {
             let apiurl=''
             
             if(!xorg){
-              apiurl = `${useRuntimeConfig().public.APP_URL}/api`
+              apiurl = `${useRuntimeConfig().public.appUrl}/api`
             }else{
               try{
                 const xorgdecode = atob(<string>xorg)
                 if(xorgdecode.includes('-')){
-                  apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
+                  apiurl = `${useRuntimeConfig().public.appUrl}/api/${xorg}`
                 }else{                 
                   return Promise.reject('wrongxorg')
                 }
@@ -135,7 +141,7 @@ export default defineNuxtPlugin( async(nuxtApp) => {
             
           },
           async decideInvitation(id:string,decision:string){
-            const apiurl = `${useRuntimeConfig().public.APP_URL}/api`
+            const apiurl = `${useRuntimeConfig().public.appUrl}/api`
             const {$axios} = useNuxtApp()
             // console.log("decideInvitation",id,decision)
             const result = await new PROFILEApi(undefined,apiurl,$axios).decideInvitation(id,decision)
@@ -155,11 +161,70 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               this.roles.includes('superuser') 
               ){
               return true
-            }else{
+            }else if( resourcename == 'Paymentverify'){
+              if (
+                this.roles.includes('admin') ||
+              this.roles.includes('manager') 
+              ){
+                return true;
+              }
+            }
+            else if( resourcename == 'Reminder'){
+              if (
+                this.roles.includes('admin') ||
+              this.roles.includes('manager') 
+              ){
+                return true;
+              }
+            }
+            else if( resourcename == 'Generateinvoice'){
+              if (
+                this.roles.includes('admin') ||
+                this.roles.includes('manager') ||
+                this.roles.includes('executive')
+              ){
+                return true;
+              }
+            }
+            else if( resourcename == 'Upgradelevel'){
+              if (
+                this.roles.includes('admin') ||
+                this.roles.includes('manager') ||
+                this.roles.includes('executive')
+              ){
+                return true;
+              }
+            }
+            else if( resourcename == 'Appintegration'){
+              if (
+                this.roles.includes('admin') ||
+                this.roles.includes('manager')
+              ){
+                return true;
+              }
+            }
+            else if( resourcename == 'Postingtosimbiz'){
+              if (
+                this.roles.includes('admin')
+              ){
+                return true;
+              }
+            }
+            else if( resourcename == 'Studentdescription'){
+              if (
+                this.roles.includes('admin') ||
+                this.roles.includes('manager') ||
+                this.roles.includes('executive')
+              ){
+                return true;
+              }
+            }
+            else{
               const checkstr= `${resourcename}:${action}`
               // console.log("verify",checkstr)
               return this.roles.includes(checkstr)
             }
+            return false;
           },
           haveAccess(resourcename:string){          
             //super admin always full access right
@@ -172,6 +237,14 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               ){
               return true
             }
+            else if( resourcename == 'Paymentverify'){
+              if (
+                this.roles.includes('admin') ||
+              this.roles.includes('manager') 
+              ){
+                return true;
+              }
+            }
             for(let i=0; i< this.roles.length; i++){
             const role:string = this.roles[i]
              if(role.includes(resourcename)){
@@ -216,11 +289,15 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               groups:this.groups,
               currentGroup:this.currentGroup,
               time:this.time,
-              moreProps: this.moreProps
-              
+              moreProps: this.moreProps,
+              package: this.package,
+              appintegration: this.appintegration
             }
             return userinfo
-          }
+          },
+          isExecutive() {
+            return this.currentGroup == 'executive';
+          },
         }        
       })
      

package/templates/nuxt/plugins/40.pusher.ts.eta

@@ -7,12 +7,15 @@
 import { defineNuxtPlugin } from "#app";
 import Pusher from 'pusher-js';
 export default defineNuxtPlugin( async(nuxtApp) => {
-    const pusherkey =  (useRuntimeConfig().app.PUSHER_KEY ?? '') as string
-    const pushercluster = (useRuntimeConfig().app.PUSHER_CLUSTER ?? '') as string    
-    const pusher = new Pusher(pusherkey, { cluster: pushercluster,});
-    return {        
+    const pusherkey =  (useRuntimeConfig().app.pusherKey ?? '') as string
+    const pushercluster = (useRuntimeConfig().app.pusherCluster ?? '') as string   
+    let pusher: Pusher | null = null;
+    if (pusherkey && pushercluster) {
+        pusher = new Pusher(pusherkey, { cluster: pushercluster,});
+    }
+    return {
         provide: {
-            pusher:pusher
+            pusher: pusher
         }
     }    
 });