upgrade to [email protected]; fixes awslabs#14

Author: brettstack

dev-portal/package.json

@@ -13,7 +13,7 @@
     "jquery": "^3.1.1",
     "react": "^15.4.1",
     "react-dom": "^15.4.1",
-    "react-router": "^4.0.0-alpha.6",
+    "react-router-dom": "^4.0.0-beta.4",
     "semantic-ui-css": "^2.2.4",
     "semantic-ui-react": "^0.61.2"
   },

dev-portal/src/components/ApiCatalog/index.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Link } from 'react-router'
+import { Link } from 'react-router-dom'
 import { Button, Card, Image, Dropdown } from 'semantic-ui-react'
 import { addSubscription, unsubscribe, isSubscribed } from '../../services/api-catalog'
 import { isAuthenticated } from '../../services/self'

dev-portal/src/components/App/index.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import {BrowserRouter, Match, Miss, Redirect, Link} from 'react-router'
+import { BrowserRouter, Route, Redirect, Link, Switch } from 'react-router-dom'
 import { Dimmer, Loader } from 'semantic-ui-react'
 import Home from '../../pages/Home'
 import CaseStudies from '../../pages/CaseStudies'
@@ -35,7 +35,7 @@ class MatchWhenAuthorized extends React.Component { // eslint-disable-line
   render() {
     const {component: Component, ...rest} = this.props
 
-    return <Match {...rest} render={props => {
+    return <Route {...rest} render={props => {
       if (!isAuthenticated()) return <Redirect to={{ pathname: '/', state: { from: props.location } }}/>
 
       return this.state.apiGatewayClient ? <Component {...props} />: (<Dimmer active>
@@ -67,14 +67,15 @@ export default class App extends React.Component {
           </div>
           <section className="App-intro">
               <AlertPopup />
-
-              <Match exactly pattern="/" component={Home} />
-              <Match pattern="/case-studies" component={CaseStudies} />
-              <Match pattern="/getting-started" component={GettingStarted} />
-              <Match pattern="/dashboard" component={Dashboard}/>
-              <Match exactly pattern="/apis" component={Apis}/>
-              <Match pattern="/apis/:apiId" component={ApiDetails}/>
-              <Miss component={NoMatch}/>
+              <Switch>
+                <Route exact path="/" component={Home} />
+                <Route path="/case-studies" component={CaseStudies} />
+                <Route path="/getting-started" component={GettingStarted} />
+                <Route path="/dashboard" component={Dashboard}/>
+                <Route exact path="/apis" component={Apis}/>
+                <Route path="/apis/:apiId" component={ApiDetails}/>
+                <Route component={NoMatch}/>
+              </Switch>
           </section>
         </div>
       </BrowserRouter>

dev-portal/src/components/Head/index.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Breadcrumb, Button, Popup } from 'semantic-ui-react'
-import { Link, Redirect} from 'react-router'
+import { Link, Redirect} from 'react-router-dom'
 import { logout, showApiKey, isAuthenticated } from '../../services/self'
 import { getApi } from '../../services/api-catalog'
 

dev-portal/src/components/Register/index.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Button, Form, Message, Modal } from 'semantic-ui-react'
-import { Redirect } from 'react-router'
+import { Redirect } from 'react-router-dom'
 import { register } from '../../services/self'
 
  export default class Register extends React.Component {

dev-portal/src/components/SignIn/index.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Button, Form, Message, Modal } from 'semantic-ui-react'
-import { Redirect } from 'react-router'
+import { Redirect } from 'react-router-dom'
 import { login } from '../../services/self'
 
  export default class SignIn extends React.Component {

dev-portal/src/pages/Home.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Link } from 'react-router'
+import { Link } from 'react-router-dom'
 import { Container, Segment, Divider, Card } from 'semantic-ui-react'
 import SignIn from '../components/SignIn'
 import Register from '../components/Register'