mostly done liveblocks integration

This commit is contained in:
Ishaan Dey
2024-05-03 14:27:45 -07:00
parent 0f1654e3dd
commit a18bcf9c14
7 changed files with 147 additions and 49 deletions

View File

@ -1,5 +1,5 @@
import Navbar from "@/components/editor/navbar"
import { Room } from "@/components/editor/room"
import { Room } from "@/components/editor/live/room"
import { Sandbox, User, UsersToSandboxes } from "@/lib/types"
import { currentUser } from "@clerk/nextjs"
import dynamic from "next/dynamic"
@ -49,12 +49,12 @@ export default async function CodePage({ params }: { params: { id: string } }) {
return (
<div className="overflow-hidden overscroll-none w-screen flex flex-col h-screen bg-background">
{/* <Room> */}
<Navbar userData={userData} sandboxData={sandboxData} shared={shared} />
<div className="w-screen flex grow">
<CodeEditor userData={userData} sandboxId={sandboxId} />
</div>
{/* </Room> */}
<Room id={sandboxId}>
<Navbar userData={userData} sandboxData={sandboxData} shared={shared} />
<div className="w-screen flex grow">
<CodeEditor userData={userData} sandboxId={sandboxId} />
</div>
</Room>
</div>
)
}

View File

@ -23,7 +23,6 @@ export async function POST(request: NextRequest) {
// userInfo is made available in Liveblocks presence hooks, e.g. useOthers
const session = liveblocks.prepareSession(user.id, {
userInfo: {
id: user.id,
name: user.name,
email: user.email,
},