@simitgroup/simpleapp-generator 1.6.7-m-alpha → 2.0.0-a-alpha

package/templates/nest/src/simple-app/.resources/resources.module.ts.eta

@@ -0,0 +1,36 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-04-02
+ * Author: Ks Tan
+ */
+import { Module } from '@nestjs/common';
+<% for(let i=0;i<it.modules.length; i++){ %>
+<% let obj = it.modules[i]%>
+<% if(!getSystemResources().includes(obj.docname.toLowerCase())){%>
+  import { <%= obj.typename %>Module } from './<%= camelToKebab(obj.resourcename) %>/<%= camelToKebab(obj.resourcename) %>.module';    
+<%}%>
+<%}%>
+
+
+@Module({
+  imports: [
+     <% for(let i=0;i<it.modules.length; i++){ %>
+      <% let obj = it.modules[i]%>
+      <% if(!getSystemResources().includes(obj.docname.toLowerCase())){%>
+        <%= obj.typename %>Module,    
+      <%}%>
+    <%}%>
+    ],
+  controllers:[],
+  providers: [],
+  exports: [
+      <% for(let i=0;i<it.modules.length; i++){ %>
+      <% let obj = it.modules[i]%>
+      <% if(!getSystemResources().includes(obj.docname.toLowerCase())){%>
+        <%= obj.typename %>Module,    
+      <%}%>
+    <%}%>
+  ],
+})
+export class SimpleAppResourcesModule {}

package/templates/nest/src/simple-app/apis/readme.md.eta

@@ -0,0 +1,9 @@
+# Intro
+1. this folder manage none standard api for json schema object, such as:
+    - additional api
+    - print api
+2. design as each json schema object have own dedicated controller, module, service
+3. modify .module/.service to full fill api requirement
+4. keep content of service.ts minimal, you shall store most of the source code/types at src/simple-app/feature/your-function
+5. controller not changable. it will always override by generator, according json schema
+

package/templates/nest/src/simple-app/apis/resource-api.module.ts.eta

@@ -0,0 +1,37 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-09-01
+ * Author: Ks Tan
+ */
+import { Module } from '@nestjs/common';
+<% const loadapi = true; %>
+<% for(let i=0;i<it.modules.length; i++){ %>
+<% let obj = it.modules[i]%>
+<% if(loadapi && obj.api && obj.api.length>0 && !getSystemResources().includes(obj.docname)){%>
+  import { <%= obj.typename %>ApiModule } from './<%= camelToKebab(obj.resourcename) %>-api/<%= camelToKebab(obj.resourcename) %>-api.module';    
+<%}%>
+<%}%>
+
+
+@Module({
+  imports: [
+     <% for(let i=0;i<it.modules.length; i++){ %>
+      <% let obj = it.modules[i]%>
+      <% if( loadapi && obj.api && obj.api.length>0 && !getSystemResources().includes(obj.docname)){%>
+        <%= obj.typename %>ApiModule,    
+      <%}%>
+    <%}%>
+    ],
+  controllers:[],
+  providers: [],
+  exports: [
+    <% for(let i=0;i<it.modules.length; i++){ %>
+      <% let obj = it.modules[i]%>
+      <% if( loadapi && obj.api && obj.api.length>0 && !getSystemResources().includes(obj.docname)){%>
+        <%= obj.typename %>ApiModule,    
+      <%}%>
+    <%}%>
+  ],
+})
+export class SimpleAppResourceApiModule {}

package/templates/nest/src/simple-app/events/branch-event/branch-event.module.ts._eta

@@ -0,0 +1,20 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-04-02
+ * Author: Ks Tan
+ */
+import { Module } from '@nestjs/common';
+
+import { BranchModule } from 'src/simple-app/.core/resources/branch/branch.module';
+import { AutoIncreamentModule } from 'src/simple-app/.core/features/auto-increament/auto-increament.module';
+import { BranchEventService } from './branch-event.service';
+import { DocumentNoFormatModule } from 'src/simple-app/.core/features/document-no-format/document-no-format.module';
+
+@Module({
+  imports: [DocumentNoFormatModule,BranchModule,AutoIncreamentModule],
+  controllers: [],
+  providers: [BranchEventService],
+  exports: [BranchEventService],
+})
+export class BranchEventModule {}

