Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5366d14
feat: resize sponsorship carrousel
anyulled Nov 12, 2024
9613251
build(deps): bump @sentry/react from 8.37.1 to 8.38.0
dependabot[bot] Nov 13, 2024
485ab39
build(deps): bump @sentry/react from 8.38.0 to 8.41.0
dependabot[bot] Nov 28, 2024
6ae04ba
build(deps): bump sass from 1.80.3 to 1.81.0
dependabot[bot] Nov 29, 2024
72caba7
fix: clicking the sponsorship button should navigate in the same page
anyulled Nov 29, 2024
ebf7847
fix: remove overlapping on the sponsorship section
anyulled Nov 29, 2024
de205b8
feat: using 2024 edition images
anyulled Nov 29, 2024
cb6af63
feat: using 2024 edition images
anyulled Nov 29, 2024
c7766f2
Merge branch 'main' into feat/resize-carrousel
anyulled Nov 29, 2024
e53e30c
Merge branch 'main' into feat/resize-carrousel
anyulled Dec 19, 2024
e0051a3
build(deps-dev): bump prettier from 3.3.3 to 3.4.2
dependabot[bot] Dec 19, 2024
91a5156
build(deps): bump @types/node from 22.9.0 to 22.10.2
dependabot[bot] Dec 19, 2024
a9684a0
build(deps): bump nanoid from 3.3.7 to 3.3.8
dependabot[bot] Dec 19, 2024
3f60b6b
build(deps): bump path-to-regexp and express
dependabot[bot] Dec 19, 2024
5bcb688
build(deps): bump react-router-dom from 6.28.0 to 7.0.2 (#591)
dependabot[bot] Dec 20, 2024
c424c2a
build(deps-dev): bump @testing-library/jest-dom from 6.4.6 to 6.6.3 (…
dependabot[bot] Dec 20, 2024
b73721c
feat: resize sponsorship carrousel
anyulled Nov 12, 2024
07879de
fix: clicking the sponsorship button should navigate in the same page
anyulled Nov 29, 2024
937f28c
fix: remove overlapping on the sponsorship section
anyulled Nov 29, 2024
bda3bea
feat: using 2024 edition images
anyulled Nov 29, 2024
57542e1
feat: using 2024 edition images
anyulled Nov 29, 2024
41ebcdc
feat: sponsorship button is a relative path
anyulled Dec 20, 2024
389fa5b
Merge remote-tracking branch 'origin/feat/resize-carrousel' into feat…
anyulled Dec 20, 2024
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
45,033 changes: 17,985 additions & 27,048 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"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 Expand Up @@ -86,7 +86,7 @@
]
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.6",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/google-map-react": "^2.1.10",
Expand All @@ -95,7 +95,7 @@
"@types/styled-components": "^5.1.34",
"eslint": "^8.57.1",
"gh-pages": "^6.2.0",
"prettier": "^3.3.3",
"prettier": "^3.4.2",
"react-ga": "^3.3.1",
"react-test-renderer": "^18.3.1"
},
Expand Down
Binary file modified public/images/sponsorship/image_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/sponsorship/image_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/sponsorship/image_3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/sponsorship/image_4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/sponsorship/image_5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/sponsorship/image_6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/sponsorship/image_7.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/sponsorship/image_8.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/images/sponsorship/image_9.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
2 changes: 1 addition & 1 deletion src/2024/HomeWrapper2024.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {FC, useState} from "react";
import styled from "styled-components";

import {useLocation} from "react-router-dom";
import {useLocation} from "react-router";
import {BIG_BREAKPOINT} from "../constants/BreakPoints";

import {useEventEdition} from "../views/Home/UseEventEdition";
Expand Down
2 changes: 1 addition & 1 deletion src/2024/SpeakerDetail/SpeakerDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import twitterIcon from "../../assets/images/twitterIcon.svg";
import {useWindowSize} from "react-use";

