Merge pull request #43 from teamViNO/feature-059

feature-059: 소셜 로그인 임시 조치
teamViNO · Feb 8, 2024 · 8c8f20d · 8c8f20d
2 parents e49f4f6 + cd24e68
commit 8c8f20d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 38 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -16,6 +16,7 @@ import ProfilePage from '@/pages/ProfilePage';
 import SearchPage from '@/pages/SearchPage';
 import SignInPage from '@/pages/SignInPage';
 import SignUpPage from '@/pages/SignUpPage';
+import SignUpSuccessPage from '@/pages/SignUpSuccessPage';
 import SummaryPage from '@/pages/SummaryPage';
 
 // Layouts
@@ -40,6 +41,7 @@ const App = () => {
             <>
               <Route path="/sign-in" element={<SignInPage />} />
               <Route path="/sign-up" element={<SignUpPage />} />
+              <Route path="/sign-up/success" element={<SignUpSuccessPage />} />
               <Route path="/find-email" element={<FindEmailPage />} />
               <Route path="/find-password" element={<FindPasswordPage />} />
             </>

diff --git a/src/pages/SignInPage.tsx b/src/pages/SignInPage.tsx
@@ -79,12 +79,12 @@ const SignInPage: React.FC = () => {
     }
   };
 
-  const Rest_api_key = '77ddf1baeb87f4a9752ed437db43cd96'; //kakao REST API KEY
-  const redirect_uri = 'https://localhost:5173/sign-up-suc'; //Redirect URI
+  const redirect_uri = `${location.origin}/sign-up/success`; //Redirect URI
+  const KAKAO_KEY = '77ddf1baeb87f4a9752ed437db43cd96'; //kakao REST API KEY
   const NAVER_CLIENT_ID = 'qR4Npp1ui69SCF6nAJd2';
   const STATE = 'flase';
   // oauth 요청 URL
-  const kakaoURL = `https://kauth.kakao.com/oauth/authorize?client_id=${Rest_api_key}&redirect_uri=${redirect_uri}&response_type=code`;
+  const kakaoURL = `https://kauth.kakao.com/oauth/authorize?client_id=${KAKAO_KEY}&redirect_uri=${redirect_uri}&response_type=code`;
   const naverURL = `https://nid.naver.com/oauth2.0/authorize?response_type=code&client_id=${NAVER_CLIENT_ID}&state=${STATE}&redirect_uri=${redirect_uri}`;
 
   const handleKakaoLogin = () => {
@@ -95,14 +95,6 @@ const SignInPage: React.FC = () => {
     window.location.href = naverURL;
   };
 
-  /* let login:any = new window.naver.LoginWithNaverId("http://localhost:5173/sign-in/", "http://localhost:5173/sign-in");
-	let state = login.getUniqState();
-	login.setButton("white", 2,40);
-	login.setDomain(".service.com");
-	login.setState(state);
-	login.isPopup(false);
-	login.LoginWithNaverId(); */
-
   return (
     <PageComponent>
       <LoginTotalComponent>

diff --git a/src/pages/SignUpPage.tsx b/src/pages/SignUpPage.tsx
@@ -184,7 +184,7 @@ const SignUp: React.FC<SignUpProps> = () => {
       // 서버에 데이터 전송
       onRegisterUserInfo();
       console.log('정보 등록 완료');
-      navigate('/sign-up-suc');
+      navigate('/sign-up/success');
     } else {
       alert('입력값을 확인해주세요.');
     }

diff --git a/src/pages/SignUpSuccessPage.tsx b/src/pages/SignUpSuccessPage.tsx
@@ -1,31 +1,28 @@
 import styled from 'styled-components';
-import celebrate from "../assets/celebrate.png";
+import celebrate from '../assets/celebrate.png';
 import { useNavigate } from 'react-router-dom';
 
 const SignUpSuccessPage = () => {
-
-    const navigate = useNavigate();
-    const navigateToHome = () => {
+  const navigate = useNavigate();
+  const navigateToHome = () => {
     navigate('/');
-    };
+  };
 
-return(
+  return (
     <Wrapper>
-    <img src={celebrate} alt="축하 이미지" />
-    <h4>
-    회원가입이 완료되었어요!
-    </h4>
-    <p>로그인하고 나만의 영상 아카이빙을 시작해요</p>
-    <HomeButton type="submit" onClick={navigateToHome}>
-    영상 읽으러가기
-    </HomeButton>
+      <img src={celebrate} alt="축하 이미지" />
+      <h4>회원가입이 완료되었어요!</h4>
+      <p>로그인하고 나만의 영상 아카이빙을 시작해요</p>
+      <HomeButton type="submit" onClick={navigateToHome}>
+        영상 읽으러가기
+      </HomeButton>
     </Wrapper>
-    );
-  };
-
-  export default SignUpSuccessPage;
+  );
+};
 
-  const Wrapper = styled.div`
+export default SignUpSuccessPage;
+
+const Wrapper = styled.div`
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -34,7 +31,7 @@ return(
   width: 100%;
   min-height: 100vh;
   h4 {
-    color:#1E1E1E;
+    color: #1e1e1e;
     font-size: 32px;
     font-weight: 500;
     line-height: 160%;
@@ -46,13 +43,13 @@ return(
       font-weight: bold;
     }
   }
-  img{
+  img {
     display: flex;
     width: 130.67px;
     height: 121.67px;
   }
-  p{
-    color:#BBBBBB;
+  p {
+    color: #bbbbbb;
     font-size: 16px;
     font-weight: 500;
     line-height: 160%;
@@ -64,15 +61,15 @@ const HomeButton = styled.button`
   width: 494px;
   height: 56px;
   background: #1e1e1e;
-  color: #FFFFFF;
+  color: #ffffff;
   font-size: 16px;
   font-weight: 500;
   line-height: 160%;
   border-radius: 12px;
   border: none;
-  margin-top:64px;
+  margin-top: 64px;
   font-family: Pretendard;
   &:hover {
     cursor: pointer;
   }
-`;
+`;