Skip to content

Commit 8a7837a

Browse files
committed
React-Router v6 -> v7
1 parent b9ccedf commit 8a7837a

File tree

114 files changed

+1987
-1757
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1987
-1757
lines changed

frontend/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@
3535
"@mantine/nprogress": "^7.7.1",
3636
"@mantine/tiptap": "^7.7.1",
3737
"@react-pdf/renderer": "^3.3.4",
38+
"@react-router/node": "^7.1.5",
3839
"@remix-run/node": "^2.8.1",
3940
"@stripe/react-stripe-js": "^2.1.1",
4041
"@stripe/stripe-js": "^1.54.1",
4142
"@tabler/icons-react": "^2.44.0",
4243
"@tanstack/react-query": "5.52.2",
43-
"@tiptap/extension-image": "^2.11.2",
44+
"@tiptap/extension-image": "^2.11.5",
4445
"@tiptap/extension-link": "^2.1.13",
4546
"@tiptap/extension-text-align": "^2.1.13",
4647
"@tiptap/extension-underline": "^2.1.13",
@@ -61,7 +62,8 @@
6162
"react-dom": "^18.2.0",
6263
"react-helmet-async": "^2.0.4",
6364
"react-qr-code": "^2.0.12",
64-
"react-router-dom": "^6.11.2",
65+
"react-router": "^7.1.5",
66+
"react-router-dom": "^7.1.5",
6567
"recharts": "2",
6668
"sirv": "^2.0.4"
6769
},

frontend/src/components/common/AttendeeList/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ActionIcon, Avatar, Tooltip, Text, Group } from "@mantine/core";
22
import { getInitials } from "../../../utilites/helpers.ts";
3-
import { NavLink } from "react-router-dom";
3+
import { NavLink } from "react-router";
44
import { IconExternalLink, IconUsers } from "@tabler/icons-react";
55
import classes from './AttendeeList.module.scss';
66
import { Order, Product } from "../../../types.ts";

frontend/src/components/common/AttendeeTable/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {useDisclosure} from "@mantine/hooks";
77
import {SendMessageModal} from "../../modals/SendMessageModal";
88
import {useState} from "react";
99
import {NoResultsSplash} from "../NoResultsSplash";
10-
import {useParams} from "react-router-dom";
10+
import {useParams} from "react-router";
1111
import {useGetEvent} from "../../../queries/useGetEvent.ts";
1212
import Truncate from "../Truncate";
1313
import {notifications} from "@mantine/notifications";

frontend/src/components/common/CheckInListList/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {EditCheckInListModal} from "../../modals/EditCheckInListModal";
1414
import {useDeleteCheckInList} from "../../../mutations/useDeleteCheckInList";
1515
import {showError, showSuccess} from "../../../utilites/notifications.tsx";
1616
import {confirmationDialog} from "../../../utilites/confirmationDialog.tsx";
17-
import {useParams} from "react-router-dom";
17+
import {useParams} from "react-router";
1818

1919
interface CheckInListListProps {
2020
checkInLists: CheckInList[];

frontend/src/components/common/ErrorDisplay/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Container} from '@mantine/core';
22
import classes from './ErrorDisplay.module.scss';
3-
import {useRouteError} from "react-router-dom";
3+
import {useRouteError} from "react-router";
44
import {t} from "@lingui/macro";
55

66
export const ErrorDisplay = () => {

frontend/src/components/common/EventCard/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {ActionIcon, Button,} from '@mantine/core';
22
import {Event, IdParam} from "../../../types.ts";
33
import classes from "./EventCard.module.scss";
44
import {Card} from "../Card";
5-
import {NavLink, useNavigate} from "react-router-dom";
5+
import {NavLink, useNavigate} from "react-router";
66
import {
77
IconArchive,
88
IconCash,

frontend/src/components/common/EventsDashboardStatusButtons/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Button, Group} from "@mantine/core";
22
import {t} from "@lingui/macro";
3-
import {useNavigate} from "react-router-dom";
3+
import {useNavigate} from "react-router";
44

55
interface EventsDashboardStatusButtonsProps {
66
baseUrl: string;

frontend/src/components/common/GlobalMenu/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Avatar, Menu, UnstyledButton} from "@mantine/core";
22
import {getInitials} from "../../../utilites/helpers.ts";
33
import {IconLifebuoy, IconLogout, IconSettingsCog, IconUser,} from "@tabler/icons-react";
44
import {useGetMe} from "../../../queries/useGetMe.ts";
5-
import {NavLink} from "react-router-dom";
5+
import {NavLink} from "react-router";
66
import {t} from "@lingui/macro";
77
import {authClient} from "../../../api/auth.client.ts";
88
import {useDisclosure} from "@mantine/hooks";

frontend/src/components/common/Header/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Container} from '@mantine/core';
22
import classes from './Header.module.scss';
3-
import {NavLink} from "react-router-dom";
3+
import {NavLink} from "react-router";
44

55
interface HeaderProps {
66
rightContent?: React.ReactNode;

frontend/src/components/common/NoResultsSplash/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import classes from './NoResultsSplash.module.scss';
3-
import {useSearchParams} from "react-router-dom";
3+
import {useSearchParams} from "react-router";
44
import {t} from "@lingui/macro";
55

66
interface NoResultsSplashProps {

0 commit comments

Comments
 (0)