import {ROUTE_SPEAKERS, ROUTE_TALK_DETAIL} from "../../constants/routes";
import {Link} from "react-router-dom";
import {Link} from "react-router";
import {Color} from "../../styles/colors";
import conferenceData from "../../data/2024.json";
import {ISpeaker} from "../../views/Speakers/Speaker.types";
Expand Down
2 changes: 1 addition & 1 deletion src/2024/SpeakerDetail/SpeakerDetailContainer2024.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 SpeakerDetail from "./SpeakerDetail";
import {useParams} from "react-router-dom";
import {useParams} from "react-router";
import conferenceData from "../../data/2024.json";
import {useFetchSpeakers} from "../Speakers/UseFetchSpeakers";
import * as Sentry from "@sentry/react";
Expand Down
2 changes: 1 addition & 1 deletion src/2024/Speakers/SpeakerInformation.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import {render, screen} from "@testing-library/react";
import {BrowserRouter, Route, Routes} from "react-router-dom";
import {BrowserRouter, Route, Routes} from "react-router";
import SpeakerInformation from "./SpeakerInformation";

describe("Speakers activities component", () => {
Expand Down
1 change: 0 additions & 1 deletion src/2024/Speakers/UseFetchSpeakers.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, {FC} from "react";
import {QueryClient, QueryClientProvider} from "react-query";
import {renderHook, waitFor} from "@testing-library/react";
import {speakerAdapter, useFetchSpeakers} from "./UseFetchSpeakers";
import {beforeAll, beforeEach, describe, expect, it} from "@jest/globals";
import axios, {AxiosHeaders, AxiosResponse} from "axios";
import {IResponse} from "../../views/Speakers/Speaker.types";

Expand Down
2 changes: 1 addition & 1 deletion src/2024/SpeakersCarousel/SpeakerSwiper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {Swiper, SwiperSlide} from "swiper/react";
import styled from "styled-components";
import "swiper/swiper-bundle.min.css";
import "./SpeakersCarousel.scss";
import {Link} from "react-router-dom";
import {Link} from "react-router";
import conferenceData from "../../data/2024.json";
import {useFetchSpeakers} from "../Speakers/UseFetchSpeakers";
import * as Sentry from "@sentry/react";
Expand Down
2 changes: 1 addition & 1 deletion src/2024/SpeakersCarousel/SpeakersCarousel.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 LessThanBlueWhiteIcon
from "../../assets/images/MoreThanBlueWhiteIcon.svg";
import {motion} from "framer-motion";
Expand Down
2 changes: 1 addition & 1 deletion src/2024/Sponsors/Supporters.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {fireEvent, render, screen} from "@testing-library/react";
import {Supporters} from "./Supporters";
import React from "react";
import {useWindowSize} from "react-use";
import {BrowserRouter, Route, Routes} from "react-router-dom";
import {BrowserRouter, Route, Routes} from "react-router";

jest.mock("react-use", () => ({
useWindowSize: jest.fn(),
Expand Down
2 changes: 1 addition & 1 deletion src/2024/TalkDetail/MeetingDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import MoreThanIcon from "../../assets/images/MoreThanBlueIcon.svg";
import SectionWrapper from "../../components/SectionWrapper/SectionWrapper";
import {useWindowSize} from "react-use";

import {Link} from "react-router-dom";
import {Link} from "react-router";
import {
ROUTE_2024_SPEAKER_DETAIL,
ROUTE_2024_TALKS,
Expand Down
2 changes: 1 addition & 1 deletion src/2024/TalkDetail/MeetingDetailContainer.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/2024.json";
import {sessionAdapter, useFetchTalksById} from "../Talks/UseFetchTalks";
import * as Sentry from "@sentry/react";
Expand Down
2 changes: 1 addition & 1 deletion src/2024/Talks/components/TalkCard.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {FC} from "react";
import {Link} from "react-router-dom";
import {Link} from "react-router";
import {Tag} from "../../../components/Tag/Tag";
import {
ROUTE_2024_SPEAKER_DETAIL,
Expand Down
1 change: 0 additions & 1 deletion src/2024/Talks/useFetchTalks.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import {QueryClient, QueryClientProvider} from "react-query";
import {renderHook, waitFor} from "@testing-library/react";
import axios, {AxiosHeaders, AxiosResponse} from "axios";
import {faker} from "@faker-js/faker";
import {beforeAll, beforeEach, describe, expect, it} from "@jest/globals";
import {
extractSessionCategoryInfo,
extractSessionSlides,
Expand Down
2 changes: 1 addition & 1 deletion src/App.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {render, screen} from "@testing-library/react";
import {BrowserRouter, Route, Routes} from "react-router-dom";
import {BrowserRouter, Route, Routes} from "react-router";
import App from "./App";
import React from "react";
import userEvent from "@testing-library/user-event";
Expand Down
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Link, Route, Routes} from "react-router-dom";
import {Link, Route, Routes} from "react-router";
import {
ROUTE_2023_ATTENDEE,
ROUTE_2023_CFP,
Expand Down
2 changes: 1 addition & 1 deletion src/components/Footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import flickrIcon from "../../assets/images/flickr.svg";
import linkedinIcon from "../../assets/images/linkedinIcon.svg";
import logo from "../../assets/images/devBcn.png";
import twitterIcon from "../../assets/images/twitterIcon.svg";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { useWindowSize } from "react-use";
import data from "../../data/2024.json";
import youtubeIcon from "../../assets/images/youtubeIcon.svg";
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navigation/Breadcrumbs.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FC, useEffect, useState } from "react";
import { Link, useLocation } from "react-router-dom";
import { Link, useLocation } from "react-router";

import { Color } from "../../styles/colors";
import styled from "styled-components";
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navigation/HorizontalMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { BIG_BREAKPOINT } from "../../constants/BreakPoints";
import { NavigationItem } from "./NavigationData";
import { useWindowSize } from "react-use";
import { NavMenu, StyledLink, SubLink, SubMenu } from "./Style.Navigation";
import { NavLink } from "react-router-dom";
import { NavLink } from "react-router";
import { FC } from "react";

type Props = {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navigation/Navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {AnimatePresence} from "framer-motion";
import {FC, useEffect, useState} from "react";
import {MOBILE_BREAKPOINT} from "../../constants/BreakPoints";
import {useLocation, useNavigate} from "react-router-dom";
import {useLocation, useNavigate} from "react-router";
import Breadcrumbs from "./Breadcrumbs";
import CloseIcon from "../../assets/images/CloseIcon.svg";
import NavigationLogo from "../../assets/images/devBcn.png";
Expand Down
2 changes: 1 addition & 1 deletion src/components/Navigation/Style.Navigation.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import styled from "styled-components";
import { motion } from "framer-motion";
import { Color } from "../../styles/colors";
import { NavLink } from "react-router-dom";
import { NavLink } from "react-router";
import { MAX_WIDTH, MOBILE_BREAKPOINT } from "../../constants/BreakPoints";

export const StyledBlueHamburger = styled(motion.img)`
Expand Down
2 changes: 1 addition & 1 deletion src/components/NotFoundError/NotFoundError.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Color } from "../../styles/colors";

import { FC, useEffect } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import SectionWrapper from "../SectionWrapper/SectionWrapper";
import styled from "styled-components";
import ActionButtons from "../../views/Home/components/ActionButtons/ActionButtons";
Expand Down
2 changes: 1 addition & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
matchRoutes,
useLocation,
useNavigationType,
} from "react-router-dom";
} from "react-router";
import App from "./App";
import React, { useEffect } from "react";
import ReactDOM from "react-dom";
Expand Down
2 changes: 2 additions & 0 deletions src/setupTests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import "@testing-library/jest-dom";
import { TextEncoder } from 'util';

global.TextEncoder = TextEncoder;
window.scrollTo = jest.fn();
2 changes: 1 addition & 1 deletion src/views/Attendee/AttendeeInformation.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { render, screen } from "@testing-library/react";
import React from "react";
import { BrowserRouter, Route, Routes } from "react-router-dom";
import { BrowserRouter, Route, Routes } from "react-router";
import AttendeeInformation from "./AttendeeInformation";

describe("Attendee information component", () => {
Expand Down
2 changes: 1 addition & 1 deletion src/views/Cookies/Cookies.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FC } from "react";
import styled from "styled-components";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { ROUTE_HOME } from "../../constants/routes";

const StyledSection = styled.section`
Expand Down
2 changes: 1 addition & 1 deletion src/views/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 Diversity from "./Diversity";
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/views/Diversity/Diversity.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/2024.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
Loading
Loading