diff --git a/frontend/bun.lock b/frontend/bun.lock index 9c9bfea..278db6f 100644 --- a/frontend/bun.lock +++ b/frontend/bun.lock @@ -22,7 +22,7 @@ "react": "^19.1.0", "react-dom": "^19.1.0", "react-icons": "^5.5.0", - "react-router-dom": "^7.7.1", + "react-router": "^7.7.1", "shiki": "^3.8.1", "socket.io-client": "^4.8.1", "typescript": "^5.8.3", @@ -451,8 +451,6 @@ "react-router": ["react-router@7.7.1", "", { "dependencies": { "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" }, "optionalPeers": ["react-dom"] }, "sha512-jVKHXoWRIsD/qS6lvGveckwb862EekvapdHJN/cGmzw40KnJH5gg53ujOJ4qX6EKIK9LSBfFed/xiQ5yeXNrUA=="], - "react-router-dom": ["react-router-dom@7.7.1", "", { "dependencies": { "react-router": "7.7.1" }, "peerDependencies": { "react": ">=18", "react-dom": ">=18" } }, "sha512-bavdk2BA5r3MYalGKZ01u8PGuDBloQmzpBZVhDLrOOv1N943Wq6dcM9GhB3x8b7AbqPMEezauv4PeGkAJfy7FQ=="], - "react-style-singleton": ["react-style-singleton@2.2.3", "", { "dependencies": { "get-nonce": "^1.0.0", "tslib": "^2.0.0" }, "peerDependencies": { "@types/react": "*", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react"] }, "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ=="], "react-textarea-autosize": ["react-textarea-autosize@8.5.9", "", { "dependencies": { "@babel/runtime": "^7.20.13", "use-composed-ref": "^1.3.0", "use-latest": "^1.2.1" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-U1DGlIQN5AwgjTyOEnI1oCcMuEr1pv1qOtklB2l4nyMGbHzWrI0eFsYK0zos2YWqAolJyG0IWJaqWmWj5ETh0A=="], diff --git a/frontend/package.json b/frontend/package.json index 74877ac..1c72be7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -22,7 +22,7 @@ "react": "^19.1.0", "react-dom": "^19.1.0", "react-icons": "^5.5.0", - "react-router-dom": "^7.7.1", + "react-router": "^7.7.1", "shiki": "^3.8.1", "socket.io-client": "^4.8.1", "typescript": "^5.8.3", diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 547b8d4..cd8faaa 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -2,7 +2,7 @@ import { Button, Group, Loader, LoadingOverlay, Notification, Space, PasswordInp import { useForm } from '@mantine/form'; import { useEffect, useState } from 'react'; import { ImCross } from 'react-icons/im'; -import { Outlet, Route, Routes } from 'react-router-dom'; +import { Outlet, Route, Routes } from 'react-router'; import MainLayout from './components/MainLayout'; import { PasswordSend, ServerStatusResponse } from './js/models'; import { errorNotify, getstatus, HomeRedirector, IS_DEV, login, setpassword, socketio } from './js/utils'; diff --git a/frontend/src/components/Header/index.tsx b/frontend/src/components/Header/index.tsx index 02f5f6a..105845e 100644 --- a/frontend/src/components/Header/index.tsx +++ b/frontend/src/components/Header/index.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { ActionIcon, Divider, Image, Menu, Tooltip, Burger, Space, AppShell, Box, Title } from '@mantine/core'; import { errorNotify, getMainPath, isLargeScreen, logout } from '../../js/utils'; import { AiFillHome } from "react-icons/ai" -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { FaLock } from 'react-icons/fa'; import { MdOutlineSettingsBackupRestore } from 'react-icons/md'; import { ImExit } from 'react-icons/im'; diff --git a/frontend/src/components/MainLayout.tsx b/frontend/src/components/MainLayout.tsx index df3ca63..12b4811 100644 --- a/frontend/src/components/MainLayout.tsx +++ b/frontend/src/components/MainLayout.tsx @@ -4,7 +4,7 @@ import { AppShell } from '@mantine/core'; import NavBar from './NavBar'; import HeaderPage from './Header'; import { getMainPath } from '../js/utils'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router'; import { useNavbarStore } from '../js/store'; import { HiMenu } from "react-icons/hi"; diff --git a/frontend/src/components/NavBar/index.tsx b/frontend/src/components/NavBar/index.tsx index ca00a25..bd7aec4 100644 --- a/frontend/src/components/NavBar/index.tsx +++ b/frontend/src/components/NavBar/index.tsx @@ -1,7 +1,7 @@ import { Divider, Group, MantineColor, ScrollArea, Text, ThemeIcon, Title, UnstyledButton, Box, AppShell } from "@mantine/core"; import { useState } from "react"; import { TbPlugConnected } from "react-icons/tb"; -import { useNavigate } from "react-router-dom"; +import { useNavigate } from "react-router"; import { GrDirections } from "react-icons/gr"; import { PiWallLight } from "react-icons/pi"; import { useNavbarStore } from "../../js/store"; diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index 67b3cf9..3694194 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -1,5 +1,5 @@ import ReactDOM from 'react-dom/client'; -import { BrowserRouter } from "react-router-dom" +import { BrowserRouter } from "react-router" import App from './App'; import { MantineProvider } from '@mantine/core'; import { Notifications } from '@mantine/notifications'; diff --git a/frontend/src/js/utils.tsx b/frontend/src/js/utils.tsx index 0999b95..4fafe54 100644 --- a/frontend/src/js/utils.tsx +++ b/frontend/src/js/utils.tsx @@ -1,7 +1,7 @@ import { showNotification } from "@mantine/notifications"; import { ImCross } from "react-icons/im"; import { TiTick } from "react-icons/ti" -import { Navigate } from "react-router-dom"; +import { Navigate } from "react-router"; import { ChangePassword, IpInterface, LoginResponse, PasswordSend, ServerResponse, ServerResponseToken, ServerStatusResponse } from "./models"; import { Buffer } from "buffer" import { QueryClient, useQuery } from "@tanstack/react-query"; diff --git a/frontend/src/pages/NFProxy/ServiceDetails.tsx b/frontend/src/pages/NFProxy/ServiceDetails.tsx index a4b89e2..3533bc6 100644 --- a/frontend/src/pages/NFProxy/ServiceDetails.tsx +++ b/frontend/src/pages/NFProxy/ServiceDetails.tsx @@ -1,5 +1,5 @@ import { ActionIcon, Box, Code, Grid, LoadingOverlay, Space, Title, Tooltip } from '@mantine/core'; -import { Navigate, useNavigate, useParams } from 'react-router-dom'; +import { Navigate, useNavigate, useParams } from 'react-router'; import { Badge, Divider, Menu } from '@mantine/core'; import { useEffect, useState } from 'react'; import { FaFilter, FaPencilAlt, FaPlay, FaStop } from 'react-icons/fa'; diff --git a/frontend/src/pages/NFProxy/index.tsx b/frontend/src/pages/NFProxy/index.tsx index 0529fa8..df69d95 100644 --- a/frontend/src/pages/NFProxy/index.tsx +++ b/frontend/src/pages/NFProxy/index.tsx @@ -1,7 +1,7 @@ import { ActionIcon, Badge, Box, Code, LoadingOverlay, Space, ThemeIcon, Title, Tooltip } from '@mantine/core'; import { useEffect, useState } from 'react'; import { BsPlusLg } from "react-icons/bs"; -import { useNavigate, useParams } from 'react-router-dom'; +import { useNavigate, useParams } from 'react-router'; import ServiceRow from '../../components/NFProxy/ServiceRow'; import { errorNotify, getErrorMessage, isMediumScreen } from '../../js/utils'; import AddEditService from '../../components/NFProxy/AddEditService'; diff --git a/frontend/src/pages/NFRegex/ServiceDetails.tsx b/frontend/src/pages/NFRegex/ServiceDetails.tsx index 7b3b806..c68f814 100644 --- a/frontend/src/pages/NFRegex/ServiceDetails.tsx +++ b/frontend/src/pages/NFRegex/ServiceDetails.tsx @@ -1,5 +1,5 @@ import { ActionIcon, Box, Grid, LoadingOverlay, Space, Title, Tooltip } from '@mantine/core'; -import { Navigate, useNavigate, useParams } from 'react-router-dom'; +import { Navigate, useNavigate, useParams } from 'react-router'; import RegexView from '../../components/RegexView'; import AddNewRegex from '../../components/AddNewRegex'; import { BsPlusLg } from "react-icons/bs"; diff --git a/frontend/src/pages/NFRegex/index.tsx b/frontend/src/pages/NFRegex/index.tsx index f51ed03..7903b74 100644 --- a/frontend/src/pages/NFRegex/index.tsx +++ b/frontend/src/pages/NFRegex/index.tsx @@ -1,7 +1,7 @@ import { ActionIcon, Badge, Box, LoadingOverlay, Space, ThemeIcon, Title, Tooltip } from '@mantine/core'; import { useEffect, useState } from 'react'; import { BsPlusLg, BsRegex } from "react-icons/bs"; -import { useNavigate, useParams } from 'react-router-dom'; +import { useNavigate, useParams } from 'react-router'; import ServiceRow from '../../components/NFRegex/ServiceRow'; import { nfregexServiceQuery } from '../../components/NFRegex/utils'; import { errorNotify, getErrorMessage, isMediumScreen } from '../../js/utils';