Skip to content
Open
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
11 changes: 8 additions & 3 deletions frontend/src/components/room/CodeEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ interface CodeEditorProps {
userName: string;
cursorPosition: {
lineNumber: number;
column: number
column: number
} | null;
selection: {
startLineNumber: number;
Expand All @@ -61,12 +61,17 @@ interface CodeEditorProps {
endColumn: number;
} | null;
}>;
initialLanguage: string;
}

function CodeEditor({ code, setCode, ws, roomId, interviewType, users }: CodeEditorProps) {
function CodeEditor({ code, setCode, ws, roomId, interviewType, users, initialLanguage }: CodeEditorProps) {
const { isDark } = useContext(DarkModeContext);
const { userId } = useContext(UserContext);
const [language, setLanguage] = useState<Language>(interviewType === 'leetcode' ? 'python' : 'react');
const isKnownLanguage = (lang: string): lang is Language =>
LANGUAGE_OPTIONS.some(opt => opt.value === lang);
const [language, setLanguage] = useState<Language>(
isKnownLanguage(initialLanguage) ? initialLanguage : interviewType === 'leetcode' ? 'python' : 'react'
);
const [langDropdownOpen, setLangDropdownOpen] = useState(false);
const [runOutput, setRunOutput] = useState<RunOutput | null>(null);
const [isRunning, setIsRunning] = useState(false);
Expand Down
12 changes: 11 additions & 1 deletion frontend/src/components/room/RoomPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ function RoomPage({ interviewType: propInterviewType }: RoomPageProps) {
const { roomId } = useParams<{ roomId: string }>();
const navigate = useNavigate();
const location = useLocation();
const interviewType: InterviewType = (location.state as { interviewType?: InterviewType })?.interviewType ?? propInterviewType ?? 'react';
const fallbackInterviewType: InterviewType =
(location.state as { interviewType?: InterviewType })?.interviewType ?? propInterviewType ?? 'react';
const { isDark } = useContext(DarkModeContext);
const { userId } = useContext(UserContext);
const [userName, setUserName] = useState('');
Expand All @@ -25,6 +26,8 @@ function RoomPage({ interviewType: propInterviewType }: RoomPageProps) {
const [showPopup, setShowPopup] = useState(false);
const [roomName, setRoomName] = useState('sce interview');
const [code, setCode] = useState(DEFAULT_CODE);
const [language, setLanguage] = useState<string>(fallbackInterviewType === 'leetcode' ? 'python' : 'react');
const [interviewType, setInterviewType] = useState<InterviewType>(fallbackInterviewType);
const [ws, setWs] = useState<WebSocket | null>(null);
const [users, setUsers] = useState<Array<{
userId: string;
Expand Down Expand Up @@ -54,6 +57,9 @@ function RoomPage({ interviewType: propInterviewType }: RoomPageProps) {
setRoomName(response.data.roomName || 'sce interview');
setCode(response.data.document || DEFAULT_CODE);
setUsers(response.data.users || []);
const serverLanguage: string = response.data.language || (fallbackInterviewType === 'leetcode' ? 'python' : 'react');
setLanguage(serverLanguage);
setInterviewType(serverLanguage === 'react' ? 'react' : 'leetcode');
const now = new Date().getTime();
const expiry = now + (24 * 60 * 60 * 1000);
const data = JSON.stringify({ userName, expiry });
Expand Down Expand Up @@ -111,6 +117,9 @@ function RoomPage({ interviewType: propInterviewType }: RoomPageProps) {
setRoomName(response.data.roomName || 'sce interview');
setCode(response.data.document || DEFAULT_CODE);
setUsers(response.data.users || []);
const serverLanguage: string = response.data.language || (fallbackInterviewType === 'leetcode' ? 'python' : 'react');
setLanguage(serverLanguage);
setInterviewType(serverLanguage === 'react' ? 'react' : 'leetcode');
setUserName(storedUserName);
setIsJoined(true);

Expand Down Expand Up @@ -329,6 +338,7 @@ function RoomPage({ interviewType: propInterviewType }: RoomPageProps) {
roomId={roomId!}
interviewType={interviewType}
users={users}
initialLanguage={language}
/>
{/* Toast notifications */}
<div className="fixed bottom-4 right-4 flex flex-col gap-2 z-50">
Expand Down
Loading