@lobehub/chat 1.42.6 → 1.43.1

package/src/app/(main)/(mobile)/me/(home)/features/UserBanner.tsx

@@ -1,9 +1,11 @@
 'use client';
 
+import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
+import { isDeprecatedEdition } from '@/const/version';
 import DataStatistics from '@/features/User/DataStatistics';
 import UserInfo from '@/features/User/UserInfo';
 import UserLoginOrSignup from '@/features/User/UserLoginOrSignup/Community';
@@ -21,21 +23,16 @@ const UserBanner = memo(() => {
 
   return (
     <Flexbox gap={12} paddingBlock={8}>
-      {!enableAuth ? (
+      {!enableAuth || (enableAuth && isLoginWithAuth) ? (
         <>
-          <UserInfo />
-          <DataStatistics paddingInline={12} />
-        </>
-      ) : isLoginWithAuth ? (
-        <>
-          <UserInfo
-            onClick={() => {
-              // Profile page only works with Clerk
-              if (enabledNextAuth) return;
-              router.push('/me/profile');
-            }}
-          />
-          <DataStatistics paddingInline={12} />
+          <Link href={'/profile'} style={{ color: 'inherit' }}>
+            <UserInfo />
+          </Link>
+          {!isDeprecatedEdition && (
+            <Link href={'/profile/stats'} style={{ color: 'inherit' }}>
+              <DataStatistics paddingInline={12} />
+            </Link>
+          )}
         </>
       ) : (
         <UserLoginOrSignup

package/src/app/(main)/(mobile)/me/(home)/features/useCategory.tsx

@@ -6,7 +6,6 @@ import {
   Download,
   Feather,
   FileClockIcon,
-  LogOut,
   Settings2,
 } from 'lucide-react';
 import { useRouter } from 'next/navigation';
@@ -28,15 +27,11 @@ export const useCategory = () => {
   const { canInstall, install } = usePWAInstall();
   const { t } = useTranslation(['common', 'setting', 'auth']);
   const { showCloudPromotion, hideDocs } = useServerConfigStore(featureFlagsSelectors);
-  const [isLogin, isLoginWithAuth, isLoginWithClerk, enableAuth, signOut, isLoginWithNextAuth] =
-    useUserStore((s) => [
-      authSelectors.isLogin(s),
-      authSelectors.isLoginWithAuth(s),
-      authSelectors.isLoginWithClerk(s),
-      authSelectors.enabledAuth(s),
-      s.logout,
-      authSelectors.isLoginWithNextAuth(s),
-    ]);
+  const [isLogin, isLoginWithAuth, enableAuth] = useUserStore((s) => [
+    authSelectors.isLogin(s),
+    authSelectors.isLoginWithAuth(s),
+    authSelectors.enabledAuth(s),
+  ]);
 
   const profile: CellProps[] = [
     {
@@ -121,20 +116,11 @@ export const useCategory = () => {
     },
   ].filter(Boolean) as CellProps[];
 
-  const nextAuthSignOut: CellProps[] = [
-    {
-      icon: LogOut,
-      key: 'nextauthSignout',
-      label: t('auth:signout'),
-      onClick: signOut,
-    },
-  ];
-
   const mainItems = [
     {
       type: 'divider',
     },
-    ...(isLoginWithClerk ? profile : []),
+    ...(!enableAuth || (enableAuth && isLoginWithAuth) ? profile : []),
     ...(enableAuth ? (isLoginWithAuth ? settings : []) : settingsWithoutAuth),
     /* ↓ cloud slot ↓ */
 
@@ -142,7 +128,6 @@ export const useCategory = () => {
     ...(canInstall ? pwa : []),
     ...(isLogin && !isServerMode ? data : []),
     ...(!hideDocs ? helps : []),
-    ...(enableAuth && isLoginWithNextAuth ? nextAuthSignOut : []),
   ].filter(Boolean) as CellProps[];
 
   return mainItems;

package/src/app/(main)/(mobile)/me/profile/features/Category.tsx

@@ -1,43 +1,60 @@
 'use client';
 
-import { LogOut, ShieldCheck, UserCircle } from 'lucide-react';
+import { ChartColumnBigIcon, LogOut, ShieldCheck, UserCircle } from 'lucide-react';
 import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import Cell, { CellProps } from '@/components/Cell';
+import { isDeprecatedEdition } from '@/const/version';
+import { ProfileTabs } from '@/store/global/initialState';
 import { useUserStore } from '@/store/user';
+import { authSelectors } from '@/store/user/slices/auth/selectors';
 
 const Category = memo(() => {
+  const [isLogin, enableAuth, isLoginWithClerk, signOut] = useUserStore((s) => [
+    authSelectors.isLogin(s),
+    authSelectors.enabledAuth(s),
+    authSelectors.isLoginWithClerk(s),
+    s.logout,
+  ]);
   const router = useRouter();
   const { t } = useTranslation('auth');
-  const signOut = useUserStore((s) => s.logout);
   const items: CellProps[] = [
     {
       icon: UserCircle,
-      key: 'profile',
-      label: t('profile'),
+      key: ProfileTabs.Profile,
+      label: t('tab.profile'),
       onClick: () => router.push('/profile'),
     },
-    {
-      icon: ShieldCheck,
-      key: 'security',
-      label: t('security'),
-      onClick: () => router.push('/profile/security'),
-    },
-    {
-      type: 'divider',
-    },
-    {
-      icon: LogOut,
-      key: 'logout',
-      label: t('signout', { ns: 'auth' }),
-      onClick: () => {
-        signOut();
-        router.push('/login');
+    enableAuth &&
+      isLoginWithClerk && {
+        icon: ShieldCheck,
+        key: ProfileTabs.Security,
+        label: t('tab.security'),
+        onClick: () => router.push('/profile/security'),
       },
+    !isDeprecatedEdition && {
+      icon: ChartColumnBigIcon,
+      key: ProfileTabs.Stats,
+      label: t('tab.stats'),
+      onClick: () => router.push('/profile/stats'),
     },
-  ];
+    enableAuth &&
+      isLogin && {
+        type: 'divider',
+      },
+    enableAuth &&
+      isLogin && {
+        icon: LogOut,
+        key: 'logout',
+        label: t('signout', { ns: 'auth' }),
+        onClick: () => {
+          signOut();
+          router.push('/login');
+        },
+      },
+  ].filter(Boolean) as CellProps[];
 
   return items?.map((item, index) => <Cell key={item.key || index} {...item} />);
 });

package/src/app/(main)/(mobile)/me/profile/layout.tsx

@@ -1,13 +1,10 @@
-import { notFound } from 'next/navigation';
 import { PropsWithChildren } from 'react';
 
 import MobileContentLayout from '@/components/server/MobileNavLayout';
-import { enableClerk } from '@/const/auth';
 
 import Header from './features/Header';
 
 const Layout = ({ children }: PropsWithChildren) => {
-  if (!enableClerk) return notFound();
   return <MobileContentLayout header={<Header />}>{children}</MobileContentLayout>;
 };
 

package/src/app/(main)/(mobile)/me/profile/page.tsx

@@ -7,10 +7,10 @@ import { isMobileDevice } from '@/utils/server/responsive';
 import Category from './features/Category';
 
 export const generateMetadata = async () => {
-  const { t } = await translation('clerk');
+  const { t } = await translation('auth');
   return metadataModule.generate({
-    description: t('userProfile.navbar.title'),
-    title: t('userProfile.navbar.description'),
+    description: t('header.desc'),
+    title: t('header.title'),
     url: '/me/profile',
   });
 };

package/src/app/(main)/chat/loading.tsx

@@ -1,3 +1,3 @@
-import CircleLoading from '@/components/Loading/BrandTextLoading';
+import Loading from '@/components/Loading/BrandTextLoading';
 
-export default () => <CircleLoading />;
+export default () => <Loading />;

package/src/app/(main)/discover/loading.tsx

@@ -1,9 +1,3 @@
-import { Center } from 'react-layout-kit';
+import Loading from '@/components/Loading/BrandTextLoading';
 
-import CircleLoading from '@/components/Loading/BrandTextLoading';
-
-export default () => (
-  <Center height={'90vh'} width={'100%'}>
-    <CircleLoading />
-  </Center>
-);
+export default () => <Loading />;

package/src/app/(main)/files/loading.tsx

@@ -1,3 +1,3 @@
-import CircleLoading from '@/components/Loading/BrandTextLoading';
+import Loading from '@/components/Loading/BrandTextLoading';
 
-export default () => <CircleLoading />;
+export default () => <Loading />;

package/src/app/(main)/profile/(home)/Client.tsx

@@ -0,0 +1,53 @@
+'use client';
+
+import { Form, type ItemGroup } from '@lobehub/ui';
+import { memo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { FORM_STYLE } from '@/const/layoutTokens';
+import AvatarWithUpload from '@/features/AvatarWithUpload';
+import UserAvatar from '@/features/User/UserAvatar';
+import { useUserStore } from '@/store/user';
+import { authSelectors, userProfileSelectors } from '@/store/user/selectors';
+
+type SettingItemGroup = ItemGroup;
+
+const Client = memo<{ mobile?: boolean }>(() => {
+  const [isLoginWithNextAuth] = useUserStore((s) => [authSelectors.isLoginWithNextAuth(s)]);
+  const [enableAuth, nickname, username, userProfile] = useUserStore((s) => [
+    s.enableAuth(),
+    userProfileSelectors.nickName(s),
+    userProfileSelectors.username(s),
+    userProfileSelectors.userProfile(s),
+  ]);
+
+  const [form] = Form.useForm();
+  const { t } = useTranslation('auth');
+
+  const profile: SettingItemGroup = {
+    children: [
+      {
+        children: enableAuth && isLoginWithNextAuth ? <UserAvatar /> : <AvatarWithUpload />,
+        label: t('profile.avatar'),
+        minWidth: undefined,
+      },
+      {
+        children: nickname || username,
+        label: t('profile.username'),
+        minWidth: undefined,
+      },
+      {
+        children: userProfile?.email || '--',
+        hidden: !isLoginWithNextAuth || !userProfile?.email,
+        label: t('profile.email'),
+        minWidth: undefined,
+      },
+    ],
+    title: t('tab.profile'),
+  };
+  return (
+    <Form form={form} items={[profile]} itemsType={'group'} variant={'pure'} {...FORM_STYLE} />
+  );
+});
+
+export default Client;

package/src/app/(main)/profile/(home)/[[...slugs]]/page.tsx

@@ -0,0 +1,38 @@
+import { Skeleton } from 'antd';
+import dynamic from 'next/dynamic';
+
+import { enableClerk } from '@/const/auth';
+import { metadataModule } from '@/server/metadata';
+import { translation } from '@/server/translation';
+import { isMobileDevice } from '@/utils/server/responsive';
+
+import Client from '../Client';
+
+// 为了兼容 ClerkProfile， 需要使用 [[...slug]]
+
+const ClerkProfile = dynamic(() => import('../../features/ClerkProfile'), {
+  loading: () => (
+    <div style={{ flex: 1 }}>
+      <Skeleton paragraph={{ rows: 8 }} title={false} />
+    </div>
+  ),
+});
+
+export const generateMetadata = async () => {
+  const { t } = await translation('auth');
+  return metadataModule.generate({
+    description: t('header.desc'),
+    title: t('tab.profile'),
+    url: '/profile',
+  });
+};
+
+const Page = async () => {
+  const mobile = await isMobileDevice();
+
+  if (enableClerk) return <ClerkProfile mobile={mobile} />;
+
+  return <Client mobile={mobile} />;
+};
+
+export default Page;

package/src/app/(main)/profile/@category/default.tsx

@@ -0,0 +1,9 @@
+import CategoryContent from './features/CategoryContent';
+
+const Category = () => {
+  return <CategoryContent />;
+};
+
+Category.displayName = 'SettingCategory';
+
+export default Category;

package/src/app/(main)/profile/@category/features/CategoryContent.tsx

@@ -0,0 +1,38 @@
+'use client';
+
+import { memo } from 'react';
+import urlJoin from 'url-join';
+
+import Menu from '@/components/Menu';
+import { useActiveSettingsKey } from '@/hooks/useActiveTabKey';
+import { useQuery } from '@/hooks/useQuery';
+import { useQueryRoute } from '@/hooks/useQueryRoute';
+import { ProfileTabs, SettingsTabs } from '@/store/global/initialState';
+
+import { useCategory } from '../../hooks/useCategory';
+
+const CategoryContent = memo<{ modal?: boolean }>(({ modal }) => {
+  const activeTab = useActiveSettingsKey();
+  const { tab = SettingsTabs.Common } = useQuery();
+  const cateItems = useCategory();
+  const router = useQueryRoute();
+
+  return (
+    <Menu
+      items={cateItems}
+      onClick={({ key }) => {
+        const activeKey = key === ProfileTabs.Profile ? '/' : key;
+        if (modal) {
+          router.replace('/profile/modal', { query: { tab: activeKey } });
+        } else {
+          router.push(urlJoin('/profile', activeKey));
+        }
+      }}
+      selectable
+      selectedKeys={[modal ? tab : (activeTab as any)]}
+      variant={'compact'}
+    />
+  );
+});
+
+export default CategoryContent;

package/src/app/(main)/profile/_layout/Desktop/Header.tsx

@@ -0,0 +1,85 @@
+'use client';
+
+import { ActionIcon, ChatHeader, ChatHeaderTitle } from '@lobehub/ui';
+import { Drawer, type DrawerProps } from 'antd';
+import { createStyles } from 'antd-style';
+import { Menu } from 'lucide-react';
+import { ReactNode, memo, useState } from 'react';
+import { Flexbox } from 'react-layout-kit';
+
+import BrandWatermark from '@/components/BrandWatermark';
+
+const useStyles = createStyles(({ token, css }) => ({
+  container: css`
+    position: relative;
+    flex: none;
+    height: 54px;
+    background: ${token.colorBgContainer};
+  `,
+  title: css`
+    font-size: 18px;
+    font-weight: 700;
+    line-height: 1.2;
+  `,
+}));
+
+interface HeaderProps extends Pick<DrawerProps, 'getContainer'> {
+  children: ReactNode;
+  title: ReactNode;
+}
+
+const Header = memo<HeaderProps>(({ children, getContainer, title }) => {
+  const [open, setOpen] = useState(false);
+  const { styles, theme } = useStyles();
+
+  return (
+    <>
+      <ChatHeader
+        className={styles.container}
+        left={
+          <ChatHeaderTitle
+            title={
+              <Flexbox align={'center'} className={styles.title} gap={4} horizontal>
+                <ActionIcon
+                  color={theme.colorText}
+                  icon={Menu}
+                  onClick={() => setOpen(true)}
+                  size={{ blockSize: 32, fontSize: 18 }}
+                />
+                {title}
+              </Flexbox>
+            }
+          />
+        }
+      />
+      <Drawer
+        bodyStyle={{
+          display: 'flex',
+          flexDirection: 'column',
+          gap: 20,
+          justifyContent: 'space-between',
+          padding: 16,
+        }}
+        getContainer={getContainer}
+        headerStyle={{ display: 'none' }}
+        maskStyle={{ background: 'transparent' }}
+        onClick={() => setOpen(false)}
+        onClose={() => setOpen(false)}
+        open={open}
+        placement={'left'}
+        rootStyle={{ position: 'absolute' }}
+        style={{
+          background: theme.colorBgContainer,
+          borderRight: `1px solid ${theme.colorSplit}`,
+        }}
+        width={260}
+        zIndex={10}
+      >
+        {children}
+        <BrandWatermark paddingInline={12} />
+      </Drawer>
+    </>
+  );
+});
+
+export default Header;

package/src/app/(main)/profile/_layout/Desktop/SideBar.tsx

@@ -0,0 +1,42 @@
+'use client';
+
+import { createStyles } from 'antd-style';
+import { useTranslation } from 'react-i18next';
+import { Flexbox, FlexboxProps } from 'react-layout-kit';
+
+import BrandWatermark from '@/components/BrandWatermark';
+import PanelTitle from '@/components/PanelTitle';
+
+const useStyles = createStyles(({ token, css }) => ({
+  container: css`
+    padding-block: 0 16px;
+    padding-inline: 12px;
+    background: ${token.colorBgContainer};
+    border-inline-end: 1px solid ${token.colorBorder};
+  `,
+}));
+
+interface SidebarLayoutProps extends FlexboxProps {
+  desc?: string;
+  title?: string;
+}
+
+const SidebarLayout = ({ children, className, title, desc, ...rest }: SidebarLayoutProps) => {
+  const { cx, styles } = useStyles();
+  const { t } = useTranslation('auth');
+  return (
+    <Flexbox
+      className={cx(styles.container, className)}
+      flex={'none'}
+      gap={20}
+      width={280}
+      {...rest}
+    >
+      <PanelTitle desc={desc || t('header.desc')} title={title || t('header.title')} />
+      {children}
+      <BrandWatermark paddingInline={12} />
+    </Flexbox>
+  );
+};
+
+export default SidebarLayout;

package/src/app/(main)/profile/_layout/Desktop/index.tsx

@@ -0,0 +1,48 @@
+'use client';
+
+import { useResponsive } from 'antd-style';
+import { memo, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Flexbox } from 'react-layout-kit';
+
+import InitClientDB from '@/features/InitClientDB';
+import Footer from '@/features/Setting/Footer';
+import SettingContainer from '@/features/Setting/SettingContainer';
+import { useActiveProfileKey } from '@/hooks/useActiveTabKey';
+
+import { LayoutProps } from '../type';
+import Header from './Header';
+import SideBar from './SideBar';
+
+const Layout = memo<LayoutProps>(({ children, category }) => {
+  const ref = useRef<any>(null);
+  const { md = true } = useResponsive();
+  const { t } = useTranslation('auth');
+  const activeKey = useActiveProfileKey();
+
+  return (
+    <>
+      <Flexbox
+        height={'100%'}
+        horizontal={md}
+        ref={ref}
+        style={{ position: 'relative' }}
+        width={'100%'}
+      >
+        {md ? (
+          <SideBar>{category}</SideBar>
+        ) : (
+          <Header getContainer={() => ref.current} title={<>{t(`tab.${activeKey}`)}</>}>
+            {category}
+          </Header>
+        )}
+        <SettingContainer addonAfter={<Footer />}>{children}</SettingContainer>
+      </Flexbox>
+      <InitClientDB />
+    </>
+  );
+});
+
+Layout.displayName = 'DesktopProfileLayout';
+
+export default Layout;

package/src/app/(main)/profile/_layout/Mobile/Header.tsx

@@ -1,22 +1,40 @@
 'use client';
 
 import { MobileNavBar, MobileNavBarTitle } from '@lobehub/ui';
-import { usePathname, useRouter } from 'next/navigation';
+import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { Flexbox } from 'react-layout-kit';
 
+import { useActiveProfileKey } from '@/hooks/useActiveTabKey';
 import { mobileHeaderSticky } from '@/styles/mobileHeader';
 
+import ShareButton from '../../stats/features/ShareButton';
+
 const Header = memo(() => {
   const { t } = useTranslation('auth');
 
   const router = useRouter();
-  const pathname = usePathname();
-  const isSecurity = pathname.startsWith('/prifile/security');
+  const activeSettingsKey = useActiveProfileKey();
+  const isStats = activeSettingsKey === 'stats';
+
+  const handleBackClick = () => {
+    router.push('/me/profile');
+  };
+
   return (
     <MobileNavBar
-      center={<MobileNavBarTitle title={t(isSecurity ? 'security' : 'profile')} />}
-      onBackClick={() => router.push('/me/profile')}
+      center={
+        <MobileNavBarTitle
+          title={
+            <Flexbox align={'center'} gap={8} horizontal>
+              <span style={{ lineHeight: 1.2 }}> {t(`tab.${activeSettingsKey}`)}</span>
+            </Flexbox>
+          }
+        />
+      }
+      onBackClick={handleBackClick}
+      right={isStats ? <ShareButton mobile /> : undefined}
       showBackButton
       style={mobileHeaderSticky}
     />

package/src/app/(main)/profile/_layout/Mobile/index.tsx

@@ -1,16 +1,23 @@
-import { PropsWithChildren } from 'react';
+import MobileContentLayout from '@/components/server/MobileNavLayout';
+import InitClientDB from '@/features/InitClientDB';
+import Footer from '@/features/Setting/Footer';
 
+import { LayoutProps } from '../type';
 import Header from './Header';
 
-const Layout = ({ children }: PropsWithChildren) => {
+const Layout = ({ children }: LayoutProps) => {
   return (
     <>
-      <Header />
-      {children}
+      <MobileContentLayout header={<Header />}>
+        {children}
+        <div style={{ flex: 1 }} />
+        <Footer />
+      </MobileContentLayout>
+      <InitClientDB />
     </>
   );
 };
 
-Layout.displayName = 'ProfileMobileLayout';
+Layout.displayName = 'MobileProfileLayout';
 
 export default Layout;

package/src/app/(main)/profile/_layout/type.ts

@@ -0,0 +1,6 @@
+import { ReactNode } from 'react';
+
+export interface LayoutProps {
+  category: ReactNode;
+  children: ReactNode;
+}

package/src/app/(main)/profile/error.tsx

@@ -0,0 +1,5 @@
+'use client';
+
+import dynamic from 'next/dynamic';
+
+export default dynamic(() => import('@/components/Error'));