Merge pull request #30 from JosephKiranBabu/display-post-author

Display post author and date in the post view
This commit is contained in:
Baptiste Gelez 2018-05-19 08:44:39 +01:00 committed by GitHub
commit 73512a4fdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions

View File

@ -20,7 +20,14 @@ fn details(blog: String, slug: String, conn: DbConn, user: Option<User>) -> Temp
let blog = Blog::find_by_fqn(&*conn, blog).unwrap(); let blog = Blog::find_by_fqn(&*conn, blog).unwrap();
let post = Post::find_by_slug(&*conn, slug).unwrap(); let post = Post::find_by_slug(&*conn, slug).unwrap();
let comments = Comment::find_by_post(&*conn, post.id); let comments = Comment::find_by_post(&*conn, post.id);
Template::render("posts/details", json!({ Template::render("posts/details", json!({
"author": ({
let author = &post.get_authors(&*conn)[0];
let mut json = serde_json::to_value(author).unwrap();
json["fqn"] = serde_json::Value::String(author.get_fqn(&*conn));
json
}),
"post": post, "post": post,
"blog": blog, "blog": blog,
"comments": comments.into_iter().map(|c| { "comments": comments.into_iter().map(|c| {
@ -32,7 +39,8 @@ fn details(blog: String, slug: String, conn: DbConn, user: Option<User>) -> Temp
}).collect::<Vec<serde_json::Value>>(), }).collect::<Vec<serde_json::Value>>(),
"n_likes": post.get_likes(&*conn).len(), "n_likes": post.get_likes(&*conn).len(),
"has_liked": user.clone().map(|u| u.has_liked(&*conn, &post)).unwrap_or(false), "has_liked": user.clone().map(|u| u.has_liked(&*conn, &post)).unwrap_or(false),
"account": user "account": user,
"date": &post.creation_date.timestamp()
})) }))
} }

View File

@ -9,6 +9,11 @@
{% endblock header %} {% endblock header %}
{% block content %} {% block content %}
<h1><a href="/@/{{ author.fqn }}/">{{ author.display_name }}</a></h1>
<div>
{{ date | date(format="%B %e, %Y") }}
</div>
<br/>
<h1>{{ post.title }}</h1> <h1>{{ post.title }}</h1>
<article> <article>
{{ post.content | safe }} {{ post.content | safe }}