From 6adb6f0a9abfe339e06c80bf55a7f87692055a62 Mon Sep 17 00:00:00 2001 From: dev-joohee Date: Tue, 6 Aug 2024 20:19:20 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B2=BD=EB=A1=9C=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 4 ++-- src/pages/SelfTest/SelfTest10.js | 2 +- src/pages/{Login.js => StartInfo.js} | 17 +++++++++-------- src/styles/login/SharePtn-styled.js | 8 ++++++-- 4 files changed, 18 insertions(+), 13 deletions(-) rename src/pages/{Login.js => StartInfo.js} (80%) diff --git a/src/App.js b/src/App.js index 5873eec..9d9538f 100644 --- a/src/App.js +++ b/src/App.js @@ -10,7 +10,7 @@ import MyFullCalendar from 'pages/MyFullCalendar'; import MyPage from 'pages/MyPage'; import AccountInfo from 'pages/AccountInfo'; import SymptomTest from 'pages/symptomTest'; -import Login from 'pages/Login'; +import StartInfo from 'pages/StartInfo'; import LoginExe from 'pages/LoginExe'; import TestFrame from 'components/comonents/frame/TestFrame'; import IntroFrame from 'components/comonents/frame/IntroFrame'; @@ -69,7 +69,7 @@ function App() { } /> {/* 로그인 후 넘어가는 페이지 */} {/* } /> */} - } /> + } /> {/* } /> */} } /> {/* 카카오 로그인이 실행되는 페이지 */} diff --git a/src/pages/SelfTest/SelfTest10.js b/src/pages/SelfTest/SelfTest10.js index 3f89cb4..27f1844 100644 --- a/src/pages/SelfTest/SelfTest10.js +++ b/src/pages/SelfTest/SelfTest10.js @@ -21,7 +21,7 @@ function SelfTest10() { handleAnswerClick, isButtonActive, handleNextButtonClickWithScore, - } = useSelfTest('/login'); + } = useSelfTest(''); const [statement, setStatement] = useState(''); const [imgUrl, setImgUrl] = useState(''); diff --git a/src/pages/Login.js b/src/pages/StartInfo.js similarity index 80% rename from src/pages/Login.js rename to src/pages/StartInfo.js index 8b9c434..a21e675 100644 --- a/src/pages/Login.js +++ b/src/pages/StartInfo.js @@ -12,23 +12,24 @@ import { ShareBtn, CloseBtn, ConnectBtn, + IntroWrapper, } from 'styles/login/SharePtn-styled'; import ShareLink from 'hooks/login/ShareLink'; -const Login = () => { +const StartInfo = () => { // const [modalIsOpen, setModalIsOpen] = useState(false); return ( - <> + - 짝꿍과 연동하기 - - 닫고 홈화면으로 돌아가기 - + <> + 짝꿍과 연동하기 + 닫고 홈화면으로 돌아가기 + 카카오로 연동하여 나의 짝꿍의 리포트도 연결해보아요 - + ); }; -export default Login; +export default StartInfo; diff --git a/src/styles/login/SharePtn-styled.js b/src/styles/login/SharePtn-styled.js index 1e61ae3..85f9502 100644 --- a/src/styles/login/SharePtn-styled.js +++ b/src/styles/login/SharePtn-styled.js @@ -48,7 +48,7 @@ export const CloseBtn = styled.div` color: #5643d1; border: 1px solid #5643d1; margin-left: 52px; - position: absolute; + margin-top: 25px; `; export const ConnectWrapper = styled.div` @@ -146,6 +146,10 @@ export const ConnectBtn = styled.div` padding: 23px 0px; width: 496px; margin-left: 52px; - position: absolute; + bottom: 66px; `; + +export const IntroWrapper = styled.div` + padding-bottom: 40px; +`;