cabloy 5.1.136 → 5.1.138

package/zova/src/suite/a-home/modules/home-api/src/apiSchema/homeUserAccount.ts

@@ -0,0 +1,62 @@
+import type { IApiSchemaOptions } from 'zova-module-a-api';
+
+import { BeanBase } from 'zova';
+import { ApiSchema } from 'zova-module-a-api';
+
+import {
+  ApiApiHomeUserAccountcurrentPath,
+  ApiApiHomeUserAccountupdateProfilePath,
+  ApiApiHomeUserAccountconsumeActivationPath,
+  ApiApiHomeUserAccountchangePasswordPath,
+  ApiApiHomeUserAccountissuePasswordSetLinkPath,
+  ApiApiHomeUserAccountconsumePasswordSetPath,
+  ApiApiHomeUserAccountrequestPasswordResetPath,
+  ApiApiHomeUserAccountconsumePasswordResetPath,
+} from '../api/homeUserAccount.js';
+
+@ApiSchema()
+export class ApiSchemaHomeUserAccount extends BeanBase {
+  current(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiHomeUserAccountcurrentPath, 'get', options);
+  }
+
+  updateProfile(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiHomeUserAccountupdateProfilePath, 'patch', options);
+  }
+
+  consumeActivation(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiHomeUserAccountconsumeActivationPath, 'post', options);
+  }
+
+  changePassword(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiHomeUserAccountchangePasswordPath, 'post', options);
+  }
+
+  issuePasswordSetLink(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(
+      ApiApiHomeUserAccountissuePasswordSetLinkPath,
+      'post',
+      options,
+    );
+  }
+
+  consumePasswordSet(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(ApiApiHomeUserAccountconsumePasswordSetPath, 'post', options);
+  }
+
+  requestPasswordReset(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(
+      ApiApiHomeUserAccountrequestPasswordResetPath,
+      'post',
+      options,
+    );
+  }
+
+  consumePasswordReset(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(
+      ApiApiHomeUserAccountconsumePasswordResetPath,
+      'post',
+      options,
+    );
+  }
+}

package/zova/src/suite/a-home/modules/home-base/src/.metadata/index.ts

