Code

[7주차] 댄서포트(Dan-support) 미션 제출합니다. #5

Code

Open

sujinRo wants to merge 114 commits intoCEOS-Developers:masterCEOS-Developers/react-vote-17th:masterfrom Dan-support-CEOS:developDan-support-CEOS/react-vote-17th:developCopy head branch name to clipboard

+6,130-45

Commits

Commits on May 26, 2023

• init: 초기 세팅

  

  Yoojin

  authored and

  Yoojin

  committed
  78290a7

  Copy full SHA for 78290a7

• init: prettier,라이브러리 추가

  

  Yoojin

  authored and

  Yoojin

  committed
  1ee0155

  Copy full SHA for 1ee0155

• init: 폴더 정리

  

  Yoojin

  authored and

  Yoojin

  committed
  654ce0a

  Copy full SHA for 654ce0a

• feat: LoginPage,RegisterPage 추가

  

  Yoojin

  authored and

  Yoojin

  committed
  8ddefa3

  Copy full SHA for 8ddefa3

Commits on Jun 4, 2023

• feat: RegisterPage,LoginPage UI

  

  Yoojin

  authored and

  Yoojin

  committed
  e50e979

  Copy full SHA for e50e979

Commits on Jun 5, 2023

• feat: loginpage (api, data..)

  sujinRo

  committed
  e506fb4

  Copy full SHA for e506fb4

Commits on Jun 7, 2023

• fix: login 했을 때, 가는 페이지 변경

  sujinRo

  committed
  08e95e6

  Copy full SHA for 08e95e6

• feat: login page css

  sujinRo

  committed
  11eae95

  Copy full SHA for 11eae95

• feat: Header 추가

  sujinRo

  committed
  c06cc39

  Copy full SHA for c06cc39

• feat: css 조금 추가

  sujinRo

  committed
  0f37172

  Copy full SHA for 0f37172

• feat: logo 누르면 home화면에 가도록

  sujinRo

  committed
  e70555a

  Copy full SHA for e70555a

• feat: 회원가입 버튼 누르면 이동

  sujinRo

  committed
  5360568

  Copy full SHA for 5360568

• feat: main page css까지 완료

  sujinRo

  committed
  31c6479

  Copy full SHA for 31c6479

Commits on Jun 8, 2023

• fix: css 변경

  sujinRo

  committed
  33484f3

  Copy full SHA for 33484f3

Commits on Jun 10, 2023

• feat: data 임의로 만들고, vote 페이지에 불러옴

  sujinRo

  committed
  4e05d5b

  Copy full SHA for 4e05d5b

• feat: 위commit과 내용 일치

  sujinRo

  committed
  60e1bc9

  Copy full SHA for 60e1bc9

• feat: 투표box 부분 위치 정렬 완

  sujinRo

  committed
  9092e5e

  Copy full SHA for 9092e5e

• feat: 짜잘한 css

  sujinRo

  committed
  95694a7

  Copy full SHA for 95694a7

Commits on Jun 11, 2023

• feat: demoResult 페이지에서 score이 높은 순으로 정렬 완, css

  sujinRo

  committed
  396b36f

  Copy full SHA for 396b36f

• feat: demoResult 페이지 결과 순서 번호 나오게

  sujinRo

  committed
  03f7998

  Copy full SHA for 03f7998

• feat: demoResult 페이지 1등 팀 css 추가

  sujinRo

  committed
  2d8bf54

  Copy full SHA for 2d8bf54

• feat: axios instance 및 회원가입,로그인 api 로직 작성

  

  Yoojin

  authored and

  Yoojin

  committed
  aab5273

  Copy full SHA for aab5273

• feat: 같은 score일 경우 rank가 같도록

  sujinRo

  committed
  2e70166

  Copy full SHA for 2e70166

• feat: RegisterPage 상태 관리,에러/확인 메시지,유효성 검사(team,part 제외)

  

  Yoojin

  authored and

  Yoojin

  committed
  4a5a887

  Copy full SHA for 4a5a887

Commits on Jun 13, 2023

• feat: demoVote 선택한 data 표시

  sujinRo

  committed
  e3eefa0

  Copy full SHA for e3eefa0

Commits on Jun 14, 2023

• feat: demoVote 선택한 data 표시 + box위치 정렬

  sujinRo

  committed
  75484dc

  Copy full SHA for 75484dc

• feat: 투표 후, alert 창

  sujinRo

  committed
  8e93d79

  Copy full SHA for 8e93d79

Commits on Jun 15, 2023

• feat: function 통해 code 줄임

  sujinRo

  committed
  cdd5046

  Copy full SHA for cdd5046

Commits on Jun 16, 2023

