linfeng
/
training_data
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://113.45.157.195:3003/insiinc/re-mooc

This commit is contained in:
Rao 2025-02-26 22:39:06 +08:00
parent f001062e44 ed85a700a4
commit 6042002280
13 changed files with 173 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/server/src/models/post/post.service.ts
View File

@ -166,19 +166,7 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
);
return transDto;
}
// async findMany(args: Prisma.PostFindManyArgs, staff?: UserProfile) {
// if (!args.where) args.where = {};
// args.where.OR = await this.preFilter(args.where.OR, staff);
// return this.wrapResult(super.findMany(args), async (result) => {
// await Promise.all(
// result.map(async (item) => {
// await setPostRelation({ data: item, staff });
// await this.setPerms(item, staff);
// }),
// );
// return { ...result };
// });
// }
async findManyWithCursor(args: Prisma.PostFindManyArgs, staff?: UserProfile) {
if (!args.where) args.where = {};
args.where.OR = await this.preFilter(args.where.OR, staff);
@ -255,6 +243,7 @@ export class PostService extends BaseTreeService<Prisma.PostDelegate> {
// 批量执行更新
return updates.length > 0 ? await db.$transaction(updates) : [];
}
protected async setPerms(data: Post, staff?: UserProfile) {
if (!staff) return;
const perms: ResPerm = {

17
apps/server/src/models/post/utils.ts
View File

@ -168,6 +168,21 @@ export async function setCourseInfo({ data }: { data: Post }) {
(lecture) => lecture.parentId === section.id,
) as any as Lecture[];
});
Object.assign(data, { sections, lectureCount });
const students = await db.staff.findMany({
where: {
learningPosts: {
some: {
id: data.id,
},
},
},
select: {
id: true,
},
});
const studentIds = (students || []).map((student) => student?.id);
Object.assign(data, { sections, lectureCount, studentIds });
}
}

13
apps/web/src/app/main/courses/components/CourseCard.tsx
View File

@ -1,5 +1,6 @@
import { Card, Tag, Typography, Button } from "antd";
import {
BookOutlined,
EyeOutlined,
PlayCircleOutlined,
TeamOutlined,
@ -73,10 +74,10 @@ export default function CourseCard({ course, edit = false }: CourseCardProps) {
<button> {course.title}</button>
</Title>
<div className="flex items-center mb-4 p-2 rounded-lg transition-all duration-300 hover:bg-blue-50 group">
<div className="flex items-center mb-4 rounded-lg transition-all duration-300 hover:bg-blue-50 group">
<TeamOutlined className="text-blue-500 text-lg transform group-hover:scale-110 transition-transform duration-300" />
<div className="ml-2 flex items-center flex-grow">
<Text className="font-medium text-blue-500 hover:text-blue-600 transition-colors duration-300 truncate max-w-[120px]">
<Text className="font-medium text-blue-500 transition-colors duration-300 truncate max-w-[120px]">
{course?.depts?.length > 1
? `${course.depts[0].name}等`
: course?.depts?.[0]?.name}
@ -84,10 +85,16 @@ export default function CourseCard({ course, edit = false }: CourseCardProps) {
{/* {course?.depts?.map((dept)=>{return dept.name})} */}
</Text>
</div>
</div>
<div className="flex items-center gap-2">
<span className="text-xs font-medium text-gray-500 flex items-center">
<EyeOutlined className="mr-1" />
<EyeOutlined />
{`观看次数 ${course?.meta?.views || 0}`}
</span>
<span className="text-xs font-medium text-gray-500 flex items-center">
<BookOutlined />
{`学习人数 ${course?.studentIds?.length || 0}`}
</span>
</div>
<div className="pt-4 border-t border-gray-100 text-center">
<Button

7
apps/web/src/app/main/my-learning/page.tsx
View File

@ -7,11 +7,14 @@ export default function MyLearningPage() {
<>
<div className="p-4">
<CourseList
edit
params={{
pageSize: 12,
where: {
authorId: user.id,
students: {
some: {
id: user?.id,
},
},
},
}}
cols={4}></CourseList>

23
apps/web/src/components/models/course/detail/CourseDetailContext.tsx
View File

@ -28,6 +28,7 @@ interface CourseDetailContextType {
isHeaderVisible: boolean; // 新增
setIsHeaderVisible: (visible: boolean) => void; // 新增
canEdit?: boolean;
userIsLearning?: boolean;
}
interface CourseFormProviderProps {
@ -43,30 +44,25 @@ export function CourseDetailProvider({
}: CourseFormProviderProps) {
const navigate = useNavigate();
const { read } = useVisitor();
const { user, hasSomePermissions } = useAuth();
const { user, hasSomePermissions, isAuthenticated } = useAuth();
const { lectureId } = useParams();
const { data: course, isLoading }: { data: CourseDto; isLoading: boolean } =
(api.post as any).findFirst.useQuery(
{
where: { id: editId },
// include: {
// // sections: { include: { lectures: true } },
// enrollments: true,
// terms:true
// },
select:courseDetailSelect
select: courseDetailSelect,
},
{ enabled: Boolean(editId) }
);
const userIsLearning = useMemo(() => {
return (course?.studentIds || []).includes(user?.id);
}, [user, course, isLoading]);
const canEdit = useMemo(() => {
const isAuthor = user?.id === course?.authorId;
const isDept = course?.depts
?.map((dept) => dept.id)
.includes(user?.deptId);
const isAuthor = isAuthenticated && user?.id === course?.authorId;
const isRoot = hasSomePermissions(RolePerms?.MANAGE_ANY_POST);
return isAuthor || isDept || isRoot;
return isAuthor || isRoot;
}, [user, course]);
const [selectedLectureId, setSelectedLectureId] = useState<
string | undefined
@ -109,6 +105,7 @@ export function CourseDetailProvider({
isHeaderVisible,
setIsHeaderVisible,
canEdit,
userIsLearning,
}}>
{children}
</CourseDetailContext.Provider>

74
apps/web/src/components/models/course/detail/CourseDetailDescription.tsx
View File

@ -3,11 +3,13 @@ import React, { useContext, useMemo } from "react";
import { Image, Typography, Skeleton, Tag } from "antd"; // 引入 antd 组件
import { CourseDetailContext } from "./CourseDetailContext";
import {
BookOutlined,
CalendarOutlined,
EditTwoTone,
EyeOutlined,
PlayCircleOutlined,
ReloadOutlined,
TeamOutlined,
} from "@ant-design/icons";
import dayjs from "dayjs";
import { useNavigate, useParams } from "react-router-dom";
@ -23,7 +25,8 @@ export const CourseDetailDescription: React.FC = () => {
const { canEdit } = useContext(CourseDetailContext);
const { id } = useParams();
return (
<div className="w-full bg-white shadow-md rounded-lg border border-gray-200 p-5 my-4">
// <div className="w-full bg-white shadow-md rounded-lg border border-gray-200 p-5 my-4">
<div className="w-full p-5 my-4">
{isLoading || !course ? (
<Skeleton active paragraph={{ rows: 4 }} />
) : (
@ -41,53 +44,61 @@ export const CourseDetailDescription: React.FC = () => {
setSelectedLectureId(firstLectureId);
}}
className="w-full h-full absolute top-0 z-10 bg-black opacity-30 transition-opacity duration-300 ease-in-out hover:opacity-70 cursor-pointer">
<PlayCircleOutlined className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-white text-4xl z-10" />
<div className="absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 text-white text-4xl z-10">
点击进入学习
</div>
</div>
</div>
</>
)}
<div className="text-lg font-bold">{"课程简介:"}</div>
<div className="flex gap-2 flex-wrap items-center">
<div>{course?.subTitle}</div>
{
course.terms.map((term) => {
<div className="flex flex-col gap-2">
<div className="flex gap-2 flex-wrap items-center float-start">
{course?.subTitle && <div>{course?.subTitle}</div>}
{course.terms.map((term) => {
return (
<Tag
key={term.id}
// color={term.taxonomy.slug===TaxonomySlug.CATEGORY? "blue" : "green"}
color={
term?.taxonomy?.slug ===
TaxonomySlug.CATEGORY
TaxonomySlug.CATEGORY
? "blue"
: term?.taxonomy?.slug ===
TaxonomySlug.LEVEL
TaxonomySlug.LEVEL
? "green"
: "orange"
}
className="px-3 py-1 rounded-full bg-blue-100 text-blue-600 border-0">
{term.name}
</Tag>
)
})
}
</div>
<div className="text-gray-800 flex justify-start gap-5">
<div className="flex gap-1">
<CalendarOutlined></CalendarOutlined>
{dayjs(course?.createdAt).format("YYYY年M月D日")}
);
})}
</div>
<div className="flex gap-1">
<ReloadOutlined></ReloadOutlined>
{dayjs(course?.updatedAt).format("YYYY年M月D日")}
</div>
<div className="flex gap-1">
<EyeOutlined></EyeOutlined>
<div>{course?.meta?.views || 0}</div>
</div>
{
canEdit && (
<div className="text-gray-600 flex justify-start gap-5">
<div className="flex gap-1">
<CalendarOutlined></CalendarOutlined>
{"创建于:"}
{dayjs(course?.createdAt).format(
"YYYY年M月D日"
)}
</div>
<div className="flex gap-1">
<ReloadOutlined></ReloadOutlined>
{"更新于:"}
{dayjs(course?.updatedAt).format(
"YYYY年M月D日"
)}
</div>
<div className="flex gap-1">
<EyeOutlined></EyeOutlined>
<div>{`观看次数${course?.meta?.views || 0}`}</div>
</div>
<div className="flex gap-1">
<BookOutlined />
<div>{`学习人数${course?.studentIds?.length || 0}`}</div>
</div>
{canEdit && (
<div
className="flex gap-1 text-primary hover:cursor-pointer"
onClick={() => {
@ -95,13 +106,12 @@ export const CourseDetailDescription: React.FC = () => {
? `/course/${id}/editor`
: "/course/editor";
navigate(url);
}}
>
}}>
<EditTwoTone></EditTwoTone>
{"点击编辑课程"}
</div>
)
}
)}
</div>
</div>
<Paragraph
className="text-gray-600"

61
apps/web/src/components/models/course/detail/CourseDetailHeader/CourseDetailHeader.tsx
View File

@ -10,17 +10,18 @@ import { useAuth } from "@web/src/providers/auth-provider";
import { useNavigate, useParams } from "react-router-dom";
import { UserMenu } from "@web/src/app/main/layout/UserMenu/UserMenu";
import { CourseDetailContext } from "../CourseDetailContext";
import { usePost, useStaff } from "@nice/client";
import toast from "react-hot-toast";
const { Header } = Layout;
export function CourseDetailHeader() {
const [searchValue, setSearchValue] = useState("");
const { id } = useParams();
const { isAuthenticated, user, hasSomePermissions, hasEveryPermissions } =
useAuth();
const navigate = useNavigate();
const { course, canEdit } = useContext(CourseDetailContext);
const { course, canEdit, userIsLearning } = useContext(CourseDetailContext);
const { update } = useStaff();
return (
<Header className="select-none flex items-center justify-center bg-white shadow-md border-b border-gray-100 fixed w-full z-30">
@ -39,20 +40,48 @@ export function CourseDetailHeader() {
{/* <NavigationMenu /> */}
</div>
<div className="flex items-center space-x-6">
{isAuthenticated && (
<Button
onClick={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,
},
},
},
});
}
}}
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={<EditFilled />}>
{userIsLearning ? "退出学习" : "加入学习"}
</Button>
)}
{canEdit && (
<>
<Button
onClick={() => {
const url = id
? `/course/${id}/editor`
: "/course/editor";
navigate(url);
}}
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={<EditFilled />}>
{"编辑课程"}
</Button>
</>
<Button
onClick={() => {
const url = id
? `/course/${id}/editor`
: "/course/editor";
navigate(url);
}}
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={<EditFilled />}>
{"编辑课程"}
</Button>
)}
{isAuthenticated ? (
<UserMenu />

77
apps/web/src/components/models/course/detail/CourseDetailHeader/CourseDetailHeader_BACKUP.tsx
View File

@ -1,77 +0,0 @@
// // components/Header.tsx
// import { motion, useScroll, useTransform } from "framer-motion";
// import { useContext, useEffect, useState } from "react";
// import { CourseDetailContext } from "../CourseDetailContext";
// import { Avatar, Button, Dropdown } from "antd";
// import { UserOutlined } from "@ant-design/icons";
// import { UserMenu } from "@web/src/app/main/layout/UserMenu";
// import { useAuth } from "@web/src/providers/auth-provider";
// export const CourseDetailHeader = () => {
// const { scrollY } = useScroll();
// const { user, isAuthenticated } = useAuth();
// const [lastScrollY, setLastScrollY] = useState(0);
// const { course, isHeaderVisible, setIsHeaderVisible, lecture } =
// useContext(CourseDetailContext);
// useEffect(() => {
// const updateHeader = () => {
// const current = scrollY.get();
// const direction = current > lastScrollY ? "down" : "up";
// if (direction === "down" && current > 100) {
// setIsHeaderVisible(false);
// } else if (direction === "up") {
// setIsHeaderVisible(true);
// }
// setLastScrollY(current);
// };
// // 使用 requestAnimationFrame 来优化性能
// const unsubscribe = scrollY.on("change", () => {
// requestAnimationFrame(updateHeader);
// });
// return () => {
// unsubscribe();
// };
// }, [lastScrollY, scrollY, setIsHeaderVisible]);
// return (
// <motion.header
// initial={{ y: 0 }}
// animate={{ y: isHeaderVisible ? 0 : -100 }}
// transition={{ type: "spring", stiffness: 300, damping: 30 }}
// className="fixed top-0 left-0 w-full h-16 bg-slate-900 backdrop-blur-sm z-50 shadow-sm">
// <div className="w-full mx-auto px-4 h-full flex items-center justify-between">
// <div className="flex items-center space-x-4">
// <h1 className="text-white text-xl ">{course?.title}</h1>
// </div>
// {isAuthenticated ? (
// <Dropdown
// overlay={<UserMenu />}
// trigger={["click"]}
// placement="bottomRight">
// <Avatar
// size="large"
// className="cursor-pointer hover:scale-105 transition-all bg-gradient-to-r from-blue-500 to-blue-600 text-white font-semibold">
// {(user?.showname ||
// user?.username ||
// "")[0]?.toUpperCase()}
// </Avatar>
// </Dropdown>
// ) : (
// <Button
// onClick={() => navigator("/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>
// )}
// </div>
// </motion.header>
// );
// };
// export default CourseDetailHeader;

4
apps/web/src/components/models/course/editor/context/CourseEditorContext.tsx
View File

@ -99,10 +99,10 @@ export function CourseFormProvider({
}),
},
terms: {
connect: termIds.map((id) => ({ id })), // 转换成 connect 格式
set: termIds.map((id) => ({ id })), // 转换成 connect 格式
},
depts: {
connect: deptIds.map((id) => ({ id })),
set: deptIds.map((id) => ({ id })),
},
};
// 删除原始的 taxonomy 字段

2
apps/web/src/components/models/course/editor/form/CourseBasicForm.tsx
View File

@ -32,7 +32,7 @@ export function CourseBasicForm() {
<Form.Item
name="subTitle"
label="课程副标题"
rules={[{ max: 10, message: "副标题最多10个字符" }]}>
rules={[{ max: 20, message: "副标题最多20个字符" }]}>
<Input placeholder="请输入课程副标题" />
</Form.Item>
<Form.Item name={["meta", "thumbnail"]} label="课程封面">

67
packages/client/src/api/hooks/useStaff.ts
View File

@ -5,39 +5,48 @@ import { ObjectType, Staff } from "@nice/common";
import { findQueryData } from "../utils";
import { CrudOperation, emitDataChange } from "../../event";
export function useStaff() {
const queryClient = useQueryClient();
const queryKey = getQueryKey(api.staff);
const queryClient = useQueryClient();
const queryKey = getQueryKey(api.staff);
const create = api.staff.create.useMutation({
onSuccess: (result) => {
queryClient.invalidateQueries({ queryKey });
emitDataChange(ObjectType.STAFF, result as any, CrudOperation.CREATED)
},
});
const updateUserDomain = api.staff.updateUserDomain.useMutation({
onSuccess: async (result) => {
queryClient.invalidateQueries({ queryKey });
},
});
const update = api.staff.update.useMutation({
onSuccess: (result) => {
queryClient.invalidateQueries({ queryKey });
emitDataChange(ObjectType.STAFF, result as any, CrudOperation.UPDATED)
},
});
const create = api.staff.create.useMutation({
onSuccess: (result) => {
queryClient.invalidateQueries({ queryKey });
emitDataChange(
ObjectType.STAFF,
result as any,
CrudOperation.CREATED
);
},
});
const updateUserDomain = api.staff.updateUserDomain.useMutation({
onSuccess: async (result) => {
queryClient.invalidateQueries({ queryKey });
},
});
const update = api.staff.update.useMutation({
onSuccess: (result) => {
queryClient.invalidateQueries({ queryKey });
queryClient.invalidateQueries({ queryKey: getQueryKey(api.post) });
emitDataChange(
ObjectType.STAFF,
result as any,
CrudOperation.UPDATED
);
},
});
const softDeleteByIds = api.staff.softDeleteByIds.useMutation({
onSuccess: (result, variables) => {
queryClient.invalidateQueries({ queryKey });
},
});
const getStaff = (key: string) => {
return findQueryData<Staff>(queryClient, api.staff, key);
};
return {
create,
update,
softDeleteByIds,
getStaff,
updateUserDomain
};
const getStaff = (key: string) => {
return findQueryData<Staff>(queryClient, api.staff, key);
};
return {
create,
update,
softDeleteByIds,
getStaff,
updateUserDomain,
};
}

2
packages/common/prisma/schema.prisma
View File

@ -93,7 +93,7 @@ model Staff {
posts Post[]
learningPost Post[] @relation("post_student")
learningPosts Post[] @relation("post_student")
sentMsgs Message[] @relation("message_sender")
receivedMsgs Message[] @relation("message_receiver")
registerToken String?

1
packages/common/src/models/post.ts
View File

@ -83,4 +83,5 @@ export type CourseDto = Course & {
terms: TermDto[];
lectureCount?: number;
depts: Department[];
studentIds: string[];
};