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 client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"mediasoup-client": "^3.20.0",
"react": "^19.2.7",
"react-dom": "^19.2.7",
"react-router-dom": "^7.18.1",
"react-router": "^8.3.0",
"socket.io-client": "^4.8.3",
"three": "^0.185.1"
},
Expand Down
2 changes: 1 addition & 1 deletion client/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Routes, Route } from 'react-router-dom';
import { Routes, Route } from 'react-router';
import LandingPage from './pages/LandingPage';
import LobbyPage from './pages/LobbyPage';
import RoomPage from './pages/RoomPage';
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/ProtectedRoute.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Navigate, useLocation } from 'react-router-dom';
import { Navigate, useLocation } from 'react-router';
import { Box, CircularProgress } from '@mui/material';
import { useAuth } from '../context/AuthContext';
import type { ReactNode } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/RoomGuard.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { describe, it, expect, vi, beforeEach } from 'vitest';
import { render, screen } from '@testing-library/react';
import { MemoryRouter, Routes, Route } from 'react-router-dom';
import { MemoryRouter, Routes, Route } from 'react-router';
import RoomGuard from './RoomGuard.jsx';
import api from '../api/axios';

Expand Down
2 changes: 1 addition & 1 deletion client/src/components/RoomGuard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createContext, useEffect, useState, type ReactNode } from 'react';
import { useParams, useNavigate, useLocation } from 'react-router-dom';
import { useParams, useNavigate, useLocation } from 'react-router';
import { Box, CircularProgress } from '@mui/material';
import api from '../api/axios';
import CheckMeetingCode from '../pages/CheckMeetingCode';
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/UpcomingMeetings.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, useEffect, useCallback } from 'react';
import { useNavigate } from 'react-router-dom';
import { useNavigate } from 'react-router';
import {
Box, Stack, Typography, Button, IconButton, Menu, MenuItem, ListItemIcon,
CircularProgress, Snackbar, Dialog, DialogTitle, DialogContent, DialogActions,
Expand Down
2 changes: 1 addition & 1 deletion client/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createRoot } from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import { BrowserRouter } from 'react-router';
import { ThemeProvider } from '@mui/material/styles';
import CssBaseline from '@mui/material/CssBaseline';
import theme from './theme/theme';
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/CheckMeetingCode.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useNavigate } from 'react-router-dom';
import { useNavigate } from 'react-router';
import { Box, Button, Link, Paper, Stack, Typography } from '@mui/material';
import { Security as SecurityIcon } from '@mui/icons-material';
import BrandMark from '../components/BrandMark';
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/LandingPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState, type FormEvent } from "react";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { motion } from "framer-motion";
import {
Avatar,
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/LinkDiscordPage.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { render, screen } from '@testing-library/react';
import { MemoryRouter } from 'react-router-dom';
import { MemoryRouter } from 'react-router';
import { ThemeProvider } from '@mui/material/styles';
import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
import theme from '../theme/theme';
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/LinkDiscordPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from 'react';
import { useSearchParams } from 'react-router-dom';
import { useSearchParams } from 'react-router';
import { Box, Button, CircularProgress, Paper, Stack, Typography } from '@mui/material';
import {
CheckCircle as CheckCircleIcon,
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/LobbyPage.test.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';
import { MemoryRouter, Route, Routes } from 'react-router-dom';
import { MemoryRouter, Route, Routes } from 'react-router';
import { ThemeProvider } from '@mui/material/styles';
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
import theme from '../theme/theme';

// Capture router navigation without a real history. useParams stays real so the
// page still reads :roomId from the route.
const navigateMock = vi.fn();
vi.mock('react-router-dom', async (importOriginal) => ({
vi.mock('react-router', async (importOriginal) => ({
...(await importOriginal()),
useNavigate: () => navigateMock,
}));
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/LobbyPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useContext, useEffect, useRef, type MouseEvent, type ElementType } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { useNavigate, useParams } from 'react-router';
import { motion } from 'framer-motion';
import {
Avatar, Box, Button, FormControl,
Expand Down
2 changes: 1 addition & 1 deletion client/src/pages/RoomPage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useContext, useEffect, useRef, useState, type ComponentProps, type FormEvent } from 'react';
import { useParams, useNavigate, useLocation } from 'react-router-dom';
import { useParams, useNavigate, useLocation } from 'react-router';
import {
Alert, Avatar, AvatarGroup, Box, Button, Chip, Dialog, DialogActions,
DialogContent, DialogTitle, IconButton, Popover,
Expand Down
86 changes: 28 additions & 58 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading