@qlover/create-app 0.10.1 → 0.10.3

package/dist/templates/next-app/config/Identifier/pages/page.about.ts

@@ -0,0 +1,20 @@
+/**
+ * @description About page title
+ * @localZh 关于我们
+ * @localEn About Us
+ */
+export const PAGE_ABOUT_TITLE = 'page_about:title';
+
+/**
+ * @description About page description
+ * @localZh 了解我们的团队和使命
+ * @localEn Learn about our team and mission
+ */
+export const PAGE_ABOUT_DESCRIPTION = 'page_about:description';
+
+/**
+ * @description About page keywords
+ * @localZh 关于我们, 团队, 使命
+ * @localEn About us, team, mission
+ */
+export const PAGE_ABOUT_KEYWORDS = 'page_about:keywords';

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

@@ -26,7 +26,7 @@ export const useLocaleRoutes = true;
  * - true: 使用API获取本地化数据，可以在 /admin/locales 页面中对他进行修改
  * - false: 不使用API获取本地化数据，直接使用 `@brain-toolkit/ts2locales` 生成的json数据
  */
-export const useApiLocales = false;
+export const useApiLocales = true;
 
 /**
  * 是否在在 useWarnTranslations 中警告缺失的翻译,而不是抛出错误

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

@@ -0,0 +1,23 @@
+export const cookiesConfig: Cookies.CookieAttributes = {
+  domain: '',
+  path: '/',
+  expires: 30,
+  /**
+   * httpOnly 必须为 false，否则客户端 JavaScript 无法设置 cookie
+   * httpOnly: true 只能用于服务端设置的 cookie（如认证 token）
+   */
+  httpOnly: false,
+  /**
+   * 是否仅通过 HTTPS 传输
+   *
+   * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#secure_cookie_attribute
+   */
+  secure: false,
+  /**
+   * 'strict'：最严格，跨站请求（如从其他网站链接过来）不发送 Cookie
+   * 其他可选值：'lax'（部分允许）、'none'（允许，但需要 secure: true）
+   *
+   * @see https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#samesite_cookie_attribute
+   */
+  sameSite: 'strict'
+};

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

@@ -0,0 +1,14 @@
+import * as i18nKeys from '../Identifier/pages/page.about';
+
+/**
+ * About page i18n interface
+ */
+export type AboutI18nInterface = typeof aboutI18n;
+
+export const aboutI18n = Object.freeze({
+  // basic meta properties
+  title: i18nKeys.PAGE_ABOUT_TITLE,
+  description: i18nKeys.PAGE_ABOUT_DESCRIPTION,
+  content: i18nKeys.PAGE_ABOUT_DESCRIPTION,
+  keywords: i18nKeys.PAGE_ABOUT_KEYWORDS
+});

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

@@ -8,7 +8,9 @@ export const i18nConfig = {
   fallbackLng: 'en',
   debug: false,
   supportedLngs: ['en', 'zh'] as const,
-  localeDetection: true
+  localeDetection: true,
+  defaultNamespaces: ['common', 'api'],
+  storageKey: 'NEXT_LOCALE'
 } as const;
 
 export type LocaleType = (typeof i18nConfig.supportedLngs)[number];

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

@@ -4,3 +4,4 @@ export * from './i18nConfig';
 export * from './loginI18n';
 export * from './PageI18nInterface';
 export * from './register18n';
+export * from './AboutI18n';

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

@@ -8,6 +8,14 @@ import * as i18nKeys from '../Identifier/pages/page.login';
  */
 export type LoginI18nInterface = typeof loginI18n;
 
