From b54b3f978d2fbf19d753ef6dd45338742e559250 Mon Sep 17 00:00:00 2001
From: wes <wjak56@gmail.com>
Date: Thu, 31 Aug 2017 16:09:43 -0400
Subject: [PATCH] reposition buttons and add hrefs

---
 src/scripts/app.tag    |  8 ++++--
 src/scripts/browse.tag | 64 +++++++++++++++++++++++++++---------------
 src/website.py         | 16 +++++++----
 3 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/src/scripts/app.tag b/src/scripts/app.tag
index 1d4af3c..39ac59e 100644
--- a/src/scripts/app.tag
+++ b/src/scripts/app.tag
@@ -171,7 +171,11 @@ menuOff(ev) {
 
 function activate(page) {
   return function() {
-    if (page !== "posts") {
+    if (page == "browse") {
+      document.title = "Wes Kerfoot";
+      self.currentPage = document.title;
+    }
+    else if (page !== "posts") {
       document.title = page.slice(0,1).toUpperCase()+page.slice(1,page.length);
       self.currentPage = document.title;
     }
@@ -235,7 +239,7 @@ self.on("mount", () => {
   );
 
   self.route.base('/blog/')
-  self.route("/", () => { self.route(`/posts/${self.state._id}`); });
+  self.route("/", () => { self.route("/browse"); });
   self.route("/posts", () => { self.route(`/posts/${self.state._id}`); });
   self.route("posts/*", posts);
   self.route("posts", (() => {posts(self.state._id)}));
diff --git a/src/scripts/browse.tag b/src/scripts/browse.tag
index 2677caf..7bbccac 100644
--- a/src/scripts/browse.tag
+++ b/src/scripts/browse.tag
@@ -1,5 +1,33 @@
 <browse>
   <div class="browse-content container">
+    <div
+      style={navStyle}
+      class="container"
+    >
+      <div class="columns">
+        <div class="col-4">
+          <button
+            disabled={opts.state.pagenum == 0}
+            class="btn btn-primary branded"
+            style={prevStyle}
+            onclick={getprev}
+          >
+            Previous
+          </button>
+        </div>
+        <div class="col-4">
+          <button
+            class="btn btn-primary branded"
+            disabled={opts.state.results.length != pagesize}
+            style={nextStyle}
+            onclick={getmore}
+          >
+            Next
+          </button>
+        </div>
+        <div class="col-4"></div>
+      </div>
+    </div>
     <div class="columns">
       <div class="column hide-xs hide-sm hide-md col-3">
         <categoryfilter
@@ -27,34 +55,13 @@
             <raw content="{ converter.makeHtml(result[1].content) }"></raw>
             <a
               style={linkStyle}
+              href={"/blog/posts/"+result[1].id}
               onclick={openPost(result[1].id)}
             >
               Read More
             </a>
           </div>
         </div>
-        <div class="container">
-          <div class="columns">
-            <div class="col-6 getprev">
-              <button
-                if={opts.state.pagenum > 0}
-                class="btn btn-primary branded"
-                onclick={getprev}
-              >
-                Previous
-              </button>
-            </div>
-            <div class="col-6 getmore">
-              <button
-                class="btn btn-primary branded"
-                if={opts.state.results.length == pagesize}
-                onclick={getmore}
-              >
-                Next
-              </button>
-            </div>
-          </div>
-        </div>
       </div>
     </div>
   </div>
@@ -72,7 +79,6 @@ var self = this;
 self.route = route;
 self.loading = false;
 self.converter = new showdown.Converter();
-self.lastkey = false;
 self.pagesize = 4;
 
 self.openPost = (id) => {
@@ -90,6 +96,18 @@ self.linkStyle = {
   "cursor" : "pointer"
 };
 
+self.prevStyle = {
+  "float" : "right"
+}
+
+self.nextStyle = {
+  "float" : "left"
+}
+
+self.navStyle = {
+  "margin-top" : "8px"
+};
+
 self.filterCategories = (category) => {
   return ((ev) => {
     if (ev !== undefined) {
diff --git a/src/website.py b/src/website.py
index b11f813..0f4551a 100755
--- a/src/website.py
+++ b/src/website.py
@@ -127,7 +127,7 @@ def NeverWhere(configfile=None):
     @cache.cached(timeout=50)
     @app.route("/blog/", methods=("GET", "POST"))
     def index():
-        return renderInitial()
+        return browse_root()
 
     # get the next post
     @cache.cached(timeout=50)
@@ -148,10 +148,6 @@ def NeverWhere(configfile=None):
     def browse_root():
         return browse(0)
 
-    @app.route("/blog/browse/<category>/")
-    def browse_categories_(category):
-        return browse_categories(category, 0)
-
     @app.route("/blog/browse/<start>")
     def browse(start):
         results = posts.browse(4, start*4, categories=[], json=False)
@@ -160,8 +156,18 @@ def NeverWhere(configfile=None):
                                 start=start,
                                 results=dumps(results))
 
+    @app.route("/blog/browse/<category>/")
+    def browse_categories_(category):
+        """
+        Get the first page of categories
+        """
+        return browse_categories(category, 0)
+
     @app.route("/blog/browse/<category>/<start>")
     def browse_categories(category, start):
+        """
+        Get the nth page of categories
+        """
         results = posts.browse(4, start*4, categories=[category], json=False)
         return render_template("index.html",
                                 page="browse",