From bf6c74d2129beaa9bcbde2b8173a4e2d3c380cc0 Mon Sep 17 00:00:00 2001 From: immms Date: Tue, 6 Aug 2024 18:04:33 +0900 Subject: [PATCH 1/6] =?UTF-8?q?chore:=20=ED=99=88=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=B2=84=ED=8A=BC=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Home.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Home.js b/src/pages/Home.js index 5a785ab..fbb4158 100644 --- a/src/pages/Home.js +++ b/src/pages/Home.js @@ -29,7 +29,7 @@ function Home() { - + {/* */} From c001b51a46522c1485f77bfa9f6a8aa85af45962 Mon Sep 17 00:00:00 2001 From: immms Date: Tue, 6 Aug 2024 18:56:03 +0900 Subject: [PATCH 2/6] =?UTF-8?q?design:=20dropdown=20=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EC=9D=BC=EC=A0=95=ED=95=9C=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/report/ReportDropDown-styled.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/styles/report/ReportDropDown-styled.js b/src/styles/report/ReportDropDown-styled.js index 3f38f34..05042a7 100644 --- a/src/styles/report/ReportDropDown-styled.js +++ b/src/styles/report/ReportDropDown-styled.js @@ -35,7 +35,7 @@ export const Solution = styled.div` align-items: center; width: 424px; height: 134px; - margin-bottom: 19px; + margin-bottom: 20px; ` export const SolutionNumBlue = styled.div` font-weight: 200; @@ -43,6 +43,7 @@ export const SolutionNumBlue = styled.div` line-height: 134.4px; color: #9180FF; margin-right: 57px; + width: 80px; ` export const SolutionNumGray = styled.div` font-weight: 200; @@ -50,10 +51,11 @@ export const SolutionNumGray = styled.div` line-height: 134.4px; color: #8A8A8A; margin-right: 57px; + width: 80px; ` export const SolutionText = styled.div` width: 280px; - height: 96px; + height: fit-content; font-weight: 400; font-size: 17px; line-height: 24px; From 73db6f10a971c1cbb6b2f7b808bbef2d33444926 Mon Sep 17 00:00:00 2001 From: immms Date: Tue, 6 Aug 2024 20:25:03 +0900 Subject: [PATCH 3/6] =?UTF-8?q?chore:=20pull=20=EB=B3=80=EA=B2=BD=EC=82=AC?= =?UTF-8?q?=ED=95=AD=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 31 ++++---------------- src/components/comonents/frame/IntroFrame.js | 4 +-- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/src/App.js b/src/App.js index 5873eec..4ade835 100644 --- a/src/App.js +++ b/src/App.js @@ -43,9 +43,7 @@ function App() { {/* 기본 화면프레임 */} }> } /> {/* 시작 화면 */} - - }> } /> } /> } /> @@ -57,6 +55,11 @@ function App() { } /> } /> } /> + } /> + + } /> + } /> + } /> }> @@ -66,24 +69,9 @@ function App() { } /> } /> } /> - } /> {/* 로그인 후 넘어가는 페이지 */} - {/* } /> */} } /> - {/* } /> */} } /> - {/* 카카오 로그인이 실행되는 페이지 */} - {/* } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> - } /> */} {/* 테스트 화면프레임 */} @@ -91,15 +79,6 @@ function App() { } /> - {/* 로고 가운데 화면프레임 */} - }> - } /> - - - } /> - } /> - - } /> diff --git a/src/components/comonents/frame/IntroFrame.js b/src/components/comonents/frame/IntroFrame.js index 2ee139f..c233f73 100644 --- a/src/components/comonents/frame/IntroFrame.js +++ b/src/components/comonents/frame/IntroFrame.js @@ -2,7 +2,7 @@ import React from 'react'; import { Outlet } from 'react-router-dom'; import { FrameWrapper } from 'styles/ComonItem-styled'; -function IntrFrame() { +function IntroFrame() { return ( {/* 중첩라우팅 */} @@ -10,4 +10,4 @@ function IntrFrame() { ); } -export default IntrFrame; +export default IntroFrame; From 658ee81a54df5c8e39287eebf48f82127929f294 Mon Sep 17 00:00:00 2001 From: immms Date: Tue, 6 Aug 2024 20:38:51 +0900 Subject: [PATCH 4/6] =?UTF-8?q?chore:=20reportDetail=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EC=97=90=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=ED=94=84?= =?UTF-8?q?=EB=A0=88=EC=9E=84=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/App.js b/src/App.js index 4ade835..b34ac0d 100644 --- a/src/App.js +++ b/src/App.js @@ -65,7 +65,6 @@ function App() { }> } /> } /> - } /> } /> } /> } /> @@ -74,9 +73,10 @@ function App() { } /> - {/* 테스트 화면프레임 */} - }> - } /> + {/* 테스트 프레임 */} + }> + } /> + } /> From 7efe4f5baa42aede206ba29432498081f8b9f417 Mon Sep 17 00:00:00 2001 From: immms Date: Tue, 6 Aug 2024 20:42:56 +0900 Subject: [PATCH 5/6] =?UTF-8?q?design:=20=EB=A6=AC=ED=8F=AC=ED=84=B0=20?= =?UTF-8?q?=ED=94=84=EB=A0=88=EC=9E=84=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 3 ++ src/components/comonents/frame/ReportFrame.js | 17 ++++++++++ .../comonents/topBar/ReportTopBar.js | 32 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 src/components/comonents/frame/ReportFrame.js create mode 100644 src/components/comonents/topBar/ReportTopBar.js diff --git a/src/App.js b/src/App.js index b34ac0d..81e90b0 100644 --- a/src/App.js +++ b/src/App.js @@ -33,6 +33,7 @@ import CodeInput from 'pages/CodeInput'; import Loading from 'pages/Loading'; import CenterFrame from 'components/comonents/frame/CenterFrame'; +import ReportFrame from 'components/comonents/frame/ReportFrame'; function App() { return ( @@ -76,6 +77,8 @@ function App() { {/* 테스트 프레임 */} }> } /> + + }> } /> diff --git a/src/components/comonents/frame/ReportFrame.js b/src/components/comonents/frame/ReportFrame.js new file mode 100644 index 0000000..9cafb58 --- /dev/null +++ b/src/components/comonents/frame/ReportFrame.js @@ -0,0 +1,17 @@ +import React from 'react'; +import { Outlet } from 'react-router-dom'; +import { FrameWrapper } from 'styles/ComonItem-styled'; +import ReportTopBar from '../topBar/ReportTopBar'; + +// Test 화면 프레임 +function ReportFrame() { + return ( + + {/* 상단바 */} + {/* 중첩라우팅 */} + {/* 하단메뉴바 */} + + ); +} + +export default ReportFrame; diff --git a/src/components/comonents/topBar/ReportTopBar.js b/src/components/comonents/topBar/ReportTopBar.js new file mode 100644 index 0000000..02343c9 --- /dev/null +++ b/src/components/comonents/topBar/ReportTopBar.js @@ -0,0 +1,32 @@ +import React from 'react'; +import { IoIosArrowBack } from "react-icons/io"; +import { useNavigate } from 'react-router-dom'; +import { TestTopBarContainer, TestTopBarWrapper, BackIconWrapper, TestTopBarText } from 'styles/ComonItem-styled'; + +function ReportTopBar() { + const navigate = useNavigate(); + + // 뒤로가기 버튼 + const gotoBack = () =>{ + navigate(-1); + } + + return ( + <> + + + + + + + + {/* TODO : 페이지에 따라 상단 TEXT 넘겨주기 */} + 세부 리포트 + + + + + ); +} + +export default ReportTopBar; From b897665384dae1caaf7e107e13ece65764290318 Mon Sep 17 00:00:00 2001 From: immms Date: Tue, 6 Aug 2024 20:58:42 +0900 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20app.js=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 9 ++++----- src/pages/SelfTest/SelfTest10.js | 2 +- src/pages/{Login.js => StartInfo.js} | 16 ++++------------ 3 files changed, 9 insertions(+), 18 deletions(-) rename src/pages/{Login.js => StartInfo.js} (66%) diff --git a/src/App.js b/src/App.js index 81e90b0..3476825 100644 --- a/src/App.js +++ b/src/App.js @@ -10,11 +10,9 @@ 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 LoginExe from 'pages/LoginExe'; import TestFrame from 'components/comonents/frame/TestFrame'; import IntroFrame from 'components/comonents/frame/IntroFrame'; -import Intro from 'pages/intro'; import UserInfo from 'pages/UserInfo'; import { CookiesProvider } from 'react-cookie'; import FeSelfTest from 'pages/SelfTest/FeSelfTest'; @@ -32,8 +30,8 @@ import Start from 'pages/Start'; import CodeInput from 'pages/CodeInput'; import Loading from 'pages/Loading'; -import CenterFrame from 'components/comonents/frame/CenterFrame'; import ReportFrame from 'components/comonents/frame/ReportFrame'; +import StartInfo from 'pages/StartInfo'; function App() { return ( @@ -59,8 +57,9 @@ function App() { } /> } /> - } /> - } /> + } /> + } /> + }> diff --git a/src/pages/SelfTest/SelfTest10.js b/src/pages/SelfTest/SelfTest10.js index 3f89cb4..3c9a05f 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('/startInfo'); const [statement, setStatement] = useState(''); const [imgUrl, setImgUrl] = useState(''); diff --git a/src/pages/Login.js b/src/pages/StartInfo.js similarity index 66% rename from src/pages/Login.js rename to src/pages/StartInfo.js index 8b9c434..bfd93b0 100644 --- a/src/pages/Login.js +++ b/src/pages/StartInfo.js @@ -2,27 +2,19 @@ // import LoginButton from 'components/login/LoginButton'; import ServiceDesc from 'components/login/ServiceDesc'; import { LoginDesc } from 'styles/login/ServiceDesc-styled'; -import React, { useState } from 'react'; +import React from 'react'; import { Link } from 'react-router-dom'; -import level4_1 from 'assets/images/level4_1.png'; import { - Header, - Title, - Result, - ShareBtn, CloseBtn, ConnectBtn, } from 'styles/login/SharePtn-styled'; -import ShareLink from 'hooks/login/ShareLink'; - -const Login = () => { - // const [modalIsOpen, setModalIsOpen] = useState(false); +const StartInfo = () => { return ( <> 짝꿍과 연동하기 - + 닫고 홈화면으로 돌아가기 @@ -31,4 +23,4 @@ const Login = () => { ); }; -export default Login; +export default StartInfo;