From 72fb3d765d4e10cc96de9f3b043c8b8a570577bd Mon Sep 17 00:00:00 2001 From: Mincheol Park <69390311+Low-ProFiles@users.noreply.github.com> Date: Fri, 23 Aug 2024 13:03:07 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/login/login.tsx | 6 ++-- src/pages/team/share.tsx | 74 ++++++++++++++++++++++----------------- 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/src/pages/login/login.tsx b/src/pages/login/login.tsx index 8018af0..4d5b517 100644 --- a/src/pages/login/login.tsx +++ b/src/pages/login/login.tsx @@ -33,13 +33,13 @@ export const LoginPage = () => { useEffect(() => { const token = localStorage.getItem('accessToken'); - const isNewUser = !!localStorage.getItem('isNewUser'); + const isNewUser = localStorage.getItem('isNewUser'); - if (token && !!isNewUser) { + if (token && isNewUser === 'true') { navigate('/signup'); } - if (token && !isNewUser) { + if (token && isNewUser === 'false') { navigate('/team'); } }, [location]); diff --git a/src/pages/team/share.tsx b/src/pages/team/share.tsx index e62eb2a..ec9c0ef 100644 --- a/src/pages/team/share.tsx +++ b/src/pages/team/share.tsx @@ -46,32 +46,41 @@ export const ShareTeamPage: React.FC = () => { return ( - - -
- {teamCode} - - 팀 코드 복사 - -
- {isCopied && 코드가 복사되었습니다!} -
- - - - {isPasswordError && {isPasswordError}} - - - 워크 스페이스로 이동 - +
+ + + + + {teamCode} + + 팀 코드 복사 + + + {isCopied && 코드가 복사되었습니다!} + + + + + {isPasswordError && {isPasswordError}} + + + 워크 스페이스로 이동 + +
); }; @@ -87,12 +96,12 @@ const CodeContainer = styled.div` width: 647px; height: 76px; margin-top: 95px; - margin-left: 372px; margin-bottom: 20px; `; -const Code = styled.span` - width: 536px; +const Code = styled.div` + height: 22.5px; + width: 605px; flex: 1; padding: 13px 18px; border: 1px solid #ccc; @@ -125,15 +134,15 @@ const CopiedMessage = styled.span` `; const PasswordContainer = styled.div` - width: 498px; + display: grid; + width: 647px; height: 76px; margin-top: 24px; - margin-left: 372px; margin-bottom: 20px; `; const PasswordInput = styled.input` - width: 498px; + width: 605px; padding: 13px 18px; height: 22.5px; border: 1px solid #ccc; @@ -146,7 +155,6 @@ const PasswordInput = styled.input` `; const NextButton = styled.button` - margin-left: 372px; margin-top: 48px; width: 536px; height: 48px;