+/**
+ * Login page i18n namespace
+ *
+ * - /login/page.tsx
+ *
+ */
+export const NS_PAGE_LOGIN = 'page_login';
+
 export const loginI18n = Object.freeze({
   // basic meta properties
   title: i18nKeys.PAGE_LOGIN_TITLE,

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

@@ -5,7 +5,11 @@ import type { ThemeConfig } from 'antd';
  */
 export const themeConfig = {
   domAttribute: 'data-theme',
+  /**
+   * If `enableSystem` is false, the default theme is light
+   */
   defaultTheme: 'system',
+  enableSystem: true,
   target: 'html',
   supportedThemes: ['light', 'dark', 'pink'],
   storageKey: 'fe_theme',

package/dist/templates/next-app/eslint.config.mjs

@@ -105,7 +105,11 @@ const eslintConfig = [
     },
     rules: {
       '@qlover-eslint/ts-class-method-return': 'error',
-      '@qlover-eslint/require-root-testid': 'error',
+      '@qlover-eslint/ts-class-member-accessibility': 'error',
+      '@qlover-eslint/ts-class-override': 'error',
+      '@qlover-eslint/require-root-testid': ['error', {
+        exclude: ['/Provider$/']
+      }],
       // 禁用原始的 no-unused-vars，使用 unused-imports 的规则替代
       '@typescript-eslint/no-unused-vars': 'off',
       // 强制使用 import type 导入类型
@@ -192,6 +196,9 @@ const eslintConfig = [
       'src/app/**/not-found.tsx',
       'src/i18n/request.ts',
       'src/middleware.ts',
+      'src/pages/**/*.tsx',
+      'src/app/manifest.ts',
+      'src/proxy.ts',
       '**/*.config.*'
     ],
     rules: {
@@ -200,4 +207,4 @@ const eslintConfig = [
   }
 ];
 
-export default eslintConfig;
+export default eslintConfig;

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

@@ -14,6 +14,7 @@ const nextConfig: NextConfig = {
   turbopack: {
     root: __dirname // 明确指定根目录
   },
+  transpilePackages: ['@qlover/corekit-bridge', '@qlover/fe-corekit'],
   env: {
     APP_ENV: process.env.APP_ENV
   }

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

@@ -10,15 +10,15 @@
     "build:staging": "cross-env APP_ENV=staging next build --turbopack",
     "build:prod": "cross-env APP_ENV=production next build --turbopack",
     "start": "next start --port 3101",
-    "lint": "eslint ./src ./config ./make ./migrations",
-    "lint:fix": "eslint ./src ./config ./make ./migrations --ext .ts,.tsx --fix",
+    "lint": "tsc --noEmit && eslint ./src ./config ./make ./migrations",
+    "lint:fix": "tsc --noEmit && eslint ./src ./config ./make ./migrations --ext .ts,.tsx --fix",
     "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
     "format:check": "prettier --check \"**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
     "fix": "npm run lint:fix && npm run format"
   },
   "dependencies": {
     "@ant-design/icons": "^6.0.0",
-    "@ant-design/nextjs-registry": "^1.1.0",
+    "@ant-design/nextjs-registry": "^1.3.0",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
     "@brain-toolkit/antd-blocks": "^0.0.1",
     "@brain-toolkit/antd-theme-override": "^0.0.3",
@@ -27,8 +27,10 @@
     "@qlover/corekit-bridge": "latest",
     "@qlover/fe-corekit": "latest",
     "@qlover/slice-store-react": "^1.4.1",
+    "@supabase/postgrest-js": "^2.87.1",
     "@supabase/ssr": "^0.7.0",
     "@supabase/supabase-js": "^2.57.2",
+    "@types/js-cookie": "^3.0.6",
     "@types/jsonwebtoken": "^9.0.10",
     "antd": "^5.27.1",
     "clsx": "^2.1.1",
@@ -36,8 +38,8 @@
     "inversify": "^7.8.1",
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
-    "next": "15.5.0",
-    "next-intl": "^4.3.5",
+    "next": "^16.0.3",
+    "next-intl": "^4.5.8",
     "next-themes": "^0.4.6",
     "openai": "^5.23.0",
     "p-limit": "^7.2.0",
@@ -53,6 +55,7 @@
     "@qlover/eslint-plugin": "latest",
     "@tailwindcss/postcss": "^4",
     "@types/lodash": "^4.17.20",
+    "@types/ms": "^2.1.0",
     "@types/node": "^20",
     "@types/react": "^19",
     "@types/react-dom": "^19",
@@ -66,8 +69,16 @@
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-unused-imports": "^4.2.0",
     "prettier": "^3.6.2",
-    "supabase": "^2.40.7",
     "tailwindcss": "^4",
     "typescript": "^5"
+  },
+  "engines": {
+    "node": "^20.17.0 || >=22.9.0",
+    "npm": ">=10.0.0"
+  },
+  "prettier": {
+    "singleQuote": true,
+    "trailingComma": "none",
+    "endOfLine": "lf"
   }
 }

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

@@ -19,17 +19,22 @@
   "common:create": "Create",
   "common:detail": "Detail",
   "common:theme__default": "Default Theme",
+  "common:theme__light": "Light Theme",
   "common:theme__dark": "Dark Theme",
   "common:theme__pink": "Pink Theme",
   "common:admin__title": "Admin Backend",
   "common:logout__dialog__title": "Logout",
   "common:logout__dialog__content": "Are you sure you want to logout?",
   "common:i18n_key_invalid": "I18n key format is incorrect",
+  "common:manifest__name": "Application Name",
   "common:v:login_params_required": "Not a valid login parameter",
   "common:v:email_invalid": "Invalid email format validation message",
   "common:v:password_min_length": "Password minimum length validation message(6)",
   "common:v:password_max_length": "Password maximum length validation message(50)",
   "common:v:password_special_chars": "Password cannot contain whitespace characters validation message",
+  "page_about:title": "About Us",
+  "page_about:description": "Learn about our team and mission",
+  "page_about:keywords": "About us, team, mission",
   "admin_home:title": "Admin page",
   "admin_home:description": "Admin page",
   "admin_home:keywords": "Admin page",

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

@@ -19,17 +19,22 @@
   "common:create": "创建",
   "common:detail": "详情",
   "common:theme__default": "默认主题",
+  "common:theme__light": "亮色主题",
   "common:theme__dark": "暗色主题",
   "common:theme__pink": "粉色主题",
   "common:admin__title": "管理后台",
   "common:logout__dialog__title": "登出",
   "common:logout__dialog__content": "确定要登出吗？",
   "common:i18n_key_invalid": "i18n 键格式不正确",
+  "common:manifest__name": "应用名称",
   "common:v:login_params_required": "不是一个有效的登录参数",
   "common:v:email_invalid": "邮箱格式无效的验证消息",
   "common:v:password_min_length": "密码最小长度验证消息(6)",
   "common:v:password_max_length": "密码最大长度验证消息(50)",
   "common:v:password_special_chars": "密码不能包含空格的验证消息",
+  "page_about:title": "关于我们",
+  "page_about:description": "了解我们的团队和使命",
+  "page_about:keywords": "关于我们, 团队, 使命",
   "admin_home:title": "管理员页面",
   "admin_home:description": "管理员页面",
   "admin_home:keywords": "管理员页面关键词",

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

@@ -0,0 +1,37 @@
+'use client';
+
+import { NextIntlClientProvider, useMessages } from 'next-intl';
+
+/**
+ * Client component wrapper to merge admin i18n messages
+ * NextIntlClientProvider supports nesting and will merge messages from parent provider
+ */
+export function AdminI18nProvider({
+  children,
+  locale,
+  adminMessages
+}: {
+  children: React.ReactNode;
+  locale: string;
+  adminMessages: Record<string, string>;
+}) {
+  // Get existing messages from parent NextIntlClientProvider (includes common, api)
+  const existingMessages = useMessages();
+
+  // Merge admin messages with existing messages
+  // Admin messages will override any existing keys with the same name
+  const mergedMessages = {
+    ...existingMessages,
+    ...adminMessages
+  };
+
+  return (
+    <NextIntlClientProvider
+      data-testid="AdminI18nProvider"
+      locale={locale}
+      messages={mergedMessages}
+    >
+      {children}
+    </NextIntlClientProvider>
+  );
+}

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

@@ -1,18 +1,42 @@
-import type { PageLayoutProps } from '@/base/types/PageProps';
-import { PageParams } from '@/server/PageParams';
+import type { PageLayoutProps } from '@/base/types/AppPageRouter';
+import { AppPageRouteParams } from '@/server/AppPageRouteParams';
 import '@/styles/css/index.css';
 import { AdminLayout } from '@/uikit/components/AdminLayout';
+import { ClinetRenderProvider } from '@/uikit/components/ClinetRenderProvider';
+import { AdminI18nProvider } from './AdminI18nProvider';
 
 export default async function AdminRootLayout({
   children,
   params
 }: PageLayoutProps) {
-  const pageParams = new PageParams(await params!);
+  const pageParams = new AppPageRouteParams(await params!);
   const locale = pageParams.getLocale();
 
+  // Load admin i18n namespaces for admin pages
+  // Note: getI18nMessages will merge with default namespaces (common, api)
+  // but we only need admin namespaces here since common/api are already in root layout
+  const adminNamespaces = ['admin_home', 'admin_locales', 'admin_users'];
+  const allMessages = await pageParams.getI18nMessages(adminNamespaces);
+
+  // Extract only admin messages (excluding common and api which are already in root layout)
+  // This avoids duplicate messages and ensures we only add what's needed
+  const adminMessages = Object.fromEntries(
+    Object.entries(allMessages).filter(([key]) =>
+      adminNamespaces.some((ns) => key.startsWith(`${ns}:`))
+    )
+  );
+
   return (
-    <AdminLayout data-testid="AdminRootLayout" lang={locale}>
-      {children}
-    </AdminLayout>
+    <AdminI18nProvider
+      data-testid="AdminI18nProvider"
+      locale={locale}
+      adminMessages={adminMessages}
+    >
+      <ClinetRenderProvider>
+        <AdminLayout data-testid="AdminRootLayout" lang={locale}>
+          {children}
+        </AdminLayout>
+      </ClinetRenderProvider>
+    </AdminI18nProvider>
   );
 }

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

@@ -11,8 +11,8 @@ import { Form, Input } from 'antd';
 import { useCallback, useMemo } from 'react';
 import { ZodColumnBuilder } from '@/base/cases/ZodColumnBuilder';
 import type { AdminLocalesApi } from '@/base/services/adminApi/AdminLocalesApi';
-import { AdminLocalesService } from '@/base/services/AdminLocalesService';
 import { AdminPageEvent } from '@/base/services/AdminPageEvent';
+import { AdminLocalesService } from '@/server/services/AdminLocalesService';
 import { ClientSeo } from '@/uikit/components/ClientSeo';
 import { EditableCell } from '@/uikit/components/EditableCell';
 import { LocalesImportButton } from '@/uikit/components/localesImportButton/LocalesImportButton';

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

@@ -1,25 +1,62 @@
 import { NextIntlClientProvider } from 'next-intl';
-import type { PageLayoutProps } from '@/base/types/PageProps';
-import { PageParams } from '@/server/PageParams';
-import { ComboProvider } from '@/uikit/components/ComboProvider';
-import { themeConfig } from '@config/theme';
+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 PageParams(await params!);
+  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();
 
-  // TODO: suppressHydrationWarning 暂时解决 hydration 问题
   return (
-    <html data-testid="RootLayout" lang={locale} suppressHydrationWarning>
+    <html data-testid="AppRoute-RootLayout" lang={locale} data-theme={theme}>
       <body>
-        <NextIntlClientProvider locale={locale} messages={messages}>
-          <ComboProvider themeConfig={themeConfig}>{children}</ComboProvider>
-        </NextIntlClientProvider>
+        <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]/login/LoginForm.tsx

@@ -28,7 +28,7 @@ export function LoginForm(props: { tt: LoginI18nInterface }) {
     try {
       setLoading(true);
       await userService.login(values);
-      routerService.gotoHome();
+      routerService.replaceHome();
     } catch (error) {
       logger.error(error);
     } finally {

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

@@ -1,12 +1,16 @@
 import { notFound } from 'next/navigation';
-import type { PageParamsProps } from '@/base/types/PageProps';
+import type { PageParamsProps } from '@/base/types/AppPageRouter';
 import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
 import { redirect } from '@/i18n/routing';
-import { PageParams, type PageParamsType } from '@/server/PageParams';
+import {
+  AppPageRouteParams,
+  type PageParamsType
+} from '@/server/AppPageRouteParams';
 import { ServerAuth } from '@/server/ServerAuth';
-import { BaseLayout } from '@/uikit/components/BaseLayout';
 import { FeatureItem } from '@/uikit/components/FeatureItem';
-import { loginI18n, i18nConfig } from '@config/i18n';
+import { AppRoutePage } from '@/uikit/components-app/AppRoutePage';
+import { loginI18n, i18nConfig, NS_PAGE_LOGIN } from '@config/i18n';
+import { COMMON_ADMIN_TITLE } from '@config/Identifier';
 import { LoginForm } from './LoginForm';
 import type { Metadata } from 'next';
 
@@ -28,7 +32,7 @@ export async function generateMetadata({
 }: {
   params: Promise<PageParamsType>;
 }): Promise<Metadata> {
-  const pageParams = new PageParams(await params);
+  const pageParams = new AppPageRouteParams(await params);
 
   return await pageParams.getI18nInterface(loginI18n);
 }
@@ -39,7 +43,7 @@ export default async function LoginPage(props: PageParamsProps) {
   }
 
   const params = await props.params;
-  const pageParams = new PageParams(params);
+  const pageParams = new AppPageRouteParams(params);
 
   const server = new BootstrapServer();
 
@@ -47,11 +51,19 @@ export default async function LoginPage(props: PageParamsProps) {
     return redirect({ href: '/', locale: params.locale! });
   }
 
-  const tt = await pageParams.getI18nInterface(loginI18n);
+  const tt = await pageParams.getI18nInterface(
+    { ...loginI18n, adminTitle: COMMON_ADMIN_TITLE },
+    NS_PAGE_LOGIN
+  );
 
   return (
-    <BaseLayout
-      data-testid="LoginPage"
+    <AppRoutePage
+      data-testid="AppRoute-LoginPage"
+      tt={{
+        title: tt.title,
+        adminTitle: tt.adminTitle
+      }}
+      headerHref="/login"
       mainProps={{
         className: 'text-xs1 bg-primary flex min-h-screen'
       }}
@@ -74,6 +86,6 @@ export default async function LoginPage(props: PageParamsProps) {
           <LoginForm tt={tt} />
         </div>
       </div>
-    </BaseLayout>
+    </AppRoutePage>
   );
 }

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

@@ -1,11 +1,15 @@
 import { Button } from 'antd';
-import type { PageParamsProps } from '@/base/types/PageProps';
+import type { PageParamsProps } from '@/base/types/AppPageRouter';
 import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
 import { redirect } from '@/i18n/routing';
-import { PageParams, type PageParamsType } from '@/server/PageParams';
+import {
+  AppPageRouteParams,
+  type PageParamsType
+} from '@/server/AppPageRouteParams';
 import { ServerAuth } from '@/server/ServerAuth';
-import { BaseLayout } from '@/uikit/components/BaseLayout';
+import { AppRoutePage } from '@/uikit/components-app/AppRoutePage';
 import { i18nConfig, homeI18n } from '@config/i18n';
+import { COMMON_ADMIN_TITLE } from '@config/Identifier';
 import type { Metadata } from 'next';
 
 // const navigationItems = [
@@ -34,22 +38,33 @@ export async function generateMetadata({
 }: {
   params: Promise<PageParamsType>;
 }): Promise<Metadata> {
-  const pageParams = new PageParams(await params);
+  const pageParams = new AppPageRouteParams(await params);
   return await pageParams.getI18nInterface(homeI18n);
 }
 
 export default async function Home({ params }: PageParamsProps) {
   const server = new BootstrapServer();
-  const pageParams = new PageParams(await params!);
+  const pageParams = new AppPageRouteParams(await params!);
   const locale = pageParams.getLocale();
-  const tt = await pageParams.getI18nInterface(homeI18n);
+  const tt = await pageParams.getI18nInterface({
+    ...homeI18n,
+    adminTitle: COMMON_ADMIN_TITLE
+  });
 
   if (!(await server.getIOC(ServerAuth).hasAuth())) {
     return redirect({ href: '/login', locale });
   }
 
   return (
-    <BaseLayout data-testid="HomePage" showLogoutButton showAdminButton>
+    <AppRoutePage
+      data-testid="AppRoute-HomePage"
+      showLogoutButton
+      showAdminButton
+      tt={{
+        title: tt.title,
+        adminTitle: tt.adminTitle
+      }}
+    >
       {/* Hero Section */}
       <section className="py-16 px-4">
         <div className="max-w-4xl mx-auto text-center">
@@ -105,6 +120,6 @@ export default async function Home({ params }: PageParamsProps) {
           </Button>
         </div>
       </section>
-    </BaseLayout>
+    </AppRoutePage>
   );
 }

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

@@ -1,12 +1,16 @@
 import { notFound } from 'next/navigation';
-import type { PageParamsProps } from '@/base/types/PageProps';
+import type { PageParamsProps } from '@/base/types/AppPageRouter';
 import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
 import { redirect } from '@/i18n/routing';
-import { PageParams, type PageParamsType } from '@/server/PageParams';
+import {
+  AppPageRouteParams,
+  type PageParamsType
+} from '@/server/AppPageRouteParams';
 import { ServerAuth } from '@/server/ServerAuth';
-import { BaseLayout } from '@/uikit/components/BaseLayout';
 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';
 
@@ -28,7 +32,7 @@ export async function generateMetadata({
 }: {
   params: Promise<PageParamsType>;
 }): Promise<Metadata> {
-  const pageParams = new PageParams(await params);
+  const pageParams = new AppPageRouteParams(await params);
 
   return await pageParams.getI18nInterface(register18n);
 }
@@ -39,7 +43,7 @@ export default async function LoginPage(props: PageParamsProps) {
   }
 
   const params = await props.params;
-  const pageParams = new PageParams(params);
+  const pageParams = new AppPageRouteParams(params);
 
   const server = new BootstrapServer();
 
@@ -47,11 +51,19 @@ export default async function LoginPage(props: PageParamsProps) {
     return redirect({ href: '/', locale: params.locale! });
   }
 
-  const tt = await pageParams.getI18nInterface(register18n);
+  const tt = await pageParams.getI18nInterface({
+    ...register18n,
+    adminTitle: COMMON_ADMIN_TITLE
+  });
 
   return (
-    <BaseLayout
-      data-testid="RegisterPage"
+    <AppRoutePage
+      data-testid="AppRoute-RegisterPage"
+      tt={{
+        title: tt.title,
+        adminTitle: tt.adminTitle
+      }}
+      headerHref="/login"
       mainProps={{
         className: 'text-xs1 bg-primary flex min-h-screen'
       }}
@@ -74,6 +86,6 @@ export default async function LoginPage(props: PageParamsProps) {
           <RegisterForm tt={tt} />
         </div>
       </div>
-    </BaseLayout>
+    </AppRoutePage>
   );
 }