From 428da50ddd1fe96fa426035ab90224db152d600e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=84=EC=A7=84=ED=98=B8?= Date: Mon, 22 Jan 2024 16:11:05 +0900 Subject: [PATCH 1/2] fix: add width height to ThumbsIcon --- src/components/Home/Comment/Thumbs.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/Home/Comment/Thumbs.tsx b/src/components/Home/Comment/Thumbs.tsx index ccde91f..a639b82 100644 --- a/src/components/Home/Comment/Thumbs.tsx +++ b/src/components/Home/Comment/Thumbs.tsx @@ -22,6 +22,8 @@ const Thumbs = ({ type, count, hasClicked, onClick }: ThumbsProps) => { +); + +export default LoginButton; diff --git a/src/routes/Auth/login/Login.styles.tsx b/src/routes/Auth/login/Login.styles.tsx index 117693d..e8f7c6d 100644 --- a/src/routes/Auth/login/Login.styles.tsx +++ b/src/routes/Auth/login/Login.styles.tsx @@ -1,7 +1,7 @@ import { styled } from 'styled-components'; export const Container = styled.div` - height: 100vh; + height: 100%; background-color: ${(props) => props.theme.colors.navy}; `; @@ -19,8 +19,6 @@ export const Divider = styled.div` `; export const LoginButtonContainer = styled.div` - position: absolute; - bottom: 104px; display: flex; flex-direction: column; gap: 17px; diff --git a/src/routes/Auth/login/Login.tsx b/src/routes/Auth/login/Login.tsx index 002695a..966d8da 100644 --- a/src/routes/Auth/login/Login.tsx +++ b/src/routes/Auth/login/Login.tsx @@ -1,20 +1,15 @@ import React from 'react'; -import { Row } from '@components/commons/Flex/Flex'; +import { Col, Row } from '@components/commons/Flex/Flex'; import Layout from '@components/commons/Layout/Layout'; import Text from '@components/commons/Text/Text'; +import LoginButton from '@components/Login/LoginButton'; -import { colors } from '@styles/theme'; +import { colors, theme } from '@styles/theme'; import { ABLogoIcon, AppleIcon, GoogleIcon, KakaoIcon } from '@icons/index'; -import { - Container, - Divider, - LoginButton, - LoginButtonContainer, - LogoContainer, -} from './Login.styles'; +import { Container, Divider, LoginButtonContainer, LogoContainer } from './Login.styles'; const Login = () => { const KakaoRestApiKey = import.meta.env.VITE_KAKAO_OAUTH_KEY; @@ -36,51 +31,43 @@ const Login = () => { return ( -
- + + - - - 세상의 모든 질문, -
AB로 답하다 -
-
- - - - - 간편 가입하기 + + 세상의 모든 질문, +
AB로 답하다
- -
- - - - - 카카오로 계속하기 + + + + + + 간편 가입하기 -
+ - - - - - - 구글로 계속하기 - -
- - - - - - - 애플로 계속하기 - -
- - - + } + buttonText="카카오로 계속하기" + /> + } + buttonText="구글로 계속하기" + /> + } + buttonText="애플로 계속하기" + /> + + );