Skip to content

[chore] 중복된 것들 Component화 #3

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

Merged
westofsky merged 2 commits into from
Jun 20, 2023
Merged

[chore] 중복된 것들 Component화 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a0587f
chore : Header Component화
westofsky Jun 20, 2023
9b7908d
chore : 중복되는 VoteForm Component화
westofsky Jun 20, 2023
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
2 changes: 1 addition & 1 deletion src/app/login/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import styled from 'styled-components';
import arrow from '@/assets/images/arrow.svg';
import Link from 'next/link';
import Sign_button from '@/components/common/Sign_button';
import Sign_button from '@/components/register/Sign_button';

export default async function page() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/main/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import styled from 'styled-components';
import vote from '@/assets/images/vote.png';
import Link from 'next/link';
import Sign_button from '@/components/common/Sign_button';
import Sign_button from '@/components/register/Sign_button';

export default async function page() {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/app/register/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import styled, { css } from 'styled-components';
import arrow from '@/assets/images/arrow.svg';
import arrows from '@/assets/images/arrows.svg';
import Link from 'next/link';
import Sign_button from '@/components/common/Sign_button';
import Sign_button from '@/components/register/Sign_button';

export default async function page() {
const [isOpen, setIsOpen] = useState(false);
Expand Down
2 changes: 1 addition & 1 deletion src/app/start/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from 'react';
import styled from 'styled-components';
import vote from '@/assets/images/vote.png';
import Link from 'next/link';
import Sign_button from '@/components/common/Sign_button';
import Sign_button from '@/components/register/Sign_button';

export default async function page() {
return (
Expand Down
58 changes: 6 additions & 52 deletions src/app/vote/demo/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,15 @@
'use client';
import React from 'react';
import styled from 'styled-components';
import Title from '@/components/common/title/Title';
import Line from '@/components/common/line/Line';
import Check from '@/components/common/check/Check';
import Footer from '@/components/common/footer/Footer';
import arrow from '@/assets/images/arrow.svg';
import Link from 'next/link';
import Result from '@/components/common/result/Result';

import Line from '@/components/common/Line';
import Header from '@/components/common/Header';
import SelectMenuResult from '@/components/vote/SelectMenuResult';
function page() {
return (
<Container>
<Head>
<Link href={'/vote'}>
<Arrow src={arrow.src} />
</Link>
<Title content="데모데이 투표" />
</Head>
<Header content = "데모데이 투표" href = "/vote" />
<Line />

<VoteForm>
<VoteName>{'데모데이 투표'}</VoteName>
<div className="button">
<Check contnet="/vote"/>
<Result />
</div>
</VoteForm>
<SelectMenuResult content = "데모데이 투표" href = "" />
</Container>
);
}
Expand All @@ -41,33 +24,4 @@ const Container = styled.div`
.vote {
margin-top: 30px;
}
`;
const Head = styled.div`
display: flex;
align-items: center;
`;
const Arrow = styled.img`
width: 20px;
margin-top: 30px;
`;
const VoteForm = styled.div`
width: 300px;
height: 150px;
background-color: #f5f5f5;
border: 3px solid #000000;
display: flex;
align-items: center;
margin-top: 110px;
.button {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
`;
const VoteName = styled.div`
white-space: pre-line;
font-size: 19px;
font-weight: bold;
margin-left: 40px;
`;
`;
2 changes: 1 addition & 1 deletion src/app/vote/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import '../globals.css';
import Footer from '@/components/common/footer/Footer';
import Footer from '@/components/common/Footer';
export default function VoteLayout({
children,
}: {
Expand Down
32 changes: 5 additions & 27 deletions src/app/vote/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
'use client';
import React from 'react';
import styled from 'styled-components';
import Title from '@/components/common/title/Title';
import Line from '@/components/common/line/Line';
import Check from '@/components/common/check/Check';
import Footer from '@/components/common/footer/Footer';
import Title from '@/components/common/Title';
import Line from '@/components/common/Line';
import SelectMenu from '@/components/vote/SelectMenu';

function vote() {
return (
<Container>
<Title content="파트장 / 데모데이 투표" />
<Line />
<VoteForm>
<VoteName>{'파트장 투표'}</VoteName>
<Check content="/vote/part" />
</VoteForm>
<VoteForm>
<VoteName>{'데모데이 투표'}</VoteName>
<Check content="/vote/demo" />
</VoteForm>
<SelectMenu content = "파트장 투표" href = "/vote/part" />
<SelectMenu content = "데모데이 투표" href = "/vote/demo" />
</Container>
);
}
Expand All @@ -30,18 +23,3 @@ const Container = styled.div`
flex-direction: column;
align-items: center;
`;
const VoteForm = styled.div`
width: 300px;
height: 90px;
background-color: #f5f5f5;
border: 3px solid #000000;
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 70px;
`;
const VoteName = styled.div`
font-size: 19px;
font-weight: bold;
margin-left: 40px;
`;
74 changes: 11 additions & 63 deletions src/app/vote/part/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,19 @@
'use client';
import React from 'react';
import styled from 'styled-components';
import Title from '@/components/common/title/Title';
import Line from '@/components/common/line/Line';
import Check from '@/components/common/check/Check';
import Footer from '@/components/common/footer/Footer';
import arrow from '@/assets/images/arrow.svg';
import Link from 'next/link';
import Result from '@/components/common/result/Result';
import Line from '@/components/common/Line';
import Header from '@/components/common/Header';
import SelectMenuResult from '@/components/vote/SelectMenuResult';

function page() {
return (
<Container>
<Head>
<Link href={'/vote'}>
<Arrow src={arrow.src} />
</Link>
<Title content="파트장 투표" />
</Head>
<Header content = "파트장 투표" href = "/vote"/>
<Line />
<div className="vote">
<VoteForm>
<VoteName>{'FRONT-END \n 파트장 투표'}</VoteName>
<div className="button">
<Check content="" />
<Result />
</div>
</VoteForm>
<VoteForm>
<VoteName>{'BACK-END \n 파트장 투표'}</VoteName>
<div className="button">
<Check content="" />
<Result />
</div>
</VoteForm>
</div>
<SelectMenuResultWrapper>
<SelectMenuResult content = "FRONT-END br 파트장 투표" href = "" />
<SelectMenuResult content = "BACK-END br 파트장 투표" href = "" />
</SelectMenuResultWrapper>
</Container>
);
}
Expand All @@ -45,38 +24,7 @@ const Container = styled.div`
display: flex;
flex-direction: column;
align-items: center;

.vote {
margin-top: 30px;
}
`;
const Head = styled.div`
display: flex;
align-items: center;
`;
const Arrow = styled.img`
width: 20px;
margin-top: 30px;
`;
const VoteForm = styled.div`
width: 300px;
height: 150px;
background-color: #f5f5f5;
border: 3px solid #000000;
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 30px;
.button {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
`;
const VoteName = styled.div`
white-space: pre-line;
font-size: 19px;
font-weight: bold;
margin-left: 40px;
`;

const SelectMenuResultWrapper = styled.div`
`
0 src/components/common/footer/Footer.tsx → src/components/common/Footer.tsx
View file
Open in desktop
File renamed without changes.
42 changes: 42 additions & 0 deletions src/components/common/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
'use client';
import React from 'react';
import styled from 'styled-components';
import Title from '@/components/common/Title';
import arrow from '@/assets/images/arrow.svg';
import Link from 'next/link';

function Header({ content, href }: { content: string , href : string }) {
return (
<>
<Head>
<LinkWrapper>
<Link href={href}>
<Arrow src={arrow.src} />
</Link>
</LinkWrapper>
<TitleWrapper>
<Title content={content} />
</TitleWrapper>
</Head>
</>
)
}

export default Header;
const Head = styled.div`
display: flex;
align-items: center;
justify-content : space-between;
width : 100%;
`;
const Arrow = styled.img`
width: 20px;
margin-top: 30px;
`;
const LinkWrapper = styled.div`
padding-left : 30px;
`
const TitleWrapper = styled.div`
margin : 0 auto;
padding-right : 50px;
`
0 src/components/common/line/Line.tsx → src/components/common/Line.tsx
View file
Open in desktop
File renamed without changes.
0 src/components/common/title/Title.tsx → src/components/common/Title.tsx
View file
Open in desktop
File renamed without changes.
0 src/components/common/Sign_button.tsx → src/components/register/Sign_button.tsx
View file
Open in desktop
File renamed without changes.
0 src/components/common/check/Check.tsx → src/components/vote/Check.tsx
View file
Open in desktop
File renamed without changes.
0 src/components/common/result/Result.tsx → src/components/vote/Result.tsx
View file
Open in desktop
File renamed without changes.
32 changes: 32 additions & 0 deletions src/components/vote/SelectMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
'use client';
import React from 'react';
import styled from 'styled-components';
import Check from '@/components/vote/Check';

function SelectMenu({ content,href }: {content : string, href : string}) {
return (
<>
<VoteForm>
<VoteName>{content}</VoteName>
<Check content={href} />
</VoteForm>
</>
);
}

export default SelectMenu;
const VoteForm = styled.div`
width: 300px;
height: 90px;
background-color: #f5f5f5;
border: 3px solid #000000;
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 70px;
`;
const VoteName = styled.div`
font-size: 19px;
font-weight: bold;
margin-left: 40px;
`;
52 changes: 52 additions & 0 deletions src/components/vote/SelectMenuResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
'use client';
import React from 'react';
import styled from 'styled-components';
import Check from '@/components/vote/Check';
import Result from '@/components/vote/Result';

function SelectMenuResult({ content,href }: {content : string, href : string}) {
const lines = content.split('br');
return (
<>
<VoteForm>
<VoteName>
{lines.map((line, index) => (
<React.Fragment key={index}>
{line}
{index !== lines.length - 1 && <br />}
</React.Fragment>
))}
</VoteName>
<CheckWrapper>
<Check content={href} />
<Result />
</CheckWrapper>
</VoteForm>
</>
);
}

export default SelectMenuResult;
const VoteForm = styled.div`
width: 300px;
height: 90px;
background-color: #f5f5f5;
border: 3px solid #000000;
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 70px;
`;
const VoteName = styled.div`
font-size: 19px;
font-weight: bold;
margin-left: 40px;
white-space: pre-line;
`;
const CheckWrapper = styled.div`
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;

`