merge to main #236

haryung-lee · 2022-10-04T05:19:45Z

친구기능 추가
axios instance화
lobby socket 수정
볼륨 조절 오류 수정

change socket name string to enum const

FIRE-667 add socket enum

…89-다른-사용자-볼륨-조절-가능

Fire 689 다른 사용자 볼륨 조절 가능

FIRE-692 fix muted

…o FIRE-691-유저에게-친구-신청을-보낼-수-있다

FIRE-691 유저에게 친구 신청을 보낼 수 있다

Fire 693 사용자 입장시 채팅 UI 변경되는 것 수정

works only at room

FIRE-695-방에서-친구-수락-및-거절-api-연동

…관계를-확인할-수-있다 Fire 696 프로필 모달 혹은 프로필 자체에서 친구 관계를 확인할 수 있다

…않게-하기 Fire 694 로비 참여자 목록에서 중복 유저 보이지 않게 하기

Fire 690 axios 객체로 만들어두고 재사용

…o FIRE-697-프로필-창에서-친구-신청을-보낼-수-있다

FIRE-697 프로필 창에서 친구 신청을 보낼 수 있다

…되는-것-수정 FIRE-700 disableButton when permission is prompt

FIRE-702 fix editMyPage

…서-프로필-페이지로-이동-가능 FIRE-703-로비-프로피-모달-친구-방정보의-방장-에서-프로필-페이지로-이동-가능

cypress · 2022-10-04T05:24:51Z

Test summary

12 • 5 • 0 • 3

Run details


Project	Default Project
Status	Failed
Commit	`749b510` ℹ️
Started	Oct 4, 2022 5:22 AM
Ended	Oct 4, 2022 5:24 AM
Duration	02:22 💡
OS	Linux Ubuntu - 20.04
Browser	Chrome 105

View run in Cypress Dashboard ➡️

Failures

	1-main-page/createRoom.cy.ts	1
1	open create room modal in main page > check close modal when user clicks background
	1-main-page/main.cy.ts	2
1	open main page > render Main Props
2	open main page > check landing page
	2-ready-page/ready-modal.cy.ts	1
1	check ready page modals > check setting modal
	2-ready-page/ready.cy.ts	1
1	open main page > render ready page

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

071yoon

LGTM

071yoon · 2022-10-04T05:48:48Z

src/adapters/getSocketData.ts

