linfeng
/
staff_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:
Li1304553726 2025-02-26 13:10:02 +08:00
parent dbabef92b8 49464054dc
commit e3b52be35e
14 changed files with 105 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web/src/app/main/home/components/HeroSection.tsx
View File

@ -53,7 +53,7 @@ const HeroSection = () => {
useEffect(() => { useEffect(() => {
const count = countNonZeroValues(statistics); const count = countNonZeroValues(statistics);
console.log(count); //console.log(count);
setCountStatistics(count); setCountStatistics(count);
}, [statistics]); }, [statistics]);
return ( return (

3
apps/web/src/app/main/paths/page.tsx
View File

@ -1,5 +1,6 @@
import MindEditor from "@web/src/components/common/editor/MindEditor"; import MindEditor from "@web/src/components/common/editor/MindEditor";
export default function PathsPage() { export default function PathsPage() {
return <MindEditor></MindEditor>; // return <MindEditor></MindEditor>;
return <>123</>
} }

70
apps/web/src/components/layout/breadcrumb.tsx
View File

@ -1,38 +1,42 @@
import React from 'react'; import React from "react";
import { useLocation, Link, useMatches } from 'react-router-dom'; import { useLocation, Link, useMatches } from "react-router-dom";
import { theme } from 'antd'; import { theme } from "antd";
import { RightOutlined } from '@ant-design/icons'; import { RightOutlined } from "@ant-design/icons";
export default function Breadcrumb() { export default function Breadcrumb() {
let matches = useMatches(); const matches = useMatches();
const { token } = theme.useToken() const { token } = theme.useToken();
let crumbs = matches const crumbs = matches
// first get rid of any matches that don't have handle and crumb // first get rid of any matches that don't have handle and crumb
.filter((match) => Boolean((match.handle as any)?.crumb)) .filter((match) => Boolean((match.handle as any)?.crumb))
// now map them into an array of elements, passing the loader // now map them into an array of elements, passing the loader
// data to each one // data to each one
.map((match) => (match.handle as any).crumb(match.data)); .map((match) => (match.handle as any).crumb(match.data));
return ( return (
<ol className='flex items-center space-x-2 text-gray-600'> <ol className="flex items-center space-x-2 text-gray-600">
{crumbs.map((crumb, index) => ( {crumbs.map((crumb, index) => (
<React.Fragment key={index}> <React.Fragment key={index}>
<li className={`inline-flex items-center `} <li
style={{ className={`inline-flex items-center `}
color: (index === crumbs.length - 1) ? token.colorPrimaryText : token.colorTextSecondary, style={{
fontWeight: (index === crumbs.length - 1) ? "bold" : "normal", color:
}} index === crumbs.length - 1
> ? token.colorPrimaryText
{crumb} : token.colorTextSecondary,
</li> fontWeight:
{index < crumbs.length - 1 && ( index === crumbs.length - 1 ? "bold" : "normal",
<li className='mx-2'> }}>
<RightOutlined></RightOutlined> {crumb}
</li> </li>
)} {index < crumbs.length - 1 && (
</React.Fragment> <li className="mx-2">
))} <RightOutlined></RightOutlined>
</ol> </li>
); )}
</React.Fragment>
))}
</ol>
);
} }

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

@ -3,10 +3,17 @@ import {
courseDetailSelect, courseDetailSelect,
CourseDto, CourseDto,
Lecture, Lecture,
RolePerms,
VisitType, VisitType,
} from "@nice/common"; } from "@nice/common";
import { useAuth } from "@web/src/providers/auth-provider"; import { useAuth } from "@web/src/providers/auth-provider";
import React, { createContext, ReactNode, useEffect, useState } from "react"; import React, {
createContext,
ReactNode,
useEffect,
useMemo,
useState,
} from "react";
import { useNavigate, useParams } from "react-router-dom"; import { useNavigate, useParams } from "react-router-dom";
interface CourseDetailContextType { interface CourseDetailContextType {
@ -19,11 +26,14 @@ interface CourseDetailContextType {
lectureIsLoading?: boolean; lectureIsLoading?: boolean;
isHeaderVisible: boolean; // 新增 isHeaderVisible: boolean; // 新增
setIsHeaderVisible: (visible: boolean) => void; // 新增 setIsHeaderVisible: (visible: boolean) => void; // 新增
canEdit?: boolean;
} }
interface CourseFormProviderProps { interface CourseFormProviderProps {
children: ReactNode; children: ReactNode;
editId?: string; // 添加 editId 参数 editId?: string; // 添加 editId 参数
} }
export const CourseDetailContext = export const CourseDetailContext =
createContext<CourseDetailContextType | null>(null); createContext<CourseDetailContextType | null>(null);
export function CourseDetailProvider({ export function CourseDetailProvider({
@ -32,8 +42,9 @@ export function CourseDetailProvider({
}: CourseFormProviderProps) { }: CourseFormProviderProps) {
const navigate = useNavigate(); const navigate = useNavigate();
const { read } = useVisitor(); const { read } = useVisitor();
const { user } = useAuth(); const { user, hasSomePermissions } = useAuth();
const { lectureId } = useParams(); const { lectureId } = useParams();
const { data: course, isLoading }: { data: CourseDto; isLoading: boolean } = const { data: course, isLoading }: { data: CourseDto; isLoading: boolean } =
(api.post as any).findFirst.useQuery( (api.post as any).findFirst.useQuery(
{ {
@ -45,7 +56,14 @@ export function CourseDetailProvider({
}, },
{ enabled: Boolean(editId) } { enabled: Boolean(editId) }
); );
const canEdit = useMemo(() => {
const isAuthor = user?.id === course?.authorId;
const isDept = course?.depts
?.map((dept) => dept.id)
.includes(user?.deptId);
const isRoot = hasSomePermissions(RolePerms?.MANAGE_ANY_POST);
return isAuthor || isDept || isRoot;
}, [user, course]);
const [selectedLectureId, setSelectedLectureId] = useState< const [selectedLectureId, setSelectedLectureId] = useState<
string | undefined string | undefined
>(lectureId || undefined); >(lectureId || undefined);
@ -57,9 +75,9 @@ export function CourseDetailProvider({
}, },
{ enabled: Boolean(editId) } { enabled: Boolean(editId) }
); );
useEffect(() => { useEffect(() => {
if (course) { if (course) {
console.log("read");
read.mutateAsync({ read.mutateAsync({
data: { data: {
visitorId: user?.id || null, visitorId: user?.id || null,
@ -85,6 +103,7 @@ export function CourseDetailProvider({
lectureIsLoading, lectureIsLoading,
isHeaderVisible, isHeaderVisible,
setIsHeaderVisible, setIsHeaderVisible,
canEdit,
}}> }}>
{children} {children}
</CourseDetailContext.Provider> </CourseDetailContext.Provider>

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

@ -11,14 +11,16 @@ import { useNavigate, useParams } from "react-router-dom";
import { UserMenu } from "@web/src/app/main/layout/UserMenu/UserMenu"; import { UserMenu } from "@web/src/app/main/layout/UserMenu/UserMenu";
import { CourseDetailContext } from "../CourseDetailContext"; import { CourseDetailContext } from "../CourseDetailContext";
const { Header } = Layout; const { Header } = Layout;
export function CourseDetailHeader() { export function CourseDetailHeader() {
const [searchValue, setSearchValue] = useState(""); const [searchValue, setSearchValue] = useState("");
const { id } = useParams(); const { id } = useParams();
const { isAuthenticated, user, hasSomePermissions } = useAuth(); const { isAuthenticated, user, hasSomePermissions, hasEveryPermissions } =
useAuth();
const navigate = useNavigate(); const navigate = useNavigate();
const { course } = useContext(CourseDetailContext); const { course, canEdit } = useContext(CourseDetailContext);
return ( return (
<Header className="select-none flex items-center justify-center bg-white shadow-md border-b border-gray-100 fixed w-full z-30"> <Header className="select-none flex items-center justify-center bg-white shadow-md border-b border-gray-100 fixed w-full z-30">
@ -49,7 +51,7 @@ export function CourseDetailHeader() {
onChange={(e) => setSearchValue(e.target.value)} onChange={(e) => setSearchValue(e.target.value)}
/> />
</div> </div>
{isAuthenticated && ( {canEdit && (
<> <>
<Button <Button
onClick={() => { onClick={() => {
@ -65,18 +67,7 @@ export function CourseDetailHeader() {
</> </>
)} )}
{isAuthenticated ? ( {isAuthenticated ? (
<Dropdown <UserMenu />
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 <Button
onClick={() => navigate("/login")} onClick={() => navigate("/login")}

9
apps/web/src/components/models/course/detail/CourseDetailLayout.tsx
View File

@ -9,9 +9,7 @@ import { CourseDetailHeader } from "./CourseDetailHeader/CourseDetailHeader";
export default function CourseDetailLayout() { export default function CourseDetailLayout() {
const { const {
course, course,
selectedLectureId,
lecture,
isLoading,
setSelectedLectureId, setSelectedLectureId,
} = useContext(CourseDetailContext); } = useContext(CourseDetailContext);
@ -38,10 +36,7 @@ export default function CourseDetailLayout() {
}} }}
transition={{ type: "spring", stiffness: 300, damping: 30 }} transition={{ type: "spring", stiffness: 300, damping: 30 }}
className="relative"> className="relative">
<CourseDetailDisplayArea <CourseDetailDisplayArea />
// course={course}
// isLoading={isLoading}
/>
</motion.div> </motion.div>
{/* 课程大纲侧边栏 */} {/* 课程大纲侧边栏 */}
<CourseSyllabus <CourseSyllabus

7
apps/web/src/components/models/course/detail/CourseSyllabus/LectureItem.tsx
View File

@ -24,7 +24,12 @@ export const LectureItem: React.FC<LectureItemProps> = ({
}, [lectureId, lecture]); }, [lectureId, lecture]);
return ( return (
<div <div
className="w-full flex items-center gap-4 p-4 hover:bg-gray-200 text-left transition-colors cursor-pointer" className={`w-full flex items-center gap-4 p-4 text-left transition-colors cursor-pointer
${
isReading
? "bg-blue-50 border-l-4 border-blue-500 hover:bg-blue-50"
: "hover:bg-gray-200"
}`}
onClick={() => onClick(lecture.id)}> onClick={() => onClick(lecture.id)}>
{lecture?.meta?.type === LectureType.VIDEO && ( {lecture?.meta?.type === LectureType.VIDEO && (
<div className="text-blue-500 flex items-center"> <div className="text-blue-500 flex items-center">

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

@ -1,6 +1,7 @@
import { createContext, useContext, ReactNode, useEffect } from "react"; import { createContext, useContext, ReactNode, useEffect } from "react";
import { Form, FormInstance, message } from "antd"; import { Form, FormInstance, message } from "antd";
import { import {
courseDetailSelect,
CourseDto, CourseDto,
CourseMeta, CourseMeta,
CourseStatus, CourseStatus,
@ -48,9 +49,7 @@ export function CourseFormProvider({
const { data: course }: { data: CourseDto } = api.post.findFirst.useQuery( const { data: course }: { data: CourseDto } = api.post.findFirst.useQuery(
{ {
where: { id: editId }, where: { id: editId },
include: { select: courseDetailSelect,
terms: true,
},
}, },
{ enabled: Boolean(editId) } { enabled: Boolean(editId) }
); );
@ -65,10 +64,12 @@ export function CourseFormProvider({
useEffect(() => { useEffect(() => {
if (course) { if (course) {
const deptIds = (course?.depts || [])?.map((dept) => dept.id);
const formData = { const formData = {
title: course.title, title: course.title,
subTitle: course.subTitle, subTitle: course.subTitle,
content: course.content, content: course.content,
deptIds: deptIds,
meta: { meta: {
thumbnail: course?.meta?.thumbnail, thumbnail: course?.meta?.thumbnail,
}, },
@ -91,7 +92,10 @@ export function CourseFormProvider({
const formattedValues = { const formattedValues = {
...values, ...values,
meta: { meta: {
thumbnail: values?.meta?.thumbnail, ...((course?.meta as CourseMeta) || {}),
...(values?.meta?.thumbnail !== undefined && {
thumbnail: values?.meta?.thumbnail,
}),
}, },
terms: { terms: {
connect: termIds.map((id) => ({ id })), // 转换成 connect 格式 connect: termIds.map((id) => ({ id })), // 转换成 connect 格式
@ -106,12 +110,9 @@ export function CourseFormProvider({
}); });
delete formattedValues.sections; delete formattedValues.sections;
delete formattedValues.deptIds; delete formattedValues.deptIds;
if (course) {
formattedValues.meta = { console.log(course.meta);
...(course?.meta as CourseMeta), console.log(formattedValues?.meta);
thumbnail: values?.meta?.thumbnail,
};
}
try { try {
if (editId) { if (editId) {
const result = await update.mutateAsync({ const result = await update.mutateAsync({

3
apps/web/src/components/models/course/editor/form/CourseContentForm/SortableSection.tsx
View File

@ -69,6 +69,9 @@ export const SortableSection: React.FC<SortableSectionProps> = ({
}); });
} else { } else {
result = await update.mutateAsync({ result = await update.mutateAsync({
where: {
id: field?.id,
},
data: { data: {
title: values?.title, title: values?.title,
}, },

11
apps/web/src/components/models/course/editor/layout/CourseEditorHeader.tsx
View File

@ -4,6 +4,7 @@ import { useEffect } from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { CourseStatus, CourseStatusLabel } from "@nice/common"; import { CourseStatus, CourseStatusLabel } from "@nice/common";
import { useCourseEditor } from "../context/CourseEditorContext"; import { useCourseEditor } from "../context/CourseEditorContext";
import { useAuth } from "@web/src/providers/auth-provider";
const { Title } = Typography; const { Title } = Typography;
@ -16,6 +17,8 @@ const courseStatusVariant: Record<CourseStatus, string> = {
export default function CourseEditorHeader() { export default function CourseEditorHeader() {
const navigate = useNavigate(); const navigate = useNavigate();
const { user, hasSomePermissions } = useAuth();
const { onSubmit, course, form } = useCourseEditor(); const { onSubmit, course, form } = useCourseEditor();
const handleSave = () => { const handleSave = () => {
@ -34,7 +37,13 @@ export default function CourseEditorHeader() {
<div className="flex items-center space-x-3"> <div className="flex items-center space-x-3">
<Button <Button
icon={<ArrowLeftOutlined />} icon={<ArrowLeftOutlined />}
onClick={() => navigate(-1)} onClick={() => {
if (course?.id) {
navigate(`/course/${course?.id}/detail`);
} else {
navigate("/");
}
}}
type="text" type="text"
/> />
<div className="flex items-center space-x-2"> <div className="flex items-center space-x-2">

7
apps/web/src/components/models/term/term-parent-selector.tsx
View File

@ -2,7 +2,6 @@ import { api } from "@nice/client/";
import { Checkbox, Form } from "antd"; import { Checkbox, Form } from "antd";
import { TermDto } from "@nice/common"; import { TermDto } from "@nice/common";
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
export default function TermParentSelector({ export default function TermParentSelector({
value, value,
onChange, onChange,
@ -13,11 +12,7 @@ export default function TermParentSelector({
domainId, domainId,
style, style,
}: any) { }: any) {
const utils = api.useUtils();
const [selectedValues, setSelectedValues] = useState<string[]>([]); // 用于存储选中的值 const [selectedValues, setSelectedValues] = useState<string[]>([]); // 用于存储选中的值
const [termsData, setTermsData] = useState<any[]>([]);
const { const {
data, data,
isLoading, isLoading,
@ -42,7 +37,7 @@ export default function TermParentSelector({
<Checkbox.Group onChange={handleCheckboxChange}> <Checkbox.Group onChange={handleCheckboxChange}>
{data?.map((category) => ( {data?.map((category) => (
<div className="w-full h-9 p-2 my-1"> <div className="w-full h-9 p-2 my-1">
<Checkbox className="text-base text-slate-700" key={category.id} value={category.id}> <Checkbox className="text-base text-slate-700" key={category.id} value={category.id}>
{category.name} {category.name}
</Checkbox> </Checkbox>
</div> </div>

16
apps/web/src/routes/index.tsx
View File

@ -63,16 +63,6 @@ export const routes: CustomRouteObject[] = [
path: "courses", path: "courses",
element: <CoursesPage></CoursesPage>, element: <CoursesPage></CoursesPage>,
}, },
{
path: "profiles",
},
// // 课程预览页面
// {
// path: "coursePreview/:id?",
// element: <CoursePreview></CoursePreview>,
// },
], ],
}, },
{ {
@ -103,12 +93,6 @@ export const routes: CustomRouteObject[] = [
</WithAuth> </WithAuth>
), ),
}, },
// {
// path: "setting",
// element: (
// <CourseSettingForm></CourseSettingForm>
// ),
// },
], ],
}, },
{ {

2
config/nginx/conf.d/web.conf
View File

@ -100,7 +100,7 @@ server {
# 仅供内部使用 # 仅供内部使用
internal; internal;
# 代理到认证服务 # 代理到认证服务
proxy_pass http://host.docker.internal:3000/auth/file; proxy_pass http://host.docker.internal:/auth/file;
# 请求优化：不传递请求体 # 请求优化：不传递请求体
proxy_pass_request_body off; proxy_pass_request_body off;

3
packages/common/src/enum.ts
View File

@ -8,6 +8,7 @@ export enum PostType {
COURSE = "couse", COURSE = "couse",
SECTION = "section", SECTION = "section",
LECTURE = "lecture", LECTURE = "lecture",
PATH = "path",
} }
export enum LectureType { export enum LectureType {
VIDEO = "video", VIDEO = "video",
@ -100,7 +101,7 @@ export enum RolePerms {
} }
export enum AppConfigSlug { export enum AppConfigSlug {
BASE_SETTING = "base_setting", BASE_SETTING = "base_setting",
} }
// 资源类型的枚举，定义了不同类型的资源，以字符串值表示 // 资源类型的枚举，定义了不同类型的资源，以字符串值表示
export enum ResourceType { export enum ResourceType {