Skip to content

Commit b7f4f6a

Browse files
committed
fix: css prop layout 컨벤션에 맞게 수정 #46
1 parent 6b0f992 commit b7f4f6a

17 files changed

+29
-29
lines changed

frontend/src/components/GameResult/GameResult.styled.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { css } from '@emotion/react';
22

3-
export const layout = css`
3+
export const gameResultLayout = css`
44
display: flex;
55
flex-direction: column;
66
justify-content: center;

frontend/src/components/GameResult/GameResult.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useNavigate } from 'react-router-dom';
22

3-
import { gameResultTitle, gameResultTitleWrapper, layout } from './GameResult.styled';
3+
import { gameResultTitle, gameResultTitleWrapper, gameResultLayout } from './GameResult.styled';
44

55
import Button from '@/components/common/Button/Button';
66

@@ -12,7 +12,7 @@ const GameResult = () => {
1212
};
1313

1414
return (
15-
<div css={layout}>
15+
<div css={gameResultLayout}>
1616
<div css={gameResultTitleWrapper}>
1717
<h1 css={gameResultTitle}>게임 결과</h1>
1818
</div>

frontend/src/components/NicknameList/NicknameList.styled.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { css } from '@emotion/react';
22

3-
export const layout = css`
3+
export const nicknameListLayout = css`
44
display: flex;
55
justify-content: space-around;
66
width: 24.5rem;

frontend/src/components/NicknameList/NicknameList.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { layout, nicknameContainer, verticalLine } from './NicknameList.styled';
1+
import { nicknameListLayout, nicknameContainer, verticalLine } from './NicknameList.styled';
22

33
const NicknameList = () => {
44
const optionANicknames = ['철수', '철수', '철수', '철수', '철수', '철수', '철수', '철수', '철수'];
55
const optionBNicknames = ['영미', '영미', '영미'];
66

77
return (
8-
<div css={layout}>
8+
<div css={nicknameListLayout}>
99
<div css={nicknameContainer}>
1010
{optionANicknames.map((optionANickname) => (
1111
<span key={optionANickname}>{optionANickname}</span>

frontend/src/components/RoundVoteResult/RoundVoteResult.styled.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { css } from '@emotion/react';
22

33
import { Theme } from '@/styles/Theme';
44

5-
interface LayoutProps {
5+
interface RoundVoteResultLayoutProps {
66
percentage: number;
77
}
88

9-
export const layout = ({ percentage }: LayoutProps) => css`
9+
export const roundVoteResultLayout = ({ percentage }: RoundVoteResultLayoutProps) => css`
1010
display: flex;
1111
justify-content: space-around;
1212
align-items: center;

frontend/src/components/RoundVoteResult/RoundVoteResult.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { layout, fontBold, voteContent } from './RoundVoteResult.styled';
1+
import { roundVoteResultLayout, fontBold, voteContent } from './RoundVoteResult.styled';
22

33
import useBalanceContentQuery from '@/hooks/useBalanceContentQuery';
44

55
const RoundVoteResult = () => {
66
const { balanceContent } = useBalanceContentQuery();
77

88
return (
9-
<div css={layout({ percentage: 72 })}>
9+
<div css={roundVoteResultLayout({ percentage: 72 })}>
1010
<div css={voteContent}>
1111
<div css={fontBold}>{balanceContent?.firstOption.name}</div>
1212
<div css={fontBold}>72%</div>

frontend/src/components/SelectContainer/SelectContainer.styled.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { css } from '@emotion/react';
22

3-
export const layout = css`
3+
export const selectContainerLayout = css`
44
display: flex;
55
flex-direction: column;
66
justify-content: center;

frontend/src/components/SelectContainer/SelectContainer.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useState } from 'react';
22
import { useNavigate } from 'react-router-dom';
33

4-
import { layout, selectSection } from './SelectContainer.styled';
4+
import { selectContainerLayout, selectSection } from './SelectContainer.styled';
55

66
import Button from '@/components/common/Button/Button';
77
import SelectOption from '@/components/SelectOption/SelectOption';
@@ -25,7 +25,7 @@ const SelectContainer = () => {
2525
return (
2626
<>
2727
{balanceContent && (
28-
<div css={layout}>
28+
<div css={selectContainerLayout}>
2929
<section css={selectSection}>
3030
<SelectOption
3131
option={balanceContent.firstOption}

frontend/src/components/SelectOption/SelectOption.styled.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { css } from '@emotion/react';
22

33
import { Theme } from '@/styles/Theme';
44

5-
export const layout = (selected: boolean) => css`
5+
export const SelectOptionLayout = (selected: boolean) => css`
66
display: flex;
77
justify-content: center;
88
align-items: center;

frontend/src/components/SelectOption/SelectOption.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { layout } from './SelectOption.styled';
1+
import { SelectOptionLayout } from './SelectOption.styled';
22

33
import { BalanceContent } from '@/types/balanceContent';
44

@@ -11,7 +11,7 @@ interface SelectOptionProps {
1111
const SelectOption = ({ option, selectedId, handleSelectOption }: SelectOptionProps) => {
1212
return (
1313
<button
14-
css={layout(Boolean(selectedId === option.optionId))}
14+
css={SelectOptionLayout(Boolean(selectedId === option.optionId))}
1515
onClick={() => handleSelectOption(option.optionId)}
1616
>
1717
{option.name}

frontend/src/components/Timer/Timer.styled.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { css } from '@emotion/react';
22

33
import { Theme } from '@/styles/Theme';
44

5-
export const layout = css`
5+
export const timerLayout = css`
66
display: flex;
77
justify-content: center;
88
width: 100%;
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { layout } from './Timer.styled';
1+
import { timerLayout } from './Timer.styled';
22

33
const Timer = () => {
4-
return <div css={layout}></div>;
4+
return <div css={timerLayout}></div>;
55
};
66

77
export default Timer;

frontend/src/components/TopicContainer/TopicContainer.styled.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { css } from '@emotion/react';
22

3-
export const topicLayout = css`
3+
export const topicContainerLayout = css`
44
display: flex;
55
flex-direction: column;
66
justify-content: center;

frontend/src/components/TopicContainer/TopicContainer.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { categoryText, topicLayout, topicText } from './TopicContainer.styled';
1+
import { categoryText, topicContainerLayout, topicText } from './TopicContainer.styled';
22

33
import useBalanceContentQuery from '@/hooks/useBalanceContentQuery';
44

55
const TopicContainer = () => {
66
const { balanceContent } = useBalanceContentQuery();
77

88
return (
9-
<section css={topicLayout}>
9+
<section css={topicContainerLayout}>
1010
<span css={categoryText}>{balanceContent?.category}</span>
1111
<span css={topicText}>{balanceContent?.question}</span>
1212
</section>

frontend/src/components/layout/Content/Content.styled.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { css } from '@emotion/react';
22

3-
export const contentSection = css`
3+
export const contentLayout = css`
44
display: flex;
55
flex-direction: column;
66
align-items: center;
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { PropsWithChildren } from 'react';
22

3-
import { contentSection } from './Content.styled';
3+
import { contentLayout } from './Content.styled';
44

55
const Content = ({ children }: PropsWithChildren) => {
6-
return <section css={contentSection}>{children}</section>;
6+
return <section css={contentLayout}>{children}</section>;
77
};
88

99
export default Content;

frontend/src/router/index.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import NicknamePage from '@/pages/NicknamePage/NicknamePage';
99
import RoundResultPage from '@/pages/RoundResultPage/RoundResultPage';
1010

1111
export const router = createBrowserRouter([
12+
{
13+
path: '/',
14+
element: <MainPage />,
15+
},
1216
{
1317
path: '/',
1418
element: <Layout />,
1519
children: [
16-
{
17-
index: true,
18-
element: <MainPage />,
19-
},
2020
{
2121
path: 'nickname',
2222
element: <NicknamePage />,

0 commit comments

Comments
 (0)