From 611fef9ac2a1c18959eac53aa2723f86e4ac9ec4 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Fri, 25 Apr 2014 17:29:15 -0700
Subject: [PATCH 01/16] Remove "upvoted template"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was breaking the website, as the “upvoted” template was defined in
viewPost.html
---
 client/comments/view/viewComment.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/comments/view/viewComment.html b/client/comments/view/viewComment.html
index 2a16d71..15d4110 100644
--- a/client/comments/view/viewComment.html
+++ b/client/comments/view/viewComment.html
@@ -19,7 +19,3 @@
     </div>
   {{/each}}
 </template>
-
-<template name="upvoted">
-  nonvoted
-</template>

From 956684bd56c695f6ee731bf197da83301e4de0e0 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Mon, 28 Apr 2014 17:22:48 -0700
Subject: [PATCH 02/16] Simplify comments

---
 .meteor/packages                         |  1 -
 client/comments/view/viewComment.html    | 15 ++++++++-------
 client/comments/view/viewComment.js      |  6 ++++++
 client/comments/view/viewComment.less    | 19 ++++++++++++++++++-
 client/global/header/globalHeader.html   |  8 ++++++--
 client/global/index.html                 |  1 -
 client/global/style/style.less           |  8 +++++++-
 client/global/wrapper/globalWrapper.html |  9 ++++++---
 client/posts/list/listPosts.html         |  2 +-
 client/posts/view/viewPost.html          | 13 +++++++------
 client/posts/view/viewPost.js            |  2 +-
 client/posts/view/viewPost.less          | 16 ++++++++++++++--
 server/hn/readHn.js                      | 10 +++++-----
 shared/router.js                         | 15 ++++++++-------
 14 files changed, 87 insertions(+), 38 deletions(-)
 create mode 100644 client/comments/view/viewComment.js

diff --git a/.meteor/packages b/.meteor/packages
index f8f4397..27aae4a 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -14,7 +14,6 @@ insecure
 fast-render
 iron-router-progress
 bootstrap3-less
-appcache
 power-queue
 reactive-list
 http
