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

apps/server/src/models/resource/processor/ImageProcessor.ts

@@ -14,7 +14,7 @@ export class ImageProcessor extends BaseProcessor {
     const { url } = resource;
     const filepath = getUploadFilePath(url);
     const originMeta = resource.meta as unknown as FileMetadata;
-    if (!originMeta.mimeType?.startsWith('image/')) {
+    if (!originMeta.filetype?.startsWith('image/')) {
       this.logger.log(`Skipping non-image resource: ${resource.id}`);
       return resource;
     }

apps/server/src/models/resource/processor/VideoProcessor.ts

@@ -19,7 +19,7 @@ export class VideoProcessor extends BaseProcessor {
     );
 
     const originMeta = resource.meta as unknown as FileMetadata;
-    if (!originMeta.mimeType?.startsWith('video/')) {
+    if (!originMeta.filetype?.startsWith('video/')) {
       this.logger.log(`Skipping non-video resource: ${resource.id}`);
       return resource;
     }

apps/server/src/models/resource/types.ts

@@ -11,7 +11,7 @@ export interface ProcessResult {
 
 export interface BaseMetadata {
     size: number
-    mimeType: string
+    filetype: string
     filename: string
     extension: string
     modifiedAt: Date

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,14 +17,12 @@ 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,
-		},
+  })
-	});
-	// const { data } = api.term;
   return (
     <div className="bg-white p-6 rounded-lg shadow-sm space-y-6">
       <div>
@@ -31,13 +30,23 @@ export default function FilterSection({
         <Radio.Group
           value={selectedCategory}
           onChange={(e) => onCategoryChange(e.target.value)}
-					className="flex flex-col space-y-3">
+          className="flex flex-col space-y-3"
+        >
+        {
+          gateGory.isLoading?
+          (<Spin/>)
+          :
+          (
+          <>
             <Radio value="">全部课程</Radio>
-					{categories.map((category) => (
+            {gateGory.categories.map(category => (
               <Radio key={category} value={category}>
                 {category}
               </Radio>
             ))}
+          </>)
+        }
+          
         </Radio.Group>
       </div>
 
@@ -48,13 +57,23 @@ export default function FilterSection({
         <Radio.Group
           value={selectedLevel}
           onChange={(e) => onLevelChange(e.target.value)}
-					className="flex flex-col space-y-3">
+          className="flex flex-col space-y-3"
+        >
+          {
+            levels.isLoading ?
+            (<Spin/>)
+            :
+            (
+            <>
             <Radio value="">全部难度</Radio>
-					{levels?.map((level) => (
+            {levels.categories.map(level => (
-						<Radio key={level.id} value={level.id}>
+              <Radio key={level} value={level}>
-							{level.name}
+                {level}
               </Radio>
             ))}
+          </>)
+          }
+          
         </Radio.Group>
       </div>
     </div>