Avoid <BasicLayout> redundancy + tsx (#37)

This commit is contained in:
David Ratiney 2020-10-22 13:02:42 +08:00 committed by GitHub
parent 063cae46df
commit 633d8facb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 56 deletions

View File

@ -1,56 +0,0 @@
import { HashRouter, Route } from 'react-router-dom';
import TradePage from './pages/TradePage';
import OpenOrdersPage from './pages/OpenOrdersPage';
import React from 'react';
import BalancesPage from './pages/BalancesPage';
import ConvertPage from './pages/ConvertPage';
import BasicLayout from './components/BasicLayout';
import ListNewMarketPage from './pages/ListNewMarketPage';
export function Routes() {
return (
<HashRouter basename={'/'}>
<Route exact path="/" component={TradePageContents} />
<Route exact path="/orders" component={OpenOrdersPageContents} />
<Route exact path="/balances" component={BalancesPageContents} />
<Route exact path="/convert" component={ConvertPageContents} />
<Route exact path="/list-new-market">
<BasicLayout>
<ListNewMarketPage />
</BasicLayout>
</Route>
</HashRouter>
);
}
function TradePageContents() {
return (
<BasicLayout>
<TradePage />
</BasicLayout>
);
}
function OpenOrdersPageContents() {
return (
<BasicLayout>
<OpenOrdersPage />
</BasicLayout>
);
}
function BalancesPageContents() {
return (
<BasicLayout>
<BalancesPage />
</BasicLayout>
);
}
function ConvertPageContents() {
return (
<BasicLayout>
<ConvertPage />
</BasicLayout>
);
}

24
src/routes.tsx Normal file
View File

@ -0,0 +1,24 @@
import { HashRouter, Route } from 'react-router-dom';
import TradePage from './pages/TradePage';
import OpenOrdersPage from './pages/OpenOrdersPage';
import React from 'react';
import BalancesPage from './pages/BalancesPage';
import ConvertPage from './pages/ConvertPage';
import BasicLayout from './components/BasicLayout';
import ListNewMarketPage from './pages/ListNewMarketPage';
export function Routes() {
return (
<>
<HashRouter basename={'/'}>
<BasicLayout>
<Route exact path="/" component={TradePage} />
<Route exact path="/orders" component={OpenOrdersPage} />
<Route exact path="/balances" component={BalancesPage} />
<Route exact path="/convert" component={ConvertPage} />
<Route exact path="/list-new-market" component={ListNewMarketPage} />
</BasicLayout>
</HashRouter>
</>
);
}