diff --git a/apps/admin/app/layout.tsx b/apps/admin/app/layout.tsx index 0d29837..1d7dcfd 100644 --- a/apps/admin/app/layout.tsx +++ b/apps/admin/app/layout.tsx @@ -8,13 +8,15 @@ import { Metadata, Viewport } from 'next'; import { NextIntlClientProvider } from 'next-intl'; import { getLocale, getMessages } from 'next-intl/server'; import { PublicEnvScript } from 'next-runtime-env'; +import { unstable_noStore as noStore } from 'next/cache'; import { cookies } from 'next/headers'; import NextTopLoader from 'nextjs-toploader'; import React from 'react'; export async function generateMetadata(): Promise { - let site: API.SiteConfig | undefined; + noStore(); + let site: API.SiteConfig | undefined; await getGlobalConfig({ skipErrorHandler: true }) .then((res) => { const config = res.data.data; diff --git a/apps/admin/config/constants.ts b/apps/admin/config/constants.ts index c7c91f9..fa3f488 100644 --- a/apps/admin/config/constants.ts +++ b/apps/admin/config/constants.ts @@ -2,13 +2,10 @@ import { env } from 'next-runtime-env'; export const locales = ['en-US', 'zh-CN']; -export const NEXT_PUBLIC_DEFAULT_LANGUAGE = - env('NEXT_PUBLIC_DEFAULT_LANGUAGE') || process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || locales[0]; +export const NEXT_PUBLIC_DEFAULT_LANGUAGE = env('NEXT_PUBLIC_DEFAULT_LANGUAGE') || locales[0]; -export const NEXT_PUBLIC_SITE_URL = env('NEXT_PUBLIC_SITE_URL') || process.env.NEXT_PUBLIC_SITE_URL; -export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL') || process.env.NEXT_PUBLIC_API_URL; +export const NEXT_PUBLIC_SITE_URL = env('NEXT_PUBLIC_SITE_URL'); +export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL'); -export const NEXT_PUBLIC_DEFAULT_USER_EMAIL = - env('NEXT_PUBLIC_DEFAULT_USER_EMAIL') || process.env.NEXT_PUBLIC_DEFAULT_USER_EMAIL; -export const NEXT_PUBLIC_DEFAULT_USER_PASSWORD = - env('NEXT_PUBLIC_DEFAULT_USER_PASSWORD') || process.env.NEXT_PUBLIC_DEFAULT_USER_PASSWORD; +export const NEXT_PUBLIC_DEFAULT_USER_EMAIL = env('NEXT_PUBLIC_DEFAULT_USER_EMAIL'); +export const NEXT_PUBLIC_DEFAULT_USER_PASSWORD = env('NEXT_PUBLIC_DEFAULT_USER_PASSWORD'); diff --git a/apps/user/app/(main)/(user)/sidebar-right.tsx b/apps/user/app/(main)/(user)/sidebar-right.tsx index b83d8ef..f581809 100644 --- a/apps/user/app/(main)/(user)/sidebar-right.tsx +++ b/apps/user/app/(main)/(user)/sidebar-right.tsx @@ -1,7 +1,9 @@ 'use client'; + import { Display } from '@/components/display'; import useGlobalStore from '@/config/use-global'; import { Icon } from '@iconify/react'; +import { isBrowser } from '@repo/ui/utils'; import { Button } from '@shadcn/ui/button'; import { Card, CardContent, CardHeader, CardTitle } from '@shadcn/ui/card'; import { toast } from '@shadcn/ui/lib/sonner'; @@ -14,6 +16,7 @@ import Recharge from './order/recharge'; export function SidebarRight({ ...props }: React.ComponentProps) { const { user } = useGlobalStore(); const t = useTranslations('layout'); + return ( @@ -33,7 +36,7 @@ export function SidebarRight({ ...props }: React.ComponentProps) { if (result) { toast.success(t('copySuccess')); diff --git a/apps/user/app/auth/user-auth-form.tsx b/apps/user/app/auth/user-auth-form.tsx index 0bb3822..6a020aa 100644 --- a/apps/user/app/auth/user-auth-form.tsx +++ b/apps/user/app/auth/user-auth-form.tsx @@ -2,10 +2,7 @@ import useGlobalStore from '@/config/use-global'; import { checkUser, resetPassword, userLogin, userRegister } from '@/services/common/auth'; -import { Icon } from '@iconify/react'; -import { Button } from '@shadcn/ui/button'; import { toast } from '@shadcn/ui/lib/sonner'; -import { cn } from '@shadcn/ui/lib/utils'; import { useTranslations } from 'next-intl'; import { useRouter } from 'next/navigation'; import { ReactNode, useState, useTransition } from 'react'; @@ -132,9 +129,9 @@ export default function UserAuthForm() { {t(`${type || 'check'}.description`)} - {!((type === 'register' && register.stop_register) || type === 'reset') && ( + {/* {!((type === 'register' && register.stop_register) || type === 'reset') && ( <> -
+
- )} + )} */} {UserForm} ); diff --git a/apps/user/app/layout.tsx b/apps/user/app/layout.tsx index 4e8fab5..57992a2 100644 --- a/apps/user/app/layout.tsx +++ b/apps/user/app/layout.tsx @@ -7,12 +7,14 @@ import { Toaster } from '@shadcn/ui/sonner'; import { NextIntlClientProvider } from 'next-intl'; import { getLocale, getMessages } from 'next-intl/server'; import { PublicEnvScript } from 'next-runtime-env'; +import { unstable_noStore as noStore } from 'next/cache'; import { cookies } from 'next/headers'; import { Metadata, Viewport } from 'next/types'; import NextTopLoader from 'nextjs-toploader'; import React from 'react'; export async function generateMetadata(): Promise { + noStore(); let site: API.SiteConfig | undefined; await getGlobalConfig({ skipErrorHandler: true }) diff --git a/apps/user/config/constants.ts b/apps/user/config/constants.ts index 85aa509..9b1d224 100644 --- a/apps/user/config/constants.ts +++ b/apps/user/config/constants.ts @@ -2,28 +2,19 @@ import { env } from 'next-runtime-env'; export const locales = ['en-US', 'zh-CN']; -export const NEXT_PUBLIC_DEFAULT_LANGUAGE = - env('NEXT_PUBLIC_DEFAULT_LANGUAGE') || process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || locales[0]; +export const NEXT_PUBLIC_DEFAULT_LANGUAGE = env('NEXT_PUBLIC_DEFAULT_LANGUAGE') || locales[0]; -export const NEXT_PUBLIC_SITE_URL = env('NEXT_PUBLIC_SITE_URL') || process.env.NEXT_PUBLIC_SITE_URL; -export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL') || process.env.NEXT_PUBLIC_API_URL; +export const NEXT_PUBLIC_SITE_URL = env('NEXT_PUBLIC_SITE_URL'); +export const NEXT_PUBLIC_API_URL = env('NEXT_PUBLIC_API_URL'); -export const NEXT_PUBLIC_DEFAULT_USER_EMAIL = - env('NEXT_PUBLIC_DEFAULT_USER_EMAIL') || process.env.NEXT_PUBLIC_DEFAULT_USER_EMAIL; -export const NEXT_PUBLIC_DEFAULT_USER_PASSWORD = - env('NEXT_PUBLIC_DEFAULT_USER_PASSWORD') || process.env.NEXT_PUBLIC_DEFAULT_USER_PASSWORD; +export const NEXT_PUBLIC_DEFAULT_USER_EMAIL = env('NEXT_PUBLIC_DEFAULT_USER_EMAIL'); +export const NEXT_PUBLIC_DEFAULT_USER_PASSWORD = env('NEXT_PUBLIC_DEFAULT_USER_PASSWORD'); -export const NEXT_PUBLIC_EMAIL = env('NEXT_PUBLIC_EMAIL') || process.env.NEXT_PUBLIC_EMAIL; +export const NEXT_PUBLIC_EMAIL = env('NEXT_PUBLIC_EMAIL'); -export const NEXT_PUBLIC_TELEGRAM_LINK = - env('NEXT_PUBLIC_TELEGRAM_LINK') || process.env.NEXT_PUBLIC_TELEGRAM_LINK; -export const NEXT_PUBLIC_DISCORD_LINK = - env('NEXT_PUBLIC_DISCORD_LINK') || process.env.NEXT_PUBLIC_DISCORD_LINK; -export const NEXT_PUBLIC_GITHUB_LINK = - env('NEXT_PUBLIC_GITHUB_LINK') || process.env.NEXT_PUBLIC_GITHUB_LINK; -export const NEXT_PUBLIC_LINKEDIN_LINK = - env('NEXT_PUBLIC_LINKEDIN_LINK') || process.env.NEXT_PUBLIC_LINKEDIN_LINK; -export const NEXT_PUBLIC_TWITTER_LINK = - env('NEXT_PUBLIC_TWITTER_LINK') || process.env.NEXT_PUBLIC_TWITTER_LINK; -export const NEXT_PUBLIC_INSTAGRAM_LINK = - env('NEXT_PUBLIC_INSTAGRAM_LINK') || process.env.NEXT_PUBLIC_INSTAGRAM_LINK; +export const NEXT_PUBLIC_TELEGRAM_LINK = env('NEXT_PUBLIC_TELEGRAM_LINK'); +export const NEXT_PUBLIC_DISCORD_LINK = env('NEXT_PUBLIC_DISCORD_LINK'); +export const NEXT_PUBLIC_GITHUB_LINK = env('NEXT_PUBLIC_GITHUB_LINK'); +export const NEXT_PUBLIC_LINKEDIN_LINK = env('NEXT_PUBLIC_LINKEDIN_LINK'); +export const NEXT_PUBLIC_TWITTER_LINK = env('NEXT_PUBLIC_TWITTER_LINK'); +export const NEXT_PUBLIC_INSTAGRAM_LINK = env('NEXT_PUBLIC_INSTAGRAM_LINK');