+
+ );
+ }
+
+ if (loading && !status) {
+ return (
+
+
+
+
+
+
+
+
+ 每日签到
+ 登录后每日可得 5–15 积分
+
+
+
+ );
+ }
+
+ const checkedIn = !!status?.checked_in;
+ const streak = status?.streak ?? 0;
+ const todayPoints = status?.today_points ?? 5;
+
+ const meta = checkedIn
+ ? (streak > 0 ? `连续 ${streak} 天 · 今日已获得 ${todayPoints} 积分` : `今日已获得 ${todayPoints} 积分`)
+ : (streak > 0 ? `连续 ${streak} 天 · 今日可得 ${todayPoints} 积分` : `今日签到可得 ${todayPoints} 积分`);
+
+ return (
+
+
+ );
+}
diff --git a/frontend/src/components/CommentThreadList.tsx b/frontend/src/components/CommentThreadList.tsx
index dac0b60..1a12450 100644
--- a/frontend/src/components/CommentThreadList.tsx
+++ b/frontend/src/components/CommentThreadList.tsx
@@ -1,6 +1,6 @@
import { useState, useEffect } from 'react';
import {
- Check, Clock, History, MessageSquare, X, Pencil, Trash2,
+ Check, Award, Clock, History, MessageSquare, X, Pencil, Trash2,
ThumbsUp, MoreHorizontal, Flag,
} from 'lucide-react';
import type { ReactNode } from 'react';
@@ -51,6 +51,7 @@ import { isHtmlEmpty } from '../utils/postContent';
import { Tooltip } from './ui/Tooltip';
import UserLink from './UserLink';
import { cn } from '@/lib/utils';
+import { pinAwardedCommentTree } from '../utils/bounty';
function isCommentAuthor(c: Comment, user?: User | null): boolean {
return !!user && c.user_id > 0 && c.user_id === user.id;
@@ -83,6 +84,13 @@ interface ItemProps {
onRequireLogin?: (actionLabel: string) => void;
onLikeUpdate?: (commentId: number, liked: boolean, likeCount: number) => void;
renderReplyBox?: (comment: Comment) => ReactNode;
+ bountyAward?: {
+ open: boolean;
+ awardedCommentId?: number;
+ postAuthorId: number;
+ canAward: boolean;
+ onAward: (commentId: number) => void;
+ };
}
/** 单条评论（支持嵌套子回复 + 内联回复框 + 编辑/删除） */
@@ -103,12 +111,14 @@ function CommentItem({
onRequireLogin,
onLikeUpdate,
renderReplyBox,
+ bountyAward,
}: ItemProps) {
const { limits } = useForumLimits();
const c = node.comment;
const nick = commentNick(c);
const guest = isGuestComment(c);
const isHighlighted = highlightFloor === c.floor;
+ const isBountyAwarded = bountyAward?.awardedCommentId === c.id;
const hidden = !!c.content_hidden;
const isReplying = replyToId === c.id;
const isEditing = editingId === c.id;
@@ -215,7 +225,12 @@ function CommentItem({
return (
+
+
+
+ {!checkedIn && (
+
+ )}
+
+ {checkedIn ? (
+
+
+
+ {checkedIn ? '今日已签到' : '每日签到'}
+
+ {meta}
+
+ {!checkedIn && (
+
+ {todayPoints}
+
+ )}
+
{!guest && c.user_id ? (
{nick}
)}
+ {isBountyAwarded && (
+
+
@@ -506,6 +539,7 @@ interface Props {
onRequireLogin?: (actionLabel: string) => void;
onLikeUpdate?: (commentId: number, liked: boolean, likeCount: number) => void;
renderReplyBox?: (comment: Comment) => ReactNode;
+ bountyAward?: ItemProps['bountyAward'];
}
/** Waline 嵌套楼层评论列表 */
@@ -525,8 +559,12 @@ export default function CommentThreadList({
onRequireLogin,
onLikeUpdate,
renderReplyBox,
+ bountyAward,
}: Props) {
- const tree = buildCommentTree(comments);
+ const tree = pinAwardedCommentTree(
+ buildCommentTree(comments),
+ bountyAward?.awardedCommentId,
+ );
return (
@@ -548,6 +586,7 @@ export default function CommentThreadList({
onRequireLogin={onRequireLogin}
onLikeUpdate={onLikeUpdate}
renderReplyBox={renderReplyBox}
+ bountyAward={bountyAward}
/>
))}
diff --git a/frontend/src/components/FeedHeader.tsx b/frontend/src/components/FeedHeader.tsx
index fbbed12..b200335 100644
--- a/frontend/src/components/FeedHeader.tsx
+++ b/frontend/src/components/FeedHeader.tsx
@@ -1,6 +1,7 @@
import { Users, FileText, LayoutGrid } from 'lucide-react';
import { useNavigate } from 'react-router-dom';
import type { Board, ForumStats } from '../api/types';
+import { navigateFeed } from '../utils/feedCache';
interface Props {
boardId: number;
@@ -81,7 +82,7 @@ export default function FeedHeader({
diff --git a/frontend/src/components/FeedPageSkeleton.tsx b/frontend/src/components/FeedPageSkeleton.tsx
index 2b58b1f..3215a0b 100644
--- a/frontend/src/components/FeedPageSkeleton.tsx
+++ b/frontend/src/components/FeedPageSkeleton.tsx
@@ -1,8 +1,11 @@
import { Skeleton } from '@/components/ui/skeleton';
import PostListSkeleton from './PostListSkeleton';
+import { useForumLimits } from '../hooks/useForumLimits';
/** 首页 Feed 初始骨架（标题区 + 排序栏 + 列表） */
export default function FeedPageSkeleton() {
+ const { limits } = useForumLimits();
+
return (
@@ -27,7 +30,7 @@ export default function FeedPageSkeleton() {
-
diff --git a/frontend/src/components/FeedSortBar.tsx b/frontend/src/components/FeedSortBar.tsx
index 340d2db..d7e7e02 100644
--- a/frontend/src/components/FeedSortBar.tsx
+++ b/frontend/src/components/FeedSortBar.tsx
@@ -1,4 +1,6 @@
import { useRef } from 'react';
+import { boardPath, type PermalinkOpts } from '../utils/permalink';
+import { getCachedForumLimits } from '../hooks/useForumLimits';
import { Clock, MessageCircle, Flame } from 'lucide-react';
import { cn } from '@/lib/utils';
import { moveTabIndex } from '../hooks/useOverlayA11y';
@@ -30,10 +32,9 @@ export function parseFeedSort(raw: string | null): FeedSort {
export function buildHomeUrl(
boardId: number,
sort: FeedSort = 'latest',
- opts?: { keyword?: string; tag?: string; author?: string; titleOnly?: boolean },
+ opts?: { keyword?: string; tag?: string; author?: string; titleOnly?: boolean; permalink?: PermalinkOpts },
) {
const p = new URLSearchParams();
- if (boardId) p.set('board', String(boardId));
const tag = opts?.tag?.trim();
const keyword = opts?.keyword?.trim();
const author = opts?.author?.trim();
@@ -48,6 +49,11 @@ export function buildHomeUrl(
}
if (sort !== 'latest') p.set('sort', sort);
const qs = p.toString();
+
+ if (boardId) {
+ const base = boardPath(boardId, opts?.permalink ?? getCachedForumLimits());
+ return qs ? `${base}?${qs}` : base;
+ }
return qs ? `/?${qs}` : '/';
}
diff --git a/frontend/src/components/FriendLinkApplyDialog.tsx b/frontend/src/components/FriendLinkApplyDialog.tsx
new file mode 100644
index 0000000..c2a4f0c
--- /dev/null
+++ b/frontend/src/components/FriendLinkApplyDialog.tsx
@@ -0,0 +1,276 @@
+import { useEffect, useRef, useState } from 'react';
+import { Link2, Upload } from 'lucide-react';
+import {
+ Dialog,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+} from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Spinner } from '@/components/ui/spinner';
+import { notify } from '@/lib/notify';
+import { cn } from '@/lib/utils';
+import { api } from '../api/client';
+import type { FriendLinkApply } from '../api/types';
+import { getCachedSiteBranding } from '../hooks/useSiteBranding';
+import { resolveFriendLinkLogo } from '../utils/friendLink';
+import FriendLinkSiteInfo from './FriendLinkSiteInfo';
+
+type LinkPlacement = 'homepage' | 'custom';
+
+interface Props {
+ open: boolean;
+ onOpenChange: (open: boolean) => void;
+ editApply?: FriendLinkApply | null;
+ onSubmitted?: () => void;
+}
+
+/** 友链申请 / 修改弹窗 */
+export default function FriendLinkApplyDialog({ open, onOpenChange, editApply, onSubmitted }: Props) {
+ const [name, setName] = useState('');
+ const [url, setUrl] = useState('');
+ const [logo, setLogo] = useState('');
+ const [linkPlacement, setLinkPlacement] = useState本站信息（请添加本站链接后再申请）
+-
+
- 名称 +
- {branding.name} +
- 地址 +
- + {siteURL ? ( + {siteURL} + ) : ( + '—' + )} + +
- LOGO +
- + {siteLogoURL ? ( + {siteLogoURL} + ) : ( + '—' + )} + +
+
+
+
+
+
+
+
+
+
+ {showRefundButton && (
+
+ 悬赏进行中
+ {points} 积分
+
+
+
+
+ )}
+ + {isOwnerOrAdmin + ? ownerHint + : `回复本帖，优质回答可获得这 ${points} 积分`} +
+
+
+ {canJumpToAwarded && onJumpToAwarded && (
+
+
+
+ 已采纳
+
+ {points} 积分已发放给被采纳的回复
+
+
+
+
+
+ )}
+
+
+
+
+
+ 悬赏已取消
+ 积分已退回
+
+
+ {post.pinned && (
+ 全局置顶
+ )}
+ {post.board_pinned && (
+ 板块置顶
+ )}
+ {post.featured && (
+
+
+ );
+
+ const metaLeft = (
+
+
+ );
+
+ const stats = (
+
+ {showImageIcon && (
+
+
+ );
+
return (
-
-
-
-
+
-
-
+ {titleRow}
+ {excerpt &&
+ {excerpt}
} +{metaLeft}
+
+
+ 
+
+ {stats}
- {post.pinned && (
- 全局置顶
- )}
- {post.board_pinned && (
- 板块置顶
- )}
- {post.featured && (
-
-
-
- {excerpt && {excerpt}
} - -
- (null);
const restoredRef = useRef(false);
const onScrollTopChangeRef = useRef(onScrollTopChange);
@@ -116,7 +120,7 @@ export default function VirtualPostList({
const virtualizer = useVirtualizer({
count: posts.length,
getScrollElement,
- estimateSize: () => 108,
+ estimateSize: () => rowEstimate,
overscan: 8,
scrollMargin: isMobile ? scrollMargin : 0,
measureElement:
@@ -214,7 +218,7 @@ export default function VirtualPostList({
return (
- {post.board &&
);
}
diff --git a/frontend/src/components/PostListSkeleton.tsx b/frontend/src/components/PostListSkeleton.tsx
index 5d597b4..7d907f1 100644
--- a/frontend/src/components/PostListSkeleton.tsx
+++ b/frontend/src/components/PostListSkeleton.tsx
@@ -1,37 +1,73 @@
import { Skeleton } from '@/components/ui/skeleton';
+import type { ForumLimitsPublic } from '../api/types';
+
+export type FeedListStyle = ForumLimitsPublic['feed_list_style'];
+
+/** 虚拟列表行高预估值 */
+export function feedListRowEstimate(style: FeedListStyle): number {
+ switch (style) {
+ case 'excerpt': return 68;
+ case 'thumbnail': return 72;
+ default: return 52;
+ }
+}
interface Props {
count?: number;
+ listStyle?: FeedListStyle;
}
-/** 帖子列表加载骨架屏（对齐卡片式列表） */
-export default function PostListSkeleton({ count = 8 }: Props) {
+/** 帖子列表加载骨架屏（对齐 v2 紧凑列表） */
+export default function PostListSkeleton({ count = 8, listStyle = 'title' }: Props) {
+ const showExcerpt = listStyle === 'excerpt' || listStyle === 'thumbnail';
+ const showThumb = listStyle === 'thumbnail';
+
return (
+
+ )}
+ {titleRow}
+ {excerpt &&
- {excerpt}
}
- {hasImage && (
-
-
-
+ {metaLeft}
+ {stats}
- {Array.from({ length: count }, (_, i) => (
-
);
diff --git a/frontend/src/components/VirtualPostList.tsx b/frontend/src/components/VirtualPostList.tsx
index 3a0305e..5d88436 100644
--- a/frontend/src/components/VirtualPostList.tsx
+++ b/frontend/src/components/VirtualPostList.tsx
@@ -4,10 +4,11 @@ import { useVirtualizer } from '@tanstack/react-virtual';
import { Inbox, SearchX } from 'lucide-react';
import { Button } from '@/components/ui/button';
import PostListItem from './PostListItem';
-import PostListSkeleton from './PostListSkeleton';
+import PostListSkeleton, { feedListRowEstimate } from './PostListSkeleton';
import FeedPagination from './FeedPagination';
import { InFlowSiteFooter } from './SiteFooter';
import { useAuth } from '../hooks/useAuth';
+import { useForumLimits } from '../hooks/useForumLimits';
import { useMediaQuery } from '../hooks/useTheme';
import { loginPath } from '../utils/authRedirect';
import type { PostItem } from '../api/types';
@@ -67,7 +68,10 @@ export default function VirtualPostList({
}: Props) {
const nav = useNavigate();
const { user } = useAuth();
+ const { limits } = useForumLimits();
const isMobile = useMediaQuery('(max-width: 768px)');
+ const feedStyle = limits.feed_list_style ?? 'title';
+ const rowEstimate = feedListRowEstimate(feedStyle);
const parentRef = useRef
-
- {(links.length > 0 || icp) && (
-
- )}
+
-
+
+ { if (!next && !drawing) setDrawOpen(false); }}
+ >
+
+
+ 立即开奖？
+
+ 将从 {lottery.participant_count} 位参与者中抽取 {lottery.winner_count} 名中奖者。此操作不可撤销。
+
+
+
+ 取消
+ {
+ e.preventDefault();
+ void confirmDraw();
+ }}
+ >
+ {drawing ? '开奖中…' : '确认开奖'}
+
+
+
+
+
+ );
+}
diff --git a/frontend/src/components/PostPollCard.tsx b/frontend/src/components/PostPollCard.tsx
new file mode 100644
index 0000000..f5294d5
--- /dev/null
+++ b/frontend/src/components/PostPollCard.tsx
@@ -0,0 +1,175 @@
+import { useState } from 'react';
+import { BarChart3 } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { notify } from '@/lib/notify';
+import { api } from '../api/client';
+import type { PollView } from '../api/types';
+import { useAuth } from '../hooks/useAuth';
+import { formatDateTime } from '../utils/content';
+
+interface Props {
+ postId: number;
+ poll: PollView;
+ isOwnerOrAdmin: boolean;
+ onUpdate: (poll: PollView) => void;
+}
+
+/** 投票帖投票卡 */
+export default function PostPollCard({ postId, poll, isOwnerOrAdmin, onUpdate }: Props) {
+ const { user } = useAuth();
+ const [selected, setSelected] = useState(poll.my_option_ids ?? []);
+ const [busy, setBusy] = useState(false);
+ const voted = (poll.my_option_ids?.length ?? 0) > 0;
+ const showResults = poll.closed || voted;
+ const canVote = !voted && !poll.closed;
+
+ const headTitle = poll.closed
+ ? '投票已结束'
+ : poll.multi
+ ? `多选（最多 ${poll.max_choices} 项）`
+ : '单选投票';
+
+ const endsAtMs = poll.ends_at ? new Date(poll.ends_at).getTime() : NaN;
+ const expiredByDeadline = poll.closed && poll.ends_at && !Number.isNaN(endsAtMs) && endsAtMs <= Date.now();
+
+ const deadlineHint = poll.ends_at && !Number.isNaN(endsAtMs)
+ ? poll.closed
+ ? (expiredByDeadline ? `已于 ${formatDateTime(poll.ends_at)} 截止` : undefined)
+ : `截止于 ${formatDateTime(poll.ends_at)}`
+ : undefined;
+
+ const toggle = (id: number) => {
+ if (!canVote) return;
+ if (!user) {
+ notify.warning('请先登录');
+ return;
+ }
+ if (poll.multi) {
+ setSelected(prev => (
+ prev.includes(id)
+ ? prev.filter(x => x !== id)
+ : [...prev, id].slice(0, poll.max_choices)
+ ));
+ } else {
+ setSelected([id]);
+ }
+ };
+
+ const submit = async () => {
+ if (!user) {
+ notify.warning('请先登录');
+ return;
+ }
+ if (selected.length === 0) {
+ notify.warning('请选择选项');
+ return;
+ }
+ setBusy(true);
+ try {
+ const r = await api.pollVote(postId, selected);
+ onUpdate(r.poll);
+ notify.success('投票成功');
+ } catch (e: unknown) {
+ notify.error(e instanceof Error ? e.message : '投票失败');
+ } finally {
+ setBusy(false);
+ }
+ };
+
+ const closePoll = async () => {
+ setBusy(true);
+ try {
+ const r = await api.pollClose(postId);
+ onUpdate(r.poll);
+ notify.success('投票已结束');
+ } catch (e: unknown) {
+ notify.error(e instanceof Error ? e.message : '操作失败');
+ } finally {
+ setBusy(false);
+ }
+ };
+
+ return (
+
+
+ );
+}
diff --git a/frontend/src/components/RightPanel.tsx b/frontend/src/components/RightPanel.tsx
index 7f85f16..db1a6ef 100644
--- a/frontend/src/components/RightPanel.tsx
+++ b/frontend/src/components/RightPanel.tsx
@@ -1,14 +1,18 @@
-import { ListTree, MessageCircle, MessagesSquare, Tags, Sparkles } from 'lucide-react';
-import { useLocation, useSearchParams } from 'react-router-dom';
+import { useMemo } from 'react';
+import { ListTree, MessageCircle, Tags, Link2 } from 'lucide-react';
+import { useLocation, useSearchParams, useNavigate } from 'react-router-dom';
import { Skeleton } from '@/components/ui/skeleton';
-import type { PostItem, RecentComment, TagCount, User } from '../api/types';
+import { Button } from '@/components/ui/button';
+import type { AsideWidget, RecentComment, TagCount, User, ForumStats, FriendLink } from '../api/types';
import type { PostHeading } from '../utils/postHeadings';
import { useSiteBranding } from '../hooks/useSiteBranding';
import { formatShortDateTime, formatTime } from '../utils/content';
+import { resolveAsideWidgets } from '../utils/asideWidgets';
import TagCloud from './TagCloud';
import UserLink from './UserLink';
import ArticleOutline from './ArticleOutline';
import PostAuthorCard from './PostAuthorCard';
+import AsideCheckInStrip from './AsideCheckInStrip';
export type PostDetailAside = {
author?: User | null;
@@ -20,38 +24,29 @@ export type PostDetailAside = {
};
interface Props {
- hot: PostItem[];
recentComments: RecentComment[];
tags?: TagCount[];
tagsLoading?: boolean;
+ stats?: ForumStats | null;
onPostClick: (id: number, opts?: { floor?: number }) => void;
/** 首次拉取中，显示骨架避免空态闪烁 */
loading?: boolean;
+ /** 右侧栏可选组件顺序与开关 */
+ asideWidgets: AsideWidget[];
/** 帖子详情：右侧顶部展示作者与目录 */
postDetail?: PostDetailAside | null;
}
-function ActiveSkeleton() {
- return (
-
);
}
diff --git a/frontend/src/components/Sidebar.tsx b/frontend/src/components/Sidebar.tsx
index e7157e9..fdfe5ad 100644
--- a/frontend/src/components/Sidebar.tsx
+++ b/frontend/src/components/Sidebar.tsx
@@ -1,7 +1,7 @@
import {
- Home, Star, LayoutDashboard, FolderGit2, FolderKanban, ArrowLeft,
+ Home, Star, LayoutDashboard, FolderGit2, FolderKanban, ArrowLeft, FileText, Link2,
} from 'lucide-react';
-import { useNavigate, useLocation, useSearchParams } from 'react-router-dom';
+import { useNavigate, useLocation, useSearchParams, Link } from 'react-router-dom';
import type { Board } from '../api/types';
import type { PostHeading } from '../utils/postHeadings';
import { useAuth } from '../hooks/useAuth';
@@ -12,9 +12,12 @@ import { navigateFeed } from '../utils/feedCache';
import BoardIconDisplay from './BoardIconDisplay';
import { getBoardThemeIndex } from '../utils/boardTheme';
import ArticleOutline from './ArticleOutline';
+import { useSitePages } from '../hooks/useSitePages';
+import { pagePath } from '../utils/permalink';
+import { useForumLimits } from '../hooks/useForumLimits';
// 内容页不参与左侧栏高亮（非 feed 浏览上下文）
-const NEUTRAL_SIDEBAR_PREFIXES = ['/post/', '/profile', '/user/'];
+const NEUTRAL_SIDEBAR_PREFIXES = ['/post/', '/profile', '/user/', '/page/'];
export function isNeutralSidebarRoute(pathname: string): boolean {
return NEUTRAL_SIDEBAR_PREFIXES.some(prefix => pathname.startsWith(prefix));
@@ -26,6 +29,8 @@ function resolveMenuKey(pathname: string, activeBoard: number, keyword = ''): st
if (keyword.trim()) return null;
if (pathname.startsWith('/favorites')) return 'favorites';
if (pathname.startsWith('/projects')) return 'projects';
+ if (pathname.startsWith('/links')) return 'links';
+ if (pathname.startsWith('/page/')) return 'pages';
if (pathname.startsWith('/admin')) return 'admin';
return activeBoard === 0 ? 'all' : String(activeBoard);
}
@@ -59,9 +64,37 @@ export default function Sidebar({
const sort = parseFeedSort(params.get('sort'));
const { user } = useAuth();
const isAdmin = user?.role === 'admin';
+ const { navPages } = useSitePages();
+ const { limits } = useForumLimits();
const keyword = params.get('keyword') || '';
const menuKey = resolveMenuKey(loc.pathname, activeBoard, keyword);
+ const permalinkOpts = { permalink: limits };
+
+ const feedNavLink = (
+ key: string,
+ to: string,
+ label: React.ReactNode,
+ icon: React.ReactNode,
+ selectId: number,
+ className?: string,
+ trailing?: React.ReactNode,
+ ) => (
+ {
+ e.preventDefault();
+ onSelectBoard(selectId);
+ navigateFeed(nav, to);
+ }}
+ >
+ {icon}
+ {label}
+ {trailing}
+
+ );
const navItem = (key: string, label: React.ReactNode, icon?: React.ReactNode, onClick?: () => void) => (
-
);
}
diff --git a/frontend/src/components/PostLotteryCard.tsx b/frontend/src/components/PostLotteryCard.tsx
new file mode 100644
index 0000000..80c260b
--- /dev/null
+++ b/frontend/src/components/PostLotteryCard.tsx
@@ -0,0 +1,98 @@
+import { useState } from 'react';
+import { Gift } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import {
+ AlertDialog,
+ AlertDialogAction,
+ AlertDialogCancel,
+ AlertDialogContent,
+ AlertDialogDescription,
+ AlertDialogFooter,
+ AlertDialogHeader,
+ AlertDialogTitle,
+} from '@/components/ui/alert-dialog';
+import { notify } from '@/lib/notify';
+import { api } from '../api/client';
+import type { PostLotteryView } from '../api/types';
+import { userPath } from '../utils/userPath';
+
+interface Props {
+ postId: number;
+ lottery: PostLotteryView;
+ isOwnerOrAdmin: boolean;
+ onUpdate: (lottery: PostLotteryView) => void;
+}
+
+/** 抽奖帖信息卡 */
+export default function PostLotteryCard({ postId, lottery, isOwnerOrAdmin, onUpdate }: Props) {
+ const [drawOpen, setDrawOpen] = useState(false);
+ const [drawing, setDrawing] = useState(false);
+ const drawn = lottery.status === 'drawn';
+ const canDraw = !drawn && isOwnerOrAdmin && lottery.participant_count >= lottery.winner_count;
+
+ const confirmDraw = async () => {
+ setDrawing(true);
+ try {
+ const r = await api.postLotteryDraw(postId);
+ onUpdate(r.lottery);
+ notify.success('开奖完成');
+ setDrawOpen(false);
+ } catch (e: unknown) {
+ notify.error(e instanceof Error ? e.message : '开奖失败');
+ } finally {
+ setDrawing(false);
+ }
+ };
+
+ return (
+ <>
+
-
- ))}
+ );
+ })}
+
-
+
- {i % 4 === 0 &&
+
+
+
+
+
-
-
-
+ )}
+
-
+
+
+
+
+
+
+ {!drawn && (
+ 回帖即可参与（楼主除外），由作者或管理员手动开奖
+ )} + {drawn && lottery.winners && lottery.winners.length > 0 && ( +-
+ {lottery.winners.map(w => (
+
- + {w.nickname || w.username} + + ))} +
+
+ -
+ {poll.options.map(opt => {
+ const isActive = selected.includes(opt.id);
+ const isMine = poll.my_option_ids?.includes(opt.id);
+ return (
+
- + + + ); + })} +
+ {canVote && user && (
+
+ )}
+ {canVote && user && selected.length === 0 && (
+
+ + {poll.multi ? '请选择后提交' : '请选择一项后提交'} +
+ )} + {!user && canVote && ( +登录后可参与投票
+ )} + {isOwnerOrAdmin && !poll.closed && ( + + )} +
- {Array.from({ length: 6 }, (_, i) => (
-
- );
-}
-
function CommentSkeleton() {
return (
-
- ))}
-
{Array.from({ length: 5 }, (_, i) => (
@@ -59,21 +54,24 @@ function CommentSkeleton() {
}
export default function RightPanel({
- hot,
recentComments,
tags = [],
tagsLoading = false,
+ stats = null,
onPostClick,
loading = false,
+ asideWidgets,
postDetail = null,
}: Props) {
const { branding } = useSiteBranding();
+ const nav = useNavigate();
const loc = useLocation();
const [params] = useSearchParams();
const activeTag = params.get('tag') || '';
- const hotList = hot?.slice(0, 8) ?? [];
const commentList = recentComments?.slice(0, 6) ?? [];
- // 站点首页：右侧品牌块承担唯一 h1；板块/搜索等页面由 Feed 标题作 h1
+ const friendLinks = (branding.friend_links ?? []).filter(
+ (l: FriendLink) => l.name?.trim() && l.url?.trim(),
+ );
const isSiteHome = loc.pathname === '/'
&& !params.get('board')
&& !params.get('keyword')
@@ -81,13 +79,144 @@ export default function RightPanel({
&& !params.get('author');
const description = branding.description?.trim() || '';
const slogan = branding.slogan?.trim() || '';
- // 有独立简介时展示简介；否则用欢迎语，避免与页脚 slogan 三连重复
- const aboutText = description || '欢迎参与讨论，发帖、评论，一起把小圈子聊热。';
- // 有近期讨论则展示「正在聊」；否则显示欢迎引导
- const showActive = loading || hotList.length > 0;
- const showWelcome = !loading && hotList.length === 0;
+ const introText = description || slogan;
const isPostDetail = !!postDetail;
+ const enabledWidgets = useMemo(
+ () => resolveAsideWidgets({
+ aside_widgets: asideWidgets,
+ aside_show_tag_cloud: false,
+ aside_show_recent_comments: false,
+ aside_show_friend_links: false,
+ }).filter(w => w.enabled),
+ [asideWidgets],
+ );
+
+ const handleApplyClick = () => {
+ nav('/links?apply=1');
+ };
+
+ const renderWidget = (widget: AsideWidget) => {
+ switch (widget.id) {
+ case 'friend_links':
+ return (
+
+
+
+ );
+ case 'tag_cloud':
+ return (
+
+
+
+
+ {friendLinks.length === 0 ? (
+
+ 暂无友情链接
+ ) : (
+ <>
+ -
+ {friendLinks.slice(0, 8).map((link: FriendLink) => (
+
- + {link.name} + + ))} +
+
+ );
+ case 'recent_comments':
+ return (
+
+
+
+
+
+
+ );
+ default:
+ return null;
+ }
+ };
+
return (
+
+
+ {loading && commentList.length === 0 ? (
+
+ 暂无评论
+ ) : commentList.map(item => (
+
+ {item.user_id ? (
+
+ {item.avatar
+ ? 
+ : (item.author?.[0] || '?')}
+
+ ) : (
+
+ {item.avatar
+ ?
+ : (item.author?.[0] || '?')}
+
+ )}
+
+
+ ))}
+
{isPostDetail && (
@@ -114,121 +243,6 @@ export default function RightPanel({
)}
- {!isPostDetail && showWelcome && (
-
)}
+
+ {!isPostDetail && enabledWidgets.map(renderWidget)}
-
- )}
-
- {!isPostDetail && showActive && (
-
-
-
-
- 社区还在起步，每条回复都很珍贵。
--
-
- 逛逛板块，找到感兴趣的话题 -
- 游客也能评论，登录可点赞收藏 -
- 发一篇帖，留下你的痕迹 -
-
- )}
-
- {!isPostDetail && (
-
-
-
- {loading && hotList.length === 0 ? (
-
- 近 7 日暂无新回复
- ) : hotList.map((item) => {
- const replyLabel = item.last_reply_at
- ? `${formatTime(item.last_reply_at)}有人回`
- : '近期有讨论';
- const count = item.comment_count ?? 0;
- return (
-
- );
- })}
-
-
- )}
-
- {!isPostDetail && (
-
-
-
-
-
-
- )}
-
{!isPostDetail && (
-
-
- {loading && commentList.length === 0 ? (
-
- 暂无评论
- ) : commentList.map(item => (
-
- {item.user_id ? (
-
- {item.avatar
- ?
- : (item.author?.[0] || '?')}
-
- ) : (
-
- {item.avatar
- ?
- : (item.author?.[0] || '?')}
-
- )}
-
-
- ))}
-
@@ -238,14 +252,32 @@ export default function RightPanel({
) : (
+ {stats && (
+ {branding.name}
)} -{aboutText}
- {description && slogan && slogan !== description && ( -{slogan}
+ {introText && ( +{introText}
)}
+
+ )}
+
+ {stats.posts}
+ 帖子
+
+
+ {stats.comments}
+ 回复
+
+
+ {stats.users}
+ 用户
+
+
{isInitialLoad ? (
-
{isSearchEmpty
diff --git a/frontend/src/components/admin/AdminSortableList.tsx b/frontend/src/components/admin/AdminSortableList.tsx
new file mode 100644
index 0000000..f4b72a5
--- /dev/null
+++ b/frontend/src/components/admin/AdminSortableList.tsx
@@ -0,0 +1,215 @@
+import {
+ type CSSProperties,
+ type ElementType,
+ type HTMLAttributes,
+ type ReactNode,
+} from 'react';
+import {
+ DndContext,
+ closestCenter,
+ KeyboardSensor,
+ PointerSensor,
+ useSensor,
+ useSensors,
+ type DragEndEvent,
+} from '@dnd-kit/core';
+import {
+ SortableContext,
+ rectSortingStrategy,
+ sortableKeyboardCoordinates,
+ useSortable,
+ verticalListSortingStrategy,
+ type SortingStrategy,
+} from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+import { ArrowDown, ArrowUp, GripVertical } from 'lucide-react';
+import { Button } from '@/components/ui/button';
+import { reorderItems, shouldShowSortableMoveButtons } from '../../utils/sortOrder';
+
+export type SortableItemControls = {
+ setNodeRef: (node: HTMLElement | null) => void;
+ style: CSSProperties;
+ isDragging: boolean;
+ dragHandleProps: HTMLAttributes;
+ moveUp: () => void;
+ moveDown: () => void;
+ canMoveUp: boolean;
+ canMoveDown: boolean;
+};
+
+type AdminSortableListProps = {
+ items: T[];
+ getId: (item: T) => string | number;
+ onReorder: (items: T[]) => void;
+ renderItem: (item: T, index: number, controls: SortableItemControls) => ReactNode;
+ showMoveButtons?: boolean | 'auto';
+ strategy?: 'vertical' | 'grid';
+ as?: ElementType;
+ className?: string;
+ ariaLabel?: string;
+};
+
+function resolveStrategy(mode: 'vertical' | 'grid'): SortingStrategy {
+ return mode === 'grid' ? rectSortingStrategy : verticalListSortingStrategy;
+}
+
+function SortableItem({
+ item,
+ index,
+ items,
+ getId,
+ onReorder,
+ showMoveButtons,
+ renderItem,
+}: {
+ item: T;
+ index: number;
+ items: T[];
+ getId: (item: T) => string | number;
+ onReorder: (items: T[]) => void;
+ showMoveButtons: boolean;
+ renderItem: AdminSortableListProps['renderItem'];
+}) {
+ const id = getId(item);
+ const {
+ attributes,
+ listeners,
+ setNodeRef,
+ transform,
+ transition,
+ isDragging,
+ } = useSortable({ id });
+
+ const style: CSSProperties = {
+ transform: CSS.Transform.toString(transform),
+ transition,
+ };
+
+ const moveUp = () => {
+ if (index > 0) onReorder(reorderItems(items, index, index - 1));
+ };
+ const moveDown = () => {
+ if (index < items.length - 1) onReorder(reorderItems(items, index, index + 1));
+ };
+
+ const controls: SortableItemControls = {
+ setNodeRef,
+ style,
+ isDragging,
+ dragHandleProps: { ...attributes, ...listeners },
+ moveUp,
+ moveDown,
+ canMoveUp: index > 0,
+ canMoveDown: index < items.length - 1,
+ };
+
+ return (
+ <>
+ {renderItem(item, index, controls)}
+ {showMoveButtons && (
+
+ {controls.canMoveUp ? '可上移' : ''}{controls.canMoveDown ? '可下移' : ''}
+
+ )}
+
+ );
+}
+
+export function SortableDragHandle({
+ label = '拖拽调整顺序',
+ className = 'admin-sortable-row__handle',
+ ...props
+}: HTMLAttributes & { label?: string }) {
+ return (
+
+ );
+}
+
+export function SortableMoveButtons({
+ controls,
+ className = 'admin-sortable-row__order',
+}: {
+ controls: Pick;
+ className?: string;
+}) {
+ return (
+ ({
+ items,
+ getId,
+ onReorder,
+ renderItem,
+ showMoveButtons = 'auto',
+ strategy = 'vertical',
+ as: Wrapper = 'div',
+ className,
+ ariaLabel,
+}: AdminSortableListProps) {
+ const sensors = useSensors(
+ useSensor(PointerSensor, { activationConstraint: { distance: 6 } }),
+ useSensor(KeyboardSensor, { coordinateGetter: sortableKeyboardCoordinates }),
+ );
+
+ const moveButtons = shouldShowSortableMoveButtons(items.length, showMoveButtons);
+
+ const handleDragEnd = (event: DragEndEvent) => {
+ const { active, over } = event;
+ if (!over || active.id === over.id) return;
+ const oldIndex = items.findIndex(item => getId(item) === active.id);
+ const newIndex = items.findIndex(item => getId(item) === over.id);
+ if (oldIndex < 0 || newIndex < 0) return;
+ onReorder(reorderItems(items, oldIndex, newIndex));
+ };
+
+ return (
+
+
+
+ {items.map((item, index) => (
+
+
+
+ );
+}
diff --git a/frontend/src/components/admin/AsideWidgetList.tsx b/frontend/src/components/admin/AsideWidgetList.tsx
new file mode 100644
index 0000000..c03f18f
--- /dev/null
+++ b/frontend/src/components/admin/AsideWidgetList.tsx
@@ -0,0 +1,71 @@
+import AdminSortableList, { SortableDragHandle } from './AdminSortableList';
+import type { AsideWidget, AsideWidgetId } from '../../api/types';
+
+const WIDGET_META: Record = {
+ tag_cloud: {
+ label: '标签云',
+ hint: '在右侧栏展示热门标签',
+ },
+ recent_comments: {
+ label: '最新评论',
+ hint: '在右侧栏展示最近回复',
+ },
+ friend_links: {
+ label: '友情链接',
+ hint: '关闭后不在右侧栏展示，友链仍可在「友情链接」页面查看与申请',
+ },
+};
+
+type Props = {
+ widgets: AsideWidget[];
+ onChange: (next: AsideWidget[]) => void;
+};
+
+export default function AsideWidgetList({ widgets, onChange }: Props) {
+ const handleToggle = (id: AsideWidgetId, enabled: boolean) => {
+ onChange(widgets.map(w => (w.id === id ? { ...w, enabled } : w)));
+ };
+
+ return (
+ widget.id}
+ onReorder={onChange}
+ showMoveButtons={false}
+ className="admin-sortable-list admin-sortable-list--boxed"
+ ariaLabel="右侧栏组件"
+ renderItem={(widget, _index, controls) => {
+ const meta = WIDGET_META[widget.id];
+ return (
+
{ if (!open && !bountyAwarding) setBountyAwardTarget(null); }}
+ >
+
+
+ 采纳该回复？
+
+ 确定采纳该回复并发放 {post.bounty_points ?? 0} 悬赏积分？此操作不可撤销。
+
+
+
+ 取消
+ {
+ e.preventDefault();
+ void confirmBountyAward();
+ }}
+ >
+ {bountyAwarding ? '发放中…' : '确认采纳'}
+
+
+
+
(null);
+ const [loading, setLoading] = useState(true);
+ const [notFound, setNotFound] = useState(false);
+
+ useEffect(() => {
+ if (!slug) {
+ setNotFound(true);
+ setLoading(false);
+ return;
+ }
+ setLoading(true);
+ api.page(slug)
+ .then(d => setPage(d.page))
+ .catch(() => setNotFound(true))
+ .finally(() => setLoading(false));
+ }, [slug]);
+
+ usePageSEO({
+ title: page?.title,
+ description: page?.title,
+ canonicalPath: slug ? pagePath(slug, limits) : undefined,
+ ogType: 'article',
+ });
+
+ if (!slug) return >({ ...EMPTY });
const [saving, setSaving] = useState(false);
const [togglingId, setTogglingId] = useState(null);
+ const [reordering, setReordering] = useState(false);
const load = () => {
setLoading(true);
@@ -161,6 +164,27 @@ export default function AdminBadgesPage() {
}
};
+ const handleBadgeReorder = async (reorderedFiltered: BadgeDef[]) => {
+ const subsetBefore = [...filtered];
+ const before = [...rows];
+ setReordering(true);
+ try {
+ const merged = mergeReorderedSubset(before, subsetBefore, reorderedFiltered);
+ const after = await persistSortOrderChanges(before, merged, badge =>
+ api.adminUpsertBadge({ ...badge, sort_order: badge.sort_order }),
+ );
+ setRows(after);
+ notify.success('徽章排序已更新');
+ } catch (e: unknown) {
+ setRows(before);
+ notify.error(e instanceof Error ? e.message : '排序保存失败');
+ } finally {
+ setReordering(false);
+ }
+ };
+
+ const showMoveButtons = shouldShowSortableMoveButtons(filtered.length);
+
if (!ready) return null;
const PreviewIcon = badgeIcon(form.icon);
@@ -249,14 +273,30 @@ export default function AdminBadgesPage() {
)}
) : (
-
+
+
+
+ );
+}
+
+export default function AdminSortableList
+
+ );
+ }}
+ />
+ );
+}
diff --git a/frontend/src/components/compose/ComposeContextBar.tsx b/frontend/src/components/compose/ComposeContextBar.tsx
index fd1ee9d..8757b6a 100644
--- a/frontend/src/components/compose/ComposeContextBar.tsx
+++ b/frontend/src/components/compose/ComposeContextBar.tsx
@@ -3,7 +3,13 @@ import BoardIconDisplay from '../BoardIconDisplay';
import { getBoardThemeIndex } from '../../utils/boardTheme';
import type { Board, ForumLimitsPublic } from '../../api/types';
-export type PostType = 'normal' | 'question';
+export type PostType = 'normal' | 'question' | 'poll' | 'bounty' | 'lottery';
+
+const SPECIAL_TYPE_LABELS: Record<'poll' | 'bounty' | 'lottery', string> = {
+ poll: '投票',
+ bounty: '悬赏',
+ lottery: '抽奖',
+};
interface Props {
isEdit: boolean;
@@ -32,34 +38,93 @@ export default function ComposeContextBar({
onTagsChange,
limits,
}: Props) {
+ const isSpecialEdit = isEdit && (postType === 'poll' || postType === 'bounty' || postType === 'lottery');
+
return (
+
+ {meta.label}
+
+ {meta.hint}
+
+
+
类型
-
-
+ {isSpecialEdit ? (
+
+ ) : (
+ <>
+
+
+ {!isEdit && (
+ <>
+
+
+
+
+ )}
+
+ )}
{postType === 'question' && (
问答可标记解决状态
)}
+ {postType === 'poll' && (
+
+ {isEdit ? '投票选项发布后不可修改' : '发布后选项不可修改'}
+
+ )}
+ {postType === 'bounty' && (
+ 发布成功即扣除积分；有人回复后不可自行取消，需采纳或联系管理员
+ )}
+ {postType === 'lottery' && (
+ 回帖参与，手动开奖
+ )}
diff --git a/frontend/src/components/compose/ComposeSpecialFields.tsx b/frontend/src/components/compose/ComposeSpecialFields.tsx
new file mode 100644
index 0000000..f114217
--- /dev/null
+++ b/frontend/src/components/compose/ComposeSpecialFields.tsx
@@ -0,0 +1,259 @@
+import { Plus, Trash2 } from 'lucide-react';
+import { cn } from '@/lib/utils';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { Switch } from '@/components/ui/switch';
+import type { PostType } from './ComposeContextBar';
+
+interface Props {
+ postType: PostType;
+ pollOptions: string[];
+ onPollOptionsChange: (opts: string[]) => void;
+ pollMulti: boolean;
+ onPollMultiChange: (v: boolean) => void;
+ pollMaxChoices: number;
+ onPollMaxChoicesChange: (v: number) => void;
+ pollEndsAt: string;
+ onPollEndsAtChange: (v: string) => void;
+ pollNoEndTime: boolean;
+ onPollNoEndTimeChange: (v: boolean) => void;
+ bountyPoints: number;
+ onBountyPointsChange: (v: number) => void;
+ userPointsBalance?: number;
+ lotteryWinners: number;
+ onLotteryWinnersChange: (v: number) => void;
+ disabled?: boolean;
+}
+
+/** 默认截止时间：7 天后，分钟进位到下一整点 */
+export function defaultPollEndsAtLocal(): string {
+ const d = new Date(Date.now() + 7 * 24 * 3600_000);
+ d.setMinutes(0, 0, 0);
+ if (d.getTime() <= Date.now()) {
+ d.setHours(d.getHours() + 1);
+ }
+ const pad = (n: number) => String(n).padStart(2, '0');
+ return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`;
+}
+
+/** datetime-local → ISO8601（UTC） */
+export function pollEndsAtLocalToISO(local: string): string | undefined {
+ const trimmed = local.trim();
+ if (!trimmed) return undefined;
+ const d = new Date(trimmed);
+ if (Number.isNaN(d.getTime())) return undefined;
+ return d.toISOString();
+}
+
+/** ISO8601 → datetime-local */
+export function pollEndsAtISOToLocal(iso: string): string {
+ const d = new Date(iso);
+ if (Number.isNaN(d.getTime())) return '';
+ const pad = (n: number) => String(n).padStart(2, '0');
+ return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())}T${pad(d.getHours())}:${pad(d.getMinutes())}`;
+}
+
+/** 特殊帖类型附加字段（投票/悬赏/抽奖） */
+export default function ComposeSpecialFields({
+ postType,
+ pollOptions,
+ onPollOptionsChange,
+ pollMulti,
+ onPollMultiChange,
+ pollMaxChoices,
+ onPollMaxChoicesChange,
+ pollEndsAt,
+ onPollEndsAtChange,
+ pollNoEndTime,
+ onPollNoEndTimeChange,
+ bountyPoints,
+ onBountyPointsChange,
+ userPointsBalance,
+ lotteryWinners,
+ onLotteryWinnersChange,
+ disabled,
+}: Props) {
+ if (postType === 'normal' || postType === 'question') return null;
+
+ if (postType === 'poll') {
+ return (
+
+
+
+ );
+ }
+
+ if (postType === 'bounty') {
+ const showBalance = !disabled && typeof userPointsBalance === 'number';
+ const balance = userPointsBalance ?? 0;
+ const overBudget = showBalance && bountyPoints > balance;
+ const remaining = showBalance && bountyPoints > 0 && !overBudget
+ ? balance - bountyPoints
+ : null;
+
+ return (
+
+
+
+ );
+ }
+
+ if (postType === 'lottery') {
+ return (
+
+
+ onLotteryWinnersChange(Math.min(20, Math.max(1, Number(e.target.value) || 1)))}
+ />
+
+ );
+ }
+
+ return null;
+}
+
+export function buildPollOptionsPayload(
+ options: string[],
+ multi: boolean,
+ maxChoices: number,
+ endsAtISO?: string | null,
+): string {
+ const payload: Record = {
+ multi,
+ max_choices: maxChoices,
+ options: options.filter(o => o.trim()).map(text => ({ text: text.trim() })),
+ };
+ if (endsAtISO) payload.ends_at = endsAtISO;
+ return JSON.stringify(payload);
+}
+
+/** 统计有效（非空）投票选项数量 */
+export function countValidPollOptions(options: string[]): number {
+ return options.filter(o => o.trim()).length;
+}
+
+/** 前端校验投票截止时间（非不限时时） */
+export function validatePollEndsAtLocal(local: string): string | null {
+ const iso = pollEndsAtLocalToISO(local);
+ if (!iso) return '请选择有效的投票截止时间';
+ if (new Date(iso).getTime() <= Date.now() + 5 * 60_000) {
+ return '投票截止时间须晚于当前时间至少 5 分钟';
+ }
+ if (new Date(iso).getTime() > Date.now() + 365 * 24 * 3600_000) {
+ return '投票截止时间不能超过 365 天';
+ }
+ return null;
+}
diff --git a/frontend/src/hooks/useCheckIn.ts b/frontend/src/hooks/useCheckIn.ts
new file mode 100644
index 0000000..5cd1e11
--- /dev/null
+++ b/frontend/src/hooks/useCheckIn.ts
@@ -0,0 +1,53 @@
+import { useCallback, useEffect, useState } from 'react';
+import { notify } from '@/lib/notify';
+import { api } from '../api/client';
+import type { CheckInStatus } from '../api/types';
+import { useAuth } from './useAuth';
+
+/** 每日签到状态与操作（侧栏、积分页等复用） */
+export function useCheckIn(enabled = true) {
+ const { user, refresh } = useAuth();
+ const [status, setStatus] = useState(null);
+ const [loading, setLoading] = useState(false);
+ const [busy, setBusy] = useState(false);
+
+ const load = useCallback(() => {
+ if (!user || !enabled) {
+ setStatus(null);
+ setLoading(false);
+ return;
+ }
+ setLoading(true);
+ api.checkInStatus()
+ .then(d => setStatus(d.check_in))
+ .catch(e => notify.error(e instanceof Error ? e.message : '加载签到状态失败'))
+ .finally(() => setLoading(false));
+ }, [user, enabled]);
+
+ useEffect(() => {
+ load();
+ }, [load]);
+
+ const doCheckIn = useCallback(async () => {
+ if (!user) return;
+ setBusy(true);
+ try {
+ const r = await api.checkIn();
+ notify.success(`签到成功，+${r.check_in.today_points} 积分`);
+ setStatus(r.check_in);
+ await refresh();
+ } catch (e: unknown) {
+ notify.error(e instanceof Error ? e.message : '签到失败');
+ } finally {
+ setBusy(false);
+ }
+ }, [user, refresh]);
+
+ return {
+ status,
+ loading,
+ busy,
+ doCheckIn,
+ reload: load,
+ };
+}
diff --git a/frontend/src/hooks/useForumLimits.ts b/frontend/src/hooks/useForumLimits.ts
index f08e62a..c3df62b 100644
--- a/frontend/src/hooks/useForumLimits.ts
+++ b/frontend/src/hooks/useForumLimits.ts
@@ -1,6 +1,7 @@
import { useEffect, useState } from 'react';
import { api } from '../api/client';
import type { ForumLimitsPublic } from '../api/types';
+import { DEFAULT_ASIDE_WIDGETS } from '../api/types';
const DEFAULT_LIMITS: ForumLimitsPublic = {
post_title_max: 128,
@@ -16,6 +17,11 @@ const DEFAULT_LIMITS: ForumLimitsPublic = {
signature_max: 200,
open_posts_in_new_tab: true,
open_content_links_in_new_tab: true,
+ aside_show_tag_cloud: false,
+ aside_show_recent_comments: false,
+ aside_show_friend_links: true,
+ aside_widgets: DEFAULT_ASIDE_WIDGETS,
+ feed_list_style: 'title',
permalink_enabled: false,
permalink_ext: 'html',
};
diff --git a/frontend/src/hooks/useSitePages.ts b/frontend/src/hooks/useSitePages.ts
new file mode 100644
index 0000000..504b103
--- /dev/null
+++ b/frontend/src/hooks/useSitePages.ts
@@ -0,0 +1,41 @@
+import { useEffect, useState } from 'react';
+import { api } from '../api/client';
+import type { SitePageSummary } from '../api/types';
+
+let cache: SitePageSummary[] | null = null;
+let pending: Promise | null = null;
+
+/** 已发布单页摘要（页脚/侧栏导航） */
+export function useSitePages() {
+ const [pages, setPages] = useState(cache ?? []);
+
+ useEffect(() => {
+ if (cache) {
+ setPages(cache);
+ return;
+ }
+ if (!pending) {
+ pending = api.pages()
+ .then(d => {
+ cache = d.pages ?? [];
+ return cache;
+ })
+ .catch(() => {
+ cache = [];
+ return cache;
+ })
+ .finally(() => { pending = null; });
+ }
+ pending.then(setPages);
+ }, []);
+
+ return {
+ pages,
+ footerPages: pages.filter(p => p.show_in_footer),
+ navPages: pages.filter(p => p.show_in_nav),
+ };
+}
+
+export function invalidateSitePagesCache() {
+ cache = null;
+}
diff --git a/frontend/src/layouts/AdminLayout.tsx b/frontend/src/layouts/AdminLayout.tsx
index 704e3bf..cf7f79f 100644
--- a/frontend/src/layouts/AdminLayout.tsx
+++ b/frontend/src/layouts/AdminLayout.tsx
@@ -1,7 +1,7 @@
import { useEffect, useState, useCallback, useRef } from 'react';
import { Outlet, NavLink, useNavigate, useLocation } from 'react-router-dom';
import {
- LayoutDashboard, FolderKanban, FileText, MessageSquare, Flag, Users, Images, Settings, ArrowLeft, Moon, Sun, Menu, X, Award,
+ LayoutDashboard, FolderKanban, FileText, MessageSquare, Flag, Users, Images, Settings, ArrowLeft, Moon, Sun, Menu, X, Award, Link2, BookOpen,
} from 'lucide-react';
import { Spinner } from '@/components/ui/spinner';
import { useAuth } from '../hooks/useAuth';
@@ -16,7 +16,7 @@ import { useNoIndexSEO } from '../hooks/usePageSEO';
import SiteBrandMark from '../components/SiteBrandMark';
import { api } from '../api/client';
-type BadgeKey = 'posts' | 'comments' | 'reports';
+type BadgeKey = 'posts' | 'comments' | 'reports' | 'links';
type NavItem = {
to: string;
@@ -50,8 +50,10 @@ const NAV_GROUPS: NavGroup[] = [
label: '社区',
items: [
{ to: '/admin/boards', label: '板块管理', icon: FolderKanban },
+ { to: '/admin/pages', label: '单页管理', icon: BookOpen },
{ to: '/admin/users', label: '用户管理', icon: Users },
{ to: '/admin/badges', label: '徽章管理', icon: Award },
+ { to: '/admin/links', label: '友情链接', icon: Link2, badgeKey: 'links' },
],
},
{
@@ -67,6 +69,7 @@ type PendingCounts = {
posts: number;
comments: number;
reports: number;
+ links: number;
};
function formatNavBadge(n: number) {
@@ -82,7 +85,7 @@ export default function AdminLayout() {
useNoIndexSEO('管理后台');
const isNarrow = useMediaQuery('(max-width: 768px)');
const [navOpen, setNavOpen] = useState(false);
- const [pending, setPending] = useState({ posts: 0, comments: 0, reports: 0 });
+ const [pending, setPending] = useState({ posts: 0, comments: 0, reports: 0, links: 0 });
const nav = useNavigate();
const location = useLocation();
const drawerRef = useRef(null);
@@ -99,10 +102,23 @@ export default function AdminLayout() {
posts: d.pending_posts ?? 0,
comments: d.pending_comments ?? 0,
reports: d.pending_reports ?? 0,
+ links: d.pending_friend_links ?? 0,
}))
.catch(() => {});
}, []);
+ useEffect(() => {
+ if (loading || !user || user.role !== 'admin') return;
+ refreshPending();
+ const onRefresh = () => refreshPending();
+ window.addEventListener('admin-pending-refresh', onRefresh);
+ const timer = window.setInterval(refreshPending, 60_000);
+ return () => {
+ window.removeEventListener('admin-pending-refresh', onRefresh);
+ window.clearInterval(timer);
+ };
+ }, [loading, user, refreshPending]);
+
useEffect(() => {
if (loading) return;
if (!user) {
diff --git a/frontend/src/layouts/MainLayout.tsx b/frontend/src/layouts/MainLayout.tsx
index a8c881a..a9de33a 100644
--- a/frontend/src/layouts/MainLayout.tsx
+++ b/frontend/src/layouts/MainLayout.tsx
@@ -14,13 +14,14 @@ import { useAuth } from '../hooks/useAuth';
import { useTheme, useMediaQuery } from '../hooks/useTheme';
import { useOverlayA11y, moveTabIndex } from '../hooks/useOverlayA11y';
import { api } from '../api/client';
-import type { Board, PostItem, RecentComment, ForumStats, TagCount, User } from '../api/types';
+import type { Board, RecentComment, ForumStats, TagCount, User } from '../api/types';
import type { PostHeading } from '../utils/postHeadings';
-import { getCachedBoards, getCachedStats, getCachedHot, getCachedRecentComments, getCachedTags, hasCachedAside, setCachedBoards, setCachedStats, setCachedHot, setCachedRecentComments, setCachedTags } from '../utils/layoutCache';
+import { getCachedBoards, getCachedStats, getCachedRecentComments, getCachedTags, hasCachedAside, setCachedBoards, setCachedStats, setCachedRecentComments, setCachedTags } from '../utils/layoutCache';
import Sidebar, { isNeutralSidebarRoute } from '../components/Sidebar';
import RightPanel from '../components/RightPanel';
import BackToTop from '../components/BackToTop';
import { useForumLimits } from '../hooks/useForumLimits';
+import { resolveAsideWidgets } from '../utils/asideWidgets';
import { buildHomeUrl, parseFeedSort } from '../components/FeedSortBar';
import { navigateFeed } from '../utils/feedCache';
import { notify } from '@/lib/notify';
@@ -32,6 +33,7 @@ import { useSiteBranding } from '../hooks/useSiteBranding';
import SiteBrandMark from '../components/SiteBrandMark';
import SiteFooter from '../components/SiteFooter';
import { userPath } from '../utils/userPath';
+import { parsePermalinkID } from '../utils/permalink';
export default function MainLayout() {
const { user, loading: authLoading, logout } = useAuth();
@@ -46,7 +48,6 @@ export default function MainLayout() {
const [boards, setBoards] = useState(() => getCachedBoards());
const [stats, setStats] = useState(() => getCachedStats());
- const [hot, setHot] = useState(() => getCachedHot());
const [recentComments, setRecentComments] = useState(() => getCachedRecentComments());
const [unreadMessages, setUnreadMessages] = useState(0);
const [tags, setTags] = useState(() => getCachedTags());
@@ -66,7 +67,11 @@ export default function MainLayout() {
const [asideLoading, setAsideLoading] = useState(() => !hasCachedAside());
const [boardsLoading, setBoardsLoading] = useState(() => getCachedBoards().length === 0);
const asideEverLoaded = useRef(false);
- const [boardId, setBoardId] = useState(Number(params.get('board')) || 0);
+ const [boardId, setBoardId] = useState(() => {
+ const m = loc.pathname.match(/^\/board\/(\d+(?:\.[A-Za-z0-9]{1,16})?)$/);
+ if (m) return parsePermalinkID(m[1]) || 0;
+ return Number(params.get('board')) || 0;
+ });
const [keyword, setKeyword] = useState(params.get('keyword') || '');
const [searchAuthor, setSearchAuthor] = useState(params.get('author') || '');
const [searchTitleOnly, setSearchTitleOnly] = useState(params.get('title_only') === '1');
@@ -74,6 +79,9 @@ export default function MainLayout() {
const [searchAdvanced, setSearchAdvanced] = useState(false);
const feedSort = parseFeedSort(params.get('sort'));
const { limits: forumLimits } = useForumLimits();
+ const asideWidgets = useMemo(() => resolveAsideWidgets(forumLimits), [forumLimits]);
+ const showTagCloud = asideWidgets.some(w => w.id === 'tag_cloud' && w.enabled);
+ const showRecentComments = asideWidgets.some(w => w.id === 'recent_comments' && w.enabled);
const asideDrawerRef = useRef(null);
const asideCloseRef = useRef(null);
@@ -99,7 +107,14 @@ export default function MainLayout() {
initialFocusRef: sidebarCloseRef,
});
- useEffect(() => { setBoardId(Number(params.get('board')) || 0); }, [params]);
+ useEffect(() => {
+ const m = loc.pathname.match(/^\/board\/(\d+(?:\.[A-Za-z0-9]{1,16})?)$/);
+ if (m) {
+ setBoardId(parsePermalinkID(m[1]) || 0);
+ return;
+ }
+ setBoardId(Number(params.get('board')) || 0);
+ }, [loc.pathname, params]);
useEffect(() => {
setKeyword(params.get('keyword') || '');
setSearchAuthor(params.get('author') || '');
@@ -183,7 +198,7 @@ export default function MainLayout() {
// 标签云：进页/离开发帖页时拉取；不跟 posts-refresh 联动（置顶/精华等不改标签）
useEffect(() => {
- if (isCompose) return;
+ if (isCompose || !showTagCloud) return;
let cancelled = false;
if (getCachedTags().length === 0) setTagsLoading(true);
api.tags(40).then(d => {
@@ -197,31 +212,24 @@ export default function MainLayout() {
return () => {
cancelled = true;
};
- }, [isCompose]);
+ }, [isCompose, showTagCloud]);
const needAsideData = !isCompose && (!hideAside || asideOpen);
+ const needRecentComments = needAsideData && showRecentComments;
useEffect(() => {
- if (!needAsideData) return;
+ if (!needRecentComments) return;
let cancelled = false;
// 无缓存时才显示加载态，有缓存则静默刷新，避免抽屉高度跳动
if (!asideEverLoaded.current && !hasCachedAside()) {
setAsideLoading(true);
}
- Promise.all([
- api.hotPosts().then(d => {
- if (cancelled) return;
- const next = Array.isArray(d.posts) ? d.posts : [];
- setHot(next);
- setCachedHot(next);
- }).catch(() => {}),
- api.recentComments().then(d => {
- if (cancelled) return;
- const next = Array.isArray(d.comments) ? d.comments : [];
- setRecentComments(next);
- setCachedRecentComments(next);
- }).catch(() => {}),
- ]).finally(() => {
+ api.recentComments().then(d => {
+ if (cancelled) return;
+ const next = Array.isArray(d.comments) ? d.comments : [];
+ setRecentComments(next);
+ setCachedRecentComments(next);
+ }).catch(() => {}).finally(() => {
if (!cancelled) {
asideEverLoaded.current = true;
setAsideLoading(false);
@@ -231,7 +239,7 @@ export default function MainLayout() {
return () => {
cancelled = true;
};
- }, [needAsideData]);
+ }, [needRecentComments]);
const doSearch = () => {
const kw = keyword.trim();
@@ -239,7 +247,7 @@ export default function MainLayout() {
const activeKw = (params.get('keyword') || '').trim();
const activeAuthor = (params.get('author') || '').trim();
const activeTitleOnly = params.get('title_only') === '1';
- const activeBoard = Number(params.get('board')) || 0;
+ const activeBoard = boardId;
if (!kw && !author) {
if (activeKw || activeAuthor) navigateFeed(nav, '/');
return;
@@ -260,9 +268,10 @@ export default function MainLayout() {
keyword: kw,
author,
titleOnly: !!kw && searchTitleOnly,
+ permalink: forumLimits,
});
const same =
- loc.pathname === '/'
+ (loc.pathname === '/' || /^\/board\/\d+/.test(loc.pathname))
&& activeKw === kw
&& activeAuthor === author
&& activeTitleOnly === (!!kw && searchTitleOnly)
@@ -280,7 +289,7 @@ export default function MainLayout() {
}, [nav, forumLimits.open_posts_in_new_tab]);
const userInitial = user?.nickname?.charAt(0) || '?';
- const isFeedHome = loc.pathname === '/';
+ const isFeedHome = loc.pathname === '/' || /^\/board\/\d+/.test(loc.pathname);
const outletKeyword = params.get('keyword') || '';
const outletTag = params.get('tag') || '';
const outletAuthor = params.get('author') || '';
@@ -318,7 +327,7 @@ export default function MainLayout() {
const selectBoardChip = (id: number) => {
setBoardId(id);
- navigateFeed(nav, buildHomeUrl(id, feedSort));
+ navigateFeed(nav, buildHomeUrl(id, feedSort, { permalink: forumLimits }));
};
const onBoardBarKeyDown = (e: React.KeyboardEvent) => {
@@ -632,11 +641,12 @@ export default function MainLayout() {
{!isCompose && (
+
+
+
+
+
+
+ {!pollNoEndTime && (
+
+
+ onPollEndsAtChange(e.target.value)}
+ disabled={disabled}
+ className="compose-special__poll-deadline-input w-auto"
+ />
+
+ )}
+
+ {pollOptions.map((opt, i) => (
+
+ {pollOptions.length < 10 && (
+
+ )}
+
+ {
+ const next = [...pollOptions];
+ next[i] = e.target.value;
+ onPollOptionsChange(next);
+ }}
+ />
+
+
+ ))}
+
+ onBountyPointsChange(Math.max(0, Number(e.target.value) || 0))}
+ />
+ {showBalance && (
+
+ + {overBudget + ? '积分不足' + : remaining != null + ? `当前余额 ${balance} · 发布后剩余 ${remaining}` + : `当前余额 ${balance}`} +
+ )} +参与者为已回帖用户（不含楼主），由作者或管理员开奖
+
+
+
+
+
+
+ );
+}
diff --git a/frontend/src/pages/admin/AdminBadgesPage.tsx b/frontend/src/pages/admin/AdminBadgesPage.tsx
index 70522bf..1fcb41a 100644
--- a/frontend/src/pages/admin/AdminBadgesPage.tsx
+++ b/frontend/src/pages/admin/AdminBadgesPage.tsx
@@ -27,6 +27,8 @@ import {
badgeIcon,
formatBadgeCondition,
} from '../../utils/badgeIcons';
+import AdminSortableList, { SortableDragHandle, SortableMoveButtons } from '../../components/admin/AdminSortableList';
+import { mergeReorderedSubset, persistSortOrderChanges, shouldShowSortableMoveButtons } from '../../utils/sortOrder';
type KindTab = 'all' | 'auto' | 'limited';
@@ -62,6 +64,7 @@ export default function AdminBadgesPage() {
const [form, setForm] = useState
- {filtered.map(b => {
+ b.id}
+ onReorder={handleBadgeReorder}
+ showMoveButtons="auto"
+ ariaLabel="徽章列表排序"
+ renderItem={(b, _index, controls) => {
const Icon = badgeIcon(b.icon);
return (
+
+
+ {showMoveButtons &&
);
- })}
-