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-25 17:47:11 +08:00
parent 6f560dc440 9c717a10df
commit b3f3193a8b
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,8 @@ export default function CourseCard({ course }: CourseCardProps) {
const handleClick = (course: CourseDto) => { const handleClick = (course: CourseDto) => {
navigate(`/course/${course.id}/detail`); navigate(`/course/${course.id}/detail`);
}; };
return ( return (
<Card <Card
onClick={() => handleClick(course)} onClick={() => handleClick(course)}
@ -39,10 +41,26 @@ export default function CourseCard({ course }: CourseCardProps) {
}> }>
<div className="px-4"> <div className="px-4">
<div className="flex gap-2 mb-4"> <div className="flex gap-2 mb-4">
<Tag {course.terms.map((term) => {
return (
<Tag
key={term.id}
// color={term.taxonomy.slug===TaxonomySlug.CATEGORY? "blue" : "green"}
color={term?.taxonomy?.slug === TaxonomySlug.CATEGORY
? "blue"
: term?.taxonomy?.slug === TaxonomySlug.LEVEL
? "green"
: "blue"}
className="px-3 py-1 rounded-full bg-blue-100 text-blue-600 border-0">
{term.name}
</Tag>
);
})}
{/* <Tag
color="blue" color="blue"
className="px-3 py-1 rounded-full bg-blue-100 text-blue-600 border-0"> className="px-3 py-1 rounded-full bg-blue-100 text-blue-600 border-0">
{course.terms?.[0].name} {course.terms?.[0].name}
</Tag> </Tag>
<Tag <Tag
@ -55,7 +73,7 @@ export default function CourseCard({ course }: CourseCardProps) {
} }
className="px-3 py-1 rounded-full border-0"> className="px-3 py-1 rounded-full border-0">
{course.terms?.[1].name} {course.terms?.[1].name}
</Tag> </Tag> */}
</div> </div>
<Title <Title
level={4} level={4}
@ -67,7 +85,8 @@ export default function CourseCard({ course }: CourseCardProps) {
<TeamOutlined className="text-blue-500 text-lg transform group-hover:scale-110 transition-transform duration-300" /> <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"> <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 hover:text-blue-600 transition-colors duration-300 truncate max-w-[120px]">
{course?.depts?.[0]?.name} {(course.depts.map((depts)=>depts.name))}
{/* {course?.depts?.[0]?.name} */}
</Text> </Text>
</div> </div>
<span className="text-xs font-medium text-gray-500"> <span className="text-xs font-medium text-gray-500">

3
apps/web/src/app/main/home/components/CoursesSection.tsx
View File

@ -86,6 +86,9 @@ const CoursesSection: React.FC<CoursesSectionProps> = ({
); );
}, [selectedCategory, data]); }, [selectedCategory, data]);
const displayedCourses = isDataLoading ? [] : filteredCourses; const displayedCourses = isDataLoading ? [] : filteredCourses;
useEffect(()=>{
console.log(data)
})
return ( return (
<section className="relative py-20 overflow-hidden bg-gradient-to-b from-gray-50 to-white"> <section className="relative py-20 overflow-hidden bg-gradient-to-b from-gray-50 to-white">
<div className="max-w-screen-2xl mx-auto px-6 relative"> <div className="max-w-screen-2xl mx-auto px-6 relative">

4
packages/common/src/models/term.ts
View File

@ -1,8 +1,10 @@
import { Term } from "@prisma/client"; import { Taxonomy, Term } from "@prisma/client";
import { ResPerm } from "./rbac"; import { ResPerm } from "./rbac";
import { TaxonomySlug } from "../enum";
export type TermDto = Term & { export type TermDto = Term & {
permissions: ResPerm; permissions: ResPerm;
children: TermDto[]; children: TermDto[];
hasChildren: boolean; hasChildren: boolean;
taxonomy: Taxonomy
}; };