Skip to content

Commit

Permalink
Merge pull request #130 from KakaoTech-BootCamp-Team-2/dev
Browse files Browse the repository at this point in the history
🚀
  • Loading branch information
Goldchae authored Sep 10, 2024
2 parents 9530da1 + ba59876 commit d9f9c4e
Showing 1 changed file with 23 additions and 60 deletions.
83 changes: 23 additions & 60 deletions src/pages/PeopleListPage/PeopleListPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ import { useNavigate } from "react-router-dom";
import Layout from "../../components/Common/Layout.jsx";
import MiniLayout from "../../components/Common/miniLayout.jsx";
import PeopleCard from "../../components/PeopleListComponents/PeopleCard/peopleCard.jsx";
import { PeopleListCall } from "../../api/PeopleListCall.js"; // PeopleListCall 불러오기
import dummyImages1 from "../../assets/dummyImages/peopleList.jpeg";
import fetchMembersList from "../../services/fetchMembersList.js";
import dummyImages1 from "../../assets/dummyImages/peopleList.jpeg"
import dummyImages2 from "../../assets/dummyImages/peoplelist2.png"
import dummyImages3 from "../../assets/dummyImages/peoplelist3.png"




export const PeopleListPage = () => {
const navigate = useNavigate();
Expand All @@ -16,9 +21,8 @@ export const PeopleListPage = () => {
const displayMembers = async () => {
setIsLoading(true);
try {
// fetchMembersList 대신 PeopleListCall 사용
const membersData = await PeopleListCall();
console.log('Fetched Members:', membersData.data); // 데이터 구조를 확인하기 위해 콘솔에 출력
const membersData = await fetchMembersList();
console.log('Fetched Members:', membersData.data);
if (membersData && membersData.data && membersData.data.memberList) {
setMembers(membersData.data.memberList);
} else {
Expand All @@ -35,6 +39,7 @@ export const PeopleListPage = () => {

//displayMembers();
}, []);
;

const handleCardClick = () => {
navigate('/details');
Expand All @@ -47,78 +52,36 @@ export const PeopleListPage = () => {
<Layout>
<MiniLayout text="카부인 전당" layerWidth="80%">
<PeopleCard
image="src/assets/dummyImages/peopleList.jpeg" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList2.png" // 더미이미지
image={dummyImages1} // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList.jpeg" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
image={dummyImages2} // 더미이미지
name="leo.park (박세호)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 :클라우드"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList2.png" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
image={dummyImages3} // 더미이미지
name="justin.park (박지혁)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : 클라우드"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList.jpeg" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList2.png" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList.jpeg" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
image={dummyImages1} // 더미이미지
name="gene.an (안태진)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList2.png" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList.jpeg" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList2.png" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList.jpeg" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
onClick={handleCardClick}
/>
<PeopleCard
image="src/assets/dummyImages/peopleList2.png" // 더미이미지
name="celina.jung (정은체)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 : AI"
image={dummyImages2} // 더미이미지
name="jully.han (한주리)" // 임시 하드코딩
affiliation="카카오 부트캠프 1기 :풀스택"
onClick={handleCardClick}
/>
</MiniLayout>
</Layout>
);
};
};

0 comments on commit d9f9c4e

Please sign in to comment.