Merge development

1 files changed, 45 insertions, 9 deletions

diff --git a/packages/website/ts/index.tsx b/packages/website/ts/index.tsx
index 96e7184f8..45054772c 100644
--- a/packages/website/ts/index.tsx
+++ b/packages/website/ts/index.tsx
@@ -4,12 +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 { Jobs } from 'ts/containers/jobs';
-import { Landing } from 'ts/containers/landing';
-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';
@@ -19,6 +15,18 @@ import { store } from 'ts/redux/store';
 import { WebsiteLegacyPaths, WebsitePaths } from 'ts/types';
 import { muiTheme } from 'ts/utils/mui_theme';
 
+// Next (new website) routes. We should rename them later
+import { NextAboutJobs } from 'ts/pages/about/jobs';
+import { NextAboutMission } from 'ts/pages/about/mission';
+import { NextAboutPress } from 'ts/pages/about/press';
+import { NextAboutTeam } from 'ts/pages/about/team';
+import { NextEcosystem } from 'ts/pages/ecosystem';
+import { Next0xInstant } from 'ts/pages/instant';
+import { NextLanding } from 'ts/pages/landing';
+import { NextLaunchKit } from 'ts/pages/launch_kit';
+import { NextMarketMaker } from 'ts/pages/market_maker';
+import { NextWhy } from 'ts/pages/why';
+
 // Check if we've introduced an update that requires us to clear the tradeHistory local storage entries
 tradeHistoryStorage.clearIfRequired();
 trackedTokenStorage.clearIfRequired();
@@ -40,6 +48,9 @@ const LazyZeroExJSDocumentation = createLazyComponent('Documentation', async ()
 const LazyContractWrappersDocumentation = createLazyComponent('Documentation', async () =>
     import(/* webpackChunkName: "contractWrapperDocs" */ 'ts/containers/contract_wrappers_documentation'),
 );
+const LazyMigrationsDocumentation = createLazyComponent('Documentation', async () =>
+    import(/* webpackChunkName: "migrationsDocs" */ 'ts/containers/migrations_documentation'),
+);
 const LazyOrderWatcherDocumentation = createLazyComponent('Documentation', async () =>
     import(/* webpackChunkName: "orderWatcherDocs" */ 'ts/containers/order_watcher_documentation'),
 );
@@ -86,14 +97,34 @@ render(
                     <Provider store={store}>
                         <div>
                             <Switch>
-                                <Route exact={true} path="/" component={Landing as any} />
+                                {/* Next (new site) routes */}
+                                <Route exact={true} path="/" component={NextLanding as any} />
+                                <Route exact={true} path={WebsitePaths.Why} component={NextWhy as any} />
+                                <Route
+                                    exact={true}
+                                    path={WebsitePaths.MarketMaker}
+                                    component={NextMarketMaker 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
+                                */}
                                 <Redirect from="/otc" to={`${WebsitePaths.Portal}`} />
-                                <Route path={WebsitePaths.LaunchKit} component={LaunchKit as any} />
-                                <Route path={WebsitePaths.Careers} component={Jobs as any} />
                                 <Route path={WebsitePaths.Portal} component={LazyPortal} />
                                 <Route path={WebsitePaths.FAQ} component={FAQ as any} />
-                                <Route path={WebsitePaths.About} component={About as any} />
                                 <Route path={WebsitePaths.Wiki} component={Wiki as any} />
+
                                 <Route
                                     path={`${WebsitePaths.ZeroExJs}/:version?`}
                                     component={LazyZeroExJSDocumentation}
@@ -103,6 +134,10 @@ render(
                                     component={LazyContractWrappersDocumentation}
                                 />
                                 <Route
+                                    path={`${WebsitePaths.Migrations}/:version?`}
+                                    component={LazyMigrationsDocumentation}
+                                />
+                                <Route
                                     path={`${WebsitePaths.OrderWatcher}/:version?`}
                                     component={LazyOrderWatcherDocumentation}
                                 />
@@ -157,7 +192,8 @@ render(
                                     path={`${WebsiteLegacyPaths.Deployer}/:version?`}
                                     component={LazySolCompilerDocumentation}
                                 />
-                                <Route path={WebsiteLegacyPaths.Jobs} component={Jobs as any} />
+                                <Redirect from={WebsiteLegacyPaths.Jobs} to={WebsitePaths.AboutJobs} />
+                                <Redirect from={WebsitePaths.Careers} to={WebsitePaths.AboutJobs} />
                                 <Route component={NotFound as any} />
                             </Switch>
                         </div>