Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
35b3f14
🐋 chore: (FE) - service 경로 alias 추가 및 순서 변경
bh2980 Dec 2, 2022
fadcb41
🐋 chore: (FE) - oauth constant 추출 및 반영
bh2980 Dec 2, 2022
cea5e8b
🐋 chore: (FE) - event type 상수화
bh2980 Dec 2, 2022
5ce7e93
🐋 chore: (FE) - user type 선언
bh2980 Dec 2, 2022
f20538c
✨ feat: (FE) - socket emit 추상화 함수 선언
bh2980 Dec 2, 2022
9df56fb
🛠️ refactor: (FE) - Landing 페이지 socket emit 추상화 함수 반영
bh2980 Dec 2, 2022
07756a5
🐋 chore: (FE) - socketEmit에 디버깅용 주석 추가
bh2980 Dec 2, 2022
b281a40
🐋 chore: (FE) - svg 파일 업데이트
bh2980 Dec 2, 2022
7a92562
🐋 chore: (FE) - globalStyle에 .App 가로 세로 100% 반영
bh2980 Dec 2, 2022
0932055
🐋 chore: (FE) - svg 변경사항 반영
bh2980 Dec 2, 2022
8a3c596
🐋 chore: (FE) - Landing 페이지 1차 마크업
bh2980 Dec 2, 2022
3543a85
🐞 fix: (FE) - webRTC close 안되는 문제 수정
bh2980 Dec 2, 2022
bd629e9
✨ feat: (FE) - streamSelector 구조 변경 및 Lobby에 반영
bh2980 Dec 2, 2022
66332dc
✨ feat: (FE) - interviewee video에 offset 추가
bh2980 Dec 3, 2022
c56f337
✨ feat: (FE) - userRoleSelector 추가
bh2980 Dec 3, 2022
dee0416
✨ feat: (FE) - interviewer 실시간 피드백 추가 기능 구현
bh2980 Dec 3, 2022
cb8b4a5
✨ feat: (FE) - 인터뷰로 넘어갈 경우 User 역할 저장 로직 구현
bh2980 Dec 3, 2022
f0542e1
Merge pull request #87 from boostcampwm-2022/55-landing-page-구현
seyoung8239 Dec 3, 2022
4c2a15d
🐞 fix: (FE) - safeNavigator 타이밍 문제
seyoung8239 Dec 3, 2022
09a8398
Merge branch 'dev' into 75-lobby에-be-api-붙이기
bh2980 Dec 4, 2022
7e18a5c
🐋 chore: (FE) - api alias 추가
bh2980 Dec 4, 2022
66955ed
🐞 fix: (FE) - socket callback 내 others 반영 안되는 에러 fix
bh2980 Dec 4, 2022
d48956f
🐋 chore: (FE) - phase -> page로 이름 변경
seyoung8239 Dec 4, 2022
e001fb0
Merge pull request #97 from boostcampwm-2022/96-라우팅-타이밍-문제-수정
bh2980 Dec 4, 2022
d8ccc6a
🐋 chore: (FE) - primary3 color 변경
bh2980 Dec 4, 2022
0a2823b
🐋 chore: (FE) - svg 업데이트
bh2980 Dec 4, 2022
3520a11
🐋 chore: (FE) - OAuth 버튼 버튼 태그로 변경
bh2980 Dec 4, 2022
f6faea2
🐋 chore: (FE) - svg 업데이트
bh2980 Dec 4, 2022
b4069ad
🐋 chore: (FE) - oauth svg width, height 삭제
bh2980 Dec 4, 2022
cdf41b1
🐋 chore: (FE) - border-box 설정
bh2980 Dec 4, 2022
33fad0b
🐋 chore: (FE) - 색상코드 변경 반영
bh2980 Dec 4, 2022
12e4bd1
🐋 chore: (FE) - styles alias 반영
bh2980 Dec 4, 2022
b7c51e5
🐋 chore: (FE) - storybook에 기본 테마 반영
bh2980 Dec 4, 2022
70e6c79
✨ feat: (FE) - Button 컴포넌트 개발
bh2980 Dec 4, 2022
c14ab26
✨ feat: (FE) - onClick, justifyContent 속성 추가
bh2980 Dec 4, 2022
8dc9294
Merge branch '102-button-컴포넌트-만들기' into 101-login-페이지-2차-마크업
bh2980 Dec 4, 2022
24d5d60
🐋 chore: (FE) - oauth svg 업데이트
bh2980 Dec 4, 2022
2f45424
🐋 chore: (FE) - 로그인 페이지 2차 마크업
bh2980 Dec 4, 2022
9cc2bff
🐋 chore: (FE) - theme에 secondary 색상코드 변경 반영
bh2980 Dec 5, 2022
389c0d5
🛠️ refactor: (BE) - join interview에 interviewee 값 전달
punkryn Dec 5, 2022
1e74c66
Merge pull request #109 from boostcampwm-2022/108-join-interview-값-전달
bh2980 Dec 5, 2022
3380296
🐋 chore: (FE) - Merge from dev
bh2980 Dec 5, 2022
50bf4c3
Merge pull request #103 from boostcampwm-2022/102-button-컴포넌트-만들기
seyoung8239 Dec 5, 2022
35074a4
Merge branch 'dev' into 75-lobby에-be-api-붙이기
bh2980 Dec 5, 2022
f4389a3
Merge pull request #94 from boostcampwm-2022/75-lobby에-be-api-붙이기
punkryn Dec 5, 2022
a90b9bb
Merge pull request #104 from boostcampwm-2022/101-login-페이지-2차-마크업
seyoung8239 Dec 5, 2022
b3a47d0
🐋 chore: (FE) - Merge from dev
bh2980 Dec 5, 2022
efe39b5
Merge branch 'dev' into 85-interviewer-페이지-로직-만들기
bh2980 Dec 5, 2022
0ce461a
🐞 fix: (FE) - page.constant 변경사항 반영
bh2980 Dec 5, 2022
9cff472
Merge branch 'dev' of https://github.com/boostcampwm-2022/web14-inter…
punkryn Dec 5, 2022
f77464b
🐞 fix: (FE) - lobby phase -> page 수정
punkryn Dec 5, 2022
edad6a6
🐞 fix: (FE) - interviewee에도 join_interview 이벤트 전송하는 문제 수정
bh2980 Dec 5, 2022
2a071d3
🐞 fix: (FE) - interviewee에서 video 불러오는 방식 수정
bh2980 Dec 5, 2022
5847431
Merge pull request #95 from boostcampwm-2022/85-interviewer-페이지-로직-만들기
punkryn Dec 5, 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
1 change: 1 addition & 0 deletions backend/socket/@types/woowa-babble.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
declare module '@woowa-babble/random-nickname';
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class InterviewService {
this.roomRepository.updateRoomPhase({ roomUUID, phase: ROOM_PHASE.INTERVIEW });
this.updateUsersRoleAtStartInterview({ emitter: user, users: usersInRoom });

server.to(roomUUID).emit(EVENT.JOIN_INTERVIEW);
client.to(roomUUID).emit(EVENT.JOIN_INTERVIEW, { user });

return {};
}
Expand Down
8 changes: 5 additions & 3 deletions frontend/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,16 @@ module.exports = {
...config.resolve.alias,
'@assets': path.resolve(__dirname, '../src/assets'),
'@components': path.resolve(__dirname, '../src/components'),
'@constants': path.resolve(__dirname, '../src/constants'),
'@customType': path.resolve(__dirname, '../src/customType'),
'@hooks': path.resolve(__dirname, '../src/hooks'),
'@layout': path.resolve(__dirname, '../src/layout'),
'@pages': path.resolve(__dirname, '../src/pages'),
'@customType': path.resolve(__dirname, '../src/customType'),
'@routes': path.resolve(__dirname, '../src/routes'),
'@service': path.resolve(__dirname, '../src/service'),
'@store': path.resolve(__dirname, '../src/store'),
'@styles': path.resolve(__dirname, '../src/styles'),
'@utils': path.resolve(__dirname, '../src/utils'),
'@routes': path.resolve(__dirname, '../src/routes'),
'@constants': path.resolve(__dirname, '../src/constants'),
};

