subs as home page

7 files changed, 36 insertions, 17 deletions

diff --git a/readme.txt b/readme.txt
index 7a152b3..dc6971a 100644
--- a/readme.txt
+++ b/readme.txt
@@ -15,5 +15,5 @@ todo:
 - [ ] highlights for op, sticky etc.
 - [ ] support 'more comments'
 - [ ] avoid js to toggle details in views/index.pug
-- [ ] set home to sum of subs
-- [ ] details tag on safari
+- [x] set home to sum of subs
+- [x] details tag on safari
diff --git a/src/mixins/header.pug b/src/mixins/header.pug
index e3b3870..f4b85e0 100644
--- a/src/mixins/header.pug
+++ b/src/mixins/header.pug
@@ -3,7 +3,9 @@ mixin header()
     div.header-item
       a(href=`/`) home
     div.header-item
-      a(href=`/subs`) subscriptions
+      a(href=`/r/all`) all
     div.header-item
       a(href=`/r/popular`) popular
+    div.header-item
+      a(href=`/subs`) subscriptions
 
diff --git a/src/mixins/post.pug b/src/mixins/post.pug
index 8cec398..43a3eb8 100644
--- a/src/mixins/post.pug
+++ b/src/mixins/post.pug
@@ -26,9 +26,8 @@ mixin post(p)
               - var item = p.gallery_data.items[0]
               - var url = `https://i.redd.it/${item.media_id}.jpg`
               img(src=url onclick=`toggleDetails('${p.id}')`) 
-        else if p.post_hint == "image" || p.post_hint == "link"
-          if p.thumbnail && p.thumbnail != "self" || p.thumbnail != "default"
-            img(src=p.thumbnail onclick=`toggleDetails('${p.id}')`) 
+        else if p.post_hint == "image" && p.thumbnail && p.thumbnail != "self" && p.thumbnail != "default"
+          img(src=p.thumbnail onclick=`toggleDetails('${p.id}')`) 
         else if p.post_hint == "hosted:video"
           - var url = p.secure_media.reddit_video.scrubber_media_url
           video(src=url data-dashjs-player width='100px' height='100px' onclick=`toggleDetails('${p.id}')`)
@@ -76,7 +75,7 @@ mixin post(p)
         - var url = p.secure_media.reddit_video.dash_url
         video(src=url controls data-dashjs-player loading="lazy").post-media
         button(onclick=`toggleDetails('${p.id}')`) close
-    else if !p.post_hint || (p.post_hint == "link" && p.thumbnail && p.thumbnail != "self" && p.thumbnail != "default")
+    else if !p.selftext
       details(id=`${p.id}`)
         summary.expand-post expand link
         a(href=`${p.url}`)
diff --git a/src/public/styles.css b/src/public/styles.css
index 70a6518..14f093b 100644
--- a/src/public/styles.css
+++ b/src/public/styles.css
@@ -431,8 +431,9 @@ a {
 }
 
 button {
-  border: 1px solid var(--text-color-muted);
+  border: 0px solid;
   border-radius: 4px;
-  background-color: var(--black);
-  color: var(--white);
+  background-color: var(--bg-color-muted);
+  color: var(--text-color);
+  padding: 5px;
 }
diff --git a/src/routes/index.js b/src/routes/index.js
index f60fd96..7fe9e2a 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -6,12 +6,13 @@ const G = new geddit.Geddit();
 
 // GET /
 router.get("/", async (req, res) => {
-        res.redirect("/r/all");
+        res.render("home");
 });
 
 // GET /r/:id
 router.get("/r/:subreddit", async (req, res) => {
         const subreddit = req.params.subreddit;
+        const isMulti = subreddit.includes("+");
         const query = req.query ? req.query : {};
         if (!query.sort) {
                 query.sort = "hot";
@@ -22,7 +23,7 @@ router.get("/r/:subreddit", async (req, res) => {
 
         const [posts, about] = await Promise.all([postsReq, aboutReq]);
 
-        res.render("index", { subreddit, posts, about, query });
+        res.render("index", { subreddit, posts, about, query, isMulti });
 });
 
 // GET /comments/:id
diff --git a/src/views/home.pug b/src/views/home.pug
new file mode 100644
index 0000000..87f6e0a
--- /dev/null
+++ b/src/views/home.pug
@@ -0,0 +1,13 @@
+include ../mixins/sub
+doctype html
+html
+  +subMgmt()
+  script(async).
+    window.addEventListener("load", () => {
+      const url = `/r/${getSubs().join('+')}`;
+        if (url) {
+          window.location.href = url;
+        } else {
+          window.location.href = '/r/all';
+        }
+    });
diff --git a/src/views/index.pug b/src/views/index.pug
index add4c8e..f7f67b9 100644
--- a/src/views/index.pug
+++ b/src/views/index.pug
@@ -8,7 +8,7 @@ doctype html
 html
   +head()
   +subMgmt()
-  script.
+  script(defer).
     function updateButton(sub) {
       var b = document.getElementById("button-container");
       b.innerHTML = '';
@@ -36,13 +36,16 @@ html
   body
     main#content
       +header()
-
       div.hero
         div.sub-title
           h1 
-            a(href=`/r/${subreddit}`)
-              | r/#{subreddit}
-          div#button-container
+            if isMulti
+              a(href=`/`) readit
+            else
+              a(href=`/r/${subreddit}`)
+                | r/#{subreddit}
+          if !isMulti
+            div#button-container
         if about
           p #{about.public_description}
         details