Skip to content

Commit 63c6d1f

Browse files
committed
fix errors due to mui v7 and react-router v7
1 parent 6c04837 commit 63c6d1f

19 files changed

+26
-26
lines changed

frontend/src/components/LoginForm.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { render } from '@testing-library/react'
22
import userEvent from '@testing-library/user-event'
33
import { HttpResponse, http } from 'msw'
44
import { setupServer } from 'msw/node'
5-
import { MemoryRouter } from 'react-router-dom'
5+
import { MemoryRouter } from 'react-router'
66
import { afterAll, afterEach, beforeAll, expect, it } from 'vitest'
77
import { AuthProvider } from '../contexts/auth'
88
import { SnackBarProvider } from '../contexts/snackbar'

frontend/src/components/LoginForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import {
1010
TextField,
1111
Typography,
1212
} from '@mui/material'
13-
import Grid from '@mui/material/Grid2'
13+
import Grid from '@mui/material/Grid'
1414
import { AxiosError } from 'axios'
1515
import { useState } from 'react'
1616
import { SubmitHandler, useForm } from 'react-hook-form'
17-
import { Link as RouterLink, useNavigate } from 'react-router-dom'
17+
import { Link as RouterLink, useNavigate } from 'react-router'
1818
import { useAuth } from '../contexts/auth'
1919
import { useSnackBar } from '../contexts/snackbar'
2020
import { User } from '../models/user'

frontend/src/components/RegisterForm.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { render } from '@testing-library/react'
22
import userEvent from '@testing-library/user-event'
33
import { HttpResponse, http } from 'msw'
44
import { setupServer } from 'msw/node'
5-
import { MemoryRouter } from 'react-router-dom'
5+
import { MemoryRouter } from 'react-router'
66
import { afterAll, afterEach, beforeAll, expect, it } from 'vitest'
77
import { AuthProvider } from '../contexts/auth'
88
import { SnackBarProvider } from '../contexts/snackbar'

frontend/src/components/RegisterForm.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import LockOutlinedIcon from '@mui/icons-material/LockOutlined'
22
import { Avatar, Box, Button, Collapse, Link, TextField, Typography } from '@mui/material'
3-
import Grid from '@mui/material/Grid2'
3+
import Grid from '@mui/material/Grid'
44
import { AxiosError } from 'axios'
55
import { useState } from 'react'
66
import { SubmitHandler, useForm } from 'react-hook-form'
7-
import { Link as RouterLink, useNavigate } from 'react-router-dom'
7+
import { Link as RouterLink, useNavigate } from 'react-router'
88
import { useSnackBar } from '../contexts/snackbar'
99
import { User } from '../models/user'
1010
import authService from '../services/auth.service'

frontend/src/components/TopMenuBar.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { render, waitFor } from '@testing-library/react'
22
import userEvent from '@testing-library/user-event'
33
import { HttpResponse, http } from 'msw'
44
import { setupServer } from 'msw/node'
5-
import { RouterProvider, createMemoryRouter } from 'react-router-dom'
5+
import { RouterProvider, createMemoryRouter } from 'react-router'
66
import { afterAll, afterEach, beforeAll, expect, it } from 'vitest'
77
import { AuthProvider } from '../contexts/auth'
88
import { SnackBarProvider } from '../contexts/snackbar'

frontend/src/components/TopMenuBar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
Typography,
1616
} from '@mui/material'
1717
import * as React from 'react'
18-
import { NavLink, useNavigate } from 'react-router-dom'
18+
import { NavLink, useNavigate } from 'react-router'
1919
import { useAuth } from '../contexts/auth'
2020

2121
export default function TopMenuBar() {

frontend/src/components/UserProfile.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { render, waitFor } from '@testing-library/react'
22
import userEvent from '@testing-library/user-event'
33
import { HttpResponse, http } from 'msw'
44
import { setupServer } from 'msw/node'
5-
import { MemoryRouter } from 'react-router-dom'
5+
import { MemoryRouter } from 'react-router'
66
import { afterAll, afterEach, beforeAll, expect, it, vi } from 'vitest'
77
import { AuthProvider } from '../contexts/auth'
88
import { SnackBarProvider } from '../contexts/snackbar'

frontend/src/components/UserProfile.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import {
1111
IconButton,
1212
TextField,
1313
} from '@mui/material'
14-
import Grid from '@mui/material/Grid2'
14+
import Grid from '@mui/material/Grid'
1515
import { AxiosError } from 'axios'
1616
import { useEffect, useState } from 'react'
1717
import { SubmitHandler, useForm } from 'react-hook-form'
18-
import { useNavigate } from 'react-router-dom'
18+
import { useNavigate } from 'react-router'
1919
import { useAuth } from '../contexts/auth'
2020
import { useSnackBar } from '../contexts/snackbar'
2121
import { User } from '../models/user'

frontend/src/error-page.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Button, Card, CardActions, CardContent, Typography } from '@mui/material'
2-
import Grid from '@mui/material/Grid2'
3-
import { isRouteErrorResponse, Link as RouterLink, useRouteError } from 'react-router-dom'
2+
import Grid from '@mui/material/Grid'
3+
import { isRouteErrorResponse, Link as RouterLink, useRouteError } from 'react-router'
44

55
interface Error {
66
status: number

frontend/src/main.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import './axios'
22
import React from 'react'
33
import ReactDOM from 'react-dom/client'
4-
import { RouterProvider } from 'react-router-dom'
4+
import { RouterProvider } from 'react-router'
55
import ReactGA from 'react-ga4'
66
import CssBaseline from '@mui/material/CssBaseline'
77
import { ThemeProvider } from '@mui/material/styles'

0 commit comments

Comments
 (0)