package/templates/nest/src/simple-app/events/branch-event/branch-event.service.ts._eta

@@ -0,0 +1,43 @@
+import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
+import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { Branch } from './branch-event.type';
+import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
+import { EventBeforeCreate, EventAfterCreate } from 'src/simple-app/.core/features/event/interface';
+import { BranchService } from 'src/simple-app/.core/resources/branch/branch.service';
+import { CreatePayload } from 'src/simple-app/.core/features/event/event.type';
+import { AutoIncreamentService } from 'src/simple-app/.core/features/auto-increament/auto-increament.service';
+import { DocumentNoFormatService } from 'src/simple-app/.core/features/document-no-format/document-no-format.service';
+import { GenerateLogoService } from 'src/simple-app/features/generate-image/generate-logo/generate-logo-service';
+
+@Injectable()
+export class BranchEventService implements EventBeforeCreate<Branch>, EventAfterCreate<Branch> {
+  constructor(
+    private branchSvc: BranchService,
+    private autoIncreamentSvc: AutoIncreamentService,
+    private docNoGeneratorSvc: DocumentNoFormatService,
+    private generateLogoSvc: GenerateLogoService,
+  ) {}
+
+  @OnEvent('branch.before-create')
+  async beforeCreate(appUser: UserContext, payload: CreatePayload<Branch>) {
+    const searchresult = await this.autoIncreamentSvc.runGenerateNextNo(appUser, 'branch', 'branchId');
+    payload.data.branchId = searchresult.nextNo;
+    console.log('branch.before-create', payload);
+  }
+
+  @OnEvent('branch.after-create')
+  async afterCreate(appUser: UserContext, payload: CreatePayload<Branch>) {
+    try{
+      const data = payload.data;
+      if(data.branchId==0){
+        throw new BadRequestException('Create branch failed due to branchId=0')
+      }
+
+      await this.docNoGeneratorSvc.generateBranchDefaultDocNumbers(appUser, data);
+      await this.generateLogoSvc.generateLogo(appUser, data.branchName, data._id, data.tenantId, data.orgId, data.branchId);
+    }catch(e){
+      return e
+    }
+    
+  }
+}

package/templates/nest/src/simple-app/events/branch-event/branch-event.type.ts._eta

@@ -0,0 +1,7 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-04-02
+ * Author: Ks Tan
+ */
+export * from '../../.core/resources/branch/branch.schema';

package/templates/nest/src/simple-app/events/events.module.ts._eta

@@ -0,0 +1,17 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-04-02
+ * Author: Ks Tan
+ */
+import { Module } from '@nestjs/common';
+import { OrganizationEventModule } from './organization-event/organization-event.module';
+import { BranchEventModule } from './branch-event/branch-event.module';
+import { PermissionEventModule } from './permission-event/permission-event.module';
+@Module({
+  imports: [TenantEventModule,OrganizationEventModule,BranchEventModule,PermissionEventModule],
+  controllers:[],
+  providers: [],
+  exports: [TenantEventModule,OrganizationEventModule,BranchEventModule,PermissionEventModule],
+})
+export class SimpleAppEventsModule {}

package/templates/nest/src/simple-app/events/organization-event/organization-event.module.ts._eta

@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+
+import { OrganizationModule } from 'src/simple-app/.core/resources/organization/organization.module';
+import { AutoIncreamentModule } from 'src/simple-app/.core/features/auto-increament/auto-increament.module';
+import { OrganizationEventService } from './organization-event.service';
+import { GenerateLogoModule } from 'src/simple-app/features/generate-image/generate-logo/generate-log-module';
+@Module({
+  imports: [ OrganizationModule, GenerateLogoModule, AutoIncreamentModule],
+  controllers: [],
+  providers: [OrganizationEventService],
+  exports: [OrganizationEventService],
+})
+export class OrganizationEventModule {}

package/templates/nest/src/simple-app/events/organization-event/organization-event.service.ts._eta

