diff --git a/src/Router.tsx b/src/Router.tsx index ec6a772..ddf0e16 100644 --- a/src/Router.tsx +++ b/src/Router.tsx @@ -2,8 +2,6 @@ import { GoormLoader } from '@goorm-dev/gds-components'; import { Suspense, lazy } from 'react'; import { RouterProvider, createBrowserRouter } from 'react-router-dom'; import Layout from './components/layout/Layout'; -import SignUp from './pages/updatePW/UpdatePW'; - const About = lazy(() => import('./pages/about/About')); const Project = lazy(() => import('./pages/project/Project')); const Recruit = lazy(() => import('./pages/recruit/Recruit')); @@ -13,6 +11,7 @@ const Information = lazy(() => import('./pages/information/Information')); const MyPage = lazy(() => import('./pages/myPage/MyPage')); const UpdatePW = lazy(() => import('./pages/updatePW/UpdatePW')); const IdeaList = lazy(() => import('./pages/hackathon/IdeaList/IdeaList')); +const SignUp = lazy(() => import('./pages/signUp/SignUp')); const IdeaCreate = lazy(() => import('./pages/hackathon/IdeaCreate/IdeaCreate')); diff --git a/src/api/instance.ts b/src/api/instance.ts index bf1337d..b30f570 100644 --- a/src/api/instance.ts +++ b/src/api/instance.ts @@ -1,7 +1,7 @@ import axios from 'axios'; const instance = axios.create({ - baseURL: process.env.REACT_APP_BASE_URL, + baseURL: import.meta.env.VITE_APP_BASE_URL, headers: { 'Content-Type': 'application/json' }, withCredentials: true, }); diff --git a/src/components/signUp/SignUpCard.tsx b/src/components/signUp/SignUpCard.tsx index d380d3b..82a3180 100644 --- a/src/components/signUp/SignUpCard.tsx +++ b/src/components/signUp/SignUpCard.tsx @@ -1,10 +1,14 @@ import styles from './signUpCard.module.scss'; -import { WarningIcon } from '@goorm-dev/gds-icons'; +import { WarningIcon } from '@goorm-dev/vapor-icons'; import { Text, Input, Button, Alert } from '@goorm-dev/vapor-components'; import { ChangeEvent, useState } from 'react'; import Logo from '../../assets/images/goormthon_univ_BI-Bk.png'; +import { loginAPI } from '../../api/auth'; +import { useNavigate } from 'react-router-dom'; export default function SignUpCard() { + const navigate = useNavigate(); + const [email, setEmail] = useState(''); const [password, setPassword] = useState(''); const [errorMessage, setErrorMessage] = useState(null); @@ -23,6 +27,15 @@ export default function SignUpCard() { }; const handleLogin = async () => { + try { + const response = await loginAPI(email, password); + console.log(response); + + navigate('/'); + } catch (error) { + console.error('로그인 실패', error); + } + if (!email && !password) { setErrorMessage('이메일을 입력해주세요'); return; @@ -53,7 +66,7 @@ export default function SignUpCard() { 로그인 {errorMessage && ( - + {errorMessage} )} diff --git a/src/components/signUp/signUpCard.module.scss b/src/components/signUp/signUpCard.module.scss index 6b741d6..d44492b 100644 --- a/src/components/signUp/signUpCard.module.scss +++ b/src/components/signUp/signUpCard.module.scss @@ -37,3 +37,7 @@ width: 16rem; margin-bottom: var(--space-600); } + +.alignCenter { + text-align: left; +} diff --git "a/src/pages/\bsignUp/SignUp.tsx" b/src/pages/signUp/SignUp.tsx similarity index 100% rename from "src/pages/\bsignUp/SignUp.tsx" rename to src/pages/signUp/SignUp.tsx diff --git "a/src/pages/\bsignUp/styles.module.scss" b/src/pages/signUp/styles.module.scss similarity index 100% rename from "src/pages/\bsignUp/styles.module.scss" rename to src/pages/signUp/styles.module.scss