diff --git a/package.json b/package.json index 22aed688..aaf6532f 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "react-query": "^3.34.0", "react-rainbow-components": "1.29.0-canary.c10cd9f", "react-redux": "^7.2.0", - "react-router-dom": "^5.0.0", + "react-router-dom": "^6.3.0", "redux": "^4.0.5", "redux-form": "^8.3.5", "redux-thunk": "^2.3.0", diff --git a/packages/app/docs/stories/appWithRouter.story.js b/packages/app/docs/stories/appWithRouter.story.js index 9af5e9ee..d096c9d7 100644 --- a/packages/app/docs/stories/appWithRouter.story.js +++ b/packages/app/docs/stories/appWithRouter.story.js @@ -1,6 +1,6 @@ import React from 'react'; import styled from 'styled-components'; -import { Switch, Route, Link } from 'react-router-dom'; +import { Route, Link, Routes } from 'react-router-dom'; import { RainbowLogo } from '@rainbow-modules/icons'; import app from '../../../../firebase'; import RainbowFirebaseApp from '../../src/components/App'; @@ -50,15 +50,11 @@ export const basicRouter = () => { - - - - Home page - - About page - Contact us - - + + Home page} /> + About page} /> + Contact page} /> + ); }; diff --git a/packages/app/docs/stories/sideBarNavigation.story.js b/packages/app/docs/stories/sideBarNavigation.story.js index 4fb3184f..ba8fc8a9 100644 --- a/packages/app/docs/stories/sideBarNavigation.story.js +++ b/packages/app/docs/stories/sideBarNavigation.story.js @@ -1,6 +1,6 @@ import React from 'react'; import styled from 'styled-components'; -import { Switch, Route } from 'react-router-dom'; +import { Route, Routes } from 'react-router-dom'; import { HomeBorder, HomeFilled, @@ -76,17 +76,11 @@ export const sideBarNavigation = () => { path="/billing" /> - - - Home page - - - Export page - - - Billing page - - + + Home page} /> + Export page} /> + Billing page} /> + ); diff --git a/packages/app/src/components/SideBarNavigation/__test__/sideBarNavigation.spec.js b/packages/app/src/components/SideBarNavigation/__test__/sideBarNavigation.spec.js index 8ee9dd1a..d8a1f5cd 100644 --- a/packages/app/src/components/SideBarNavigation/__test__/sideBarNavigation.spec.js +++ b/packages/app/src/components/SideBarNavigation/__test__/sideBarNavigation.spec.js @@ -11,9 +11,9 @@ describe('', () => { - - - + + + , diff --git a/packages/app/src/components/SideBarOption/__test__/sideBarOption.spec.js b/packages/app/src/components/SideBarOption/__test__/sideBarOption.spec.js index 4ea05d74..51706a7d 100644 --- a/packages/app/src/components/SideBarOption/__test__/sideBarOption.spec.js +++ b/packages/app/src/components/SideBarOption/__test__/sideBarOption.spec.js @@ -7,7 +7,7 @@ describe('', () => { it('should render a SidebarItem with the right props', () => { const component = mount( - + , ); const expectedProps = { @@ -33,6 +33,7 @@ describe('', () => { selectedIcon={} name="name" label="label" + path="" isSelected /> , @@ -44,7 +45,7 @@ describe('', () => { const Icon = () => Icon; const component = mount( - } name="name" label="label" isSelected /> + } name="name" label="label" path="" isSelected /> , ); expect(component.find(Icon).exists()).toBe(true); diff --git a/packages/auth/docs/stories/authRoutes.story.js b/packages/auth/docs/stories/authRoutes.story.js index 78d1798a..34957c67 100644 --- a/packages/auth/docs/stories/authRoutes.story.js +++ b/packages/auth/docs/stories/authRoutes.story.js @@ -1,5 +1,6 @@ import React, { useState } from 'react'; import styled from 'styled-components'; +import { Route, Routes } from 'react-router-dom'; import { Button, Input, Card } from 'react-rainbow-components'; import { RainbowFirebaseApp } from '@rainbow-modules/app'; import app from '../../../../firebase'; @@ -78,13 +79,25 @@ const Login = () => { export const basicEmailPasswordAuthFlow = () => { return ( - - - - - Authenticated! -