@qlover/create-app 0.7.8 → 0.7.10

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

@@ -0,0 +1,20 @@
+/**
+ * @description 用户未找到
+ * @localZh 用户未找到
+ * @localEn User not found
+ */
+export const API_USER_NOT_FOUND = 'api__user__not_found';
+
+/**
+ * @description 用户已存在
+ * @localZh 用户已存在
+ * @localEn User already exists
+ */
+export const API_USER_ALREADY_EXISTS = 'api__user__already_exists';
+
+/**
+ * @description 响应不正确
+ * @localZh 响应不正确
+ * @localEn Response not correct
+ */
+export const API_RESPONSE_NOT_OK = 'RESPONSE_NOT_OK';

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

@@ -1,3 +1,4 @@
+export * from './api';
 export * from './common';
 export * from './common.error';
 export * from './page.about';
@@ -8,3 +9,4 @@ export * from './page.jsonStorage';
 export * from './page.login';
 export * from './page.register';
 export * from './page.request';
+export * from './validator';

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

@@ -12,6 +12,13 @@ export const PAGE_HOME_TITLE = 'page__home__title';
  */
 export const PAGE_HOME_DESCRIPTION = 'page__home__description';
 
+/**
+ * @description Home page keywords
+ * @localZh 现代前端实用库, 实用工具, 组件
+ * @localEn Modern frontend utility library, practical tools, components
+ */
+export const PAGE_HOME_KEYWORDS = 'page__home__keywords';
+
 /**
  * @description Home page welcome message
  * @localZh 欢迎来到主页

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

@@ -97,8 +97,8 @@ export const LOGIN_NO_ACCOUNT = 'login__no_account';
 export const LOGIN_CREATE_ACCOUNT = 'login__create_account';
 /**
  * @description Login page email validation message
- * @localZh 请输入您的邮箱！
- * @localEn Please input your email!
+ * @localZh 请输入正确的邮箱！
+ * @localEn Please input a valid email!
  */
 export const LOGIN_EMAIL_REQUIRED = 'login__email_required';
 /**

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

@@ -13,17 +13,56 @@ export const PAGE_REGISTER_TITLE = 'page__register__title';
 export const PAGE_REGISTER_DESCRIPTION = 'page__register__description';
 
 /**
- * @description Register page title
- * @localZh 创建账号
- * @localEn Create Account
+ * @description Register page content
+ * @localZh 创建账号页面内容
+ * @localEn Create Account Page Content
  */
-export const REGISTER_TITLE = 'register__title';
+export const PAGE_REGISTER_CONTENT = 'page__register__content';
+
+/**
+ * @description Register page keywords
+ * @localZh 创建账号页面关键词
+ * @localEn Create Account Page Keywords
+ */
+export const PAGE_REGISTER_KEYWORDS = 'page__register__keywords';
+
+/**
+ * @description Register page welcome
+ * @localZh 欢迎来到我们的平台
+ * @localEn Welcome to our platform
+ */
+export const REGISTER_WELCOME = 'register__welcome';
+
 /**
  * @description Register page subtitle
  * @localZh 开始您的学习之旅
  * @localEn Start your learning journey
  */
 export const REGISTER_SUBTITLE = 'register__subtitle';
+
+/**
+ * @description Register page feature ai paths
+ * @localZh AI路径
+ * @localEn AI Paths
+ */
+export const REGISTER_FEATURE_AI_PATHS = 'register__feature__ai_paths';
+
+/**
+ * @description Register page feature smart recommendations
+ * @localZh 智能推荐
+ * @localEn Smart Recommendations
+ */
+export const REGISTER_FEATURE_SMART_RECOMMENDATIONS =
+  'register__feature__smart_recommendations';
+
+/**
+ * @description Register page feature progress tracking
+ * @localZh 进度跟踪
+ * @localEn Progress Tracking
+ */
+export const REGISTER_FEATURE_PROGRESS_TRACKING =
+  'register__feature__progress_tracking';
+
 /**
  * @description Register page username field
  * @localZh 用户名
@@ -121,24 +160,6 @@ export const REGISTER_HAVE_ACCOUNT = 'register__have_account';
  * @localEn Sign in
  */
 export const REGISTER_LOGIN_LINK = 'register__login_link';
