@qlover/create-app 0.7.10 → 0.7.11

package/dist/templates/next-app/migrations/schema/UserSchema.ts

@@ -1,13 +1,24 @@
-export interface UserSchema {
-  id: number;
-  role: string;
-  email: string;
-  password: string;
+import { z } from 'zod';
+
+export const UserRole = {
+  ADMIN: 0,
+  USER: 1
+} as const;
+
+export type UserRoleType = (typeof UserRole)[keyof typeof UserRole];
+
+export const userSchema = z.object({
+  id: z.number(),
+  role: z.enum(UserRole),
+  email: z.email(),
+  password: z.string(),
   /**
    * 加密的token, 包含token, 过期时间
    */
-  credential_token: string;
-  email_confirmed_at: number;
-  created_at?: number;
-  updated_at?: number;
-}
+  credential_token: z.string(),
+  email_confirmed_at: z.number(),
+  created_at: z.number(),
+  updated_at: z.number()
+});
+
+export type UserSchema = z.infer<typeof userSchema>;

package/dist/templates/next-app/next.config.ts

@@ -10,6 +10,7 @@ generateLocales().catch((error) => {
 });
 
 const nextConfig: NextConfig = {
+  // reactStrictMode: false,
   turbopack: {
     root: __dirname // 明确指定根目录
   },

package/dist/templates/next-app/package.json

@@ -56,6 +56,7 @@
     "eslint": "^9",
     "eslint-config-next": "15.5.0",
     "eslint-config-prettier": "^10.1.8",
+    "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-unused-imports": "^4.2.0",

package/dist/templates/next-app/public/locales/en.json

@@ -195,5 +195,8 @@
   "register__welcome": "Welcome to our platform",
   "register__feature__ai_paths": "AI Paths",
   "register__feature__smart_recommendations": "Smart Recommendations",
-  "register__feature__progress_tracking": "Progress Tracking"
+  "register__feature__progress_tracking": "Progress Tracking",
+  "page__head__admin__title": "Admin Backend",
+  "api__not_authorized": "Not authorized",
+  "api__page__invalid": "Page number is incorrect"
 }

package/dist/templates/next-app/public/locales/zh.json

@@ -195,5 +195,8 @@
   "register__welcome": "欢迎来到我们的平台",
   "register__feature__ai_paths": "AI路径",
   "register__feature__smart_recommendations": "智能推荐",
-  "register__feature__progress_tracking": "进度跟踪"
+  "register__feature__progress_tracking": "进度跟踪",
+  "page__head__admin__title": "管理后台",
+  "api__not_authorized": "未授权",
+  "api__page__invalid": "页码不正确"
 }

package/dist/templates/next-app/src/app/[locale]/admin/layout.tsx

@@ -1,8 +1,9 @@
 import { PageParams } from '@/base/cases/PageParams';
 import type { PageLayoutProps } from '@/base/types/PageProps';
 import '@/styles/css/index.css';
+import { AdminLayout } from '@/uikit/components/AdminLayout';
 
