SejongPeer · JunYoungKr · Mar 3, 2025 · Oct 14, 2024 · Oct 14, 2024 · Oct 17, 2024
diff --git a/index.html b/index.html
@@ -10,6 +10,7 @@
 
 <body>
   <div id="root"></div>
+  <div id="modal"></div>
   <script type="module" src="/src/main.tsx"></script>
 </body>
 

diff --git a/src/assets/images/buddyApproval.svg b/src/assets/images/buddyApproval.svg
diff --git a/src/assets/images/buddyWaiting.svg b/src/assets/images/buddyWaiting.svg
diff --git a/src/assets/images/left-controller.svg b/src/assets/images/left-controller.svg
diff --git a/src/assets/images/notice_black.svg b/src/assets/images/notice_black.svg
diff --git a/src/assets/images/right-controller.svg b/src/assets/images/right-controller.svg
diff --git a/src/components/buddy/buddyButton.tsx b/src/components/buddy/buddyButton.tsx
@@ -1,70 +1,59 @@
 import styled from "styled-components";
 import { COLORS } from "../../theme";
 
-import checked from '../../assets/images/filledCheck.png';
-import unchecked from '../../assets/images/unfilledCheck.png';
+import checked from "../../assets/images/filledCheck.png";
+import unchecked from "../../assets/images/unfilledCheck.png";
 
 interface ButtonProps {
-    text?: string;
-    ischecked?: boolean;
-    onClick?: () => void;
+  text?: string;
+  ischecked?: boolean;
+  onClick?: () => void;
 }
 
