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주차] Repick 미션 제출합니다. #3

Open
wants to merge 88 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
f4c4d94
feat : install next
oyatplum Jun 15, 2023
c2acda5
feat : install prettier
oyatplum Jun 16, 2023
8abaa4e
feat : 폴더 구조 생성
oyatplum Jun 16, 2023
cfcff89
chore : 폴더 구조 변경 및 prettier 오류 해결
oyatplum Jun 16, 2023
39fb1f0
feat : install styled-components
oyatplum Jun 16, 2023
f5c1c08
feat : main 화면 생성
oyatplum Jun 16, 2023
3b93381
feat : register 화면 생성
oyatplum Jun 17, 2023
bef8483
feat : dropdown menu 생성
oyatplum Jun 19, 2023
c8265d2
feat : 타이틀 , 라인 컴포넌트화
westofsky Jun 19, 2023
67ade52
Merge branch 'develop' of https://github.com/Repick-CEOS/react-vote-1…
westofsky Jun 19, 2023
182345e
Merge pull request #1 from westofsky/develop
westofsky Jun 19, 2023
b7033c5
feat : login 화면 생성 및 버튼 컴포넌트 분리
oyatplum Jun 19, 2023
d87ea2d
feat : join button 컴포넌트 사용
oyatplum Jun 19, 2023
f35f881
style : button color 변경
oyatplum Jun 19, 2023
eb9ab82
feat : start page 생성
oyatplum Jun 19, 2023
3069175
style : user name animation 추가
oyatplum Jun 19, 2023
1168541
feat : vote main page 생성
oyatplum Jun 19, 2023
99b7283
feat : 파트장 main 페이지 생성
oyatplum Jun 19, 2023
8fd84f3
feat : 데모데이 main 페이지 생
oyatplum Jun 19, 2023
586b360
chore : 파일 구조 변경
westofsky Jun 19, 2023
decd7c2
chore : css 배치 수정 및 Layout화
westofsky Jun 20, 2023
c2d71e2
Merge pull request #2 from westofsky/develop
westofsky Jun 20, 2023
1a0587f
chore : Header Component화
westofsky Jun 20, 2023
9b7908d
chore : 중복되는 VoteForm Component화
westofsky Jun 20, 2023
1012abc
Merge pull request #3 from westofsky/develop
westofsky Jun 20, 2023
2c2f7fb
style : 버튼 수정 및 사이즈 조절
oyatplum Jun 20, 2023
a7bfa56
Merge branch 'feature/chore' into develop
oyatplum Jun 20, 2023
5ea94ce
feat : fe / be vote 페이지 생성
oyatplum Jun 20, 2023
f090845
feat : fe / be voting, result 페이지 생성
oyatplum Jun 20, 2023
093fc4c
feat : demo voting, result 페이지 생성
oyatplum Jun 20, 2023
8fba530
feat : user modal 생성
oyatplum Jun 20, 2023
8038bf9
feat : Dropdown 수정 및 Value 설정
westofsky Jun 20, 2023
6c2b0fc
Merge branch 'develop' of https://github.com/Repick-CEOS/react-vote-1…
westofsky Jun 20, 2023
e8a1545
feat : 투표 종료 이벤트 추가
westofsky Jun 20, 2023
bf8cc6d
style : 버튼, 드롭다운, 속도 css 변경
oyatplum Jun 20, 2023
018f28b
feat : fe / be / demo dummy data 활용
oyatplum Jun 20, 2023
00ce4e5
style : link 태그에 밑줄 제거
oyatplum Jun 20, 2023
a12fc22
feat : 로그인 버튼 click시 handler추가
westofsky Jun 21, 2023
626f9bf
feat : Input에 따른 event 처리
westofsky Jun 21, 2023
d348877
style : deamo team 선택 시 스타일링 변경
oyatplum Jun 21, 2023
4f1157f
feat : 선택 시 Check 추가
westofsky Jun 21, 2023
f87801f
feat : order 컴포넌트 생성 및 페이지에 적용
oyatplum Jun 21, 2023
04734c8
chore : merge
oyatplum Jun 21, 2023
b68ccb3
style: check 버튼 컬러 수정
oyatplum Jun 21, 2023
bc5e330
style : order 순서에 따른 색상 변경
oyatplum Jun 21, 2023
114a330
style : title 위치 수정
oyatplum Jun 21, 2023
7b3a5ca
style : fe/ be leader 선택 시 스타일 적용
oyatplum Jun 21, 2023
28380e7
feat : score 컴포넌트 생성
oyatplum Jun 21, 2023
9f3d08c
style : 결과보기 버튼 애니메이션 추가
oyatplum Jun 22, 2023
3b9117b
style : 숫자 위치 변겨 및 Modal z-index 설정
westofsky Jun 22, 2023
d1813c5
chore : Link 영역 style 변경
westofsky Jun 22, 2023
995c790
feat : api 받아오기
westofsky Jun 24, 2023
8a5da0c
Merge pull request #5 from westofsky/feature/api
westofsky Jun 24, 2023
6c82859
chore : 오타 수정
oyatplum Jun 25, 2023
bf4f087
feat : api 연동
westofsky Jun 25, 2023
4b0c945
feat : API 연결 및 로그인 시 Cookie설정
westofsky Jun 25, 2023
9ca07eb
Merge pull request #6 from westofsky/develop
westofsky Jun 25, 2023
50565c4
feat : result api 연동
oyatplum Jun 25, 2023
49efd0d
feat : 후보자 보기 api 연동
westofsky Jun 26, 2023
1554b93
feat : 로그인 안 했을때 login으로 이동
westofsky Jun 26, 2023
92c8646
feat : fe result api 받아오기
oyatplum Jun 26, 2023
9c364d9
Merge branch 'develop' into feature/vote/result
oyatplum Jun 26, 2023
8811a47
feat : 투표하기 api 연결
westofsky Jun 27, 2023
82ada30
fix : 결과 창 안보이는 오류 수정
westofsky Jun 27, 2023
8e49065
feat : be vote , result api 연결
oyatplum Jun 27, 2023
64ce80d
feat : 파트, 투표여부에 따른 화면 설정
westofsky Jun 27, 2023
013932e
fix : 충돌 해결
westofsky Jun 27, 2023
8c6ecbe
Merge pull request #7 from westofsky/develop
westofsky Jun 27, 2023
411a78a
feat : demo vote , result api 연결
oyatplum Jun 27, 2023
a17cd07
Merge branch 'feature/vote/demo' into develop
oyatplum Jun 27, 2023
a1541cb
chore : 스타일 변경
westofsky Jun 27, 2023
5ca34f6
chore : iamge 파일 삭제 후 react icons 적용
westofsky Jun 27, 2023
56be00c
chore : 주석 처리 및 본인 투표 방지
westofsky Jun 27, 2023
3448a2c
style : 결과 디자인 추가
oyatplum Jun 27, 2023
b0b1fc8
feat : start 페이지 연결
oyatplum Jun 27, 2023
fb9f508
feat : 폭죽 추가 및 고득점자 상위 표출
westofsky Jun 28, 2023
2a69a81
feat : 데모데이 본인 투표 막기
westofsky Jun 28, 2023
a645e68
chore : 크라운 위치 변경 및 파트장 본인 투표 막기
oyatplum Jun 28, 2023
94717fa
Merge branch 'feature/vote/result' into develop
oyatplum Jun 28, 2023
9c7e58f
fix : 파트장 중복 투표 방지 오류 해결
oyatplum Jun 28, 2023
7caaade
fix : svg, png 파일 읽기 오류 해결
oyatplum Jun 28, 2023
e1bdf8c
feat : favicon 추가 및 비회원 처리
westofsky Jun 28, 2023
03ca8f0
Merge branch 'develop' of https://github.com/Repick-CEOS/react-vote-1…
westofsky Jun 28, 2023
a82e99a
chore : 폭죽 시간 변경
westofsky Jun 28, 2023
d83f7f6
feat : 이메일 형식 확인
oyatplum Jun 28, 2023
5d08455
Merge branch 'feature/register' into develop
oyatplum Jun 28, 2023
b5e4a1f
feat : 이메일 정규식 추가
westofsky Jun 28, 2023
71aa7d8
feat : 폭죽 효과 변경
westofsky Jun 28, 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
22 changes: 22 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 2020,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true
}
},
"extends": [
"plugin:react/recommended",
"plugin:prettier/recommended"
],
"rules": {
"prettier/prettier": ["error", {
"endOfLine": "auto"
}],
"react/prop-types": "off",
"no-var": "error",
"no-dupe-keys": "error"
}
}
35 changes: 35 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# local env files
.env*.local

# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
8 changes: 8 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"singleQuote": true,
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"useTabs": false,
"printWidth": 80
}
11 changes: 11 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
compiler: {
styledComponents: true,
},
env: {
API_URL: process.env.API_URL,
},
};

module.exports = nextConfig;
Loading