-export default async function AdminLayout({
+export default async function AdminRootLayout({
   children,
   params
 }: PageLayoutProps) {
@@ -10,12 +11,8 @@ export default async function AdminLayout({
   const locale = pageParams.getLocale();
 
   return (
-    <div
-      data-testid="AdminRootLayout"
-      lang={locale}
-      className="min-h-screen bg-primary text-text"
-    >
+    <AdminLayout data-testid="AdminRootLayout" lang={locale}>
       {children}
-    </div>
+    </AdminLayout>
   );
 }

package/dist/templates/next-app/src/app/[locale]/admin/page.tsx

@@ -1,10 +1,22 @@
-'use client';
-import Link from 'next/link';
+import type { Metadata } from 'next';
+
+function AdminPageClient() {
+  return <div data-testid="AdminPage">Admin Page</div>;
+}
+
+export const metadata: Metadata = {
+  title: 'Admin Dashboard',
+  description: 'Admin dashboard for managing application resources',
+  robots: {
+    index: false,
+    follow: false
+  }
+};
 
 export default function AdminPage() {
   return (
-    <div data-testid="AdminPage">
-      <Link href="/admin/migrations">Migrations</Link>
+    <div data-testid="AdminPageWrapper">
+      <AdminPageClient />
     </div>
   );
 }

package/dist/templates/next-app/src/app/[locale]/admin/users/page.tsx

@@ -0,0 +1,62 @@
+'use client';
+
+import { Table } from 'antd';
+import { useEffect, useRef } from 'react';
+import { AdminUserService } from '@/base/services/AdminUserService';
+import { useIOC } from '@/uikit/hook/useIOC';
+import { useStore } from '@/uikit/hook/useStore';
+import { userSchema, type UserSchema } from '@migrations/schema/UserSchema';
+import type { ColumnsType } from 'antd/es/table';
+
+const baseColumns: ColumnsType<UserSchema> = Object.keys(
+  userSchema.omit({
+    password: true,
+    credential_token: true
+  }).shape
+).map((key) => ({
+  title: key,
+  dataIndex: key
+}));
+
+export default function UsersPage() {
+  const adminUserService = useIOC(AdminUserService);
+
+  const listParams = useStore(adminUserService, (state) => state.listParams);
+  const listState = useStore(adminUserService, (state) => state.listState);
+  const mouted = useRef(false);
+
+  useEffect(() => {
+    if (!mouted.current) {
+      mouted.current = true;
+      adminUserService.initialize();
+    }
+  }, []);
+
+  const dataSource = listState.result?.list as UserSchema[];
+
+  const columns: ColumnsType<UserSchema> = baseColumns;
+
+  return (
+    <div data-testid="UsersPage">
+      <Table
+        rowKey="id"
+        columns={columns}
+        dataSource={dataSource}
+        loading={listState.loading}
+        scroll={{ x: true }}
+        pagination={{
+          pageSizeOptions: [10, 20, 50],
+          current: listParams.page,
+          pageSize: listParams.pageSize,
+          total: listState.result?.total,
+          onChange: (page, pageSize) => {
+            adminUserService.changeListParams({
+              page,
+              pageSize
+            });
+          }
+        }}
+      />
+    </div>
+  );
+}

package/dist/templates/next-app/src/app/[locale]/layout.tsx

@@ -1,8 +1,8 @@
 import { NextIntlClientProvider } from 'next-intl';
-import { themeConfig } from '@config/theme';
 import { PageParams } from '@/base/cases/PageParams';
 import type { PageLayoutProps } from '@/base/types/PageProps';
 import { ComboProvider } from '@/uikit/components/ComboProvider';
+import { themeConfig } from '@config/theme';
 import '@/styles/css/index.css';
 
 export default async function RootLayout({

package/dist/templates/next-app/src/app/[locale]/login/LoginForm.tsx

@@ -4,11 +4,11 @@ import { UserOutlined, LockOutlined, GoogleOutlined } from '@ant-design/icons';
 import { Form, Input, Button } from 'antd';
 import { useTranslations } from 'next-intl';
 import { useState } from 'react';
-import { I } from '@config/IOCIdentifier';
 import { LoginValidator } from '@/server/validators/LoginValidator';
 import { LocaleLink } from '@/uikit/components/LocaleLink';
 import { useIOC } from '@/uikit/hook/useIOC';
 import type { LoginI18nInterface } from '@config/i18n/loginI18n';
+import { I } from '@config/IOCIdentifier';
 
 interface LoginFormData {
   email: string;

package/dist/templates/next-app/src/app/[locale]/login/page.tsx

@@ -1,5 +1,4 @@
 import { notFound } from 'next/navigation';
-import { loginI18n, i18nConfig } from '@config/i18n';
 import { PageParams, type PageParamsType } from '@/base/cases/PageParams';
 import type { PageParamsProps } from '@/base/types/PageProps';
 import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
@@ -7,6 +6,7 @@ import { redirect } from '@/i18n/routing';
 import { ServerAuth } from '@/server/ServerAuth';
 import { BaseLayout } from '@/uikit/components/BaseLayout';
 import { FeatureItem } from '@/uikit/components/FeatureItem';
+import { loginI18n, i18nConfig } from '@config/i18n';
 import { LoginForm } from './LoginForm';
 import type { Metadata } from 'next';
 

package/dist/templates/next-app/src/app/[locale]/page.tsx

@@ -1,12 +1,12 @@
 import { Button } from 'antd';
-import { i18nConfig } from '@config/i18n';
-import { homeI18n } from '@config/i18n/HomeI18n ';
 import { PageParams, type PageParamsType } from '@/base/cases/PageParams';
 import type { PageParamsProps } from '@/base/types/PageProps';
 import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
 import { redirect } from '@/i18n/routing';
 import { ServerAuth } from '@/server/ServerAuth';
 import { BaseLayout } from '@/uikit/components/BaseLayout';
+import { i18nConfig } from '@config/i18n';
+import { homeI18n } from '@config/i18n/HomeI18n ';
 import type { Metadata } from 'next';
 
 // const navigationItems = [
@@ -50,7 +50,7 @@ export default async function Home({ params }: PageParamsProps) {
   }
 
   return (
-    <BaseLayout data-testid="HomePage" showLogoutButton>
+    <BaseLayout data-testid="HomePage" showLogoutButton showAdminButton>
       {/* Hero Section */}
       <section className="py-16 px-4">
         <div className="max-w-4xl mx-auto text-center">

package/dist/templates/next-app/src/app/[locale]/register/RegisterForm.tsx

@@ -3,9 +3,9 @@
 import { LockOutlined, MailOutlined, UserOutlined } from '@ant-design/icons';
 import { Button, Checkbox, Form, Input } from 'antd';
 import { useState } from 'react';
-import { I } from '@config/IOCIdentifier';
 import { useIOC } from '@/uikit/hook/useIOC';
 import type { RegisterI18nInterface } from '@config/i18n';
+import { I } from '@config/IOCIdentifier';
 
 export function RegisterForm(props: { tt: RegisterI18nInterface }) {
   const { tt } = props;

package/dist/templates/next-app/src/app/[locale]/register/page.tsx

@@ -1,5 +1,4 @@
 import { notFound } from 'next/navigation';
-import { i18nConfig, register18n } from '@config/i18n';
 import { PageParams, type PageParamsType } from '@/base/cases/PageParams';
 import type { PageParamsProps } from '@/base/types/PageProps';
 import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
@@ -7,6 +6,7 @@ import { redirect } from '@/i18n/routing';
 import { ServerAuth } from '@/server/ServerAuth';
 import { BaseLayout } from '@/uikit/components/BaseLayout';
 import { FeatureItem } from '@/uikit/components/FeatureItem';
+import { i18nConfig, register18n } from '@config/i18n';
 import { RegisterForm } from './RegisterForm';
 import type { Metadata } from 'next';
 

package/dist/templates/next-app/src/app/api/admin/users/route.ts

@@ -0,0 +1,39 @@
+import { ExecutorError } from '@qlover/fe-corekit';
+import { NextResponse } from 'next/server';
+import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
+import { AppErrorApi } from '@/server/AppErrorApi';
+import { AppSuccessApi } from '@/server/AppSuccessApi';
+import { AdminAuthPlugin } from '@/server/services/AdminAuthPlugin';
+import { ApiUserService } from '@/server/services/ApiUserService';
+import { PaginationValidator } from '@/server/validators/PaginationValidator';
+import type { NextRequest } from 'next/server';
+
+export async function GET(req: NextRequest) {
+  const server = new BootstrapServer();
+
+  const result = await server
+    .use(new AdminAuthPlugin())
+    .execNoError(async ({ parameters: { IOC } }) => {
+      const searchParams = Object.fromEntries(
+        req.nextUrl.searchParams.entries()
+      );
+      const paginationParams = IOC(PaginationValidator).getThrow(searchParams);
+
+      const apiUserService = IOC(ApiUserService);
+
+      const result = await apiUserService.getUsers({
+        page: paginationParams.page,
+        pageSize: paginationParams.pageSize
+      });
+
+      return result;
+    });
+
+  if (result instanceof ExecutorError) {
+    return NextResponse.json(new AppErrorApi(result.id, result.message), {
+      status: 400
+    });
+  }
+
+  return NextResponse.json(new AppSuccessApi(result));
+}

package/dist/templates/next-app/src/base/cases/AdminPageManager.ts

@@ -0,0 +1,40 @@
+import { injectable } from 'inversify';
+import { AdminLayoutInterface } from '../port/AdminLayoutInterface';
+import type {
+  NavItemInterface,
+  AdminPageState
+} from '../port/AdminLayoutInterface';
+
+const defaultNavItems: NavItemInterface[] = [
+  {
+    key: 'dashboard',
+    i18nKey: 'Dashboard',
+    pathname: '/admin'
+  },
+  {
+    key: 'users',
+    i18nKey: 'User Management',
+    pathname: '/admin/users'
+  }
+];
+
+class AdminPageManagerState implements AdminPageState {
+  collapsedSidebar = false;
+
+  navItems: NavItemInterface[] = defaultNavItems;
+}
+
+@injectable()
+export class AdminPageManager extends AdminLayoutInterface {
+  constructor() {
+    super(() => new AdminPageManagerState());
+  }
+
+  override toggleSidebar(): void {
+    this.emit(
+      this.cloneState({
+        collapsedSidebar: !this.state.collapsedSidebar
+      })
+    );
+  }
+}

package/dist/templates/next-app/src/base/cases/AppConfig.ts

@@ -1,6 +1,6 @@
-import type { StringValue } from 'ms';
 import { name, version } from '../../../package.json';
 import type { EnvConfigInterface } from '@qlover/corekit-bridge';
+import type { StringValue } from 'ms';
 
 export class AppConfig implements EnvConfigInterface {
   /**

package/dist/templates/next-app/src/base/cases/DialogErrorPlugin.ts

@@ -28,8 +28,19 @@ export class DialogErrorPlugin implements ExecutorPlugin {
     const handleError = runtimesError || error;
 
     if (handleError instanceof ExecutorError) {
-      const message = this.i18nService.t(handleError.id);
-      this.dialogHandler.error(message);
+      if (this.isI18nMessage(handleError.message)) {
+        const message = this.i18nService.t(handleError.id);
+        this.dialogHandler.error(message);
+      } else {
+        this.dialogHandler.error(handleError.message);
+      }
     }
   }
+
+  protected isI18nMessage(message: string): boolean {
+    // Check if message follows the pattern of underscore-separated format
+    // e.g., "namespace_key" or "namespace__key"
+    const pattern = /^[a-zA-Z]+(?:_[a-zA-Z]+)+$|^[a-zA-Z]+(?:__[a-zA-Z]+)+$/;
+    return pattern.test(message);
+  }
 }

package/dist/templates/next-app/src/base/cases/PageParams.ts

@@ -1,8 +1,8 @@
 import { notFound } from 'next/navigation';
 import { getMessages, getTranslations } from 'next-intl/server';
 import { i18nConfig } from '@config/i18n';
-import type { ParamsHandlerInterface as ParamsHandlerInterface } from '../port/ParamsHandlerInterface';
 import type { LocaleType, PageI18nInterface } from '@config/i18n';
+import type { ParamsHandlerInterface as ParamsHandlerInterface } from '../port/ParamsHandlerInterface';
 
 export interface PageWithParams {
   params?: Promise<PageParamsType>;

package/dist/templates/next-app/src/base/cases/RequestState.ts

@@ -0,0 +1,20 @@
+import type { AsyncStateInterface } from '@/base/port/AsyncStateInterface';
+
+export class RequestState<T = unknown> implements AsyncStateInterface<T> {
+  startTime: number;
+  endTime: number;
+
+  constructor(
+    public loading: boolean = false,
+    public result: T | null = null,
+    public error: unknown | null = null
+  ) {
+    this.startTime = Date.now();
+    this.endTime = 0;
+  }
+
+  end(): this {
+    this.endTime = Date.now();
+    return this;
+  }
+}

package/dist/templates/next-app/src/base/cases/UserServiceApi.ts

@@ -1,8 +1,8 @@
 import { inject, injectable } from 'inversify';
+import type { UserSchema } from '@migrations/schema/UserSchema';
 import { AppUserApi } from '../services/appApi/AppUserApi';
 import type { AppApiSuccessInterface } from '../port/AppApiInterface';
 import type { AppUserApiInterface } from '../port/AppUserApiInterface';
-import type { UserSchema } from '@migrations/schema/UserSchema';
 import type {
   LoginResponseData,
   UserAuthApiInterface,

package/dist/templates/next-app/src/base/port/AdminLayoutInterface.ts

@@ -0,0 +1,26 @@
+import { StoreInterface } from '@qlover/corekit-bridge';
+import type { StoreStateInterface } from '@qlover/corekit-bridge';
+
+export interface NavItemInterface {
+  key: string;
+  /**
+   * 可以是 i18n key
+   */
+  i18nKey: string;
+
+  pathname?: string;
+}
+
+export interface AdminPageState extends StoreStateInterface {
+  navItems: NavItemInterface[];
+  collapsedSidebar: boolean;
+}
+
+export abstract class AdminLayoutInterface extends StoreInterface<AdminPageState> {
+  public readonly selectors = {
+    collapsedSidebar: (state: AdminPageState) => state.collapsedSidebar,
+    navItems: (state: AdminPageState) => state.navItems
+  };
+
+  abstract toggleSidebar(): void;
+}

package/dist/templates/next-app/src/base/port/AdminPageInterface.ts

@@ -0,0 +1,87 @@
+import { StoreInterface } from '@qlover/corekit-bridge';
+import { RequestState } from '../cases/RequestState';
+import type { PaginationInterface } from './PaginationInterface';
+import type { StoreStateInterface } from '@qlover/corekit-bridge';
+
+export interface AdminPageListParams {
+  page: number;
+  pageSize: number;
+}
+
+export class AdminPageState implements StoreStateInterface {
+  listParams: AdminPageListParams = {
+    page: 1,
+    pageSize: 10
+  };
+  initState = new RequestState<unknown>();
+  listState = new RequestState<PaginationInterface<unknown>>();
+}
+
+export abstract class AdminPageInterface<
+  S extends AdminPageState
+> extends StoreInterface<S> {
+  /**
+   * 初始化
+   * @returns
+   */
+  async initialize(): Promise<unknown> {
+    this.emit(
+      this.cloneState({
+        initState: new RequestState(true)
+      } as Partial<S>)
+    );
+
+    try {
+      const result = await this.fetchList(this.state.listParams);
+
+      console.log('jj result', result);
+
+      this.emit(
+        this.cloneState({
+          initState: new RequestState(false, result).end()
+        } as Partial<S>)
+      );
+      return result;
+    } catch (error) {
+      this.emit(
+        this.cloneState({
+          initState: new RequestState(false, null, error).end()
+        } as Partial<S>)
+      );
+
+      return error;
+    }
+  }
+
+  /**
+   * 销毁
+   */
+  destroy(): void {
+    this.reset();
+  }
+
+  /**
+   * 获取列表
+   * @param params
+   * @returns
+   */
+  abstract fetchList(
+    params: Partial<AdminPageListParams>
+  ): Promise<PaginationInterface<unknown>>;
+
+  changeListState(state: RequestState<unknown>): void {
+    this.emit(
+      this.cloneState({
+        listState: state
+      } as Partial<S>)
+    );
+  }
+
+  changeListParams(params: Partial<AdminPageListParams>): void {
+    this.emit(
+      this.cloneState({
+        listParams: params
+      } as Partial<S>)
+    );
+  }
+}

package/dist/templates/next-app/src/base/port/AppApiInterface.ts

@@ -9,6 +9,6 @@ export interface AppApiSuccessInterface<T = unknown> {
   data?: T;
 }
 
-export type AppApiResponse<T = unknown> =
+export type AppApiResult<T = unknown> =
   | AppApiErrorInterface
   | AppApiSuccessInterface<T>;

package/dist/templates/next-app/src/base/port/AppUserApiInterface.ts

@@ -1,15 +1,15 @@
-import type { AppApiResponse } from './AppApiInterface';
+import type { AppApiResult } from './AppApiInterface';
 
 export interface AppUserApiInterface {
   login(params: {
     email: string;
     password: string;
-  }): Promise<AppApiResponse<unknown>>;
+  }): Promise<AppApiResult<unknown>>;
 
   register(params: {
     email: string;
     password: string;
-  }): Promise<AppApiResponse<unknown>>;
+  }): Promise<AppApiResult<unknown>>;
 
-  logout(): Promise<AppApiResponse<unknown>>;
+  logout(): Promise<AppApiResult<unknown>>;
 }

package/dist/templates/next-app/src/base/port/AsyncStateInterface.ts

@@ -0,0 +1,7 @@
+export interface AsyncStateInterface<T> {
+  loading: boolean;
+  result: T | null;
+  error: unknown | null;
+  startTime: number;
+  endTime: number;
+}

package/dist/templates/next-app/src/base/port/DBBridgeInterface.ts

@@ -8,6 +8,8 @@ export interface BridgeEvent {
   fields?: string | string[];
   where?: Where[];
   data?: unknown;
+  page?: number;
+  pageSize?: number;
 }
 
 export interface DBBridgeInterface {
@@ -15,4 +17,5 @@ export interface DBBridgeInterface {
   update(event: BridgeEvent): Promise<PostgrestSingleResponse<unknown>>;
   delete(event: BridgeEvent): Promise<PostgrestSingleResponse<unknown>>;
   get(event: BridgeEvent): Promise<PostgrestSingleResponse<unknown>>;
+  pagination(event: BridgeEvent): Promise<PostgrestSingleResponse<unknown>>;
 }

package/dist/templates/next-app/src/base/port/PaginationInterface.ts

@@ -0,0 +1,6 @@
+export interface PaginationInterface<T> {
+  list: T[];
+  total: number;
+  page: number;
+  pageSize: number;
+}

package/dist/templates/next-app/src/base/services/AdminUserService.ts

@@ -0,0 +1,45 @@
+import { inject, injectable } from 'inversify';
+import {
+  AdminPageInterface,
+  type AdminPageListParams,
+  AdminPageState
+} from '../port/AdminPageInterface';
+import { AdminUserApi } from './adminApi/AdminUserApi';
+import { RequestState } from '../cases/RequestState';
+import type { PaginationInterface } from '../port/PaginationInterface';
+
+@injectable()
+export class AdminUserService extends AdminPageInterface<AdminPageState> {
+  constructor(@inject(AdminUserApi) protected adminUserApi: AdminUserApi) {
+    super(() => new AdminPageState());
+  }
+
+  override async fetchList(
+    params: Partial<AdminPageListParams>
+  ): Promise<PaginationInterface<unknown>> {
+    this.changeListState(new RequestState(true));
+
+    try {
+      const response = await this.adminUserApi.getUserList(
+        Object.assign({}, this.state.listParams, params)
+      );
+
+      if (response.data.success) {
+        const paginationData = response.data
+          .data as PaginationInterface<unknown>;
+
+        this.changeListState(new RequestState(false, paginationData));
+
+        return paginationData;
+      }
+
+      this.changeListState(
+        new RequestState(false, null, response.data.message)
+      );
+    } catch (error) {
+      this.changeListState(new RequestState(false, null, error));
+    }
+
+    return this.state.listState.result!;
+  }
+}