1
0
mirror of https://github.com/mgerb/mywebsite synced 2026-01-10 18:02:51 +00:00

New post - more css changes (date)

This commit is contained in:
2016-08-25 23:52:53 -05:00
parent a2642c39b2
commit 58fb665ce2
8 changed files with 82 additions and 39 deletions

View File

@@ -1,7 +1,10 @@
import React from 'react';
import {Link} from 'react-router';
import marked from 'marked';
import hljs from 'highlight.js';
import '../../assets/scss/Content.scss';
const renderer = new marked.Renderer();
marked.setOptions({
@@ -15,7 +18,10 @@ export default class Post extends React.Component{
render(){
return(
<div class="Preview" dangerouslySetInnerHTML={{__html : marked(this.props.content, {renderer : renderer})}}>
<div class="Content">
<div dangerouslySetInnerHTML={{__html : marked(this.props.content, {renderer : renderer})}}>
</div>
<Link to="/" class="link"><i class="fa fa-caret-left" aria-hidden="true"></i> Home</Link>
</div>
);
}

View File

@@ -1,7 +1,7 @@
import React from 'react';
import {Link} from 'react-router';
import '../../assets/scss/Preview.scss';
import '../../assets/scss/Content.scss';
export default class Preview extends React.Component{
@@ -17,7 +17,7 @@ export default class Preview extends React.Component{
<p>{posts[i].intro.toString()}</p>
<p>
<Link class="link" to={`/post/${posts[i].category}/${posts[i].filename}`}>
continue reading...
continue reading <i class="fa fa-caret-right" aria-hidden="true"></i>
</Link>
</p>
</div>
@@ -31,7 +31,7 @@ export default class Preview extends React.Component{
const posts = this.props.posts;
return (
<div class="Preview">
<div class="Content">
{posts.length > 0 ? this.insertPosts(posts): ""}
</div>
);

View File

@@ -37,10 +37,8 @@ export default class Index extends React.Component {
<div class="Layout" >
<Header />
<div class="Main">
<div class="Content">
{typeof this.page === 'undefined' ? <Preview posts={this.props.redux.preview.posts} /> : ""}
{this.page === 'post' ? <Post content={this.props.redux.post}/> : ""}
</div>
<Sidebar />
</div>
<Footer />