@qlover/create-app 1.1.0 → 2.0.2

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

@@ -1,67 +0,0 @@
-'use client';
-
-import { ResourceTable } from '@brain-toolkit/antd-blocks/resourceTable/ResourceTable';
-import { ResourceTableHeader } from '@brain-toolkit/antd-blocks/resourceTable/ResourceTableHeader';
-import { useFactory, useLifecycle } from '@brain-toolkit/react-kit';
-import { ResourceStore } from '@qlover/corekit-bridge';
-import { useMemo } from 'react';
-import { ResourceState } from '@/base/cases/ResourceState';
-import { ZodColumnBuilder } from '@/base/cases/ZodColumnBuilder';
-import { AdminUserApi } from '@/base/services/adminApi/AdminUserApi';
-import { AdminPageEvent } from '@/base/services/AdminPageEvent';
-import { ResourceService } from '@/base/services/ResourceService';
-import { ClientSeo } from '@/uikit/components/ClientSeo';
-import { useI18nInterface } from '@/uikit/hook/useI18nInterface';
-import { useIOC } from '@/uikit/hook/useIOC';
-import { useWarnTranslations } from '@/uikit/hook/useWarnTranslations';
-import { userSchema } from '@migrations/schema/UserSchema';
-import { adminUsers18n, adminTableI18n } from '@config/i18n';
-
-const ns = 'admin_users';
-
-const localesTT = {
-  ...adminUsers18n,
-  ...adminTableI18n
-};
-
-export default function UsersPage() {
-  const tt = useI18nInterface(localesTT);
-  const t = useWarnTranslations();
-  const adminUserApi = useIOC(AdminUserApi);
-  const resourceStore = useFactory(ResourceStore, () => new ResourceState());
-  const service = useFactory(ResourceService, ns, resourceStore, adminUserApi);
-  const pageEvent = useFactory(AdminPageEvent, ns, service);
-
-  const zodColumnBuilder = useFactory(
-    ZodColumnBuilder,
-    ns,
-    userSchema.omit({
-      password: true,
-      credential_token: true
-    })
-  );
-
-  useLifecycle(pageEvent);
-
-  const options = useMemo(
-    () => zodColumnBuilder.translate(t).buildAll(),
-    [t, zodColumnBuilder]
-  );
-
-  return (
-    <div data-testid="UsersPage">
-      <ClientSeo i18nInterface={tt} />
-
-      <ResourceTableHeader
-        settings={Object.assign({}, tt, { create: false })}
-        tableEvent={pageEvent}
-      />
-
-      <ResourceTable
-        columns={options}
-        tableEvent={pageEvent}
-        actionProps={false}
-      />
-    </div>
-  );
-}

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

@@ -1,18 +0,0 @@
-import type { PageLayoutProps } from '@/base/types/AppPageRouter';
-import { bootstrapServer } from '@/core/bootstraps/BootstrapServer';
-import { redirect } from '@/i18n/routing';
-import { AppPageRouteParams } from '@/server/AppPageRouteParams';
-import { ServerAuth } from '@/server/ServerAuth';
-
-export default async function AuthRootPage(props: PageLayoutProps) {
-  const pageParams = new AppPageRouteParams(await props.params!);
-  const locale = pageParams.getLocale();
-
-  if (await bootstrapServer.getIOC(ServerAuth).hasAuth()) {
-    console.info('> User already logged in, redirecting to home page');
-
-    return redirect({ href: '/', locale: locale });
-  }
-
-  return <>{props.children}</>;
-}

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