• feat: LoginPage 상태관리

  

  Yoojin

  authored and

  Yoojin

  committed
  3336f4b

  Copy full SHA for 3336f4b

• feat: user interface 정의, user 전역 상태 생성

  

  Yoojin

  authored and

  Yoojin

  committed
  5070cba

  Copy full SHA for 5070cba

• 회원가입,로그인,id와 email 중복 확인 api 로직들 작성

  

  Yoojin

  authored and

  Yoojin

  committed
  f51e1ba

  Copy full SHA for f51e1ba

• feat: RegisterPage,LoginPage에 api 로직들 가져와서 연결

  

  Yoojin

  authored and

  Yoojin

  committed
  6e382b9

  Copy full SHA for 6e382b9

• fix: RegisterPage에서, register 함수에 전달할 인자 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  79d5aee

  Copy full SHA for 79d5aee

• feat: RegisterPage에서, 회원가입 form submit시에 유효성 검사 하나라도 통과 못하면 subit 못하도록 막기

  

  Yoojin

  authored and

  Yoojin

  committed
  1082ef3

  Copy full SHA for 1082ef3

• fix: uid의 type에 null 추가

  

  Yoojin

  authored and

  Yoojin

  committed
  d9c50d1

  Copy full SHA for d9c50d1

• feat: QueryClient 추가

  

  Yoojin

  authored and

  Yoojin

  committed
  195981b

  Copy full SHA for 195981b

• feat: RecoilRoot 추가

  

  Yoojin

  authored and

  Yoojin

  committed
  2f0177e

  Copy full SHA for 2f0177e

Commits on Jun 17, 2023

• feat: team,part 부분 리팩토링,상태 관리

  

  Yoojin

  authored and

  Yoojin

  committed
  ee7b5c8

  Copy full SHA for ee7b5c8

Commits on Jun 18, 2023

• feat: 파트장 투표,데모데이 투표 라우팅

  

  Yoojin

  authored and

  Yoojin

  committed
  ece0b1d

  Copy full SHA for ece0b1d

Commits on Jun 19, 2023

• feat: 충돌 방지 제거

  sujinRo

  committed
  12c002b

  Copy full SHA for 12c002b

• fix: RegisterPage에서 part의 state를 'frontend'/'backend'->'fe'/'be'로 변경

  

  Yoojin

  authored and

  Yoojin

  committed
  8af5e29

  Copy full SHA for 8af5e29

• 실수 어쩌고

  

  Yoojin

  authored and

  Yoojin

  committed
  3849b9c

  Copy full SHA for 3849b9c

• feat: merge전, url경로 변경

  sujinRo

  committed
  ac80e66

  Copy full SHA for ac80e66

• feat: 충돌 때문에,,

  sujinRo

  committed
  bb34645

  Copy full SHA for bb34645

• feat: 충돌하는 거 다 제거,,

  sujinRo

  committed
  0e26c65

  Copy full SHA for 0e26c65

• feat: 충돌 해결중,,

  sujinRo

  committed
  12d81a9

  Copy full SHA for 12d81a9

• Merge branch 'develop' into feature/login2/Sujin

  sujinRo

  authored
  aa5cfe2

  Copy full SHA for aa5cfe2

• Merge pull request #3 from Dan-support-CEOS/feature/login2/Sujin

  Show description for 0fbe54f
  sujinRo

  authored
  0fbe54f

  Copy full SHA for 0fbe54f

• feat: 충돌 때문에 삭제했던것 추가

  sujinRo

  committed
  923ccf2

  Copy full SHA for 923ccf2

Commits on Jun 21, 2023

• feat: PartLeaderVotePage(FE/BE) UI 구현

  

  Yoojin

  authored and

  Yoojin

  committed
  600bb1b

  Copy full SHA for 600bb1b

• feat: PartLeaderVotePage에, 선택한 후보 state 관리

  

  Yoojin

  authored and

  Yoojin

  committed
  8dec885

  Copy full SHA for 8dec885

• feat: 파트장 투표 api 로직 작성,PartLeaderVotePage에 api 로직 가져와서 사용

  

  Yoojin

  authored and

  Yoojin

  committed
  a798a22

  Copy full SHA for a798a22

Commits on Jun 22, 2023

• feat: PartLeaderResultPage UI,state 관리,파트장 투표결과 api 로직 작성 및 사용

  

  Yoojin

  authored and

  Yoojin

  committed
  d36a325

  Copy full SHA for d36a325

• fix: RegisterPage에서 team 이름 목록 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  14f749e

  Copy full SHA for 14f749e

Commits on Jun 24, 2023

• develop 브랜치 pull해오고, 수정할 부분 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  90b6341

  Copy full SHA for 90b6341