@@ -0,0 +1,52 @@
+import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
+import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { Organization } from './organization-event.type';
+import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
+import { EventBeforeCreate, EventAfterCreate, EventBeforeUpdate } from 'src/simple-app/.core/features/event/interface';
+import { OrganizationService } from 'src/simple-app/.core/resources/organization/organization.service';
+import { CreatePayload, UpdatePayload } from 'src/simple-app/.core/features/event/event.type';
+import { AutoIncreamentService } from 'src/simple-app/.core/features/auto-increament/auto-increament.service';
+import { GenerateLogoService } from 'src/simple-app/features/generate-image/generate-logo/generate-logo-service';
+import { getCountriesForTimezone, getCurrencyCode } from 'src/simple-app/.core/utils/locale-tool';
+
+
+@Injectable()
+export class OrganizationEventService implements 
+  EventBeforeCreate<Organization>, 
+  EventAfterCreate<Organization>,
+  EventBeforeUpdate<Organization>
+   {
+  constructor(
+    private organizationSvc: OrganizationService,
+    private autoIncreamentSvc: AutoIncreamentService,
+    private generateLogoSvc: GenerateLogoService,
+  ) {}
+
+  @OnEvent('organization.before-create',{suppressErrors:false})
+  async beforeCreate(appUser: UserContext, payload: CreatePayload<Organization>) {
+    const searchresult = await this.autoIncreamentSvc.runGenerateNextNo(appUser, 'organization', 'orgId');
+    payload.data.orgId = searchresult.nextNo;
+    console.log('organization.before-create', payload);
+  }
+
+  @OnEvent('organization.after-create',{suppressErrors:false})
+  async afterCreate(appUser: UserContext, payload: CreatePayload<Organization>) {
+    const data = payload.data;
+    if (data.orgId == 0) {
+      throw new BadRequestException('Create branch failed due to orgId=0');
+    }
+    // await this.generateLogoSvc.generateLogo(appUser, data.orgName, data._id, data.tenantId, data.orgId, data.organizationId);
+  }
+
+  @OnEvent('organization.after-create',{suppressErrors:false})
+  async beforeUpdate(appUser: UserContext, payload: UpdatePayload<Organization>): Promise<void> {
+    if (payload.prevData.timeZone != payload.newData.timeZone) {
+      const timeZoneInfo = getCountriesForTimezone(payload.newData.timeZone);
+      payload.newData.country = timeZoneInfo['id'];
+      // newdata.currency = getCurrencyCode(timeZoneInfo['id']);
+    }
+  }
+
+
+
+}

package/templates/nest/src/simple-app/events/organization-event/organization-event.type.ts._eta

@@ -0,0 +1 @@
+export * from '../../.core/resources/organization/organization.schema';

package/templates/nest/src/simple-app/events/permission-event/permission-event.module.ts.eta

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+
+import { PermissionEventService } from './permission-event.service';
+import { PermissionModule } from 'src/simple-app/.core/resources/permission/permission.module';
+@Module({
+  imports: [PermissionModule],
+  controllers: [],
+  providers: [PermissionEventService],
+  exports: [PermissionEventService],
+})
+export class PermissionEventModule {}

package/templates/nest/src/simple-app/events/permission-event/permission-event.service.ts.eta

@@ -0,0 +1,33 @@
+import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
+import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { Permission } from './permission-event.type';
+import { OnEvent } from '@nestjs/event-emitter';
+import { EventBeforeCreate, EventAfterCreate } from 'src/simple-app/.core/features/event/interface';
+import { PermissionService } from 'src/simple-app/.core/resources/permission/permission.service';
+import { CreatePayload } from 'src/simple-app/.core/features/event/event.type';
+
+@Injectable()
+export class PermissionEventService implements EventBeforeCreate<Permission>, EventAfterCreate<Permission> {
+  constructor(
+    private permissionSvc: PermissionService,
+  ) {}
+
+  @OnEvent('permission.before-create')
+  async beforeCreate(appUser: UserContext, payload: CreatePayload<Permission>) {
+
+  }
+
+  @OnEvent('permission.after-create')
+  async afterCreate(appUser: UserContext, payload: CreatePayload<Permission>) {
+    const data = payload.data;
+    if(data.tenantId ==0){
+      throw new BadRequestException('Create permission failed due to tenantId=0')
+    }
+    if(data.orgId ==0){
+      throw new BadRequestException('Create permission failed due to orgId=0')
+    }
+    if(data.branchId ==0){
+      throw new BadRequestException('Create permission failed due to branchId=0')
+    }
+  }
+}

