@qlover/create-app 0.10.1 → 0.10.2

package/dist/templates/next-app/src/server/port/AdminLocalesControllerInterface.ts

@@ -0,0 +1,21 @@
+import type { LocalesSchema } from '@migrations/schema/LocalesSchema';
+import type { BridgeOrderBy } from './DBBridgeInterface';
+import type { UpsertResult } from './LocalesRepositoryInterface';
+import type { PaginationInterface } from './PaginationInterface';
+import type { ImportLocalesData } from '../services/ApiLocaleService';
+
+export interface AdminLocalesControllerInterface {
+  getLocales(query: {
+    page: number;
+    pageSize: number;
+    orderBy?: BridgeOrderBy;
+  }): Promise<PaginationInterface<LocalesSchema>>;
+
+  createLocale(
+    body: Omit<LocalesSchema, 'id' | 'created_at' | 'updated_at'>
+  ): Promise<{ success: boolean }>;
+
+  updateLocale(body: Partial<LocalesSchema>): Promise<void>;
+
+  importLocales(formData: ImportLocalesData): Promise<UpsertResult>;
+}

package/dist/templates/next-app/src/server/port/AdminUserControllerInterface.ts

@@ -0,0 +1,11 @@
+import type { UserSchema } from '@migrations/schema/UserSchema';
+import type { BridgeOrderBy } from './DBBridgeInterface';
+import type { PaginationInterface } from './PaginationInterface';
+
+export interface AdminUserControllerInterface {
+  getUsers(query: {
+    page: number;
+    pageSize: number;
+    orderBy?: BridgeOrderBy;
+  }): Promise<PaginationInterface<UserSchema>>;
+}

package/dist/templates/next-app/src/server/port/LocalesControllerInterface.ts

@@ -0,0 +1,10 @@
+import type { BridgeOrderBy } from './DBBridgeInterface';
+
+export interface LocalesControllerJsonQuery {
+  locale: string;
+  orderBy?: BridgeOrderBy;
+}
+
+export interface LocalesControllerInterface {
+  json(query: LocalesControllerJsonQuery): Promise<Record<string, string>>;
+}

package/dist/templates/next-app/src/server/port/{ParamsHandlerInterface.ts → RouteParamsnHandlerInterface.ts}

@@ -1,11 +1,18 @@
 import type { PageI18nInterface } from '@config/i18n';
 