• Merge pull request #4 from Dan-support-CEOS/feature/partleader-vote

  Show description for a5a4f55
  paya17

  authored
  a5a4f55

  Copy full SHA for a5a4f55

• fix: 세오스 로고 이름 더 명확하게 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  cb0579e

  Copy full SHA for cb0579e

• style: 글로벌 스타일 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  44b78d9

  Copy full SHA for 44b78d9

• feat: Layout 생성해서 Header 컴포넌트 여기로 이동, 회원가입 페이지/파트장 투표 페이지 조금 스타일링

  

  Yoojin

  authored and

  Yoojin

  committed
  5e7c8f1

  Copy full SHA for 5e7c8f1

Commits on Jun 25, 2023

• style: 스타일링 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  d42aba8

  Copy full SHA for d42aba8

• 별 거 아님

  

  Yoojin

  authored and

  Yoojin

  committed
  bc33a33

  Copy full SHA for bc33a33

Commits on Jun 26, 2023

• feat: 백엔드에서 받은 거랑 맞춰서, api 수정 및 추가, 전역상태 userState 수정, interface 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  e77a64f

  Copy full SHA for e77a64f

• 로그인한 후 백으로부터 받은 응답으로, LoginPage에서 전역상태 userState를 업데이트하는 로직 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  4f9da3f

  Copy full SHA for 4f9da3f

• feat: LoginPage에서, 로그인 성공하면 홈페이지로 navigate되도록 + 로그인 실패하면 아이디,비번 초기화되도록

  

  Yoojin

  authored and

  Yoojin

  committed
  145c96a

  Copy full SHA for 145c96a

• feat: Header 컴포넌트에, 로그아웃 로직 작성, 로그아웃 상태면 회원가입,로그인 버튼 보이게/로그인 상태면 유저 정보와 로그아웃 버튼 보이게 로직 작성

  

  Yoojin

  authored and

  Yoojin

  committed
  c0ee4ea

  Copy full SHA for c0ee4ea

• feat: 로그아웃하면, 홈페이지로 navigate되도록

  

  Yoojin

  authored and

  Yoojin

  committed
  fd6dcc5

  Copy full SHA for fd6dcc5

• fix: 로그아웃 로직 수정(로그아웃 api 다시 사용)

  

  Yoojin

  authored and

  Yoojin

  committed
  ee3868e

  Copy full SHA for ee3868e

• feat: 파트 선택하는 PartSelectPage 생성, 본인 파트의 파트장 투표만 가능하게 하는 로직 작성

  

  Yoojin

  authored and

  Yoojin

  committed
  52f92c2

  Copy full SHA for 52f92c2

• feat: Home페이지에서, 로그인 여부/재투표 여부로 파트장 투표 가능 여부 판별하는 로직 작성, 파트장 투표 권한 확인 로직 작성

  

  Yoojin

  authored and

  Yoojin

  committed
  f0b4242

  Copy full SHA for f0b4242

• Merge pull request #5 from Dan-support-CEOS/feature/api-연결(yoojin)

  Show description for c802036
  paya17

  authored
  c802036

  Copy full SHA for c802036

Commits on Jun 27, 2023

• feat: demoVote, demoResult api 추가

  sujinRo

  committed
  24a6a57

  Copy full SHA for 24a6a57

• feat: DemoVote 클릭 수가 백으로 넘어가도록

  sujinRo

  committed
  e7e838d

  Copy full SHA for e7e838d

• feat: Header css 추가

  sujinRo

  committed
  7c81619

  Copy full SHA for 7c81619

• feat: demoResult 백에서 값을 받아와서 보여줌

  sujinRo

  committed
  73c4d0f

  Copy full SHA for 73c4d0f

• feat: demoDay authority code 추가 (token 안 넘어가지는 상태)

  sujinRo

  committed
  5a59aea

  Copy full SHA for 5a59aea

• feat: global style과 겹치는 css 제거

  sujinRo

  committed
  65152e8

  Copy full SHA for 65152e8

• feat: 짜잘한 수정

  sujinRo

  committed
  8285257

  Copy full SHA for 8285257

• chore: 자잘한 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  db9996f

  Copy full SHA for db9996f

• feat: logout, authority 기능 api 연결

  sujinRo

  committed
  a283877

  Copy full SHA for a283877

• style: RegisterPage 스타일링(ing)

  

  Yoojin

  authored and

  Yoojin

  committed
  a89af29

  Copy full SHA for a89af29

• style

  Show description for c51cbc6
  

  Yoojin

  authored and

  Yoojin

  committed
  c51cbc6

  Copy full SHA for c51cbc6

Commits on Jun 28, 2023

