-
Notifications
You must be signed in to change notification settings - Fork 0
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
[NDD-240] settingpage 라우터 처리 (1h/2h) #98
Merged
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1e340de
remove: 폴더 경로 변경
Yoon-Hae-Min cd66f8e
design: 레이아웃 가장 상위 컴포넌트로 css 병합
Yoon-Hae-Min eb4faab
feat: 이전 상태에 따라 다음 페이지에 넘어가지 못하도록 구현
Yoon-Hae-Min cbb6a15
feat: 페이지가 화면과 소리 설정으로 넘어가야 카메라가 켜지도록 수정
Yoon-Hae-Min a9cea23
feat: useMedia hook 수정
Yoon-Hae-Min eb7b523
style: rem 제거
Yoon-Hae-Min File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
...erSelectionModal/AnswerSelectionModal.tsx → ...erSelectionModal/AnswerSelectionModal.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
21 changes: 0 additions & 21 deletions
21
FE/src/components/interviewSettingPage/VideoSettingBox.tsx
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
import { closeMedia, getMedia, getSupportedMimeTypes } from '@/utils/media'; | ||
import { useState, useEffect, useCallback, useRef } from 'react'; | ||
|
||
const useMedia = () => { | ||
const useMedia = (trigger: boolean = true) => { | ||
const [media, setMedia] = useState<MediaStream | null>(null); | ||
const [selectedMimeType, setSelectedMimeType] = useState(''); | ||
const [connectStatus, setIsConnectedStatus] = useState< | ||
|
@@ -23,7 +23,7 @@ const useMedia = () => { | |
}, []); | ||
|
||
useEffect(() => { | ||
if (!media) { | ||
if (!media && trigger) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [p-5] 이 trigger 플래그는 훅이 수정되면 없어질 부분인거죠?? |
||
void connectMedia(); | ||
} | ||
const mimeTypes = getSupportedMimeTypes(); | ||
|
@@ -32,7 +32,7 @@ const useMedia = () => { | |
return () => { | ||
closeMedia(media); | ||
}; | ||
}, [media, connectMedia]); | ||
}, [media, connectMedia, trigger]); | ||
|
||
return { media, videoRef, connectStatus, selectedMimeType }; | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[p-3] 0에는 단위 빼주세요! 웹스톰에서 경고를 표시해줘서 보기 불편합니다 ㅜㅜ