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

apps/web/src/app/main/course/preview/components/coursePreviewAllmsg.tsx

@@ -0,0 +1,7 @@
+export function coursePreviewAllmsg() {
+    return (
+        <div className="min-h-screen">
+            helloword
+        </div>
+    )
+}

apps/web/src/app/main/course/preview/page.tsx

@@ -0,0 +1,7 @@
+export function CoursePreview(){
+    return(
+       <div className="min-h-screen">
+         helloword
+       </div>
+    )
+}

apps/web/src/app/main/courses/components/FilterSection.tsx

@@ -1,7 +1,8 @@
-import { Checkbox, Divider, Radio, Space } from "antd";
+import { Checkbox, Divider, Radio, Space , Spin} from 'antd';
-import { categories, levels } from "../mockData";
+import { categories, levels } from '../mockData';
-import { api } from "@nice/client";
+import { TaxonomySlug, TermDto } from '@nice/common';
-import { TaxonomySlug } from "@nice/common";
+import { GetTaxonomyProps, useGetTaxonomy } from '@web/src/hooks/useGetTaxonomy';
+import { useMemo } from 'react';
 
 interface FilterSectionProps {
 	selectedCategory: string;
@@ -16,47 +17,65 @@ export default function FilterSection({
 	onCategoryChange,
 	onLevelChange,
 }: FilterSectionProps) {
-	const { data: levels, isLoading } = api.term.findMany.useQuery({
+  const gateGory : GetTaxonomyProps = useGetTaxonomy({
-		where: {
+      type: TaxonomySlug.CATEGORY,
-			taxonomy: {
+  })
-				slug: TaxonomySlug.LEVEL,
+  const levels : GetTaxonomyProps = useGetTaxonomy({
-			},
+      type: TaxonomySlug.LEVEL,
-		},
+  })
-	});
+  return (
-	// const { data } = api.term;
+    <div className="bg-white p-6 rounded-lg shadow-sm space-y-6">
-	return (
+      <div>
-		<div className="bg-white p-6 rounded-lg shadow-sm space-y-6">
+        <h3 className="text-lg font-medium mb-4">课程分类</h3>
-			<div>
+        <Radio.Group
-				<h3 className="text-lg font-medium mb-4">课程分类</h3>
+          value={selectedCategory}
-				<Radio.Group
+          onChange={(e) => onCategoryChange(e.target.value)}
-					value={selectedCategory}
+          className="flex flex-col space-y-3"
-					onChange={(e) => onCategoryChange(e.target.value)}
+        >
-					className="flex flex-col space-y-3">
+        {
-					<Radio value="">全部课程</Radio>
+          gateGory.isLoading?
-					{categories.map((category) => (
+          (<Spin/>)
-						<Radio key={category} value={category}>
+          :
-							{category}
+          (
-						</Radio>
+          <>
-					))}
+            <Radio value="">全部课程</Radio>
-				</Radio.Group>
+            {gateGory.categories.map(category => (
-			</div>
+              <Radio key={category} value={category}>
+                {category}
+              </Radio>
+            ))}
+          </>)
+        }
+          
+        </Radio.Group>
+      </div>
 
 			<Divider className="my-6" />
 
-			<div>
+      <div>
-				<h3 className="text-lg font-medium mb-4">难度等级</h3>
+        <h3 className="text-lg font-medium mb-4">难度等级</h3>
-				<Radio.Group
+        <Radio.Group
-					value={selectedLevel}
+          value={selectedLevel}
-					onChange={(e) => onLevelChange(e.target.value)}
+          onChange={(e) => onLevelChange(e.target.value)}
-					className="flex flex-col space-y-3">
+          className="flex flex-col space-y-3"
-					<Radio value="">全部难度</Radio>
+        >
-					{levels?.map((level) => (
+          {
-						<Radio key={level.id} value={level.id}>
+            levels.isLoading ?
-							{level.name}
+            (<Spin/>)
-						</Radio>
+            :
-					))}
+            (
-				</Radio.Group>
+            <>
-			</div>
+            <Radio value="">全部难度</Radio>
-		</div>
+            {levels.categories.map(level => (
-	);
+              <Radio key={level} value={level}>
+                {level}
+              </Radio>
+            ))}
+          </>)
+          }
+          
+        </Radio.Group>
+      </div>
+    </div>
+  );
 }