package/templates/nest/src/simple-app/events/permission-event/permission-event.type.ts.eta

@@ -0,0 +1 @@
+export * from '../../.core/resources/permission/permission.schema';

package/templates/nest/src/simple-app/events/readme.md.eta

@@ -0,0 +1,76 @@
+# Introduction
+1. all event store here (beforeCreate, afterCreate,...)
+2. 1 resource 1 folder, 1 resource module
+3. keep source code minimal, main source code park at feature instead
+4. steps:
+    a. create resource folder (student)
+    b. create student-event.event.ts (sample1) and student-event.module.ts (sample2)
+    c. modify src/simple-app/events/events.module.ts to import & export "StudentEventModule" from student-event.module
+5. Supported event:
+  - before-create
+  - after-create
+  - before-update
+  - after-update
+  - before-delete
+  - after-delete    
+    
+    
+# sample1: student.event.ts
+```ts
+//student.event.ts
+import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
+import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import * as schema from 'src/simple-app/.resources/student/student.schema'
+import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
+
+import { EventBeforeCreate } from 'src/simple-app/.core/features/event/interface';
+import { CreatePayLoad } from 'src/simple-app/.core/features/event/event.type';
+@Injectable()
+export class StudentEvent implements EventBeforeUpdate<Student>{
+  constructor() {}
+  
+  @OnEvent('student.before-create')
+  async runBeforeCreate(
+    appuser: UserContext,
+    payloads: {    
+        data: schema.Student,
+    },
+  ) {
+    console.log("student.beforeCreate")
+  }
+
+}
+```
+
+
+# sample2: student-event.module.ts
+```ts
+//student-event.module.ts
+import { Module } from '@nestjs/common';
+
+import { StudentEvent } from './student.event';
+
+@Module({
+  imports: [],
+  controllers: [],
+  providers: [StudentEvent],
+  exports: [StudentEvent],
+})
+export class StudentEventModule {}
+```
+
+
+# sample3: import/export student event module
+```ts
+// events.module.ts
+import { Module } from '@nestjs/common';
+import {StudentEventModule} from './student/student-event.module'
+@Module({
+  imports: [StudentEventModule],
+  controllers: [],
+  providers: [],
+  exports: [StudentEventModule],
+})
+export class SimpleAppEventsModule {}
+
+```

package/templates/nest/src/simple-app/events/tenant-event/tenant-event.module.ts_eta

@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { TenantModule } from 'src/simple-app/.core/resources/tenant/tenant.module';
+import { AutoIncreamentModule } from 'src/simple-app/.core/features/auto-increament/auto-increament.module';
+import { TenantEventService } from './tenant-event.service';
+@Module({
+  imports: [TenantModule, AutoIncreamentModule],
+  controllers: [],
+  providers: [TenantEventService],
+  exports: [TenantEventService],
+})
+export class TenantEventModule {}

package/templates/nest/src/simple-app/events/tenant-event/tenant-event.service.ts_eta

@@ -0,0 +1,30 @@
+import { BadRequestException, InternalServerErrorException, HttpException, Injectable, Inject } from '@nestjs/common';
+import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { Tenant } from './tenant-event.type';
+import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
+import { EventBeforeCreate, EventAfterCreate } from 'src/simple-app/.core/features/event/interface';
+import { TenantService } from 'src/simple-app/.core/resources/tenant/tenant.service';
+import { CreatePayLoad } from 'src/simple-app/.core/features/event/event.type';
+import { AutoIncreamentService } from 'src/simple-app/.core/features/auto-increament/auto-increament.service';
+
+@Injectable()
+export class TenantEventService implements EventBeforeCreate<Tenant>, EventAfterCreate<Tenant> {
+  constructor(
+    private tenantSvc: TenantService,
+    private autoIncreamentSvc: AutoIncreamentService,
+  ) {}
+
+  @OnEvent('tenant.before-create')
+  async beforeCreate(appUser: UserContext, payload: CreatePayLoad<Tenant>) {
+    const searchresult = await this.autoIncreamentSvc.runGenerateNextNo(appUser, 'tenant', 'tenantId');
+    payload.data.tenantId = searchresult.nextNo;
+  }
+
+  @OnEvent('tenant.after-create')
+  async afterCreate(appUser: UserContext, payload: CreatePayLoad<Tenant>) {
+    const data = payload.data;
+    if(data.tenantId ==0){
+      throw new BadRequestException('Create branch failed due to tenantId=0')
+    }
+  }
+}

