Changeset 3717 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/client/router.jsx

Timestamp:

07/24/2016 09:40:56 PM (10 years ago)

Author:

obenland

Message:

Plugin Directory: WordCamp Boston Contributor Day updates.

• Separate store creation.
• Pass SiteHeader component to React Router for navigation links to rerender.
• Pass default plugins from container component to PluginSection.
• Basic 404 and no-content handling.

Props sirbrillig.
See #1719.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/client/router.jsx (moved) (moved from sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/client/routes.jsx ) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/js/client/router.jsx

@@ +1 @@
+/* global add_data:object */
 import React from 'react';
 import { connect } from 'react-redux';
-import { Route, IndexRoute } from 'react-router';
+import { Router, Route, IndexRoute, useRouterHistory } from 'react-router';
+import createBrowserHistory from 'history/lib/createBrowserHistory';
 
 /**
@@ -9 +11 @@
 import FrontPage from 'components/front-page';
 import PluginDirectory from 'components/plugin-directory';
+import SiteHeader from 'components/site-header';
+import SiteMain from 'components/site-main';
 import ArchiveBrowse from 'components/archive-browse';
+import NotFound from 'components/404';
+
+const history = useRouterHistory( createBrowserHistory )( {
+        basename: app_data.base
+} );
 
 export default (
-        <Route path="/" component={ PluginDirectory } >
-                <IndexRoute component={ FrontPage } />
-                <Route path="browse/favorites/:username" component={ ArchiveBrowse } />
-                <Route path="browse/:type" component={ ArchiveBrowse } />
-                <Route path="developers" component={ Page } />
-                <Route path=":plugin" component={ FrontPage } />
-                <Route path="search/:searchTerm" component={ FrontPage } />
-        </Route>
+        <Router history={ history }>
+                <Route name="root" component={ PluginDirectory }>
+                        <Route path="/" components={ { header: SiteHeader, main: SiteMain } }>
+                                <IndexRoute component={ FrontPage } />
+                                <Route path="browse/favorites/:username" component={ ArchiveBrowse } />
+                                <Route path="browse/:type" component={ ArchiveBrowse } />
+                                <Route path="developers" component={ Page } />
+                                <Route path=":plugin" component={ FrontPage } />
+                                <Route path="search/:searchTerm" component={ FrontPage } />
+                                <Route path="*" component={ NotFound } />
+                        </Route>
+                </Route>
+        </Router>
 );