Console
;
+}
\ No newline at end of file
diff --git a/web/src/app/console/post/page.tsx b/web/src/app/console/post/page.tsx
new file mode 100644
index 0000000..d612c1f
--- /dev/null
+++ b/web/src/app/console/post/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+ return 文章管理
;
+}
\ No newline at end of file
diff --git a/web/src/app/console/user/page.tsx b/web/src/app/console/user/page.tsx
new file mode 100644
index 0000000..b3f8732
--- /dev/null
+++ b/web/src/app/console/user/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+ return 用户管理
;
+}
\ No newline at end of file
diff --git a/web/src/components/blog-home/blog-home.tsx b/web/src/components/blog-home/blog-home.tsx
index f568bcc..86b9ed4 100644
--- a/web/src/components/blog-home/blog-home.tsx
+++ b/web/src/components/blog-home/blog-home.tsx
@@ -38,7 +38,7 @@ export default function BlogHome() {
const [sortBy, setSortBy, isSortByLoaded] = useStoredState
-
+ {getFallbackAvatarFromUsername(config.owner.name)}
+
{config.owner.name}
{config.owner.motto}
@@ -66,23 +71,23 @@ export function SidebarHotPosts({ posts, sortType }: { posts: Post[], sortType:- {post.title} -
-
-
-
+
+
clickToUserProfile(user.username) : clickToLogin} className="cursor-pointer flex-shrink-0 w-10 h-10 fade-in">
- {user &&
+ {getFirstCharFromUser(user)}
+ }
{!user &&
diff --git a/web/src/components/comment/comment-item.tsx b/web/src/components/comment/comment-item.tsx
index b9d8926..423ad80 100644
--- a/web/src/components/comment/comment-item.tsx
+++ b/web/src/components/comment/comment-item.tsx
@@ -3,7 +3,6 @@ import { User } from "@/models/user";
import { useLocale, useTranslations } from "next-intl";
import { useState } from "react";
import { toast } from "sonner";
-import GravatarAvatar, { getGravatarByUser } from "@/components/common/gravatar";
import { Reply, Trash, Heart, Pencil, Lock } from "lucide-react";
import { Comment } from "@/models/comment";
import { TargetType } from "@/models/types";
@@ -13,6 +12,9 @@ import { CommentInput } from "./comment-input";
import { createComment, deleteComment, getComment, listComments, updateComment } from "@/api/comment";
import { OrderBy } from "@/models/common";
import { formatDateTime } from "@/utils/common/datetime";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { getGravatarUrl } from "@/utils/common/gravatar";
+import { getFirstCharFromUser } from "@/utils/common/username";
export function CommentItem(
@@ -157,7 +159,10 @@ export function CommentItem(
clickToUserProfile(commentState.user.username)} className="cursor-pointer fade-in w-12 h-12">
-
+ {getFirstCharFromUser(commentState.user)}
+
diff --git a/web/src/components/comment/index.tsx b/web/src/components/comment/index.tsx
index 445cb21..deaa820 100644
--- a/web/src/components/comment/index.tsx
+++ b/web/src/components/comment/index.tsx
@@ -59,7 +59,7 @@ export function CommentSection(
}).then(response => {
setComments(response.data.comments);
});
- }, [])
+ }, [page, targetId, targetType]);
const onCommentSubmitted = ({ commentContent, isPrivate, showClientInfo }: { commentContent: string, isPrivate: boolean, showClientInfo: boolean }) => {
createComment({
diff --git a/web/src/components/common/captcha/index.tsx b/web/src/components/common/captcha/index.tsx
index 174df66..2210a52 100644
--- a/web/src/components/common/captcha/index.tsx
+++ b/web/src/components/common/captcha/index.tsx
@@ -3,7 +3,6 @@
import { useEffect } from "react";
import { GoogleReCaptcha, GoogleReCaptchaProvider } from "react-google-recaptcha-v3";
import HCaptcha from "@hcaptcha/react-hcaptcha";
-import { Turnstile } from "@marsidev/react-turnstile";
import { CaptchaProvider } from "@/models/captcha";
import "./captcha.css";
import { TurnstileWidget } from "./turnstile";
diff --git a/web/src/components/common/captcha/turnstile.tsx b/web/src/components/common/captcha/turnstile.tsx
index 2a2ecf2..f2d6c21 100644
--- a/web/src/components/common/captcha/turnstile.tsx
+++ b/web/src/components/common/captcha/turnstile.tsx
@@ -52,13 +52,13 @@ export function TurnstileWidget(props: CaptchaProps) {
const handleSuccess = (token: string) => {
setStatus('success');
- props.onSuccess(token);
+ return props.onSuccess && props.onSuccess(token);
};
const handleError = (error: string) => {
setStatus('error');
setError(error);
- props.onError && props.onError(error);
+ return props.onError && props.onError(error);
};
useEffect(() => {
@@ -66,11 +66,11 @@ export function TurnstileWidget(props: CaptchaProps) {
if (status === 'loading') {
setStatus('error');
setError('timeout');
- props.onError && props.onError('timeout');
+ return props.onError && props.onError('timeout');
}
}, TURNSTILE_TIMEOUT * 1000);
return () => clearTimeout(timer);
- })
+ }, [status, props]);
return (
diff --git a/web/src/components/common/gravatar.tsx b/web/src/components/common/gravatar.tsx
deleted file mode 100644
index f4ccfd8..0000000
--- a/web/src/components/common/gravatar.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-"use client";
-
-import React from "react";
-import Image from "next/image";
-import crypto from "crypto";
-
-// 生成 Gravatar URL 的函数
-function getGravatarUrl(email: string, size: number = 200, defaultType: string = "identicon"): string {
- const hash = crypto.createHash('md5').update(email.toLowerCase().trim()).digest('hex');
- return `https://www.gravatar.com/avatar/${hash}?s=${size}&d=${defaultType}`;
-}
-
-interface GravatarAvatarProps {
- email: string;
- size?: number;
- className?: string;
- alt?: string;
- url?: string;
- defaultType?: 'mm' | 'identicon' | 'monsterid' | 'wavatar' | 'retro' | 'robohash' | 'blank';
-}
-
-const GravatarAvatar: React.FC = ({
- email,
- size = 200,
- className = "",
- alt = "avatar",
- url,
- defaultType = "identicon"
-}) => {
- // 把尺寸控制交给父组件的 wrapper（父组件通过 tailwind 的 w-.. h-.. 控制）
- const gravatarUrl = url && url.trim() !== "" ? url : getGravatarUrl(email, size , defaultType);
-
- return (
- ) {
+ async function handleCopy() {
try {
const ok = await copyToClipboard(codeContent);
if (ok) toast.success(t("copy_success"));
diff --git a/web/src/components/common/pagination.tsx b/web/src/components/common/pagination.tsx
index 1ec5c77..726da68 100644
--- a/web/src/components/common/pagination.tsx
+++ b/web/src/components/common/pagination.tsx
@@ -21,15 +21,10 @@ export function PaginationController({
buttons?: number
onPageChange?: (page: number) => void
} & React.HTMLAttributes) {
- // normalize buttons
const btns = Math.max(5, buttons ?? 7);
const buttonsToShow = totalPages < btns ? totalPages : btns;
- // rely on shadcn buttonVariants and PaginationLink's isActive prop for styling
const [currentPage, setCurrentPage] = useState(() => Math.min(Math.max(1, initialPage ?? 1), Math.max(1, totalPages)));
- const [direction, setDirection] = useState(0) // 1 = forward (right->left), -1 = backward
-
- // sync when initialPage or totalPages props change
useEffect(() => {
const p = Math.min(Math.max(1, initialPage ?? 1), Math.max(1, totalPages));
setCurrentPage(p);
@@ -37,10 +32,9 @@ export function PaginationController({
const handleSetPage = useCallback((p: number) => {
const next = Math.min(Math.max(1, Math.floor(p)), Math.max(1, totalPages));
- setDirection(next > currentPage ? 1 : next < currentPage ? -1 : 0);
setCurrentPage(next);
if (typeof onPageChange === 'function') onPageChange(next);
- }, [onPageChange, totalPages, currentPage]);
+ }, [onPageChange, totalPages]);
// helper to render page link
const renderPage = (pageNum: number) => (
diff --git a/web/src/components/console/app-sidebar.tsx b/web/src/components/console/app-sidebar.tsx
index 9c43737..8356f8d 100644
--- a/web/src/components/console/app-sidebar.tsx
+++ b/web/src/components/console/app-sidebar.tsx
@@ -1,29 +1,16 @@
"use client"
-
-import * as React from "react"
+import { useEffect, useState } from "react"
import {
- IconCamera,
IconChartBar,
IconDashboard,
- IconDatabase,
- IconFileAi,
- IconFileDescription,
- IconFileWord,
IconFolder,
- IconHelp,
IconInnerShadowTop,
IconListDetails,
- IconReport,
- IconSearch,
- IconSettings,
IconUsers,
} from "@tabler/icons-react"
-import { NavDocuments } from "@/components/console/nav-documents"
import { NavMain } from "@/components/console/nav-main"
-import { NavSecondary } from "@/components/console/nav-secondary"
import { NavUser } from "@/components/console/nav-user"
-import { metadata } from '../../app/layout';
import {
Sidebar,
SidebarContent,
@@ -34,125 +21,53 @@ import {
SidebarMenuItem,
} from "@/components/ui/sidebar"
import config from "@/config"
+import Link from "next/link"
+import { getLoginUser } from "@/api/user"
+import { User } from "@/models/user"
const data = {
- user: {
- name: "shadcn",
- email: "m@example.com",
- avatar: "/avatars/shadcn.jpg",
- },
navMain: [
{
- title: "Dashboard",
- url: "#",
+ title: "大石坝",
+ url: "/console",
icon: IconDashboard,
},
{
- title: "Lifecycle",
- url: "#",
+ title: "文章管理",
+ url: "/console/post",
icon: IconListDetails,
},
{
- title: "Analytics",
- url: "#",
+ title: "评论管理",
+ url: "/console/comment",
icon: IconChartBar,
},
{
- title: "Projects",
- url: "#",
+ title: "文件管理",
+ url: "/console/file",
icon: IconFolder,
},
{
- title: "Team",
- url: "#",
+ title: "用户管理",
+ url: "/console/user",
icon: IconUsers,
},
- ],
- navClouds: [
- {
- title: "Capture",
- icon: IconCamera,
- isActive: true,
- url: "#",
- items: [
- {
- title: "Active Proposals",
- url: "#",
- },
- {
- title: "Archived",
- url: "#",
- },
- ],
- },
- {
- title: "Proposal",
- icon: IconFileDescription,
- url: "#",
- items: [
- {
- title: "Active Proposals",
- url: "#",
- },
- {
- title: "Archived",
- url: "#",
- },
- ],
- },
- {
- title: "Prompts",
- icon: IconFileAi,
- url: "#",
- items: [
- {
- title: "Active Proposals",
- url: "#",
- },
- {
- title: "Archived",
- url: "#",
- },
- ],
- },
- ],
- navSecondary: [
- {
- title: "Settings",
- url: "#",
- icon: IconSettings,
- },
- {
- title: "Get Help",
- url: "#",
- icon: IconHelp,
- },
- {
- title: "Search",
- url: "#",
- icon: IconSearch,
- },
- ],
- documents: [
- {
- name: "Data Library",
- url: "#",
- icon: IconDatabase,
- },
- {
- name: "Reports",
- url: "#",
- icon: IconReport,
- },
- {
- name: "Word Assistant",
- url: "#",
- icon: IconFileWord,
- },
- ],
+ ]
}
export function AppSidebar({ ...props }: React.ComponentProps) {
+ const [loginUser, setLoginUser] = useState(null);
+
+ useEffect(() => {
+ getLoginUser().then(resp => {
+ setLoginUser(resp.data);
+ });
+ }, [])
+
+ if (!loginUser) {
+ return null; // 或者返回一个加载指示器
+ }
+
return (
@@ -162,21 +77,19 @@ export function AppSidebar({ ...props }: React.ComponentProps) {
asChild
className="data-[slot=sidebar-menu-button]:!p-1.5"
>
-
+
-
)
diff --git a/web/src/components/console/nav-main.tsx b/web/src/components/console/nav-main.tsx
index 4ea34d8..fa8a3c4 100644
--- a/web/src/components/console/nav-main.tsx
+++ b/web/src/components/console/nav-main.tsx
@@ -1,8 +1,7 @@
"use client"
-import { IconCirclePlusFilled, IconMail, type Icon } from "@tabler/icons-react"
+import { type Icon } from "@tabler/icons-react"
-import { Button } from "@/components/ui/button"
import {
SidebarGroup,
SidebarGroupContent,
@@ -10,6 +9,7 @@ import {
SidebarMenuButton,
SidebarMenuItem,
} from "@/components/ui/sidebar"
+import Link from "next/link"
export function NavMain({
items,
@@ -26,10 +26,12 @@ export function NavMain({
{items.map((item) => (
-
- {item.icon &&
+
+
+ {item.icon &&
+
))}
diff --git a/web/src/components/console/nav-user.tsx b/web/src/components/console/nav-user.tsx
index 7c49dc7..bb38069 100644
--- a/web/src/components/console/nav-user.tsx
+++ b/web/src/components/console/nav-user.tsx
@@ -28,15 +28,14 @@ import {
SidebarMenuItem,
useSidebar,
} from "@/components/ui/sidebar"
+import { User } from "@/models/user"
+import { getGravatarFromUser } from "@/utils/common/gravatar"
+import { getFallbackAvatarFromUsername } from "@/utils/common/username"
export function NavUser({
user,
}: {
- user: {
- name: string
- email: string
- avatar: string
- }
+ user: User
}) {
const { isMobile } = useSidebar()
@@ -49,12 +48,12 @@ export function NavUser({
size="lg"
className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground"
>
-
- CN
+
+ {getFallbackAvatarFromUsername(user.nickname || user.username)}
-
- );
-};
-
-// 用户类型定义（如果还没有的话）
-interface User {
- email?: string;
- displayName?: string;
- name?: string;
- avatarUrl?: string;
-}
-
-export function getGravatarByUser({user, className="", size=640}:{user?: User, className?: string, size?: number}): React.ReactElement {
- if (!user) {
- return
- 
-
- );
-}
\ No newline at end of file
diff --git a/web/src/components/common/markdown-codeblock.tsx b/web/src/components/common/markdown-codeblock.tsx
index 3fd993e..78a33a4 100644
--- a/web/src/components/common/markdown-codeblock.tsx
+++ b/web/src/components/common/markdown-codeblock.tsx
@@ -46,7 +46,7 @@ export default function CodeBlock(props: React.ComponentPropsWithoutRef<"pre">)
codeContent = extractText(child.props.children);
}
- async function handleCopy(e: React.MouseEvent
-
- {user.name}
+ {user.nickname}({user.username})
{user.email}
@@ -70,12 +69,12 @@ export function NavUser({
>
-
- CN
+
+ {getFallbackAvatarFromUsername(user.nickname || user.username)}
- {user.name}
+ {user.nickname}({user.username})
{user.email}
diff --git a/web/src/components/layout/avatar-with-dropdown-menu.tsx b/web/src/components/layout/avatar-with-dropdown-menu.tsx
index 1897ccc..f7e9869 100644
--- a/web/src/components/layout/avatar-with-dropdown-menu.tsx
+++ b/web/src/components/layout/avatar-with-dropdown-menu.tsx
@@ -5,15 +5,9 @@ import {
DropdownMenuGroup,
DropdownMenuItem,
DropdownMenuLabel,
- DropdownMenuPortal,
DropdownMenuSeparator,
- DropdownMenuShortcut,
- DropdownMenuSub,
- DropdownMenuSubContent,
- DropdownMenuSubTrigger,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu"
-import GravatarAvatar from "../common/gravatar"
import { User } from "@/models/user";
import { useEffect, useState } from "react";
import { getLoginUser, userLogout } from "@/api/user";
@@ -21,6 +15,9 @@ import Link from "next/link";
import { toast } from "sonner";
import { useToLogin } from "@/hooks/use-route";
import { CircleUser } from "lucide-react";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { getGravatarFromUser } from "@/utils/common/gravatar";
+import { getFallbackAvatarFromUsername } from "@/utils/common/username";
export function AvatarWithDropdownMenu() {
const [user, setUser] = useState(null);
@@ -44,7 +41,10 @@ export function AvatarWithDropdownMenu() {
@@ -58,29 +58,6 @@ export function AvatarWithDropdownMenu() {
- Team
-
- Invite users
-
-
- Email
- Message
- More...
-
-
-
-
- New Team
- ⌘+T
-
-
- GitHub
- Support
- API
-
{user ? `Logout (${user.username})` : "Login"}
diff --git a/web/src/components/layout/navbar-or-side.tsx b/web/src/components/layout/navbar-or-side.tsx
index 4e5590f..ece03ff 100644
--- a/web/src/components/layout/navbar-or-side.tsx
+++ b/web/src/components/layout/navbar-or-side.tsx
@@ -46,7 +46,7 @@ const navbarMenuComponents = [
]
export function Navbar() {
- const { navbarAdditionalClassName, setMode, mode } = useDevice()
+ const { navbarAdditionalClassName} = useDevice()
return (