Skip to content

Commit 51bd511

Browse files
authored
Merge pull request #646 from TGiles/fix-645-ff-to-firefox-desktop-redirect
Fix #645 by adding a redirect from 'ff' to 'firefox-desktop'
2 parents 8534c82 + 79d02a2 commit 51bd511

2 files changed

Lines changed: 30 additions & 14 deletions

File tree

src/App/index.jsx

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { hot } from 'react-hot-loader';
22
import React, { Component, Suspense } from 'react';
3-
import { BrowserRouter, Switch, Route } from 'react-router-dom';
3+
import { BrowserRouter, Switch, Route, Redirect } from 'react-router-dom';
44
import { ApolloProvider } from '@apollo/client';
55
import { ApolloClient } from 'apollo-client';
66
import { HttpLink } from 'apollo-link-http';
@@ -90,19 +90,31 @@ class App extends Component {
9090
<CssBaseline />
9191
<BrowserRouter>
9292
<Switch>
93-
{routes.map(({ path, exact, component: Component, ...props }) => (
94-
<Route
95-
key={path}
96-
path={path}
97-
exact={exact}
98-
render={({ staticContext, ...renderProps }) => (
99-
<Suspense
100-
fallback={<Spinner className={classes.spinner} />}>
101-
<Component {...renderProps} {...props} />
102-
</Suspense>
103-
)}
104-
/>
105-
))}
93+
{routes.map(({ path, exact, redirect, component: Component, ...props }) =>
94+
redirect ? (
95+
<Route
96+
key={path}
97+
path={path}
98+
render={({ location }) => (
99+
<Redirect
100+
to={{ pathname: redirect, search: location.search }}
101+
/>
102+
)}
103+
/>
104+
) : (
105+
<Route
106+
key={path}
107+
path={path}
108+
exact={exact}
109+
render={({ staticContext, ...renderProps }) => (
110+
<Suspense
111+
fallback={<Spinner className={classes.spinner} />}>
112+
<Component {...renderProps} {...props} />
113+
</Suspense>
114+
)}
115+
/>
116+
)
117+
)}
106118
</Switch>
107119
</BrowserRouter>
108120
</MuiThemeProvider>

src/App/routes.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ const routes = [
66
path: '/',
77
exact: true,
88
},
9+
{
10+
path: '/projects/ff',
11+
redirect: '/projects/firefox-frontend',
12+
},
913
{
1014
component: lazy(() => import('../views/Project/index')),
1115
path: '/projects/:project',

0 commit comments

Comments
 (0)