mitchell/mywebsite
1
0
Fork 0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-11 18:32:50 +00:00
Code Issues Releases Wiki Activity

fixed routing

Browse Source
This commit is contained in:
mgerb42
2016-09-02 20:38:01 +00:00
parent 6bf367f9be
commit be5e95b6cf
6 changed files with 72 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/js/components/Post.js
View File

@@ -3,6 +3,9 @@ import marked from 'marked';
import React from 'react';
import {Link} from 'react-router';
//components
import Loading from './utils/Loading';
import '../../assets/scss/Content.scss';
const renderer = new marked.Renderer();
@@ -16,13 +19,25 @@ marked.setOptions({
export default class Post extends React.Component {
componentDidMount() {
const params = this.props.params;
this.props.actions.fetchPost(params.category, params.post);
}
render() {
const post = this.props.redux.post;
const fetched = this.props.redux.fetched;
const fetching = this.props.redux.fetching;
return (
<div class="Content">
<div dangerouslySetInnerHTML={{__html : marked(this.props.content, {renderer : renderer})}}>
{fetched ?
<div>
<div dangerouslySetInnerHTML={{__html : marked(post, {renderer : renderer})}}/>
<Link to="/" class="link"><i class="fa fa-caret-left" aria-hidden="true"></i> Home</Link>
</div>
: <Loading/>}
</div>
<Link to="/" class="link"><i class="fa fa-caret-left" aria-hidden="true"></i> Home</Link>
</div>
);
}
}