diff --git a/react/app.js b/react/app.js index e8aa7ea5..212713c0 100644 --- a/react/app.js +++ b/react/app.js @@ -1,13 +1,20 @@ import React from 'react'; import { Route, Switch } from 'react-router-dom'; -import routes from './routes'; +import PublishPage from 'components/PublishPage'; +import AboutPage from 'components/AboutPage'; +import LoginPage from 'containers/LoginPage'; +import ShowPage from 'containers/ShowPage'; +import FourOhFourPage from 'components/FourOhFourPage'; const App = () => { return ( - {routes.map((route, index) => ( - - ))} + + + + + + ); }; diff --git a/react/components/AssetDisplay/view.jsx b/react/components/AssetDisplay/view.jsx index ecac5e6d..733f1bd1 100644 --- a/react/components/AssetDisplay/view.jsx +++ b/react/components/AssetDisplay/view.jsx @@ -8,7 +8,6 @@ class AssetDisplay extends React.Component { this.props.onFileRequest(name, claimId); } render () { - console.log('rendering assetdisplay', this.props); const { status, error, asset: { claimData: { name, claimId, contentType, fileExt, thumbnail } } } = this.props; return (
diff --git a/react/routes.js b/react/routes.js deleted file mode 100644 index 9bc9c0ae..00000000 --- a/react/routes.js +++ /dev/null @@ -1,33 +0,0 @@ -import PublishPage from 'components/PublishPage'; -import AboutPage from 'components/AboutPage'; -import LoginPage from 'containers/LoginPage'; -import ShowPage from 'containers/ShowPage'; -import FourOhFourPage from 'components/FourOhFourPage'; - -const routes = [ - { path : '/', - exact : true, - component: PublishPage, - }, - { path : '/about', - exact : true, - component: AboutPage, - }, - { path : '/login', - exact : true, - component: LoginPage, - }, - { path : '/:identifier/:claim', - exact : true, - component: ShowPage, - }, - { path : '/:claim', - exact : true, - component: ShowPage, - }, - { - component: FourOhFourPage, - }, -]; - -export default routes;