[feat] 유저 상태 백엔드 및 프로필에서 게임초대 프론트 #27
Comments
minsikim-42
added a commit
that referenced
this issue
Dec 15, 2022
minsikim-42
added a commit
that referenced
this issue
Dec 15, 2022
kimhxsong
added a commit
that referenced
this issue
Dec 19, 2022
commit 7e29171 Merge: 8fdaa5f 7796fd0 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Mon Dec 19 12:48:20 2022 +0900 Merge pull request #32 from ping-neo-meo-pong/feat/#31 Feat/#31 클린코드, live&leaderboard페이지, ladder점수 개혁 commit 7796fd0 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 18 22:33:49 2022 +0900 feat: leaderboard (#31) commit b36bc4e Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 18 22:11:20 2022 +0900 feat: unhandled error (#31) commit ada9c62 Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 17 01:23:57 2022 +0900 feat: ladder point evolution (#31) commit 458bba1 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 16 14:50:14 2022 +0900 chore: clean code (#31) commit 907e109 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 16 14:47:35 2022 +0900 feat: create live page (#31) commit ac13f0b Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 16 14:46:12 2022 +0900 chore: delete is_player and not import user_data (#31) commit 8fdaa5f Merge: 5964bbd 63a8388 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Fri Dec 16 14:38:19 2022 +0900 Merge pull request #29 from ping-neo-meo-pong/feat/#27 feat: user status 유저상태 update commit 63a8388 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 22:33:51 2022 +0900 feat: invite game in profile (#27) commit 47c3445 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 21:49:46 2022 +0900 feat: status default OFFLINE (#27) commit 124cf50 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 21:29:57 2022 +0900 feat: user status (#27) commit 5964bbd Merge: 026199a 59e25ee Author: kjh6b6a68 <67954615+kjh6b6a68@users.noreply.github.com> Date: Thu Dec 15 19:01:22 2022 +0900 Merge pull request #26 from ping-neo-meo-pong/feat/#23 Feat/#23 commit 59e25ee Merge: 979bb9b 4ff6584 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 18:52:58 2022 +0900 chore: Merge branch feat23 (#23) commit 979bb9b Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 18:51:10 2022 +0900 feat: channel block implement (#23) commit 0e3be09 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 15:55:52 2022 +0900 feat: channel and eslint (#23) commit 3b7159d Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 13:10:06 2022 +0900 feat: get historys (#23) commit 4ff6584 Author: name <email> Date: Wed Dec 14 22:52:05 2022 +0900 fix: problem which was not fixed correctly on previous commit (#23) commit 65e9cfe Author: name <email> Date: Wed Dec 14 22:34:29 2022 +0900 fix: problem that dialog remember its state when closed (#23) commit a2c4a6f Author: name <email> Date: Wed Dec 14 22:07:11 2022 +0900 feat: can create and join channels (#23) commit 249dcea Author: name <email> Date: Wed Dec 14 14:52:46 2022 +0900 fix: few things changed due to merge (#23) commit ce0d414 Merge: fc7833a 026199a Author: name <email> Date: Wed Dec 14 14:34:56 2022 +0900 chore: merge main (#23) commit 026199a Merge: 98137a3 43f4e4a Author: jwoo <74581396+Jiwon-Woo@users.noreply.github.com> Date: Tue Dec 13 22:44:34 2022 +0900 Merge pull request #25 from ping-neo-meo-pong/feat/#24 Feat/#24 commit fc7833a Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 13 22:23:07 2022 +0900 feat: eslint a goto profile a goto mainpage (#23) commit 43f4e4a Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 22:12:09 2022 +0900 fix: Set permission to get chat messages (#24) commit 3e2a484 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 22:01:42 2022 +0900 fix: Cannot enter private channels uninvited (#24) commit 9db9ace Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 21:46:35 2022 +0900 fix: Only users who have entered the channel can invite others - add await (#24) commit 7dcaa6a Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 21:40:03 2022 +0900 fix: response username when new user login (#24) commit 5a75287 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 21:38:37 2022 +0900 fix: uuid error (#24) commit 6dd10fc Merge: e4f18a3 f4dd321 Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 13 21:10:28 2022 +0900 chore: Merge branch feat23 of github com pnmp into feat (#23) commit f4dd321 Author: name <email> Date: Tue Dec 13 21:03:41 2022 +0900 feat: add chat list and friend list and dialogs for create new of them Now working on channel list and joining or creating new channel (#23) commit e4f18a3 Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 13 20:51:32 2022 +0900 feat: history view (#23) commit fd507df Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 13 18:48:44 2022 +0900 feat: eslint a history a profile (#23) commit 856c05e Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 01:09:33 2022 +0900 chore: fix incorrectly written api (#24) commit a6fe895 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 00:21:06 2022 +0900 feat: add accept channel inivite api (#24) commit 66f393a Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 00:20:41 2022 +0900 chore: remove swagger ApiBody of inviteUser api (#24) commit 2658df0 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 00:19:22 2022 +0900 fix: make join_at column nullable and Modify exception condition of inivteUser api (#24) commit 4dabb1f Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 23:26:47 2022 +0900 feat: add get block list api (#24) commit 592b5c0 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 23:19:55 2022 +0900 feat: classify friend list by FriendStatus (#24) commit 55eb96e Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 23:07:38 2022 +0900 feat: add relationship of friend and block when get user profile (#24) commit 58b2ace Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 22:14:36 2022 +0900 feat: kick user when admin ban user (#24) commit 44c9f0e Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 21:56:50 2022 +0900 feat: add API to invite user to channel (#24) commit 74ce4e9 Author: name <email> Date: Sun Dec 11 23:07:30 2022 +0900 feat: working on dm list (#23) commit cc6afa7 Author: name <email> Date: Sun Dec 11 19:20:10 2022 +0900 feat: searchbar moved to ChatPanel (#23) commit 6ef3033 Merge: 92a1db0 66b049b Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 16:24:53 2022 +0900 Merge branch 'feat/#23' of github.com:ping-neo-meo-pong/pnmp into feat/#23 commit 92a1db0 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 16:24:25 2022 +0900 chore: change from layout (#23) commit 7225c65 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 16:23:54 2022 +0900 feat: Matching Modal (#23) commit 57d9c18 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 16:02:52 2022 +0900 fix: once get userId by getLoginUser (#23) commit 66b049b Merge: f0e3d72 61cb634 Author: name <email> Date: Sun Dec 11 16:02:38 2022 +0900 chore: merge (#23) commit f0e3d72 Author: name <email> Date: Sun Dec 11 16:00:18 2022 +0900 feat: menu popup align to right, and logout works (#23) commit 61cb634 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 15:56:56 2022 +0900 feat: invite Modal v2 (#23) commit ef4e55e Author: name <email> Date: Sat Dec 10 23:00:16 2022 +0900 feat: display correct username, and display menu when hamburger menu clicked (#23) commit 5b38852 Author: name <email> Date: Sat Dec 10 20:52:35 2022 +0900 feat: layout followed figma (#23) commit 98137a3 Merge: 8544a6e 7c6872b Author: jwoo <74581396+Jiwon-Woo@users.noreply.github.com> Date: Sat Dec 10 02:10:27 2022 +0900 Merge pull request #22 from ping-neo-meo-pong/feat/#21 Feat/#21 차단한 사용자가 보낸 메세지 차단 & 채널 소유자가 채널을 나갈때 소유자 권한 넘기기 commit de8a62d Author: name <email> Date: Fri Dec 9 23:16:18 2022 +0900 feat: working on header (#23) commit 7c6872b Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 19:53:35 2022 +0900 fix: update roleInChannel when owner left channel (#21) commit 5a39290 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 16:12:39 2022 +0900 feat: automatically select an owner when the owner leaves the channel (#21) commit 50eea92 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 16:11:49 2022 +0900 fix: get channel list when no channels were joined (#21) commit 8ef0d39 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 16:09:27 2022 +0900 refactor: remove unique props of channelName (#21) commit 3d0a3e6 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 13:32:23 2022 +0900 feat: excluding channel messages from blocked users when get save messages (#21) commit ff9c9db Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 13:09:07 2022 +0900 feat: add win rate to specific user info (#21) commit a5e7999 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 12:08:16 2022 +0900 feat: excluding messages from blocked users when chatting real time (#21) commit 4cf4a6d Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 12:07:30 2022 +0900 feat: excluding messages from blocked users when get save messages (#21) commit 48b164f Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 10:10:44 2022 +0900 refactor: remove the part that user.role used (#21) commit 8544a6e Merge: 3347f57 85cbcc7 Author: kjh6b6a68 <67954615+kjh6b6a68@users.noreply.github.com> Date: Thu Dec 8 20:29:28 2022 +0900 Merge pull request #19 from ping-neo-meo-pong/feat/#14 Feat/#14 commit 85cbcc7 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 8 18:58:25 2022 +0900 chore: eslint impliment (#14) commit 1047e3d Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 8 18:49:59 2022 +0900 fix: fix any refresh error (#14) commit 82c2189 Author: name <email> Date: Thu Dec 8 15:15:24 2022 +0900 fix: username was not displayed after reload on /clients (#14) commit 15ab9c7 Author: name <email> Date: Thu Dec 8 11:26:23 2022 +0900 fix: dm messages disappearing problem when reloaded (#14) commit 3347f57 Merge: 2443a1b d860a40 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Thu Dec 8 11:25:16 2022 +0900 Merge pull request #18 from ping-neo-meo-pong/feat/#15 Feat/#15 게임종료시 게임룸의 id에 대한 히스토리가 2개(left, right) 추가됩니다. commit 15d6457 Author: name <email> Date: Thu Dec 8 11:19:49 2022 +0900 fix: cookie related problem and not-so-important mistake (#14) commit b484ab7 Merge: ae4e1da d860a40 Author: name <email> Date: Wed Dec 7 22:53:06 2022 +0900 feat: merge feat 15 to feat 14 (#14) commit ae4e1da Author: name <email> Date: Wed Dec 7 22:08:49 2022 +0900 feat: refresh error removed (#14) commit d860a40 Author: minsikim-42 <spalstlr321@naver.com> Date: Wed Dec 7 14:42:59 2022 +0900 chore: lslint implment (#15) commit 4755018 Author: minsikim-42 <spalstlr321@naver.com> Date: Wed Dec 7 14:34:39 2022 +0900 fix: fix list error and count error (#15) commit 6787d6a Author: minsikim-42 <spalstlr321@naver.com> Date: Wed Dec 7 13:01:36 2022 +0900 feat: when game ended history add (#15) commit c6aa0c1 Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 6 21:58:40 2022 +0900 feat: fit to jwoo s game history DB (#15) commit c11e306 Merge: b92836f 2443a1b Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 6 19:04:10 2022 +0900 chore: Merge branch main into feat (#15) commit 2443a1b Merge: 4df4202 4f0e8bb Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Tue Dec 6 18:03:39 2022 +0900 Merge pull request #17 from ping-neo-meo-pong/feat/#16 Feat/#16 dm 방 생성시 사용자 검색기능 추가 및 새로고침 오류 해결 오옹 잘 봤습니다!! 이미 초대된 사람을 초대하면 url이 계속 push되긴 하지만 큰 문제는 아니고 잘 작동하는것같습니다! commit 4f0e8bb Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 5 23:58:29 2022 +0900 feat: 사용자 검색 기능 추가 (#16) commit 8ac46f4 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 5 23:55:09 2022 +0900 feat: 임시로 로그인 유지를 위해 localStorage 활용 (#16) commit e6e9848 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 5 23:54:11 2022 +0900 refactor: login api 반환값에 username 추가 (#16) commit dfb28df Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 5 23:52:47 2022 +0900 refactor: events.gateway.ts 에서 dm 부분 분리 (#16) commit e5b65fc Author: name <email> Date: Mon Dec 5 22:52:29 2022 +0900 test: tried reading document.cookie from just global scope but failed (#14) commit b92836f Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Dec 5 22:03:22 2022 +0900 feat: reset button and add invited list (#15) commit 4df4202 Merge: 5bed318 847b5d9 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Mon Dec 5 19:20:08 2022 +0900 Merge pull request #13 from ping-neo-meo-pong/feat/#12 Feat/#12 게임 자동매칭 시스템, 게임모드 추가, 게임 종결 조건 추가 및 여러 에러 commit 847b5d9 Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Dec 5 19:18:50 2022 +0900 chore: lslint 적용 (#12) commit 7efebff Merge: 9501e88 86f7836 Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Dec 5 18:54:13 2022 +0900 chore: Merge branch feat12 of githubcom pnmp (#12) commit 9501e88 Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Dec 5 18:52:30 2022 +0900 feat: input name and you can invite them (#12) commit 86f7836 Author: kjh6b6a68 <67954615+kjh6b6a68@users.noreply.github.com> Date: Mon Dec 5 17:44:39 2022 +0900 오타 수정 cencel -> cancle Co-authored-by: jwoo <74581396+Jiwon-Woo@users.noreply.github.com> commit 80eab7c Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 18:15:21 2022 +0900 chore: code clean and change name (#12) commit 0ecde96 Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 18:14:40 2022 +0900 fix: change is player name to id (#12) commit ea02355 Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 17:32:58 2022 +0900 feat: check is player and fix idx error (#12) commit 55f3f85 Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 16:25:58 2022 +0900 fix: fix gameQue get idx error (#12) commit dadc39f Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 15:53:14 2022 +0900 fix: splice and change idx 2 but matching interval idx not changed now Good Working (#12) commit 26560be Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 23:04:44 2022 +0900 feat: viewer not yet (#12) commit de8021a Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 22:29:09 2022 +0900 fix: fix viewer error (#12) commit b14d9a6 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 22:28:48 2022 +0900 feat: exception (#12) commit 2386510 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 20:50:05 2022 +0900 feat: exception (#12) commit 3914198 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 20:49:32 2022 +0900 feat: Game Over (#12) commit 21972f9 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 18:20:11 2022 +0900 feat: change api for another MAC (#12) commit 2fdc75e Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 17:43:34 2022 +0900 feat: version 2 OK-seperate Que- (#12) commit 2921c38 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 15:52:54 2022 +0900 feat: good Matching (#12) commit 7da6268 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 1 23:11:51 2022 +0900 feat: matching system by jihkwon but setInterval (#12) commit 10ddecc Author: minsikim-42 <spalstlr321@naver.com> Date: Wed Nov 30 23:09:07 2022 +0900 refactor: game-room repository [#10] commit 5bed318 Merge: 8a1bcae b6b8f82 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Tue Nov 29 13:30:02 2022 +0900 Merge pull request #9 from ping-neo-meo-pong/feat/#8 Feat/#8 게임 데이터 배열화 commit b6b8f82 Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Nov 29 13:27:28 2022 +0900 chore: eslint 적용 [#8] commit 637c31d Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Nov 28 19:52:43 2022 +0900 test: issue2 (#8) commit 4682eda Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Nov 28 19:50:10 2022 +0900 test: issue (#8) commit a57fa69 Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Nov 28 19:46:08 2022 +0900 Feat: 게임 정보 배열화하여 여러 게임방 각각의 정보를 따로 수집
kimhxsong
added a commit
that referenced
this issue
Dec 22, 2022
Squashed commit of the following: commit 8d2f0c8 Merge: 7e29171 c3c5881 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Wed Dec 21 22:01:54 2022 +0900 Merge pull request #34 from ping-neo-meo-pong/hotfix/#33 fix: replace or with typeorm where array operator (#33) commit c3c5881 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 19 23:26:33 2022 +0900 fix: Modifying conditions that channel members can be get (#33) commit f99c8c5 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 19 22:13:20 2022 +0900 fix: replace or with typeorm where array operator (#33) commit 7e29171 Merge: 8fdaa5f 7796fd0 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Mon Dec 19 12:48:20 2022 +0900 Merge pull request #32 from ping-neo-meo-pong/feat/#31 Feat/#31 클린코드, live&leaderboard페이지, ladder점수 개혁 commit 7796fd0 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 18 22:33:49 2022 +0900 feat: leaderboard (#31) commit b36bc4e Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 18 22:11:20 2022 +0900 feat: unhandled error (#31) commit ada9c62 Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 17 01:23:57 2022 +0900 feat: ladder point evolution (#31) commit 458bba1 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 16 14:50:14 2022 +0900 chore: clean code (#31) commit 907e109 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 16 14:47:35 2022 +0900 feat: create live page (#31) commit ac13f0b Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 16 14:46:12 2022 +0900 chore: delete is_player and not import user_data (#31) commit 8fdaa5f Merge: 5964bbd 63a8388 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Fri Dec 16 14:38:19 2022 +0900 Merge pull request #29 from ping-neo-meo-pong/feat/#27 feat: user status 유저상태 update commit 63a8388 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 22:33:51 2022 +0900 feat: invite game in profile (#27) commit 47c3445 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 21:49:46 2022 +0900 feat: status default OFFLINE (#27) commit 124cf50 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 21:29:57 2022 +0900 feat: user status (#27) commit 5964bbd Merge: 026199a 59e25ee Author: kjh6b6a68 <67954615+kjh6b6a68@users.noreply.github.com> Date: Thu Dec 15 19:01:22 2022 +0900 Merge pull request #26 from ping-neo-meo-pong/feat/#23 Feat/#23 commit 59e25ee Merge: 979bb9b 4ff6584 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 18:52:58 2022 +0900 chore: Merge branch feat23 (#23) commit 979bb9b Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 18:51:10 2022 +0900 feat: channel block implement (#23) commit 0e3be09 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 15:55:52 2022 +0900 feat: channel and eslint (#23) commit 3b7159d Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 15 13:10:06 2022 +0900 feat: get historys (#23) commit 4ff6584 Author: name <email> Date: Wed Dec 14 22:52:05 2022 +0900 fix: problem which was not fixed correctly on previous commit (#23) commit 65e9cfe Author: name <email> Date: Wed Dec 14 22:34:29 2022 +0900 fix: problem that dialog remember its state when closed (#23) commit a2c4a6f Author: name <email> Date: Wed Dec 14 22:07:11 2022 +0900 feat: can create and join channels (#23) commit 249dcea Author: name <email> Date: Wed Dec 14 14:52:46 2022 +0900 fix: few things changed due to merge (#23) commit ce0d414 Merge: fc7833a 026199a Author: name <email> Date: Wed Dec 14 14:34:56 2022 +0900 chore: merge main (#23) commit 026199a Merge: 98137a3 43f4e4a Author: jwoo <74581396+Jiwon-Woo@users.noreply.github.com> Date: Tue Dec 13 22:44:34 2022 +0900 Merge pull request #25 from ping-neo-meo-pong/feat/#24 Feat/#24 commit fc7833a Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 13 22:23:07 2022 +0900 feat: eslint a goto profile a goto mainpage (#23) commit 43f4e4a Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 22:12:09 2022 +0900 fix: Set permission to get chat messages (#24) commit 3e2a484 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 22:01:42 2022 +0900 fix: Cannot enter private channels uninvited (#24) commit 9db9ace Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 21:46:35 2022 +0900 fix: Only users who have entered the channel can invite others - add await (#24) commit 7dcaa6a Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 21:40:03 2022 +0900 fix: response username when new user login (#24) commit 5a75287 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 21:38:37 2022 +0900 fix: uuid error (#24) commit 6dd10fc Merge: e4f18a3 f4dd321 Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 13 21:10:28 2022 +0900 chore: Merge branch feat23 of github com pnmp into feat (#23) commit f4dd321 Author: name <email> Date: Tue Dec 13 21:03:41 2022 +0900 feat: add chat list and friend list and dialogs for create new of them Now working on channel list and joining or creating new channel (#23) commit e4f18a3 Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 13 20:51:32 2022 +0900 feat: history view (#23) commit fd507df Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 13 18:48:44 2022 +0900 feat: eslint a history a profile (#23) commit 856c05e Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 01:09:33 2022 +0900 chore: fix incorrectly written api (#24) commit a6fe895 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 00:21:06 2022 +0900 feat: add accept channel inivite api (#24) commit 66f393a Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 00:20:41 2022 +0900 chore: remove swagger ApiBody of inviteUser api (#24) commit 2658df0 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Tue Dec 13 00:19:22 2022 +0900 fix: make join_at column nullable and Modify exception condition of inivteUser api (#24) commit 4dabb1f Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 23:26:47 2022 +0900 feat: add get block list api (#24) commit 592b5c0 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 23:19:55 2022 +0900 feat: classify friend list by FriendStatus (#24) commit 55eb96e Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 23:07:38 2022 +0900 feat: add relationship of friend and block when get user profile (#24) commit 58b2ace Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 22:14:36 2022 +0900 feat: kick user when admin ban user (#24) commit 44c9f0e Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 12 21:56:50 2022 +0900 feat: add API to invite user to channel (#24) commit 74ce4e9 Author: name <email> Date: Sun Dec 11 23:07:30 2022 +0900 feat: working on dm list (#23) commit cc6afa7 Author: name <email> Date: Sun Dec 11 19:20:10 2022 +0900 feat: searchbar moved to ChatPanel (#23) commit 6ef3033 Merge: 92a1db0 66b049b Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 16:24:53 2022 +0900 Merge branch 'feat/#23' of github.com:ping-neo-meo-pong/pnmp into feat/#23 commit 92a1db0 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 16:24:25 2022 +0900 chore: change from layout (#23) commit 7225c65 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 16:23:54 2022 +0900 feat: Matching Modal (#23) commit 57d9c18 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 16:02:52 2022 +0900 fix: once get userId by getLoginUser (#23) commit 66b049b Merge: f0e3d72 61cb634 Author: name <email> Date: Sun Dec 11 16:02:38 2022 +0900 chore: merge (#23) commit f0e3d72 Author: name <email> Date: Sun Dec 11 16:00:18 2022 +0900 feat: menu popup align to right, and logout works (#23) commit 61cb634 Author: minsikim-42 <spalstlr321@naver.com> Date: Sun Dec 11 15:56:56 2022 +0900 feat: invite Modal v2 (#23) commit ef4e55e Author: name <email> Date: Sat Dec 10 23:00:16 2022 +0900 feat: display correct username, and display menu when hamburger menu clicked (#23) commit 5b38852 Author: name <email> Date: Sat Dec 10 20:52:35 2022 +0900 feat: layout followed figma (#23) commit 98137a3 Merge: 8544a6e 7c6872b Author: jwoo <74581396+Jiwon-Woo@users.noreply.github.com> Date: Sat Dec 10 02:10:27 2022 +0900 Merge pull request #22 from ping-neo-meo-pong/feat/#21 Feat/#21 차단한 사용자가 보낸 메세지 차단 & 채널 소유자가 채널을 나갈때 소유자 권한 넘기기 commit de8a62d Author: name <email> Date: Fri Dec 9 23:16:18 2022 +0900 feat: working on header (#23) commit 7c6872b Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 19:53:35 2022 +0900 fix: update roleInChannel when owner left channel (#21) commit 5a39290 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 16:12:39 2022 +0900 feat: automatically select an owner when the owner leaves the channel (#21) commit 50eea92 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 16:11:49 2022 +0900 fix: get channel list when no channels were joined (#21) commit 8ef0d39 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 16:09:27 2022 +0900 refactor: remove unique props of channelName (#21) commit 3d0a3e6 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 13:32:23 2022 +0900 feat: excluding channel messages from blocked users when get save messages (#21) commit ff9c9db Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 13:09:07 2022 +0900 feat: add win rate to specific user info (#21) commit a5e7999 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 12:08:16 2022 +0900 feat: excluding messages from blocked users when chatting real time (#21) commit 4cf4a6d Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 12:07:30 2022 +0900 feat: excluding messages from blocked users when get save messages (#21) commit 48b164f Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Fri Dec 9 10:10:44 2022 +0900 refactor: remove the part that user.role used (#21) commit 8544a6e Merge: 3347f57 85cbcc7 Author: kjh6b6a68 <67954615+kjh6b6a68@users.noreply.github.com> Date: Thu Dec 8 20:29:28 2022 +0900 Merge pull request #19 from ping-neo-meo-pong/feat/#14 Feat/#14 commit 85cbcc7 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 8 18:58:25 2022 +0900 chore: eslint impliment (#14) commit 1047e3d Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 8 18:49:59 2022 +0900 fix: fix any refresh error (#14) commit 82c2189 Author: name <email> Date: Thu Dec 8 15:15:24 2022 +0900 fix: username was not displayed after reload on /clients (#14) commit 15ab9c7 Author: name <email> Date: Thu Dec 8 11:26:23 2022 +0900 fix: dm messages disappearing problem when reloaded (#14) commit 3347f57 Merge: 2443a1b d860a40 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Thu Dec 8 11:25:16 2022 +0900 Merge pull request #18 from ping-neo-meo-pong/feat/#15 Feat/#15 게임종료시 게임룸의 id에 대한 히스토리가 2개(left, right) 추가됩니다. commit 15d6457 Author: name <email> Date: Thu Dec 8 11:19:49 2022 +0900 fix: cookie related problem and not-so-important mistake (#14) commit b484ab7 Merge: ae4e1da d860a40 Author: name <email> Date: Wed Dec 7 22:53:06 2022 +0900 feat: merge feat 15 to feat 14 (#14) commit ae4e1da Author: name <email> Date: Wed Dec 7 22:08:49 2022 +0900 feat: refresh error removed (#14) commit d860a40 Author: minsikim-42 <spalstlr321@naver.com> Date: Wed Dec 7 14:42:59 2022 +0900 chore: lslint implment (#15) commit 4755018 Author: minsikim-42 <spalstlr321@naver.com> Date: Wed Dec 7 14:34:39 2022 +0900 fix: fix list error and count error (#15) commit 6787d6a Author: minsikim-42 <spalstlr321@naver.com> Date: Wed Dec 7 13:01:36 2022 +0900 feat: when game ended history add (#15) commit c6aa0c1 Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 6 21:58:40 2022 +0900 feat: fit to jwoo s game history DB (#15) commit c11e306 Merge: b92836f 2443a1b Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Dec 6 19:04:10 2022 +0900 chore: Merge branch main into feat (#15) commit 2443a1b Merge: 4df4202 4f0e8bb Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Tue Dec 6 18:03:39 2022 +0900 Merge pull request #17 from ping-neo-meo-pong/feat/#16 Feat/#16 dm 방 생성시 사용자 검색기능 추가 및 새로고침 오류 해결 오옹 잘 봤습니다!! 이미 초대된 사람을 초대하면 url이 계속 push되긴 하지만 큰 문제는 아니고 잘 작동하는것같습니다! commit 4f0e8bb Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 5 23:58:29 2022 +0900 feat: 사용자 검색 기능 추가 (#16) commit 8ac46f4 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 5 23:55:09 2022 +0900 feat: 임시로 로그인 유지를 위해 localStorage 활용 (#16) commit e6e9848 Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 5 23:54:11 2022 +0900 refactor: login api 반환값에 username 추가 (#16) commit dfb28df Author: Jiwon-Woo <jwoo@student.42seoul.kr> Date: Mon Dec 5 23:52:47 2022 +0900 refactor: events.gateway.ts 에서 dm 부분 분리 (#16) commit e5b65fc Author: name <email> Date: Mon Dec 5 22:52:29 2022 +0900 test: tried reading document.cookie from just global scope but failed (#14) commit b92836f Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Dec 5 22:03:22 2022 +0900 feat: reset button and add invited list (#15) commit 4df4202 Merge: 5bed318 847b5d9 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Mon Dec 5 19:20:08 2022 +0900 Merge pull request #13 from ping-neo-meo-pong/feat/#12 Feat/#12 게임 자동매칭 시스템, 게임모드 추가, 게임 종결 조건 추가 및 여러 에러 commit 847b5d9 Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Dec 5 19:18:50 2022 +0900 chore: lslint 적용 (#12) commit 7efebff Merge: 9501e88 86f7836 Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Dec 5 18:54:13 2022 +0900 chore: Merge branch feat12 of githubcom pnmp (#12) commit 9501e88 Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Dec 5 18:52:30 2022 +0900 feat: input name and you can invite them (#12) commit 86f7836 Author: kjh6b6a68 <67954615+kjh6b6a68@users.noreply.github.com> Date: Mon Dec 5 17:44:39 2022 +0900 오타 수정 cencel -> cancle Co-authored-by: jwoo <74581396+Jiwon-Woo@users.noreply.github.com> commit 80eab7c Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 18:15:21 2022 +0900 chore: code clean and change name (#12) commit 0ecde96 Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 18:14:40 2022 +0900 fix: change is player name to id (#12) commit ea02355 Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 17:32:58 2022 +0900 feat: check is player and fix idx error (#12) commit 55f3f85 Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 16:25:58 2022 +0900 fix: fix gameQue get idx error (#12) commit dadc39f Author: minsikim-42 <spalstlr321@naver.com> Date: Sat Dec 3 15:53:14 2022 +0900 fix: splice and change idx 2 but matching interval idx not changed now Good Working (#12) commit 26560be Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 23:04:44 2022 +0900 feat: viewer not yet (#12) commit de8021a Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 22:29:09 2022 +0900 fix: fix viewer error (#12) commit b14d9a6 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 22:28:48 2022 +0900 feat: exception (#12) commit 2386510 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 20:50:05 2022 +0900 feat: exception (#12) commit 3914198 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 20:49:32 2022 +0900 feat: Game Over (#12) commit 21972f9 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 18:20:11 2022 +0900 feat: change api for another MAC (#12) commit 2fdc75e Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 17:43:34 2022 +0900 feat: version 2 OK-seperate Que- (#12) commit 2921c38 Author: minsikim-42 <spalstlr321@naver.com> Date: Fri Dec 2 15:52:54 2022 +0900 feat: good Matching (#12) commit 7da6268 Author: minsikim-42 <spalstlr321@naver.com> Date: Thu Dec 1 23:11:51 2022 +0900 feat: matching system by jihkwon but setInterval (#12) commit 10ddecc Author: minsikim-42 <spalstlr321@naver.com> Date: Wed Nov 30 23:09:07 2022 +0900 refactor: game-room repository [#10] commit 5bed318 Merge: 8a1bcae b6b8f82 Author: minsikim-42 <74590585+minsikim-42@users.noreply.github.com> Date: Tue Nov 29 13:30:02 2022 +0900 Merge pull request #9 from ping-neo-meo-pong/feat/#8 Feat/#8 게임 데이터 배열화 commit b6b8f82 Author: minsikim-42 <spalstlr321@naver.com> Date: Tue Nov 29 13:27:28 2022 +0900 chore: eslint 적용 [#8] commit 637c31d Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Nov 28 19:52:43 2022 +0900 test: issue2 (#8) commit 4682eda Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Nov 28 19:50:10 2022 +0900 test: issue (#8) commit a57fa69 Author: minsikim-42 <spalstlr321@naver.com> Date: Mon Nov 28 19:46:08 2022 +0900 Feat: 게임 정보 배열화하여 여러 게임방 각각의 정보를 따로 수집
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Description
...
Todo
The text was updated successfully, but these errors were encountered: