02272258

apps/server/src/models/post/post.service.ts

@@ -184,32 +184,7 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
     where?: Prisma.PostWhereInput;
     orderBy?: OrderByArgs<(typeof db.post)['findMany']>;
     select?: Prisma.PostSelect<DefaultArgs>;
-  }): Promise<{
+  }) {
-    items: {
-      id: string;
-      type: string | null;
-      level: string | null;
-      state: string | null;
-      title: string | null;
-      subTitle: string | null;
-      content: string | null;
-      important: boolean | null;
-      domainId: string | null;
-      order: number | null;
-      duration: number | null;
-      rating: number | null;
-      createdAt: Date;
-      views: number;
-      publishedAt: Date | null;
-      updatedAt: Date;
-      deletedAt: Date | null;
-      authorId: string | null;
-      parentId: string | null;
-      hasChildren: boolean | null;
-      meta: Prisma.JsonValue | null;
-    }[];
-    totalPages: number;
-  }> {
     // super.updateOrder;
     return super.findManyWithPagination(args);
   }

apps/web/src/app/main/course/detail/page.tsx

@@ -3,6 +3,5 @@ import { useParams } from "react-router-dom";
 
 export function CourseDetailPage() {
 	const { id, lectureId } = useParams();
-	console.log("Course ID:", id);
 	return <CourseDetail id={id} lectureId={lectureId}></CourseDetail>;
 }

apps/web/src/app/main/home/components/HeroSection.tsx

@@ -57,7 +57,7 @@ const HeroSection = () => {
 			{
 				icon: <EyeOutlined />,
 				value: statistics.reads,
-				label: "观看次数",
+				label: "播放次数",
 			},
 		];
 	}, [statistics]);

apps/web/src/app/main/layout/MainHeader.tsx

@@ -30,8 +30,10 @@ export function MainHeader() {
 				<NavigationMenu />
 			</div>
 
-			{/* 中间搜索区域 - 允许适当收缩但保持可用性 */}
+
-			<div className="mx-4 flex-shrink md:flex-shrink-0 md:w-auto w-auto">
+			{/* 右侧区域 - 可以灵活收缩 */}
+			<div className="flex justify-end gap-2 md:gap-4 flex-shrink">
+				<div className="flex items-center gap-2 md:gap-4">
 					<Input
 						size="large"
 						prefix={
@@ -60,14 +62,12 @@ export function MainHeader() {
 							}
 						}}
 					/>
