Skip to content
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.

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

[feat] 투표 옵션에 이미지, 코드블럭 추가 #68

Merged
merged 18 commits into from
Feb 1, 2023
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
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
3 changes: 3 additions & 0 deletions __mocks__/data/image.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import image from '@mocks/data/img.png';

export const TEST_IMAGE = image.toString();
Binary file added __mocks__/data/img.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 65 additions & 0 deletions __mocks__/data/voteOption.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { TEST_IMAGE } from '@mocks/data/image';

import VoteOption from '@src/types/VoteOption';

export const VOTE_OPTION: VoteOption = {
Expand All @@ -16,3 +18,66 @@ export const VOTE_OPTION2: VoteOption = {
};

export const VOTE_OPTIONS: VoteOption[] = [VOTE_OPTION, VOTE_OPTION2];

export const VOTE_OPTION_WITH_IMAGE: VoteOption = {
...VOTE_OPTION,
voteOptionId: 9,
text: '이미지가 있음',
image: TEST_IMAGE,
};

export const VOTE_OPTION_WITH_CODE: VoteOption = {
...VOTE_OPTION,
voteOptionId: 9,
text: '코드가 있어요!',
codeBlock: {
language: 'js',
contents: `
import React, { MouseEvent } from 'react';

import { Languages } from '@src/components/common/CodeEditor';
import Icon from '@src/components/common/Icon';
import VoteOption from '@src/types/VoteOption';

hwookim marked this conversation as resolved.
Show resolved Hide resolved
import * as S from './SelectOption.style';

interface SelectOptionProps extends VoteOption {
rate?: number;
result?: boolean;
selected?: boolean;
onClick: (id: number, selected: boolean) => void;
}

const SelectOption = (props: SelectOptionProps) => {
const { voteOptionId, text, rate = 0, result = false, selected = false, image, codeBlock, onClick } = props;

const handleClick = (e: MouseEvent<HTMLButtonElement>) => {
e.stopPropagation();
e.nativeEvent.preventDefault();
onClick(voteOptionId, selected);
};

return (
<S.Container>
<S.SelectButton $result={result} $selected={selected} onClick={handleClick}>
{result && <S.ProgressBar className="progress" $rate={rate} $selected={selected} />}
<S.Info>
<Icon name="Vote" />
<S.Text>{text}</S.Text>
{result && <S.Rate>{Math.round(rate * 100)}%</S.Rate>}
</S.Info>
</S.SelectButton>
{image && (
<S.ImageWrapper>
<S.OptionImage src={image} alt={text} fill />
</S.ImageWrapper>
)}
{codeBlock && <S.CodeBlock language={codeBlock.language as Languages} value={codeBlock.contents} disabled />}
</S.Container>
);
};

export default SelectOption;
`,
},
};
2 changes: 1 addition & 1 deletion next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const nextConfig = {
return config;
},
images: {
domains: ['avatars.githubusercontent.com'],
domains: ['*'], // TODO: S3 주소만 허용할 건지 논의 필요
},
};

Expand Down
Loading