return config;
Expand Down
8 changes: 7 additions & 1 deletion frontend/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import { Global, ThemeProvider, css } from '@emotion/react';
import { RecoilRoot } from 'recoil';
import globalStyle from '../src/styles/globalStyle';
import theme from '../src/styles/theme';

export const parameters = {
actions: { argTypesRegex: '^on[A-Z].*' },
Expand All @@ -13,7 +16,10 @@ export const parameters = {
export const decorators = [
(Story) => (
<RecoilRoot>
<Story />
<ThemeProvider theme={theme}>
<Global styles={globalStyle} />
<Story />
</ThemeProvider>
</RecoilRoot>
),
];
4 changes: 2 additions & 2 deletions frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import { Global, ThemeProvider } from '@emotion/react';
import { BrowserRouter } from 'react-router-dom';

import RootRoutes from '@routes/RootRoutes';
import globalStyle from './styles/globalStyle';
import theme from './styles/theme';
import globalStyle from '@styles/globalStyle';
import theme from '@styles/theme';

function App() {
return (
Expand Down
24 changes: 24 additions & 0 deletions frontend/src/api/socket.api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { socket } from '@service/socket';

interface socketResponseType<T> {
success: boolean;
data?: T;
message?: string;
}

export const socketEmit = <T>(event, data?: T) => {
return new Promise<T>((resolve) => {
socket.emit(event, data, ({ success, data, message }: socketResponseType<T>) => {
console.log('socket.api', success, data, message);
if (!success) {
//TODO 여기서 에러 처리
//모달을 띄우던 -> useModal
//NOT Found 같은 에러 페이지로 이동 하던. -> throw Error -> React Error Boundary
alert(message);
return;
}

resolve(data);
});
});
};
1 change: 1 addition & 0 deletions frontend/src/assets/error.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 22 additions & 1 deletion frontend/src/assets/icon/broadcast.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 11 additions & 1 deletion frontend/src/assets/icon/camera_off.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 2 additions & 5 deletions frontend/src/assets/icon/camera_on.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion frontend/src/assets/icon/chat.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions frontend/src/assets/icon/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 3 additions & 7 deletions frontend/src/assets/icon/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions frontend/src/assets/icon/copy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion frontend/src/assets/icon/delete.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 11 additions & 1 deletion frontend/src/assets/icon/download.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 9 additions & 1 deletion frontend/src/assets/icon/edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading