diff options
| author | Fred Carlsen <fred@sjelfull.no> | 2018-12-20 06:59:07 +0800 |
|---|---|---|
| committer | Fred Carlsen <fred@sjelfull.no> | 2018-12-20 06:59:07 +0800 |
| commit | 5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf (patch) | |
| tree | aed059ac8540233b7fbd20aa32bc3a0f21734182 /packages/website/ts/index.tsx | |
| parent | aa5c2c249d43c980c06d3a5541233f2407a83371 (diff) | |
| parent | 125a940560a01305781bfb6754f52fa64669a6f3 (diff) | |
| download | dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.gz dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.tar.zst dexon-sol-tools-5eb316f5d832d0e7ffc8a3a3858350cc13af3dcf.zip | |
Merge remote-tracking branch 'upstream/feature/website/0x-org' into feature/website/0x-org
# Conflicts:
# packages/website/ts/@next/components/button.tsx
# packages/website/ts/@next/components/definition.tsx
# packages/website/ts/@next/components/hero.tsx
# packages/website/ts/@next/components/sections/landing/about.tsx
# packages/website/ts/@next/pages/market_maker.tsx
Diffstat (limited to 'packages/website/ts/index.tsx')
| -rw-r--r-- | packages/website/ts/index.tsx | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx index abd8bc2ef..3f0c1c28c 100644 --- a/packages/website/ts/index.tsx +++ b/packages/website/ts/index.tsx @@ -4,13 +4,8 @@ import { render } from 'react-dom'; import { Provider } from 'react-redux'; import { BrowserRouter as Router, Redirect, Route, Switch } from 'react-router-dom'; import { MetaTags } from 'ts/components/meta_tags'; -import { About } from 'ts/containers/about'; import { DocsHome } from 'ts/containers/docs_home'; import { FAQ } from 'ts/containers/faq'; -import { Instant } from 'ts/containers/instant'; -import { Jobs } from 'ts/containers/jobs'; -import { Landing } from 'ts/containers/landing'; // Note(ez): When we're done we omit all old site imports -import { LaunchKit } from 'ts/containers/launch_kit'; import { NotFound } from 'ts/containers/not_found'; import { Wiki } from 'ts/containers/wiki'; import { createLazyComponent } from 'ts/lazy_component'; @@ -25,12 +20,10 @@ import { NextAboutJobs } from 'ts/@next/pages/about/jobs'; import { NextAboutMission } from 'ts/@next/pages/about/mission'; import { NextAboutPress } from 'ts/@next/pages/about/press'; import { NextAboutTeam } from 'ts/@next/pages/about/team'; -import { NextCommunity } from 'ts/@next/pages/community'; import { NextEcosystem } from 'ts/@next/pages/ecosystem'; import { Next0xInstant } from 'ts/@next/pages/instant'; import { NextLanding } from 'ts/@next/pages/landing'; import { NextLaunchKit } from 'ts/@next/pages/launch_kit'; -import { NextMarketMaker } from 'ts/@next/pages/market_maker'; import { NextWhy } from 'ts/@next/pages/why'; // Check if we've introduced an update that requires us to clear the tradeHistory local storage entries @@ -104,15 +97,19 @@ render( <div> <Switch> {/* Next (new site) routes */} - <Route exact path="/" component={NextLanding as any} /> - <Route exact path={WebsitePaths.Why} component={NextWhy as any} /> - <Route exact path={WebsitePaths.Instant} component={Next0xInstant as any} /> - <Route exact path={WebsitePaths.LaunchKit} component={NextLaunchKit as any} /> - <Route exact path={WebsitePaths.Ecosystem} component={NextEcosystem as any} /> - <Route exact path={WebsitePaths.AboutMission} component={NextAboutMission as any} /> - <Route exact path={WebsitePaths.AboutTeam} component={NextAboutTeam as any} /> - <Route exact path={WebsitePaths.AboutPress} component={NextAboutPress as any} /> - <Route exact path={WebsitePaths.AboutJobs} component={NextAboutJobs as any} /> + <Route exact={true} path="/" component={NextLanding as any} /> + <Route exact={true} path={WebsitePaths.Why} component={NextWhy as any} /> + <Route exact={true} path={WebsitePaths.Instant} component={Next0xInstant as any} /> + <Route exact={true} path={WebsitePaths.LaunchKit} component={NextLaunchKit as any} /> + <Route exact={true} path={WebsitePaths.Ecosystem} component={NextEcosystem as any} /> + <Route + exact={true} + path={WebsitePaths.AboutMission} + component={NextAboutMission as any} + /> + <Route exact={true} path={WebsitePaths.AboutTeam} component={NextAboutTeam as any} /> + <Route exact={true} path={WebsitePaths.AboutPress} component={NextAboutPress as any} /> + <Route exact={true} path={WebsitePaths.AboutJobs} component={NextAboutJobs as any} /> {/* Note(ez): We remove/replace all old routes with next routes once we're ready to put a ring on it. for now let's keep em there for reference |