Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 경로변경 #47

Merged
merged 1 commit into from
Aug 6, 2024
Merged

feat: 경로변경 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -69,7 +69,7 @@ function App() {
<Route path="/userInfo" element={<UserInfo />} />
{/* 로그인 후 넘어가는 페이지 */}
{/* <Route path="/login" element={<Login />} /> */}
<Route path="/login" element={<Start />} />
<Route path="/login" element={<StartInfo />} />
{/* <Route path="/kakaologin" element={<ShareUrl />} /> */}
<Route path="/kakaologin" element={<LoginExe />} />
{/* 카카오 로그인이 실행되는 페이지 */}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/SelfTest/SelfTest10.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function SelfTest10() {
handleAnswerClick,
isButtonActive,
handleNextButtonClickWithScore,
} = useSelfTest('/login');
} = useSelfTest('</login>');

const [statement, setStatement] = useState('');
const [imgUrl, setImgUrl] = useState('');
Expand Down
17 changes: 9 additions & 8 deletions src/pages/Login.js → src/pages/StartInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<>
<IntroWrapper>
<ServiceDesc />
<ConnectBtn>짝꿍과 연동하기</ConnectBtn>
<Link to="/">
<CloseBtn>닫고 홈화면으로 돌아가기</CloseBtn>
</Link>

<>
<ConnectBtn>짝꿍과 연동하기</ConnectBtn>
<CloseBtn>닫고 홈화면으로 돌아가기</CloseBtn>
</>
<LoginDesc>카카오로 연동하여 나의 짝꿍의 리포트도 연결해보아요</LoginDesc>
</>
</IntroWrapper>
);
};

export default Login;
export default StartInfo;
8 changes: 6 additions & 2 deletions src/styles/login/SharePtn-styled.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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;
`;
Loading