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
124 changes: 85 additions & 39 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
"@faker-js/faker": "9.2.0",
"@sentry/react": "^8.41.0",
"@sentry/tracing": "^7.114.0",
"@types/node": "^22.10.2",
"@types/node": "^22.9.0",
"@types/react": "^18.3.5",
"@types/react-dom": "^18.3.0",
"add-to-calendar-button-react": "^2.7.3",
"axios": "^1.7.7",
"clsx": "^2.1.1",
"date-fns": "^4.1.0",
"framer-motion": "^11.15.0",
"framer-motion": "^11.11.8",
"google-map-react": "^2.2.1",
"moment": "^2.30.1",
"primeicons": "^7.0.0",
Expand All @@ -26,7 +26,7 @@
"react-countdown": "^2.3.6",
"react-dom": "^18.3.1",
"react-query": "^3.39.2",
"react-router-dom": "^6.28.0",
"react-router-dom": "^7.0.2",
"react-scripts": "5.0.1",
"react-use": "^17.5.1",
"sass": "^1.81.0",
Expand Down
2 changes: 1 addition & 1 deletion src/2023/Diversity/Diversity.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import { render, screen } from "@testing-library/react";
import Diversity2023 from "./Diversity2023";
import { BrowserRouter, Route, Routes } from "react-router-dom";
import { BrowserRouter, Route, Routes } from "react-router";

describe("Diversity component", () => {
it("renders heading correctly", () => {
Expand Down
2 changes: 1 addition & 1 deletion src/2023/Diversity/Diversity2023.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Color } from "../../styles/colors";
import data from "../../data/2023.json";
import styled from "styled-components";
import { BIG_BREAKPOINT } from "../../constants/BreakPoints";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import {
ROUTE_CODE_OF_CONDUCT,
ROUTE_CONDITIONS,
Expand Down
2 changes: 1 addition & 1 deletion src/2023/Home/Home2023Wrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import SpeakersCarousel from "./components/SpeakersCarousel/SpeakersCarousel";
import Sponsors from "./components/Sponsors/Sponsors";
import styled from "styled-components";
import data from "../../data/2023.json";
import { useLocation } from "react-router-dom";
import { useLocation } from "react-router";

const StyledContainer = styled.div`
padding-bottom: 10rem;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import styled from "styled-components";
import { Color } from "../../../../styles/colors";
import "swiper/swiper-bundle.min.css";
import "./SpeakersCarousel.scss";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { ROUTE_SPEAKER_DETAIL } from "../../../../constants/routes";
import { useFetchSpeakers } from "../../../Speakers/UseFetchSpeakers";
import * as Sentry from "@sentry/react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Color } from "../../../../styles/colors";

import { FC } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import LessThanBlueWhiteIcon from ".././../../../assets/images/MoreThanBlueIcon.svg";
import SectionWrapper from "../../../../components/SectionWrapper/SectionWrapper";
import { TABLET_BREAKPOINT } from "../../../../constants/BreakPoints";
Expand Down
2 changes: 1 addition & 1 deletion src/2023/Schedule/components/AvatarCard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC } from 'react';
import { Link } from 'react-router-dom';
import { Link } from 'react-router';
import {
StyledAvatarContainer,
StyledAvatarImage,
Expand Down
2 changes: 1 addition & 1 deletion src/2023/SessionFeedback/SessionFeedback2023.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import "primereact/resources/themes/lara-light-blue/theme.css";
import { InputText } from "primereact/inputtext";
import { FilterMatchMode } from "primereact/api";
import { Color } from "../../styles/colors";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { ROUTE_TALK_DETAIL } from "../../constants/routes";

const SessionFeedback2023: FC<React.PropsWithChildren<unknown>> = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/2023/SpeakerDetail/SpeakerDetail.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import styled from "styled-components";
import {motion} from "framer-motion";
import {BIG_BREAKPOINT} from "../../constants/BreakPoints";
import {Color} from "../../styles/colors";
import {Link} from "react-router-dom";
import {Link} from "react-router";

export const StyledTalkDescription = styled(Link)`
text-decoration: none;
Expand Down
2 changes: 1 addition & 1 deletion src/2023/SpeakerDetail/SpeakerDetail2023.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import {
ROUTE_2023_TALK_DETAIL,
} from "../../constants/routes";
import { StyledTalkDescription } from "./SpeakerDetail.style";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { Color } from "../../styles/colors";
import { ISpeaker } from "../Speakers/Speaker.types";

Expand Down
2 changes: 1 addition & 1 deletion src/2023/SpeakerDetail/SpeakerDetailContainer2023.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Color } from "../../styles/colors";
import React, { FC } from "react";
import SectionWrapper from "../../components/SectionWrapper/SectionWrapper";
import SpeakerDetail2023 from "./SpeakerDetail2023";
import { useParams } from "react-router-dom";
import { useParams } from "react-router";
import { StyledContainer, StyledWaveContainer } from "./Speaker.style";
import conferenceData from "../../data/2023.json";
import { useFetchSpeakers } from "../Speakers/UseFetchSpeakers";
Expand Down
2 changes: 1 addition & 1 deletion src/2023/Speakers/components/SpeakersCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
StyledSpeakerText,
StyledSpeakerTitle,
} from "./SpeakerCard.Style";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { ISpeaker } from "../Speaker.types";
import Loading from "../../../assets/images/logo.png";
import { ROUTE_2023_SPEAKER_DETAIL } from "../../../constants/routes";
Expand Down
2 changes: 1 addition & 1 deletion src/2023/TalkDetail/TalkDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
StyledVideoContainer,
StyledVideoTagsContainer,
} from "./Style.MeetingDetail";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import {
ROUTE_2023_SPEAKER_DETAIL,
ROUTE_2023_TALKS,
Expand Down
2 changes: 1 addition & 1 deletion src/2023/TalkDetail/TalkDetailContainer2023.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React, { FC, useEffect } from "react";
import NotFoundError from "../../components/NotFoundError/NotFoundError";
import SectionWrapper from "../../components/SectionWrapper/SectionWrapper";
import styled from "styled-components";
import { useParams } from "react-router-dom";
import { useParams } from "react-router";
import conferenceData from "../../data/2023.json";
import { sessionAdapter, useFetchTalksById } from "../Talks/UseFetchTalks";
import * as Sentry from "@sentry/react";
Expand Down
2 changes: 1 addition & 1 deletion src/2023/Talks/Talks.style.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from "styled-components";
import { Color } from "../../styles/colors";
import { BIG_BREAKPOINT, TABLET_BREAKPOINT } from "../../constants/BreakPoints";
import { Link } from "react-router-dom";
import { Link } from "react-router";

export const StyledTitleContainer = styled.div`
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/2023/Talks/components/TalkCard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { StyledJobsInfo } from "../../JobOffers/components/JobsCard";
import { Tag } from "../../../components/Tag/Tag";
import {
Expand Down
2 changes: 1 addition & 1 deletion src/2024/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
StyleHomeContainer,
} from "./Style.Home";
import {formatDateRange} from "./DateUtil";
import {Link} from "react-router-dom";
import {Link} from "react-router";
import data from "../../data/2024.json";
import SectionWrapper from "../../components/SectionWrapper/SectionWrapper";
import {Color} from "../../styles/colors";
Expand Down
Loading
Loading