gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use public_folder to display images persisted with no path reference (#163)

Browse Source
This commit is contained in:
Cássio Souza
2016-11-17 11:41:54 -02:00
committed by GitHub
parent d81d0d416f
commit 007575d315
4 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/containers/CollectionPage.js
View File

@ -12,6 +12,7 @@ class CollectionPage extends React.Component {
static propTypes = {
collection: ImmutablePropTypes.map.isRequired,
collections: ImmutablePropTypes.orderedMap.isRequired,
publicFolder: PropTypes.string.isRequired,
dispatch: PropTypes.func.isRequired,
page: PropTypes.number,
entries: ImmutablePropTypes.list,
@ -37,7 +38,7 @@ class CollectionPage extends React.Component {
};
render() {
const { collections, collection, page, entries } = this.props;
const { collections, collection, publicFolder, page, entries } = this.props;
if (collections == null) {
return <h1>No collections defined in your config.yml</h1>;
}
@ -46,6 +47,7 @@ class CollectionPage extends React.Component {
<EntryListing
collections={collection}
entries={entries}
publicFolder={publicFolder}
page={page}
onPaginate={this.handleLoadMore}
>
@ -60,14 +62,15 @@ class CollectionPage extends React.Component {
function mapStateToProps(state, ownProps) {
const { collections } = state;
const { collections, config } = state;
const { name, slug } = ownProps.params;
const publicFolder = config.get('public_folder');
const collection = name ? collections.get(name) : collections.first();
const page = state.entries.getIn(['pages', collection.get('name'), 'page']);
const entries = selectEntries(state, collection.get('name'));
return { slug, collection, collections, page, entries };
return { slug, publicFolder, collection, collections, page, entries };
}
export default connect(mapStateToProps)(CollectionPage);