diff --git a/client/comments/view/viewComment.html b/client/comments/view/viewComment.html
index 15d4110..0d0eace 100644
--- a/client/comments/view/viewComment.html
+++ b/client/comments/view/viewComment.html
@@ -1,14 +1,15 @@
 <template name="viewComment">
   {{#if text}}
-  <div class="nonvoted post" data-id="{{id}}">
+  <div class="nonvoted post comment" data-id="{{id}}">
     <div class="media">
-      <div href="#" class="pull-left">
-        {{>vote}}
-      </div>
+      {{#if currentUser}}
+        <div href="#" class="pull-left">
+          {{>vote}}
+        </div>
+      {{/if}}
       <div class="media-body">
-
-        <p class="caption">{{points}} points by {{author}} at <abbr title="{{created_at}}"><time datetime="{{created_at}}">{{created_at}}</time></abbr></p>
-        <p class="commentText">{{{text}}}</p>
+        <p class="author caption"><a href="https://news.ycombinator.com/user?id={{author}}">{{author}}</a></p>
+        <p class="commentText">{{{cleanText}}}</p>
       </div>
     </div>
   </div>
diff --git a/client/comments/view/viewComment.js b/client/comments/view/viewComment.js
new file mode 100644
index 0000000..5e285ec
--- /dev/null
+++ b/client/comments/view/viewComment.js
@@ -0,0 +1,6 @@
+Template.viewComment.helpers({
+  'cleanText' : function () {
+    // replace '\n' with a newline character
+    return this.text.replace(/\\n/g, "\n");
+  }
+});
diff --git a/client/comments/view/viewComment.less b/client/comments/view/viewComment.less
index 6de6a74..e32e2e4 100644
--- a/client/comments/view/viewComment.less
+++ b/client/comments/view/viewComment.less
@@ -1,4 +1,21 @@
+.comment {
+  .commentText {
+    margin-top: 0.5rem;
+    max-width: 35rem;
+
+    p {
+      margin-top: 0.5rem;
+    }
+  }
+
+  .commentAuthor {
+    margin-top: 0.2rem;
+    margin-bottom: 0;
+  }
+}
+
 .indent {
   padding-left: 1rem;
-  background-color: #F9FAFB;
+  background-color: white;
+  border-left: 3px solid #F9FAFB;
 }
diff --git a/client/global/header/globalHeader.html b/client/global/header/globalHeader.html
index c05f26c..5e18b1a 100644
--- a/client/global/header/globalHeader.html
+++ b/client/global/header/globalHeader.html
@@ -1,7 +1,8 @@
 <template name="header">
   <div class="header">
-    <nav class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+    <nav class="navbar navbar-fixed-top navbar-inverse push-both" role="navigation">
       <div class="container">
+        <div class="col-sm-6">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-9">
             <span class="sr-only">Toggle navigation</span>
@@ -69,21 +70,24 @@
                   {{/if}}
                 {{/if}}
                 {{#if currentUser}}
+                <!--
                   <li class="dropdown">
                     <a href="/" class="dropdown-toggle" data-toggle="dropdown">{{currentUser.username}}<b class="caret"></b></a>
                     <ul class="dropdown-menu" role="menu">
-                      <!--<li><a href="/user/{{currentUser.username}}">Profile</a></li>-->
+                      <li><a href="/user/{{currentUser.username}}">Profile</a></li>
                       <li><a href="/sign-out">Sign Out</a></li>
                     </ul>
                   </li>
                   {{else}}
                   <li><a href="/sign-in">Sign In</a></li>
                   <li class="highlight"><a href="/sign-up">Sign Up</a></li>
+                -->
                 {{/if}}
               {{/unless}}
           </ul>
         </div>
       </div>
+    </div>
     </nav>
   </div>
 </template>
diff --git a/client/global/index.html b/client/global/index.html
index 0aeb280..0cdbac9 100644
--- a/client/global/index.html
+++ b/client/global/index.html
@@ -2,5 +2,4 @@
   <title>Fraction</title>
   <link rel="icon" type="image/png" href="/img/favicon.png" />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
-  <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
 </head>
diff --git a/client/global/style/style.less b/client/global/style/style.less
index 74bc4f1..273c4d5 100644
--- a/client/global/style/style.less
+++ b/client/global/style/style.less
@@ -8,7 +8,8 @@ html {
 
 body {
   line-height: 1.3rem;
-  font-family: 'Open Sans', sans-serif;
+  font-family: "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+  font-weight: 400;
   background-color: hsl(210, 20%, 98%);
 }
 
@@ -23,3 +24,8 @@ a {
     text-decoration: none;
   }
 }
+
+.push-both {
+  margin-left: auto;
+  margin-right: auto;
+}
diff --git a/client/global/wrapper/globalWrapper.html b/client/global/wrapper/globalWrapper.html
index 41fcf28..6bb0ae7 100644
--- a/client/global/wrapper/globalWrapper.html
+++ b/client/global/wrapper/globalWrapper.html
@@ -1,9 +1,12 @@
 <template name="wrapper">
   {{>header}}
   <div class="wrapper container">
-    <div class="content">
-      {{>yield}}
+    <div class="col-sm-6">
+      <div class="content">
+        {{>yield}}
+      </div>
+      {{>footer}}
     </div>
-    {{>footer}}
+
   </div>
 </template>
diff --git a/client/posts/list/listPosts.html b/client/posts/list/listPosts.html
index dc875d6..f613b9b 100644
--- a/client/posts/list/listPosts.html
+++ b/client/posts/list/listPosts.html
@@ -1,7 +1,7 @@
 <template name="feed">
   <div class="feed">
     {{#each posts}}
-      {{> post}}
+      {{> viewPost}}
     {{/each}}
   </div>
 </template>
diff --git a/client/posts/view/viewPost.html b/client/posts/view/viewPost.html
index df40bf9..3e749f8 100644
--- a/client/posts/view/viewPost.html
+++ b/client/posts/view/viewPost.html
@@ -1,4 +1,4 @@
-<template name="post">
+<template name="viewPost">
   <div class="{{previousVote}} post" data-id="{{_id}}">
     <div class="media">
       {{#if currentUser}}
@@ -8,12 +8,13 @@
       {{/if}}
       <div class="media-body">
         <a href="{{url}}" class="title" target="_blank">{{title}}</a>
-        <p class="caption">{{totalPoints}} points by <a href="{{authorLink}}">{{author}}</a> <abbr title="{{createdAt}}"><time datetime="{{createdAt}}">{{timeCopy}}</time> ago</abbr> with <a href="{{commentLink}}">{{oldComments}} comments</a></p>
+        <p class="caption">{{totalPoints}} points and <a href="{{commentLink}}">{{oldComments}} comments</a> from <abbr title="{{createdAt}}"><time datetime="{{createdAt}}">{{timeCopy}}</time> ago</abbr> by <a href="{{authorLink}}">{{author}}</a></p>
       </div>
     </div>
   </div>
-</template>
-
-<template name="upvoted">
-  nonvoted
+  <div class="listComments">
+    {{#each oldChildren}}
+      {{>viewComment}}
+    {{/each}}
+  </div>
 </template>
diff --git a/client/posts/view/viewPost.js b/client/posts/view/viewPost.js
index 25752c1..62aea76 100644
--- a/client/posts/view/viewPost.js
+++ b/client/posts/view/viewPost.js
@@ -42,7 +42,7 @@ var timeSince = function (date) {
   return timeString(interval, 'second');
 };
 
-Template.post.helpers({
+Template.viewPost.helpers({
   previousVote: function () {
     "use strict";
 
diff --git a/client/posts/view/viewPost.less b/client/posts/view/viewPost.less
index d6680c4..b198d65 100644
--- a/client/posts/view/viewPost.less
+++ b/client/posts/view/viewPost.less
@@ -4,7 +4,7 @@
   padding: 0.5rem;
   padding-left: 1rem;
   background-color: white;
-  margin-bottom: 1px;
+  border-bottom: 1px solid #F9FAFB;
   border-left: 3px solid #F9FAFB;
 
   &.upvoted {
@@ -23,15 +23,27 @@
 
   .title {
     display: inline-block;
-    margin-top: 0.2rem;
     font-size: 1.1rem;
     color: #303540;
+    font-weight: 500;
+    margin-top: 0.2rem;
   }
 
   .caption {
+
+    &.author a {
+      color: hsl(221, 14%, 22%);
+      font-weight: 500;
+    }
+
     font-size: 1rem;
+    font-weight: 300;
     color: @gray-color;
     margin-bottom: 1px;
+    a {
+      color: hsl(210, 16%, 76%);
+      font-weight: 500;
+    }
   }
 
   abbr {
diff --git a/server/hn/readHn.js b/server/hn/readHn.js
index 192072c..ab85139 100644
--- a/server/hn/readHn.js
+++ b/server/hn/readHn.js
@@ -48,16 +48,16 @@ var readHn = function (before) {
   );
 };
 
-Meteor.setInterval(function () {         // 720 rph
+Meteor.setInterval(function () {         // 630rph
   "use strict";
   readHn(60 * 60);                       // hour      - 21 requests
-  readHn(24 * 60 * 60);                  // day       - 21 requests
-}, 3.5 * 60 * 1000);                     // read every 3.5 minutes
+}, 3.5 * 60 * 1000);                     // read every 2 minutes
 
-Meteor.setInterval(function () {         // 189 rph
+Meteor.setInterval(function () {         // 370 rph
   "use strict";
+  readHn(24 * 60 * 60);                  // day       - 21 requests
   readHn(7 * 24 * 60 * 60);              // week      - 21 requests
   readHn(31 * 24 * 60 * 60);             // month     - 21 requests
   readHn(31 * 24 * 60 * 60);             // year      - 21 requests
   readHn(Math.floor(Date.now() / 1000)); // ever      - 21 requests
-}, 20 * 60 * 1000);                      // read every 20 minutes
+}, 20 * 60 * 1000);                      // read every 17 minutes
diff --git a/shared/router.js b/shared/router.js
index 97141c1..aa7d47e 100644
--- a/shared/router.js
+++ b/shared/router.js
@@ -2,6 +2,8 @@ Router.configure({
   layoutTemplate: 'wrapper'
 });
 
+Router.onBeforeAction('loading');
+
 Router.map(function () {
   "use strict";
   this.route('home', {
@@ -13,18 +15,17 @@ Router.map(function () {
 
   this.route('hnPost', {
     path: '/hn/:id',
-    template: 'listComments',
+    template: 'viewPost',
     waitOn: function () {
       var id = this.params.id.toLowerCase();
       return Meteor.subscribe('hnPost', id);
     },
     data: function () {
-      var templateData = {
-        currentView: 'Hacker News',
-        post: Posts.findOne({}, {
-          reactive: false
-        })
-      };
+      var templateData = Posts.findOne({}, {
+        reactive: false
+      });
+
+      templateData.currentView = 'Comments';
 
       return templateData;
     }

From c92e3bbc4e786eae3199396b82af9e6c9e8dbdfc Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Mon, 28 Apr 2014 17:23:38 -0700
Subject: [PATCH 03/16] Add 'use strict'

---
 client/comments/view/viewComment.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/comments/view/viewComment.js b/client/comments/view/viewComment.js
index 5e285ec..53005d1 100644
--- a/client/comments/view/viewComment.js
+++ b/client/comments/view/viewComment.js
@@ -1,5 +1,6 @@
 Template.viewComment.helpers({
   'cleanText' : function () {
+    "use strict";
     // replace '\n' with a newline character
     return this.text.replace(/\\n/g, "\n");
   }

From f67b91b77129b889bfd13b067f0ecb973ac84313 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 15:24:51 -0700
Subject: [PATCH 04/16] Add sidebar and make it pretty

---
 client/global/style/style.less           |  1 -
 client/global/wrapper/globalWrapper.html | 73 ++++++++++++++++++++++--
 client/global/wrapper/globalWrapper.less | 11 +++-
 client/global/wrapper/sidebar.js         |  0
 client/global/wrapper/sidebar.less       | 49 ++++++++++++++++
 client/posts/view/viewPost.html          |  3 +-
 client/posts/view/viewPost.js            |  6 +-
 client/posts/view/viewPost.less          | 11 ++--
 server/hn/readHn.js                      |  1 +
 server/posts/publishPosts.js             | 10 +---
 shared/router.js                         | 16 +++---
 11 files changed, 151 insertions(+), 30 deletions(-)
 create mode 100644 client/global/wrapper/sidebar.js
 create mode 100644 client/global/wrapper/sidebar.less

diff --git a/client/global/style/style.less b/client/global/style/style.less
index 273c4d5..897a3b0 100644
--- a/client/global/style/style.less
+++ b/client/global/style/style.less
@@ -10,7 +10,6 @@ body {
   line-height: 1.3rem;
   font-family: "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
   font-weight: 400;
-  background-color: hsl(210, 20%, 98%);
 }
 
 a {
diff --git a/client/global/wrapper/globalWrapper.html b/client/global/wrapper/globalWrapper.html
index 6bb0ae7..669c545 100644
--- a/client/global/wrapper/globalWrapper.html
+++ b/client/global/wrapper/globalWrapper.html
@@ -1,12 +1,77 @@
 <template name="wrapper">
-  {{>header}}
-  <div class="wrapper container">
-    <div class="col-sm-6">
+  <div class="wrapper">
+      <div class="sidebar col-sm-2" data-spy="affix" data-offset-top="200" data-offset-bottom="200">
+        <a class="title" href="/"><img src="/img/logo.svg"> Fraction</a>
+        <ul class="list-group">
+          <li class="list-header list-group-item">
+            <i class="fa fa-sort"></i>
+            <strong>SORT</strong>
+          </li>
+          {{#if sortHot}}
+            <a href="/hot" class="active list-group-item"><i class="fa fa-fire"></i> Hot</a>
+          {{else}}
+            <a href="/hot" class="list-group-item"><i class="fa fa-fire"></i> Hot</a>
+          {{/if}}
+          {{#if sortTop}}
+            <a href="/top/week" class="active list-group-item"><i class="fa fa-star"></i> Top</a>
+          {{else}}
+            <a href="/top/week" class="list-group-item"><i class="fa fa-star"></i> Top</a>
+          {{/if}}
+          {{#if sortRecent}}
+            <a href="/recent" class="active list-group-item"><i class="fa fa-clock-o"></i> Recent</a>
+          {{else}}
+            <a href="/recent" class="list-group-item"><i class="fa fa-clock-o"></i> Recent</a>
+          {{/if}}
+          {{#if sortRandom}}
+            <a href="/random" class="active list-group-item"><i class="fa fa-random"></i> Random</a>
+          {{else}}
+            <a href="/random" class="list-group-item"><i class="fa fa-random"></i> Random</a>
+          {{/if}}
+          {{#if sortTop}}
+            <li class="list-group-item"></li>
+            <li class="list-header list-group-item">
+              <i class="fa fa-calendar"></i>
+              <strong>TIME</strong>
+            </li>
+            {{#if timeHour}}
+              <a class="active list-group-item" href="/{{toLowerCase sortType}}/hour">Hour</a>
+              {{else}}
+              <a class="list-group-item" href="/{{toLowerCase sortType}}/hour">Hour</a>
+            {{/if}}
+            {{#if timeDay}}
+              <a class="active list-group-item" href="/{{toLowerCase sortType}}/day">Day</a>
+              {{else}}
+              <a class="list-group-item" href="/{{toLowerCase sortType}}/day">Day</a>
+            {{/if}}
+            {{#if timeWeek}}
+              <a class="active list-group-item" href="/{{toLowerCase sortType}}/week">Week</a>
+              {{else}}
+              <a class="list-group-item" href="/{{toLowerCase sortType}}/week">Week</a>
+            {{/if}}
+            {{#if timeFortnight}}
+              <a class="active list-group-item" href="/{{toLowerCase sortType}}/fortnight">Fortnight</a>
+              {{else}}
+              <a class="list-group-item" href="/{{toLowerCase sortType}}/fortnight">Fortnight</a>
+            {{/if}}
+            {{#if timeMonth}}
+              <a class="active list-group-item" href="/{{toLowerCase sortType}}/month">Month</a>
+              {{else}}
+              <a class="list-group-item" href="/{{toLowerCase sortType}}/month">Month</a>
+            {{/if}}
+            {{#if timeEver}}
+              <a class="active list-group-item" href="/{{toLowerCase sortType}}/ever">Ever</a>
+              {{else}}
+              <a class="list-group-item" href="/{{toLowerCase sortType}}/ever">Ever</a>
+            {{/if}}
+          {{/if}}
+        </ul>
+      </div>
+    <div class="col-sm-10 col-sm-offset-2">
+      <h3 class="currentView">{{currentView}}</h3>
       <div class="content">
         {{>yield}}
       </div>
       {{>footer}}
     </div>
-
   </div>
 </template>
diff --git a/client/global/wrapper/globalWrapper.less b/client/global/wrapper/globalWrapper.less
index 7c58ada..a5f4d49 100644
--- a/client/global/wrapper/globalWrapper.less
+++ b/client/global/wrapper/globalWrapper.less
@@ -1,6 +1,11 @@
 .wrapper {
-  margin-top: 50px;
-  &.container {
-    padding: 0;
+  .currentView {
+    margin-top: 1rem;
+    padding-left: 0.5rem;
+    margin-bottom: 0;
+    border-bottom: 1px solid #F9FAFB;
+    padding-bottom: 1rem;
+    color: hsl(210, 16%, 73%);
+    font-weight: 300;
   }
 }
diff --git a/client/global/wrapper/sidebar.js b/client/global/wrapper/sidebar.js
new file mode 100644
index 0000000..e69de29
diff --git a/client/global/wrapper/sidebar.less b/client/global/wrapper/sidebar.less
new file mode 100644
index 0000000..8bddbf1
--- /dev/null
+++ b/client/global/wrapper/sidebar.less
@@ -0,0 +1,49 @@
+@import "/client/global/style/variables.import.less";
+
+.sidebar {
+  background-color: hsl(210, 12%, 23%);
+  padding-left: 0;
+  padding-right: 0;
+
+  @media @sm {
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+  }
+
+  .title {
+    background-color: #4E86FE;
+    display: inline-block;
+    padding: 1rem;
+    color: white;
+    font-weight: 500;
+    font-size: 1rem;
+    width: 100%;
+    img {
+      margin-top: -0.25rem;
+      width: 2rem;
+    }
+  }
+
+  .list-group-item {
+    border-color: transparent;
+    background-color: hsl(210, 12%, 23%);
+    color: hsl(210, 16%, 76%);
+    &:hover {
+      background-color: hsl(210, 6%, 54%);
+    }
+  }
+
+  .list-header {
+    color: hsl(210, 6%, 54%);
+    &:hover {
+      background-color: hsl(210, 12%, 23%);
+    }
+  }
+
+  .list-group {
+    color: hsl(221%, 14%, 22%) !important;
+    background-color: hsl(210, 12%, 23%);
+  }
+}
diff --git a/client/posts/view/viewPost.html b/client/posts/view/viewPost.html
index 3e749f8..e174ca8 100644
--- a/client/posts/view/viewPost.html
+++ b/client/posts/view/viewPost.html
@@ -8,9 +8,10 @@
       {{/if}}
       <div class="media-body">
         <a href="{{url}}" class="title" target="_blank">{{title}}</a>
-        <p class="caption">{{totalPoints}} points and <a href="{{commentLink}}">{{oldComments}} comments</a> from <abbr title="{{createdAt}}"><time datetime="{{createdAt}}">{{timeCopy}}</time> ago</abbr> by <a href="{{authorLink}}">{{author}}</a></p>
+        <p class="caption">{{totalPoints}} points and <a href="{{commentLink}}">{{oldComments}} comments </a> from <abbr title="{{createdAt}}"><time datetime="{{createdAt}}">{{timeCopy}}</time> ago</abbr> by <a href="{{authorLink}}">{{author}}</a></p>
       </div>
     </div>
+    {{{text}}}
   </div>
   <div class="listComments">
     {{#each oldChildren}}
diff --git a/client/posts/view/viewPost.js b/client/posts/view/viewPost.js
index 62aea76..4aaab8e 100644
--- a/client/posts/view/viewPost.js
+++ b/client/posts/view/viewPost.js
@@ -84,6 +84,10 @@ Template.viewPost.helpers({
   },
   commentLink: function () {
     "use strict";
-    return '/hn/' + this.oldId;
+    return '/comments/' + this._id;
+  },
+  text: function () {
+    "use strict";
+    return this.hnText;
   }
 });
diff --git a/client/posts/view/viewPost.less b/client/posts/view/viewPost.less
index b198d65..f7aa36f 100644
--- a/client/posts/view/viewPost.less
+++ b/client/posts/view/viewPost.less
@@ -2,10 +2,8 @@
 
 .post {
   padding: 0.5rem;
-  padding-left: 1rem;
   background-color: white;
   border-bottom: 1px solid #F9FAFB;
-  border-left: 3px solid #F9FAFB;
 
   &.upvoted {
     border-color: @upvote-color;
@@ -21,12 +19,15 @@
     }
   }
 
-  .title {
+  a.title {
     display: inline-block;
     font-size: 1.1rem;
     color: #303540;
     font-weight: 500;
     margin-top: 0.2rem;
+    &:visited {
+      color: hsl(210, 16%, 76%);
+    }
   }
 
   .caption {
@@ -34,15 +35,17 @@
     &.author a {
       color: hsl(221, 14%, 22%);
       font-weight: 500;
+      border-bottom: none;
     }
 
     font-size: 1rem;
     font-weight: 300;
     color: @gray-color;
     margin-bottom: 1px;
+
     a {
       color: hsl(210, 16%, 76%);
-      font-weight: 500;
+      border-bottom: 1px solid hsl(210, 16%, 76%);
     }
   }
 
diff --git a/server/hn/readHn.js b/server/hn/readHn.js
index ab85139..876d097 100644
--- a/server/hn/readHn.js
+++ b/server/hn/readHn.js
@@ -21,6 +21,7 @@ var readHn = function (before) {
           site: 'hn',
           author: item.author,
           title: item.title,
+          hnText: item.text,
           url: item.url,
           oldComments: parseInt(item.num_comments, 10),
         };
diff --git a/server/posts/publishPosts.js b/server/posts/publishPosts.js
index 44a3550..66eccb3 100644
--- a/server/posts/publishPosts.js
+++ b/server/posts/publishPosts.js
@@ -9,17 +9,11 @@ Meteor.publish('allPosts', function () {
   return result;
 });
 
-Meteor.publish('hnPost', function (id) {
+Meteor.publish('post', function (id) {
   "use strict";
 
-  console.log({
-    site: 'hn',
-    oldId: parseInt(id, 10)
-  });
-
   return Posts.find({
-    site: 'hn',
-    oldId: parseInt(id, 10)
+    _id: id
   });
 });
 
diff --git a/shared/router.js b/shared/router.js
index aa7d47e..0f89ade 100644
--- a/shared/router.js
+++ b/shared/router.js
@@ -13,12 +13,12 @@ Router.map(function () {
     }
   });
 
-  this.route('hnPost', {
-    path: '/hn/:id',
+  this.route('comments', {
+    path: '/comments/:id',
     template: 'viewPost',
     waitOn: function () {
-      var id = this.params.id.toLowerCase();
-      return Meteor.subscribe('hnPost', id);
+      var id = this.params.id;
+      return Meteor.subscribe('post', id);
     },
     data: function () {
       var templateData = Posts.findOne({}, {
@@ -101,7 +101,7 @@ Router.map(function () {
       var time = this.params.time.toLowerCase();
 
       var templateData = {
-        currentView: 'Home',
+        currentView: 'Top News',
         isFeed: true
       };
 
@@ -152,7 +152,7 @@ Router.map(function () {
     },
     data: function () {
       var templateData = {
-        currentView: 'Home',
+        currentView: 'Hot News',
         isFeed: true
       };
 
@@ -177,7 +177,7 @@ Router.map(function () {
     },
     data: function () {
       var templateData = {
-        currentView: 'Home',
+        currentView: 'Recent News',
         isFeed: true
       };
 
@@ -202,7 +202,7 @@ Router.map(function () {
     },
     data: function () {
       var templateData = {
-        currentView: 'Home',
+        currentView: 'Random News',
         isFeed: true
       };
 

From 6f905dac7e235094142fcaf98fe31663b6ba32a3 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 15:39:48 -0700
Subject: [PATCH 05/16] Add user profile icon

---
 client/comments/view/viewComment.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/comments/view/viewComment.html b/client/comments/view/viewComment.html
index 0d0eace..ff544ca 100644
--- a/client/comments/view/viewComment.html
+++ b/client/comments/view/viewComment.html
@@ -8,7 +8,7 @@
         </div>
       {{/if}}
       <div class="media-body">
-        <p class="author caption"><a href="https://news.ycombinator.com/user?id={{author}}">{{author}}</a></p>
+        <p class="author caption"><a href="https://news.ycombinator.com/user?id={{author}}"><i class="fa fa-user"></i> {{author}}</a></p>
         <p class="commentText">{{{cleanText}}}</p>
       </div>
     </div>

From 9e6a79e163ba435775a03ec4fdf91efeb4d9e786 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 15:39:58 -0700
Subject: [PATCH 06/16] Darken sidebar item hover background color

---
 client/global/wrapper/sidebar.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/global/wrapper/sidebar.less b/client/global/wrapper/sidebar.less
index 8bddbf1..41981a9 100644
--- a/client/global/wrapper/sidebar.less
+++ b/client/global/wrapper/sidebar.less
@@ -31,7 +31,7 @@
     background-color: hsl(210, 12%, 23%);
     color: hsl(210, 16%, 76%);
     &:hover {
-      background-color: hsl(210, 6%, 54%);
+      background-color: hsl(210, 15%, 18%);
     }
   }
 

From 852bb72b36ec471c90f18c7a7d79731fdca6c0f9 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 20:07:53 -0700
Subject: [PATCH 07/16] Use icons instead of text where possible

---
 client/global/wrapper/sidebar.less |  4 ++--
 client/posts/view/viewPost.html    |  8 +++++++-
 client/posts/view/viewPost.js      | 16 ++++++----------
 client/posts/view/viewPost.less    |  7 +++----
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/client/global/wrapper/sidebar.less b/client/global/wrapper/sidebar.less
index 41981a9..0eb3886 100644
--- a/client/global/wrapper/sidebar.less
+++ b/client/global/wrapper/sidebar.less
@@ -13,7 +13,7 @@
   }
 
   .title {
-    background-color: #4E86FE;
+    background-color: hsl(208, 70%, 52%); // todo: change to brand color
     display: inline-block;
     padding: 1rem;
     color: white;
@@ -31,7 +31,7 @@
     background-color: hsl(210, 12%, 23%);
     color: hsl(210, 16%, 76%);
     &:hover {
-      background-color: hsl(210, 15%, 18%);
+      background-color: hsl(210, 16%, 29%);
     }
   }
 
diff --git a/client/posts/view/viewPost.html b/client/posts/view/viewPost.html
index e174ca8..03c1247 100644
--- a/client/posts/view/viewPost.html
+++ b/client/posts/view/viewPost.html
@@ -8,7 +8,13 @@
       {{/if}}
       <div class="media-body">
         <a href="{{url}}" class="title" target="_blank">{{title}}</a>
-        <p class="caption">{{totalPoints}} points and <a href="{{commentLink}}">{{oldComments}} comments </a> from <abbr title="{{createdAt}}"><time datetime="{{createdAt}}">{{timeCopy}}</time> ago</abbr> by <a href="{{authorLink}}">{{author}}</a></p>
+        <p class="caption">
+          <i class="fa fa-chevron-up"></i> {{totalPoints}} &nbsp;
+          <a href="{{commentLink}}">
+            <i class="fa fa-comment"></i> {{oldComments}}</a> &nbsp;
+            <a href="{{authorLink}}"><i class="fa fa-user"></i> {{author}}</a>  &nbsp;
+            <abbr title="{{createdAt}}"><i class="fa fa-clock-o"></i> <time datetime="{{createdAt}}">{{timeCopy}}</time></abbr>
+        </p>
       </div>
     </div>
     {{{text}}}
diff --git a/client/posts/view/viewPost.js b/client/posts/view/viewPost.js
index 4aaab8e..4007015 100644
--- a/client/posts/view/viewPost.js
+++ b/client/posts/view/viewPost.js
@@ -10,34 +10,30 @@ var timeSince = function (date) {
   "use strict";
 
   var timeString = function (int, str) {
-    var suffix = '';
-    if (Math.floor(int) !== 1) {
-      suffix = 's';
-    }
-    return int + ' ' + str + suffix;
+    return int + str;
   };
 
   var seconds = Math.floor((new Date() - date) / 1000);
   var interval = Math.floor(seconds / 31536000);
 
   if (interval > 0) {
-    return timeString(interval, 'year');
+    return timeString(interval, 'y');
   }
   interval = Math.floor(seconds / 2592000);
   if (interval > 0) {
-    return timeString(interval, 'month');
+    return timeString(interval, 'mo');
   }
   interval = Math.floor(seconds / 86400);
   if (interval > 0) {
-    return timeString(interval, 'day');
+    return timeString(interval, 'd');
   }
   interval = Math.floor(seconds / 3600);
   if (interval > 0) {
-    return timeString(interval, 'hour');
+    return timeString(interval, 'h');
   }
   interval = Math.floor(seconds / 60);
   if (interval > 0) {
-    return timeString(interval, 'minute');
+    return timeString(interval, 'min');
   }
   return timeString(interval, 'second');
 };
diff --git a/client/posts/view/viewPost.less b/client/posts/view/viewPost.less
index f7aa36f..5822efc 100644
--- a/client/posts/view/viewPost.less
+++ b/client/posts/view/viewPost.less
@@ -26,14 +26,14 @@
     font-weight: 500;
     margin-top: 0.2rem;
     &:visited {
-      color: hsl(210, 16%, 76%);
+      color: hsl(210, 9%, 59%);
     }
   }
 
   .caption {
 
     &.author a {
-      color: hsl(221, 14%, 22%);
+      color: hsl(212, 9%, 59%);
       font-weight: 500;
       border-bottom: none;
     }
@@ -45,11 +45,10 @@
 
     a {
       color: hsl(210, 16%, 76%);
-      border-bottom: 1px solid hsl(210, 16%, 76%);
     }
   }
 
   abbr {
-    border-bottom: 1px dotted hsl(0, 0%, 90%);
+    border-bottom: none;
   }
 }

From 7f2d076635a1f6b8b2339f44517d718520cf0bb4 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 20:08:25 -0700
Subject: [PATCH 08/16] Read HN every 2 minutes (thanks Algolia!)

---
 server/hn/readHn.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/hn/readHn.js b/server/hn/readHn.js
index 876d097..be4e4f7 100644
--- a/server/hn/readHn.js
+++ b/server/hn/readHn.js
@@ -49,16 +49,12 @@ var readHn = function (before) {
   );
 };
 
-Meteor.setInterval(function () {         // 630rph
+Meteor.setInterval(function () {         // 3780rph
   "use strict";
   readHn(60 * 60);                       // hour      - 21 requests
-}, 3.5 * 60 * 1000);                     // read every 2 minutes
-
-Meteor.setInterval(function () {         // 370 rph
-  "use strict";
   readHn(24 * 60 * 60);                  // day       - 21 requests
   readHn(7 * 24 * 60 * 60);              // week      - 21 requests
   readHn(31 * 24 * 60 * 60);             // month     - 21 requests
   readHn(31 * 24 * 60 * 60);             // year      - 21 requests
   readHn(Math.floor(Date.now() / 1000)); // ever      - 21 requests
-}, 20 * 60 * 1000);                      // read every 17 minutes
+}, 3.5 * 60 * 1000);                     // read every 2 minutes

From 629b54c5eec05b08b04089278efb16542df66615 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 21:28:30 -0700
Subject: [PATCH 09/16] Actually read HN every 2 minutes

---
 server/hn/readHn.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/hn/readHn.js b/server/hn/readHn.js
index be4e4f7..583d743 100644
--- a/server/hn/readHn.js
+++ b/server/hn/readHn.js
@@ -57,4 +57,4 @@ Meteor.setInterval(function () {         // 3780rph
   readHn(31 * 24 * 60 * 60);             // month     - 21 requests
   readHn(31 * 24 * 60 * 60);             // year      - 21 requests
   readHn(Math.floor(Date.now() / 1000)); // ever      - 21 requests
-}, 3.5 * 60 * 1000);                     // read every 2 minutes
+}, 2 * 60 * 1000);                     // read every 2 minutes

From e908057f1b1fff0da70f1fe1fce0cad2a89f8282 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 21:28:48 -0700
Subject: [PATCH 10/16] Tweet a hot link every 10 minutes in production

---
 .gitignore                |  2 ++
 packages.json             |  3 ++-
 server/twitter/postHot.js | 45 +++++++++++++++++++++++++++++++++++++++
 settings/development.json |  3 +++
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 server/twitter/postHot.js
 create mode 100644 settings/development.json

diff --git a/.gitignore b/.gitignore
index e69de29..08e02e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+settings/production.json
diff --git a/packages.json b/packages.json
index fe7b8ab..cbdb9cd 100644
--- a/packages.json
+++ b/packages.json
@@ -1,3 +1,4 @@
 {
-  "hacker-news-api" : "1.1.4"
+  "hacker-news-api" : "1.1.4",
+  "twit" : "1.1.14"
 }
diff --git a/server/twitter/postHot.js b/server/twitter/postHot.js
new file mode 100644
index 0000000..0da97a0
--- /dev/null
+++ b/server/twitter/postHot.js
@@ -0,0 +1,45 @@
+if (Meteor.settings.environment === 'production') {
+  var Twit =    Meteor.require('twit');
+  var twitter = new Twit(Meteor.settings.twitter);
+
+  var postHot = function () {
+    "use strict";
+    var hot = Posts.find({}, {
+      limit: 50,
+      sort: {
+        heat: -1
+      },
+      fields: {
+        oldChildren: false
+      }
+    }).fetch();
+
+    var finished = false;
+    _(hot).forEach(function (item) {
+      // it hasn't been tweeted yet
+      if (finished === false && (typeof item.tweeted === 'undefined')) {
+          twitter.post('statuses/update',
+          {
+            status: item.title + "\n" +
+            'http://beta.fraction.io/comments/' + item._id
+          }, function(err /*, response */) {
+            if (err) {
+              throw err;
+            }
+          });
+          Posts.update({
+            _id: item._id
+          }, {
+            $set: {
+              tweeted: true
+            }
+          });
+          console.log('Tweeting "' + item.title + '"');
+        finished = true;
+      }
+    });
+  };
+
+  //post a new link every 10 minutes
+  Meteor.setInterval(postHot, 10 * 60 * 1000);
+}
diff --git a/settings/development.json b/settings/development.json
new file mode 100644
index 0000000..92d7530
--- /dev/null
+++ b/settings/development.json
@@ -0,0 +1,3 @@
+{
+  "environment" : "development"
+}

From a78d9d6a4bf9174ebdc8a4579e97a135f58dc156 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 22:37:37 -0700
Subject: [PATCH 11/16] Up the Twitter post interval to 20 minutes

---
 server/twitter/postHot.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/twitter/postHot.js b/server/twitter/postHot.js
index 0da97a0..5c8420e 100644
--- a/server/twitter/postHot.js
+++ b/server/twitter/postHot.js
@@ -40,6 +40,6 @@ if (Meteor.settings.environment === 'production') {
     });
   };
 
-  //post a new link every 10 minutes
-  Meteor.setInterval(postHot, 10 * 60 * 1000);
+  //post a new link every 20 minutes
+  Meteor.setInterval(postHot, 20 * 60 * 1000);
 }

From 3b11b0ddae6c13d90e091c8683956c9a071eb6d7 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 22:37:42 -0700
Subject: [PATCH 12/16] Add a user page

---
 client/comments/view/viewComment.html |  2 +-
 client/posts/view/viewPost.js         |  2 +-
 server/posts/publishPosts.js          | 16 +++++++++++++++-
 shared/router.js                      | 25 ++++++++++++++++++++++---
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/client/comments/view/viewComment.html b/client/comments/view/viewComment.html
index ff544ca..2edd3c5 100644
--- a/client/comments/view/viewComment.html
+++ b/client/comments/view/viewComment.html
@@ -8,7 +8,7 @@
         </div>
       {{/if}}
       <div class="media-body">
-        <p class="author caption"><a href="https://news.ycombinator.com/user?id={{author}}"><i class="fa fa-user"></i> {{author}}</a></p>
+        <p class="author caption"><a href="/user/{{author}}"><i class="fa fa-user"></i> {{author}}</a></p>
         <p class="commentText">{{{cleanText}}}</p>
       </div>
     </div>
diff --git a/client/posts/view/viewPost.js b/client/posts/view/viewPost.js
index 4007015..f9d373e 100644
--- a/client/posts/view/viewPost.js
+++ b/client/posts/view/viewPost.js
@@ -76,7 +76,7 @@ Template.viewPost.helpers({
   },
   authorLink: function() {
     "use strict";
-    return 'https://news.ycombinator.com/user?id=' + this.author;
+    return '/user/' + this.author;
   },
   commentLink: function () {
     "use strict";
diff --git a/server/posts/publishPosts.js b/server/posts/publishPosts.js
index 66eccb3..1dd1711 100644
--- a/server/posts/publishPosts.js
+++ b/server/posts/publishPosts.js
@@ -9,7 +9,7 @@ Meteor.publish('allPosts', function () {
   return result;
 });
 
-Meteor.publish('post', function (id) {
+Meteor.publish('comments', function (id) {
   "use strict";
 
   return Posts.find({
@@ -17,6 +17,20 @@ Meteor.publish('post', function (id) {
   });
 });
 
+Meteor.publish('user', function (username) {
+  "use strict";
+
+  console.log(Posts.find().fetch())
+  return Posts.find({
+    author: username
+  },{
+    limit: 50,
+    fields: {
+      oldChildren: false
+    }
+  });
+});
+
 Meteor.publish('recentPosts', function () {
   "use strict";
   return Posts.find({}, {
diff --git a/shared/router.js b/shared/router.js
index 0f89ade..90ec0df 100644
--- a/shared/router.js
+++ b/shared/router.js
@@ -15,17 +15,36 @@ Router.map(function () {
 
   this.route('comments', {
     path: '/comments/:id',
-    template: 'viewPost',
+    template: 'feed',
     waitOn: function () {
       var id = this.params.id;
-      return Meteor.subscribe('post', id);
+      return Meteor.subscribe('comments', id);
+    },
+    data: function () {
+      var templateData = {
+        posts: Posts.find({}, {
+        reactive: false
+      }).fetch()
+      };
+
+      templateData.currentView =  'Comments for "' + templateData.title + '"';
+
+      return templateData;
+    }
+  });
+
+  this.route('user', {
+    path: '/user/:username',
+    template: 'viewPost',
+    waitOn: function () {
+      return Meteor.subscribe('user', this.params.username);
     },
     data: function () {
       var templateData = Posts.findOne({}, {
         reactive: false
       });
 
-      templateData.currentView = 'Comments';
+      templateData.currentView = 'Profile for "' + this.params.username + '"';
 
       return templateData;
     }

From d24721fcd6a7cccc9c6098f256fb5fc9bbe11f56 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Tue, 29 Apr 2014 22:39:16 -0700
Subject: [PATCH 13/16] Remove the console.log from the user pub

---
 server/posts/publishPosts.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/posts/publishPosts.js b/server/posts/publishPosts.js
index 1dd1711..fffd663 100644
--- a/server/posts/publishPosts.js
+++ b/server/posts/publishPosts.js
@@ -20,7 +20,6 @@ Meteor.publish('comments', function (id) {
 Meteor.publish('user', function (username) {
   "use strict";
 
-  console.log(Posts.find().fetch())
   return Posts.find({
     author: username
   },{

From 65b107fa00fe46b27070230b05209fd4545cb295 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Wed, 30 Apr 2014 16:07:48 -0700
Subject: [PATCH 14/16] Update Meteor to 0.8.1

---
 .meteor/release | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.meteor/release b/.meteor/release
index 4b324f2..6f4eebd 100644
--- a/.meteor/release
+++ b/.meteor/release
@@ -1 +1 @@
-0.8.0.1
+0.8.1

From a50410308d3d4b083694035dbc9130b185d8c712 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Wed, 30 Apr 2014 16:08:00 -0700
Subject: [PATCH 15/16] Re-add app cache to get speedy

---
 .meteor/packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.meteor/packages b/.meteor/packages
index 27aae4a..4864275 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -20,3 +20,4 @@ http
 feedparser
 npm
 lodash
+appcache

From 8f5a1fe48ab9867f2e51d218015d152d6ac1b148 Mon Sep 17 00:00:00 2001
From: Christian Bundy <me@christianbundy.com>
Date: Wed, 30 Apr 2014 16:08:47 -0700
Subject: [PATCH 16/16] Revamp sidebar and nav
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This also uses session data instead of template data wherever possible,
because it’s SO much faster.
---
 client/global/header/globalHeader.html        |  93 ----------
 client/global/header/globalHeader.js          |  32 ----
 client/global/header/globalHeader.less        |  68 -------
 client/global/sidebar/globalSidebar.html      |  28 +++
 client/global/sidebar/globalSidebar.js        |  37 ++++
 .../globalSidebar.less}                       |   0
 client/global/wrapper/globalWrapper.html      |  67 +------
 client/global/wrapper/globalWrapper.js        |  11 ++
 client/global/wrapper/sidebar.js              |   0
 client/posts/list/listPosts.html              |   2 +-
 shared/{posts.js => collections.js}           |   4 +-
 shared/hot.js                                 |   3 -
 shared/router.js                              | 170 +++++-------------
 shared/votes.js                               |   3 -
 14 files changed, 130 insertions(+), 388 deletions(-)
 delete mode 100644 client/global/header/globalHeader.html
 delete mode 100644 client/global/header/globalHeader.js
 delete mode 100644 client/global/header/globalHeader.less
 create mode 100644 client/global/sidebar/globalSidebar.html
 create mode 100644 client/global/sidebar/globalSidebar.js
 rename client/global/{wrapper/sidebar.less => sidebar/globalSidebar.less} (100%)
 create mode 100644 client/global/wrapper/globalWrapper.js
 delete mode 100644 client/global/wrapper/sidebar.js
 rename shared/{posts.js => collections.js} (50%)
 delete mode 100644 shared/hot.js
 delete mode 100644 shared/votes.js

diff --git a/client/global/header/globalHeader.html b/client/global/header/globalHeader.html
deleted file mode 100644
index 5e18b1a..0000000
--- a/client/global/header/globalHeader.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<template name="header">
-  <div class="header">
-    <nav class="navbar navbar-fixed-top navbar-inverse push-both" role="navigation">
-      <div class="container">
-        <div class="col-sm-6">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-9">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="logo" href="/"><img src="/img/logo.svg" alt="Fraction Logo"></a>
-          <ol class="breadcrumb">
-            <li><a href="/">Fraction</a></li>
-            <li class="current-view">{{currentView}}</li>
-          </ol>
-        </div>
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-9">
-          <ul class="nav navbar-nav navbar-right">
-            {{#unless loggingIn}}
-                {{#if isFeed}}
-                  <!--
-                    <li class="highlight"><a href="/new-post">New Post</a></li>
-                  -->
-                  <li class="dropdown">
-                    <a href="/" class="dropdown-toggle" data-toggle="dropdown">{{sortType}}<b class="caret"></b></a>
-                    <ul class="dropdown-menu" role="menu">
-                      {{#unless sortHot}}
-                        <li><a href="/hot">Hot</a></li>
-                      {{/unless}}
-                      {{#unless sortTop}}
-                        <li><a href="/top/week">Top</a></li>
-                      {{/unless}}
-                      {{#unless sortRecent}}
-                        <li><a href="/recent">Recent</a></li>
-                      {{/unless}}
-                      {{#unless sortRandom}}
-                        <li><a href="/random">Random</a></li>
-                      {{/unless}}
-                    </ul>
-                  </li>
-                  {{#if sortTop}}
-                  <li class="dropdown">
-                    <a href="/" class="dropdown-toggle" data-toggle="dropdown">{{timeType}}<b class="caret"></b></a>
-                    <ul class="dropdown-menu" role="menu">
-                      {{#unless timeHour}}
-                        <li><a href="/{{toLowerCase sortType}}/hour">Hour</a></li>
-                      {{/unless}}
-                      {{#unless timeDay}}
-                        <li><a href="/{{toLowerCase sortType}}/day">Day</a></li>
-                      {{/unless}}
-                      {{#unless timeWeek}}
-                        <li><a href="/{{toLowerCase sortType}}/week">Week</a></li>
-                      {{/unless}}
-                      {{#unless timeFortnight}}
-                        <li><a href="/{{toLowerCase sortType}}/fortnight">Fortnight</a></li>
-                      {{/unless}}
-                      {{#unless timeMonth}}
-                        <li><a href="/{{toLowerCase sortType}}/month">Month</a></li>
-                      {{/unless}}
-                      {{#unless timeYear}}
-                        <li><a href="/{{toLowerCase sortType}}/year">Year</a></li>
-                      {{/unless}}
-                      {{#unless timeEver}}
-                        <li><a href="/{{toLowerCase sortType}}/ever">Ever</a></li>
-                      {{/unless}}
-                    </ul>
-                  </li>
-                  {{/if}}
-                {{/if}}
-                {{#if currentUser}}
-                <!--
-                  <li class="dropdown">
-                    <a href="/" class="dropdown-toggle" data-toggle="dropdown">{{currentUser.username}}<b class="caret"></b></a>
-                    <ul class="dropdown-menu" role="menu">
-                      <li><a href="/user/{{currentUser.username}}">Profile</a></li>
-                      <li><a href="/sign-out">Sign Out</a></li>
-                    </ul>
-                  </li>
-                  {{else}}
-                  <li><a href="/sign-in">Sign In</a></li>
-                  <li class="highlight"><a href="/sign-up">Sign Up</a></li>
-                -->
-                {{/if}}
-              {{/unless}}
-          </ul>
-        </div>
-      </div>
-    </div>
-    </nav>
-  </div>
-</template>
diff --git a/client/global/header/globalHeader.js b/client/global/header/globalHeader.js
deleted file mode 100644
index 3545ef1..0000000
--- a/client/global/header/globalHeader.js
+++ /dev/null
@@ -1,32 +0,0 @@
-Template.header.links = function () {
-  "use strict";
-  var links = [];
-  if (Meteor.userId() === null) {
-    links.push({
-      url: 'sign-in',
-      text: 'Sign In'
-    },{
-      url: 'sign-up',
-      text: 'Sign Up'
-    });
-  } else {
-    links.push({
-      url: 'new-post',
-      text: 'Post'
-    },{
-      url: 'sign-out',
-      text: 'Sign Out'
-    });
-  }
-  return links;
-};
-
-Template.wrapper.loggingIn = function () {
-  "use strict";
-  return Meteor.loggingIn();
-};
-
-Handlebars.registerHelper('toLowerCase', function(str) {
-  "use strict";
-  return str.toLowerCase();
-});
diff --git a/client/global/header/globalHeader.less b/client/global/header/globalHeader.less
deleted file mode 100644
index 7531994..0000000
--- a/client/global/header/globalHeader.less
+++ /dev/null
@@ -1,68 +0,0 @@
-@import "/client/global/style/variables.import.less";
-
-.header {
-  nav {
-    border-radius: 0;
-    margin-bottom: 0;
-  }
-
-  .logo img {
-    margin-top: 11px;
-    margin-bottom: 11px;
-    @media @xs {
-      margin-left: 15px;
-    }
-    height: 26px;
-  }
-
-  .navbar > ul > li > a {
-    color: #F9FAFB;
-  }
-
-  .navbar-inverse .navbar-nav > li > a {
-    color: hsla(0, 0%, 100%, 0.9);
-    &:hover {
-      color: white;
-    }
-  }
-
-  ul > li.highlight > a {
-    padding-top: 5px;
-    margin-top: 10px;
-    padding-bottom: 5px;
-    margin-bottom: 10px;
-    border-radius: 2px;
-    margin-left: 5px;
-    margin-right: 5px;
-    padding-left: 10px;
-    padding-right: 10px;
-    background-color: #93CB2A;
-    &:hover, &:active {
-      background-color: #8DCC16;
-    }
-  }
-
-  .breadcrumb {
-    margin-top: 0.25rem;
-    display: inline-block;
-    background: none;
-    padding-left: .25rem;
-    margin-bottom: 0;
-    margin-left: 0.4rem;
-    a {
-      color: white;
-    }
-  }
-
-  // todo: remove magic numbers
-  .current-view {
-    color: hsla(0, 100%, 100%, 0.75);
-  }
-
-  .navbar-inverse .navbar-nav > .open > a, .navbar-inverse .navbar-nav > .open > a:hover, .navbar-inverse .navbar-nav > .open > a:focus {
-    color: hsl(0, 100%, 100%);
-    background-color: #373737;
-  }
-
-
-}
diff --git a/client/global/sidebar/globalSidebar.html b/client/global/sidebar/globalSidebar.html
new file mode 100644
index 0000000..485c3df
--- /dev/null
+++ b/client/global/sidebar/globalSidebar.html
@@ -0,0 +1,28 @@
+<template name="sidebar">
+  <div class="sidebar col-sm-2">
+    <a class="title" href="/"><img src="/img/logo.svg"> Fraction</a>
+    <ul class="list-group">
+      <li class="list-header list-group-item">
+        <i class="fa fa-sort"></i>
+        <strong>SORT </strong>
+      </li>
+        <a href="/hot" class="{{activeSort 'hot'}} list-group-item"><i class="fa fa-fire"></i> Hot</a>
+        <a href="/top/week" class="{{activeSort 'top'}} list-group-item"><i class="fa fa-star"></i> Top</a>
+        <a href="/recent" class="{{activeSort 'recent'}} list-group-item"><i class="fa fa-clock-o"></i> Recent</a>
+        <a href="/random" class="{{activeSort 'random'}} list-group-item"><i class="fa fa-random"></i> Random</a>
+      {{#if isSortTop}}
+        <li class="list-group-item"></li>
+        <li class="list-header list-group-item">
+          <i class="fa fa-calendar"></i>
+          <strong>TIME</strong>
+        </li>
+          <a class="{{activeTime 'hour'}} list-group-item" href="/{{sortType}}/hour">Hour</a>
+          <a class="{{activeTime 'day'}} list-group-item" href="/{{sortType}}/day">Day</a>
+          <a class="{{activeTime 'week'}} list-group-item" href="/{{sortType}}/week">Week</a>
+          <a class="{{activeTime 'month'}} list-group-item" href="/{{sortType}}/month">Month</a>
+          <a class="{{activeTime 'year'}} list-group-item" href="/{{sortType}}/year">Year</a>
+          <a class="{{activeTime 'ever'}} list-group-item" href="/{{sortType}}/ever">Ever</a>
+      {{/if}}
+    </ul>
+  </div>
+</template>
diff --git a/client/global/sidebar/globalSidebar.js b/client/global/sidebar/globalSidebar.js
new file mode 100644
index 0000000..80a8680
--- /dev/null
+++ b/client/global/sidebar/globalSidebar.js
@@ -0,0 +1,37 @@
+Handlebars.registerHelper('activeTime', function(time) {
+  "use strict";
+
+  if (Session.equals('topTime', time)) {
+    return 'active';
+  } else {
+    return null;
+  }
+});
+
+
+Handlebars.registerHelper('activeSort', function(sort) {
+  "use strict";
+
+  if (Session.equals('sortType', sort)) {
+    return 'active';
+  } else {
+    return 'inactive';
+  }
+});
+
+Template.sidebar.helpers({
+  'isSortTop' : function () {
+    "use strict";
+
+    if (Session.equals('sortType', 'top')) {
+      return true;
+    } else {
+      return false;
+    }
+  },
+  'sortType' : function () {
+    "use strict";
+    
+    return Session.get('sortType').toLowerCase();
+  }
+});
diff --git a/client/global/wrapper/sidebar.less b/client/global/sidebar/globalSidebar.less
similarity index 100%
rename from client/global/wrapper/sidebar.less
rename to client/global/sidebar/globalSidebar.less
diff --git a/client/global/wrapper/globalWrapper.html b/client/global/wrapper/globalWrapper.html
index 669c545..56c7dfe 100644
--- a/client/global/wrapper/globalWrapper.html
+++ b/client/global/wrapper/globalWrapper.html
@@ -1,71 +1,6 @@
 <template name="wrapper">
   <div class="wrapper">
-      <div class="sidebar col-sm-2" data-spy="affix" data-offset-top="200" data-offset-bottom="200">
-        <a class="title" href="/"><img src="/img/logo.svg"> Fraction</a>
-        <ul class="list-group">
-          <li class="list-header list-group-item">
-            <i class="fa fa-sort"></i>
-            <strong>SORT</strong>
-          </li>
-          {{#if sortHot}}
-            <a href="/hot" class="active list-group-item"><i class="fa fa-fire"></i> Hot</a>
-          {{else}}
-            <a href="/hot" class="list-group-item"><i class="fa fa-fire"></i> Hot</a>
-          {{/if}}
-          {{#if sortTop}}
-            <a href="/top/week" class="active list-group-item"><i class="fa fa-star"></i> Top</a>
-          {{else}}
-            <a href="/top/week" class="list-group-item"><i class="fa fa-star"></i> Top</a>
-          {{/if}}
-          {{#if sortRecent}}
-            <a href="/recent" class="active list-group-item"><i class="fa fa-clock-o"></i> Recent</a>
-          {{else}}
-            <a href="/recent" class="list-group-item"><i class="fa fa-clock-o"></i> Recent</a>
-          {{/if}}
-          {{#if sortRandom}}
-            <a href="/random" class="active list-group-item"><i class="fa fa-random"></i> Random</a>
-          {{else}}
-            <a href="/random" class="list-group-item"><i class="fa fa-random"></i> Random</a>
-          {{/if}}
-          {{#if sortTop}}
-            <li class="list-group-item"></li>
-            <li class="list-header list-group-item">
-              <i class="fa fa-calendar"></i>
-              <strong>TIME</strong>
-            </li>
-            {{#if timeHour}}
-              <a class="active list-group-item" href="/{{toLowerCase sortType}}/hour">Hour</a>
-              {{else}}
-              <a class="list-group-item" href="/{{toLowerCase sortType}}/hour">Hour</a>
-            {{/if}}
-            {{#if timeDay}}
-              <a class="active list-group-item" href="/{{toLowerCase sortType}}/day">Day</a>
-              {{else}}
-              <a class="list-group-item" href="/{{toLowerCase sortType}}/day">Day</a>
-            {{/if}}
-            {{#if timeWeek}}
-              <a class="active list-group-item" href="/{{toLowerCase sortType}}/week">Week</a>
-              {{else}}
-              <a class="list-group-item" href="/{{toLowerCase sortType}}/week">Week</a>
-            {{/if}}
-            {{#if timeFortnight}}
-              <a class="active list-group-item" href="/{{toLowerCase sortType}}/fortnight">Fortnight</a>
-              {{else}}
-              <a class="list-group-item" href="/{{toLowerCase sortType}}/fortnight">Fortnight</a>
-            {{/if}}
-            {{#if timeMonth}}
-              <a class="active list-group-item" href="/{{toLowerCase sortType}}/month">Month</a>
-              {{else}}
-              <a class="list-group-item" href="/{{toLowerCase sortType}}/month">Month</a>
-            {{/if}}
-            {{#if timeEver}}
-              <a class="active list-group-item" href="/{{toLowerCase sortType}}/ever">Ever</a>
-              {{else}}
-              <a class="list-group-item" href="/{{toLowerCase sortType}}/ever">Ever</a>
-            {{/if}}
-          {{/if}}
-        </ul>
-      </div>
+    {{>sidebar}}
     <div class="col-sm-10 col-sm-offset-2">
       <h3 class="currentView">{{currentView}}</h3>
       <div class="content">
diff --git a/client/global/wrapper/globalWrapper.js b/client/global/wrapper/globalWrapper.js
new file mode 100644
index 0000000..f6f4170
--- /dev/null
+++ b/client/global/wrapper/globalWrapper.js
@@ -0,0 +1,11 @@
+Template.wrapper.helpers({
+  'currentView' : function () {
+    "use strict";
+    return Session.get('currentView');
+  }
+});
+
+Handlebars.registerHelper('session', function(input) {
+  "use strict";
+  return Session.get(input);
+});
diff --git a/client/global/wrapper/sidebar.js b/client/global/wrapper/sidebar.js
deleted file mode 100644
index e69de29..0000000
diff --git a/client/posts/list/listPosts.html b/client/posts/list/listPosts.html
index f613b9b..0114706 100644
--- a/client/posts/list/listPosts.html
+++ b/client/posts/list/listPosts.html
@@ -1,6 +1,6 @@
 <template name="feed">
   <div class="feed">
-    {{#each posts}}
+    {{#each session 'posts'}}
       {{> viewPost}}
     {{/each}}
   </div>
diff --git a/shared/posts.js b/shared/collections.js
similarity index 50%
rename from shared/posts.js
rename to shared/collections.js
index ce78fb0..f7106e1 100644
--- a/shared/posts.js
+++ b/shared/collections.js
@@ -1,3 +1,5 @@
 /* global Posts:true */
-
 Posts = new Meteor.Collection('posts');
+
+/* global Votes:true */
+Votes = new Meteor.Collection('votes');
diff --git a/shared/hot.js b/shared/hot.js
deleted file mode 100644
index 966dfe9..0000000
--- a/shared/hot.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* global Hot:true */
-
-Hot = new Meteor.Collection('sortHot');
diff --git a/shared/router.js b/shared/router.js
index 90ec0df..18c4403 100644
--- a/shared/router.js
+++ b/shared/router.js
@@ -17,66 +17,34 @@ Router.map(function () {
     path: '/comments/:id',
     template: 'feed',
     waitOn: function () {
-      var id = this.params.id;
-      return Meteor.subscribe('comments', id);
+      return Meteor.subscribe('comments', this.params.id);
     },
-    data: function () {
-      var templateData = {
-        posts: Posts.find({}, {
+    onAfterAction: function () {
+      Session.set('posts', Posts.find({
+        _id: this.params.id
+      }, {
         reactive: false
-      }).fetch()
-      };
-
-      templateData.currentView =  'Comments for "' + templateData.title + '"';
-
-      return templateData;
+      }).fetch());
+      Session.set('currentView', 'Comments');
     }
   });
 
   this.route('user', {
     path: '/user/:username',
-    template: 'viewPost',
+    template: 'feed',
     waitOn: function () {
       return Meteor.subscribe('user', this.params.username);
     },
     data: function () {
-      var templateData = Posts.findOne({}, {
+      Session.set('currentView', 'Profile');
+      Session.set('posts', Posts.find({
+        author: this.params.username
+      }, {
         reactive: false
-      });
-
-      templateData.currentView = 'Profile for "' + this.params.username + '"';
-
-      return templateData;
+      }).fetch());
     }
   });
 
-/* disabled
-  this.route('newPost', {
-    path:     '/new-post',
-    template: 'newPost',
-    data: function () {
-      var templateData = {
-        currentView: 'New Post',
-        posts: Posts.find({username : this.params.username})
-      };
-      return templateData;
-    }
-  });
-*/
-/*
-  this.route('user', {
-    path:     'user/:username',
-    template: 'user',
-    data: function () {
-      var templateData = {
-        currentView: 'User',
-        username: this.params.username,
-        posts: Posts.find({username : this.params.username})
-      };
-      return templateData;
-    }
-  });
-*/
   this.route('top', {
     path:     '/top/:time',
     template: 'feed',
@@ -116,48 +84,29 @@ Router.map(function () {
         return Meteor.subscribe('topPosts', new Date(start));
       }
     },
-    data: function () {
+    onAfterAction: function () {
       var time = this.params.time.toLowerCase();
-
-      var templateData = {
-        currentView: 'Top News',
-        isFeed: true
-      };
-
-      var setTemplateData = function (time, data) {
-        var accepted = [
-          'hour',
-          'day',
-          'week',
-          'fortnight',
-          'month',
-          'year',
-          'ever'
-        ];
-
-        if (_.contains(accepted, time)) {
-          var cap = time.charAt(0).toUpperCase() + time.slice(1);
-          data.timeType = cap;
-          data['time' + cap] = true;
-          return data;
-        } else {
-          return false;
+      Session.set('topTime', time);
+      Session.set('sortType', 'top');
+      Session.set('posts', Posts.find({}, {
+        reactive: false,
+        sort: {
+          oldPoints: -1
         }
-      };
-
-      templateData = setTemplateData(time, templateData);
-
-      if (templateData !== false) {
-        templateData.sortType = 'Top';
-        templateData.sortTop = true;
-        templateData.posts = Posts.find({}, {
-          reactive: false,
-          sort: {
-            oldPoints: -1
-          }
-        });
-        return templateData;
-      } else {
+      }).fetch());
+      Session.set('currentView', 'Top News');
+
+      var accepted = [
+        'hour',
+        'day',
+        'week',
+        'fortnight',
+        'month',
+        'year',
+        'ever'
+      ];
+
+      if (!_.contains(accepted, time)) {
         Router.go('/top/week');
       }
     }
@@ -169,22 +118,15 @@ Router.map(function () {
     waitOn: function () {
       return Meteor.subscribe('hotPosts');
     },
-    data: function () {
-      var templateData = {
-        currentView: 'Hot News',
-        isFeed: true
-      };
-
-
-      templateData.sortType = 'Hot';
-      templateData.sortHot = true;
-      templateData.posts = Posts.find({}, {
+    onAfterAction: function () {
+      Session.set('sortType', 'hot');
+      Session.set('currentView', 'Hot News');
+      Session.set('posts', Posts.find({}, {
         reactive: false,
         sort: {
           heat: -1
         }
-      });
-      return templateData;
+      }).fetch());
     }
   });
 
@@ -194,22 +136,15 @@ Router.map(function () {
     waitOn: function () {
       return Meteor.subscribe('recentPosts');
     },
-    data: function () {
-      var templateData = {
-        currentView: 'Recent News',
-        isFeed: true
-      };
-
-      templateData.sortType = 'Recent';
-      templateData.sortRecent = true;
-      templateData.posts = Posts.find({}, {
+    onAfterAction: function () {
+      Session.set('sortType', 'recent');
+      Session.set('currentView', 'Recent News');
+      Session.set('posts', Posts.find({}, {
         reactive: false,
         sort: {
           createdAt: -1
         }
-      });
-
-      return templateData;
+      }).fetch());
     }
   });
 
@@ -219,12 +154,7 @@ Router.map(function () {
     waitOn: function () {
       return Meteor.subscribe('recentPosts');
     },
-    data: function () {
-      var templateData = {
-        currentView: 'Random News',
-        isFeed: true
-      };
-
+    onAfterAction: function () {
       // todo: make a lib and move this
       var shuffle = function (array) {
         var currentIndex = array.length, temporaryValue, randomIndex;
@@ -240,13 +170,11 @@ Router.map(function () {
         return array;
       };
 
-      templateData.sortType = 'Random';
-      templateData.sortRandom = true;
-      templateData.posts = shuffle(Posts.find({}, {
+      Session.set('sortType', 'random');
+      Session.set('currentView', 'Random News');
+      Session.set('posts', shuffle(Posts.find({}, {
         reactive: false
-      }).fetch());
-
-      return templateData;
+      }).fetch()));
     }
   });
 
diff --git a/shared/votes.js b/shared/votes.js
deleted file mode 100644
index 7fcf0c4..0000000
--- a/shared/votes.js
+++ /dev/null
@@ -1,3 +0,0 @@
-/* global Votes:true */
-
-Votes = new Meteor.Collection('votes');