@@ -1,126 +0,0 @@
-'use client';
-
-import { UserOutlined, LockOutlined, GoogleOutlined } from '@ant-design/icons';
-import { Form, Input, Button } from 'antd';
-import { useState } from 'react';
-import { LoginValidator } from '@/server/validators/LoginValidator';
-import { LocaleLink } from '@/uikit/components/LocaleLink';
-import { useIOC } from '@/uikit/hook/useIOC';
-import { useWarnTranslations } from '@/uikit/hook/useWarnTranslations';
-import type { LoginI18nInterface } from '@config/i18n/loginI18n';
-import { I } from '@config/IOCIdentifier';
-import { ROUTE_REGISTER } from '@config/route';
-
-interface LoginFormData {
-  email: string;
-  password: string;
-}
-
-export function LoginForm(props: { tt: LoginI18nInterface }) {
-  const { tt } = props;
-  const t = useWarnTranslations();
-  const userService = useIOC(I.UserServiceInterface);
-  const appConfig = useIOC(I.AppConfig);
-  const routerService = useIOC(I.RouterServiceInterface);
-  const [loading, setLoading] = useState(false);
-
-  const handleLogin = async (values: LoginFormData) => {
-    try {
-      setLoading(true);
-      await userService.login(values);
-      routerService.replaceHome();
-    } catch {
-      // do nothing
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  return (
-    <Form
-      data-testid="LoginForm"
-      name="login"
-      onFinish={handleLogin}
-      layout="vertical"
-      className="space-y-4"
-      validateTrigger="onSubmit"
-      initialValues={{
-        email: appConfig.testLoginEmail,
-        password: appConfig.testLoginPassword
-      }}
-    >
-      <Form.Item
-        name="email"
-        rules={[{ required: true, type: 'email', message: tt.emailRequired }]}
-      >
-        <Input
-          prefix={<UserOutlined className="text-text-tertiary" />}
-          placeholder={tt.email}
-          title={tt.emailTitle}
-          className="h-12 text-base bg-secondary border-c-border"
-        />
-      </Form.Item>
-
-      <Form.Item
-        name="password"
-        rules={[
-          { required: true, message: tt.passwordRequired },
-          {
-            validator(_, value) {
-              const validator = new LoginValidator();
-              const result = validator.validatePassword(value);
-              if (result != null) {
-                return Promise.reject(t(result.message));
-              }
-              return Promise.resolve();
-            }
-          }
-        ]}
-      >
-        <Input.Password
-          prefix={<LockOutlined />}
-          placeholder={tt.password}
-          title={tt.passwordTitle}
-          className="h-12 text-base"
-        />
-      </Form.Item>
-
-      <div className="flex justify-end">
-        <LocaleLink href="#" title={tt.forgotPasswordTitle}>
-          {tt.forgotPassword}
-        </LocaleLink>
-      </div>
-
-      <Form.Item>
-        <Button
-          type="primary"
-          htmlType="submit"
-          loading={loading}
-          title={tt.buttonTitle}
-          className="w-full h-12 text-base"
-        >
-          {tt.button}
-        </Button>
-      </Form.Item>
-
-      <div className="text-center text-text-tertiary my-4">
-        {tt.continueWith}
-      </div>
-
-      <Button
-        icon={<GoogleOutlined />}
-        className="w-full h-12 text-base"
-        title={tt.withGoogleTitle}
-      >
-        {tt.withGoogle}
-      </Button>
-
-      <div className="text-center mt-6">
-        <span className="text-text-tertiary">{tt.noAccount} </span>
-        <LocaleLink href={ROUTE_REGISTER} title={tt.createAccountTitle}>
-          {tt.createAccount}
-        </LocaleLink>
-      </div>
-    </Form>
-  );
-}

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

@@ -1,90 +0,0 @@
-import { notFound } from 'next/navigation';
-import type { PageParamsProps } from '@/base/types/AppPageRouter';
-import { bootstrapServer } from '@/core/bootstraps/BootstrapServer';
-import { redirect } from '@/i18n/routing';
-import {
-  AppPageRouteParams,
-  type PageParamsType
-} from '@/server/AppPageRouteParams';
-import { ServerAuth } from '@/server/ServerAuth';
-import { FeatureItem } from '@/uikit/components/FeatureItem';
-import { AppRoutePage } from '@/uikit/components-app/AppRoutePage';
-import { loginI18n, i18nConfig, NS_PAGE_LOGIN } from '@config/i18n';
-import { COMMON_ADMIN_TITLE } from '@config/Identifier';
-import { ROUTE_LOGIN } from '@config/route';
-import { LoginForm } from './LoginForm';
-import type { Metadata } from 'next';
-
-// Generate static params for all supported locales (used for SSG)
-export async function generateStaticParams() {
-  // Return one entry for each supported locale
-  return i18nConfig.supportedLngs.map((locale) => ({ locale }));
-}
-
-// Allow Next.js to statically generate this page if possible (default behavior)
-// Note: 'auto' is not a valid value in Next.js 15, removed to use default behavior
-
-// Optional: Use revalidate if you want ISR (Incremental Static Regeneration)
-// export const revalidate = 3600; // Rebuild every hour (optional)
-
-// Generate localized SEO metadata per locale (Next.js 15+ best practice)
-export async function generateMetadata({
-  params
-}: {
-  params: Promise<PageParamsType>;
-}): Promise<Metadata> {
-  const pageParams = new AppPageRouteParams(await params);
-
-  return await pageParams.getI18nInterface(loginI18n);
-}
-
-export default async function LoginPage(props: PageParamsProps) {
-  if (!props.params) {
-    return notFound();
-  }
-
-  const params = await props.params;
-  const pageParams = new AppPageRouteParams(params);
-
-  if (await bootstrapServer.getIOC(ServerAuth).hasAuth()) {
-    return redirect({ href: '/', locale: params.locale! });
-  }
-
-  const tt = await pageParams.getI18nInterface(
-    { ...loginI18n, adminTitle: COMMON_ADMIN_TITLE },
-    NS_PAGE_LOGIN
-  );
-
-  return (
-    <AppRoutePage
-      data-testid="AppRoute-LoginPage"
-      tt={{
-        title: tt.title,
-        adminTitle: tt.adminTitle
-      }}
-      headerHref={ROUTE_LOGIN}
-      mainProps={{
-        className: 'text-xs1 bg-primary flex min-h-screen'
-      }}
-    >
-      <div className="hidden lg:flex bg-secondary lg:w-1/2 p-12 flex-col">
-        <h1 className="text-4xl font-bold text-text mb-4">{tt.welcome}</h1>
-        <p className="text-text-secondary text-lg mb-8">{tt.subtitle}</p>
-        <div className="space-y-4">
-          <FeatureItem icon="🎯" text={tt.feature_ai_paths} />
-          <FeatureItem icon="🎯" text={tt.feature_smart_recommendations} />
-          <FeatureItem icon="📊" text={tt.feature_progress_tracking} />
-        </div>
-      </div>
-
-      <div className="w-full lg:w-1/2 p-8 sm:p-12 flex items-center justify-center">
-        <div className="w-full max-w-[420px]">
-          <h2 className="text-2xl font-semibold mb-2 text-text">{tt.title}</h2>
-          <p className="text-text-secondary mb-8">{tt.subtitle}</p>
-
-          <LoginForm tt={tt} />
-        </div>
-      </div>
-    </AppRoutePage>
-  );
-}

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

@@ -1,8 +0,0 @@
-import { redirect } from 'next/navigation';
-import { ROUTE_LOGIN } from '@config/route';
-
-export default async function AuthRootPage() {
-  console.log('AuthRootPage redirect to login page');
-
-  redirect(ROUTE_LOGIN);
-}

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

@@ -1,197 +0,0 @@
-'use client';
-
-import { LockOutlined, MailOutlined, UserOutlined } from '@ant-design/icons';
-import { useStore } from '@brain-toolkit/react-kit';
-import { Button, Checkbox, Form, Input } from 'antd';
-import { useState } from 'react';
-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;
-  const userService = useIOC(I.UserServiceInterface);
-  const logger = useIOC(I.Logger);
-  const routerService = useIOC(I.RouterServiceInterface);
-  const [loading, setLoading] = useState(false);
-  const result = useStore(userService.getUIStore(), (state) => state.result);
-
-  const handleRegister = async (values: {
-    username: string;
-    email: string;
-    password: string;
-  }) => {
-    try {
-      setLoading(true);
-      await userService.register({
-        username: values.username,
-        email: values.email,
-        password: values.password
-      });
-    } catch (error) {
-      logger.error(error);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const handleLoginClick = (e: React.MouseEvent) => {
-    e.preventDefault();
-    routerService.gotoLogin();
-  };
-
-  return (
-    <Form
-      data-testid="RegisterForm"
-      name="register"
-      onFinish={handleRegister}
-      layout="vertical"
-      className="space-y-4"
-      validateTrigger="onSubmit"
-      disabled={!!result}
-      initialValues={{
-        username: 'myused@sina.com',
-        email: 'myused@sina.com',
-        password: 'q1234566',
-        confirmPassword: 'q1234566',
-        agreeToTerms: true
-      }}
-    >
-      {result && result.email_confirmed_at == null ? (
-        <div className="text-xl text-red-500">{tt.email_verify}</div>
-      ) : null}
-
-      <Form.Item
-        name="username"
-        rules={[
-          {
-            required: true,
-            message: tt.username_required
-          }
-        ]}
-      >
-        <Input
-          prefix={<UserOutlined className="text-text-tertiary" />}
-          placeholder={tt.username}
-          className="h-12 text-base bg-secondary border-border"
-        />
-      </Form.Item>
-
-      <Form.Item
-        name="email"
-        rules={[
-          {
-            required: true,
-            type: 'email',
-            message: tt.email_required
-          }
-        ]}
-      >
-        <Input
-          prefix={<MailOutlined className="text-text-tertiary" />}
-          placeholder={tt.email}
-          className="h-12 text-base bg-secondary border-border"
-        />
-      </Form.Item>
-
-      <Form.Item
-        name="password"
-        rules={[
-          {
-            required: true,
-            message: tt.password_required
-          }
-        ]}
-      >
-        <Input.Password
-          prefix={<LockOutlined />}
-          placeholder={tt.password}
-          className="h-12 text-base"
-        />
-      </Form.Item>
-
-      <Form.Item
-        name="confirmPassword"
-        dependencies={['password']}
-        rules={[
-          {
-            required: true,
-            message: tt.confirm_password_required
-          },
-          ({ getFieldValue }) => ({
-            validator(_, value) {
-              if (!value || getFieldValue('password') === value) {
-                return Promise.resolve();
-              }
-              return Promise.reject(tt.password_mismatch);
-            }
-          })
-        ]}
-      >
-        <Input.Password
-          prefix={<LockOutlined />}
-          placeholder={tt.confirm_password}
-          className="h-12 text-base"
-        />
-      </Form.Item>
-
-      <Form.Item
-        name="agreeToTerms"
-        valuePropName="checked"
-        rules={[
-          {
-            validator: (_, value) =>
-              value
-                ? Promise.resolve()
-                : Promise.reject(new Error(tt.terms_required))
-          }
-        ]}
-      >
-        <Checkbox>
-          <span className="text-text-secondary">
-            {tt.terms_prefix}{' '}
-            <a
-              href="#"
-              className="text-brand hover:text-brand-hover"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              {tt.terms_link}
-            </a>{' '}
-            {tt.terms_and}{' '}
-            <a
-              href="#"
-              className="text-brand hover:text-brand-hover"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              {tt.privacy_link}
-            </a>
-          </span>
-        </Checkbox>
-      </Form.Item>
-
-      <Form.Item>
-        <Button
-          type="primary"
-          htmlType="submit"
-          loading={loading}
-          className="w-full h-12 text-base"
-        >
-          {tt.button}
-        </Button>
-      </Form.Item>
-
-      <div className="text-center mt-6">
-        <span className="text-text-tertiary">{tt.have_account} </span>
-        <a
-          href="#"
-          className="text-brand hover:text-brand-hover"
-          onClick={handleLoginClick}
-        >
-          {tt.login_link}
-        </a>
-      </div>
-    </Form>
-  );
-}

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

@@ -1,90 +0,0 @@
-import { notFound } from 'next/navigation';
-import type { PageParamsProps } from '@/base/types/AppPageRouter';
-import { bootstrapServer } from '@/core/bootstraps/BootstrapServer';
-import { redirect } from '@/i18n/routing';
-import {
-  AppPageRouteParams,
-  type PageParamsType
-} from '@/server/AppPageRouteParams';
-import { ServerAuth } from '@/server/ServerAuth';
-import { FeatureItem } from '@/uikit/components/FeatureItem';
-import { AppRoutePage } from '@/uikit/components-app/AppRoutePage';
-import { i18nConfig, register18n } from '@config/i18n';
-import { COMMON_ADMIN_TITLE } from '@config/Identifier';
-import { RegisterForm } from './RegisterForm';
-import type { Metadata } from 'next';
-
-// Generate static params for all supported locales (used for SSG)
-export async function generateStaticParams() {
-  // Return one entry for each supported locale
-  return i18nConfig.supportedLngs.map((locale) => ({ locale }));
-}
-
-// Allow Next.js to statically generate this page if possible (default behavior)
-// Note: 'auto' is not a valid value in Next.js 15, removed to use default behavior
-
-// Optional: Use revalidate if you want ISR (Incremental Static Regeneration)
-// export const revalidate = 3600; // Rebuild every hour (optional)
-
-// Generate localized SEO metadata per locale (Next.js 15+ best practice)
-export async function generateMetadata({
-  params
-}: {
-  params: Promise<PageParamsType>;
-}): Promise<Metadata> {
-  const pageParams = new AppPageRouteParams(await params);
-
-  return await pageParams.getI18nInterface(register18n);
-}
-
-export default async function LoginPage(props: PageParamsProps) {
-  if (!props.params) {
-    return notFound();
-  }
-
-  const params = await props.params;
-  const pageParams = new AppPageRouteParams(params);
-
-  if (await bootstrapServer.getIOC(ServerAuth).hasAuth()) {
-    return redirect({ href: '/', locale: params.locale! });
-  }
-
-  const tt = await pageParams.getI18nInterface({
-    ...register18n,
-    adminTitle: COMMON_ADMIN_TITLE
-  });
-
-  return (
-    <AppRoutePage
-      data-testid="AppRoute-RegisterPage"
-      tt={{
-        title: tt.title,
-        adminTitle: tt.adminTitle
-      }}
-      showAuthButton={false}
-      headerHref=""
-      mainProps={{
-        className: 'text-xs1 bg-primary flex min-h-screen'
-      }}
-    >
-      <div className="hidden lg:flex bg-secondary lg:w-1/2 p-12 flex-col">
-        <h1 className="text-4xl font-bold text-text mb-4">{tt.welcome}</h1>
-        <p className="text-text-secondary text-lg mb-8">{tt.subtitle}</p>
-        <div className="space-y-4">
-          <FeatureItem icon="🎯" text={tt.feature_ai_paths} />
-          <FeatureItem icon="🎯" text={tt.feature_smart_recommendations} />
-          <FeatureItem icon="📊" text={tt.feature_progress_tracking} />
-        </div>
-      </div>
-
-      <div className="w-full lg:w-1/2 p-8 sm:p-12 flex items-center justify-center">
-        <div className="w-full max-w-[420px]">
-          <h2 className="text-2xl font-semibold mb-2 text-text">{tt.title}</h2>
-          <p className="text-text-secondary mb-8">{tt.subtitle}</p>
-
-          <RegisterForm tt={tt} />
-        </div>
-      </div>
-    </AppRoutePage>
-  );
-}

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

@@ -1,63 +0,0 @@
-import { NextIntlClientProvider } from 'next-intl';
-import { setRequestLocale } from 'next-intl/server';
-import type { PageLayoutProps } from '@/base/types/AppPageRouter';
-import { AppPageRouteParams } from '@/server/AppPageRouteParams';
-import { BootstrapsProvider } from '@/uikit/components/BootstrapsProvider';
-import { ClientRootProvider } from '@/uikit/components/ClientRootProvider';
-import { IOCProvider } from '@/uikit/components/IOCProvider';
-import { i18nConfig } from '@config/i18n';
-import '@/styles/css/index.css';
-import { themeConfig } from '@config/theme';
-
-export function generateStaticParams() {
-  return i18nConfig.supportedLngs.map((locale) => ({ locale }));
-}
-
-/**
- * RootLayout is the root layout for the app
- *
- * 注意事项:
- *
- * 1. Layout 组件建议不要使用类似客户端渲染, 比如 useMountedClient 等这样会导致重渲染时dom节点发生变化,
- * 页面闪烁特别是切换语言时
- *
- * 2. Layout 组件内 IOCProvider 置于顶层, 因为整个项目依赖容器化
- * 在 spa 中项目中，也就是前端渲染时是不需要要区分渲染环境(server 和 client)
- *
- * 3. 除了已有的 provider 外, 尽量使用 ClientRootProvider 包裹所有客户端组件
- *
- * @param children - The children components
- * @param params - The page parameters
- * @returns
- */
-export default async function RootLayout({
-  children,
-  params
-}: PageLayoutProps) {
-  const pageParams = new AppPageRouteParams(await params!);
-  const locale = pageParams.getLocale();
-  const theme = await pageParams.getTheme();
-
-  // Enable static rendering
-  setRequestLocale(locale);
-
-  // Get messages for the current locale to prevent flickering during language switch
-  // Load default namespaces (common, api) - admin namespaces are loaded in admin layout
-  const messages = await pageParams.getI18nMessages();
-
-  return (
-    <html data-testid="AppRoute-RootLayout" lang={locale} data-theme={theme}>
-      <body>
-        <IOCProvider>
-          <NextIntlClientProvider locale={locale} messages={messages}>
-            <BootstrapsProvider>
-              <ClientRootProvider themeConfig={themeConfig}>
-                {children}
-              </ClientRootProvider>
-            </BootstrapsProvider>
-          </NextIntlClientProvider>
-        </IOCProvider>
-      </body>
-    </html>
-  );
-}

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

@@ -1,24 +0,0 @@
-// import { useTranslations } from 'next-intl'; // Client-side translation hook
-import { identity as t } from 'lodash';
-import { Link } from '@/i18n/routing'; // i18n-aware Link component
-
-export default function NotFound() {
-  return (
-    <div
-      data-testid="NotFound"
-      className="space-y-6 py-24 flex flex-col items-center"
-    >
-      {/* Large translated 404 headline */}
-      <h1 className="text-4xl font-bold text-center">{'title'}</h1>
-      {/* Description text, translated */}
-      <p className="text-lg text-gray-600 text-center">{t('description')}</p>
-      {/* Link back to home page, translated label */}
-      <Link
-        href="/"
-        className="inline-block rounded-xl bg-gray-900 text-white font-medium px-6 py-3 hover:bg-gray-800 transition"
-      >
-        {t('backToHome')}
-      </Link>
-    </div>
-  );
-}