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

[CLIENT & Server] Week2 마무리 #92

Merged
merged 148 commits into from
Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
b62b0a7
setting: mongodb 연결
NaayoungKwon Nov 13, 2022
362fe73
setting: file directory 생성
NaayoungKwon Nov 14, 2022
79e63a7
Merge branch 'dev-be' into project-setting-server
NaayoungKwon Nov 14, 2022
f72cc22
Merge pull request #3 from boostcampwm-2022/project-setting-server
NaayoungKwon Nov 14, 2022
54ebdee
setting: app -> socket 으로 명칭 변경
soomanbaek Nov 14, 2022
c72b8af
setting: mongodb create user
NaayoungKwon Nov 14, 2022
6fadaad
fix: user schema 수정
soomanbaek Nov 15, 2022
7f55324
remove: userInfo.schema.ts 삭제
soomanbaek Nov 15, 2022
447c148
refactor: user repo create 수정 #9
NaayoungKwon Nov 15, 2022
6371345
feat: auth dto 생성
soomanbaek Nov 15, 2022
5a08be6
refactor: auth.dto.ts 변수명 수정
soomanbaek Nov 15, 2022
e1c8d0b
refactor: user.repository.ts class 명 수정
soomanbaek Nov 15, 2022
cd2ba19
rename: 폴더 이름 변경 (common -> share)
soomanbaek Nov 15, 2022
e8e2251
rename: auth 폴더 경로 변경
soomanbaek Nov 15, 2022
1cbbe30
rename: auth/dto 폴더 경로 변경
soomanbaek Nov 15, 2022
41d36c3
refactor: 변수명 수정 (pw -> password)
soomanbaek Nov 15, 2022
bbc6935
feat: ApiModule 에서 AuthModule import
soomanbaek Nov 15, 2022
e25d0b9
feat: auth 경로 변화에 따른 import 경로 수정 및 불필요한 함수 주석처리
soomanbaek Nov 15, 2022
f1b0d9f
chore: ts.config에 api경로 추가
soomanbaek Nov 15, 2022
868020f
feat: 응답 포맷 작성
soomanbaek Nov 15, 2022
7857529
feat: user.repository.ts create함수 매개변수 형식 변경
soomanbaek Nov 15, 2022
814d329
feat: 회원가입 기능 구현
soomanbaek Nov 15, 2022
f58e103
feat: responseForm 매개변수 수정
soomanbaek Nov 15, 2022
c5e5195
[Server] #20 팔로잉 요청 수행 (#44)
NaayoungKwon Nov 15, 2022
1436efb
bug: PR merge conflict bug 해결
NaayoungKwon Nov 15, 2022
6756e41
feat: user.repository.ts에 findOne 함수 생성
soomanbaek Nov 15, 2022
cfc5472
feat: 로그인 로직 구현
soomanbaek Nov 15, 2022
7947ee0
refactor: 로그인 로직 수정
soomanbaek Nov 15, 2022
33d0e0b
refactor: auth controller에서의 에러처리를 service에서 처리하도록 변경
soomanbaek Nov 15, 2022
00bdba5
github action: 백엔드 dev merge시 api 서버 자동 배포 및 slack bot 전송
NaayoungKwon Nov 15, 2022
605a6b0
Merge branch 'dev-be' of https://github.com/boostcampwm-2022/web24-As…
NaayoungKwon Nov 15, 2022
658f456
feat: 팔로우 취소 요청 처리 충돌 해결 #50
NaayoungKwon Nov 15, 2022
a0b40ae
refactor: 팔로우 요청 repository 추상화 #20
NaayoungKwon Nov 15, 2022
1ee94e9
feat: 특정 사용자 정보 요청 처리 #22
NaayoungKwon Nov 16, 2022
1a599be
refactor: mongodb _id validator pipe 추가 #20, #50
NaayoungKwon Nov 16, 2022
da0c89f
refactor: 회원 기본 정보 함수 생성 #22
NaayoungKwon Nov 16, 2022
73ddb91
refactor: 불필요한 미들웨어 삭제 #22
NaayoungKwon Nov 16, 2022
71de26a
[Feature/auth] 로그인 요청 기능 (#59)
soomanbaek Nov 16, 2022
a8fbaaf
feat: follwer정보 요청받는 controller 작성 #60
NaayoungKwon Nov 16, 2022
2637676
feat: follwer정보 요청받는 service layer 작성 #60
NaayoungKwon Nov 16, 2022
3822385
feat: 사용자 follwing 정보 전달 #21
NaayoungKwon Nov 16, 2022
3830710
feat: 사용자 follwing 정보 전달service layer #21
NaayoungKwon Nov 16, 2022
4a3eb4b
refactor: 중속 service logic 추상화 #21, #60
NaayoungKwon Nov 16, 2022
2d7cfa3
refactor: follow, unfollow toggle 방식으로 변경 #20,#50
NaayoungKwon Nov 16, 2022
e396ee3
bug: follow, unfollow 완료 시 message 전송
NaayoungKwon Nov 17, 2022
fdd57ed
[Fix/validation] validation 버그 수정 (#70)
soomanbaek Nov 17, 2022
92c868e
fix: 사용자 검색 시 primary id가 아닌 로그인 id 또는 nickname으로 검색하도록 수정
NaayoungKwon Nov 17, 2022
a34b6b0
fix: oauth.service import 제거
soomanbaek Nov 17, 2022
5fa2d91
fix: cors 해결
NaayoungKwon Nov 17, 2022
2cbf4f9
feat: 사용자 정보 수정 #75
NaayoungKwon Nov 17, 2022
69c5145
fix: 사용자 정보 수정의 password field 삭제 #75
NaayoungKwon Nov 17, 2022
b14b36f
test: user.service.toggleFollowing
NaayoungKwon Nov 17, 2022
7ccfbaa
test: user.service.getUser
NaayoungKwon Nov 17, 2022
68a9758
test: user.service.modifyUser
NaayoungKwon Nov 17, 2022
d9c8d02
test: junit 설치
NaayoungKwon Nov 17, 2022
c173e93
refactor: 오타 수정
NaayoungKwon Nov 18, 2022
4d01cfe
feat: 자신의 정보를 받을 수 있는 API 추가
soomanbaek Nov 17, 2022
e16ad9b
feat: jwtAuthGuard 생성
soomanbaek Nov 21, 2022
8163956
feat: api server 에러발생시 noti
NaayoungKwon Nov 19, 2022
3358b19
feat: api server error msg server ip 추가
NaayoungKwon Nov 19, 2022
c12a6cd
fix: undo refactoring : interceptor logging은 추후 진행
NaayoungKwon Nov 21, 2022
cdedd13
refactor: res 삭제
NaayoungKwon Nov 21, 2022
7559209
Update server_dev_api.yml
NaayoungKwon Nov 21, 2022
5f79c77
fix: @slack/client -> @slack/webhook 변경
NaayoungKwon Nov 21, 2022
6a73d12
refactor: accessToken, refreshToken 구별을 위한 파일이름 변경
soomanbaek Nov 21, 2022
47dfc66
build: cookie-parser 라이브러리 설치
soomanbaek Nov 21, 2022
39b8e0b
feat: cookie-parser 미들웨어 설정
soomanbaek Nov 21, 2022
f267a92
feat: Jwt 토큰 검증 guard 설정
soomanbaek Nov 21, 2022
5585281
feat: Jwt 토큰 검증 strategy 설정
soomanbaek Nov 21, 2022
16a4bf6
refactor: 기존에 accessToken, refreshToken 을 한번에 발행하던 것을 각각 발행하도록 분할
soomanbaek Nov 21, 2022
69a0b0b
feat: refreshToken 재발행 로직 구현
soomanbaek Nov 21, 2022
9316c87
feat: 로그아웃 기능 구현 및 리펙토링
soomanbaek Nov 21, 2022
0d7b84b
refactor: 디버깅용 출력 제거
soomanbaek Nov 21, 2022
4bc30ba
feat: 로그아웃 시, 쿠키에 refreshToken 만료시킴
soomanbaek Nov 21, 2022
c2e53cb
chore: css theme 세팅
mjsdo Nov 14, 2022
4dc8b52
chore: client prettier 세팅
mjsdo Nov 14, 2022
7e74659
chore: react-router-dom, react-query devtools 세팅
mjsdo Nov 14, 2022
6e49809
chore: 린트, 프리티어, tsconfig 공통 설정 변경
mjsdo Nov 15, 2022
4f1b585
feat: 페이지 초기 세팅 추가
mjsdo Nov 15, 2022
b812caf
feat: div#root 초기 스타일 지정
mjsdo Nov 15, 2022
7621db4
feat: 라우터 설정
mjsdo Nov 15, 2022
3a2e079
chore: common 워크스페이스 이름 변경
mjsdo Nov 15, 2022
a9b43fa
fix: 라우트 파라미터 roomId -> :roomId로 수정
mjsdo Nov 15, 2022
c4b20dd
feat: theme 업데이트
mjsdo Nov 15, 2022
223e076
feat: theme 업데이트
leegwae Nov 15, 2022
e520000
chore: server package.json의 common -> shared로 변경
mjsdo Nov 15, 2022
c65435b
chore: mui/icons 추가
mjsdo Nov 15, 2022
829a90e
[CLIENT] 공통 레이아웃 적용을 위한 라우팅 구조 수정 (#48)
leegwae Nov 16, 2022
db675b3
[CLIENT] 공통 컴포넌트 - 아바타, 커뮤니티 아바타, 유저 아바타 작성 (#45)
leegwae Nov 16, 2022
d750284
[CLIENT/FEAT] `Home` 페이지 레이아웃 (#63)
leegwae Nov 17, 2022
dc7fff5
feat: AuthInput 컴포넌트 추가
mjsdo Nov 15, 2022
425f85b
[Client] 회원가입 폼 Validation 까지 완료 (#55)
mjsdo Nov 16, 2022
2a85a6a
[Client] 회원가입 요청 (#71)
mjsdo Nov 17, 2022
006dcc2
chore: 로그인 mock api 추가
mjsdo Nov 20, 2022
69696f1
refactor: SignUp 리팩토링
mjsdo Nov 20, 2022
1b162a4
feat: tokenStore 추가
mjsdo Nov 20, 2022
aeccce2
feat: SignIn 페이지 추가
mjsdo Nov 20, 2022
eaed74c
chore: reference 추가
mjsdo Nov 20, 2022
e6e8648
chore: shared tsconfig 추가
mjsdo Nov 20, 2022
8623568
fix: Navigate api -> Component로 변경
mjsdo Nov 20, 2022
96f85fb
chore: template에 환경변수를 parameter로 주입
mjsdo Nov 18, 2022
9d8dd18
chore: favicon 추가
mjsdo Nov 18, 2022
7b71137
chore: 웹팩 배포모드 압축 옵션 추가
mjsdo Nov 20, 2022
647a516
chore: 번들 사이즈 분석용 스크립트 추가
mjsdo Nov 20, 2022
8bb3542
chore: index.ejs -> index.html
mjsdo Nov 21, 2022
f406c0a
chore: 클라이언트 CI/CD 워크플로우 작성
mjsdo Nov 20, 2022
77a3c62
design: `DM` 페이지 친구 탭 패널 패딩 #64
leegwae Nov 17, 2022
4d23aeb
feat: 정수 난수 생성하는 `getRandomInt` 함수 구현
leegwae Nov 17, 2022
57e6288
feat: /GET `/followings` mock API 작성 #65
leegwae Nov 17, 2022
2ac2801
feat: `UserProfile` 공통 컴포넌트 작성 #65
leegwae Nov 17, 2022
421cba4
feat: 팔로잉 목록 보여주는 `Followings` 탭 구현 #65
leegwae Nov 17, 2022
91749a6
chore: `users` 목업 데이터 `profileUrl` 난수값 조정
leegwae Nov 17, 2022
eedeb7b
rename: `Following` 페이지를 `FollowingsList`로 변경 #65
leegwae Nov 17, 2022
8342e3c
design: `UserProfile` 컴포넌트 `li`에서 `div`로 변경
leegwae Nov 17, 2022
a8e62ea
build: mui icon 사용을 위한 의존성 설치
leegwae Nov 17, 2022
db2a080
feat: `FollowingItem` 컴포넌트로 분리 #65
leegwae Nov 17, 2022
7a34eca
fix: /GET `/followings` mock API 엔드포인트 변경
leegwae Nov 18, 2022
c3c7fe7
feat: `Badge` 컴포넌트 구현 #65
leegwae Nov 18, 2022
5745833
feat: `UserProfile` 컴포넌트에 `Badge` 추가
leegwae Nov 18, 2022
665ae3a
feat: mui icon에서 heroicon으로 변경 #65
leegwae Nov 18, 2022
834e1ca
design: figma 시안에 맞게 scale 조정 #65
leegwae Nov 20, 2022
efa9ba4
feat: /GET `/api/user/auth/me` mock API 작성
leegwae Nov 20, 2022
6248b84
feat: Sidebar에 로그인한 사용자 프로필 컴포넌트 구현
leegwae Nov 20, 2022
10bba45
design: `FollowingList` border 대신 divide 사용 #65
leegwae Nov 20, 2022
f05c6c6
feat: `SearchInput` 컴포넌트 마크업 #65
leegwae Nov 20, 2022
2d3f39c
feat: 팔로잉 탭에 검색 바 배치 #65
leegwae Nov 20, 2022
81b5398
rename: `FollowingsList`에서 `FollowingList`로 이름 변경
leegwae Nov 20, 2022
78d54f9
feat: GET `/api/users/followings` 목업 API에 검색 query 추가 #65
leegwae Nov 20, 2022
51730c4
feat: 팔로잉 탭 디바운싱 검색 기능 구현 #65
leegwae Nov 20, 2022
cf51819
rename: `FollowingList`를 `FollowingTab`으로 변경 #65
leegwae Nov 20, 2022
bba0781
refactor: 팔로잉 탭에서 hook, 컴포넌트 분리 #65
leegwae Nov 20, 2022
b2b04ea
feat: POST `/api/user/following/:userId` mock API 작성 #65
leegwae Nov 20, 2022
bed9382
feat: 언팔로우 optimistic update 적용 #65
leegwae Nov 20, 2022
4a98628
refactor: getUserResponse.ts를 user.ts로 이름 변경
leegwae Nov 21, 2022
456b78c
fix: 팔로잉 검색 결과 없을 시 다른 문구 띄우도록 함 #65
leegwae Nov 21, 2022
c7d508b
fix: 잘못된 import 경로 수정
leegwae Nov 21, 2022
ce92b41
chore: yarn.lock 업데이트
mjsdo Nov 21, 2022
719cbb2
refactor: Mock API BASE_URL 추가
mjsdo Nov 21, 2022
4f2de6a
fix: setAccessToken 파라미터 타입 수정
mjsdo Nov 21, 2022
a34b32f
refactor: 라우터 구조 수정
mjsdo Nov 21, 2022
6db4042
feat: useInput hooks 추가
mjsdo Nov 21, 2022
2d44a5c
refactor: 컴포넌트 디렉토리 위치 수정
mjsdo Nov 21, 2022
06b1f99
refactor: feature -> layouts로 이름 변경
mjsdo Nov 21, 2022
d2252fc
refactor: markup 업데이트
mjsdo Nov 21, 2022
1c5bc44
fix: 충돌 해결
soomanbaek Nov 21, 2022
b3d1f28
fix: 충돌 해결
soomanbaek Nov 21, 2022
da52b89
Merge branch 'dev' into dev-be
soomanbaek Nov 21, 2022
613b498
Merge pull request #91 from boostcampwm-2022/dev-be
mjsdo Nov 21, 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
refactor: getUserResponse.ts를 user.ts로 이름 변경
  • Loading branch information
leegwae authored and soomanbaek committed Nov 21, 2022
commit 4a986287d7805fd17acfc7fb2916585f26b5e3fe
2 changes: 1 addition & 1 deletion client/src/common/components/UserProfile/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Avatar from '@components/Avatar';
import Badge from '@components/Badge';
import React from 'react';
import { User } from 'shared/lib/getUserResponse';
import { User } from 'shared/lib/user';

interface UserItemProps {
user: User;
Expand Down
2 changes: 1 addition & 1 deletion client/src/features/FollowingTab/components/item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from '@heroicons/react/20/solid';
import React from 'react';
import { useNavigate } from 'react-router-dom';
import { User } from 'shared/lib/getUserResponse';
import { User } from 'shared/lib/user';

import useUpdateFollowing from '../hooks/useUpdateFollowing';

Expand Down
8 changes: 4 additions & 4 deletions client/src/features/FollowingTab/hooks/useUpdateFollowing.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useMutation, useQueryClient } from '@tanstack/react-query';
import { GetUserReponse, User } from 'shared/lib/getUserResponse';
import { GetUsersReponse, User } from 'shared/lib/user';

import updateFollowing from '../apis/updateFollowing';

Expand All @@ -8,14 +8,14 @@ const useUpdateFollowing = (userId: string) => {
const mutation = useMutation(() => updateFollowing(userId), {
onMutate: async (deleted: User) => {
await queryClient.cancelQueries(['followings']);
const previousFollowings = queryClient.getQueryData<GetUserReponse>([
const previousFollowings = queryClient.getQueryData<GetUsersReponse>([
'followings',
]);

if (previousFollowings) {
const { users } = previousFollowings.result;

queryClient.setQueryData<GetUserReponse>(['followings'], {
queryClient.setQueryData<GetUsersReponse>(['followings'], {
...previousFollowings,
result: {
...previousFollowings.result,
Expand All @@ -27,7 +27,7 @@ const useUpdateFollowing = (userId: string) => {
},
onError: (err, variables, context) => {
if (context?.previousFollowings)
queryClient.setQueryData<GetUserReponse>(
queryClient.setQueryData<GetUsersReponse>(
['followings'],
context.previousFollowings,
);
Expand Down
2 changes: 1 addition & 1 deletion shared/lib/getUserResponse.ts → shared/lib/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface User {
descrption: string;
}

export interface GetUserReponse {
export interface GetUsersReponse {
statusCode: number;
result: {
users: User[];
Expand Down