Merge pull request #323 from Aloso/year-date-on-homepage

Add publish date and author to posts

Author: steveklabnik

src/main.rs

@@ -7,7 +7,7 @@ use std::{
 
 use comrak::ComrakOptions;
 
-use handlebars::Handlebars;
+use handlebars::{Handlebars, Helper, Context, RenderContext, Output, HelperResult, RenderError};
 
 use serde_derive::{Deserialize, Serialize};
 use serde_json::json;
@@ -26,6 +26,7 @@ struct Post {
     title: String,
     author: String,
     year: String,
+    show_year: bool,
     month: String,
     day: String,
     contents: String,
@@ -38,6 +39,29 @@ struct YamlHeader {
     author: String,
 }
 
+fn hb_month_helper<'a>(h: &Helper, _b: &Handlebars, _ctx: &Context, _rc: &mut RenderContext,
+                      out: &mut Output) -> HelperResult {
+    let num: u32 = h.param(0).unwrap().value().as_str().unwrap().parse()
+        .or_else(|_| Err(RenderError::new("The value is not a number")))?;
+    let name = match num {
+        1  => "Jan.",
+        2  => "Feb.",
+        3  => "Mar.",
+        4  => "Apr.",
+        5  => "May",
+        6  => "June",
+        7  => "July",
+        8  => "Aug.",
+        9  => "Sept.",
+        10 => "Oct.",
+        11 => "Nov.",
+        12 => "Dec.",
+        _  => "Error!",
+    };
+    out.write(name)?;
+    Ok(())
+}
+
 impl Blog {
     fn new<T>(out_directory: T, posts_directory: T) -> Result<Blog, Box<Error>>
     where
@@ -49,6 +73,8 @@ impl Blog {
 
         handlebars.register_templates_directory(".hbs", "templates")?;
 
+        handlebars.register_helper("month_name", Box::new(hb_month_helper));
+
         let posts = Blog::load_posts(posts_directory.into())?;
 
         Ok(Blog {
@@ -105,6 +131,7 @@ impl Blog {
                 title,
                 author,
                 year,
+                show_year: false,
                 month,
                 day,
                 contents,
@@ -120,6 +147,10 @@ impl Blog {
 
         posts.reverse();
 
+        for i in 1 .. posts.len() {
+            posts[i].show_year = posts[i - 1].year != posts[i].year;
+        }
+
         Ok(posts)
     }
 

src/styles/app.scss

@@ -145,6 +145,18 @@ div.brand {
   }
 }
 
+table.post-list a {
+  text-decoration: none;
+}
+table.post-list a:hover {
+  text-decoration: underline;
+}
+
+.publish-date-author {
+  color: $gray;
+  margin: -60px 0 60px 0;
+}
+
 footer {
   padding: 30px 0;
   background-color: black;

templates/index.hbs

@@ -9,11 +9,20 @@
 
 <section id="posts" class="purple">
    <div class="w-100 mw-none ph3 mw8-m mw9-l center f3">
-    <ul>
+
+    <table class="post-list collapse w-100 f2-l f2-m f3-s">
     {{#each posts}}
-      <li><h3><a href="{{url}}">{{title}}</a></h3></li>
+      {{#if show_year}}<tr>
+        <td class="bn"></td>
+        <td class="bn"><h3 class="f0-l f1-m f2-s mt4 mb0">{{year}}</h3></td>
+      </tr>{{/if}}
+      <tr>
+        <td class="tr o-60 pr4 pr5-l bn">{{month_name month}}&nbsp;{{day}}</td>
+        <td class="bn"><a href="{{url}}">{{title}}</a></td>
+      </tr>
     {{/each}}
-    </ul>
+    </table>
+
   </div>
 </section>
 {{/inline}}

templates/post.hbs

@@ -6,6 +6,8 @@
       <div class="highlight"></div>
     </header>
 
+    <div class="publish-date-author">{{month_name post.month}} {{post.day}}, {{post.year}} &middot; {{post.author}}</div>
+
     <div class="post">
       {{{ post.contents }}}
     </div>