-/**
- * @description Register page feature item - Personalized Learning
- * @localZh 个性化学习体验
- * @localEn Personalized Learning Experience
- */
-export const REGISTER_FEATURE_PERSONALIZED = 'register__feature__personalized';
-/**
- * @description Register page feature item - Expert Support
- * @localZh 专家支持和指导
- * @localEn Expert Support and Guidance
- */
-export const REGISTER_FEATURE_SUPPORT = 'register__feature__support';
-/**
- * @description Register page feature item - Learning Community
- * @localZh 活跃的学习社区
- * @localEn Active Learning Community
- */
-export const REGISTER_FEATURE_COMMUNITY = 'register__feature__community';
 /**
  * @description Register page terms agreement required message
  * @localZh 请同意服务条款和隐私政策

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

@@ -0,0 +1,34 @@
+/**
+ * @description Validator for login params
+ * @localZh 不是一个有效的登录参数
+ * @localEn Not a valid login parameter
+ */
+export const V_LOGIN_PARAMS_REQUIRED = 'v_login_params_required';
+
+/**
+ * @description Invalid email format validation message
+ * @localZh 邮箱格式无效的验证消息
+ * @localEn Invalid email format validation message
+ */
+export const V_EMAIL_INVALID = 'validator_email_invalid';
+
+/**
+ * @description Password minimum length validation message
+ * @localZh 密码最小长度验证消息(6)
+ * @localEn Password minimum length validation message(6)
+ */
+export const V_PASSWORD_MIN_LENGTH = 'validator_password_min_length';
+
+/**
+ * @description Password maximum length validation message
+ * @localZh 密码最大长度验证消息(50)
+ * @localEn Password maximum length validation message(50)
+ */
+export const V_PASSWORD_MAX_LENGTH = 'validator_password_max_length';
+
+/**
+ * @description Password whitespace validation message
+ * @localZh 密码不能包含空格的验证消息
+ * @localEn Password cannot contain whitespace characters validation message
+ */
+export const V_PASSWORD_SPECIAL_CHARS = 'validator_password_special_chars';

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

@@ -0,0 +1,22 @@
+import * as i18nKeys from '../Identifier/page.home';
+
+/**
+ * Home page i18n interface
+ *
+ * @description
+ * - welcome: welcome message
+ */
+export type HomeI18nInterface = typeof homeI18n;
+
+export const homeI18n = Object.freeze({
+  // basic meta properties
+  title: i18nKeys.PAGE_HOME_TITLE,
+  description: i18nKeys.PAGE_HOME_DESCRIPTION,
+  content: i18nKeys.PAGE_HOME_DESCRIPTION,
+  keywords: i18nKeys.PAGE_HOME_KEYWORDS,
+
+  welcome: i18nKeys.HOME_WELCOME,
+  getStartedTitle: i18nKeys.HOME_GET_STARTED_TITLE,
+  getStartedDescription: i18nKeys.HOME_GET_STARTED_DESCRIPTION,
+  getStartedButton: i18nKeys.HOME_GET_STARTED_BUTTON
+});

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

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

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