package/templates/nest/src/simple-app/events/tenant-event/tenant-event.type.ts_eta

@@ -0,0 +1 @@
+export * from '../../.core/resources/tenant/tenant.schema';

package/templates/nest/src/{simpleapp/additional.module.ts._eta → simple-app/features/features.module.ts._eta}

@@ -1,13 +1,14 @@
 /**
- * This file was automatically generated by simpleapp generator. It is changable.
+ * This file was automatically generated by simpleapp generator. Every
  * --remove-this-line-to-prevent-override--
- * last change 2025-05-22
- * Author: 
+ * last change 2024-04-02
+ * Author: Ks Tan
  */
-
-export default {
+import { Module } from '@nestjs/common';
+@Module({
   imports: [],
-  controllers: [],
+  controllers:[],
   providers: [],
   exports: [],
-}
+})
+export class SimpleAppFeaturesModule {}

package/templates/nest/src/{printapi/printapi.module.ts.eta → simple-app/features/print/print.module.ts.eta}

@@ -5,11 +5,11 @@
  * Author: Ks Tan
  */
 import { Module } from '@nestjs/common';
-import { PrintApiService } from './printapi.service';
+import { PrintService } from './print.service';
 @Module({
   imports: [],
   controllers: [],
-  providers: [PrintApiService],
-  exports: [PrintApiService],
+  providers: [PrintService],
+  exports: [PrintService],
 })
-export class PrintapiModule {}
+export class PrintModule {}

package/templates/nest/src/{printapi/printapi.service.ts.eta → simple-app/features/print/print.service.ts.eta}

@@ -6,29 +6,29 @@
  */
 
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
+import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
 import * as api from './api';
 
 @Injectable()
