Skip to content

Commit

Permalink
curator landing page. Style matches curator listing on department page
Browse files Browse the repository at this point in the history
  • Loading branch information
emhavens authored and kjell committed Dec 3, 2015
1 parent 8197204 commit 8db03ba
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 8 deletions.
2 changes: 2 additions & 0 deletions routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ var ArtistsByLetter = require('./src/artists-by-letter')
var ObjectsById = require('./src/objects-by-id')
var Department = require('./src/department')
var Curator = require('./src/curator')
var Curators = require('./src/curators')
var Explore = require('./src/explore')
var Page = require('./src/page')
var Info = require('./src/info')
Expand All @@ -27,6 +28,7 @@ var routes = (
</Route>
<Route name="department" path="/departments/:dept" handler={Department} />
<Route name="curator" path="/curators/:slug" handler={Curator} />
<Route name="curators" path="/curators" handler={Curators} />
<Route name="explore" path="/explore" handler={Explore} />
<Route name="artistsByName" path="/search/artists/:letter" handler={ArtistsByLetter} />
<Route name="objectsById" path="/search/ids/:ids" handler={ObjectsById} />
Expand Down
8 changes: 7 additions & 1 deletion sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ a.departmentLink h2{
}

/* ===== DEPARTMENT PAGES ===== */
.departmentPage h2 {
.departmentPage h2, .curatorsPage h2 {
background: transparent;
font-size: 1.75em;
width: 100%;
Expand Down Expand Up @@ -704,6 +704,12 @@ a.departmentLink h2{
#curators a:hover {
opacity:.7;
}
.curatorsPage .curatorBio{
width: 45%;
margin-right: 2%;
margin-left: 2%;
float: left;
}
.curatorProfile.pageText {
margin-top: 4em;
}
Expand Down
51 changes: 51 additions & 0 deletions src/curators.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
var React = require('react')
var Router = require('react-router')
var Helmet = require('react-helmet')
var {Link} = Router

var Markdown = require('./markdown')
var rest = require('rest')


var Curators = React.createClass({
mixins: [Router.State],

statics: {
fetchData: {
curators: (params, query) => {
return rest("http://artsmia.github.io/collection-info/index.json").then((r) => JSON.parse(r.entity))
}
},
},

render() {
var curators = this.props.data.curators.curators

return <div>
<div className="explore-header"></div>
<div className="mdl-grid curatorsPage" id="curators">
<h2>Curators</h2>
{Object.keys(curators)
.filter(name => ['kaywin-feldman', 'matthew-welch'].indexOf(name) == -1)
.map(name => {
var curator = curators[name]

return <div className="mdl-cell curatorBio" key={curator.slug}>
<Link to="curator" params={{slug:curator.slug}}>
<div className="curatorPic">
<img src={curator.photo} alt={`portrait of ${curator.name}`} />
</div>
<div className="curator-intro">
<h4>{curator.name}</h4>
<h5><Markdown>{curator.title}</Markdown></h5>
</div>
</Link>
</div>
})}
</div>
<Helmet title="Curators" />
</div>
}
})

module.exports = Curators
9 changes: 2 additions & 7 deletions src/department.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,8 @@ var Department = React.createClass({

statics: {
fetchData: {
searchResults: (params, query) => {
params.terms = '*'
var name = findDepartment(params.dept)[0]
params.splat = 'department:"'+name+'"'
return SearchResults.fetchData.searchResults(params, query)
},
departments: (params, query) => {

curators: (params, query) => {
return rest("http://artsmia.github.io/collection-info/index.json").then((r) => JSON.parse(r.entity))
}
},
Expand Down

0 comments on commit 8db03ba

Please sign in to comment.