Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/room/control-bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Screen from './screen';

const ControlBar = () => {
return (
<div className="p-2 backdrop-blur-sm flex ">
<div className="p-2 backdrop-blur-sm flex">
<div className="flex items-center justify-center md:justify-between gap-2 max-w-4xl mx-auto ">
{/* Left Controls */}
<div className="flex items-center gap-2">
Expand Down
18 changes: 10 additions & 8 deletions src/pages/room/conference.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,17 @@ import DynamicBg from '@/components/dynamic-bg';

export const Conference: React.FC = () => {
return (
<div className=" fixed h-screen w-full flex flex-col overflow-hidden justify-between">
<DynamicBg />
{/* Header */}
<Header />
<div className=" relative h-full w-screen overflow-hidden ">
<div className="fixed h-full w-full flex flex-col justify-between">
<DynamicBg />
{/* Header */}
<Header />

<Display />
{/* Bottom Controls */}
<ControlBar />
<PeerAudioList />
<Display />
{/* Bottom Controls */}
<ControlBar />
<PeerAudioList />
</div>
</div>
);
};
Expand Down
9 changes: 4 additions & 5 deletions src/pages/room/join.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import React, { useEffect } from 'react';

import { useParams } from 'react-router-dom';
import { toast } from 'sonner';
import { useSignaling } from '@/hooks/use-signaling';
import { useRoomActions, useRoomData } from '@/store/conf/hooks';
import JoinForm from '@/components/room/join/join-form';
import Terms from '@/components/room/join/join-terms';
import Header from '@/components/room/join/join-header';
import CameraPreview from '@/components/room/join/join-camera-preview';
import Controls from '../../components/room/join/join-controls';
import { useRoom } from '@/hooks/use-room';
import DynamicBg from '@/components/dynamic-bg';
import { useParams } from 'react-router-dom';
import { toast } from 'sonner';
// import Terms from '@/components/room/join/join-terms';

const JoinRoom: React.FC = () => {
const { signalingService } = useSignaling();
Expand Down Expand Up @@ -48,7 +47,7 @@ const JoinRoom: React.FC = () => {

<JoinForm />

<Terms />
{/* <Terms /> */}
</div>
</div>
);
Expand Down
Loading