4 files changed, 16 insertions, 7 deletions

diff --git a/src/routes/index.js b/src/routes/index.js
index c56b73e..6e54ef3 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -106,7 +106,7 @@ router.get("/subs", authenticateToken, async (req, res) => {
 // GET /search-subreddits
 router.get("/search", authenticateToken, async (req, res) => {
         if (!req.query || !req.query.q) {
-                res.render("sub-search", {});
+                res.render("sub-search", { user: req.user });
         } else {
                 const { q, options } = req.query.q.split(/\s+/).reduce(
                         (acc, word) => {
@@ -131,7 +131,7 @@ router.get("/search", authenticateToken, async (req, res) => {
                         items.length === 0
                                 ? "no results found"
                                 : `showing ${items.length} results`;
-                res.render("sub-search", { items, subs, after, message });
+                res.render("sub-search", { items, subs, after, message, user: req.user });
         }
 });
 
diff --git a/src/views/index.pug b/src/views/index.pug
index 636f9ac..a3bcd84 100644
--- a/src/views/index.pug
+++ b/src/views/index.pug
@@ -31,6 +31,7 @@ html
             | consider donating to 
             a(href="https://donate.stripe.com/dR62bTaZH1295Da4gg") oppiliappan
             |, author of readit
+        hr
         details
           summary.sorting sorting by #{query.sort + (query.t?' '+query.t:'')}
           div.sort-opts
diff --git a/src/views/sub-search.pug b/src/views/sub-search.pug
index 4fa707e..da33214 100644
--- a/src/views/sub-search.pug
+++ b/src/views/sub-search.pug
@@ -14,8 +14,8 @@ html
           input(type="text" name="q" placeholder="search subreddits (add +nsfw to include over-18 results)" required).search-input
           button(type="submit").search-button go
         if message
-        div.search-message
-          | #{message}
+          div.search-message
+            i #{message}
         if items
           div.search-results
             each i in items
diff --git a/src/views/subs.pug b/src/views/subs.pug
index 41f29ce..eba1961 100644
--- a/src/views/subs.pug
+++ b/src/views/subs.pug
@@ -4,6 +4,7 @@ include ../mixins/head
 doctype html
 html
   +head("subscriptions")
+  include ../mixins/subUtils
   body
     main#content
       +header(user)
@@ -11,6 +12,13 @@ html
         h1 subscriptions
         p
           each s in subs 
-            a(href=`/r/${s.subreddit}`) 
-              | r/#{s.subreddit}
-            br
+            - var subreddit = s.subreddit
+            div.sub-title
+              h4
+                a(href=`/r/${subreddit}`) 
+                  | r/#{subreddit}
+              div#button-container
+                if isSubbed
+                  button(onclick=`toggleSub('${subreddit}')` id=`thinger_${subreddit}`) unsubscribe
+                else
+                  button(onclick=`toggleSub('${subreddit}')` id=`thinger_${subreddit}`) subscribe