Skip to content

Commit

Permalink
Merge pull request #121 from sayyyho/dev
Browse files Browse the repository at this point in the history
Fix: WebRTC UI 수정
  • Loading branch information
sayyyho authored Sep 10, 2024
2 parents 8608dc0 + 29c77f0 commit edb31ae
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 38 deletions.
22 changes: 0 additions & 22 deletions docker-compose-chat-test-db.yml

This file was deleted.

4 changes: 2 additions & 2 deletions src/components/Common/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import Header from "./Header";
import Footer from "./Footer";
import { LayoutContainer, MainContent } from "./Layout.styled";

const Layout = ({ children }) => {
const Layout = ({ children, noneHeader }) => {
return (
<>
<Background></Background>
<LayoutContainer>
<Header />
{!noneHeader && <Header />}
<MainContent>{children}</MainContent>
<Footer />
</LayoutContainer>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Common/miniLayout.styled.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const LayoutContainer = styled.div`
export const HeaderBox = styled.div`
width: 100%;
display: flex;
justify-content: space-around;
justify-content: space-between;
align-items: center;
`;

Expand Down
16 changes: 6 additions & 10 deletions src/pages/WebRTC/VideoPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,8 @@ const RTCPage = () => {
}, [roomName]); // Add roomName to the dependency array to ensure updates

return (
<Layout>
<MiniLayout
text={"000님과의 실시간 커넥션"}
layerWidth={"70%"}
isButton={true}
>
<Layout noneHeader={true}>
<MiniLayout text={"실시간 커넥션"} layerWidth={"70%"} isButton={true}>
<S.VideoLayout>
<div
style={{
Expand All @@ -140,13 +136,13 @@ const RTCPage = () => {
flexDirection: "column",
}}
>
<h1>나의 화면</h1>
<h3>나의 화면</h3>
<video
ref={myVideoRef}
autoPlay
playsInline
style={{
width: "400px",
width: "300px",
borderRadius: "20px",
transform: "rotateY(180deg)",
WebkitTransform: "rotateY(180deg)",
Expand All @@ -162,14 +158,14 @@ const RTCPage = () => {
flexDirection: "column",
}}
>
<h1>000님의 화면</h1>
<h3>상대 화면</h3>

<video
ref={remoteVideoRef}
autoPlay
playsInline
style={{
width: "400px",
width: "300px",
borderRadius: "20px",
transform: "rotateY(180deg)",
WebkitTransform: "rotateY(180deg)",
Expand Down
6 changes: 3 additions & 3 deletions src/pages/WebRTC/style.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ export const VideoLayout = ({ children }) => {
return (
<div
css={css`
height: 50vh;
width: 100%;
width: 50%;
border-radius: 20px;
display: flex;
justify-content: center;
gap: 10rem;
gap: 2rem;
align-items: center;
flex-direction: column;
`}
>
{children}
Expand Down

0 comments on commit edb31ae

Please sign in to comment.