diff --git a/DigitalHumanWeb/Dockerfile b/DigitalHumanWeb/Dockerfile index a1f37c5..c42f10b 100644 --- a/DigitalHumanWeb/Dockerfile +++ b/DigitalHumanWeb/Dockerfile @@ -32,7 +32,7 @@ FROM base AS builder ARG USE_CN_MIRROR ENV NEXT_PUBLIC_SERVICE_MODE="server" \ - APP_URL="http://192.168.15.199:3010" \ + APP_URL="http://192.168.15.199:3210" \ DATABASE_DRIVER="node" \ DATABASE_URL="postgres://postgres:uWNZugjBqixf8dxC@localhost:5432/lobechat" \ KEY_VAULTS_SECRET="Kix2wcUONd4CX51E/ZPAd36BqM4wzJgKjPtz2sGztqQ=" @@ -114,11 +114,11 @@ ENV NODE_ENV="production" \ # set hostname to localhost ENV HOSTNAME="192.168.15.199" \ - PORT="3010" + PORT="3210" # General Variables ENV ACCESS_CODE="" \ - APP_URL="http://192.168.15.199:3010" \ + APP_URL="http://192.168.15.199:3210" \ API_KEY_SELECT_MODE="" \ DEFAULT_AGENT_CONFIG="" \ SYSTEM_AGENT="" \ @@ -131,9 +131,9 @@ ENV KEY_VAULTS_SECRET="Kix2wcUONd4CX51E/ZPAd36BqM4wzJgKjPtz2sGztqQ=" \ DATABASE_URL="postgresql://postgres:uWNZugjBqixf8dxC@postgresql:5432/lobechat" # Next Auth -ENV NEXT_AUTH_SECRET="NX2kaPE923dt6BL2U8e9oSre5RfoT7hg" \ +ENV NEXT_AUTH_SECRET="BIoLJoshK5E0R4BxLl4tkDedzIZkdyam/MB+vThTAT0=" \ NEXT_AUTH_SSO_PROVIDERS="casdoor" \ - NEXTAUTH_URL="http://192.168.15.199:3010/api/auth" + NEXTAUTH_URL="http://192.168.15.199:3210/api/auth" # S3 ENV NEXT_PUBLIC_S3_DOMAIN="" \ diff --git a/DigitalHumanWeb/package.json b/DigitalHumanWeb/package.json index ddf5ffe..7f52e35 100644 --- a/DigitalHumanWeb/package.json +++ b/DigitalHumanWeb/package.json @@ -38,7 +38,7 @@ "db:push-test": "NODE_ENV=test drizzle-kit push", "db:studio": "drizzle-kit studio", "db:z-pull": "drizzle-kit introspect", - "dev": "next dev -p 3011", + "dev": "next dev -p 3210", "docs:i18n": "lobe-i18n md && npm run lint:mdx", "docs:seo": "lobe-seo && npm run lint:mdx", "i18n": "npm run workflow:i18n && lobe-i18n", @@ -304,7 +304,7 @@ "vitest": "~1.2.2", "vitest-canvas-mock": "^0.3.3" }, - "packageManager": "pnpm@9.11.0", + "packageManager": "pnpm@9.15.0", "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org" diff --git a/DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx b/DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx index 3f084f1..2a76697 100644 --- a/DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx +++ b/DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx @@ -38,15 +38,15 @@ export interface TopActionProps { tab?: SidebarTabKey; } -const getUserId = (s: { user?: { id?: any } }) => s.user?.id; +// const getUserId = (s: { user?: { id?: any } }) => s.user?.id; const TopActions = memo(() => { const { t } = useTranslation('common'); const switchBackToChat = useGlobalStore((s) => s.switchBackToChat); const { showMarket, enableKnowledgeBase } = useServerConfigStore(featureFlagsSelectors); const { styles, cx } = useStyles() const [value, setValue] = useState("chat") - const userId = getUserId(useUserStore.getState()) - console.log(userId,'3837373266262266') + // const userId = getUserId(useUserStore.getState()) + // console.log(userId,'3837373266262266') return (
{ + const { t } = useTranslation('common'); + const hideSettingsMoveGuide = useUserStore(preferenceSelectors.hideSettingsMoveGuide); + const updateGuideState = useUserStore((s) => s.updateGuideState); + const content = ( + + + + ); + + return hideSettingsMoveGuide ? ( + content + ) : ( + +
{t('userPanel.moveGuide')}
+ { + updateGuideState({ moveSettingsToAvatar: true }); + }} + role={'close-guide'} + size={'small'} + style={{ color: 'inherit' }} + /> + + } + > + {content} +
+ ); +}); + +Avatar.displayName = 'Avatar'; + +export default Avatar; diff --git a/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx b/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx index 6b62445..43b5208 100644 --- a/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx +++ b/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx @@ -95,7 +95,7 @@ const Layout = memo(({ children, nav }) => { {title[pathName]}
-
+
diff --git a/DigitalHumanWeb/src/features/User/UserAvatar.tsx b/DigitalHumanWeb/src/features/User/UserAvatar.tsx index 77e90bc..efd1db5 100644 --- a/DigitalHumanWeb/src/features/User/UserAvatar.tsx +++ b/DigitalHumanWeb/src/features/User/UserAvatar.tsx @@ -63,7 +63,7 @@ const UserAvatar = forwardRef( className={cx(clickable && styles.clickable, className)} ref={ref} size={size} - style={{ flex: 'none', ...style }} + style={{ flex: 'none',...style }} unoptimized {...rest} /> diff --git a/DigitalHumanWeb/src/features/User/UserPanel/PanelContent.tsx b/DigitalHumanWeb/src/features/User/UserPanel/PanelContent.tsx index 4d6ba4e..0eea6ba 100644 --- a/DigitalHumanWeb/src/features/User/UserPanel/PanelContent.tsx +++ b/DigitalHumanWeb/src/features/User/UserPanel/PanelContent.tsx @@ -46,7 +46,7 @@ const PanelContent = memo<{ closePopover: () => void }>(({ closePopover }) => { }; return ( - + {!enableAuth ? ( <> diff --git a/DigitalHumanWeb/src/features/User/UserPanel/UpgradeBadge.tsx b/DigitalHumanWeb/src/features/User/UserPanel/UpgradeBadge.tsx index d258c31..e64c6b5 100644 --- a/DigitalHumanWeb/src/features/User/UserPanel/UpgradeBadge.tsx +++ b/DigitalHumanWeb/src/features/User/UserPanel/UpgradeBadge.tsx @@ -6,7 +6,7 @@ const UpgradeBadge = memo(({ children, showBadge }: PropsWithChildren<{ showBadg if (!showBadge) return children; return ( - + {children} diff --git a/DigitalHumanWeb/src/features/User/UserPanel/index.tsx b/DigitalHumanWeb/src/features/User/UserPanel/index.tsx index 853b62d..e922cfd 100644 --- a/DigitalHumanWeb/src/features/User/UserPanel/index.tsx +++ b/DigitalHumanWeb/src/features/User/UserPanel/index.tsx @@ -27,7 +27,7 @@ const UserPanel = memo(({ children }) => { content={ setOpen(false)} />} onOpenChange={setOpen} open={open} - overlayInnerStyle={{ padding: 0 }} + overlayInnerStyle={{ padding: 0, position: 'fixed',right: 18 }} placement={'topRight'} rootClassName={styles.popover} trigger={['click']}