maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-27 19:42:11 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Provide routesConfiguration and use flattened routes for Routes

Browse source
This commit is contained in:
Kimmo Puputti 2017-02-14 14:20:32 +02:00
parent 18bdcf5993
commit 9a91380896
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/app.js
View file

@ -7,19 +7,23 @@ import { IntlProvider, addLocaleData } from 'react-intl';
import en from 'react-intl/locale-data/en';
import configureStore from './store';
import Routes from './Routes';
import routesConfiguration from './routesConfiguration';
import { RoutesProvider } from './components';
import routesConfiguration, { flattenRoutes } from './routesConfiguration';
import localeData from './translations/en.json';
export const ClientApp = props => {
const { store } = props;
addLocaleData([...en]);
const flattenedRoutes = flattenRoutes(routesConfiguration);
return (
<IntlProvider locale="en" messages={localeData}>
<BrowserRouter>
<Provider store={store}>
<Routes routes={routesConfiguration} />
</Provider>
</BrowserRouter>
<Provider store={store}>
<RoutesProvider routes={routesConfiguration}>
<BrowserRouter>
<Routes routes={flattenedRoutes} />
</BrowserRouter>
</RoutesProvider>
</Provider>
</IntlProvider>
);
};
@ -31,13 +35,16 @@ ClientApp.propTypes = { store: any.isRequired };
export const ServerApp = props => {
const { url, context, store } = props;
addLocaleData([...en]);
const flattenedRoutes = flattenRoutes(routesConfiguration);
return (
<IntlProvider locale="en" messages={localeData}>
<StaticRouter location={url} context={context}>
<Provider store={store}>
<Routes routes={routesConfiguration} />
</Provider>
</StaticRouter>
<Provider store={store}>
<RoutesProvider routes={routesConfiguration}>
<StaticRouter location={url} context={context}>
<Routes routes={flattenedRoutes} />
</StaticRouter>
</RoutesProvider>
</Provider>
</IntlProvider>
);
};