@@ -0,0 +1,44 @@
+import * as i18nKeys from '../Identifier/page.register';
+
+/**
+ * Register page i18n interface
+ *
+ * @description
+ * - welcome: welcome message
+ */
+export type RegisterI18nInterface = typeof register18n;
+
+export const register18n = Object.freeze({
+  // basic meta properties
+  title: i18nKeys.PAGE_REGISTER_TITLE,
+  description: i18nKeys.PAGE_REGISTER_DESCRIPTION,
+  content: i18nKeys.PAGE_REGISTER_CONTENT,
+  keywords: i18nKeys.PAGE_REGISTER_KEYWORDS,
+
+  // register page
+  welcome: i18nKeys.REGISTER_WELCOME,
+  subtitle: i18nKeys.REGISTER_SUBTITLE,
+  feature_ai_paths: i18nKeys.REGISTER_FEATURE_AI_PATHS,
+  feature_smart_recommendations:
+    i18nKeys.REGISTER_FEATURE_SMART_RECOMMENDATIONS,
+  feature_progress_tracking: i18nKeys.REGISTER_FEATURE_PROGRESS_TRACKING,
+
+  // register form
+  username: i18nKeys.REGISTER_USERNAME,
+  username_required: i18nKeys.REGISTER_USERNAME_REQUIRED,
+  email: i18nKeys.REGISTER_EMAIL,
+  email_required: i18nKeys.REGISTER_EMAIL_REQUIRED,
+  password: i18nKeys.REGISTER_PASSWORD,
+  password_required: i18nKeys.REGISTER_PASSWORD_REQUIRED,
+  confirm_password_required: i18nKeys.REGISTER_CONFIRM_PASSWORD_REQUIRED,
+  password_mismatch: i18nKeys.REGISTER_PASSWORD_MISMATCH,
+  button: i18nKeys.REGISTER_BUTTON,
+  terms_prefix: i18nKeys.REGISTER_TERMS_PREFIX,
+  terms_link: i18nKeys.REGISTER_TERMS_LINK,
+  terms_and: i18nKeys.REGISTER_TERMS_AND,
+  privacy_link: i18nKeys.REGISTER_PRIVACY_LINK,
+  have_account: i18nKeys.REGISTER_HAVE_ACCOUNT,
+  confirm_password: i18nKeys.REGISTER_CONFIRM_PASSWORD,
+  terms_required: i18nKeys.REGISTER_TERMS_REQUIRED,
+  login_link: i18nKeys.REGISTER_LOGIN_LINK
+});

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

@@ -20,4 +20,5 @@ export const themeConfig = {
   } as ThemeConfig
 } as const;
 
+export type SupportedTheme = (typeof themeConfig.supportedThemes)[number];
 export type CommonThemeConfig = typeof themeConfig;

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

@@ -0,0 +1,13 @@
+export interface UserSchema {
+  id: number;
+  role: string;
+  email: string;
+  password: string;
+  /**
+   * 加密的token, 包含token, 过期时间
+   */
+  credential_token: string;
+  email_confirmed_at: number;
+  created_at?: number;
+  updated_at?: number;
+}

package/dist/templates/next-app/migrations/sql/1694244000000.sql

@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS fe_users (
+  id BIGSERIAL PRIMARY KEY,
+  role TEXT NOT NULL,
+  email TEXT NOT NULL,
+  password TEXT NOT NULL,
+  credential_token TEXT,
+  email_confirmed_at TIMESTAMPTZ,
+  created_at TIMESTAMPTZ DEFAULT NOW(),
+  updated_at TIMESTAMPTZ DEFAULT NOW()
+);

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

@@ -3,13 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "cross-env APP_ENV=localhost next dev --turbopack",
-    "dev:staging": "cross-env APP_ENV=staging next dev --turbopack",
-    "dev:prod": "cross-env APP_ENV=production next dev --turbopack",
+    "dev": "cross-env APP_ENV=localhost next dev --turbopack --port 3100",
+    "dev:staging": "cross-env APP_ENV=staging next dev --turbopack --port 3100",
+    "dev:prod": "cross-env APP_ENV=production next dev --turbopack --port 3100",
     "build": "cross-env APP_ENV=localhost next build --turbopack",
     "build:staging": "cross-env APP_ENV=staging next build --turbopack",
     "build:prod": "cross-env APP_ENV=production next build --turbopack",
-    "start": "next start",
+    "start": "next start --port 3101",
     "lint": "eslint .",
     "lint:fix": "eslint . --ext .ts,.tsx --fix",
     "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
@@ -25,26 +25,34 @@
     "@qlover/corekit-bridge": "^1.6.4",
     "@qlover/fe-corekit": "^2.1.0",
     "@qlover/slice-store-react": "^1.4.1",
+    "@supabase/auth-helpers-nextjs": "^0.10.0",
+    "@supabase/ssr": "^0.7.0",
+    "@supabase/supabase-js": "^2.57.2",
+    "@types/jsonwebtoken": "^9.0.10",
     "antd": "^5.27.1",
     "clsx": "^2.1.1",
     "inversify": "^7.8.1",
+    "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
     "next": "15.5.0",
     "next-intl": "^4.3.5",
     "next-themes": "^0.4.6",
     "react": "19.1.0",
-    "react-dom": "19.1.0"
+    "react-dom": "19.1.0",
+    "zod": "^4.1.8"
   },
   "devDependencies": {
     "@brain-toolkit/ts2locales": "^0.2.3",
     "@eslint/eslintrc": "^3",
+    "@qlover/env-loader": "^0.3.0",
+    "@qlover/eslint-plugin": "latest",
     "@tailwindcss/postcss": "^4",
     "@types/lodash": "^4.17.20",
     "@types/node": "^20",
     "@types/react": "^19",
     "@types/react-dom": "^19",
-    "@qlover/eslint-plugin": "latest",
     "cross-env": "^7.0.3",
+    "dotenv-expand": "^12.0.3",
     "eslint": "^9",
     "eslint-config-next": "15.5.0",
     "eslint-config-prettier": "^10.1.8",
@@ -52,6 +60,7 @@
     "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"
   }

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

@@ -114,7 +114,7 @@
   "login__with_google": "Sign in with Google",
   "login__no_account": "Don't have an account?",
   "login__create_account": "Create one here",
-  "login__email_required": "Please input your email!",
+  "login__email_required": "Please input a valid email!",
   "login__password_required": "Please input your password!",
   "login__feature__ai_paths": "AI-powered personalized learning paths",
   "login__feature__smart_recommendations": "Smart content recommendations",
@@ -180,5 +180,20 @@
   "page__request__stop_api_catch": "Stop API Catch Result",
   "page__login__content": "Login Page Content",
   "page__login__keywords": "Login Page Keywords",
-  "err__server__auth__error": "Server auth error"
+  "err__server__auth__error": "Server auth error",
+  "page__home__keywords": "Modern frontend utility library, practical tools, components",
+  "api__user__not_found": "User not found",
+  "api__user__already_exists": "User already exists",
+  "RESPONSE_NOT_OK": "Response not correct",
+  "v_login_params_required": "Not a valid login parameter",
+  "validator_email_invalid": "Invalid email format validation message",
+  "validator_password_min_length": "Password minimum length validation message(6)",
+  "validator_password_max_length": "Password maximum length validation message(50)",
+  "validator_password_special_chars": "Password cannot contain whitespace characters validation message",
+  "page__register__content": "Create Account Page Content",
+  "page__register__keywords": "Create Account Page Keywords",
+  "register__welcome": "Welcome to our platform",
+  "register__feature__ai_paths": "AI Paths",
+  "register__feature__smart_recommendations": "Smart Recommendations",
+  "register__feature__progress_tracking": "Progress Tracking"
 }

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

@@ -114,7 +114,7 @@
   "login__with_google": "使用 Google 登录",
   "login__no_account": "还没有账号？",
   "login__create_account": "在此创建",
-  "login__email_required": "请输入您的邮箱！",
+  "login__email_required": "请输入正确的邮箱！",
   "login__password_required": "请输入您的密码！",
   "login__feature__ai_paths": "AI驱动的个性化学习路径",
   "login__feature__smart_recommendations": "智能内容推荐",
