Compare commits

..

3 Commits

Author SHA1 Message Date
6be2c02506 fix: socket connection 2024-09-01 22:04:56 -04:00
1d92b6ea6f chore: removed logs, added comments 2024-09-01 20:06:11 -04:00
f683ff6480 fix: files not loading when creating a new project
This push contains console logs at various places where the server is emitting the event and the client is receiving the event. Please remove those before merging with production.
2024-08-31 20:31:20 -04:00
6 changed files with 35 additions and 42 deletions

View File

@ -6,7 +6,6 @@ import { notFound, redirect } from "next/navigation"
import Loading from "@/components/editor/loading"
import dynamic from "next/dynamic"
import fs from "fs"
import { TerminalProvider } from "@/context/TerminalContext"
export const revalidate = 0
@ -88,10 +87,8 @@ 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 id={sandboxId}>
<TerminalProvider>
<Navbar userData={userData} sandboxData={sandboxData} shared={shared} />
<div className="w-screen flex grow">
<CodeEditor
@ -99,9 +96,7 @@ export default async function CodePage({ params }: { params: { id: string } }) {
sandboxData={sandboxData}
/>
</div>
</TerminalProvider>
</Room>
</div>
</>
)
}

View File

@ -6,6 +6,7 @@ import { ThemeProvider } from "@/components/layout/themeProvider"
import { ClerkProvider } from "@clerk/nextjs"
import { Toaster } from "@/components/ui/sonner"
import { Analytics } from "@vercel/analytics/react"
import { TerminalProvider } from '@/context/TerminalContext';
import { PreviewProvider } from "@/context/PreviewContext";
import { SocketProvider } from '@/context/SocketContext'
@ -31,7 +32,9 @@ export default function RootLayout({
>
<SocketProvider>
<PreviewProvider>
<TerminalProvider>
{children}
</TerminalProvider>
</PreviewProvider>
</SocketProvider>
<Analytics />

View File

@ -51,7 +51,7 @@ export default function Dashboard({
useEffect(() => { // update the dashboard to show a new project
router.refresh()
}, [])
}, [sandboxes])
return (
<>

View File

@ -1,48 +1,37 @@
"use client"
import { SetStateAction, useCallback, useEffect, useRef, useState } from "react"
import { Sandbox, User, TFile, TFolder, TTab } from "@/lib/types"
// Authentication
import monaco from "monaco-editor"
import Editor, { BeforeMount, OnMount } from "@monaco-editor/react"
import { toast } from "sonner"
import { useClerk } from "@clerk/nextjs"
// Liveblocks
import * as Y from "yjs"
import LiveblocksProvider from "@liveblocks/yjs"
import { MonacoBinding } from "y-monaco"
import { Awareness } from "y-protocols/awareness"
import { TypedLiveblocksProvider, useRoom, useSelf } from "@/liveblocks.config"
// Icons
import { FileJson, Loader2, TerminalSquare } from "lucide-react"
// Contexts
import { PreviewProvider, usePreview } from '@/context/PreviewContext';
import { useSocket } from "@/context/SocketContext"
// External Components
import monaco from "monaco-editor"
import { Terminal } from "@xterm/xterm"
import Editor, { BeforeMount, OnMount } from "@monaco-editor/react"
import { toast } from "sonner"
import {
ResizableHandle,
ResizablePanel,
ResizablePanelGroup,
} from "@/components/ui/resizable"
import { ImperativePanelHandle } from "react-resizable-panels"
// Editor Components
import { FileJson, Loader2, TerminalSquare } from "lucide-react"
import Tab from "../ui/tab"
import Sidebar from "./sidebar"
import GenerateInput from "./generate"
import { Sandbox, User, TFile, TFolder, TTab } from "@/lib/types"
import { addNew, processFileType, validateName, debounce } from "@/lib/utils"
import { Cursors } from "./live/cursors"
import { Terminal } from "@xterm/xterm"
import DisableAccessModal from "./live/disableModal"
import Loading from "./loading"
import PreviewWindow from "./preview"
import Terminals from "./terminals"
import { ImperativePanelHandle } from "react-resizable-panels"
import { PreviewProvider, usePreview } from '@/context/PreviewContext';
import { useSocket } from "@/context/SocketContext"
export default function CodeEditor({
userData,
@ -52,17 +41,22 @@ export default function CodeEditor({
sandboxData: Sandbox
}) {
// Socket to the backend server
//SocketContext functions and effects
const { socket, setUserAndSandboxId } = useSocket();
useEffect(() => {
// Pass the user and sandbox ID to the socket, causing the socket to be created and to connect.
setUserAndSandboxId(userData.id, sandboxData.id);
}, []);
// Ensure userData.id and sandboxData.id are available before attempting to connect
if (userData.id && sandboxData.id) {
// Check if the socket is not initialized or not connected
if (!socket || (socket && !socket.connected)) {
// Initialize socket connection
setUserAndSandboxId(userData.id, sandboxData.id);
}
}
}, [socket, userData.id, sandboxData.id, setUserAndSandboxId]);
// Preview panel state
//Preview Button state
const [isPreviewCollapsed, setIsPreviewCollapsed] = useState(true)
// When the owner closes the project, isDisabled gets set for the other users.
const [disableAccess, setDisableAccess] = useState({
isDisabled: false,
message: "",
@ -497,13 +491,14 @@ export default function CodeEditor({
const fileCache = useRef(new Map());
// Debounced function to get file content
const debouncedGetFile =
(tabId: any, callback: any) => {
socket?.emit('getFile', tabId, callback);
} // 300ms debounce delay, adjust as needed
const selectFile = (tab: TTab) => {
const debouncedGetFile = useCallback(
debounce((tabId, callback) => {
socket?.emit('getFile', tabId, callback);
}, 300), // 300ms debounce delay, adjust as needed
[]
);
const selectFile = useCallback((tab: TTab) => {
if (tab.id === activeFileId) return;
setGenerate((prev) => ({ ...prev, show: false }));
@ -528,7 +523,7 @@ export default function CodeEditor({
setEditorLanguage(processFileType(tab.name));
setActiveFileId(tab.id);
};
}, [activeFileId, tabs, debouncedGetFile]);
// Close tab and remove from tabs
const closeTab = (id: string) => {

View File

@ -27,7 +27,7 @@ export default function Navbar({
const [isShareOpen, setIsShareOpen] = useState(false);
const [isRunning, setIsRunning] = useState(false);
const isOwner = sandboxData.userId === userData.id;
const isOwner = sandboxData.userId === userData.id;;
return (
<>

View File

@ -44,7 +44,7 @@ export default function RunButtonModal({
"pip install -r requirements.txt && streamlit run main.py --server.runOnSave true"
);
} else {
createNewTerminal("yarn install && yarn dev");
createNewTerminal("yarn install && yarn dev");
}
} else {
toast.error("You reached the maximum # of terminals.");