-			</div>
-
-			{/* 右侧区域 - 可以灵活收缩 */}
-			<div className="flex justify-end gap-2 md:gap-4 flex-shrink">
-				<div className="flex items-center gap-2 md:gap-4">
 					{isAuthenticated && (
 						<>
 							<Button
+								size="large"
+								shape="round"
+								icon={<PlusOutlined></PlusOutlined>}
 								onClick={() => {
 									const url = id
 										? `/course/${id}/editor`
@@ -82,9 +82,12 @@ export function MainHeader() {
 					)}
 					{isAuthenticated && (
 						<Button
+							size="large"
+							shape="round"
 							onClick={() => {
 								window.location.href = "/path/editor";
 							}}
+							ghost type="primary"
 							icon={<PlusOutlined></PlusOutlined>}>
 							创建思维导图
 						</Button>
@@ -93,8 +96,11 @@ export function MainHeader() {
 						<UserMenu />
 					) : (
 						<Button
+							type="primary"
+							size="large"
+							shape="round"
 							onClick={() => navigate("/login")}
-							className="flex items-center space-x-1 bg-gradient-to-r from-blue-500 to-blue-600 text-white hover:from-blue-600 hover:to-blue-700 border-none shadow-md hover:shadow-lg transition-all"
+
 							icon={<UserOutlined />}>
 							登录
 						</Button>

apps/web/src/app/main/layout/NavigationMenu.tsx

@@ -11,7 +11,7 @@ export const NavigationMenu = () => {
 	const menuItems = useMemo(() => {
 		const baseItems = [
 			{ key: "home", path: "/", label: "首页" },
-			{ key: "path", path: "/path", label: "思维导图" },
+			{ key: "path", path: "/path", label: "全部思维导图" },
 			{ key: "courses", path: "/courses", label: "所有课程" },
 		];
 
@@ -20,9 +20,10 @@ export const NavigationMenu = () => {
 		} else {
 			return [
 				...baseItems,
-				{ key: "my-duty", path: "/my-duty", label: "我的授课" },
+				{ key: "my-duty", path: "/my-duty", label: "我创建的课程" },
-				{ key: "my-learning", path: "/my-learning", label: "我的课程" },
+				{ key: "my-learning", path: "/my-learning", label: "我学习的课程" },
-				{ key: "my-path", path: "/my-path", label: "我的路径" },
+				{ key: "my-duty-path", path: "/my-duty-path", label: "我创建的思维导图" },
+				{ key: "my-path", path: "/my-path", label: "我学习的思维导图" },
 			];
 		}
 	}, [isAuthenticated]);

apps/web/src/app/main/my-duty-path/components/MyDutyPathContainer.tsx

@@ -0,0 +1,30 @@
+import PostList from "@web/src/components/models/course/list/PostList";
+import { useAuth } from "@web/src/providers/auth-provider";
+import { useMainContext } from "../../layout/MainProvider";
+import { PostType } from "@nice/common";
+import PathCard from "@web/src/components/models/post/SubPost/PathCard";
+
+export default function MyLearningListContainer() {
+	const { user } = useAuth();
+	const { searchCondition, termsCondition } = useMainContext();
+	return (
+		<>
+			<PostList
+				renderItem={(post) => <PathCard post={post}></PathCard>}
+				params={{
+					pageSize: 12,
+					where: {
+						type: PostType.PATH,
+						students: {
+							some: {
+								id: user?.id,
+							},
+						},
+						...termsCondition,
+						...searchCondition,
+					},
+				}}
+				cols={4}></PostList>
+		</>
+	);
+}

apps/web/src/app/main/my-duty-path/page.tsx

@@ -0,0 +1,17 @@
+import { useEffect } from "react";
+import BasePostLayout from "../layout/BasePost/BasePostLayout";
+import { useMainContext } from "../layout/MainProvider";
+import { PostType } from "@nice/common";
+import MyDutyPathContainer from "./components/MyDutyPathContainer";
+
+export default function MyDutyPathPage() {
+	const { setSearchMode } = useMainContext();
+	useEffect(() => {
+		setSearchMode(PostType.PATH);
+	}, [setSearchMode]);
+	return (
+		<BasePostLayout>
+			<MyDutyPathContainer></MyDutyPathContainer>
+		</BasePostLayout>
+	);
+}

apps/web/src/components/common/editor/MindEditor.tsx

@@ -1,6 +1,6 @@
 import { Button, Card, Empty, Form, Space, Spin, message, theme } from "antd";
 import NodeMenu from "./NodeMenu";
-import { api, usePost } from "@nice/client";
+import { api, usePost, useVisitor } from "@nice/client";
 import {
 	ObjectType,
 	PathDto,
@@ -8,6 +8,7 @@ import {
 	PostType,
 	Prisma,
 	RolePerms,
+	VisitType,
 } from "@nice/common";
 import TermSelect from "../../models/term/term-select";
 import DepartmentSelect from "../../models/department/department-select";
@@ -23,6 +24,7 @@ export default function MindEditor({ id }: { id?: string }) {
 	const containerRef = useRef<HTMLDivElement>(null);
 	const [instance, setInstance] = useState<MindElixirInstance | null>(null);
 	const { isAuthenticated, user, hasSomePermissions } = useAuth();
+	const { read } = useVisitor()
 	const { data: post, isLoading }: { data: PathDto; isLoading: boolean } =
 		api.post.findFirst.useQuery({
 			where: {
@@ -42,9 +44,19 @@ export default function MindEditor({ id }: { id?: string }) {
 	});
 	const { handleFileUpload } = useTusUpload();
 	const [form] = Form.useForm();
+	useEffect(() => {
+		if (post?.id) {
+			read.mutateAsync({
+				data: {
+					visitorId: user?.id || null,
+					postId: post?.id,
+					type: VisitType.READED,
+				},
+			});
+		}
+	}, [post]);
 	useEffect(() => {
 		if (post && form && instance && id) {
-			console.log(post);
 			instance.refresh((post as any).meta);
 			const deptIds = (post?.depts || [])?.map((dept) => dept.id);
 			const formData = {

apps/web/src/components/models/course/detail/CourseDetail.tsx

@@ -8,11 +8,7 @@ export default function CourseDetail({
 	id?: string;
 	lectureId?: string;
 }) {
-	const iframeStyle = {
+	
-		width: "50%",
-		height: "100vh",
-		border: "none",
-	};
 	return (
 		<>
 			<CourseDetailProvider editId={id}>

apps/web/src/components/models/course/detail/CourseDetailDisplayArea.tsx

@@ -7,25 +7,10 @@ import { Course, LectureType, PostType } from "@nice/common";
 import { CourseDetailContext } from "./CourseDetailContext";
 import CollapsibleContent from "@web/src/components/common/container/CollapsibleContent";
 import { Skeleton } from "antd";
-import { CoursePreview } from "./CoursePreview/CoursePreview";
 import ResourcesShower from "@web/src/components/common/uploader/ResourceShower";
-import {
-	BookOutlined,
-	CalendarOutlined,
-	EditTwoTone,
-	EyeOutlined,
-	ReloadOutlined,
-} from "@ant-design/icons";
-import dayjs from "dayjs";
 import { useNavigate } from "react-router-dom";
 import CourseDetailTitle from "./CourseDetailTitle";
 
-// interface CourseDetailDisplayAreaProps {
-// 	// course: Course;
-// 	// videoSrc?: string;
-// 	// videoPoster?: string;
-// 	// isLoading?: boolean;
-// }
 
 export const CourseDetailDisplayArea: React.FC = () => {
 	// 创建滚动动画效果

apps/web/src/components/models/course/detail/CourseDetailLayout.tsx

@@ -19,11 +19,7 @@ export default function CourseDetailLayout() {
 	const [isSyllabusOpen, setIsSyllabusOpen] = useState(true);
 	return (
 		<div className="relative">
-			{/* <CourseDetailHeader /> */}
 
-			{/* 添加 Header 组件 */}
-			{/* 主内容区域 */}
-			{/* 为了防止 Header 覆盖内容，添加上边距 */}
 			<div className="pt-12 px-32">
 				{" "}
 				{/* 添加这个包装 div */}

apps/web/src/components/models/course/detail/CourseDetailTitle.tsx

@@ -44,7 +44,7 @@ export default function CourseDetailTitle() {
 				</div>
 				<div className="flex gap-1">
 					<EyeOutlined></EyeOutlined>
-					<div>{`观看次数${course?.meta?.views || 0}`}</div>
+					<div>{`播放次数${course?.meta?.views || 0}`}</div>
 				</div>
 				<div className="flex gap-1">
 					<BookOutlined />

apps/web/src/components/models/course/detail/course-objectives.tsx

@@ -1,29 +0,0 @@
-import { CheckOutlined } from '@ant-design/icons';
-import React from 'react';
-interface CourseObjectivesProps {
-    objectives: string[];
-    title?: string;
-}
-const CourseObjectives: React.FC<CourseObjectivesProps> = ({
-    objectives,
-    title = "您将会学到"
-}) => {
-    return (
-        <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-            <h2 className="text-xl font-bold mb-4">{title}</h2>
-            <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
-                {objectives.map((objective, index) => (
-                    <div
-                        key={index}
-                        className="flex items-start space-x-3"
-                    >
-                        <CheckOutlined></CheckOutlined>
-                        <span className="text-gray-700">{objective}</span>
-                    </div>
-                ))}
-            </div>
-        </div>
-    );
-};
-
-export default CourseObjectives;

apps/web/src/routes/index.tsx

@@ -86,6 +86,14 @@ export const routes: CustomRouteObject[] = [
 							</WithAuth>
 						),
 					},
+					{
+						path: "my-duty-path",
+						element: (
+							<WithAuth>
+								<MyPathPage></MyPathPage>
+							</WithAuth>
+						),
+					},
 					{
 						path: "my-duty",
 						element: (