Merge pull request #55 from GDSC-DGU/feature/main

✨ Feat -  전반적 코드 수정

src/app/api/member/porojectMember/route.tsx

@@ -0,0 +1,46 @@
+import { Client } from '@notionhq/client';
+import { NextRequest } from 'next/server';
+
+const notion = new Client({
+  auth: process.env.NOTION_SECRET_KEY,
+});
+
+
+async function queryAllMemberData(): Promise<any[]> {
+  try {
+    const response = await notion.databases.query({
+      database_id: process.env.NOTION_MEMBER_DATABASE_ID || '',
+    });
+    return response.results;
+  } catch (error) {
+    console.error(JSON.stringify(error));
+
+    throw error;
+  }
+}
+
+
+export async function GET(req: NextRequest) {
+  try {
+    const data = await queryAllMemberData();
+
+    return new Response(JSON.stringify({ data, message: 'Success' }), {
+      status: 200,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+  } catch (error) {
+
+    return new Response(
+      JSON.stringify({ message: `Failed: ${error?.toString()}` }),
+      {
+        status: 500,
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      },
+    );
+  }
+}
+

src/app/api/member/route.tsx

@@ -5,33 +5,51 @@ const notion = new Client({
   auth: process.env.NOTION_SECRET_KEY,
 });
 
-
-async function queryAllMemberData(): Promise<any[]> {
+// seminar id를 가진 member 불러오기
+async function queryMemberData(
+  databaseId: string,
+  seminarId: string,
+): Promise<any[]> {
   try {
     const response = await notion.databases.query({
-      database_id: process.env.NOTION_MEMBER_DATABASE_ID || '',
+      database_id: databaseId,
+      filter: {
+        property: 'Seminars',
+        relation: {
+          contains: seminarId,
+        },
+      },
     });
+
     return response.results;
   } catch (error) {
-    console.error(JSON.stringify(error));
-
+    console.error(
+      'Error querying Notion database and fetching member data:',
+      JSON.stringify(error),
+    );
     throw error;
   }
 }
 
+type Data = {
+  items?: any[];
+  message: string;
+};
 
 export async function GET(req: NextRequest) {
-  try {
-    const data = await queryAllMemberData();
+  const url = new URL(req.url);
+  const seminarId = url.searchParams.get('seminarId') || ''; // 쿼리 파라미터에서 세미나 ID 가져오기
+  const databaseId = process.env.NOTION_MEMBER_DATABASE_ID || '';
 
+  try {
+    const data = await queryMemberData(databaseId, seminarId);
     return new Response(JSON.stringify({ data, message: 'Success' }), {
       status: 200,
       headers: {
         'Content-Type': 'application/json',
       },
     });
   } catch (error) {
-
     return new Response(
       JSON.stringify({ message: `Failed: ${error?.toString()}` }),
       {
@@ -43,4 +61,3 @@ export async function GET(req: NextRequest) {
     );
   }
 }
-

src/app/member/page.tsx

@@ -17,7 +17,7 @@ const MemberPage = () => {
       {/* -----------------------------------------------*/}
       {/* ----------- 타임라인 및 GDSC세대별 페이지-------------*/}
       {/* -----------------------------------------------*/}
-      <GenerationPage />
+      {/* <GenerationPage /> */}
     </main>
   );
 };

src/app/project/[id]/page.tsx

@@ -24,7 +24,9 @@ const ProjectDetailPage = async ({ params }: { params: { id: string } }) => {
   }
 
   // 멤버 데이터 불러오기
-  const memberResponse = await fetch(`${process.env.SERVER_HOST}/api/member`);
+  const memberResponse = await fetch(
+    `${process.env.SERVER_HOST}/api/member/projectMember`,
+  );
 
   const memberList = await memberResponse.json();
 

src/app/recruit/page.tsx

@@ -20,19 +20,19 @@ const RecruitPage = () => {
       {/* -----------------------------------------------*/}
       {/* -------------------- 인재상 -------------------*/}
       {/* -----------------------------------------------*/}
-      <RecruitRecommand />
+      {/* <RecruitRecommand /> */}
       {/* -----------------------------------------------*/}
       {/* -------------------- 모집상 -------------------*/}
       {/* -----------------------------------------------*/}
-      <RecruitTarget />
+      {/* <RecruitTarget /> */}
       {/* -----------------------------------------------*/}
       {/* -------------------- 스케쥴 -------------------*/}
       {/* -----------------------------------------------*/}
-      <RecruitSchedule />
+      {/* <RecruitSchedule /> */}
       {/* -----------------------------------------------*/}
       {/* -------------------- FAQ ---------------------*/}
       {/* -----------------------------------------------*/}
-      <RecruitFaq />
+      {/* <RecruitFaq /> */}
     </main>
   );
 };

src/components/home/aboutGDSC/AboutGDSC.tsx

@@ -49,15 +49,18 @@ const AboutGDSC = () => {
             <br />
           </motion.p>
 
-          <motion.div
+          <motion.a
             className="H6 flex gap-1 items-center"
             initial="hidden"
             whileInView="visible"
             viewport={{ once: true, amount: 0.8 }}
             variants={aniSlideUp}
+            href="https://developers.google.com/community/gdsc"
+            target="_blank"
           >
-            GDSC 소개 바로가기 <div className="w-6 h-6 bg-red-900"></div>
-          </motion.div>
+            GDSC 소개 바로가기{' '}
+            <img className="w-6 h-6" src="/svg/icons/common/right.svg" />
+          </motion.a>
 
           <motion.div
             className="flex gap-10 pt-6"
@@ -73,7 +76,7 @@ const AboutGDSC = () => {
 
         {/* 이미지 */}
         <motion.div
-          className="desktop:flex-grow desktop:h-[378px] bg-red-100 desktop:w-auto w-full"
+          className="desktop:flex-grow desktop:h-[378px] desktop:w-auto w-full"
           initial="hidden"
           whileInView="visible"
           viewport={{ once: true, amount: 0.8 }}