mirror of
https://github.com/PeWu/topola-viewer.git
synced 2026-08-03 09:31:52 +00:00
Moved Router to the same component as Route
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
import {ChartView} from './chart_view';
|
import {ChartView} from './chart_view';
|
||||||
import {Route, RouteComponentProps, Switch} from 'react-router-dom';
|
import {HashRouter as Router, Route, RouteComponentProps, Switch} from 'react-router-dom';
|
||||||
import {Intro} from './intro';
|
import {Intro} from './intro';
|
||||||
import {TopBar} from './top_bar';
|
import {TopBar} from './top_bar';
|
||||||
|
|
||||||
@@ -9,7 +9,8 @@ export class App extends React.Component<{}, {}> {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div className="root">
|
<Router>
|
||||||
|
<>
|
||||||
<Route
|
<Route
|
||||||
component={(props: RouteComponentProps) => (
|
component={(props: RouteComponentProps) => (
|
||||||
<TopBar
|
<TopBar
|
||||||
@@ -34,7 +35,8 @@ export class App extends React.Component<{}, {}> {
|
|||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
</Switch>
|
</Switch>
|
||||||
</div>
|
</>
|
||||||
|
</Router>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
body, html, #root {
|
body, html {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6,7 +6,7 @@ body, html, #root {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.root {
|
#root {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import messages_pl from './translations/pl.json';
|
|||||||
import {addLocaleData} from 'react-intl';
|
import {addLocaleData} from 'react-intl';
|
||||||
import {App} from './app';
|
import {App} from './app';
|
||||||
import {detect} from 'detect-browser';
|
import {detect} from 'detect-browser';
|
||||||
import {HashRouter as Router} from 'react-router-dom';
|
|
||||||
import {IntlProvider} from 'react-intl';
|
import {IntlProvider} from 'react-intl';
|
||||||
import './index.css';
|
import './index.css';
|
||||||
import 'semantic-ui-css/semantic.min.css';
|
import 'semantic-ui-css/semantic.min.css';
|
||||||
@@ -31,9 +30,7 @@ if (browser && browser.name === 'ie') {
|
|||||||
} else {
|
} else {
|
||||||
ReactDOM.render(
|
ReactDOM.render(
|
||||||
<IntlProvider locale={language} messages={messages[language]}>
|
<IntlProvider locale={language} messages={messages[language]}>
|
||||||
<Router>
|
<App />
|
||||||
<App />
|
|
||||||
</Router>
|
|
||||||
</IntlProvider>,
|
</IntlProvider>,
|
||||||
document.querySelector('#root'),
|
document.querySelector('#root'),
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user