+import lobbySocket from './lobbySocket';
+
+const getSocketData = (roomId: string) => {
+  const { connectedUsers: roomConnected } = connectedUsersStore();


이따가 파일로 분리해야될거같아용

071yoon and others added 30 commits September 28, 2022 16:51

FIRE-667 add socket enum

628bc41

change socket name string to enum const

Merge pull request #223 from SWM-FIRE/FIRE-667-소켓-이벤트-const로-지정하기

6c3b925

FIRE-667 add socket enum

FIRE-689 fix mediaStateChange

857515b

FIRE-689 rename socketId to sid

970abb7

Merge branch 'dev' of github.com:SWM-FIRE/modoco-frontend into FIRE-6…

a5b466a

…89-다른-사용자-볼륨-조절-가능

Merge pull request #224 from SWM-FIRE/FIRE-689-다른-사용자-볼륨-조절-가능

a036fca

Fire 689 다른 사용자 볼륨 조절 가능

FIRE-692 fix muted

af86faa

Merge pull request #225 from SWM-FIRE/FIRE-692-다른-사용자-볼륨-조절-오류-수정

84c3590

FIRE-692 fix muted

FIRE-691 add friend hooks

15d498c

FIRE-691 add friend UI in room

cba2b85

Merge branch 'dev' of https://github.com/SWM-FIRE/modoco-frontend int…

3d68645

…o FIRE-691-유저에게-친구-신청을-보낼-수-있다

FIRE-691 remove console and fix minor error

b073d20

Merge pull request #226 from SWM-FIRE/FIRE-691-유저에게-친구-신청을-보낼-수-있다

af62e4c

FIRE-691 유저에게 친구 신청을 보낼 수 있다

FIRE-693 fix msg error when user entrance

b76a62b

FIRE-693 fix message

f3400d4

Merge pull request #227 from SWM-FIRE/FIRE-693-사용자-입장시-채팅-ui-변경되는-것-수정

3474793

Fire 693 사용자 입장시 채팅 UI 변경되는 것 수정

filter room data by current

41ff37f

fix media screen

07db795

fix chart week label

3913f3c

FIRE-693 accept or decline friend request

4478239

works only at room

Merge pull request #228 from SWM-FIRE/FIRE-695-방에서-친구-수락-및-거절-api-연동

35b6a9e

FIRE-695-방에서-친구-수락-및-거절-api-연동

FIRE-694 add deleteLobbySocket

3da7802

FIRE-694 rerender when connectedLobbyUsers change

f06de66

FIRE-694 fix login error msg

98d723c

FIRE-696 remove lobby to archive

1bd7a98

FIRE-696 edit header profile modal state to global

67e3817

FIRE-696 add friend request at header profile

6c28ad2

FIRE-694 delete user in connectedLobby when logout

afb51ca

Merge pull request #229 from SWM-FIRE/FIRE-696-프로필-모달-혹은-프로필-자체에서-친구-…

ddab948

…관계를-확인할-수-있다 Fire 696 프로필 모달 혹은 프로필 자체에서 친구 관계를 확인할 수 있다

Merge pull request #230 from SWM-FIRE/FIRE-694-로비-참여자-목록에서-중복-유저-보이지-…

47ef496

…않게-하기 Fire 694 로비 참여자 목록에서 중복 유저 보이지 않게 하기

haryung-lee and others added 16 commits October 1, 2022 03:08

FIRE-690 add axios api instance

d55750c

FIRE-690 fix to axios instance

418e9db

FIRE-690 fix lobbysocket

bf9d8ed

Merge pull request #231 from SWM-FIRE/FIRE-690-axios-객체로-만들어두고-재사용

d2cdebb

Fire 690 axios 객체로 만들어두고 재사용

FIRE-697 Add useUser Hook

0375406

Merge branch 'dev' of https://github.com/SWM-FIRE/modoco-frontend int…

ca61279

…o FIRE-697-프로필-창에서-친구-신청을-보낼-수-있다

FIRE-697 add friend relation at profile

c7eaba8

Merge pull request #232 from SWM-FIRE/FIRE-697-프로필-창에서-친구-신청을-보낼-수-있다

ff3fd24

FIRE-697 프로필 창에서 친구 신청을 보낼 수 있다

FIRE-700 disableButton when permission is prompt

46265d4

Merge pull request #233 from SWM-FIRE/FIRE-700-마이크-연결-모달-있을-때-소켓-연결-안…

f602298

…되는-것-수정 FIRE-700 disableButton when permission is prompt

FIRE-702 fix editMyPage

ce69be2

Merge pull request #234 from SWM-FIRE/FIRE-702-마이페이지-수정-리팩토링

60ff28f

FIRE-702 fix editMyPage

FIRE-703 stop fetching friend list everytime

630cd91

FIRE-703 improve UX display

2a2f7b9

FIRE-703 able to go to page through everything

9feb98d

Merge pull request #235 from SWM-FIRE/FIRE-703-로비-프로피-모달-친구-방정보의-방장-에…

9f5318f

…서-프로필-페이지로-이동-가능 FIRE-703-로비-프로피-모달-친구-방정보의-방장-에서-프로필-페이지로-이동-가능

haryung-lee requested a review from 071yoon October 4, 2022 05:19

071yoon approved these changes Oct 4, 2022

View reviewed changes

071yoon merged commit 9b8b5f1 into main Oct 4, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge to main #236

merge to main #236

haryung-lee commented Oct 4, 2022 •

edited

Loading

cypress bot commented Oct 4, 2022

071yoon left a comment

071yoon Oct 4, 2022

merge to main #236

merge to main #236

Conversation

haryung-lee commented Oct 4, 2022 • edited Loading

cypress bot commented Oct 4, 2022

Test summary

Run details

Failures

071yoon left a comment

Choose a reason for hiding this comment

071yoon Oct 4, 2022

Choose a reason for hiding this comment

haryung-lee commented Oct 4, 2022 •

edited

Loading