@qlover/create-app 1.0.1 → 1.0.2

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

@@ -1,10 +1,10 @@
-import { TeamOutlined } from '@ant-design/icons';
 import { clsx } from 'clsx';
 import { useLocale } from 'next-intl';
-import { useMemo, type HTMLAttributes } from 'react';
+import { Suspense, type HTMLAttributes } from 'react';
+import { AdminButton } from './AdminButton';
 import { AppBridge } from './AppBridge';
+import { AuthButton } from './AuthButton';
 import { LanguageSwitcher } from './LanguageSwitcher';
-import { LogoutButton } from './LogoutButton';
 import { ThemeSwitcher } from './ThemeSwitcher';
 import { LocaleLink } from '../components/LocaleLink';
 
@@ -14,9 +14,9 @@ export interface AppRoutePageTT {
 }
 
 export interface AppRoutePageProps extends HTMLAttributes<HTMLDivElement> {
-  showLogoutButton?: boolean;
   showAdminButton?: boolean;
   mainProps?: HTMLAttributes<HTMLElement>;
+  showAuthButton?: boolean;
   headerClassName?: string;
   headerHref?: string;
   tt: AppRoutePageTT;
@@ -34,10 +34,10 @@ export interface AppRoutePageProps extends HTMLAttributes<HTMLDivElement> {
  */
 export function AppRoutePage({
   children,
-  showLogoutButton,
   showAdminButton,
   mainProps,
   headerClassName,
+  showAuthButton,
   tt,
   headerHref = '/',
   ...props
@@ -45,28 +45,6 @@ export function AppRoutePage({
   const locale = useLocale();
   const adminTitle = tt.adminTitle;
 
-  const actions = useMemo(() => {
-    return [
-      showAdminButton && (
-        <LocaleLink
-          key="admin-button"
-          href="/admin"
-          title={adminTitle}
-          locale={locale}
-          className="text-text hover:text-text-hover cursor-pointer text-lg transition-colors"
-        >
-          <TeamOutlined className="text-lg text-text" />
-        </LocaleLink>
-      ),
-
-      <LanguageSwitcher key="language-switcher" />,
-
-      <ThemeSwitcher key="theme-switcher" />,
-
-      showLogoutButton && <LogoutButton key="logout-button" />
-    ].filter(Boolean);
-  }, [adminTitle, showAdminButton, showLogoutButton, locale]);
-
   return (
     <div
       data-testid="AppRoutePage"
@@ -100,7 +78,22 @@ export function AppRoutePage({
               </span>
             </LocaleLink>
           </div>
-          <div className="flex items-center gap-2 md:gap-4">{actions}</div>
+          <div className="flex items-center gap-2 md:gap-4">
+            {showAdminButton && (
+              <Suspense>
+                <AdminButton adminTitle={adminTitle} locale={locale} />
+              </Suspense>
+            )}
+
+            <LanguageSwitcher key="language-switcher" />
+            <ThemeSwitcher key="theme-switcher" />
+
+            {showAuthButton && (
+              <Suspense>
+                <AuthButton />
+              </Suspense>
+            )}
+          </div>
         </div>
       </header>
 

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

@@ -0,0 +1,20 @@
+import { bootstrapServer } from '@/core/bootstraps/BootstrapServer';
+import { Link } from '@/i18n/routing';
+import { ServerAuth } from '@/server/ServerAuth';
+import { ROUTE_LOGIN, ROUTE_REGISTER } from '@config/route';
+import { LogoutButton } from './LogoutButton';
+
+export async function AuthButton() {
+  const hasAuth = await bootstrapServer.getIOC(ServerAuth).hasAuth();
+
+  if (hasAuth) {
+    return <LogoutButton data-testid="logout-button" />;
+  }
+
+  return (
+    <div data-testid="AuthButton" className="flex gap-2" data-auth={hasAuth}>
+      <Link href={ROUTE_LOGIN}>Sign in</Link>
+      <Link href={ROUTE_REGISTER}>Sign up</Link>
+    </div>
+  );
+}

package/dist/templates/next-app/src/uikit/hook/useI18nInterface.ts

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { TranslateI18nInterface } from '@/base/cases/TranslateI18nInterface';
+import { TranslateI18nUtil } from '@/base/cases/TranslateI18nUtil';
 import { useWarnTranslations } from './useWarnTranslations';
 
 /**
@@ -14,7 +14,7 @@ export function useI18nInterface<T extends Record<string, string>>(
   const t = useWarnTranslations();
 
   const i18n = useMemo(
-    () => TranslateI18nInterface.translate(i18nInterface, t),
+    () => TranslateI18nUtil.translate(i18nInterface, t),
     [i18nInterface, t]
   );
 

package/dist/templates/next-app/src/uikit/hook/useWarnTranslations.ts

@@ -1,25 +1,11 @@
 import { useTranslations as useNextTranslations } from 'next-intl';
-import { useCallback } from 'react';
-import { i18nWarnMissingTranslation } from '@config/common';
+import { useMemo } from 'react';
+import { TranslateI18nUtil } from '@/base/cases/TranslateI18nUtil';
 
 export function useWarnTranslations() {
   const t = useNextTranslations();
 
-  const overrideT = useCallback(
-    (key: string) => {
-      if (!i18nWarnMissingTranslation) {
-        return t(key);
-      }
-
-      if (t.has(key)) {
-        return t(key);
-      }
-
-      console.warn(`[i18n] Missing translation: ${key}`);
-      return key;
-    },
-    [t]
-  );
+  const overrideT = useMemo(() => TranslateI18nUtil.overrideTranslateT(t), [t]);
 
   return Object.assign(overrideT, t);
 }

package/dist/templates/next-app/src/uikit/utils/getHashParams.ts

@@ -0,0 +1,8 @@
+export function getHashParams(hash: string): Record<string, string | null> {
+  const sp = new URLSearchParams(hash.startsWith('#') ? hash.slice(1) : hash);
+  const params = {};
+  sp.forEach((value, key) => {
+    Object.assign(params, { [key]: value });
+  });
+  return params;
+}

package/dist/templates/next-app/src/uikit/utils/getHashVerifyEmailParams.ts

@@ -0,0 +1,42 @@
+import { isString, pick } from 'lodash';
+import type { SignupVerifyParamType } from '@/server/validators/SignupVerifyValidator';
+
+export const emailVerifyParamKeys = [
+  'access_token',
+  'expires_at',
+  'expires_in',
+  'refresh_token',
+  'token_type',
+  'type'
+] as const;
+
+export function getHashParams(hash: string): Record<string, string | null> {
+  const sp = new URLSearchParams(hash.startsWith('#') ? hash.slice(1) : hash);
+  const params = {};
+  sp.forEach((value, key) => {
+    Object.assign(params, { [key]: value });
+  });
+  return params;
+}
+
+export function isEmailVerifyParam(
+  value: unknown
+): value is SignupVerifyParamType {
+  return emailVerifyParamKeys.every(
+    (key) =>
+      emailVerifyParamKeys.includes(key) &&
+      (value as SignupVerifyParamType)[key] != null &&
+      isString((value as SignupVerifyParamType)[key])
+  );
+}
+
+export function getHashVerifyEmailParams(
+  hash: string
+): SignupVerifyParamType | null {
+  if (!hash) {
+    return null;
+  }
+
+  const hashParams = pick(getHashParams(hash), emailVerifyParamKeys);
+  return isEmailVerifyParam(hashParams) ? hashParams : null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qlover/create-app",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Create a new app with a single command",
   "private": false,
   "type": "module",

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

@@ -1,25 +0,0 @@
-import type { PageI18nInterface } from '@config/i18n';
-import type { useTranslations } from 'next-intl';
-
-/**
- * Translate I18n Interface tools class
- *
- * @param i18nInterface - The i18n interface to translate
- * @param t - The translations function
- * @returns The translated i18n interface
- */
-export class TranslateI18nInterface {
-  public static translate<T extends PageI18nInterface | Record<string, string>>(
-    source: T,
-    t: ReturnType<typeof useTranslations>
-  ): T {
-    return Object.fromEntries(
-      Object.entries(source).map(([key, value]) => {
-        if (typeof value === 'string') {
-          return [key, t(value)];
-        }
-        return [key, value];
-      })
-    ) as T;
-  }
-}

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

@@ -1,78 +0,0 @@
-import { inject, injectable } from 'inversify';
-import { omit } from 'lodash';
-import type { LoginValidatorData } from '@/server/validators/LoginValidator';
-import {
-  isWebUserSchema,
-  type UserCredential,
-  type UserSchema
-} from '@migrations/schema/UserSchema';
-import { AppUserApi } from '../services/appApi/AppUserApi';
-import type { AppUserApiInterface } from '../port/AppUserApiInterface';
-import type { UserServiceGateway } from '@qlover/corekit-bridge';
-
-@injectable()
-export class UserServiceApi implements UserServiceGateway<
-  UserSchema,
-  UserCredential
-> {
-  constructor(@inject(AppUserApi) protected appUserApi: AppUserApiInterface) {}
-
-  /**
-   * @override
-   */
-  public getUserInfo(_params?: unknown): Promise<UserSchema | null> {
-    if (_params && isWebUserSchema(_params).success) {
-      return Promise.resolve(omit(_params, 'credential_token') as UserSchema);
-    }
-
-    return Promise.resolve(null);
-  }
-
-  /**
-   * @override
-   */
-  public refreshUserInfo<Params>(
-    _params?: Params | undefined
-  ): Promise<UserSchema | null> {
-    return this.getUserInfo(_params);
-  }
-
-  /**
-   * @override
-   */
-  public async login(params: LoginValidatorData): Promise<UserCredential> {
-    const response = await this.appUserApi.login(params);
-
-    if (!response.data.success) {
-      throw response;
-    }
-
-    return response.data.data as UserCredential;
-  }
-
-  /**
-   * @override
-   */
-  public async register(params: LoginValidatorData): Promise<UserSchema> {
-    const response = await this.appUserApi.register(params);
-
-    if (!response.data.success) {
-      throw response;
-    }
-
-    return response.data.data as UserSchema;
-  }
-
-  /**
-   * @override
-   */
-  public async logout<P = unknown, Result = void>(params?: P): Promise<Result> {
-    const response = await this.appUserApi.logout(params);
-
-    if (!response.data.success) {
-      throw response;
-    }
-
-    return response.data.data as Result;
-  }
-}

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

@@ -1,25 +0,0 @@
-import {
-  ExecutorContextInterface,
-  RequestAdapterFetch,
-  RequestExecutor
-} from '@qlover/fe-corekit';
-import { injectable } from 'inversify';
-import type { AppApiConfig } from '../appApi/AppApiRequester';
-
-export interface AdminApiRequesterContext
-  extends ExecutorContextInterface<AppApiConfig> {}
-
-@injectable()
-export class AdminApiRequester extends RequestExecutor<
-  AppApiConfig,
-  AdminApiRequesterContext
-> {
-  constructor() {
-    super(
-      new RequestAdapterFetch({
-        baseURL: '/api/admin',
-        responseType: 'json'
-      })
-    );
-  }
-}

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

@@ -1,78 +0,0 @@
-import { inject, injectable } from 'inversify';
-import type {
-  AppUserApiInterface,
-  UserApiLoginTransaction,
-  UserApiLogoutTransaction,
-  UserApiRegisterTransaction
-} from '@/base/port/AppUserApiInterface';
-import { AppApiRequester } from './AppApiRequester';
-import type { AppApiConfig, AppApiRequesterContext } from './AppApiRequester';
-import { RequestExecutor } from '@qlover/fe-corekit';
-
-/**
- * UserApi
- *
- * @description
- * UserApi is a client for the user API.
- *
- */
-@injectable()
-export class AppUserApi implements AppUserApiInterface {
-  constructor(
-    @inject(AppApiRequester)
-    protected client: RequestExecutor<AppApiConfig, AppApiRequesterContext>
-  ) {}
-
-  /**
-   * @override
-   */
-  public async login(
-    params: UserApiLoginTransaction['data']
-  ): Promise<UserApiLoginTransaction['response']> {
-    const response = await this.client.request<
-      UserApiLoginTransaction['response'],
-      UserApiLoginTransaction['request']
-    >({
-      url: '/user/login',
-      method: 'POST',
-      data: params,
-      encryptProps: 'password'
-    });
-
-    return response;
-  }
-
-  /**
-   * @override
-   */
-  public async register(
-    params: UserApiRegisterTransaction['data']
-  ): Promise<UserApiRegisterTransaction['response']> {
-    const response = await this.client.request<
-      UserApiRegisterTransaction['response'],
-      UserApiRegisterTransaction['request']
-    >({
-      url: '/user/register',
-      method: 'POST',
-      data: params,
-      encryptProps: 'password'
-    });
-
-    return response;
-  }
-
-  /**
-   * @override
-   */
-  public async logout(
-    _params?: unknown
-  ): Promise<UserApiLogoutTransaction['response']> {
-    return await this.client.request<
-      UserApiLogoutTransaction['response'],
-      UserApiLogoutTransaction['request']
-    >({
-      url: '/user/logout',
-      method: 'POST'
-    });
-  }
-}

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

@@ -1,8 +0,0 @@
-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>;
-}