@@ -180,5 +180,20 @@
   "page__request__stop_api_catch": "停止 API 捕获结果",
   "page__login__content": "登录页面内容",
   "page__login__keywords": "登录页面关键词",
-  "err__server__auth__error": "服务器认证错误"
+  "err__server__auth__error": "服务器认证错误",
+  "page__home__keywords": "现代前端实用库, 实用工具, 组件",
+  "api__user__not_found": "用户未找到",
+  "api__user__already_exists": "用户已存在",
+  "RESPONSE_NOT_OK": "响应不正确",
+  "v_login_params_required": "不是一个有效的登录参数",
+  "validator_email_invalid": "邮箱格式无效的验证消息",
+  "validator_password_min_length": "密码最小长度验证消息(6)",
+  "validator_password_max_length": "密码最大长度验证消息(50)",
+  "validator_password_special_chars": "密码不能包含空格的验证消息",
+  "page__register__content": "创建账号页面内容",
+  "page__register__keywords": "创建账号页面关键词",
+  "register__welcome": "欢迎来到我们的平台",
+  "register__feature__ai_paths": "AI路径",
+  "register__feature__smart_recommendations": "智能推荐",
+  "register__feature__progress_tracking": "进度跟踪"
 }

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

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

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

@@ -0,0 +1,10 @@
+'use client';
+import Link from 'next/link';
+
+export default function AdminPage() {
+  return (
+    <div data-testid="AdminPage">
+      <Link href="/admin/migrations">Migrations</Link>
+    </div>
+  );
+}

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

@@ -2,7 +2,6 @@ import { NextIntlClientProvider } from 'next-intl';
 import { themeConfig } from '@config/theme';
 import { PageParams } from '@/base/cases/PageParams';
 import type { PageLayoutProps } from '@/base/types/PageProps';
-import { BaseHeader } from '@/uikit/components/BaseHeader';
 import { ComboProvider } from '@/uikit/components/ComboProvider';
 import '@/styles/css/index.css';
 