-export const BuddyButton = ({ 
-    text='오류', 
-    ischecked=false,
-    onClick
+export const BuddyButton = ({
+  text = "오류",
+  ischecked = false,
+  onClick,
 }: ButtonProps) => {
-    return (
-        (ischecked ? 
-        <ButtonWrapperChecked 
-            onClick={onClick}
-        >
-            {text}
-        </ButtonWrapperChecked>
-        :
-        <ButtonWrapper
-            onClick={onClick}
-        >
-            {text}
-        </ButtonWrapper>
-    )
-    )
-}
+  return ischecked ? (
+    <ButtonWrapperChecked onClick={onClick}>{text}</ButtonWrapperChecked>
+  ) : (
+    <ButtonWrapper onClick={onClick}>{text}</ButtonWrapper>
+  );
+};
 
 const ButtonWrapper = styled.button<ButtonProps>`
-    width: 100%;
-    height: 56px;
-    color: ${COLORS.font1};
-    background-color: #FFF;
-    border-radius: 50px;
-    border: none;
-    cursor: pointer;
-    display: inline-block;
-    text-align: left;
-    padding: 16px 24px;
-    box-shadow: 0px 0px 12px -4px rgba(0, 0, 0, 0.20);
-    background-image: url(${unchecked});
-    background-size: 28px;
-    background-repeat: no-repeat;
-    background-position: right 20px center;
+  width: 100%;
+  height: 56px;
+  color: ${COLORS.font1};
+  background-color: #fff;
+  border-radius: 50px;
+  border: none;
+  cursor: pointer;
+  display: inline-block;
+  text-align: left;
+  padding: 16px 24px;
+  box-shadow: 0px 0px 12px -4px rgba(0, 0, 0, 0.2);
+  background-image: url(${unchecked});
+  background-size: 28px;
+  background-repeat: no-repeat;
+  background-position: right 20px center;
 `;
 const ButtonWrapperChecked = styled.button<ButtonProps>`
-    width: 100%;
-    height: 56px;
-    color: ${COLORS.font1};
-    background-color: #FCECEE;
-    border-radius: 50px;
-    border: 1px solid ${COLORS.main}; 
-    cursor: pointer;
-    display: inline-block;
-    text-align: left;
-    padding: 16px 24px;
-    box-shadow: 0px 0px 12px -4px rgba(0, 0, 0, 0.20);
-    font-weight: bold;
-    background-image: url(${checked});
-    background-size: 28px;
-    background-repeat: no-repeat;
-    background-position: right 20px center;
+  width: 100%;
+  height: 56px;
+  color: ${COLORS.font1};
+  background-color: #fcecee;
+  border-radius: 50px;
+  border: 1px solid ${COLORS.main};
+  cursor: pointer;
+  display: inline-block;
+  text-align: left;
+  padding: 16px 24px;
+  box-shadow: 0px 0px 12px -4px rgba(0, 0, 0, 0.2);
+  font-weight: bold;
+  background-image: url(${checked});
+  background-size: 28px;
+  background-repeat: no-repeat;
+  background-position: right 20px center;
 `;
-
diff --git a/src/components/buddy/buddyStart.tsx b/src/components/buddy/buddyStart.tsx
@@ -1,122 +1,169 @@
-import styled from "styled-components";
-import { COLORS } from "../../theme";
+import { useEffect, useState } from "react";
+
+// api
+import { getBuddyUsers } from "../../services/apis/buddy.service";
 
 // 컴포넌트
 import { ConfirmButton } from "../button/confirmButton";
 import { BuddyHeader } from "../header/buddyHeader";
 import { useNavigate } from "react-router-dom";
 
-// styled-components
-import { BuddyContainer, BuddyContainer2, ApplicationContainer } from "../../styles/buddy-styles";
+// style
+import styled from "styled-components";
+import {
+  BuddyContainer,
+  BuddyContainer2,
+  ApplicationContainer,
+} from "../../styles/buddy-styles";
+import { COLORS } from "../../theme";
 
 // 이미지
-import startImg from '../../assets/images/buddyStart.svg';
-import nugul from '../../assets/images/nugul.svg';
-import { useEffect } from "react";
+import startImg from "../../assets/images/buddyStart.svg";
+import nugul from "../../assets/images/nugul.svg";
+import { ConfirmModal } from "../modals/confirmModal";
 
 export const BuddyStart = () => {
-    const navigate = useNavigate();
-
-    // localStorage에서 토큰 가져오기
-    // const token = localStorage.getItem("accessToken");
-
-    // 조건 선택 페이지 이동
-    const navigateHandler = () => {
-        navigate('/buddy?step=1');
-        // 로그인 하면 이동할 수 있도록 했는데 테스트 끝나면 주석해제 예정입니다~
-        // if(token) {
-        //     navigate('/buddy?step=1');
-        // } else {
-        //     alert('로그인이 필요한 서비스 입니다!');
-        //     navigate('/login');
-        // }
+  const [isModalOpen, setIsModalOpen] = useState(false);
+
+  const openModal = () => {
+    setIsModalOpen(true); // 모달 열기
+  };
+
+  const closeModal = () => {
+    setIsModalOpen(false); // 모달 닫기
+  };
+
+  const navigate = useNavigate();
+
+  // localStorage에서 토큰 가져오기
+  // const token = localStorage.getItem("accessToken");
+
+  // 조건 선택 페이지 이동
+  const navigateHandler = () => {
+    navigate("/buddy?step=1");
+    // 로그인 하면 이동할 수 있도록 했는데 테스트 끝나면 주석해제 예정입니다~
+    // if(token) {
+    //     navigate('/buddy?step=1');
+    // } else {
+    //     alert('로그인이 필요한 서비스 입니다!');
+    //     navigate('/login');
+    // }
+  };
+
+  const [buddyCount, setBuddyCount] = useState(0);
+  useEffect(() => {
+    const fetchUserCount = async () => {
+      const result = await getBuddyUsers();
+      if (result) {
+        setBuddyCount(result);
+        localStorage.setItem('buddyCount', `${result}`);
+      } else {
+        localStorage.setItem('buddyCount', `0`);
+      }
     };
 
-    useEffect(() => {
-
-    }, [])
-
-    return (
-        <BuddyContainer>
-            <BuddyHeader />
-            <BuddyContainer2>
-            <StartImg src={startImg} />
-
-            <BuddyStartTextContainer>
-                <BuddyStartTitle>세종버디란?</BuddyStartTitle>
-                <BuddyStartText1>세종버디(Buddy)는</BuddyStartText1>
-                <BuddyStartText1>
-                    <BuddyStartTextB>맞춤형 캠퍼스 짝꿍</BuddyStartTextB>을 찾는 서비스 입니다.
-                </BuddyStartText1>
-                <BuddyStartText2>한 명의 학우와 한 학기 동안 버디로 매칭 되며,</BuddyStartText2>
-                <BuddyStartText2>다음 학기에 새로운 버디를 찾을 수 있습니다.</BuddyStartText2>
-            </BuddyStartTextContainer>
-
-            <ApplicationContainer>
-                <ApplicationNum>
-                    <ApplicationImg src={nugul}/>
-                    <ApplicationText>216명의 학생들이 버디를 찾고 있어요!</ApplicationText>
-                </ApplicationNum>
-                <ConfirmButton 
-                    width='100%'
-                    height='52px'
-                    text='세종버디 신청하기' 
-                    textcolor= '#FFF'
-                    backgroundcolor= {COLORS.main}
-                    borderradius='50px'
-                    border='none'
-                    onClick={navigateHandler}
-                />
-            </ApplicationContainer>
-            </BuddyContainer2>
-        </BuddyContainer>
-    );
-}
+    fetchUserCount();
+  }, []);
+
+  return (
+    <BuddyContainer>
+      {isModalOpen && (
+        <ConfirmModal 
+          text="이 작업을 계속하시겠습니까?" 
+          subText="진짜?"
+          onClick={() => {
+            console.log("확인 버튼 클릭");
+            closeModal(); // 모달 닫기
+          }} 
+          onClose={closeModal} // 백드롭 또는 취소 버튼 클릭 시 모달 닫기
+        />
+      )}
+      <BuddyHeader />
+      <BuddyContainer2>
+        <StartImg src={startImg} onClick={openModal}/>
+
+        <BuddyStartTextContainer>
+          <BuddyStartTitle>세종버디란?</BuddyStartTitle>
+          <BuddyStartText1>세종버디(Buddy)는</BuddyStartText1>
+          <BuddyStartText1>
+            <BuddyStartTextB>맞춤형 캠퍼스 짝꿍</BuddyStartTextB>을 찾는 서비스
+            입니다.
+          </BuddyStartText1>
+          <BuddyStartText2>
+            한 명의 학우와 한 학기 동안 버디로 매칭 되며,
+          </BuddyStartText2>
+          <BuddyStartText2>
+            다음 학기에 새로운 버디를 찾을 수 있습니다.
+          </BuddyStartText2>
+        </BuddyStartTextContainer>
+
+        <ApplicationContainer>
+          <ApplicationNum>
+            <ApplicationImg src={nugul} />
+            <ApplicationText>
+              {buddyCount}명의 학생들이 버디를 찾고 있어요!
+            </ApplicationText>
+          </ApplicationNum>
+          <ConfirmButton
+            width="100%"
+            height="52px"
+            text="세종버디 신청하기"
+            textcolor="#FFF"
+            backgroundcolor={COLORS.main}
+            borderradius="50px"
+            border="none"
+            onClick={navigateHandler}
+          />
+        </ApplicationContainer>
+      </BuddyContainer2>
+    </BuddyContainer>
+  );
+};
 
 const StartImg = styled.img`
-    width: 100%;
-    height: 132px;
-    text-align: center;
-    margin: 20% 0 17%;
+  width: 100%;
+  height: 132px;
+  text-align: center;
+  margin: 20% 0 17%;
 `;
 
 const BuddyStartTextContainer = styled.div`
-    padding: 0 6px;
-    @media (min-width: 430px) {
-        max-width: 398px;
-        margin: 0 auto;
-    }
+  padding: 0 6px;
+  @media (min-width: 430px) {
+    max-width: 398px;
+    margin: 0 auto;
+  }
 `;
 const BuddyStartTitle = styled.h3`
-    color: #111;
-    font-weight: bold;
-    font-size: 24px;
-    margin-bottom: 12px;
+  color: #111;
+  font-weight: bold;
+  font-size: 24px;
+  margin-bottom: 12px;
 `;
 const BuddyStartText1 = styled.p`
-    color: ${COLORS.font1};
-    font-weight: 700;
-    line-height: 1.5;
+  color: ${COLORS.font1};
+  font-weight: 700;
+  line-height: 1.5;
 `;
 const BuddyStartTextB = styled.b`
-    color: ${COLORS.main};
+  color: ${COLORS.main};
 `;
 const BuddyStartText2 = styled.p`
-    color: #555;
-    line-height: 1.5;
+  color: #555;
+  line-height: 1.5;
 `;
 
 const ApplicationNum = styled.div`
-    display: flex;
-    align-items: center;
-    gap: 5px;
+  display: flex;
+  align-items: center;
+  gap: 5px;
 `;
 
 const ApplicationImg = styled.img`
-    object-fit:cover;
-    border-raidus: 12px;
+  object-fit: cover;
+  border-raidus: 12px;
 `;
 const ApplicationText = styled.p`
-color: #111;
-font-weight: 700;
-`;
+  color: #111;
+  font-weight: 700;
+`;
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     <body>
       <div id="root"></div>
+      <div id="modal"></div>
       <script type="module" src="/src/main.tsx"></script>
     </body>
@@ Expand Down @@