Skip to content

Commit 2e8fa23

Browse files
Merge pull request #347 from shivarm/upgrade-react-router
chore: use latest react-router
2 parents 03c46f5 + 191d4f1 commit 2e8fa23

File tree

11 files changed

+1082
-18432
lines changed

11 files changed

+1082
-18432
lines changed

package-lock.json

Lines changed: 1072 additions & 18422 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"react-icons": "^5.3.0",
2424
"react-img-mapper": "^1.5.1",
2525
"react-markdown": "^9.0.1",
26-
"react-router-dom": "^7.0.1",
26+
"react-router": "^7.5.3",
2727
"react-social-icons": "^6.18.0",
2828
"swiper": "^11.1.15",
2929
"web-vitals": "^4.2.4"

src/App.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
-Fakidis
3636
3737
*/
38-
import { Routes, Route } from "react-router-dom";
38+
import { Routes, Route } from "react-router";
3939
import HomePage from "./pages/HomePage";
4040
import Header from "./components/Header";
4141
import { useEffect } from "react";

src/components/Header.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*/
3838

3939
import { useEffect, useState } from "react";
40-
import { Outlet, useNavigate, useLocation } from "react-router-dom";
40+
import { Outlet, useNavigate, useLocation } from "react-router";
4141
import myUOMLogo from "../assets/myUOMLogo.png";
4242
import { Flex, Box, Heading, Image, useColorModeValue } from "@chakra-ui/react";
4343
import SettingsButton from "./settings/SettingsButton";

src/components/MenuBox.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import {
4646
} from "@chakra-ui/react";
4747
import { motion } from "framer-motion";
4848
import { useMemo } from "react";
49-
import { useNavigate } from "react-router-dom";
49+
import { useNavigate } from "react-router";
5050
import { DiagonalRightArrowIcon, RightArrowIcon } from "../assets/icons";
5151
import { useDepName, useDepartments } from "../hooks";
5252
import i18n from "../i18n";

src/components/settings/SettingsDrawer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
FaBook,
2121
FaRegComment,
2222
} from "react-icons/fa";
23-
import { Link } from "react-router-dom";
23+
import { Link } from "react-router";
2424
import { CloseIcon } from "../../assets/icons";
2525
import i18n from "../../i18n";
2626
import LanguagePicker from "./LanguagePicker";

src/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import "./index.css";
4343
import theme from "./theme/theme";
4444
import App from "./App";
4545
import reportWebVitals from "./reportWebVitals";
46-
import { BrowserRouter } from "react-router-dom";
46+
import { BrowserRouter } from "react-router";
4747
import { DepartmentProvider } from "./contexts/departmentContext";
4848
import "./i18n";
4949

src/pages/AnnouncementPage.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
import { Box, Heading, useToast } from "@chakra-ui/react";
4040
import { useEffect } from "react";
41-
import { useNavigate } from "react-router-dom";
41+
import { useNavigate } from "react-router";
4242
import { useAnnouncementLink, useDepName } from "../hooks";
4343
import i18n from "../i18n";
4444

src/pages/Error404.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*/
3838

3939
import { Box, Text } from "@chakra-ui/react";
40-
import { useNavigate } from "react-router-dom";
40+
import { useNavigate } from "react-router";
4141
import i18n from "../i18n";
4242

4343
function Error404() {

src/pages/GraduationPage.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
import { Box, Heading, useToast } from "@chakra-ui/react";
4040
import { useEffect, useRef } from 'react';
41-
import { useNavigate } from "react-router-dom";
41+
import { useNavigate } from "react-router";
4242
import { useDepName, useGraduationLink } from '../hooks';
4343
import i18n from "../i18n";
4444

0 commit comments

Comments
 (0)