diff --git a/client/js/components/Preview.js b/client/js/components/Preview.js index d4dc511..c37b087 100644 --- a/client/js/components/Preview.js +++ b/client/js/components/Preview.js @@ -13,8 +13,7 @@ export default class Preview extends React.Component {
{posts[i].date}
-

{posts[i].title.toString()}

-

{posts[i].intro.toString()}

+

continue reading diff --git a/client/js/pages/Index.js b/client/js/pages/Index.js index 09602e2..c6aa2f3 100644 --- a/client/js/pages/Index.js +++ b/client/js/pages/Index.js @@ -23,7 +23,6 @@ export default class Index extends React.Component { this.page === 'post' ? this.props.actions.fetchPost(this.props.params.category, this.props.params.post) : ""; } - componentWillReceiveProps(nextProps) { if (this.props.params !== nextProps.params) { const params = nextProps.params; @@ -58,6 +57,6 @@ export default class Index extends React.Component { } } -const loadingElement =

+const loadingElement =
loading...
; diff --git a/metadata.js b/metadata.js index 6762140..fa3bce8 100644 --- a/metadata.js +++ b/metadata.js @@ -40,8 +40,8 @@ function parse_dir(dir, folder_name){ filename: post.slice(0, post.length - 3), category: folder_name, date: post.slice(0, 10), - title: tokens[0].text, - intro: tokens[1].text + title: `

${tokens[0].text}

`, + intro: marked(tokens[1].text) } json.posts.push(temp); } diff --git a/package.json b/package.json index 2ad0b69..72b6bf9 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "check_gzip_size": "gzip -9 -c ./public/client.min.js | wc -c | numfmt --to=iec-i --suffix=B --padding=10", "deploy" : "npm run get_dependencies && npm run prod && ./mywebsite", "dev": "webpack-dev-server --content-base public --inline --hot --history-api-fallback", - "get_dependencies": "npm install & go get ./server", + "get_dependencies": "go get ./server && npm install", "prod": "export NODE_ENV=production && webpack -p && babel-node metadata.js && go build ./server/mywebsite.go", "prod-win": "set NODE_ENV=production && webpack -p && babel-node metadata.js && go build ./server/mywebsite.go" },