@@ -19,12 +18,7 @@ export default async function RootLayout({
     <html data-testid="RootLayout" lang={locale} suppressHydrationWarning>
       <body>
         <NextIntlClientProvider locale={locale} messages={messages}>
-          <ComboProvider themeConfig={themeConfig}>
-            <div className="flex flex-col min-h-screen">
-              <BaseHeader showLogoutButton />
-              <div className="flex flex-col">{children}</div>
-            </div>
-          </ComboProvider>
+          <ComboProvider themeConfig={themeConfig}>{children}</ComboProvider>
         </NextIntlClientProvider>
       </body>
     </html>

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

@@ -2,8 +2,10 @@
 
 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';
@@ -15,7 +17,10 @@ interface LoginFormData {
 
 export function LoginForm(props: { tt: LoginI18nInterface }) {
   const { tt } = props;
+  const t = useTranslations();
   const userService = useIOC(I.UserServiceInterface);
+  const logger = useIOC(I.Logger);
+  const appConfig = useIOC(I.AppConfig);
   const routerService = useIOC(I.RouterServiceInterface);
   const [loading, setLoading] = useState(false);
 
@@ -25,7 +30,7 @@ export function LoginForm(props: { tt: LoginI18nInterface }) {
       await userService.login(values);
       routerService.gotoHome();
     } catch (error) {
-      console.error('Login error:', error);
+      logger.error(error);
     } finally {
       setLoading(false);
     }
@@ -38,39 +43,50 @@ export function LoginForm(props: { tt: LoginI18nInterface }) {
       onFinish={handleLogin}
       layout="vertical"
       className="space-y-4"
+      validateTrigger="onSubmit"
+      initialValues={{
+        email: appConfig.testLoginEmail,
+        password: appConfig.testLoginPassword
+      }}
     >
       <Form.Item
         name="email"
-        rules={[{ required: true, message: tt.emailRequired }]}
+        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-border"
-          autoComplete="off"
+          className="h-12 text-base bg-secondary border-c-border"
         />
       </Form.Item>
 
       <Form.Item
         name="password"
-        rules={[{ required: true, message: tt.passwordRequired }]}
+        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"
-          autoComplete="new-password"
         />
       </Form.Item>
 
       <div className="flex justify-end">
-        <LocaleLink
-          href="#"
-          className="text-brand hover:text-brand-hover"
-          title={tt.forgotPasswordTitle}
-        >
+        <LocaleLink href="#" title={tt.forgotPasswordTitle}>
           {tt.forgotPassword}
         </LocaleLink>
       </div>
@@ -101,11 +117,7 @@ export function LoginForm(props: { tt: LoginI18nInterface }) {
 
       <div className="text-center mt-6">
         <span className="text-text-tertiary">{tt.noAccount} </span>
-        <LocaleLink
-          href="/register"
-          className="text-brand hover:text-brand-hover"
-          title={tt.createAccountTitle}
-        >
+        <LocaleLink href="/register" title={tt.createAccountTitle}>
           {tt.createAccount}
         </LocaleLink>
       </div>

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

@@ -1,11 +1,12 @@
 import { notFound } from 'next/navigation';
 import { loginI18n, i18nConfig } from '@config/i18n';
 import { PageParams, type PageParamsType } from '@/base/cases/PageParams';
-import { ServerAuth } from '@/base/cases/ServerAuth';
 import type { PageParamsProps } from '@/base/types/PageProps';
 import { BootstrapServer } from '@/core/bootstraps/BootstrapServer';
 import { redirect } from '@/i18n/routing';
-import { FeatureItem } from './FeatureItem';
+import { ServerAuth } from '@/server/ServerAuth';
+import { BaseLayout } from '@/uikit/components/BaseLayout';
+import { FeatureItem } from '@/uikit/components/FeatureItem';
 import { LoginForm } from './LoginForm';
 import type { Metadata } from 'next';
 
@@ -29,9 +30,7 @@ export async function generateMetadata({
 }): Promise<Metadata> {
   const pageParams = new PageParams(await params);
 
-  const tt = await pageParams.getI18nInterface(loginI18n);
-
-  return tt;
+  return await pageParams.getI18nInterface(loginI18n);
 }
 
 export default async function LoginPage(props: PageParamsProps) {
@@ -44,25 +43,20 @@ export default async function LoginPage(props: PageParamsProps) {
 
   const server = new BootstrapServer();
 
-  if (await new ServerAuth(server).hasAuth()) {
+  if (await server.getIOC(ServerAuth).hasAuth()) {
     return redirect({ href: '/', locale: params.locale! });
   }
 
   const tt = await pageParams.getI18nInterface(loginI18n);
 
   return (
-    <div
+    <BaseLayout
       data-testid="LoginPage"
-      className="flex text-xs1 bg-primary min-h-screen"
+      mainProps={{
+        className: 'text-xs1 bg-primary flex min-h-screen'
+      }}
     >
-      {/* Left side - Brand section */}
       <div className="hidden lg:flex bg-secondary lg:w-1/2 p-12 flex-col">
-        <div className="flex items-center gap-3 mb-12">
-          <div className="w-10 h-10 bg-brand rounded-lg"></div>
-          <span className="text-2xl font-semibold text-text">
-            {'AppConfig.appName'}
-          </span>
-        </div>
         <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">
@@ -72,7 +66,6 @@ export default async function LoginPage(props: PageParamsProps) {
         </div>
       </div>
 
-      {/* Right side - Login form */}
       <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>
@@ -81,6 +74,6 @@ export default async function LoginPage(props: PageParamsProps) {
           <LoginForm tt={tt} />
         </div>
       </div>
-    </div>
+    </BaseLayout>
   );
 }