Merge pull request #275 from daodaoedu/feat/project

feat: my island page
daodaoedu · Feb 11, 2025 · 81d0978 · 81d0978
2 parents 652a722 + 8c58c5a
commit 81d0978
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 18 deletions.
diff --git a/components/Projects/Project/type.ts b/components/Projects/Project/type.ts
@@ -1,3 +1,5 @@
+import { Milestone } from "@/contexts/Milestones/type";
+
 interface User {
   id: string;
   name: string;
@@ -22,6 +24,7 @@ export interface Project {
   outcome: string[];
   outcomeDescription: string;
   user: User;
+  milestones: Milestone[];
 }
 
 export const DEFAULT_PROJECT: Project = {
@@ -46,4 +49,5 @@ export const DEFAULT_PROJECT: Project = {
     name: "",
     _id: "",
   },
+  milestones: [],
 };
diff --git a/hooks/api/project/useProjectQuery.ts b/hooks/api/project/useProjectQuery.ts
@@ -1,5 +1,6 @@
 import useSWR from 'swr';
 import { getProjectEndpoint } from '@/services/project';
+import { Project } from '@/components/Projects/Project/type';
 
 interface UseProjectQueryProps {
   isMe?: boolean;
@@ -10,5 +11,7 @@ export default function useProjectQuery({
   isMe,
   projectId,
 }: UseProjectQueryProps = {}) {
-  return useSWR(projectId || isMe ? getProjectEndpoint({ isMe, projectId }) : null);
+  return useSWR<Project[]>(
+    projectId || isMe ? getProjectEndpoint({ isMe, projectId }) : null
+  );
 }
diff --git a/hooks/useClickOutside.tsx b/hooks/useClickOutside.tsx
@@ -16,7 +16,7 @@ export default function useClickOutside<T extends HTMLElement>({
   useEffect(() => {
     const handleClick = (e: MouseEvent) => {
       if (
-        e.target instanceof HTMLElement &&
+        (e.target instanceof HTMLElement || e.target instanceof SVGElement) &&
         ref.current?.contains?.(e.target)
       ) {
         return;

diff --git a/pages/manage/index.tsx b/pages/manage/index.tsx
@@ -10,11 +10,16 @@ import { GoArrowUpRight } from 'react-icons/go';
 import { PiCalendarBlankBold } from 'react-icons/pi';
 import getManageLayout from '@/layout/ManageLayout';
 import useClickOutside from '@/hooks/useClickOutside';
+import { useProjectReviewQuery } from '@/hooks/api/review';
+import { useProjectQuery } from '@/hooks/api/project';
 import SEOConfig from '@/shared/components/SEO';
 import Dropdown from '@/shared/components/Dropdown';
 import Button from '@/shared/components/Button';
 import Collapse from '@/shared/components/Collapse';
-// import ReviewCard from '@/components/Review/Card';
+import ReviewCard from '@/components/Review/Card';
+import MilestoneItem from '@/components/Milestones/MilestoneItem';
+import { MilestonesProvider } from '@/contexts/Milestones';
+import { ProjectProvider } from '@/contexts/Project';
 import { cn } from '@/utils/cn';
 import 'dayjs/locale/zh-tw';
 
@@ -31,7 +36,7 @@ const Header = () => {
         <Dropdown.List className="top-full left-0 -mt-1 z-20">
           <Dropdown.Item className="rounded-lg text-nowrap hover:bg-primary-lightest">
             <div className="p-2 text-basic-300 cursor-not-allowed">
-              新增啥？
+              學習計畫
             </div>
           </Dropdown.Item>
         </Dropdown.List>
@@ -164,14 +169,31 @@ const Project = ({ href, title, children, defaultOpen }: ProjectProps) => {
   );
 };
 
+const ReviewCardList = () => {
+  const { data } = useProjectReviewQuery();
+
+  return (
+    <ul>
+      {data?.map((review) => (
+        <li key={review.id}>
+          <ReviewCard
+            data={review}
+            detailLink="/manage/project/review/detail?id=1"
+          />
+        </li>
+      ))}
+    </ul>
+  );
+};
+
 const Manage = () => {
   const [date, setDate] = useState<Dayjs>(dayjs().startOf('day'));
   const pathname = usePathname();
+  const { data: projects } = useProjectQuery({ isMe: true });
+  const { data: reviews } = useProjectReviewQuery(projects?.[0]?.id);
 
-  // const MIN_DATE = dayjs(new Date('2025-02-09'));
-  // const MAX_DATE = dayjs(new Date('2025-07-12'));
-  const MIN_DATE = dayjs().startOf('day').subtract(5, 'day');
-  const MAX_DATE = dayjs().startOf('day').add(5, 'day');
+  const MIN_DATE = dayjs(new Date('2025-02-09'));
+  const MAX_DATE = dayjs(new Date('2025-07-12'));
 
   const SEOData = useMemo(
     () => ({
@@ -197,19 +219,48 @@ const Manage = () => {
         maxDate={MAX_DATE}
         minDate={MIN_DATE}
       />
-      <Project title="學習計畫名稱一" href="/manage#1" defaultOpen>
-        <div>第一週</div>
-        <div>第三週</div>
-      </Project>
-      <Project title="學習計畫名稱二" href="/manage#2">
-        <div>第一週</div>
-        <div>第三週</div>
-      </Project>
-      {/* <ReviewCard detailLink="/manage/project/review/detail?id=1" /> */}
+      <ul>
+        {Array.isArray(projects) &&
+          projects.map((project, index) => (
+            <li key={project.id}>
+              <Project
+                title={project.title}
+                href={`/manage/project?id=${project.id}`}
+                defaultOpen={index === 0}
+              >
+                {project?.milestones?.map((milestone) => (
+                  <MilestoneItem
+                    key={milestone.id}
+                    milestone={milestone}
+                    isLgScreen={false}
+                    projectId={project.id}
+                  />
+                ))}
+              </Project>
+            </li>
+          ))}
+      </ul>
+
+      <ul>
+        {Array.isArray(reviews) &&
+          reviews.map((review) => (
+            <li key={review.id}>
+              <ReviewCard
+                data={review}
+                detailLink="/manage/project/review/detail?id=1"
+              />
+            </li>
+          ))}
+      </ul>
     </LocalizationProvider>
   );
 };
 
-Manage.getLayout = getManageLayout;
+Manage.getLayout = (page: React.ReactElement) =>
+  getManageLayout(
+    <ProjectProvider>
+      <MilestonesProvider>{page}</MilestonesProvider>
+    </ProjectProvider>
+  );
 
 export default Manage;