From f22e55a85e755fc5ada7e011d40b31592569ce12 Mon Sep 17 00:00:00 2001 From: ditiqi Date: Wed, 26 Feb 2025 23:55:44 +0800 Subject: [PATCH 01/45] add --- .../main/home/components/CategorySection.tsx | 18 +++++++++--------- .../src/app/main/layout/UserMenu/UserMenu.tsx | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/web/src/app/main/home/components/CategorySection.tsx b/apps/web/src/app/main/home/components/CategorySection.tsx index d589d35..4c8141e 100755 --- a/apps/web/src/app/main/home/components/CategorySection.tsx +++ b/apps/web/src/app/main/home/components/CategorySection.tsx @@ -19,11 +19,11 @@ const CategorySection = () => { taxonomy: { slug: TaxonomySlug.CATEGORY, }, - parentId : null + parentId: null, }, take: 8, }); - const navigate = useNavigate() + const navigate = useNavigate(); const handleMouseEnter = useCallback((index: number) => { setHoveredIndex(index); @@ -33,13 +33,13 @@ const CategorySection = () => { setHoveredIndex(null); }, []); - const handleMouseClick = useCallback((categoryId:string) => { + const handleMouseClick = useCallback((categoryId: string) => { setSelectedTerms({ - [TaxonomySlug.CATEGORY] : [categoryId] - }) - navigate('/courses') - window.scrollTo({top: 0,behavior: "smooth",}) - },[]); + [TaxonomySlug.CATEGORY]: [categoryId], + }); + navigate("/courses"); + window.scrollTo({ top: 0, behavior: "smooth" }); + }, []); return (
@@ -57,7 +57,7 @@ const CategorySection = () => { {isLoading ? ( ) : ( - courseCategoriesData.map((category, index) => { + courseCategoriesData?.map((category, index) => { const categoryColor = stringToColor(category.name); const isHovered = hoveredIndex === index; diff --git a/apps/web/src/app/main/layout/UserMenu/UserMenu.tsx b/apps/web/src/app/main/layout/UserMenu/UserMenu.tsx index e3ef21f..c25fc53 100755 --- a/apps/web/src/app/main/layout/UserMenu/UserMenu.tsx +++ b/apps/web/src/app/main/layout/UserMenu/UserMenu.tsx @@ -90,14 +90,14 @@ export function UserMenu() { icon: , label: "我创建的课程", action: () => { - navigate("/my/duty"); + navigate("/my-duty"); }, }, { icon: , label: "我学习的课程", action: () => { - navigate("/my/learning"); + navigate("/my-learning"); }, }, canManageAnyStaff && { From ae44ed6872e3a1469ac43a85ae7a06c345a6880e Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 08:25:34 +0800 Subject: [PATCH 02/45] add --- .../courses/components/CoursesContainer.tsx | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/apps/web/src/app/main/courses/components/CoursesContainer.tsx b/apps/web/src/app/main/courses/components/CoursesContainer.tsx index 9e2d871..a6cc07f 100644 --- a/apps/web/src/app/main/courses/components/CoursesContainer.tsx +++ b/apps/web/src/app/main/courses/components/CoursesContainer.tsx @@ -4,16 +4,13 @@ import { PostType, Prisma } from "@nice/common"; import { useMemo } from "react"; export function CoursesContainer() { - const { searchValue, selectedTerms } = useMainContext(); + const { selectedTerms, searchCondition } = useMainContext(); const termFilters = useMemo(() => { return Object.entries(selectedTerms) .filter(([, terms]) => terms.length > 0) .map(([, terms]) => terms); }, [selectedTerms]); - const searchCondition: Prisma.StringNullableFilter = { - contains: searchValue, - mode: "insensitive" as Prisma.QueryMode, // 使用类型断言 - }; + return ( <> From 47ccacfee2c50237d1ab8700f285b193b16d5a4c Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 08:25:39 +0800 Subject: [PATCH 03/45] add --- apps/web/src/app/main/layout/MainHeader.tsx | 5 +-- apps/web/src/app/main/layout/MainProvider.tsx | 34 ++++++++++++++++++- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/apps/web/src/app/main/layout/MainHeader.tsx b/apps/web/src/app/main/layout/MainHeader.tsx index f86fd6b..5087709 100755 --- a/apps/web/src/app/main/layout/MainHeader.tsx +++ b/apps/web/src/app/main/layout/MainHeader.tsx @@ -15,7 +15,7 @@ export function MainHeader() { const navigate = useNavigate(); const { searchValue, setSearchValue } = useMainContext(); const { update } = useStaff(); - + return (
@@ -42,7 +42,8 @@ export function MainHeader() { if ( !window.location.pathname.startsWith( "/courses/" - ) + ) && + !window.location.pathname.startsWith("my") ) { navigate(`/courses/`); window.scrollTo({ diff --git a/apps/web/src/app/main/layout/MainProvider.tsx b/apps/web/src/app/main/layout/MainProvider.tsx index 0952268..979d110 100644 --- a/apps/web/src/app/main/layout/MainProvider.tsx +++ b/apps/web/src/app/main/layout/MainProvider.tsx @@ -1,4 +1,11 @@ -import React, { createContext, ReactNode, useContext, useState } from "react"; +import { Prisma } from "packages/common/dist"; +import React, { + createContext, + ReactNode, + useContext, + useMemo, + useState, +} from "react"; interface SelectedTerms { [key: string]: string[]; // 每个 slug 对应一个 string 数组 } @@ -8,6 +15,7 @@ interface MainContextType { selectedTerms?: SelectedTerms; setSearchValue?: React.Dispatch>; setSelectedTerms?: React.Dispatch>; + searchCondition?: Prisma.PostWhereInput; } const MainContext = createContext(null); @@ -18,6 +26,29 @@ interface MainProviderProps { export function MainProvider({ children }: MainProviderProps) { const [searchValue, setSearchValue] = useState(""); const [selectedTerms, setSelectedTerms] = useState({}); // 初始化状态 + + const searchCondition: Prisma.PostWhereInput = useMemo(() => { + const containTextCondition: Prisma.StringNullableFilter = { + contains: searchValue, + mode: "insensitive" as Prisma.QueryMode, // 使用类型断言 + }; + return searchValue + ? { + OR: [ + { title: containTextCondition }, + { subTitle: containTextCondition }, + { content: containTextCondition }, + { + terms: { + some: { + name: containTextCondition, + }, + }, + }, + ], + } + : {}; + }, [searchValue]); return ( {children} From 412aa3436a0e1c2e3f907bba2dd6a32c82468196 Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 08:25:41 +0800 Subject: [PATCH 04/45] add --- apps/web/src/app/main/my-duty/page.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/web/src/app/main/my-duty/page.tsx b/apps/web/src/app/main/my-duty/page.tsx index fd33761..4f6c7a0 100644 --- a/apps/web/src/app/main/my-duty/page.tsx +++ b/apps/web/src/app/main/my-duty/page.tsx @@ -1,8 +1,10 @@ import CourseList from "@web/src/components/models/course/list/CourseList"; import { useAuth } from "@web/src/providers/auth-provider"; +import { useMainContext } from "../layout/MainProvider"; export default function MyDutyPage() { const { user } = useAuth(); + const { searchCondition } = useMainContext(); return ( <>
@@ -12,6 +14,7 @@ export default function MyDutyPage() { pageSize: 12, where: { authorId: user.id, + ...searchCondition, }, }} cols={4}> From 7d5e21c200f6b25682917e6ebde9d3668382ab7e Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 08:25:43 +0800 Subject: [PATCH 05/45] add --- apps/web/src/app/main/my-learning/page.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/web/src/app/main/my-learning/page.tsx b/apps/web/src/app/main/my-learning/page.tsx index 8807119..07924a0 100644 --- a/apps/web/src/app/main/my-learning/page.tsx +++ b/apps/web/src/app/main/my-learning/page.tsx @@ -1,8 +1,10 @@ import CourseList from "@web/src/components/models/course/list/CourseList"; import { useAuth } from "@web/src/providers/auth-provider"; +import { useMainContext } from "../layout/MainProvider"; export default function MyLearningPage() { const { user } = useAuth(); + const { searchCondition } = useMainContext(); return ( <>
@@ -15,6 +17,7 @@ export default function MyLearningPage() { id: user?.id, }, }, + ...searchCondition, }, }} cols={4}> From 1f009310fee0dfceaa30be0a7f7066a318fe6b38 Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 08:25:45 +0800 Subject: [PATCH 06/45] add --- .../src/components/models/course/detail/CourseDetailLayout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx b/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx index 6154bbe..cac3bf8 100755 --- a/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx +++ b/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx @@ -19,7 +19,7 @@ export default function CourseDetailLayout() { const [isSyllabusOpen, setIsSyllabusOpen] = useState(true); return (
- + {/* */} {/* 添加 Header 组件 */} {/* 主内容区域 */} From 508e850f38a67d605671fe381ad767a7bc4c8b7b Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 08:25:48 +0800 Subject: [PATCH 07/45] add --- apps/web/src/routes/index.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx index 1ba39aa..042e5c2 100755 --- a/apps/web/src/routes/index.tsx +++ b/apps/web/src/routes/index.tsx @@ -81,6 +81,10 @@ export const routes: CustomRouteObject[] = [ ), }, + { + path: "course/:id?/detail/:lectureId?", // 使用 ? 表示 id 参数是可选的 + element: , + }, ], }, @@ -114,10 +118,6 @@ export const routes: CustomRouteObject[] = [ }, ], }, - { - path: ":id?/detail/:lectureId?", // 使用 ? 表示 id 参数是可选的 - element: , - }, ], }, adminRoute, From deb0bf25d2cf095247c80c0d7af446a5cc7346af Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 09:05:27 +0800 Subject: [PATCH 08/45] add --- apps/web/src/app/main/layout/MainHeader.tsx | 117 ++++++-------------- 1 file changed, 34 insertions(+), 83 deletions(-) diff --git a/apps/web/src/app/main/layout/MainHeader.tsx b/apps/web/src/app/main/layout/MainHeader.tsx index 03d0f00..d6d288f 100755 --- a/apps/web/src/app/main/layout/MainHeader.tsx +++ b/apps/web/src/app/main/layout/MainHeader.tsx @@ -29,33 +29,31 @@ export function MainHeader() {
-
-
- - } - placeholder="搜索课程" - className="w-72 rounded-full" - value={searchValue} - onChange={(e) => setSearchValue(e.target.value)} - onPressEnter={(e) => { - if ( - !window.location.pathname.startsWith( - "/courses/" - ) && - !window.location.pathname.startsWith("my") - ) { - navigate(`/courses/`); - window.scrollTo({ - top: 0, - behavior: "smooth", - }); - } - }} - /> -
+
+
+ + } + placeholder="搜索课程" + className="w-96 rounded-full" + value={searchValue} + onChange={(e) => setSearchValue(e.target.value)} + onPressEnter={(e) => { + if ( + !window.location.pathname.startsWith("/courses/") && + !window.location.pathname.startsWith("my") + ) { + navigate(`/courses/`); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); + } + }} + /> +
{isAuthenticated && ( <> + )} {isAuthenticated ? ( ) : ( @@ -82,62 +89,6 @@ export function MainHeader() { )}
- -
- - } - placeholder="搜索课程" - className="w-96 rounded-full" - value={searchValue} - onChange={(e) => setSearchValue(e.target.value)} - onPressEnter={(e) => { - if (!window.location.pathname.startsWith("/courses/")) { - navigate(`/courses/`); - window.scrollTo({ - top: 0, - behavior: "smooth", - }); - } - }} - /> -
- {isAuthenticated && ( - <> - - - )} - {isAuthenticated && ( - - )} - {isAuthenticated ? ( - - ) : ( - - )}
); From 3a9a7076f38802ccad2cfc162c89ff94cb32853a Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 09:05:29 +0800 Subject: [PATCH 09/45] add --- .../course/detail/CourseDetailTitle.tsx | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/apps/web/src/components/models/course/detail/CourseDetailTitle.tsx b/apps/web/src/components/models/course/detail/CourseDetailTitle.tsx index 3ebc083..0b8da3b 100644 --- a/apps/web/src/components/models/course/detail/CourseDetailTitle.tsx +++ b/apps/web/src/components/models/course/detail/CourseDetailTitle.tsx @@ -1,8 +1,15 @@ import { useContext } from "react"; import { CourseDetailContext } from "./CourseDetailContext"; import { useNavigate } from "react-router-dom"; -import { BookOutlined, CalendarOutlined, EditTwoTone, EyeOutlined, ReloadOutlined } from "@ant-design/icons"; +import { + BookOutlined, + CalendarOutlined, + EditTwoTone, + EyeOutlined, + ReloadOutlined, +} from "@ant-design/icons"; import dayjs from "dayjs"; +import CourseOperationBtns from "./JoinLearingButton"; export default function CourseDetailTitle() { const { @@ -19,14 +26,14 @@ export default function CourseDetailTitle() {
{course?.title}
-
+
{"创建于:"} {dayjs(course?.createdAt).format("YYYY年M月D日")}
- + {"更新于:"} {dayjs(course?.updatedAt).format("YYYY年M月D日")}
@@ -38,19 +45,7 @@ export default function CourseDetailTitle() {
{`学习人数${course?.studentIds?.length || 0}`}
- {canEdit && ( -
{ - const url = course?.id - ? `/course/${course?.id}/editor` - : "/course/editor"; - navigate(url); - }}> - - {"点击编辑课程"} -
- )} +
); From f5dce3210c720c66474d6b800cb56d7006d1a9dc Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 09:05:31 +0800 Subject: [PATCH 10/45] add --- .../course/detail/JoinLearingButton.tsx | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 apps/web/src/components/models/course/detail/JoinLearingButton.tsx diff --git a/apps/web/src/components/models/course/detail/JoinLearingButton.tsx b/apps/web/src/components/models/course/detail/JoinLearingButton.tsx new file mode 100644 index 0000000..68c4243 --- /dev/null +++ b/apps/web/src/components/models/course/detail/JoinLearingButton.tsx @@ -0,0 +1,94 @@ +import { useAuth } from "@web/src/providers/auth-provider"; +import { useContext, useState } from "react"; +import { useNavigate, useParams } from "react-router-dom"; +import { CourseDetailContext } from "./CourseDetailContext"; +import { useStaff } from "@nice/client"; +import { + CheckCircleFilled, + CheckCircleOutlined, + CloseCircleFilled, + CloseCircleOutlined, + EditFilled, + EditTwoTone, + LoginOutlined, +} from "@ant-design/icons"; + +export default function CourseOperationBtns() { + const { id } = useParams(); + const { isAuthenticated, user, hasSomePermissions, hasEveryPermissions } = + useAuth(); + const navigate = useNavigate(); + const { course, canEdit, userIsLearning } = useContext(CourseDetailContext); + const { update } = useStaff(); + const [isHovered, setIsHovered] = useState(false); + const toggleLearning = async () => { + if (!userIsLearning) { + await update.mutateAsync({ + where: { id: user?.id }, + data: { + learningPosts: { + connect: { id: course.id }, + }, + }, + }); + } else { + await update.mutateAsync({ + where: { id: user?.id }, + data: { + learningPosts: { + disconnect: { + id: course.id, + }, + }, + }, + }); + } + }; + return ( + <> + {isAuthenticated && ( +
setIsHovered(true)} + onMouseLeave={() => setIsHovered(false)} + className={`flex px-1 py-0.5 gap-1 hover:cursor-pointer transition-all ${ + userIsLearning + ? isHovered + ? "text-red-500 border-red-500 rounded-md " + : "text-green-500 " + : "text-primary " + }`}> + {userIsLearning ? ( + isHovered ? ( + + ) : ( + + ) + ) : ( + + )} + + {userIsLearning + ? isHovered + ? "退出学习" + : "正在学习" + : "加入学习"} + +
+ )} + {canEdit && ( +
{ + const url = course?.id + ? `/course/${course?.id}/editor` + : "/course/editor"; + navigate(url); + }}> + + {"编辑课程"} +
+ )} + + ); +} From aff206cbe6225a0c9b0933100783ee0eedf2b7b8 Mon Sep 17 00:00:00 2001 From: longdayi <13477510+longdayilongdayi@user.noreply.gitee.com> Date: Thu, 27 Feb 2025 09:27:53 +0800 Subject: [PATCH 11/45] 02270927 --- .../queue/models/post/post.queue.service.ts | 0 apps/server/src/queue/models/post/utils.ts | 0 .../components/couresPreviewTabmsg.tsx | 0 .../preview/components/courseCatalog.tsx | 0 .../components/coursePreviewAllmsg.tsx | 0 apps/web/src/app/main/course/preview/page.tsx | 0 apps/web/src/app/main/course/preview/type.ts | 0 .../courses/components/CoursesContainer.tsx | 0 .../main/courses/layout/AllCoursesLayout.tsx | 0 .../home/components/CategorySectionCard.tsx | 0 .../home/components/CoursesSectionTag.tsx | 0 .../app/main/home/components/LookForMore.tsx | 0 apps/web/src/app/main/layout/MainProvider.tsx | 0 .../main/layout/UserMenu/UserEditModal.tsx | 0 .../src/app/main/layout/UserMenu/UserForm.tsx | 0 .../web/src/app/main/layout/UserMenu/types.ts | 0 apps/web/src/app/main/my-duty/page.tsx | 0 apps/web/src/app/main/my-learning/page.tsx | 0 .../path/components/PathListContainer.tsx | 0 apps/web/src/app/main/path/editor/page.tsx | 0 .../app/main/path/layout/PathListLayout.tsx | 0 .../common/container/CollapsibleContent.tsx | 0 .../src/components/common/editor/NodeMenu.tsx | 0 apps/web/src/components/common/editor/i18n.ts | 0 .../web/src/components/common/editor/types.ts | 0 .../src/components/common/input/InputList.tsx | 0 .../common/uploader/MultiAvatarUploader.tsx | 0 .../common/uploader/ResourceShower.tsx | 0 .../src/components/common/uploader/utils.tsx | 0 .../course/detail/CourseDetailTitle.tsx | 0 .../detail/CoursePreview/CoursePreview.tsx | 0 .../CoursePreview/couresPreviewTabmsg.tsx | 0 .../detail/CoursePreview/courseCatalog.tsx | 0 .../models/term/term-parent-selector.tsx | 0 packages/common/src/models/resource.ts | 0 scripts/git_stats.py | 503 ++++++++++++++++++ web-dist/index.html | 0 37 files changed, 503 insertions(+) mode change 100644 => 100755 apps/server/src/queue/models/post/post.queue.service.ts mode change 100644 => 100755 apps/server/src/queue/models/post/utils.ts mode change 100644 => 100755 apps/web/src/app/main/course/preview/components/couresPreviewTabmsg.tsx mode change 100644 => 100755 apps/web/src/app/main/course/preview/components/courseCatalog.tsx mode change 100644 => 100755 apps/web/src/app/main/course/preview/components/coursePreviewAllmsg.tsx mode change 100644 => 100755 apps/web/src/app/main/course/preview/page.tsx mode change 100644 => 100755 apps/web/src/app/main/course/preview/type.ts mode change 100644 => 100755 apps/web/src/app/main/courses/components/CoursesContainer.tsx mode change 100644 => 100755 apps/web/src/app/main/courses/layout/AllCoursesLayout.tsx mode change 100644 => 100755 apps/web/src/app/main/home/components/CategorySectionCard.tsx mode change 100644 => 100755 apps/web/src/app/main/home/components/CoursesSectionTag.tsx mode change 100644 => 100755 apps/web/src/app/main/home/components/LookForMore.tsx mode change 100644 => 100755 apps/web/src/app/main/layout/MainProvider.tsx mode change 100644 => 100755 apps/web/src/app/main/layout/UserMenu/UserEditModal.tsx mode change 100644 => 100755 apps/web/src/app/main/layout/UserMenu/UserForm.tsx mode change 100644 => 100755 apps/web/src/app/main/layout/UserMenu/types.ts mode change 100644 => 100755 apps/web/src/app/main/my-duty/page.tsx mode change 100644 => 100755 apps/web/src/app/main/my-learning/page.tsx mode change 100644 => 100755 apps/web/src/app/main/path/components/PathListContainer.tsx mode change 100644 => 100755 apps/web/src/app/main/path/editor/page.tsx mode change 100644 => 100755 apps/web/src/app/main/path/layout/PathListLayout.tsx mode change 100644 => 100755 apps/web/src/components/common/container/CollapsibleContent.tsx mode change 100644 => 100755 apps/web/src/components/common/editor/NodeMenu.tsx mode change 100644 => 100755 apps/web/src/components/common/editor/i18n.ts mode change 100644 => 100755 apps/web/src/components/common/editor/types.ts mode change 100644 => 100755 apps/web/src/components/common/input/InputList.tsx mode change 100644 => 100755 apps/web/src/components/common/uploader/MultiAvatarUploader.tsx mode change 100644 => 100755 apps/web/src/components/common/uploader/ResourceShower.tsx mode change 100644 => 100755 apps/web/src/components/common/uploader/utils.tsx mode change 100644 => 100755 apps/web/src/components/models/course/detail/CourseDetailTitle.tsx mode change 100644 => 100755 apps/web/src/components/models/course/detail/CoursePreview/CoursePreview.tsx mode change 100644 => 100755 apps/web/src/components/models/course/detail/CoursePreview/couresPreviewTabmsg.tsx mode change 100644 => 100755 apps/web/src/components/models/course/detail/CoursePreview/courseCatalog.tsx mode change 100644 => 100755 apps/web/src/components/models/term/term-parent-selector.tsx mode change 100644 => 100755 packages/common/src/models/resource.ts create mode 100755 scripts/git_stats.py mode change 100644 => 100755 web-dist/index.html diff --git a/apps/server/src/queue/models/post/post.queue.service.ts b/apps/server/src/queue/models/post/post.queue.service.ts old mode 100644 new mode 100755 diff --git a/apps/server/src/queue/models/post/utils.ts b/apps/server/src/queue/models/post/utils.ts old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/course/preview/components/couresPreviewTabmsg.tsx b/apps/web/src/app/main/course/preview/components/couresPreviewTabmsg.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/course/preview/components/courseCatalog.tsx b/apps/web/src/app/main/course/preview/components/courseCatalog.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/course/preview/components/coursePreviewAllmsg.tsx b/apps/web/src/app/main/course/preview/components/coursePreviewAllmsg.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/course/preview/page.tsx b/apps/web/src/app/main/course/preview/page.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/course/preview/type.ts b/apps/web/src/app/main/course/preview/type.ts old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/courses/components/CoursesContainer.tsx b/apps/web/src/app/main/courses/components/CoursesContainer.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/courses/layout/AllCoursesLayout.tsx b/apps/web/src/app/main/courses/layout/AllCoursesLayout.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/home/components/CategorySectionCard.tsx b/apps/web/src/app/main/home/components/CategorySectionCard.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/home/components/CoursesSectionTag.tsx b/apps/web/src/app/main/home/components/CoursesSectionTag.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/home/components/LookForMore.tsx b/apps/web/src/app/main/home/components/LookForMore.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/layout/MainProvider.tsx b/apps/web/src/app/main/layout/MainProvider.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/layout/UserMenu/UserEditModal.tsx b/apps/web/src/app/main/layout/UserMenu/UserEditModal.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/layout/UserMenu/UserForm.tsx b/apps/web/src/app/main/layout/UserMenu/UserForm.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/layout/UserMenu/types.ts b/apps/web/src/app/main/layout/UserMenu/types.ts old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/my-duty/page.tsx b/apps/web/src/app/main/my-duty/page.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/my-learning/page.tsx b/apps/web/src/app/main/my-learning/page.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/path/components/PathListContainer.tsx b/apps/web/src/app/main/path/components/PathListContainer.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/path/editor/page.tsx b/apps/web/src/app/main/path/editor/page.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/app/main/path/layout/PathListLayout.tsx b/apps/web/src/app/main/path/layout/PathListLayout.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/common/container/CollapsibleContent.tsx b/apps/web/src/components/common/container/CollapsibleContent.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/common/editor/NodeMenu.tsx b/apps/web/src/components/common/editor/NodeMenu.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/common/editor/i18n.ts b/apps/web/src/components/common/editor/i18n.ts old mode 100644 new mode 100755 diff --git a/apps/web/src/components/common/editor/types.ts b/apps/web/src/components/common/editor/types.ts old mode 100644 new mode 100755 diff --git a/apps/web/src/components/common/input/InputList.tsx b/apps/web/src/components/common/input/InputList.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/common/uploader/MultiAvatarUploader.tsx b/apps/web/src/components/common/uploader/MultiAvatarUploader.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/common/uploader/ResourceShower.tsx b/apps/web/src/components/common/uploader/ResourceShower.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/common/uploader/utils.tsx b/apps/web/src/components/common/uploader/utils.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/models/course/detail/CourseDetailTitle.tsx b/apps/web/src/components/models/course/detail/CourseDetailTitle.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/models/course/detail/CoursePreview/CoursePreview.tsx b/apps/web/src/components/models/course/detail/CoursePreview/CoursePreview.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/models/course/detail/CoursePreview/couresPreviewTabmsg.tsx b/apps/web/src/components/models/course/detail/CoursePreview/couresPreviewTabmsg.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/models/course/detail/CoursePreview/courseCatalog.tsx b/apps/web/src/components/models/course/detail/CoursePreview/courseCatalog.tsx old mode 100644 new mode 100755 diff --git a/apps/web/src/components/models/term/term-parent-selector.tsx b/apps/web/src/components/models/term/term-parent-selector.tsx old mode 100644 new mode 100755 diff --git a/packages/common/src/models/resource.ts b/packages/common/src/models/resource.ts old mode 100644 new mode 100755 diff --git a/scripts/git_stats.py b/scripts/git_stats.py new file mode 100755 index 0000000..374834c --- /dev/null +++ b/scripts/git_stats.py @@ -0,0 +1,503 @@ +import statistics +from git import Repo +from collections import defaultdict, Counter +from datetime import datetime, timedelta +import os + + +def get_contributor_stats(repo_path, start_date=None, end_date=None, branch='HEAD'): + """ + 获取仓库贡献者的详细统计信息 + + Args: + repo_path: Git仓库路径 + start_date: 开始日期（可选） + end_date: 结束日期（可选） + branch: 要分析的分支（默认为HEAD） + + Returns: + 包含每个贡献者详细统计信息的字典 + """ + # 初始化仓库对象 + repo = Repo(repo_path) + + # 存储统计结果 + stats = defaultdict(lambda: { + 'additions': 0, # 添加的行数 + 'deletions': 0, # 删除的行数 + 'commits': 0, # 提交次数 + 'files_modified': set(), # 修改过的文件集合 + 'file_types': defaultdict(int),# 各类型文件的修改次数 + 'commit_dates': set(), # 提交日期集合 + 'commit_hours': defaultdict(int), # 提交小时分布 + 'commit_weekdays': defaultdict(int), # 提交工作日分布 + 'largest_commit': 0, # 最大单次提交修改量 + 'first_commit': None, # 首次提交时间 + 'last_commit': None, # 最近提交时间 + 'commit_sizes': [], # 每次提交的大小，用于计算平均值和中位数 + 'commit_messages': [], # 提交消息列表 + 'commit_message_lengths': [], # 提交消息长度列表 + 'directories_modified': set(), # 修改过的目录集合 + 'co_authors': set(), # 合作者集合 + 'impact_score': 0, # 影响力得分 + 'complexity_score': 0, # 复杂度得分 + 'commit_by_month': defaultdict(int), # 按月份统计的提交次数 + 'commit_by_quarter': defaultdict(int), # 按季度统计的提交次数 + 'commit_by_year': defaultdict(int), # 按年份统计的提交次数 + 'commit_by_week': defaultdict(int), # 按周统计的提交次数 + 'file_operations': { # 文件操作统计 + 'created': set(), # 创建的文件 + 'deleted': set(), # 删除的文件 + 'modified': set(), # 修改的文件 + }, + 'review_comments': 0, # 代码审查评论数（如果可用） + 'merge_commits': 0, # 合并提交数 + 'commit_streak': 0, # 最长连续提交天数 + 'current_streak': 0, # 当前连续提交天数 + 'contribution_days': [], # 所有贡献的日期列表（用于热图） + 'code_churn': 0, # 代码周转率（添加后又删除的代码） + 'file_ownership': {}, # 文件所有权百分比 + 'key_files_modified': set(), # 修改过的关键文件 + 'refactoring_commits': 0, # 重构提交数（基于提交消息分析） + 'bug_fix_commits': 0, # 修复bug的提交数 + 'feature_commits': 0, # 新功能提交数 + 'documentation_commits': 0, # 文档相关提交数 + 'commit_size_distribution': defaultdict(int), # 提交大小分布 + 'collaboration_score': 0, # 协作得分 + 'consistency_score': 0, # 一致性得分 + 'expertise_areas': defaultdict(float), # 专业领域（目录/语言） + }) + + # 存储所有文件的修改者，用于计算协作指标 + file_authors = defaultdict(set) + + # 存储项目文件的重要性权重 (基于修改频率) + file_importance = Counter() + + # 存储用于检测关键词的正则表达式 + import re + refactor_pattern = re.compile(r'refactor|重构', re.IGNORECASE) + bugfix_pattern = re.compile(r'fix|修复|bug|问题|issue|错误', re.IGNORECASE) + feature_pattern = re.compile(r'feature|功能|新增|add|实现', re.IGNORECASE) + docs_pattern = re.compile(r'doc|文档|注释|comment', re.IGNORECASE) + + # 记录每位贡献者的提交日期，用于计算连续贡献天数 + author_commit_days = defaultdict(set) + + # 定义关键文件路径模式 (可以根据项目自定义) + key_file_patterns = [ + re.compile(r'package\.json$'), + re.compile(r'docker-compose\.yml$'), + re.compile(r'Dockerfile$'), + re.compile(r'tsconfig\..*\.json$'), + re.compile(r'/src/index\.[jt]s$'), + re.compile(r'README\.md$'), + re.compile(r'\.env'), + re.compile(r'/main\.[jt]s$'), + re.compile(r'/app\.[jt]s$'), + ] + + # 遍历所有提交 + for commit in repo.iter_commits(branch): + # 过滤日期 + commit_date = datetime.fromtimestamp(commit.committed_date) + if start_date and commit_date < start_date: + continue + if end_date and commit_date > end_date: + continue + + author = commit.author.name + stats[author]['commits'] += 1 + + # 记录提交日期和时间 + commit_day = commit_date.date() + stats[author]['commit_dates'].add(commit_day) + stats[author]['contribution_days'].append(commit_day) # 用于热图 + stats[author]['commit_hours'][commit_date.hour] += 1 + stats[author]['commit_weekdays'][commit_date.weekday()] += 1 + + # 添加到作者的提交日集合 + author_commit_days[author].add(commit_day) + + # 按时间段统计 + year = commit_date.year + month = commit_date.month + quarter = (month - 1) // 3 + 1 + week_num = commit_date.isocalendar()[1] + stats[author]['commit_by_year'][year] += 1 + stats[author]['commit_by_month'][f"{year}-{month:02d}"] += 1 + stats[author]['commit_by_quarter'][f"{year}-Q{quarter}"] += 1 + stats[author]['commit_by_week'][f"{year}-W{week_num:02d}"] += 1 + + # 分析提交消息，对提交进行分类 + commit_message = commit.message.strip() + if refactor_pattern.search(commit_message): + stats[author]['refactoring_commits'] += 1 + if bugfix_pattern.search(commit_message): + stats[author]['bug_fix_commits'] += 1 + if feature_pattern.search(commit_message): + stats[author]['feature_commits'] += 1 + if docs_pattern.search(commit_message): + stats[author]['documentation_commits'] += 1 + + # 记录首次和最近提交 + if stats[author]['first_commit'] is None or commit_date < stats[author]['first_commit']: + stats[author]['first_commit'] = commit_date + if stats[author]['last_commit'] is None or commit_date > stats[author]['last_commit']: + stats[author]['last_commit'] = commit_date + + # 记录提交消息 + commit_message = commit.message.strip() + stats[author]['commit_messages'].append(commit_message) + stats[author]['commit_message_lengths'].append(len(commit_message)) + + # 检测是否为合并提交 + if len(commit.parents) > 1: + stats[author]['merge_commits'] += 1 + + # 统计添加和删除的行数 + total_changes = 0 + modified_files = set() + created_files = set() + deleted_files = set() + directories = set() + + # 尝试获取提交前后的差异，以确定文件操作类型 + try: + if commit.parents: + parent = commit.parents[0] + diffs = parent.diff(commit) + for diff_item in diffs: + if diff_item.new_file: + if diff_item.b_path: + created_files.add(diff_item.b_path) + elif diff_item.deleted_file: + if diff_item.a_path: + deleted_files.add(diff_item.a_path) + else: + if diff_item.a_path: + modified_files.add(diff_item.a_path) + else: + # 对于首次提交，所有文件都是新创建的 + for file_path in commit.stats.files: + created_files.add(file_path) + except Exception as e: + # 如果获取差异失败，退回到简单的文件修改统计 + modified_files = set(commit.stats.files.keys()) + + for file_path, item in commit.stats.files.items(): + # 统计文件类型 + _, ext = os.path.splitext(file_path) + if ext: # 确保扩展名不为空 + stats[author]['file_types'][ext] += 1 + else: + stats[author]['file_types']['no_extension'] += 1 + + # 记录目录 + directory = os.path.dirname(file_path) + if directory: + directories.add(directory) + + # 记录修改的文件 + modified_files.add(file_path) + + # 记录文件的修改者，用于计算协作指标 + file_authors[file_path].add(author) + + # 统计添加和删除的行数 + stats[author]['additions'] += item['insertions'] + stats[author]['deletions'] += item['deletions'] + total_changes += item['insertions'] + item['deletions'] + + # 更新修改过的文件和目录集合 + stats[author]['files_modified'].update(modified_files) + stats[author]['directories_modified'].update(directories) + stats[author]['file_operations']['created'].update(created_files) + stats[author]['file_operations']['deleted'].update(deleted_files) + stats[author]['file_operations']['modified'].update(modified_files - created_files - deleted_files) + + # 记录本次提交的修改量 + stats[author]['commit_sizes'].append(total_changes) + + # 记录提交大小分布 + commit_size_category = "小型(1-10行)" if total_changes <= 10 else \ + "中型(11-100行)" if total_changes <= 100 else \ + "大型(101-500行)" if total_changes <= 500 else \ + "超大型(500+行)" + stats[author]['commit_size_distribution'][commit_size_category] += 1 + + # 更新最大单次提交修改量 + if total_changes > stats[author]['largest_commit']: + stats[author]['largest_commit'] = total_changes + + # 检查修改的文件是否为关键文件 + for file_path in modified_files: + for pattern in key_file_patterns: + if pattern.search(file_path): + stats[author]['key_files_modified'].add(file_path) + break + + # 更新文件重要性权重 + for file_path in modified_files: + file_importance[file_path] += 1 + + # 计算影响力得分 (基于修改的文件数和总修改行数) + impact = total_changes * len(modified_files) / 100 if modified_files else 0 + stats[author]['impact_score'] += impact + + # 计算文件协作度和文件所有权 + for file_path, authors in file_authors.items(): + # 如果只有一个作者修改了文件，则该作者100%拥有此文件 + if len(authors) == 1: + author = next(iter(authors)) + if 'file_ownership' not in stats[author]: + stats[author]['file_ownership'] = {} + stats[author]['file_ownership'][file_path] = 100.0 + else: + # 如果多个作者修改了文件，则按照每个作者的修改比例计算所有权 + for author in authors: + # 简化处理：平均分配所有权 + ownership_percent = 100.0 / len(authors) + if 'file_ownership' not in stats[author]: + stats[author]['file_ownership'] = {} + stats[author]['file_ownership'][file_path] = ownership_percent + + # 计算每个作者的连续提交天数 + for author, commit_days in author_commit_days.items(): + if not commit_days: + continue + + # 按日期排序 + sorted_days = sorted(commit_days) + + # 计算最长提交连续天数 + current_streak = 1 + max_streak = 1 + + for i in range(1, len(sorted_days)): + # 如果当前日期与前一天相差正好一天，则增加连续计数 + if (sorted_days[i] - sorted_days[i-1]).days == 1: + current_streak += 1 + else: + # 重置当前连续计数 + current_streak = 1 + + max_streak = max(max_streak, current_streak) + + # 记录最长连续提交天数 + stats[author]['commit_streak'] = max_streak + + # 计算当前连续提交天数 (到最后一个日期) + if sorted_days: + today = datetime.now().date() + days_since_last = (today - sorted_days[-1]).days + + if days_since_last <= 1: # 如果最后提交是今天或昨天 + current_streak = 1 + for i in range(len(sorted_days) - 1, 0, -1): + if (sorted_days[i] - sorted_days[i-1]).days == 1: + current_streak += 1 + else: + break + stats[author]['current_streak'] = current_streak + + # 后处理：计算派生指标并转换集合为计数 + for author, data in stats.items(): + # 将文件集合转换为数量 + data['files_count'] = len(data['files_modified']) + data['active_days'] = len(data['commit_dates']) + data['key_files_count'] = len(data['key_files_modified']) + + # 计算平均每次提交的修改量 + if data['commits'] > 0: + data['avg_commit_size'] = sum(data['commit_sizes']) / data['commits'] + data['median_commit_size'] = statistics.median(data['commit_sizes']) if data['commit_sizes'] else 0 + + # 计算代码复杂度得分 (基于修改量、文件数和一致性) + variability = statistics.stdev(data['commit_sizes']) if len(data['commit_sizes']) > 1 else 0 + data['complexity_score'] = (data['avg_commit_size'] * data['files_count'] * (1 + variability / 1000)) / 100 + + # 计算一致性得分 (提交大小和频率的一致性) + if variability > 0: + data['consistency_score'] = 100 * (1 - min(1, variability / data['avg_commit_size'])) + else: + data['consistency_score'] = 100 + else: + data['avg_commit_size'] = 0 + data['median_commit_size'] = 0 + data['complexity_score'] = 0 + data['consistency_score'] = 0 + + # 计算总修改量 + data['total_changes'] = data['additions'] + data['deletions'] + + # 计算代码周转率 (code churn) - 估算值 + if data['additions'] > 0 and data['deletions'] > 0: + data['code_churn'] = min(data['additions'], data['deletions']) / max(data['additions'], data['deletions']) * 100 + + # 计算活跃时长（天） + if data['first_commit'] and data['last_commit']: + delta = data['last_commit'] - data['first_commit'] + data['active_period_days'] = delta.days + 1 + + # 计算活跃密度 (提交数/活跃天数) + if delta.days > 0: + data['activity_density'] = data['commits'] / delta.days + else: + data['activity_density'] = data['commits'] + else: + data['active_period_days'] = 0 + data['activity_density'] = 0 + + # 计算协作得分 (基于参与修改的共享文件比例) + total_files = len(data['files_modified']) + shared_files = sum(1 for f in data['files_modified'] if len(file_authors[f]) > 1) + if total_files > 0: + data['collaboration_score'] = (shared_files / total_files) * 100 + + # 计算专业领域 (基于文件类型和目录) + if data['file_types']: + primary_type = max(data['file_types'].items(), key=lambda x: x[1])[0] + data['primary_file_type'] = primary_type + data['primary_file_type_percent'] = (data['file_types'][primary_type] / sum(data['file_types'].values())) * 100 + + # 统计目录专业度 + if data['directories_modified']: + dir_counts = Counter() + for directory in data['directories_modified']: + dir_counts[directory] += 1 + + # 检查父目录 + parent = os.path.dirname(directory) + while parent: + dir_counts[parent] += 0.5 # 对父目录给予较低的权重 + parent = os.path.dirname(parent) + + # 找出专业领域（最常修改的目录） + if dir_counts: + primary_dir = max(dir_counts.items(), key=lambda x: x[1])[0] + data['primary_directory'] = primary_dir + data['expertise_areas'][primary_dir] = dir_counts[primary_dir] / sum(dir_counts.values()) + + return stats + +def print_stats(stats): + """打印贡献者统计信息的详细报告""" + # 基本信息表头 + print("\n===== 贡献者基本统计 =====") + print("{:<20} {:<10} {:<10} {:<10} {:<10} {:<15} {:<15}".format( + "作者", "提交数", "添加行数", "删除行数", "总修改行数", "修改文件数", "活跃天数")) + print("-" * 90) + + # 按总修改量排序 + for author, data in sorted(stats.items(), key=lambda x: x[1]['total_changes'], reverse=True): + print("{:<20} {:<10} {:<10} {:<10} {:<10} {:<15} {:<15}".format( + author, + data['commits'], + data['additions'], + data['deletions'], + data['total_changes'], + data['files_count'], + data['active_days'] + )) + + # 为每个贡献者打印详细信息 + for author, data in sorted(stats.items(), key=lambda x: x[1]['total_changes'], reverse=True): + print(f"\n\n===== {author} 的详细贡献统计 =====") + + # 活跃时间信息 + if data['first_commit'] and data['last_commit']: + print(f"首次提交时间: {data['first_commit'].strftime('%Y-%m-%d %H:%M:%S')}") + print(f"最近提交时间: {data['last_commit'].strftime('%Y-%m-%d %H:%M:%S')}") + print(f"活跃时长: {data['active_period_days']} 天") + + # 提交规模信息 + print(f"平均每次提交修改: {data['avg_commit_size']:.2f} 行") + print(f"最大单次提交修改: {data['largest_commit']} 行") + + # 文件类型分布 + if data['file_types']: + print("\n文件类型分布:") + for ext, count in sorted(data['file_types'].items(), key=lambda x: x[1], reverse=True): + print(f" {ext}: {count} 次修改") + + # 提交时间分布 + if data['commit_hours']: + print("\n提交时间分布:") + for hour in range(24): + count = data['commit_hours'].get(hour, 0) + if count > 0: + print(f" {hour:02d}:00-{hour+1:02d}:00: {count} 次提交") + + # 工作日分布 + if data['commit_weekdays']: + weekday_names = ["周一", "周二", "周三", "周四", "周五", "周六", "周日"] + print("\n工作日分布:") + for day in range(7): + count = data['commit_weekdays'].get(day, 0) + if count > 0: + print(f" {weekday_names[day]}: {count} 次提交") + +def get_team_summary(stats): + """生成团队整体统计摘要""" + summary = { + 'total_commits': 0, + 'total_additions': 0, + 'total_deletions': 0, + 'total_files': set(), + 'contributors': len(stats), + 'first_commit': None, + 'last_commit': None, + } + + for author, data in stats.items(): + summary['total_commits'] += data['commits'] + summary['total_additions'] += data['additions'] + summary['total_deletions'] += data['deletions'] + summary['total_files'].update(data['files_modified']) + + # 更新首次和最近提交 + if data['first_commit']: + if summary['first_commit'] is None or data['first_commit'] < summary['first_commit']: + summary['first_commit'] = data['first_commit'] + + if data['last_commit']: + if summary['last_commit'] is None or data['last_commit'] > summary['last_commit']: + summary['last_commit'] = data['last_commit'] + + return summary + +def print_team_summary(summary): + """打印团队整体统计摘要""" + print("\n===== 团队整体统计 =====") + print(f"贡献者数量: {summary['contributors']}") + print(f"总提交次数: {summary['total_commits']}") + print(f"总添加行数: {summary['total_additions']}") + print(f"总删除行数: {summary['total_deletions']}") + print(f"总修改行数: {summary['total_additions'] + summary['total_deletions']}") + print(f"修改的文件数: {len(summary['total_files'])}") + + if summary['first_commit'] and summary['last_commit']: + print(f"项目起始时间: {summary['first_commit'].strftime('%Y-%m-%d')}") + print(f"最近活动时间: {summary['last_commit'].strftime('%Y-%m-%d')}") + delta = summary['last_commit'] - summary['first_commit'] + print(f"项目活跃时长: {delta.days + 1} 天") +if __name__ == "__main__": + # 设置仓库路径（当前目录） + repo_path = '.' + + # 设置日期范围（示例） + # 注意：这里使用的是2025年的日期，可能需要根据实际情况调整 + start_date = datetime(2025, 1, 1) # 修改为更合理的日期范围 + end_date = datetime(2025, 12, 31) + + print(f"分析Git仓库: {os.path.abspath(repo_path)}") + print(f"时间范围: {start_date.strftime('%Y-%m-%d')} 至 {end_date.strftime('%Y-%m-%d')}") + + # 获取统计信息 + stats = get_contributor_stats(repo_path, start_date, end_date) + + # 打印团队摘要 + team_summary = get_team_summary(stats) + print_team_summary(team_summary) + print(stats) \ No newline at end of file diff --git a/web-dist/index.html b/web-dist/index.html old mode 100644 new mode 100755 From f0f15024c02813477199c1c2841ea6834322f15a Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 09:28:16 +0800 Subject: [PATCH 12/45] afff --- .../main/courses/components/CourseCard.tsx | 6 +- .../main/courses/components/FilterSection.tsx | 27 +--- apps/web/src/app/main/layout/MainFooter.tsx | 130 ++++++++++-------- apps/web/src/app/main/layout/MainLayout.tsx | 2 +- .../course/detail/CourseDetailLayout.tsx | 2 +- .../detail/CourseSyllabus/CourseSyllabus.tsx | 4 +- 6 files changed, 80 insertions(+), 91 deletions(-) diff --git a/apps/web/src/app/main/courses/components/CourseCard.tsx b/apps/web/src/app/main/courses/components/CourseCard.tsx index 597caf0..fa4b0d5 100755 --- a/apps/web/src/app/main/courses/components/CourseCard.tsx +++ b/apps/web/src/app/main/courses/components/CourseCard.tsx @@ -87,11 +87,11 @@ export default function CourseCard({ course, edit = false }: CourseCardProps) {
- + {`观看次数 ${course?.meta?.views || 0}`} - + {`学习人数 ${course?.studentIds?.length || 0}`} @@ -102,7 +102,7 @@ export default function CourseCard({ course, edit = false }: CourseCardProps) { size="large" className="w-full shadow-[0_8px_20px_-6px_rgba(59,130,246,0.5)] hover:shadow-[0_12px_24px_-6px_rgba(59,130,246,0.6)] transform hover:translate-y-[-2px] transition-all duration-500 ease-out"> - {edit ? "进行编辑" : "立即学习"} + {edit ? "编辑" : "立即学习"}
diff --git a/apps/web/src/app/main/courses/components/FilterSection.tsx b/apps/web/src/app/main/courses/components/FilterSection.tsx index b437058..110ba8c 100755 --- a/apps/web/src/app/main/courses/components/FilterSection.tsx +++ b/apps/web/src/app/main/courses/components/FilterSection.tsx @@ -19,7 +19,7 @@ export default function FilterSection() { }); }; return ( -
+
{taxonomies?.map((tax, index) => { const items = Object.entries(selectedTerms).find( ([key, items]) => key === tax.slug @@ -31,7 +31,7 @@ export default function FilterSection() { handleTermChange( @@ -39,27 +39,8 @@ export default function FilterSection() { selected as string[] ) } - taxonomyId={tax?.id} - > - {/* ( -
{menu}
- )} - dropdownStyle={{ maxHeight: 400, overflow: "auto" }} - multiple - taxonomyId={tax?.id} - onChange={(selected) => - handleTermChange( - tax?.slug, - selected as string[] - ) - }> - {index < taxonomies.length - 1 && ( - - )} */} + taxonomyId={tax?.id}> +
); })} diff --git a/apps/web/src/app/main/layout/MainFooter.tsx b/apps/web/src/app/main/layout/MainFooter.tsx index 9d060dc..5ebe46f 100755 --- a/apps/web/src/app/main/layout/MainFooter.tsx +++ b/apps/web/src/app/main/layout/MainFooter.tsx @@ -1,68 +1,76 @@ -import { CloudOutlined, FileSearchOutlined, HomeOutlined, MailOutlined, PhoneOutlined } from '@ant-design/icons'; +import { + CloudOutlined, + FileSearchOutlined, + HomeOutlined, + MailOutlined, + PhoneOutlined, +} from "@ant-design/icons"; export function MainFooter() { - return ( -
-
-
- {/* 开发组织信息 */} -
-

- 软件与数据小组 -

-

- 提供技术支持 -

-
+ return ( +
+
+
+ {/* 开发组织信息 */} +
+

+ 软件与数据小组 +

+

+ 提供技术支持 +

+
- {/* 联系方式 */} -
-
- - 628118 -
-
- - gcsjs6@tx3l.nb.kj -
-
+ {/* 联系方式 */} +
+
+ + + 628118 + +
+
+ + + gcsjs6@tx3l.nb.kj + +
+
- {/* 系统链接 */} -
-
- - - - - - + {/* 系统链接 */} +
+ -
-
+ + + +
+
+
- {/* 版权信息 */} -
-

- © {new Date().getFullYear()} 南天烽火. All rights reserved. -

-
-
-
- ); + {/* 版权信息 */} +
+

+ © {new Date().getFullYear()} 南天烽火. All rights + reserved. +

+
+
+ + ); } diff --git a/apps/web/src/app/main/layout/MainLayout.tsx b/apps/web/src/app/main/layout/MainLayout.tsx index f5b462b..fa6627a 100755 --- a/apps/web/src/app/main/layout/MainLayout.tsx +++ b/apps/web/src/app/main/layout/MainLayout.tsx @@ -11,7 +11,7 @@ export function MainLayout() {
- + diff --git a/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx b/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx index cac3bf8..56831e4 100755 --- a/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx +++ b/apps/web/src/components/models/course/detail/CourseDetailLayout.tsx @@ -24,7 +24,7 @@ export default function CourseDetailLayout() { {/* 添加 Header 组件 */} {/* 主内容区域 */} {/* 为了防止 Header 覆盖内容，添加上边距 */} -
+
{" "} {/* 添加这个包装 div */} = ({ style={{ width: isOpen ? "25%" : "0", right: 0, - top: isHeaderVisible ? "64px" : "0", + top: isHeaderVisible ? "56px" : "0", }} - className="fixed top-0 bottom-0 z-20 bg-white shadow-xl"> + className="fixed top-0 bottom-0 z-10 bg-white shadow-xl"> {isOpen && (
From ab6727e23bc563e6102a60c74199be7f70c747cc Mon Sep 17 00:00:00 2001 From: Li1304553726 <1304553726@qq.com> Date: Thu, 27 Feb 2025 09:44:51 +0800 Subject: [PATCH 13/45] add liaohui --- .../main/home/components/CoursesSection.tsx | 60 +++++++++---------- .../src/app/main/layout/UserMenu/UserForm.tsx | 12 +--- .../course/detail/CourseDetailContext.tsx | 10 ++-- .../course/detail/CourseDetailDescription.tsx | 5 +- 4 files changed, 39 insertions(+), 48 deletions(-) diff --git a/apps/web/src/app/main/home/components/CoursesSection.tsx b/apps/web/src/app/main/home/components/CoursesSection.tsx index 999e931..b012fa6 100755 --- a/apps/web/src/app/main/home/components/CoursesSection.tsx +++ b/apps/web/src/app/main/home/components/CoursesSection.tsx @@ -6,45 +6,45 @@ import { CoursesSectionTag } from "./CoursesSectionTag"; import CourseList from "@web/src/components/models/course/list/CourseList"; import LookForMore from "./LookForMore"; interface GetTaxonomyProps { - categories: string[]; - isLoading: boolean; + categories: string[]; + isLoading: boolean; } function useGetTaxonomy({ type }): GetTaxonomyProps { - const { data, isLoading }: { data: TermDto[]; isLoading: boolean } = - api.term.findMany.useQuery({ - where: { - taxonomy: { - slug: type, - }, - parentId : null - }, - take: 11, // 只取前10个 - }); - const categories = useMemo(() => { - const allCategories = isLoading - ? [] - : data?.map((course) => course.name); - return [...Array.from(new Set(allCategories))]; - }, [data]); - return { categories, isLoading }; + const { data, isLoading }: { data: TermDto[]; isLoading: boolean } = + api.term.findMany.useQuery({ + where: { + taxonomy: { + slug: type, + }, + parentId: null + }, + take: 11, // 只取前10个 + }); + const categories = useMemo(() => { + const allCategories = isLoading + ? [] + : data?.map((course) => course.name); + return [...Array.from(new Set(allCategories))]; + }, [data]); + return { categories, isLoading }; } const { Title, Text } = Typography; interface CoursesSectionProps { - title: string; - description: string; - initialVisibleCoursesCount?: number; + title: string; + description: string; + initialVisibleCoursesCount?: number; } const CoursesSection: React.FC = ({ - title, - description, - initialVisibleCoursesCount = 8, + title, + description, + initialVisibleCoursesCount = 8, }) => { const [selectedCategory, setSelectedCategory] = useState("全部"); const gateGory: GetTaxonomyProps = useGetTaxonomy({ type: TaxonomySlug.CATEGORY, }); return ( -
+
@@ -87,10 +87,10 @@ const CoursesSection: React.FC = ({ where: { terms: !(selectedCategory === "全部") ? { - some: { - name: selectedCategory, - }, - } + some: { + name: selectedCategory, + }, + } : {}, }, }} diff --git a/apps/web/src/app/main/layout/UserMenu/UserForm.tsx b/apps/web/src/app/main/layout/UserMenu/UserForm.tsx index efbf12c..a496ed0 100644 --- a/apps/web/src/app/main/layout/UserMenu/UserForm.tsx +++ b/apps/web/src/app/main/layout/UserMenu/UserForm.tsx @@ -12,15 +12,7 @@ import toast from "react-hot-toast"; export default function StaffForm() { const { user } = useAuth(); const { create, update } = useStaff(); // Ensure you have these methods in your hooks - const { - formLoading, - modalOpen, - setModalOpen, - domainId, - setDomainId, - form, - setFormLoading, - } = useContext(UserEditorContext); + const {formLoading,modalOpen,setModalOpen,domainId,setDomainId,form,setFormLoading,} = useContext(UserEditorContext); const { data, isLoading, @@ -76,6 +68,8 @@ export default function StaffForm() { } useEffect(() => { form.resetFields(); + console.log('cc',data); + if (data) { form.setFieldValue("username", data.username); form.setFieldValue("showname", data.showname); diff --git a/apps/web/src/components/models/course/detail/CourseDetailContext.tsx b/apps/web/src/components/models/course/detail/CourseDetailContext.tsx index b722f3c..2738b7b 100755 --- a/apps/web/src/components/models/course/detail/CourseDetailContext.tsx +++ b/apps/web/src/components/models/course/detail/CourseDetailContext.tsx @@ -35,12 +35,8 @@ interface CourseFormProviderProps { editId?: string; // 添加 editId 参数 } -export const CourseDetailContext = - createContext(null); -export function CourseDetailProvider({ - children, - editId, -}: CourseFormProviderProps) { +export const CourseDetailContext =createContext(null); +export function CourseDetailProvider({children,editId}: CourseFormProviderProps) { const navigate = useNavigate(); const { read } = useVisitor(); const { user, hasSomePermissions } = useAuth(); @@ -61,6 +57,7 @@ export function CourseDetailProvider({ { enabled: Boolean(editId) } ); const canEdit = useMemo(() => { + //先判断登陆再判断是否是作者，三个条件满足一个就有编辑权限 const isAuthor = user?.id === course?.authorId; const isDept = course?.depts ?.map((dept) => dept.id) @@ -68,6 +65,7 @@ export function CourseDetailProvider({ const isRoot = hasSomePermissions(RolePerms?.MANAGE_ANY_POST); return isAuthor || isDept || isRoot; }, [user, course]); + const [selectedLectureId, setSelectedLectureId] = useState< string | undefined >(lectureId || undefined); diff --git a/apps/web/src/components/models/course/detail/CourseDetailDescription.tsx b/apps/web/src/components/models/course/detail/CourseDetailDescription.tsx index 39204fb..dbe6ce2 100755 --- a/apps/web/src/components/models/course/detail/CourseDetailDescription.tsx +++ b/apps/web/src/components/models/course/detail/CourseDetailDescription.tsx @@ -13,14 +13,13 @@ import dayjs from "dayjs"; import { useNavigate, useParams } from "react-router-dom"; export const CourseDetailDescription: React.FC = () => { - const { course, isLoading, selectedLectureId, setSelectedLectureId } = + const { course,canEdit, isLoading, selectedLectureId, setSelectedLectureId } = useContext(CourseDetailContext); const { Paragraph, Title } = Typography; const firstLectureId = useMemo(() => { return course?.sections?.[0]?.lectures?.[0]?.id; }, [course]); const navigate = useNavigate(); - const { canEdit } = useContext(CourseDetailContext); const { id } = useParams(); return (
@@ -72,7 +71,7 @@ export const CourseDetailDescription: React.FC = () => { }
- +
From b50e1521f6b5c287b48f5eae7720334d28bfdbcf Mon Sep 17 00:00:00 2001 From: ditiqi Date: Thu, 27 Feb 2025 09:47:31 +0800 Subject: [PATCH 14/45] add --- apps/web/src/app/main/layout/MainFooter.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/web/src/app/main/layout/MainFooter.tsx b/apps/web/src/app/main/layout/MainFooter.tsx index 5ebe46f..b232752 100755 --- a/apps/web/src/app/main/layout/MainFooter.tsx +++ b/apps/web/src/app/main/layout/MainFooter.tsx @@ -8,7 +8,7 @@ import { export function MainFooter() { return ( -