Merge pull request #148 from GDGoCINHA/develop

Deploy(#102)/ Main페이지, Recruit 페이지 업데이트 및 로그인 비밀번호 재설정 로직 수정 반영

Author: ThinkMuk

package-lock.json

@@ -28,12 +28,16 @@ export default function Page() {
   const [errors, setErrors] = useState([]);
   const [isRendering, setIsRendering] = useState(0);
   const [loading, setLoading] = useState(false);
+  const [verifiedEmail, setVerifiedEmail] = useState('');
 
   const handleBackToLogin = () => setIsRendering(0);
   const handleFindIdClick = () => setIsRendering(1);
   const handleResetPasswordClick = () => setIsRendering(2);
   const handleBackToResetRequest = () => setIsRendering(2);
-  const handleResetPasswordNext = () => setIsRendering(3);
+  const handleResetPasswordNext = (email) => {
+    setVerifiedEmail(email);
+    setIsRendering(3);
+  };
 
   const validatePassword = (password) => {
     const newErrors = [];
@@ -59,13 +63,13 @@ export default function Page() {
         setLoading(true);
         const res = await login(email, password);
         const { exists, access_token } = res.data.data;
-      
+
         if (!exists) {
           alert('아이디 혹은 비밀번호가 올바르지 않습니다.');
           setLoading(false);
           return;
         }
-      
+
         setAccessToken(access_token);
         router.push('/main');
       } catch (error) {
@@ -77,7 +81,7 @@ export default function Page() {
   };
 
   return (
-      <>
+    <>
       <Loader isLoading={loading} />
       <Image src={loginBg} alt='loginBg' fill className='absolute top-0 left-0 -z-10 object-cover opacity-70 blur-sm' />
       <div className='flex justify-center items-center flex-1 relative'>
@@ -120,9 +124,9 @@ export default function Page() {
               : `${isRendering === 3 ? '-translate-x-full' : 'translate-x-full'} opacity-0`
           } flex justify-center items-center`}
         >
-          <AuthResetRequest 
-            handleNextStep={handleResetPasswordNext} 
-            handleBackToLogin={handleBackToLogin} 
+          <AuthResetRequest
+            handleNextStep={handleResetPasswordNext}
+            handleBackToLogin={handleBackToLogin}
             setLoading={setLoading}
           />
         </div>
@@ -135,6 +139,7 @@ export default function Page() {
           } flex justify-center items-center`}
         >
           <AuthResetPassword
+            email={verifiedEmail}
             handleBackToLogin={handleBackToLogin}
             handleBackToResetRequest={handleBackToResetRequest}
             setLoading={setLoading}

public/icons/logo/chatgpt.png

@@ -7,16 +7,9 @@ import FAQ from '@/components/main/FAQ';
 
 import { mainSlides, ongoingEvents, ongoingStudies } from '@/mock/events';
 
-import eventbg from '@public/images/activity/songdo_conf.jpg';
-import eventposter from '@public/images/study/study1.jpg';
-
 export default function Page() {
   // 이미지 임포트 문제 해결을 위한 실제 슬라이드 데이터
-  const slidesWithImages = mainSlides.map(slide => ({
-    ...slide,
-    background: eventbg,
-    poster: eventposter
-  }));
+  
 
   // 카드 아이템을 SplideSlide로 감싸는 함수
   const renderEventCards = (events) => {
@@ -40,7 +33,7 @@ export default function Page() {
   return (
     <div className="min-h-screen bg-black mb-64">
       <div className="w-full flex flex-col justify-center">
-        <MainCarousel slides={slidesWithImages} />
+        <MainCarousel slides={mainSlides} />
 
         <div className='flex flex-col max-w-[1300px] w-full mx-auto justify-start pt-[130px] px-5'>
           <CardCarousel id="card-carousel-1" title="진행중인 행사">

public/icons/logo/django.png

@@ -78,7 +78,7 @@ export default function Recruit() {
             <strong className='text-[#34A853]'>D</strong>
             <strong className='text-[#F9AB00]'>G</strong>
             <strong className='text-[#4285F4]'>o</strong>
-            <strong className='text-[#EA4335]'>C</strong> INHA 25-1 <br className='pc:hidden' />
+            <strong className='text-[#EA4335]'>C</strong> INHA 25-2 <br className='pc:hidden' />
             멤버에 지원해보세요
           </p>
           <HorizontalProgressBar step={step} />