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

[7주차] 로컬무드 미션 제출합니다. #4

Open
wants to merge 97 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
f3f44ea
Feat:cra 세팅
wokbjso Nov 28, 2023
ea7d223
Feat:vote 관련 스토리북 생성
wokbjso Nov 29, 2023
40fc187
Feat:파트장 투표 결과 story 생성
wokbjso Dec 2, 2023
8d3c6c1
Feat:데모데이 story 생성
wokbjso Dec 2, 2023
7bd1c7b
Feat:투표 선택 hover시 story 반영
wokbjso Dec 2, 2023
860004f
Feat:버튼 layout story 생성
wokbjso Dec 2, 2023
963c37c
Feat:input 레이아웃 스토리 생성
wokbjso Dec 4, 2023
3e4ce3e
Chore:vote result 타입 2개로 정의
wokbjso Dec 4, 2023
9c59200
Merge pull request #1 from CEOS-LocalMood-Front/storybook-setting
wokbjso Dec 4, 2023
3ba4c5b
Feat:vite 세팅
wokbjso Dec 4, 2023
5fd94d0
Merge pull request #2 from CEOS-LocalMood-Front/vite-setting
wokbjso Dec 4, 2023
3303a44
Feat:yarn-berry(zero-installs) 세팅 완료
wokbjso Dec 6, 2023
3ff32b8
Merge pull request #3 from CEOS-LocalMood-Front/yarn-berry-setting
wokbjso Dec 6, 2023
c25133d
Fix:스토리북 실행 시 esLint 오류 해결
wokbjso Dec 7, 2023
e33865d
Merge pull request #1 from local-mood/hotfix
wokbjso Dec 7, 2023
3a36fa8
Feat:라우터 설정 추가
wokbjso Dec 7, 2023
8b7f81f
Feat:헤더 라우터에 전역 선언
wokbjso Dec 7, 2023
c85ff97
Feat:header 레이아웃 완성
wokbjso Dec 8, 2023
fa2ac58
Merge pull request #2 from local-mood/feature/header
wokbjso Dec 8, 2023
e684d1f
Feat:투표 메인 페이지 생성
wokbjso Dec 8, 2023
bc185d0
Merge pull request #3 from local-mood/feature/vote-main
wokbjso Dec 8, 2023
23bb43b
Feat:헤더 버튼 컴포넌트 분리
wokbjso Dec 9, 2023
8a87608
Feat:page 메인 텍스트 컴포넌트화
wokbjso Dec 9, 2023
020f04b
Feat:파트장 투표 페이지 생성
wokbjso Dec 9, 2023
e0b0848
Merge pull request #4 from local-mood/feature/vote-part-select
wokbjso Dec 9, 2023
6c2ae13
Feat:데모데이 투표 카테고리 선택 페이지 생성
wokbjso Dec 9, 2023
54aac5f
Merge pull request #5 from local-mood/feature/vote-demoday-select
wokbjso Dec 9, 2023
109ac7a
Feat:로그인, 회원가입 라우팅 생성
wokbjso Dec 9, 2023
b380544
Feat:로그인 폼 디자인 생성
wokbjso Dec 10, 2023
7eb2af2
Feat:로그인 form border 모바일 크기에서 안나타나게 설정
wokbjso Dec 12, 2023
fb11fad
Feat:회원가입 form border 모바일 시 안나타나게 설정
wokbjso Dec 12, 2023
7feb3a8
Feat:form 컨테이너 컴포넌트로 생성
wokbjso Dec 13, 2023
4ab5990
Feat:로그인,회원가입 form 정보 onChange 로직 훅으로 생성
wokbjso Dec 14, 2023
e591ae8
Feat:로그인,회원가입 form 정보 onChange 로직 훅으로 생성
wokbjso Dec 14, 2023
aac355c
Feat:세팅
geeoneee Dec 17, 2023
4bae962
Feat:파트장 투표창 페이지 생성
geeoneee Dec 17, 2023
14a5a14
Design:파트장 투표창 CSS 작성
geeoneee Dec 17, 2023
8adf7e7
Refactor:Form Layout 타입으로 구별
wokbjso Dec 18, 2023
adc4189
Feat:onChange handler 가져오는 컴포넌트를 FormLayout으로 수정
wokbjso Dec 18, 2023
d70dcfb
Feat:name, check_password 필드 선택적으로 선언
wokbjso Dec 20, 2023
a496557
Merge pull request #6 from local-mood/feat/login
wokbjso Dec 20, 2023
e24d85f
Feat:충돌 해결
wokbjso Dec 20, 2023
590ef08
Merge pull request #7 from local-mood/feature/vote-leader
wokbjso Dec 20, 2023
4de1ea0
Feat:프론트엔드 파트장 투표 라우팅 설정
wokbjso Dec 20, 2023
5c4f141
Fixed:파트장 투표 페이지 반응형 수정
wokbjso Dec 20, 2023
5c31a5e
Merge pull request #8 from local-mood/feature/vote-leader
wokbjso Dec 20, 2023
65d6ceb
Feat:투표 결과 페이지 생성
wokbjso Dec 20, 2023
7d237a6
Fix:백엔드 투표창 텍스트 버그 수정
wokbjso Dec 20, 2023
ae8bc46
Feat:스크롤 시 컴포넌트 blur 처리하는 훅 생성 후 헤더에 적용
wokbjso Dec 20, 2023
60b1d12
Feat:컴포넌트 추상화 단계 통일
wokbjso Dec 20, 2023
a29bfbe
Feat:react-query 세팅
wokbjso Dec 20, 2023
bfbc87f
Feat:Auth HOC 처리
wokbjso Dec 20, 2023
6d0c064
Feat:form validation 로직 생성
wokbjso Dec 20, 2023
f11bd79
Merge pull request #9 from local-mood/Hyeonmin
wokbjso Dec 20, 2023
25b6d1d
Feat:도커파일 생성
wokbjso Dec 20, 2023
0916a37
Merge pull request #10 from local-mood/Hyeonmin
wokbjso Dec 20, 2023
b32b3b8
Fix:회원가입 validate 로직 수정
wokbjso Dec 21, 2023
aeca76f
Merge pull request #11 from local-mood/Hyeonmin
wokbjso Dec 21, 2023
9566e33
Feat:로그인,회원가입 dto 와 query 생성
wokbjso Dec 22, 2023
de58d6e
Feat:옵션 선택 레이아웃 생성
wokbjso Dec 22, 2023
96b7c12
Feat:DropDown 컴포넌트 완성
wokbjso Dec 23, 2023
0f0d29f
Merge pull request #12 from local-mood/Hyeonmin
wokbjso Dec 23, 2023
aeca701
Feat:팀 선택, 파트 선택 validation 추가
wokbjso Dec 23, 2023
c2d3d7e
Chore:요소 이름 수정
wokbjso Dec 23, 2023
96dae35
Merge pull request #13 from local-mood/Hyeonmin
wokbjso Dec 23, 2023
0cf2494
Create deploy.yml
wokbjso Dec 24, 2023
5d284c5
Update deploy.yml
wokbjso Dec 24, 2023
8dd4c0c
Update deploy.yml
wokbjso Dec 24, 2023
2b305fa
Update deploy.yml
wokbjso Dec 24, 2023
1981a59
토큰 처리 임의 로직 생성
wokbjso Dec 24, 2023
ca4752c
Merge pull request #14 from local-mood/Hyeonmin
wokbjso Dec 24, 2023
db48d8b
Chore:로그인 처리를 위해 user 정보 임의변경
wokbjso Dec 24, 2023
bffd0de
Merge pull request #15 from local-mood/Hyeonmin
wokbjso Dec 24, 2023
751fb2d
Update deploy.yml
wokbjso Dec 24, 2023
d34300a
Feat:유저 정보 api 연결로 Auth HOC 처리
wokbjso Dec 24, 2023
ebe97db
Merge pull request #16 from local-mood/Hyeonmin
wokbjso Dec 24, 2023
4ce6f93
Feat:로그아웃 로직 생성
wokbjso Dec 24, 2023
b5c3cb8
Merge pull request #17 from local-mood/Hyeonmin
wokbjso Dec 24, 2023
9880b8b
Fix:로그인에는 로그인으로 버튼 텍스트 수정
wokbjso Dec 24, 2023
d780e58
Merge pull request #18 from local-mood/Hyeonmin
wokbjso Dec 24, 2023
aedff5d
Feat:비밀번호 input 텍스트 type password 처리
wokbjso Dec 24, 2023
504bcba
Merge pull request #19 from local-mood/Hyeonmin
wokbjso Dec 24, 2023
ad44c1f
Feat:투표장 투표 클릭 시 버튼 색깔 변경
wokbjso Dec 24, 2023
a925ddb
Merge pull request #20 from local-mood/Hyeonmin
wokbjso Dec 24, 2023
dd6a2b5
Feat:Header 로고 클릭시 홈으로 이동
geeoneee Dec 25, 2023
adf37ff
Feat: 데모데이 투표 결과보기 dto와query 생성 및 rank 적용
geeoneee Dec 25, 2023
0a733f4
Feat: 파트장 투표 결과보기 API 연결
geeoneee Dec 25, 2023
3a59ae8
Feat: 데모데이 투표하기 기능 API 연결 및 중복 투표시 alert창 띄우기
geeoneee Dec 25, 2023
dbe40f6
Feat: 파트장 투표하기 기능 API 연결 및 투표, 중복투표시 alert창 띄우기
geeoneee Dec 25, 2023
6039158
VoteDemoday dummylist 삭제
geeoneee Dec 25, 2023
d4f8dcf
Feat: 투표시 alert 띄우기
geeoneee Dec 25, 2023
28883c2
Merge pull request #21 from local-mood/Jiwon
wokbjso Dec 26, 2023
04fb6ee
Refactor:투표하기 버튼 누르면 로직 수행하도록 수정
wokbjso Dec 26, 2023
b211296
Update deploy.yml
wokbjso Dec 26, 2023
a140202
Update deploy.yml
wokbjso Dec 26, 2023
a27a6aa
Delete .env
wokbjso Dec 26, 2023
4bbf7e4
Update deploy.yml
wokbjso Dec 26, 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
1 change: 0 additions & 1 deletion src/features/vote/components/voteResult/VoteResult.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import React from "react";
import styled from "styled-components";
import { VoteResultProps } from "../../state/vote-state";
import { SELECT_TYPE } from "../../constants/select-vote-type";
Expand Down
2 changes: 1 addition & 1 deletion src/features/vote/state/vote-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface VoteSelectionProps {
}

export interface VoteResultProps {
type: SELECT_TYPE;
type: SELECT_TYPE.PartLeader | SELECT_TYPE.Demoday;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

타입을 유연하게 지정을 잘 하시는 것 같습니다!

mainText: string;
subText: string;
rank: number;
Expand Down