diff options
Diffstat (limited to 'scraper')
| -rw-r--r-- | scraper/client/app.js | 43 | ||||
| -rw-r--r-- | scraper/client/common/header.component.js | 28 | ||||
| -rw-r--r-- | scraper/client/common/index.js | 2 | ||||
| -rw-r--r-- | scraper/client/store.js | 3 | ||||
| -rw-r--r-- | scraper/client/util.js | 1 |
5 files changed, 48 insertions, 29 deletions
diff --git a/scraper/client/app.js b/scraper/client/app.js index a115041b..81152c0c 100644 --- a/scraper/client/app.js +++ b/scraper/client/app.js @@ -2,7 +2,7 @@ import React, { Component } from 'react' import { ConnectedRouter } from 'connected-react-router' import { Route, Switch } from 'react-router' -import { Header, Sidebar, Footer } from './common' +import { Header, Footer } from './common' // import * as Metadata from './metadata' // import * as Search from './search' // import * as Review from './review' @@ -14,7 +14,6 @@ export default class App extends Component { <div> <Header /> <div className='app'> - <Route path="/metadata/" component={Sidebar} /> <div className='body'> </div> </div> @@ -25,23 +24,23 @@ export default class App extends Component { } } - // <Route path="/search/" component={Search.Menu} /> - // <Route path="/metadata/:hash/" component={Metadata.Heading} /> - // <Switch> - // <Route exact path="/metadata/:hash/summary/" component={Metadata.Summary} /> - // <Route exact path="/metadata/:hash/mediaRecord/" component={Metadata.MediaRecord} /> - // <Route exact path="/metadata/:hash/mediaInfo/" component={Metadata.MediaInfo} /> - // <Route exact path="/metadata/:hash/keyframe/:frame/" component={Metadata.KeyframeSingle} /> - // <Route exact path="/metadata/:hash/keyframe/" component={Metadata.KeyframeList} /> - // <Route exact path="/metadata/:hash/coco/" component={Metadata.Coco} /> - // <Route exact path="/metadata/:hash/places365/" component={Metadata.Places365} /> - // <Route exact path="/metadata/:hash/sugarcube/" component={Metadata.Sugarcube} /> - // <Route exact path="/metadata/:hash/" component={Metadata.Summary} /> - // <Route exact path="/metadata/" render={() => <div className='notFound'><h4>NOT FOUND</h4></div>} /> - // <Route exact path="/search/" component={Search.Container} /> - // <Route exact path="/search/keyframe/:verified/:hash/:frame/" component={Search.Container} /> - // <Route exact path="/search/keyframe/:hash/:frame/" component={Search.Container} /> - // <Route exact path="/search/browse/:hash/" component={Search.Browse} /> - // <Route exact path="/search/random/" component={Search.Random} /> - // <Route exact path="/search/review/" component={Review.Saved} /> - // </Switch> +// <Route path="/search/" component={Search.Menu} /> +// <Route path="/metadata/:hash/" component={Metadata.Heading} /> +// <Switch> +// <Route exact path="/metadata/:hash/summary/" component={Metadata.Summary} /> +// <Route exact path="/metadata/:hash/mediaRecord/" component={Metadata.MediaRecord} /> +// <Route exact path="/metadata/:hash/mediaInfo/" component={Metadata.MediaInfo} /> +// <Route exact path="/metadata/:hash/keyframe/:frame/" component={Metadata.KeyframeSingle} /> +// <Route exact path="/metadata/:hash/keyframe/" component={Metadata.KeyframeList} /> +// <Route exact path="/metadata/:hash/coco/" component={Metadata.Coco} /> +// <Route exact path="/metadata/:hash/places365/" component={Metadata.Places365} /> +// <Route exact path="/metadata/:hash/sugarcube/" component={Metadata.Sugarcube} /> +// <Route exact path="/metadata/:hash/" component={Metadata.Summary} /> +// <Route exact path="/metadata/" render={() => <div className='notFound'><h4>NOT FOUND</h4></div>} /> +// <Route exact path="/search/" component={Search.Container} /> +// <Route exact path="/search/keyframe/:verified/:hash/:frame/" component={Search.Container} /> +// <Route exact path="/search/keyframe/:hash/:frame/" component={Search.Container} /> +// <Route exact path="/search/browse/:hash/" component={Search.Browse} /> +// <Route exact path="/search/random/" component={Search.Random} /> +// <Route exact path="/search/review/" component={Review.Saved} /> +// </Switch> diff --git a/scraper/client/common/header.component.js b/scraper/client/common/header.component.js index 650df5fc..d82a8db0 100644 --- a/scraper/client/common/header.component.js +++ b/scraper/client/common/header.component.js @@ -1,19 +1,39 @@ import React, { Component } from 'react' import { NavLink } from 'react-router-dom' +import { bindActionCreators } from 'redux' import { connect } from 'react-redux' +import * as actions from '../actions' + class Header extends Component { - componentDidMount(){ - + componentDidMount() { + this.props.actions.getInstitutions() + this.props.actions.getPapers() } + render() { + console.log(this.props) + let { papers } = this.props.api.papers + papers = papers || {} + const paperOptions = Object.keys(papers).map(key => ( + <option key={key} value={key}>{papers[key][1]}</option> + )) + console.log(papers) return ( + <header> + <select> + {paperOptions} + </select> + </header> ) } } const mapStateToProps = state => ({ - // hash: state.metadata.hash, + api: state.api +}) +const mapDispatchToProps = dispatch => ({ + actions: bindActionCreators({ ...actions }, dispatch), }) -export default connect(mapStateToProps)(Sidebar) +export default connect(mapStateToProps, mapDispatchToProps)(Header) diff --git a/scraper/client/common/index.js b/scraper/client/common/index.js index 7f4d9870..c5b4af5b 100644 --- a/scraper/client/common/index.js +++ b/scraper/client/common/index.js @@ -2,7 +2,6 @@ import ActiveLink from './activeLink.component' import Header from './header.component' import Footer from './footer.component' import Loader from './loader.component' -import Sidebar from './sidebar.component' import Gate from './gate.component' import { TableObject, TableArray, TableTuples, TableRow, TableCell } from './table.component' import './common.css' @@ -10,7 +9,6 @@ import './common.css' export { Header, Footer, - Sidebar, Loader, Gate, TableObject, diff --git a/scraper/client/store.js b/scraper/client/store.js index 08b6e801..9eae8939 100644 --- a/scraper/client/store.js +++ b/scraper/client/store.js @@ -8,6 +8,9 @@ import * as types from './types' // import metadataReducer from './metadata/metadata.reducer' const initialState = () => ({ + institutions: {}, + papers: {}, + address: {}, options: {} }) diff --git a/scraper/client/util.js b/scraper/client/util.js index ef93507e..b00a0061 100644 --- a/scraper/client/util.js +++ b/scraper/client/util.js @@ -115,7 +115,6 @@ export const get = (uri, data) => { } let opt = { method: 'GET', - body: data, headers, // credentials: 'include', } |