(WIP) Fix for routing

Author: timothyis

components/Layout.js

@@ -23,11 +23,16 @@ class Layout extends React.Component {
 
   componentWillReceiveProps(nextProps) {
     const { router } = nextProps
+    console.log(router.asPath)
     if (!/^\/search/.exec(router.asPath)) {
       this.setState({
         searchQuery: null,
         originalURL: router.asPath
       })
+    } else {
+      this.setState({
+        originalURL: router.asPath
+      })
     }
   }
 
@@ -59,13 +64,20 @@ class Layout extends React.Component {
   }
 
   render() {
+    console.log(
+      this.state && this.state.searchQuery,
+      this.props.query,
+      this.props.router
+    )
     return (
       <div className="main">
         <Meta />
 
         <Header handleSearch={this.handleSearch} />
 
-        {(this.state && this.state.searchQuery) || this.props.query ? (
+        {(this.state && this.state.searchQuery) ||
+        this.props.query ||
+        this.props.router.query.q ? (
           <SearchList
             query={
               this.state && this.state.searchQuery

yarn.lock

@@ -1132,8 +1132,8 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
 caniuse-lite@^1.0.30000792:
-  version "1.0.30000820"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000820.tgz#6e36ee75187a2c83d26d6504a1af47cc580324d2"
+  version "1.0.30000830"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000830.tgz#cb96b8a2dd3cbfe04acea2af3c4e894249095328"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"