-export interface ParamsHandlerInterface {
+/**
+ * 用于处理页面渲染的路由参数处理接口
+ */
+export interface RouteParamsnHandlerInterface {
   getLocale(defaultLocale?: string): string;
   getI18nWithNotFound(): string;
-  getI18nMessages(): Promise<Record<string, string>>;
+  getI18nMessages(
+    namespace?: string | string[]
+  ): Promise<Record<string, string>>;
   getI18nInterface<T extends PageI18nInterface>(
     i18nInterface: T,
     namespace?: string
   ): Promise<T>;
+
+  getTheme(): string | Promise<string>;
 }

package/dist/templates/next-app/src/server/port/ServerInterface.ts

@@ -3,9 +3,9 @@ import { type IOCIdentifierMapServer } from '@config/IOCIdentifier';
 import type {
   ServiceIdentifier,
   IOCContainerInterface,
-  IOCFunctionInterface,
-  LoggerInterface
+  IOCFunctionInterface
 } from '@qlover/corekit-bridge';
+import type { LoggerInterface } from '@qlover/logger';
 
 export interface ServerInterface {
   readonly logger: LoggerInterface;

package/dist/templates/next-app/src/server/port/UserControllerInerface.ts

@@ -0,0 +1,8 @@
+import type { UserSchema } from '@migrations/schema/UserSchema';
+import type { LoginValidatorData } from '../validators/LoginValidator';
+
+export interface UserControllerInerface {
+  login(body: LoginValidatorData): Promise<UserSchema>;
+  register(body: LoginValidatorData): Promise<UserSchema>;
+  logout(): Promise<void>;
+}

package/dist/templates/next-app/src/server/port/UserServiceInterface.ts

@@ -2,7 +2,7 @@ import type { UserSchema } from '@migrations/schema/UserSchema';
 
 export interface UserServiceInterface {
   register(params: { email: string; password: string }): Promise<UserSchema>;
-  login(params: { email: string; password: string }): Promise<unknown>;
+  login(params: { email: string; password: string }): Promise<UserSchema>;
 
   logout(): Promise<void>;
 }

package/dist/templates/next-app/src/server/port/ValidatorInterface.ts

@@ -3,7 +3,7 @@ export interface ValidationFaildResult {
   message: string;
 }
 
-export interface ValidatorInterface {
+export interface ValidatorInterface<T> {
   /**
    * Validate the data and return validation result
    * @param data - The data to validate
@@ -19,5 +19,5 @@ export interface ValidatorInterface {
    * @returns The data if it is valid
    * @throws {import('@qlover/fe-corekit').ExecutorError} if the data is invalid, with validation errors
    */
-  getThrow(data: unknown): unknown;
+  getThrow(data: unknown): Promise<T> | T;
 }

package/dist/templates/next-app/src/server/repositorys/LocalesRepository.ts

@@ -10,7 +10,7 @@ import {
   localesSchema,
   type LocalesSchema
 } from '@migrations/schema/LocalesSchema';
-import { I } from '@config/IOCIdentifier';
+import { SupabaseBridge } from '../SupabaseBridge';
 import type {
   LocalesRepositoryInterface,
   UpsertResult
@@ -23,7 +23,7 @@ export class LocalesRepository implements LocalesRepositoryInterface {
   protected safeFields = Object.keys(localesSchema.shape);
 
   constructor(
-    @inject(I.DBBridgeInterface) protected dbBridge: DBBridgeInterface,
+    @inject(SupabaseBridge) protected dbBridge: DBBridgeInterface,
     @inject(Datetime) protected datetime: Datetime
   ) {}
 
@@ -70,6 +70,12 @@ export class LocalesRepository implements LocalesRepositoryInterface {
     id: number,
     params: Partial<Omit<LocalesSchema, 'id' | 'created_at'>>
   ): Promise<void> {
+    if (!id || typeof id !== 'number') {
+      throw new Error(
+        'ID is required and must be a number for updateById operation'
+      );
+    }
+
     const data = {
       ...params,
       updated_at: this.datetime.timestampz()

package/dist/templates/next-app/src/{base → server}/services/AdminLocalesService.ts

@@ -1,9 +1,9 @@
 import { ResourceStore } from '@qlover/corekit-bridge';
 import { inject, injectable } from 'inversify';
+import { ResourceState } from '@/base/cases/ResourceState';
+import { AdminLocalesApi } from '@/base/services/adminApi/AdminLocalesApi';
 import { ResourceService } from '@/base/services/ResourceService';
 import type { LocalesSchema } from '@migrations/schema/LocalesSchema';
-import { AdminLocalesApi } from './adminApi/AdminLocalesApi';
-import { ResourceState } from '../cases/ResourceState';
 
 @injectable()
 export class AdminLocalesService extends ResourceService<

package/dist/templates/next-app/src/server/services/ApiLocaleService.ts

@@ -1,4 +1,5 @@
 import { inject, injectable } from 'inversify';
+import { omit } from 'lodash';
 import { revalidateTag } from 'next/cache';
 import type { LocalesSchema } from '@migrations/schema/LocalesSchema';
 import type { LocaleType } from '@config/i18n';
@@ -20,6 +21,12 @@ export type ImportLocalesData = {
   };
 };
 
+export type GetLocalesParams = {
+  page: number;
+  pageSize: number;
+  orderBy?: BridgeOrderBy;
+};
+
 @injectable()
 export class ApiLocaleService {
   constructor(
@@ -45,11 +52,9 @@ export class ApiLocaleService {
     );
   }
 
-  async getLocales(params: {
-    page: number;
-    pageSize: number;
-    orderBy?: BridgeOrderBy;
-  }): Promise<PaginationInterface<LocalesSchema>> {
+  async getLocales(
+    params: GetLocalesParams
+  ): Promise<PaginationInterface<LocalesSchema>> {
     return this.localesRepository.pagination({
       page: params.page,
       pageSize: params.pageSize,
@@ -58,14 +63,20 @@ export class ApiLocaleService {
   }
 
   async update(data: Partial<LocalesSchema>): Promise<void> {
+    if (!data.id || typeof data.id !== 'number') {
+      throw new Error(
+        'ID is required and must be a number for update operation'
+      );
+    }
+
     await this.localesRepository.updateById(
-      data.id!,
-      data as Omit<LocalesSchema, 'id' | 'created_at'>
+      data.id,
+      omit(data, ['id', 'created_at'])
     );
 
     // 清除所有支持的语言的缓存
     const revalidatePromises = i18nConfig.supportedLngs.map(async (locale) => {
-      await revalidateTag(`i18n-${locale}`);
+      await revalidateTag(`i18n-${locale}`, 'default');
     });
     await Promise.all(revalidatePromises);
   }
@@ -75,7 +86,7 @@ export class ApiLocaleService {
 
     // 清除所有支持的语言的缓存
     const revalidatePromises = i18nConfig.supportedLngs.map(async (locale) => {
-      await revalidateTag(`i18n-${locale}`);
+      await revalidateTag(`i18n-${locale}`, 'default');
     });
     await Promise.all(revalidatePromises);
   }
@@ -94,6 +105,10 @@ export class ApiLocaleService {
         result[key]!['value'] = key;
         result[key]![locale] = value;
 
+        if (locale === i18nConfig.fallbackLng) {
+          result[key]!['description'] = value;
+        }
+
         const { namespace: namespace2 } = splitI18nKey(key);
         result[key]!['namespace'] = namespace2 || namespace;
       });
@@ -111,7 +126,7 @@ export class ApiLocaleService {
     if (upsertResult.successCount > 0) {
       const revalidatePromises = i18nConfig.supportedLngs.map(
         async (locale) => {
-          await revalidateTag(`i18n-${locale}`);
+          await revalidateTag(`i18n-${locale}`, 'default');
         }
       );
       await Promise.all(revalidatePromises);

package/dist/templates/next-app/src/server/services/ApiUserService.ts

@@ -2,7 +2,10 @@ import { inject, injectable } from 'inversify';
 import type { PaginationInterface } from '@/server/port/PaginationInterface';
 import type { UserSchema } from '@migrations/schema/UserSchema';
 import { UserRepository } from '../repositorys/UserRepository';
-import { PaginationValidator } from '../validators/PaginationValidator';
+import {
+  type PaginationParams,
+  PaginationValidator
+} from '../validators/PaginationValidator';
 import type { UserRepositoryInterface } from '../port/UserRepositoryInterface';
 import type { ValidatorInterface } from '../port/ValidatorInterface';
 
@@ -12,7 +15,7 @@ export class ApiUserService {
     @inject(UserRepository)
     protected userRepository: UserRepositoryInterface,
     @inject(PaginationValidator)
-    protected paginationValidator: ValidatorInterface
+    protected paginationValidator: ValidatorInterface<PaginationParams>
   ) {}
 
   async getUsers(params: {

package/dist/templates/next-app/src/server/validators/LocalesValidator.ts

@@ -11,7 +11,9 @@ import {
 import type { ExtendedExecutorError } from './ExtendedExecutorError';
 import type { ImportLocalesData } from '../services/ApiLocaleService';
 
-export class LocalesValidator implements ValidatorInterface {
+export class LocalesValidator implements ValidatorInterface<
+  Omit<LocalesSchema, 'id' | 'created_at' | 'updated_at'>
+> {
   validate(data: unknown): void | ValidationFaildResult {
     if (typeof data !== 'object' || data === null) {
       return {
@@ -44,7 +46,7 @@ export class LocalesValidator implements ValidatorInterface {
   }
 }
 
-export class LocalesImportValidator implements ValidatorInterface {
+export class LocalesImportValidator implements ValidatorInterface<ImportLocalesData> {
   getHasAnyFilesLocale(
     values: FormData
   ): { language: LocaleType; value: FormDataEntryValue }[] {

package/dist/templates/next-app/src/server/validators/LoginValidator.ts

@@ -26,7 +26,7 @@ const passwordSchema = z
   .max(50, { message: V_PASSWORD_MAX_LENGTH })
   .regex(/^\S+$/, { message: V_PASSWORD_SPECIAL_CHARS });
 
-export class LoginValidator implements ValidatorInterface {
+export class LoginValidator implements ValidatorInterface<LoginValidatorData> {
   validateEmail(data: unknown): void | ValidationFaildResult {
     const emailResult = emailSchema.safeParse(data);
     if (!emailResult.success) {

package/dist/templates/next-app/src/server/validators/PaginationValidator.ts

@@ -1,5 +1,4 @@
 import { z } from 'zod';
-import type { PaginationInterface } from '@/server/port/PaginationInterface';
 import { API_PAGE_INVALID } from '@config/Identifier';
 import {
   type ValidationFaildResult,
@@ -22,7 +21,13 @@ const paginationSchema = z.object({
   order: z.string().optional().default('0')
 });
 
-export class PaginationValidator implements ValidatorInterface {
+export type PaginationParams = {
+  page: number;
+  pageSize: number;
+  orders?: BridgeOrderBy;
+};
+
+export class PaginationValidator implements ValidatorInterface<PaginationParams> {
   protected defaultPageSize = 10;
 
   validate(data: unknown): void | ValidationFaildResult {
@@ -39,12 +44,7 @@ export class PaginationValidator implements ValidatorInterface {
     }
   }
 
-  getThrow(data: unknown): Pick<
-    PaginationInterface<unknown>,
-    'page' | 'pageSize'
-  > & {
-    orders: BridgeOrderBy;
-  } {
+  getThrow<T>(data: unknown): T {
     const result = paginationSchema.safeParse(data);
     if (!result.success) {
       throw new Error(result.error.issues[0].message);
@@ -58,7 +58,7 @@ export class PaginationValidator implements ValidatorInterface {
       orders: [
         result.data.orderBy || 'updated_at',
         order == '0' || order == '1' ? (+order as 0 | 1) : 0
-      ]
-    };
+      ] as BridgeOrderBy
+    } as T;
   }
 }

package/dist/templates/next-app/src/styles/css/antd-themes/_common/_default.css

@@ -277,48 +277,4 @@ html,
     --fe-layout-light-trigger-bg: rgb(var(--color-bg-base));
     --fe-layout-light-trigger-color: rgb(var(--text-primary));
   }
-
-  /* 滚动条样式变量 */
-  --fe-scrollbar-size: 6px;
-  --fe-scrollbar-thumb-bg: rgba(15 23 42 / 0.2);
-  --fe-scrollbar-thumb-hover-bg: rgba(15 23 42 / 0.3);
-  --fe-scrollbar-track-bg: transparent;
-
-  /* 滚动条样式 */
-  ::-webkit-scrollbar {
-    width: var(--fe-scrollbar-size);
-    height: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-track {
-    background: var(--fe-scrollbar-track-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb {
-    background: var(--fe-scrollbar-thumb-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb:hover {
-    background: var(--fe-scrollbar-thumb-hover-bg);
-  }
-
-  ::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-
-  /* 可选的细滚动条样式 */
-  .scrollbar-thin {
-    --fe-scrollbar-size: 4px;
-  }
-
-  /* 隐藏滚动条但保持可滚动 */
-  .scrollbar-hidden {
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-    &::-webkit-scrollbar {
-      display: none;
-    }
-  }
 }

package/dist/templates/next-app/src/styles/css/antd-themes/_common/dark.css

@@ -230,48 +230,4 @@
     --fe-layout-light-trigger-bg: rgb(30 41 59);
     --fe-layout-light-trigger-color: rgb(var(--text-primary));
   }
-
-  /* 滚动条样式变量 */
-  --fe-scrollbar-size: 6px;
-  --fe-scrollbar-thumb-bg: rgba(255 255 255 / 0.2);
-  --fe-scrollbar-thumb-hover-bg: rgba(255 255 255 / 0.3);
-  --fe-scrollbar-track-bg: transparent;
-
-  /* 滚动条样式 */
-  ::-webkit-scrollbar {
-    width: var(--fe-scrollbar-size);
-    height: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-track {
-    background: var(--fe-scrollbar-track-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb {
-    background: var(--fe-scrollbar-thumb-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb:hover {
-    background: var(--fe-scrollbar-thumb-hover-bg);
-  }
-
-  ::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-
-  /* 可选的细滚动条样式 */
-  .scrollbar-thin {
-    --fe-scrollbar-size: 4px;
-  }
-
-  /* 隐藏滚动条但保持可滚动 */
-  .scrollbar-hidden {
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-    &::-webkit-scrollbar {
-      display: none;
-    }
-  }
 }

package/dist/templates/next-app/src/styles/css/antd-themes/_common/pink.css

@@ -243,48 +243,4 @@
     --fe-layout-light-trigger-bg: var(--ant-color-bg-container);
     --fe-layout-light-trigger-color: var(--ant-color-text);
   }
-
-  /* 滚动条样式变量 */
-  --fe-scrollbar-size: 6px;
-  --fe-scrollbar-thumb-bg: rgba(244 114 182 / 0.3);
-  --fe-scrollbar-thumb-hover-bg: rgba(244 114 182 / 0.4);
-  --fe-scrollbar-track-bg: transparent;
-
-  /* 滚动条样式 */
-  ::-webkit-scrollbar {
-    width: var(--fe-scrollbar-size);
-    height: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-track {
-    background: var(--fe-scrollbar-track-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb {
-    background: var(--fe-scrollbar-thumb-bg);
-    border-radius: var(--fe-scrollbar-size);
-  }
-
-  ::-webkit-scrollbar-thumb:hover {
-    background: var(--fe-scrollbar-thumb-hover-bg);
-  }
-
-  ::-webkit-scrollbar-corner {
-    background: transparent;
-  }
-
-  /* 可选的细滚动条样式 */
-  .scrollbar-thin {
-    --fe-scrollbar-size: 4px;
-  }
-
-  /* 隐藏滚动条但保持可滚动 */
-  .scrollbar-hidden {
-    -ms-overflow-style: none;
-    scrollbar-width: none;
-    &::-webkit-scrollbar {
-      display: none;
-    }
-  }
 }

package/dist/templates/next-app/src/styles/css/index.css

@@ -2,5 +2,5 @@
 @import './zIndex.css';
 
 @import './antd-themes/index.css';
-
+@import './scrollbar.css';
 @import './page.css';

package/dist/templates/next-app/src/styles/css/scrollbar.css

@@ -0,0 +1,34 @@
+html,
+.fe-theme {
+  --scrollbar-track-color: var(--color-secondary);
+  --scrollbar-thumb-color: var(--color-text-secondary);
+  --scrollbar-thumb-hover-color: var(--color-brand-hover);
+
+  /* Webkit browsers (Chrome, Safari, Edge) - 全局样式，使用最高优先级 */
+  body *::-webkit-scrollbar,
+  *::-webkit-scrollbar {
+    width: 10px;
+    height: 10px;
+  }
+
+  body *::-webkit-scrollbar-track,
+  *::-webkit-scrollbar-track {
+    background: var(--scrollbar-track-color);
+  }
+
+  body *::-webkit-scrollbar-thumb,
+  *::-webkit-scrollbar-thumb {
+    background-color: var(--scrollbar-thumb-color);
+    border-radius: 6px;
+    border: 1px solid var(--scrollbar-track-color);
+    transition: background-color 0.2s ease;
+  }
+
+  body *::-webkit-scrollbar-thumb:hover {
+    background-color: var(--scrollbar-thumb-hover-color) !important;
+  }
+
+  *::-webkit-scrollbar-thumb:hover {
+    background-color: var(--scrollbar-thumb-hover-color) !important;
+  }
+}

package/dist/templates/next-app/src/uikit/components/AdminLayout.tsx

@@ -13,12 +13,13 @@ import { clsx } from 'clsx';
 import { usePathname } from 'next/navigation';
 import React, { useMemo, type HTMLAttributes } from 'react';
 import { AdminPageManager } from '@/base/cases/AdminPageManager';
-import { BaseHeader } from './BaseHeader';
-import { LanguageSwitcher } from './LanguageSwitcher';
+import { COMMON_ADMIN_TITLE } from '@config/Identifier';
 import { LocaleLink } from './LocaleLink';
-import { LogoutButton } from './LogoutButton';
-import { ThemeSwitcher } from './ThemeSwitcher';
+import { LanguageSwitcher } from '../components-app/LanguageSwitcher';
+import { LogoutButton } from '../components-app/LogoutButton';
+import { ThemeSwitcher } from '../components-app/ThemeSwitcher';
 import { useIOC } from '../hook/useIOC';
+import { useWarnTranslations } from '../hook/useWarnTranslations';
 import type { ItemType } from 'antd/es/menu/interface';
 
 const { Sider } = Layout;
@@ -41,10 +42,13 @@ export function AdminLayout(props: AdminLayoutProps) {
   const page = useIOC(AdminPageManager);
   const collapsedSidebar = useStore(page, page.selectors.collapsedSidebar);
   const navItems = useStore(page, page.selectors.navItems);
+  const t = useWarnTranslations();
+
+  const title = useMemo(() => t(COMMON_ADMIN_TITLE), [t]);
 
   const selectedKey = useMemo(() => {
     // 移除语言前缀，例如 /en/admin/users -> /admin/users
-    const normalizedPath = pathname.replace(/^\/[^/]+/, '');
+    const normalizedPath = pathname?.replace(/^\/[^/]+/, '') ?? '';
     return navItems.find((item) => item.pathname === normalizedPath)?.key || '';
   }, [pathname, navItems]);
 
@@ -81,7 +85,7 @@ export function AdminLayout(props: AdminLayoutProps) {
 
   return (
     <Layout data-testid="AdminLayout" className={className} {...rest}>
-      <div className="overflow-y-auto overflow-x-hidden h-screen sticky top-0 bottom-0 scrollbar-thin scrollbar-gutter-stable">
+      <div className="overflow-y-auto overflow-x-hidden h-screen sticky top-0 bottom-0">
         <Sider
           className="h-full relative"
           onCollapse={() => page.toggleSidebar()}
@@ -111,11 +115,30 @@ export function AdminLayout(props: AdminLayoutProps) {
       </div>
 
       <Layout>
-        <BaseHeader
-          href="/admin"
-          className="max-w-full pl-0"
-          rightActions={rightActions}
-        />
+        <header
+          data-testid="AdminLayoutHeader"
+          className="h-14 bg-secondary border-b border-c-border sticky top-0 z-50"
+        >
+          <div
+            className={clsx(
+              'flex items-center justify-between h-full px-4 mx-auto max-w-7xl',
+              className
+            )}
+          >
+            <div className="flex items-center">
+              <LocaleLink
+                href="/admin"
+                title={title}
+                className="flex items-center hover:opacity-80 transition-opacity"
+              >
+                <span className="text-lg font-semibold text-text">{title}</span>
+              </LocaleLink>
+            </div>
+            <div className="flex items-center gap-2 md:gap-4">
+              {rightActions}
+            </div>
+          </div>
+        </header>
         <main
           className={clsx('p-2 bg-primary text-text flex-1', mainClassName)}
         >