@@ -7,7 +7,7 @@ export * from '../service/ssrLayout.js';
 
 import 'zova-module-a-bean';
 declare module 'zova-module-a-bean' {
-  
+
     export interface IServiceRecord {
       'home-base:locale': never;
 'home-base:routerGuards': never;
@@ -15,10 +15,10 @@ declare module 'zova-module-a-bean' {
 'home-base:ssrLayout': never;
     }
 
-  
+
 }
 declare module 'zova-module-home-base' {
-  
+
         export interface ServiceLocale {
           /** @internal */
           get scope(): ScopeModuleHomeBase;
@@ -27,7 +27,7 @@ declare module 'zova-module-home-base' {
         export interface ServiceLocale {
           get $beanFullName(): 'home-base.service.locale';
           get $onionName(): 'home-base:locale';
-          
+
         }
 
         export interface ServiceRouterGuards {
@@ -38,7 +38,7 @@ declare module 'zova-module-home-base' {
         export interface ServiceRouterGuards {
           get $beanFullName(): 'home-base.service.routerGuards';
           get $onionName(): 'home-base:routerGuards';
-          
+
         }
 
         export interface ServiceSsr {
@@ -49,7 +49,7 @@ declare module 'zova-module-home-base' {
         export interface ServiceSsr {
           get $beanFullName(): 'home-base.service.ssr';
           get $onionName(): 'home-base:ssr';
-          
+
         }
 
         export interface ServiceSsrLayout {
@@ -60,8 +60,8 @@ declare module 'zova-module-home-base' {
         export interface ServiceSsrLayout {
           get $beanFullName(): 'home-base.service.ssrLayout';
           get $onionName(): 'home-base:ssrLayout';
-          
-        } 
+
+        }
 }
 /** service: end */
 /** service: begin */
@@ -89,11 +89,11 @@ export * from '../page/errorNotFound/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-home-base' {
-  
+
         export interface ControllerItemLink {
           /** @internal */
           get scope(): ScopeModuleHomeBase;
@@ -122,7 +122,7 @@ declare module 'zova-module-home-base' {
         export interface ControllerPageErrorNotFound {
           /** @internal */
           get scope(): ScopeModuleHomeBase;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -162,7 +162,7 @@ export interface IPagePathRecord {
 '/home/base//:catchAll(.*)*': TypePagePathSchema<undefined,undefined>;
 }
 export interface IPageNameRecord {
-  
+
 }
 }
 export const pagePathSchemas = {
@@ -241,7 +241,7 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'home-base': ScopeModuleHomeBase;
   }
-  
+
   export interface IBeanScopeConfig {
     'home-base': ReturnType<typeof config>;
   }
@@ -250,10 +250,10 @@ declare module 'zova' {
     'home-base': (typeof locales)[TypeLocaleBase];
   }
 
-  
+
 }
 
 export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-base::${K}` {
   return `home-base::${key}`;
-}  
+}
 /** scope: end */

package/zova/src/suite/a-home/modules/home-base/src/config/config.ts

@@ -1,5 +1,7 @@
 import type { ZovaSys } from 'zova';
 
+import AvatarUser from '../../assets/img/avatar_user.png';
+
 export const config = (_sys: ZovaSys) => {
   return {
     layout: {
@@ -10,5 +12,8 @@ export const config = (_sys: ZovaSys) => {
         height: 132,
       },
     },
+    avatar: {
+      empty: AvatarUser,
+    },
   };
 };

package/zova/src/suite/a-home/modules/home-base/src/service/routerGuards.ts

@@ -1,7 +1,7 @@
 import type { BeanRouter } from 'zova-module-a-router';
 
 import { catchError } from '@cabloy/utils';
-import { cast, Use } from 'zova';
+import { Use } from 'zova';
 import { Service } from 'zova-module-a-bean';
 import { BeanRouterGuardsBase } from 'zova-module-a-router';
 
@@ -53,12 +53,5 @@ export class ServiceRouterGuards extends BeanRouterGuardsBase {
         return { path: pagePath, replace: true };
       }
     });
-    router.beforeResolve(async to => {
-      const locale = to.meta?.locale;
-      if (locale) {
-        const localeCurrent = cast(to.params)?.locale ?? this.sys.config.locale.default;
-        this.$$serviceLocale.setLocale(localeCurrent);
-      }
-    });
   }
 }

package/zova/src/suite/a-home/modules/home-icon/src/.metadata/index.ts

@@ -291,12 +291,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'home-icon': ScopeModuleHomeIcon;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
-  
+
 /** scope: end */

package/zova/src/suite/a-home/modules/home-indexadmin/src/.metadata/index.ts

@@ -4,15 +4,15 @@ export * from '../page/dashboard/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-home-indexadmin' {
-  
+
         export interface ControllerPageDashboard {
           /** @internal */
           get scope(): ScopeModuleHomeIndexadmin;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -34,7 +34,7 @@ export interface IPagePathRecord {
   '/home/indexadmin/dashboard': TypePagePathSchema<undefined,undefined>;
 }
 export interface IPageNameRecord {
-  
+
 }
 }
 export const pagePathSchemas = {
@@ -44,7 +44,7 @@ export const pageNameSchemas = {
 
 };
 declare module 'zova-module-home-indexadmin' {
-  
+
 }
 /** pages: end */
 
@@ -64,12 +64,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'home-indexadmin': ScopeModuleHomeIndexadmin;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
-  
+
 /** scope: end */

package/zova/src/suite/a-home/modules/home-indexweb/src/.metadata/index.ts

@@ -4,15 +4,15 @@ export * from '../page/home/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-home-indexweb' {
-  
+
         export interface ControllerPageHome {
           /** @internal */
           get scope(): ScopeModuleHomeIndexweb;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -44,7 +44,7 @@ export const pagePathSchemas = {
 export const pageNameSchemas = {
 'home-indexweb:home': {
           params: NSControllerPageHome.paramsSchema,
-          
+
         },
 };
 declare module 'zova-module-home-indexweb' {
@@ -70,12 +70,12 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'home-indexweb': ScopeModuleHomeIndexweb;
   }
-  
-  
 
-  
 
-  
+
+
+
+
 }
 
 /** scope: end */

package/zova/src/suite/a-home/modules/home-layoutadmin/src/.metadata/index.ts

@@ -6,16 +6,16 @@ import { IModelOptionsLayout } from '../model/layout.js';
 import { IModelOptionsMenu } from '../model/menu.js';
 import 'zova-module-a-model';
 declare module 'zova-module-a-model' {
-  
+
     export interface IModelRecord {
       'home-layoutadmin:layout': IModelOptionsLayout;
 'home-layoutadmin:menu': IModelOptionsMenu;
     }
 
-  
+
 }
 declare module 'zova-module-home-layoutadmin' {
-  
+
         export interface ModelLayout {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutadmin;
@@ -36,7 +36,7 @@ declare module 'zova-module-home-layoutadmin' {
           get $beanFullName(): 'home-layoutadmin.model.menu';
           get $onionName(): 'home-layoutadmin:menu';
           get $onionOptions(): IModelOptionsMenu;
-        } 
+        }
 }
 /** model: end */
 /** model: begin */
@@ -55,15 +55,15 @@ export * from '../component/layoutAdmin/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-home-layoutadmin' {
-  
+
         export interface ControllerLayoutAdmin {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutadmin;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -105,11 +105,11 @@ export * from '../component/layoutAdmin/render.user.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-home-layoutadmin' {
-  
+
         export interface RenderContent {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutadmin;
@@ -153,7 +153,7 @@ declare module 'zova-module-home-layoutadmin' {
         export interface RenderUser {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutadmin;
-        } 
+        }
 }
 /** render: end */
 /** render: begin */
@@ -186,15 +186,15 @@ export * from '../component/layoutAdmin/style.js';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-home-layoutadmin' {
-  
+
         export interface StyleLayoutAdmin {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutadmin;
-        } 
+        }
 }
 /** style: end */
 /** style: begin */
@@ -231,7 +231,7 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'home-layoutadmin': ScopeModuleHomeLayoutadmin;
   }
-  
+
   export interface IBeanScopeConfig {
     'home-layoutadmin': ReturnType<typeof config>;
   }
@@ -240,10 +240,10 @@ declare module 'zova' {
     'home-layoutadmin': (typeof locales)[TypeLocaleBase];
   }
 
-  
+
 }
 
 export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-layoutadmin::${K}` {
   return `home-layoutadmin::${key}`;
-}  
+}
 /** scope: end */

package/zova/src/suite/a-home/modules/home-layoutadmin/src/component/layoutAdmin/render.user.tsx

@@ -1,6 +1,6 @@
 import { BeanRenderBase } from 'zova';
 import { Render } from 'zova-module-a-bean';
-import { $icon } from 'zova-module-a-icon';
+import { resolveImagePreviewUrl } from 'zova-module-basic-image';
 import { closeNearestDetails } from 'zova-module-home-base';
 
 @Render()
@@ -10,10 +10,27 @@ export class RenderUser extends BeanRenderBase {
       <li>
         <details>
           <summary>
+            <img
+              class="h-6 w-6 rounded-full object-cover"
+              alt="avatar"
+              src={
+                resolveImagePreviewUrl(this.$passport.user?.avatar, this.sys.config.api.baseURL) ||
+                this.$scopeBase.config.avatar.empty
+              }
+            />
             {this.$passport.user?.name}
-            {$icon(this.$passport.user?.avatar as any, 24)}
           </summary>
           <ul class="bg-base-100 rounded-t-none p-2 w-32">
+            <li>
+              <a
+                onClick={event => {
+                  this.app.$gotoPage('/home/user/account');
+                  closeNearestDetails(event);
+                }}
+              >
+                {this.scope.locale['Account Settings']()}
+              </a>
+            </li>
             <li>
               <a
                 onClick={event => {

package/zova/src/suite/a-home/modules/home-layoutadmin/src/config/locale/en-us.ts

@@ -1,6 +1,7 @@
 export default {
   'Home': 'Home',
   'Logout': 'Logout',
+  'Account Settings': 'Account Settings',
   'LanguageEnglish': 'English',
   'LanguageChinese': 'Chinese',
   'ThemeLight': 'Light',

package/zova/src/suite/a-home/modules/home-layoutadmin/src/config/locale/zh-cn.ts

@@ -1,6 +1,7 @@
 export default {
   'Home': '首页',
   'Logout': '退出登录',
+  'Account Settings': '账户设置',
   'LanguageEnglish': '英语',
   'LanguageChinese': '简体中文',
   'ThemeLight': '亮色',

package/zova/src/suite/a-home/modules/home-layoutempty/src/.metadata/index.ts

@@ -4,15 +4,15 @@ export * from '../component/layoutEmpty/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-home-layoutempty' {
-  
+
         export interface ControllerLayoutEmpty {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutempty;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -62,14 +62,14 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'home-layoutempty': ScopeModuleHomeLayoutempty;
   }
-  
+
   export interface IBeanScopeConfig {
     'home-layoutempty': ReturnType<typeof config>;
   }
 
-  
 
-  
+
+
 }
 
 /** scope: end */

package/zova/src/suite/a-home/modules/home-layoutweb/src/.metadata/component/layoutWeb.ts

@@ -27,6 +27,7 @@ declare module 'zova-module-home-layoutweb' {
   export interface RenderLocale extends ControllerLayoutWeb {}
   export interface RenderTabs extends ControllerLayoutWeb {}
   export interface RenderTheme extends ControllerLayoutWeb {}
+  export interface RenderUser extends ControllerLayoutWeb {}
 }
 export const ZLayoutWeb = defineComponent((_props: ZLayoutWebProps) => {
   useController(ControllerLayoutWeb, RenderLayoutWeb, undefined);

package/zova/src/suite/a-home/modules/home-layoutweb/src/.metadata/index.ts

@@ -6,16 +6,16 @@ import { IModelOptionsLayout } from '../model/layout.js';
 import { IModelOptionsMenu } from '../model/menu.js';
 import 'zova-module-a-model';
 declare module 'zova-module-a-model' {
-  
+
     export interface IModelRecord {
       'home-layoutweb:layout': IModelOptionsLayout;
 'home-layoutweb:menu': IModelOptionsMenu;
     }
 
-  
+
 }
 declare module 'zova-module-home-layoutweb' {
-  
+
         export interface ModelLayout {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutweb;
@@ -36,7 +36,7 @@ declare module 'zova-module-home-layoutweb' {
           get $beanFullName(): 'home-layoutweb.model.menu';
           get $onionName(): 'home-layoutweb:menu';
           get $onionOptions(): IModelOptionsMenu;
-        } 
+        }
 }
 /** model: end */
 /** model: begin */
@@ -55,15 +55,15 @@ export * from '../component/layoutWeb/controller.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-home-layoutweb' {
-  
+
         export interface ControllerLayoutWeb {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutweb;
-        } 
+        }
 }
 /** controller: end */
 /** controller: begin */
@@ -99,14 +99,15 @@ export * from '../component/layoutWeb/render.locale.jsx';
 export * from '../component/layoutWeb/render.tabs.jsx';
 export * from '../component/layoutWeb/render.theme.jsx';
 export * from '../component/layoutWeb/render.jsx';
+export * from '../component/layoutWeb/render.user.jsx';
 
 import 'zova';
 declare module 'zova' {
-  
-  
+
+
 }
 declare module 'zova-module-home-layoutweb' {
-  
+
         export interface RenderContent {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutweb;
@@ -135,7 +136,12 @@ declare module 'zova-module-home-layoutweb' {
         export interface RenderLayoutWeb {
           /** @internal */
           get scope(): ScopeModuleHomeLayoutweb;
-        } 
+        }
+
+        export interface RenderUser {
+          /** @internal */
+          get scope(): ScopeModuleHomeLayoutweb;
+        }
 }
 /** render: end */
 /** render: begin */
@@ -145,6 +151,7 @@ import { RenderLocale } from '../component/layoutWeb/render.locale.jsx';
 import { RenderTabs } from '../component/layoutWeb/render.tabs.jsx';
 import { RenderTheme } from '../component/layoutWeb/render.theme.jsx';
 import { RenderLayoutWeb } from '../component/layoutWeb/render.jsx';
+import { RenderUser } from '../component/layoutWeb/render.user.jsx';
 import 'zova';
 declare module 'zova' {
   export interface IBeanRecordLocal {
@@ -154,6 +161,7 @@ declare module 'zova' {
 'home-layoutweb.render.tabs': RenderTabs;
 'home-layoutweb.render.theme': RenderTheme;
 'home-layoutweb.render.layoutWeb': RenderLayoutWeb;
+'home-layoutweb.render.user': RenderUser;
   }
 }
 /** render: end */
@@ -182,7 +190,7 @@ declare module 'zova' {
   export interface IBeanScopeRecord {
     'home-layoutweb': ScopeModuleHomeLayoutweb;
   }
-  
+
   export interface IBeanScopeConfig {
     'home-layoutweb': ReturnType<typeof config>;
   }
@@ -191,10 +199,10 @@ declare module 'zova' {
     'home-layoutweb': (typeof locales)[TypeLocaleBase];
   }
 
-  
+
 }
 
 export function locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `home-layoutweb::${K}` {
   return `home-layoutweb::${key}`;
-}  
+}
 /** scope: end */

package/zova/src/suite/a-home/modules/home-layoutweb/src/component/layoutWeb/render.header.tsx

@@ -29,6 +29,7 @@ export class RenderHeader extends BeanRenderBase {
             <ul class="menu menu-horizontal">
               {this.$$r.$$renderLocale.render()}
               {this.$$r.$$renderTheme.renderThemeDark()}
+              {this.$$r.$$renderUser.render()}
             </ul>
           </div>
         </div>