• feat: 로그아웃하면 user 정보,accessToken 초기화되도록, 로그아웃 로직 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  9ebcf4b

  Copy full SHA for 9ebcf4b

• feat: tokenRefresh 메소드 변경

  sujinRo

  committed
  1b2a7fa

  Copy full SHA for 1b2a7fa

• style: partSelectPage css

  sujinRo

  committed
  884f5ee

  Copy full SHA for 884f5ee

• feat: router 추가/ alert 내용 추가

  sujinRo

  committed
  24dcc92

  Copy full SHA for 24dcc92

• style: 파트장 투표 결과보기 페이지 스타일링 추가

  

  Yoojin

  authored and

  Yoojin

  committed
  f02b69c

  Copy full SHA for f02b69c

• Merge pull request #9 from Dan-support-CEOS/feature/api-연결(sujin)

  Show description for a77b996
  sujinRo

  authored
  a77b996

  Copy full SHA for a77b996

• fix: 회원가입 페이지 로직,스타일 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  9764cbd

  Copy full SHA for 9764cbd

• fix: 회원가입 유효성 검사 로직 수정

  

  Yoojin

  authored and

  Yoojin

  committed
  e888339

  Copy full SHA for e888339

• style : 파트장 투표 페이지에서, 클릭한 후보 버튼에 검정색 border가 생기도록

  

  Yoojin

  authored and

  Yoojin

  committed
  c437da0

  Copy full SHA for c437da0

• style: 파트장 투표 결과 페이지 파트 선택 스타일링,회원가입 버튼 가운데로

  

  Yoojin

  authored and

  Yoojin

  committed
  deda3bc

  Copy full SHA for deda3bc

• chore

  

  Yoojin

  authored and

  Yoojin

  committed
  78888e2

  Copy full SHA for 78888e2

• Merge branch 'develop' of https://github.com/Dan-support-CEOS/react-vote-17th into feature/api-연결(yoojin)

  paya17

  committed
  081b32b

  Copy full SHA for 081b32b

• style: 글로벌 스타일에서 border:none; 다시 추가

  paya17

  committed
  1daca47

  Copy full SHA for 1daca47

• Merge pull request #10 from Dan-support-CEOS/feature/api-연결(yoojin)

  Show description for 951f5f7
  paya17

  authored
  951f5f7

  Copy full SHA for 951f5f7

• 에러 해결

  paya17

  committed
  3be8cc0

  Copy full SHA for 3be8cc0

• feat: title 추가

  sujinRo

  committed
  a289f3d

  Copy full SHA for a289f3d

• feat: 필요없는 것 정리

  sujinRo

  committed
  6ebb2bd

  Copy full SHA for 6ebb2bd

• feat: env 추가

  sujinRo

  committed
  e86d29a

  Copy full SHA for e86d29a

• 어쩌구

  paya17

  committed
  aa457d4

  Copy full SHA for aa457d4

• .env를 gitignore에 추가

  paya17

  committed
  0883292

  Copy full SHA for 0883292

• style: css 전체적으로 수정

  sujinRo

  committed
  46a900e

  Copy full SHA for 46a900e

• feat: 로그인/회원가입 글씨 추가

  sujinRo

  committed
  6713e17

  Copy full SHA for 6713e17

• style: register, login styling 맞춤

  sujinRo

  committed
  497c186

  Copy full SHA for 497c186

Commits on Jun 29, 2023

• fix: title 위치 수정

  paya17

  committed
  2275acb

  Copy full SHA for 2275acb

• style: 투표 페이지의 후보 버튼들에 hover시 transition 적용

  paya17

  committed
  85b31de

  Copy full SHA for 85b31de

• style: transition 적용

  paya17

  committed
  0be3f74

  Copy full SHA for 0be3f74

• style: 파트장 투표결과 박스 크기 고정

  paya17

  committed
  9d40e0d

  Copy full SHA for 9d40e0d

• style: 파트장 투표 1등만 스타일 다르게 주기

  paya17

  committed
  4f92497

  Copy full SHA for 4f92497

• style: 로그인,회원가입 타이틀 스타일 수정

  paya17

  committed
  e428429

  Copy full SHA for e428429

• feat: json삭제

  sujinRo

  committed
  7d3ac75

  Copy full SHA for 7d3ac75

• style: 회원가입 페이지에 사용 가능 버튼 추가

  paya17

  committed
  ddf2ab8

  Copy full SHA for ddf2ab8

Commits on Apr 22, 2024

• Update README.md

  paya17

  authored
  fcaeba6

  Copy full SHA for fcaeba6

• Update README.md

  paya17

  authored
  e2f0196

  Copy full SHA for e2f0196