-export class PrintApiService {
+export class PrintService {
   constructor() {}
 
-  getConfig(appuser: UserContext) {
+  getConfig(appUser: UserContext) {
     const config: api.Configuration = {
       basePath: process.env.PRINTAPI_SERVER,
-      accessToken: appuser.getUserToken(),
+      accessToken: appUser.getUserToken(),
       isJsonMime(mime) {
         return true;
       },
     };
     return config;
   }
-  async getBase64Pdf(appuser: UserContext, formatid: string, id: string) {
-    const printapi = new api.DefaultApi(this.getConfig(appuser), undefined);
+  async getBase64Pdf(appUser: UserContext, document:string, formatid: string, id: string) {
+    const printapi = new api.DefaultApi(this.getConfig(appUser), undefined);
     try {
       const result: any = await printapi.runPdfBase64(formatid, id, {
         headers: {
-          'x-org': appuser.getXOrg(),
+          'x-org': appUser.getXOrg(),
         },
       });
 

package/templates/nest/src/simple-app/features/readme.md._eta

@@ -0,0 +1,6 @@
+# introduction
+all manual coding place here, such as:
+1. 3party integration modules like e-invoice, accounting
+2. shared source code use by api, queues, events
+3. reporting source code
+4. 1 module 1 folder

package/templates/nest/src/simple-app/simple-app.module.ts.eta

@@ -0,0 +1,32 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-09-01
+ * Author: Ks Tan
+ */
+import { Module } from '@nestjs/common';
+import {SimpleAppCoreModule} from './.core/simple-app-core.module'
+import {SimpleAppResourcesModule} from './.resources/resources.module'
+import {SimpleAppEventsModule} from './events/events.module'
+import {SimpleAppFeaturesModule} from './features/features.module'
+
+import { SimpleAppResourceApiModule } from './apis/resource-api.module';
+
+
+@Module({
+  imports: [
+    SimpleAppCoreModule,
+    SimpleAppResourcesModule,
+    SimpleAppEventsModule,
+    SimpleAppResourceApiModule,
+  ],
+  controllers: [],
+  providers: [],
+  exports:[
+     SimpleAppCoreModule,
+    SimpleAppResourcesModule,
+    SimpleAppEventsModule,
+    SimpleAppResourceApiModule,
+  ]
+})
+export class SimpleAppModule {}

package/templates/nuxt/.env._eta

@@ -10,6 +10,8 @@ APP_URL=http://localhost:<%=it.configs.frontendPort%>
 
 API_URL=http://localhost:<%=it.configs.frontendPort%>/api
 
+AVATAR_URL=https://xxxxx.ap-southeast-1.amazonaws.com/bucket-xxx/
+
 DEBUGDATA=1
 
 OAUTH2_CONFIGURL=<%=it.configs.oauthSetting.oauthRealmUrl%>

package/templates/nuxt/app.vue.eta

@@ -39,13 +39,21 @@ const getLayout = ()=>{
   // } 
 }
 
-onMounted(()=>{
-  const currentgroup = useCookie('currentGroup').value
-  //if no xorg, no enforce pick group
-  if(getCurrentXorg()){
-    if (!currentgroup)goTo('pickgroup')
-    setGraphqlServer()
-  }
+onMounted(async()=>{
+    const x = useAuthState()
+  if(x.data.value?.expires && x.data.value?.expires > new Date().toISOString()){
+    await reloadUserStore()
+    const currentgroup = useCookie('currentGroup').value
+    //if no xorg, no enforce pick group
+    if(getCurrentXorg()){
+      if (!currentgroup)goTo('pickgroup')
+      setGraphqlServer()
+    }
+  }else{
+    if(useRoute().path!='/login'){
+      navigateTo("/login");
+    }    
+  } 
     
 })
 </script>

package/templates/nuxt/components/header/HeaderSelectBranch.vue.eta

@@ -47,7 +47,8 @@ const getBranchesForOrg = (org: Org) => {
 
   return branchlist;
 };
-const switchXorg = () => {
+const switchXorg = async () => {
   navigateTo(`/${selectedbranch.value}`, { external: true });
+  await reloadUserStore()
 };
 </script>

package/templates/nuxt/components/image/ImageAvatar.vue._eta

@@ -0,0 +1,63 @@
+<template>
+  <div>
+    <ImageToBase64Uploader
+      v-if="changable"
+      #default
+      :style="`width:${size}px; height:${size} px`"
+      :class="`place-content-center `"
+      @image-uploaded="handleBase64"
+      :imagePath="imagepath"
+    >
+      <NuxtImg
+        v-if="uid"
+        class="w-full h-full border-4 rounded-full"
+        :src="imagepath"
+        :key="imageKey"
+        provider="cloudflare"
+      />
+    </ImageToBase64Uploader>
+    <div
+      v-else
+      class="inline-block text-black"
+      :style="`width:${size}px; height:${size} px`"
+    >
+      <NuxtImg
+        v-if="uid"
+        class="w-full h-full border rounded-full"
+        :key="refreshkey"
+        :src="imagepath"
+        provider="cloudflare"
+      />
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { updateAvatarVersion } from "~/composables/stringHelper.generate";
+import { PHOTOSIZE } from "~/types";
+
+// import {KeyValue} from ''
+const props = defineProps<{
+  changable?: boolean;
+  size?: PHOTOSIZE;
+  uid?: string;
+  refreshkey?: number;
+}>();
+const size = computed(() => props.size ?? PHOTOSIZE.S64);
+const imageKey = ref(0);
+const uid = computed(() => props.uid ?? getUserProfile()?.uid);
+// const xorgpath = getCurrentXorg() ? `${getCurrentXorg()}/` : "MC0wLTA/";
+
+const imagepath = computed(() => useUserInfo().getAvatarByUid(uid.value,size.value)); //`${xorgpath}images/organization/${orgRecordId.value}`;
+
+const handleBase64 = async (data: string) => {
+  await fetch(`/api/profile/avatar`, {
+    method: "POST",
+    body: data.split("base64,")[1],
+  }).then(async (res) => {
+    await fetch(imagepath.value, { cache: "reload", credentials: "include" });
+    imageKey.value++;
+    updateAvatarVersion();
+    // useNuxtApp().$event('RefreshUser',uid.value)
+  });
+};
+</script>