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

[6주차] 챗마인더 미션 제출합니다. #6

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
0632346
[Feat] LogIn 컴포넌트 생성
SEEWON Nov 25, 2021
6a737f9
[Chore] Router 추가
SEEWON Nov 26, 2021
59b0ffe
[Chore] Styled-Components 추가
SEEWON Nov 26, 2021
34bbadb
[Feat] 로그인 및 회원가입 UI 구현
SEEWON Nov 26, 2021
ed24f68
[Feat] axios.POST 구현
SEEWON Nov 26, 2021
5dc41d6
[Feat] 로그인 구현
SEEWON Nov 26, 2021
67c83e7
vote layout
roum02 Nov 26, 2021
1bedaf2
modal layout
roum02 Nov 26, 2021
4aeedf7
layout 수정
roum02 Nov 26, 2021
bbba437
CandidateList TS성공
roum02 Nov 27, 2021
649876e
iconly img button완료
roum02 Nov 27, 2021
c3967c7
count 함수 기능 완료
roum02 Nov 27, 2021
fe27402
모달창 적용 완료
roum02 Nov 27, 2021
79400aa
[Feat] 발급받은 액세스 토큰 쿠키에 저장
SEEWON Nov 28, 2021
4d6add6
[Refactor] 쿠키 관련 리팩토링
SEEWON Nov 28, 2021
5dde1cb
[Feat] Sign up 성공 시 refresh, 실패 시 alert
SEEWON Nov 28, 2021
54c5664
[Feat] Redux, global한 유저 상태 관리 구현
SEEWON Dec 1, 2021
d154f81
[Feat] 토큰 검증, 전역 state에 유저 정보 저장
SEEWON Dec 2, 2021
7927bf9
[Feat] 로그아웃 구현(쿠키 삭제)
SEEWON Dec 2, 2021
f9d535b
[Feat] 투표 창에서 유저 state 받아오기
SEEWON Dec 2, 2021
fe24769
[Fix] 문구 수정..ㅎ
SEEWON Dec 2, 2021
cd0f3bf
[Feat] Refresh when Signout
SEEWON Dec 3, 2021
ac2e979
test.js
roum02 Dec 3, 2021
27f4880
후보 리스트 get
roum02 Dec 3, 2021
ed77814
voteBox 레이아웃 수정
roum02 Dec 3, 2021
94988fb
vote 성공~~~~~~ ^^ 행복하네요
roum02 Dec 3, 2021
0ed698a
vote 정렬 완료
roum02 Dec 3, 2021
6e63acf
text레이아웃 정렬
roum02 Dec 3, 2021
bff5d46
유저인지 아닌지 구분
roum02 Dec 3, 2021
d28e57c
투표 결과화면 구현완료
roum02 Dec 3, 2021
ab3dff6
후보 등록 완료
roum02 Dec 3, 2021
c7b9bec
후보 삭제 기능 완료?
roum02 Dec 3, 2021
75d7b14
우와ㅡㅠㅠ리듀서 썼어요ㅠㅠㅜㅜㅡ짱편하네요
roum02 Dec 3, 2021
3453e06
와 성공했어요ㅜㅡㅜㅡㅜㅡㅠㅠ
roum02 Dec 3, 2021
8777524
[Refactor] http -> https && 약간의 리팩토링
SEEWON Dec 3, 2021
3e6ba6b
렌더링 버그 수정
roum02 Dec 26, 2021
46d98f3
Update README.md
SEEWON Apr 9, 2022
71a8a83
Update README.md
SEEWON Apr 9, 2022
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
Prev Previous commit
Next Next commit
투표 결과화면 구현완료
roum02 committed Dec 3, 2021
commit d28e57c930182ba7d978c912e5b58193931c53d7
10 changes: 6 additions & 4 deletions src/pages/Vote(ROUM)/CandidateList.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import React, { useState } from "react";
import { VoteProps } from "./Vote";
import { Text, TextBox } from "./VotePresenter";
import { TextItem } from "./VotePresenter";

const CandidateList = (candidate: VoteProps["candidates"]): JSX.Element => {
const CandidateList = (
candidate: VoteProps["candidates"]
//isResult: VoteProps["isResult"]
): JSX.Element => {
return (
<>
<Text width="5rem">{candidate.name}</Text>
<Text width="3rem">{candidate.votes} 표</Text>
<TextItem width="5rem">{candidate.name}</TextItem>
</>
);
};
2 changes: 2 additions & 0 deletions src/pages/Vote(ROUM)/Vote.tsx
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ import {
LoginBox,
VoteButtonBox,
CandidateBox,
TextItem,
} from "./VotePresenter";
import CandidateList from "./CandidateList";

@@ -189,6 +190,7 @@ const Vote = () => {
{candidates.map((candidate) => (
<CandidateBox>
<CandidateList key={candidate.id} {...candidate} />
<TextItem width="3rem"> {candidate.votes} 표</TextItem>
</CandidateBox>
))}
</Modal.Body>
2 changes: 1 addition & 1 deletion src/pages/Vote(ROUM)/VotePresenter.tsx
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ type WidthType = {
width: string;
};

export const Text = styled.div<WidthType>`
export const TextItem = styled.div<WidthType>`
width: ${(props) => props.width || "5rem"};
`;