diff --git a/apps/server/src/models/term/term.service.ts b/apps/server/src/models/term/term.service.ts index cc119e6..7f21041 100755 --- a/apps/server/src/models/term/term.service.ts +++ b/apps/server/src/models/term/term.service.ts @@ -298,12 +298,12 @@ export class TermService extends BaseTreeService { ...(hasAnyPerms ? {} // 当有全局权限时，不添加任何额外条件 : { - // 当无全局权限时，添加域ID过滤 - OR: [ - { domainId: null }, // 通用记录 - { domainId: domainId }, // 特定域记录 - ], - }), + // 当无全局权限时，添加域ID过滤 + OR: [ + { domainId: null }, // 通用记录 + { domainId: domainId }, // 特定域记录 + ], + }), }, ancestorId: parentId, relDepth: 1, @@ -315,29 +315,29 @@ export class TermService extends BaseTreeService { }), termIds ? db.term.findMany({ - where: { - ...(termIds && { - OR: [ - ...(validTermIds.length - ? [{ id: { in: validTermIds } }] - : []), - ], - }), - taxonomyId: taxonomyId, - // 动态权限控制条件 - ...(hasAnyPerms - ? {} // 当有全局权限时，不添加任何额外条件 - : { - // 当无全局权限时，添加域ID过滤 + where: { + ...(termIds && { OR: [ - { domainId: null }, // 通用记录 - { domainId: domainId }, // 特定域记录 + ...(validTermIds.length + ? [{ id: { in: validTermIds } }] + : []), ], }), - }, - include: { children: true }, - orderBy: { order: 'asc' }, - }) + taxonomyId: taxonomyId, + // 动态权限控制条件 + ...(hasAnyPerms + ? {} // 当有全局权限时，不添加任何额外条件 + : { + // 当无全局权限时，添加域ID过滤 + OR: [ + { domainId: null }, // 通用记录 + { domainId: domainId }, // 特定域记录 + ], + }), + }, + include: { children: true }, + orderBy: { order: 'asc' }, + }) : [], ]); const children = childrenData @@ -371,12 +371,12 @@ export class TermService extends BaseTreeService { ...(hasAnyPerms ? {} // 当有全局权限时，不添加任何额外条件 : { - // 当无全局权限时，添加域ID过滤 - OR: [ - { domainId: null }, // 通用记录 - { domainId: domainId }, // 特定域记录 - ], - }), + // 当无全局权限时，添加域ID过滤 + OR: [ + { domainId: null }, // 通用记录 + { domainId: domainId }, // 特定域记录 + ], + }), }, }, include: { @@ -398,12 +398,12 @@ export class TermService extends BaseTreeService { ...(hasAnyPerms ? {} // 当有全局权限时，不添加任何额外条件 : { - // 当无全局权限时，添加域ID过滤 - OR: [ - { domainId: null }, // 通用记录 - { domainId: domainId }, // 特定域记录 - ], - }), + // 当无全局权限时，添加域ID过滤 + OR: [ + { domainId: null }, // 通用记录 + { domainId: domainId }, // 特定域记录 + ], + }), }, include: { children: true }, // 包含子节点信息 orderBy: { order: 'asc' }, // 按顺序升序排序 diff --git a/apps/web/src/app/admin/base-setting/page.tsx b/apps/web/src/app/admin/base-setting/page.tsx index c0e77e8..c0aed70 100755 --- a/apps/web/src/app/admin/base-setting/page.tsx +++ b/apps/web/src/app/admin/base-setting/page.tsx @@ -46,12 +46,21 @@ export default function BaseSettingPage() { } async function onSubmit(values: BaseSetting) { setLoading(true); + const appConfig = values?.appConfig || {}; try { await update.mutateAsync({ where: { slug: AppConfigSlug.BASE_SETTING, }, - data: { meta: { ...baseSetting, ...values } }, + data: { + meta: { + ...baseSetting, + appConfig: { + ...baseSetting.appConfig, + ...appConfig, + }, + }, + }, }); setIsFormChanged(false); message.success("已保存"); diff --git a/apps/web/src/app/main/courses/components/CourseCard.tsx b/apps/web/src/app/main/courses/components/CourseCard.tsx index 5d7c3cd..9a9f37d 100755 --- a/apps/web/src/app/main/courses/components/CourseCard.tsx +++ b/apps/web/src/app/main/courses/components/CourseCard.tsx @@ -1,49 +1,90 @@ -import { Card, Rate, Tag } from 'antd'; -import { Course } from '../mockData'; -import { UserOutlined, ClockCircleOutlined } from '@ant-design/icons'; -import { CourseDto } from '@nice/common'; +import { Card, Rate, Tag, Typography, Button } from "antd"; +import { Course } from "../mockData"; +import { + UserOutlined, + ClockCircleOutlined, + PlayCircleOutlined, + TeamOutlined, +} from "@ant-design/icons"; +import { CourseDto, TaxonomySlug } from "@nice/common"; +import { useNavigate } from "react-router-dom"; interface CourseCardProps { - course: CourseDto; + course: CourseDto; } - +const { Title, Text } = Typography; export default function CourseCard({ course }: CourseCardProps) { - return ( - - } - > -
-

- {course.title} -

-

{course.subTitle}

-
- - {course.rating} -
-
-
- - {course.enrollments?.length} 人在学 -
-
- - {course.duration} -
-
-
- {course.terms[0].name} - {course.terms[1].name} -
-
- - ); + const navigate = useNavigate(); + const handleClick = (course: CourseDto) => { + navigate(`/course/${course.id}/detail`); + }; + return ( + handleClick(course)} + key={course.id} + hoverable + className="group overflow-hidden rounded-2xl border border-gray-200 bg-white + shadow-xl hover:shadow-2xl transition-all duration-300 transform hover:-translate-y-2" + cover={ +
+
+
+ +
+ }> +
+
+ + {course.terms?.[0].name} + + + + {course.terms?.[1].name} + +
+ + <button> {course.title}</button> + + +
+ +
+ + {course?.depts?.[0]?.name} + +
+ + 观看次数{course?.meta?.views}次 + +
+ +
+ +
+
+ + ); } diff --git a/apps/web/src/app/main/courses/components/CourseList.tsx b/apps/web/src/app/main/courses/components/CourseList.tsx index f3e3177..4550795 100755 --- a/apps/web/src/app/main/courses/components/CourseList.tsx +++ b/apps/web/src/app/main/courses/components/CourseList.tsx @@ -1,44 +1,74 @@ -import { Pagination, Empty } from 'antd'; -import { Course } from '../mockData'; -import CourseCard from './CourseCard'; -import {CourseDto} from '@nice/common' +import { Pagination, Empty } from "antd"; +import CourseCard from "./CourseCard"; +import { CourseDto, Prisma } from "@nice/common"; +import { api } from "@nice/client"; +import { DefaultArgs } from "@prisma/client/runtime/library"; +import { useEffect, useMemo, useState } from "react"; interface CourseListProps { - courses: CourseDto[]; - total: number; - pageSize: number; - currentPage: number; - onPageChange: (page: number) => void; + params?: { + page?: number; + pageSize?: number; + where?: Prisma.PostWhereInput; + select?: Prisma.PostSelect; + }; } +interface CoursesPagnationProps { + data: { + items: CourseDto[]; + totalPages: number; + }; + isLoading: boolean; +} +export default function CourseList({ params }: CourseListProps) { + const [currentPage, setCurrentPage] = useState(params?.page || 1); + const { data, isLoading }: CoursesPagnationProps = + api.post.findManyWithPagination.useQuery({ + ...params, + page: currentPage, + }); + const totalPages = useMemo(() => { + if (data && !isLoading) { + return data?.totalPages; + } + return 1; + }, [data, isLoading]); -export default function CourseList({ - courses, - total, - pageSize, - currentPage, - onPageChange, -}: CourseListProps) { - return ( -
- {courses.length > 0 ? ( - <> -
- {courses.map(course => ( - - ))} -
-
- -
- - ) : ( - - )} -
- ); -} \ No newline at end of file + const courses = useMemo(() => { + if (data && !isLoading) { + return data?.items; + } + return []; + }, [data, isLoading]); + + useEffect(() => { + setCurrentPage(params?.page || 1); + }, [params?.page]); + function onPageChange(page: number, pageSize: number) { + setCurrentPage(page); + window.scrollTo({ top: 0, behavior: "smooth" }); + } + return ( +
+ {courses.length > 0 ? ( + <> +
+ {courses.map((course) => ( + + ))} +
+
+ +
+ + ) : ( + + )} +
+ ); +} diff --git a/apps/web/src/app/main/courses/components/FilterSection.tsx b/apps/web/src/app/main/courses/components/FilterSection.tsx index 6fe06c4..69fd828 100755 --- a/apps/web/src/app/main/courses/components/FilterSection.tsx +++ b/apps/web/src/app/main/courses/components/FilterSection.tsx @@ -1,10 +1,12 @@ -import { Checkbox, Divider, Radio, Space , Spin} from 'antd'; -import { categories, levels } from '../mockData'; -import { TaxonomySlug, TermDto } from '@nice/common'; +import { Checkbox, Divider, Radio, Space, Spin } from "antd"; +import { categories, levels } from "../mockData"; +import { TaxonomySlug, TermDto } from "@nice/common"; -import { useEffect, useMemo } from 'react'; -import { api } from '@nice/client'; -import { useSearchParams } from 'react-router-dom'; +import { useEffect, useMemo } from "react"; +import { api } from "@nice/client"; +import { useSearchParams } from "react-router-dom"; +import TermTree from "@web/src/components/models/term/term-tree"; +import TermSelect from "@web/src/components/models/term/term-select"; interface FilterSectionProps { selectedCategory: string; @@ -14,105 +16,75 @@ interface FilterSectionProps { } 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: { - //TaxonomySlug.CATEGORY - slug:type - } - }, - include:{ - children :true - }, - take:10, // 只取前10个 - orderBy: { - createdAt: 'desc', // 按创建时间降序排列 - }, - }) - const categories = useMemo(() => { - const allCategories = isLoading ? [] : data?.map((course) => course.name); - return [...Array.from(new Set(allCategories))]; - }, [data]); - return {categories,isLoading} +function useGetTaxonomy({ type }): GetTaxonomyProps { + const { data, isLoading }: { data: TermDto[]; isLoading: boolean } = + api.term.findMany.useQuery({ + where: { + taxonomy: { + //TaxonomySlug.CATEGORY + slug: type, + }, + }, + include: { + children: true, + }, + take: 10, // 只取前10个 + orderBy: { + createdAt: "desc", // 按创建时间降序排列 + }, + }); + const categories = useMemo(() => { + const allCategories = isLoading + ? [] + : data?.map((course) => course.name); + return [...Array.from(new Set(allCategories))]; + }, [data]); + return { categories, isLoading }; } - export default function FilterSection({ selectedCategory, selectedLevel, onCategoryChange, onLevelChange, }: FilterSectionProps) { - const gateGory : GetTaxonomyProps = useGetTaxonomy({ - type: TaxonomySlug.CATEGORY, - }) - const levels : GetTaxonomyProps = useGetTaxonomy({ - type: TaxonomySlug.LEVEL, - }) + const gateGory: GetTaxonomyProps = useGetTaxonomy({ + type: TaxonomySlug.CATEGORY, + }); + const levels: GetTaxonomyProps = useGetTaxonomy({ + type: TaxonomySlug.LEVEL, + }); - const [searchParams,setSearchParams] = useSearchParams() - useEffect(() => { - if(searchParams.get('category')) onCategoryChange(searchParams.get('category')) - },[searchParams.get('category')]) + const [searchParams, setSearchParams] = useSearchParams(); + useEffect(() => { + if (searchParams.get("category")) + onCategoryChange(searchParams.get("category")); + }, [searchParams.get("category")]); - return ( -
-
-

课程分类

- onCategoryChange(e.target.value)} - className="flex flex-col space-y-3" - > - { - gateGory.isLoading? - () - : - ( - <> - 全部课程 - {gateGory.categories.map(category => ( - - {category} - - ))} - ) - } - - -
+ const { data: taxonomies } = api.taxonomy.getAll.useQuery({}); + + return ( +
+ {taxonomies?.map((tax) => { + return ( + <> +
+

+ {tax?.name} +

+ +
+ + ); + })} - -
-

难度等级

- onLevelChange(e.target.value)} - className="flex flex-col space-y-3" - > - { - levels.isLoading ? - () - : - ( - <> - 全部难度 - {levels.categories.map(level => ( - - {level} - - ))} - ) - } - - -
-
- ); +
+ ); } diff --git a/apps/web/src/app/main/courses/instructor/page.tsx b/apps/web/src/app/main/courses/instructor/page.tsx deleted file mode 100755 index a914925..0000000 --- a/apps/web/src/app/main/courses/instructor/page.tsx +++ /dev/null @@ -1,66 +0,0 @@ -import { PlusIcon } from "@heroicons/react/24/outline"; -import { CourseList } from "@web/src/components/models/course/list/course-list"; -import { Button } from "@web/src/components/common/element/Button"; -import { api } from "@nice/client"; -import { useState } from "react"; -import { CourseCard } from "@web/src/components/models/course/card/CourseCard"; -import { useNavigate } from "react-router-dom"; -import { useAuth } from "@web/src/providers/auth-provider"; - -export default function InstructorCoursesPage() { - const navigate = useNavigate(); - const [currentPage, setCurrentPage] = useState(1); - const { user } = useAuth(); - - const { data: paginationRes, refetch } = - api.post.findManyWithPagination.useQuery({ - page: currentPage, - pageSize: 8, - where: { - instructors: { - some: { - instructorId: user?.id, - }, - }, - }, - }); - - const handlePageChange = (page: number) => { - setCurrentPage(page); - refetch(); - }; - - return ( -
-
-
-

- 我教授的课程 -

- -
- ( - { - navigate(`/course/${course.id}/editor`, { - replace: true, - }); - }} - course={course} - /> - )} - /> -
-
- ); -} diff --git a/apps/web/src/app/main/courses/page.tsx b/apps/web/src/app/main/courses/page.tsx index a411d60..fa2fe9a 100755 --- a/apps/web/src/app/main/courses/page.tsx +++ b/apps/web/src/app/main/courses/page.tsx @@ -3,127 +3,33 @@ import { mockCourses } from "./mockData"; import FilterSection from "./components/FilterSection"; import CourseList from "./components/CourseList"; import { api } from "@nice/client"; -import { courseDetailSelect, CourseDto, LectureType, PostType } from "@nice/common"; +import { + courseDetailSelect, + CourseDto, + LectureType, + PostType, +} from "@nice/common"; import { useSearchParams } from "react-router-dom"; import { set } from "idb-keyval"; +import { useMainContext } from "../layout/MainProvider"; - +interface paginationData { + items: CourseDto[]; + totalPages: number; +} export default function CoursesPage() { - const [currentPage, setCurrentPage] = useState(1); - const [selectedCategory, setSelectedCategory] = useState(""); - const [selectedLevel, setSelectedLevel] = useState(""); - const pageSize = 9; - const [isAll,setIsAll] = useState(true) - const [searchParams, setSearchParams] = useSearchParams(); - let coursesData = [] - let isCourseLoading = false - if(!searchParams.get('searchValue')){ - console.log('no category') - const {data,isLoading} = api.post.findManyWithPagination.useQuery({ - where: { - type: PostType.COURSE, - terms:isAll?{}:{ - some: { - OR : [ - selectedCategory?{name:selectedCategory}:{}, - selectedLevel?{name:selectedLevel}:{} - ], - }, - }, + const { searchValue, setSearchValue } = useMainContext(); - }, - select:courseDetailSelect - }); - coursesData = data?.items - isCourseLoading = isLoading - }else{ - console.log('searchValue:'+searchParams.get('searchValue')) - const searchValue = searchParams.get('searchValue') - const {data,isLoading} = api.post.findManyWithPagination.useQuery({ - where: { - type: PostType.COURSE, - OR:[ - { title: { contains: searchValue, mode: 'insensitive' } }, - { subTitle: { contains: searchValue, mode: 'insensitive' } }, - { content: { contains: searchValue, mode: 'insensitive' } }, - { terms: { some: { name: { contains: searchValue, mode: 'insensitive' } } } } - ] - }, - select:courseDetailSelect - }) - coursesData = data?.items - isCourseLoading = isLoading - } - useEffect(() => { - if(searchParams.get('searchValue')==''){ - setSelectedCategory(''); - setSelectedLevel('') - } - }, [searchParams.get('searchValue')]); - const filteredCourses = useMemo(() => { - return isCourseLoading ? [] : coursesData; - }, [isCourseLoading, coursesData, selectedCategory, selectedLevel]); - - const paginatedCourses :CourseDto[]= useMemo(() => { - const startIndex = (currentPage - 1) * pageSize; - return isCourseLoading ? [] : (filteredCourses.slice(startIndex, startIndex + pageSize) as any as CourseDto[]); - }, [filteredCourses, currentPage]); - - const handlePageChange = (page: number) => { - setCurrentPage(page); - window.scrollTo({ top: 0, behavior: "smooth" }); - }; - useEffect(()=>{ - setCurrentPage(1) - },[]) - - return ( -
-
-
- {/* 左侧筛选区域 */} -
-
- { - console.log(category); - setSelectedCategory(category); - setCurrentPage(1); - setIsAll(!category) - setSearchParams({ searchValue: ''}); - }} - onLevelChange={(level) => { - setSelectedLevel(level); - setCurrentPage(1); - setIsAll(!level) - setSearchParams({ searchValue: ''}); - }} - /> -
-
- - {/* 右侧课程列表区域 */} -
-
-
- - 共找到 {filteredCourses.length} 门课程 - -
- -
-
-
+ <> +
+
{searchValue}
+
-
+ ); } diff --git a/apps/web/src/app/main/courses/student/page.tsx b/apps/web/src/app/main/courses/student/page.tsx deleted file mode 100755 index 2508c50..0000000 --- a/apps/web/src/app/main/courses/student/page.tsx +++ /dev/null @@ -1,48 +0,0 @@ -import { CourseList } from "@web/src/components/models/course/list/course-list"; -import { api } from "@nice/client"; -import { useState } from "react"; -import { CourseCard } from "@web/src/components/models/course/card/CourseCard"; -import { useAuth } from "@web/src/providers/auth-provider"; - -export default function StudentCoursesPage() { - const [currentPage, setCurrentPage] = useState(1); - const { user } = useAuth(); - - const { data: paginationRes, refetch } = - api.post.findManyWithPagination.useQuery({ - page: currentPage, - pageSize: 8, - where: { - enrollments: { - some: { - studentId: user?.id, - }, - }, - }, - }); - - const handlePageChange = (page: number) => { - setCurrentPage(page); - refetch(); - }; - - return ( -
-
-
-

- 我参加的课程 -

-
- ( - - )}> -
-
- ); -} diff --git a/apps/web/src/app/main/home/components/CategorySection.tsx b/apps/web/src/app/main/home/components/CategorySection.tsx index c2eff20..d0735fa 100755 --- a/apps/web/src/app/main/home/components/CategorySection.tsx +++ b/apps/web/src/app/main/home/components/CategorySection.tsx @@ -3,7 +3,7 @@ import { Typography, Button, Spin } from 'antd'; import { stringToColor, TaxonomySlug, TermDto } from '@nice/common'; import { api,} from '@nice/client'; import { ControlOutlined } from '@ant-design/icons'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate, useSearchParams } from 'react-router-dom'; const { Title, Text } = Typography; @@ -69,6 +69,8 @@ const CategorySection = () => { const [displayedCategories,setDisplayedCategories] = useState([]) useEffect(() => { console.log(courseCategoriesData); + // 如果 showAll 为 true，则显示所有分类数据， +// 如果 showAll 为 false，则只显示前 8 个分类数据， if(!isLoading){ if(showAll){ setDisplayedCategories(courseCategoriesData) @@ -84,9 +86,6 @@ const CategorySection = () => { // description: term.description // })) || []; // },[data]) - - - const handleMouseEnter = useCallback((index: number) => { setHoveredIndex(index); }, []); @@ -127,6 +126,7 @@ const CategorySection = () => { onClick={()=>{ console.log(category.name) navigate(`/courses?category=${category.name}`) + window.scrollTo({ top: 0, behavior: 'smooth' }) }} >
diff --git a/apps/web/src/app/main/home/components/CoursesSection.tsx b/apps/web/src/app/main/home/components/CoursesSection.tsx index c6a2969..2117baa 100755 --- a/apps/web/src/app/main/home/components/CoursesSection.tsx +++ b/apps/web/src/app/main/home/components/CoursesSection.tsx @@ -1,275 +1,178 @@ -import React, { useState, useMemo, useEffect } from 'react'; -import { useNavigate, useParams, useSearchParams } from 'react-router-dom'; -import { Button, Card, Typography, Tag, Progress, Spin } from 'antd'; +import React, { useState, useMemo, useEffect } from "react"; +import { useNavigate } from "react-router-dom"; +import { Button, Card, Typography, Tag, Spin, Empty } from "antd"; import { - PlayCircleOutlined, - UserOutlined, - ClockCircleOutlined, - TeamOutlined, - StarOutlined, - ArrowRightOutlined, - EyeOutlined, -} from '@ant-design/icons'; -import { TaxonomySlug, TermDto } from '@nice/common'; -import { api } from '@nice/client'; -// const {courseId} = useParams(); + PlayCircleOutlined, + TeamOutlined, + ArrowRightOutlined, +} from "@ant-design/icons"; +import { CourseDto, TaxonomySlug, TermDto } from "@nice/common"; +import { api } from "@nice/client"; +import CourseCard from "../../courses/components/CourseCard"; 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: { - //TaxonomySlug.CATEGORY - slug: type - } - }, - include: { - children: true - }, - take: 10, // 只取前10个 - orderBy: { - createdAt: 'desc', // 按创建时间降序排列 - }, - }) - 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, + }, + }, + include: { + children: true, + }, + take: 10, // 只取前10个 + orderBy: {}, + }); + const categories = useMemo(() => { + const allCategories = isLoading + ? [] + : data?.map((course) => course.name); + return [...Array.from(new Set(allCategories))]; + }, [data]); + return { categories, isLoading }; } +// 不同分类跳转 +function useFetchCoursesByCategory(category: string) { + const isAll = category === "全部"; + const { data, isLoading }: { data: CourseDto[]; isLoading: boolean } = + api.post.findMany.useQuery({ + where: isAll + ? {} + : { + terms: { + some: { + name: category, + }, + }, + }, + take: 8, + include: { + terms: true, + depts: true, + }, + }); - + return { data, isLoading }; +} const { Title, Text } = Typography; - -interface Course { - id: number; - title: string; - instructor: string; - students: number; - rating: number; - level: string; - duration: string; - category: string; - progress: number; - thumbnail: string; -} interface CoursesSectionProps { - title: string; - description: string; - courses: Course[]; - isLoading:boolean - initialVisibleCoursesCount?: number; + title: string; + description: string; + initialVisibleCoursesCount?: number; } - const CoursesSection: React.FC = ({ - title, - description, - courses, - isLoading, - initialVisibleCoursesCount = 8, + title, + description, }) => { - const navigate = useNavigate(); - const [selectedCategory, setSelectedCategory] = useState('全部'); - const [visibleCourses, setVisibleCourses] = useState(initialVisibleCoursesCount); - const gateGory: GetTaxonomyProps = useGetTaxonomy({ - type: TaxonomySlug.CATEGORY, - }) - // const { data } = api.post.findMany.useQuery({ - // where: {}, // 必选参数 - // include: { // 关联查询 - // instructors: true - // }, - // orderBy: { // 排序规则 - // createdAt: 'desc' - // }, - // take: 8 - // }) - // useEffect(() => { - // // 添加空值保护 - // if (data && data.length > 0) { - // console.log('有效数据:', data) - // // 执行后续操作 - // } else { - // console.log('无数据或加载中') - // } - // }, [data]) - // const formatted = data?.map(course => ({ - // id: course.id, - // title: course.title - // })); - const handleClick = (course: Course) => { - navigate(`/course?courseId=${course.id}/detail`); - } + const navigate = useNavigate(); + const [selectedCategory, setSelectedCategory] = useState("全部"); + const gateGory: GetTaxonomyProps = useGetTaxonomy({ + type: TaxonomySlug.CATEGORY, + }); + const { data, isLoading: isDataLoading } = + useFetchCoursesByCategory(selectedCategory); + const filteredCourses = useMemo(() => { + return selectedCategory === "全部" + ? data + : data?.filter((c) => + c.terms.some((t) => t.name === selectedCategory) + ); + }, [selectedCategory, data]); + const displayedCourses = isDataLoading ? [] : filteredCourses; + return ( +
+
+
+
+ + {title} + + + {description} + +
+
- const filteredCourses = useMemo(() => { - return selectedCategory === '全部' - ? courses - : courses.filter((course) => course.category === selectedCategory); - }, [selectedCategory, courses]); +
+ {gateGory.isLoading ? ( + + ) : ( + <> + setSelectedCategory("全部")} + className={`px-6 py-2 text-base cursor-pointer rounded-full transition-all duration-300 ${ + selectedCategory === "全部" + ? "bg-blue-600 text-white shadow-lg" + : "bg-white text-gray-600 hover:bg-gray-100" + }`}> + 全部 + + {gateGory.categories.map((category) => ( + { + setSelectedCategory(category); + }} + className={`px-6 py-2 text-base cursor-pointer rounded-full transition-all duration-300 ${ + selectedCategory === category + ? "bg-blue-600 text-white shadow-lg" + : "bg-white text-gray-600 hover:bg-gray-100" + }`}> + {category} + + ))} + + )} +
- const displayedCourses = isLoading ? [] : filteredCourses.slice(0, visibleCourses); - return ( -
-
-
-
- - {title} - - - {description} - -
-
- -
- {gateGory.isLoading ? : - ( - <> - setSelectedCategory("全部")} - className={`px-6 py-2 text-base cursor-pointer rounded-full transition-all duration-300 ${selectedCategory === "全部" - ? 'bg-blue-600 text-white shadow-lg' - : 'bg-white text-gray-600 hover:bg-gray-100' - }`} - >全部 - { - gateGory.categories.map((category) => ( - { - setSelectedCategory(category) - console.log(category) - }} - className={`px-6 py-2 text-base cursor-pointer rounded-full transition-all duration-300 ${selectedCategory === category - ? 'bg-blue-600 text-white shadow-lg' - : 'bg-white text-gray-600 hover:bg-gray-100' - }`} - - > - {category} - - )) - } - - ) - } -
- -
- {displayedCourses.map((course) => ( - handleClick(course)} - key={course.id} - hoverable - className="group overflow-hidden rounded-2xl border border-gray-200 bg-white - shadow-xl hover:shadow-2xl transition-all duration-300 transform hover:-translate-y-2" - cover={ -
-
-
- - {course.progress > 0 && ( -
- {/* */} -
- )} -
- } - > -
-
- - {course.category} - - - {course.level} - -
- - <button > {course.title}</button> - - -
- -
- - {course.instructor} - -
- - - 观看次数{course.progress}次 - -
-
- -
- -
- - ))} -
- - {filteredCourses?.length >= visibleCourses && ( -
-
-
- -
-
- )} -
-
- ); +
+ {displayedCourses.length === 0 ? ( +
+ +
+ ) : ( + displayedCourses?.map((course) => ( + + )) + )} +
+ { +
+
+
+ +
+
+ } +
+
+ ); }; - export default CoursesSection; diff --git a/apps/web/src/app/main/home/components/HeroSection.tsx b/apps/web/src/app/main/home/components/HeroSection.tsx index 0399c32..10ecbfe 100755 --- a/apps/web/src/app/main/home/components/HeroSection.tsx +++ b/apps/web/src/app/main/home/components/HeroSection.tsx @@ -1,4 +1,4 @@ -import React, { useRef, useCallback } from "react"; +import React, { useRef, useCallback, useEffect } from "react"; import { Button, Carousel, Typography } from "antd"; import { TeamOutlined, @@ -48,12 +48,11 @@ const carouselItems: CarouselItem[] = [ const HeroSection = () => { const carouselRef = useRef(null); const { statistics, baseSetting } = useAppConfig(); - const platformStats: PlatformStat[] = [ - { icon: , value: "50,000+", label: "注册学员" }, - { icon: , value: "1,000+", label: "精品课程" }, - // { icon: , value: '98%', label: '好评度' }, - { icon: , value: "4552", label: "观看次数" }, + { icon: , value: statistics.staffs.toString(), label: "注册学员" }, + { icon: , value: statistics.courses.toString(), label: "精品课程" }, + { icon: , value: statistics.lectures.toString(), label: '课程章节' }, + { icon: , value: statistics.reads.toString(), label: "观看次数" }, ]; const handlePrev = useCallback(() => { carouselRef.current?.prev(); @@ -62,7 +61,11 @@ const HeroSection = () => { const handleNext = useCallback(() => { carouselRef.current?.next(); }, []); - //const {slides:carouselItems} = useAppConfig() + const { slides } = useAppConfig() + useEffect(() => { + //slides.push(('https://s.cn.bing.net/th?id=OHR.GiantCuttlefish_ZH-CN0670915878_1920x1080.webp&qlt=50')) + //console.log(slides) + }, []) return (
@@ -74,20 +77,20 @@ const HeroSection = () => { dots={{ className: "carousel-dots !bottom-32 !z-20", }}> - {Array.isArray(carouselItems) ? ( - carouselItems.map((item, index) => ( + {Array.isArray(slides)? + (slides.map((item, index) => (
-
+ /> */}
{/* Content Container */} @@ -115,8 +118,8 @@ const HeroSection = () => {
{/* Stats Container */} -
-
+
+
{platformStats.map((stat, index) => (
{ - // const mockCourses = [ - // { - // id: 1, - // title: 'Python 零基础入门', - // instructor: '张教授', - // students: 12000, - // rating: 4.8, - // level: '入门', - // duration: '36小时', - // category: '编程语言', - // progress: 16, - // thumbnail: '/images/course1.jpg', - // }, - // { - // id: 2, - // title: '数据结构与算法', - // instructor: '李教授', - // students: 8500, - // rating: 4.9, - // level: '进阶', - // duration: '48小时', - // category: '计算机基础', - // progress: 35, - // thumbnail: '/images/course2.jpg', - // }, - // { - // id: 3, - // title: '前端开发实战', - // instructor: '王教授', - // students: 10000, - // rating: 4.7, - // level: '中级', - // duration: '42小时', - // category: '前端开发', - // progress: 68, - // thumbnail: '/images/course3.jpg', - // }, - // { - // id: 4, - // title: 'Java企业级开发', - // instructor: '刘教授', - // students: 9500, - // rating: 4.6, - // level: '高级', - // duration: '56小时', - // category: '编程语言', - // progress: 15, - // thumbnail: '/images/course4.jpg', - // }, - // { - // id: 5, - // title: '人工智能基础', - // instructor: '陈教授', - // students: 11000, - // rating: 4.9, - // level: '中级', - // duration: '45小时', - // category: '人工智能', - // progress: 20, - // thumbnail: '/images/course5.jpg', - // }, - // { - // id: 6, - // title: '大数据分析', - // instructor: '赵教授', - // students: 8000, - // rating: 4.8, - // level: '进阶', - // duration: '50小时', - // category: '数据科学', - // progress: 45, - // thumbnail: '/images/course6.jpg', - // }, - // { - // id: 7, - // title: '云计算实践', - // instructor: '孙教授', - // students: 7500, - // rating: 4.7, - // level: '高级', - // duration: '48小时', - // category: '云计算', - // progress: 15, - // thumbnail: '/images/course7.jpg', - // }, - // { - // id: 8, - // title: '移动应用开发', - // instructor: '周教授', - // students: 9000, - // rating: 4.8, - // level: '中级', - // duration: '40小时', - // category: '移动开发', - // progress: 70, - // thumbnail: '/images/course8.jpg', - // }, - // ]; - const { data ,isLoading}: { data: Courses[] , isLoading:boolean} = api.post.findMany.useQuery({ - where: {}, - include: { - instructors: true, - }, - orderBy: { - createdAt: 'desc' // 按创建时间降序排列 - }, - take: 8 // 只获取前8个课程 - }); - useEffect(() => { - if (data) { - console.log('mockCourses data:', data); - } - }, [data]); - - // 数据处理逻辑 -// 修正依赖数组 -return ( -
- - - {/* {formattedCourses.map((course)=>{ - return ( - <> - course.title - - ) - })} */} - {/* */} - - {/* */} -
-); + + return ( +
+ + + +
+ ); }; -export default HomePage; \ No newline at end of file +export default HomePage; diff --git a/apps/web/src/app/main/layout/MainHeader.tsx b/apps/web/src/app/main/layout/MainHeader.tsx index 76a15b4..47503b5 100755 --- a/apps/web/src/app/main/layout/MainHeader.tsx +++ b/apps/web/src/app/main/layout/MainHeader.tsx @@ -1,18 +1,17 @@ -import { useState } from "react"; +import { useContext, useState } from "react"; import { Input, Layout, Avatar, Button, Dropdown } from "antd"; import { EditFilled, SearchOutlined, UserOutlined } from "@ant-design/icons"; import { useAuth } from "@web/src/providers/auth-provider"; -import { useNavigate } from "react-router-dom"; +import { useNavigate, useSearchParams } from "react-router-dom"; import { UserMenu } from "./UserMenu/UserMenu"; import { NavigationMenu } from "./NavigationMenu"; - +import { useMainContext } from "./MainProvider"; const { Header } = Layout; export function MainHeader() { - const [searchValue, setSearchValue] = useState(""); const { isAuthenticated, user } = useAuth(); const navigate = useNavigate(); - + const { searchValue, setSearchValue } = useMainContext(); return (
@@ -36,12 +35,17 @@ export function MainHeader() { value={searchValue} onChange={(e) => setSearchValue(e.target.value)} onPressEnter={(e) => { - //console.log(e) - setSearchValue(""); - navigate( - `/courses/?searchValue=${searchValue}` - ); - window.scrollTo({ top: 0, behavior: "smooth" }); + if ( + !window.location.pathname.startsWith( + "/courses/" + ) + ) { + navigate(`/courses/`); + window.scrollTo({ + top: 0, + behavior: "smooth", + }); + } }} />
diff --git a/apps/web/src/app/main/layout/MainLayout.tsx b/apps/web/src/app/main/layout/MainLayout.tsx index 09f5670..0a0074b 100755 --- a/apps/web/src/app/main/layout/MainLayout.tsx +++ b/apps/web/src/app/main/layout/MainLayout.tsx @@ -1,19 +1,21 @@ -import { Layout } from 'antd'; -import { Outlet } from 'react-router-dom'; -import { MainHeader } from './MainHeader'; -import { MainFooter } from './MainFooter'; +import { Layout } from "antd"; +import { Outlet } from "react-router-dom"; +import { MainHeader } from "./MainHeader"; +import { MainFooter } from "./MainFooter"; +import { MainProvider } from "./MainProvider"; const { Content } = Layout; export function MainLayout() { - return ( - - - - - - - - - ); -} \ No newline at end of file + return ( + + + + + + + + + + ); +} diff --git a/apps/web/src/app/main/layout/MainProvider.tsx b/apps/web/src/app/main/layout/MainProvider.tsx new file mode 100644 index 0000000..d503c39 --- /dev/null +++ b/apps/web/src/app/main/layout/MainProvider.tsx @@ -0,0 +1,31 @@ +import React, { createContext, ReactNode, useContext, useState } from "react"; + +interface MainContextType { + searchValue?: string; + setSearchValue?: React.Dispatch>; +} + +const MainContext = createContext(null); +interface MainProviderProps { + children: ReactNode; +} + +export function MainProvider({ children }: MainProviderProps) { + const [searchValue, setSearchValue] = useState(""); + return ( + + {children} + + ); +} +export const useMainContext = () => { + const context = useContext(MainContext); + if (!context) { + throw new Error("useMainContext must be used within MainProvider"); + } + return context; +}; diff --git a/apps/web/src/components/models/term/term-select.tsx b/apps/web/src/components/models/term/term-select.tsx index 045e0e1..ce5d9be 100755 --- a/apps/web/src/components/models/term/term-select.tsx +++ b/apps/web/src/components/models/term/term-select.tsx @@ -23,7 +23,7 @@ export default function TermSelect({ value, onChange, className, - placeholder = "选择单位", + placeholder = "选择分类", multiple = false, taxonomyId, domainId, @@ -190,4 +190,4 @@ export default function TermSelect({ onDropdownVisibleChange={handleDropdownVisibleChange} /> ); -} \ No newline at end of file +} diff --git a/apps/web/src/components/models/term/term-tree.tsx b/apps/web/src/components/models/term/term-tree.tsx new file mode 100644 index 0000000..ae88a68 --- /dev/null +++ b/apps/web/src/components/models/term/term-tree.tsx @@ -0,0 +1,199 @@ +import React, { useEffect, useState, useCallback } from "react"; +import { Tree } from "antd"; +import type { DataNode, TreeProps } from "antd/es/tree"; +import { getUniqueItems } from "@nice/common"; +import { api } from "@nice/client"; + +interface TermData { + value?: string; + children?: TermData[]; + key?: string; + hasChildren?: boolean; + isLeaf?: boolean; + pId?: string; + title?: React.ReactNode; + data?: any; + order?: string; + id?: string; +} + +interface TermTreeProps { + defaultValue?: string | string[]; + value?: string | string[]; + onChange?: (value: string | string[]) => void; + multiple?: boolean; + taxonomyId?: string; + disabled?: boolean; + className?: string; + domainId?: string; + style?: React.CSSProperties; +} + +const TermTree: React.FC = ({ + defaultValue, + value, + onChange, + className, + multiple = false, + taxonomyId, + domainId, + disabled = false, + style, +}) => { + const utils = api.useUtils(); + const [treeData, setTreeData] = useState([]); + + const processTermData = (terms: TermData[]): TermData[] => { + return terms.map((term) => ({ + ...term, + key: term.key || term.id || "", + title: term.title || term.value, + children: term.children + ? processTermData(term.children) + : undefined, + })); + }; + + const fetchParentTerms = useCallback( + async (termIds: string | string[], taxonomyId?: string) => { + const idsArray = Array.isArray(termIds) + ? termIds + : [termIds].filter(Boolean); + try { + const result = await utils.term.getParentSimpleTree.fetch({ + termIds: idsArray, + taxonomyId, + domainId, + }); + return processTermData(result); + } catch (error) { + console.error( + "Error fetching parent terms for termIds", + idsArray, + ":", + error + ); + throw error; + } + }, + [utils, domainId] + ); + + const fetchTerms = useCallback(async () => { + try { + const rootTerms = await utils.term.getChildSimpleTree.fetch({ + taxonomyId, + domainId, + }); + let combinedTerms = processTermData(rootTerms); + if (defaultValue) { + const defaultTerms = await fetchParentTerms( + defaultValue, + taxonomyId + ); + combinedTerms = getUniqueItems( + [...treeData, ...combinedTerms, ...defaultTerms], + "key" + ); + } + if (value) { + const valueTerms = await fetchParentTerms(value, taxonomyId); + combinedTerms = getUniqueItems( + [...treeData, ...combinedTerms, ...valueTerms], + "key" + ); + } + + setTreeData(combinedTerms); + } catch (error) { + console.error("Error fetching terms:", error); + } + }, [ + defaultValue, + value, + taxonomyId, + utils, + fetchParentTerms, + domainId, + treeData, + ]); + + useEffect(() => { + fetchTerms(); + }, [fetchTerms]); + + const onLoadData = async ({ key }: any) => { + try { + const result = await utils.term.getChildSimpleTree.fetch({ + termIds: [key], + taxonomyId, + domainId, + }); + const processedResult = processTermData(result); + const newItems = getUniqueItems( + [...treeData, ...processedResult], + "key" + ); + setTreeData(newItems); + } catch (error) { + console.error( + "Error loading data for node with key", + key, + ":", + error + ); + } + }; + + const handleCheck: TreeProps["onCheck"] = (checkedKeys, info) => { + if (onChange) { + if (multiple) { + onChange(checkedKeys as string[]); + } else { + onChange((checkedKeys as string[])[0] || ""); + } + } + }; + + const handleExpand = async (expandedKeys: React.Key[]) => { + try { + const allKeyIds = expandedKeys + .map((key) => key.toString()) + .filter(Boolean); + const expandedNodes = await utils.term.getChildSimpleTree.fetch({ + termIds: allKeyIds, + taxonomyId, + domainId, + }); + const processedNodes = processTermData(expandedNodes); + const newItems = getUniqueItems( + [...treeData, ...processedNodes], + "key" + ); + setTreeData(newItems); + } catch (error) { + console.error( + "Error expanding nodes with keys", + expandedKeys, + ":", + error + ); + } + }; + + return ( + + ); +}; + +export default TermTree; diff --git a/apps/web/src/components/models/term/util.ts b/apps/web/src/components/models/term/util.ts index c54910a..f7aebc8 100755 --- a/apps/web/src/components/models/term/util.ts +++ b/apps/web/src/components/models/term/util.ts @@ -1,15 +1,16 @@ -import { TreeDataNode } from "@nice/common" +import { TreeDataNode } from "@nice/common"; +import React from "react"; export const treeVisitor = ( - data: TreeDataNode[], - key: React.Key, - callback: (node: TreeDataNode, i: number, data: TreeDataNode[]) => void + data: TreeDataNode[], + key: React.Key, + callback: (node: TreeDataNode, i: number, data: TreeDataNode[]) => void ) => { - for (let i = 0; i < data.length; i++) { - if (data[i].key === key) { - return callback(data[i], i, data); - } - if (data[i].children) { - treeVisitor(data[i].children!, key, callback); - } - } -}; \ No newline at end of file + for (let i = 0; i < data.length; i++) { + if (data[i].key === key) { + return callback(data[i], i, data); + } + if (data[i].children) { + treeVisitor(data[i].children!, key, callback); + } + } +}; diff --git a/apps/web/src/routes/index.tsx b/apps/web/src/routes/index.tsx index 70f60a8..07c7c9c 100755 --- a/apps/web/src/routes/index.tsx +++ b/apps/web/src/routes/index.tsx @@ -8,8 +8,6 @@ import { import ErrorPage from "../app/error"; import WithAuth from "../components/utils/with-auth"; import LoginPage from "../app/login"; -import StudentCoursesPage from "../app/main/courses/student/page"; -import InstructorCoursesPage from "../app/main/courses/instructor/page"; import HomePage from "../app/main/home/page"; import { CourseDetailPage } from "../app/main/course/detail/page"; import { CourseBasicForm } from "../components/models/course/editor/form/CourseBasicForm"; @@ -41,7 +39,6 @@ export type CustomRouteObject = | CustomIndexRouteObject | CustomNonIndexRouteObject; export const routes: CustomRouteObject[] = [ - { path: "/", errorElement: , @@ -66,39 +63,16 @@ export const routes: CustomRouteObject[] = [ path: "courses", element: , }, - { - path: "my-courses", - }, + { path: "profiles", }, - { - path: "courses", - children: [ - { - path: "student", - element: ( - - - - ), - }, - { - path: "instructor", - element: ( - - - - ), - }, - ], - }, + // 课程预览页面 { path: "coursePreview/:id?", - element: - } - + element: , + }, ], }, { @@ -106,20 +80,27 @@ export const routes: CustomRouteObject[] = [ children: [ { path: ":id?/editor", - element: , + element: ( + + + + ), children: [ { index: true, - element: , + element: ( + + + + ), }, - // { - // path: "goal", - // element: , - // }, + { path: "content", element: ( - + + + ), }, // { @@ -146,5 +127,4 @@ export const routes: CustomRouteObject[] = [ }, ]; - export const router = createBrowserRouter(routes); diff --git a/packages/common/src/models/post.ts b/packages/common/src/models/post.ts index de740d5..6994d4b 100755 --- a/packages/common/src/models/post.ts +++ b/packages/common/src/models/post.ts @@ -79,4 +79,5 @@ export type CourseDto = Course & { sections?: SectionDto[]; terms: Term[]; lectureCount?: number; + depts:Department[] };