@simitgroup/simpleapp-generator 1.2.6 → 1.2.7

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

@@ -26,7 +26,7 @@ import SimpleAppValue from './SimpleAppValue.vue'
 import {ref} from 'vue'
 
 
-const uuid =  crypto.randomUUID();
+const uuid =  randomUUID();
 // const fieldlabel = ref('')
 // const fielddesc = ref('')
 const defaultcssclass='simpleapp-input-container'

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

@@ -34,7 +34,7 @@ import _, { upperFirst } from 'lodash'
         type keytype = keyof defaulttype
         
         const x : keytype = 'Default'+ props.document.getDocName(true)   as keytype
-        const defaultvalue = alldefaults[x](crypto.randomUUID())
+        const defaultvalue = alldefaults[x](randomUUID())
         return {
             path: path,
             key: _.last(path.split('/')),

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

@@ -1,14 +1,15 @@
 <template>
+    <!-- dont modify this component -->
     <div class="simpleapp-tool-bar flex flex-row text-left gap-4">           
         <div v-for="(menu,index) in menus" :key="index">
             <div>
-                <Button v-if="showMenuButton(menu)" @click="emitEvent(menu,$event)">{{ menu.label  }}</Button>
+                <ButtonDefault v-if="showMenuButton(menu)" @click="emitEvent(menu,$event)">{{ menu.label  }}</ButtonDefault>
             </div>
             
         </div>  
         <div v-for="(menu,index) in getDocActions()" :key="index">
             <div>
-                <Button @click="emitEvent(menu,$event)">{{ menu.label  }}</Button>
+                <ButtonDefault @click="emitEvent(menu,$event)">{{ menu.label  }}</ButtonDefault>
             </div>
             
         </div>     

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

@@ -172,7 +172,7 @@ import Slider,{ SliderProps }  from 'primevue/slider';
 import Textarea, { TextareaProps } from 'primevue/textarea';
 import {SimpleAppInputType} from '~/types'
 
-const modelValue = defineModel()
+const modelValue = defineModel({required:true})
 const datevalue = ref('')
 const timevalue = ref<Date>()
 

package/templates/nuxt/components/simpleApp/pending/SimpleAppValue.vue

@@ -22,7 +22,7 @@ import {camelCaseToWords} from './helper'
 import {computed,watch} from 'vue'
 import {ref} from 'vue'
 const modelValue = defineModel()
-const uuid = crypto.randomUUID()
+const uuid = randomUUID()
 const fieldlabel = ref('')
 const fielddesc = ref('')
 const defaultcssclass='simpleapp-input-container'

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

@@ -0,0 +1 @@
+export const isMobile = () => window.innerWidth <= 640

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

@@ -1,12 +1,14 @@
 import _ from 'lodash'
 import {Md5} from 'ts-md5'
 import moment from "moment";
+import { v4 as uuidv4 } from 'uuid';
+
 export const camelCaseToWords = (s: string) =>{
     const result = s.replace(/([A-Z])/g, ' $1');
     return result.charAt(0).toUpperCase() + result.slice(1);
   }
   
-
+export const randomUUID = ()=> uuidv4() 
 export const md5=(s:string)=>  new Md5().appendStr(s).end()
 
 export const getAvatarLink = (email:string, size:number):string=>{

package/templates/nuxt/error.vue._eta

@@ -9,7 +9,7 @@
                       </div>
                       <div>
                         <h1 class="px-4 pt-2 pb-4 text-left text-5xl font-bold leading-10 text-gray-800">OOPS!</h1>                    
-                        <p class="px-4 mt mb-4 text-4xl text-left font font-bold">{{error?.statusCode}} Error</p>                    
+                        <p class="px-4 mt mb-4 text-4xl text-left font font-bold">{{isNaN(error?.statusCode) ? t('server'): error?.statusCode}} Error</p>                    
                         <p class="px-4 pb-10 text-base leading-none text-left text-red-400">{{t(error?.statusMessage)}}</p>  
                         <p>    <Button @click="handleError" class="btn-primary">{{ t('backToHome') }}</Button></p>                  
                       </div>

package/templates/nuxt/layouts/default.vue._eta

@@ -1,10 +1,49 @@
-<script lang="ts" setup>
-// import Menus from '~/components/Menus.vue'
-</script>
 <template>
-    <div>
-        <HeaderBar />
-        <UserInvitation/>
-        <slot></slot>
+    <div class="h-full flex flex-row"  v-if="!isMobile()">
+        <div>
+            <HeaderButtonMenuPicker class="p-2  text-6xl cursor-pointer"></HeaderButtonMenuPicker>
+            <div class="" v-for="item in menus">
+                <div class="border">                    
+                    <NuxtLink 
+                        :class="`pi ${item.iconClass} p-2  text-6xl cursor-pointer`"
+                        :to="getDocumentUrl(item.path)"
+                        ></NuxtLink>
+                </div>
+            </div>            
+        </div>        
+        <div class="flex-1">
+            <HeaderBar />
+            <UserInvitation/>
+            <slot></slot>
+        </div>                
     </div>
-</template>
+    <div v-else class="mb-20">
+        <div v-if="getCurrentXorg()" class="border flex flex-row h-20 fixed left-0 w-full  justify justify-between bottom-0 z-50 bg-white dark:bg-gray-800" >
+                
+                <div v-for="item in menus">                    
+                    <NuxtLink 
+                        :class="`pi ${item.iconClass} p-2  text-6xl cursor-pointer`"
+                        :to="getDocumentUrl(item.path)"
+                        ></NuxtLink>
+                </div>
+                <HeaderButtonMenuPicker class="p-2  text-6xl cursor-pointer"></HeaderButtonMenuPicker>
+        </div> 
+        <div class="flex flex-col h-screen ">
+            
+                <HeaderBar />
+                <UserInvitation/>
+                <slot></slot>
+            
+        </div> 
+    </div>
+</template>
+<script setup lang="ts">
+const menus=[
+    // {iconClass:'pi-bars',path:'managestudents/profile'},
+    {iconClass:'pi-home',path:''},
+    {iconClass:'pi-users',path:'managestudents/profile'},
+    {iconClass:'pi-calendar',path:`manageclasses`},
+    // {iconClass:'pi-database',path:'managedata'},
+    {iconClass:'pi-chart-pie',path:'reports'},
+]
+</script>

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

@@ -26,6 +26,9 @@ export default defineNuxtConfig({
 tailwindcss: {
     // Options
   },
+  devServer: {
+      // host: "0.0.0.0",
+  },
   modules: [
     // "@hebilicious/authjs-nuxt",
     '@nuxtjs/i18n',
@@ -122,7 +125,8 @@ tailwindcss: {
   // ],
   css: [ 
     'primeicons/primeicons.css',
-    path.resolve(__dirname,'./assets/css/style.css')
+    path.resolve(__dirname,'./assets/css/style.css'),
+    path.resolve(__dirname,'./assets/css/calendar.css'),
     ],
 
   // devtools: { enabled: true },

package/templates/nuxt/pages/[xorg]/index.vue._eta

@@ -1,18 +1,20 @@
-<script lang="ts" setup>
-/**
- * This file was automatically generated by simpleapp generator.
- * YOU ALLOWED TO CHANGE THIS FILE, IT WONT OVERRIDE BY GENERATOR
- * last change 2023-10-28
- * Author: Ks Tan
- */
-</script>
 <template>
   <div class="frontpage-container">
     <client-only>
-      <title>{{ getUserProfile().branchName }}</title>
+      <title>{{ getUserProfile()?.branchName }}</title>
     </client-only>
     <h1 class="border text-3xl text-center m-20 p-20">
       {{ t("createYourContentHere") }}
     </h1>
   </div>
 </template>
+<script lang="ts" setup>
+/**
+ * This file was automatically generated by simpleapp generator.
+ * YOU ALLOWED TO CHANGE THIS FILE, IT WONT OVERRIDE BY GENERATOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+
+useNuxtApp().$event('SetTitle',t('home'))
+</script>

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

@@ -114,6 +114,11 @@ getCurrentOrg();
                   v-model="data.timeZone"
                   :setting="o.getField('#/properties/timeZone')"
                 />
+                <SimpleAppInput
+                  :input-type="SimpleAppInputType.text"
+                  v-model="data.currency"
+                  :setting="o.getField('#/properties/currency')"
+                />
               </div>
               <div>
                 <SimpleAppInput

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

@@ -24,8 +24,19 @@ export default defineNuxtPlugin( async(nuxtApp) => {
     //axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
     const myaxios = axios.create({timeout:5000})
     myaxios.interceptors.response.use((response) => response, (error) => {
-
-      if(error.response.status==401){        
+      console.error('errorerrorerrorerror',error)
+      
+      if(error.code == 'ERR_BAD_REQUEST'){
+        console.error("axios ERR_BAD_REQUEST, redirect to relogin")
+      }
+      else if(error.code){        
+        throw createError({
+          statusCode:error.code,
+          statusMessage:error.message,
+          fatal:true
+        })           
+      }
+      else if(error.response.status==401){        
         console.error("axios 401 session expired, pop up for relogin")
       }else if(error.response && error.response.status){
         let errmsg = error.response.message

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

@@ -25,6 +25,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
           orgRecordId:ref(''),
           orgCode:ref(''),
           orgName:ref(''),
+          timeZone:ref(''),
+          currency:ref(''),
           uid: ref(''),
           email: ref(''),
           fullName: ref(''),
@@ -66,6 +68,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               this.branchName = res.data.branchName
               this.orgCode = res.data.orgCode
               this.orgName = res.data.orgName
+              this.timeZone = res.data.timeZone
+              this.currency = res.data.currency
               this.uid = res.data.uid
               this.email = res.data.email
               this.fullName = res.data.fullName              
@@ -167,6 +171,8 @@ export default defineNuxtPlugin( async(nuxtApp) => {
               branchName: this.branchName,
               orgCode: this.orgCode,
               orgName: this.orgName,
+              currency: this.currency,
+              timeZone: this.timeZone,
               fullName : this.fullName,        
               branches:this.branches??[],
               invites: this.invites ?? [],

package/templates/nuxt/types/calendar.ts.eta

@@ -0,0 +1,54 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
+ * Author: Ks Tan
+ */
+
+import { ForeignKey } from "./others"
+export type OffDay={
+    _id:string
+    date:Date
+    title:string
+  }
+  
+  export type CalRightClickEvent = {
+      class: string //"vuecal__cell--day5"
+      content: number //16
+      endDate: Date //Fri Feb 16 2024 23:59:59 GMT+0800 (Malaysia Time) {}
+      formattedDate: string //"2024-02-16"
+      outOfScope: boolean //false
+      startDate: Date //Fri Feb 16 2024 00:00:00 GMT+0800 (Malaysia Time) {}
+      today:  boolean //false
+  }
+  export type CalEventType<T> = {
+    id: string //record _id
+    start: Date|string //date or ISO8601 time string
+    end: Date|string //date or ISO8601 time string
+    class? : string //css class
+    title: string
+    content?: string //unuse at the moment
+    split?: string //resource _id
+    data?: T  // object/document data bind to event
+   
+    // unuse
+    _eid?:string 
+    startTimeMinutes?:number
+    endTimeMinutes?:number  
+  };
+export type  RelocateEvent<T> = {
+    event : CalEventType<T> // {_eid: '190_1', start: Thu Jan 25 2024 13:23:00 GMT+0800 (Malaysia Time), startTimeMinutes: 803, end: Thu Jan 25 2024 14:23:00 GMT+0800 (Malaysia Time), endTimeMinutes: 863, …}
+    external : boolean
+    newDate :  Date
+    oldDate :  Date
+    newSplit :  string
+    oldSplit :  string
+    originalEvent: CalEventType<T>
+  }
+export type CalResource = ForeignKey  & {  
+    id?:string  //real id use by calendar, undefined will use _id
+    hide?:boolean //default = false
+    displayName: string; //use to display at calendar, undefine will use foreignkey label
+    email?: string; //for generate avatar only
+};
+  

package/templates/nuxt/types/documentlist.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
+ * Author: Ks Tan
+ */
 export type CellSetting  = {
     title: string
     field: string

package/templates/nuxt/types/events.ts.eta

@@ -1,8 +1,7 @@
-
 /**
  * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
  * Author: Ks Tan
  */
 import { Component } from 'vue';
@@ -14,8 +13,9 @@ export type ViewRecord = {
     label:string
     documentName: string
     viewer?: any 
-    readonly?:boolean
-    afterCreate?:Function
+    readonly?:boolean    
+    paras?:any
+    after?: (eventType:string,data:any,result:any )=>any
     document?:SimpleAppClient<any,any>
 }
 export type RefreshDocumentList ={

package/templates/nuxt/types/index.ts._eta

@@ -1,7 +1,7 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * YOU CAN MODIFY THIS FILE
+ * last change 2024-02-03
  * Author: Ks Tan
  */
 
@@ -13,4 +13,5 @@ export * from  './user'
 export * from  './documentlist'
 export * from './simpleappinput'
 export * from  './schema'
-export * from  './workflow'
+export * from  './workflow'
+export * from  './events'

package/templates/nuxt/types/listview.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
+ * Author: Ks Tan
+ */
 export type  ListItem = {
     name: string
     code: string

package/templates/nuxt/types/notifications.ts.eta

@@ -1,4 +1,9 @@
-
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
+ * Author: Ks Tan
+ */
 export enum NotificationStatus {
     'info'='info',
     'error'='error',

package/templates/nuxt/types/others.ts.eta

@@ -1,4 +1,9 @@
-
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
+ * Author: Ks Tan
+ */
 import {SimpleAppClient} from '~/simpleapp/generate/clients/SimpleAppClient'
 import {CellSetting} from './documentlist'
 import { Component } from 'vue'

package/templates/nuxt/types/schema.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
+ * Author: Ks Tan
+ */
 import  { JSONSchema7,JSONSchema7Type,JSONSchema7Version, JSONSchema7TypeName,JSONSchema7Definition } from 'json-schema';
 export type DocumentStatus = {
     status:string  //'CO', 'V', 'CL', 'D' and etc
@@ -13,6 +19,8 @@ export type DocumentStatus = {
     requiredRole?: string[]   // what special user role wish to allow for this api, example: ['SuperUser']
     workflowSetting?: {bpmn:string} //optional property, once define code gen connect the bpmn workflow
     method:RESTMethods    
+    schema?:string //any schema/type name in types & apischemas
+    responseType?:string //any schema/type name for response
     description:string //description of api
   }
   export enum IsolationType {"none"="none" , "tenant"="tenant","org"="org", "branch"="branch"}

package/templates/nuxt/types/simpleappinput.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
+ * Author: Ks Tan
+ */
 export enum SimpleAppInputType  {
     'text'='text',
     'textarea'='textarea',

package/templates/nuxt/types/user.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
+ * Author: Ks Tan
+ */
 export type UserListItem = {
     _id: string
     uid?:string
@@ -55,6 +61,8 @@ export type UserProfile = {
   branchName: string
   orgCode: string
   orgName: string
+  currency:string
+  timeZone:string
   fullName : string
   branches: {
     _id: string

package/templates/nuxt/types/workflow.ts.eta

@@ -1,4 +1,9 @@
-
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * DONT CHANGE THIS GILE CAUSE IT OVERRIDE BY GENERATEOR
+ * last change 2024-02-03
+ * Author: Ks Tan
+ */
 export type UserTaskType = {
   
     id: string