Skip to content

Commit

Permalink
delete :: button
Browse files Browse the repository at this point in the history
  • Loading branch information
dutexion committed Apr 17, 2024
1 parent 7c35494 commit 7c1ac3e
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 91 deletions.
6 changes: 3 additions & 3 deletions src/components/Main/firstContainer.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from '@emotion/styled';
import MainImg from '@/assets/Main.svg';
import { Button } from '../common/button';
// import { Button } from '../common/Button';

export const FirstContainer = () => {
return (
Expand All @@ -15,9 +15,9 @@ export const FirstContainer = () => {
배포하는 경험을 할 수 있습니다.
</div>
<div>스퀘어는 보다 쉬운 방법으로 배포할 수 있고 쉽게 모니터링 할 수 있습니다.</div>
<Button width={190} height={64} buttonColor="white" buttonStyle="ghost" onClick={() => console.log('click!!')}>
{/* <Button width={190} height={64} buttonColor="white" buttonStyle="ghost" onClick={() => console.log('click!!')}>
자세히 보기
</Button>
</Button> */}
</MainContainer>
</Container>
);
Expand Down
63 changes: 0 additions & 63 deletions src/components/common/button.tsx

This file was deleted.

48 changes: 26 additions & 22 deletions src/components/common/header/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from '@emotion/styled';
import LogoImg from '@/assets/Logo.svg';
import { useEffect, useState } from 'react';
import { Button } from '@/components/common/button';
// import { Button } from '@/components/common/Button';
import { useLocation } from 'react-router-dom';
import { css } from '@emotion/react';

Expand All @@ -25,27 +25,31 @@ export const Header = () => {
return (
<>
<Wrapper scroll={scroll} pathname={_pathname}>
<LeftSide scroll={scroll}>
<img src={LogoImg} />
<span>Xquare Infra</span>
</LeftSide>
<Center>
<span>소개</span>
<span>고객 지원</span>
</Center>
<RightSide>
<Button
width={164}
height={40}
buttonStyle="ghost"
buttonColor={scroll === 0 ? 'white' : 'black'}
onClick={() => {
console.log('click!');
}}
>
무료로 시작하기
</Button>
</RightSide>
{_pathname === '' && (
<>
<LeftSide scroll={scroll}>
<img src={LogoImg} />
<span>Xquare Infra</span>
</LeftSide>
<Center>
<span>소개</span>
<span>고객 지원</span>
</Center>
<RightSide>
{/* <Button
width={164}
height={40}
buttonStyle="ghost"
buttonColor={scroll === 0 ? 'white' : 'black'}
onClick={() => {
console.log('click!');
}}
>
무료로 시작하기
</Button> */}
</RightSide>
</>
)}
<WrapperBackground scroll={_pathname === '' ? scroll : 0} />
</Wrapper>
</>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/Main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import styled from '@emotion/styled';
import { FirstContainer } from '@/components/Main/firstContainer';
import { SecondContainer } from '@/components/Main/secondContainer';
import { ThirdContainer } from '@/components/Main/thirdContainer';
import { Button } from '@/components/common/button';
// import { Button } from '@/components/common/Button';

export const Main = () => {
return (
Expand All @@ -16,9 +16,9 @@ export const Main = () => {
대마고 학생이라면 <b>‘스퀘어 인프라’</b><br />
<b>무료</b>로 사용할 수 있습니다.
</div>
<Button width={188} height={56} buttonColor="white" buttonStyle="solid" onClick={() => console.log('click!!')}>
{/* <Button width={188} height={56} buttonColor="white" buttonStyle="solid" onClick={() => console.log('click!!')}>
무료로 사용하기
</Button>
</Button> */}
</SubFooter>
</Wrapper>
);
Expand Down

0 comments on commit 7c1ac3e

Please sign in to comment.