6 files changed, 61 insertions, 23 deletions

diff --git a/src/index.js b/src/index.js
index b59cb53..deccc61 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,6 @@
 const express = require("express");
 const rateLimit = require("express-rate-limit");
 const path = require("node:path");
-const geddit = require("./geddit.js");
 const cookieParser = require("cookie-parser");
 const app = express();
 const hasher = new Bun.CryptoHasher("sha256", "secret-key");
diff --git a/src/mixins/post.pug b/src/mixins/post.pug
index 027e42f..b182e0d 100644
--- a/src/mixins/post.pug
+++ b/src/mixins/post.pug
@@ -1,11 +1,12 @@
 include ../utils
 include postUtils
-mixin post(p)
+mixin post(p, currentUrl)
+  - var from = encodeURIComponent(currentUrl)
   article.post
-    div.post-container
+    div(id=`${p.id}`).post-container
       div.post-text
         div.title-container
-          a(href=`/comments/${p.id}`)
+          a(href=`/comments/${p.id}?from=${from}`)
             != p.title
           span.domain   (#{p.domain})
         div.info-container 
@@ -19,7 +20,7 @@ mixin post(p)
             |  · 
             a(href=`/r/${p.subreddit}`) r/#{p.subreddit}
             |  · 
-            a(href=`/comments/${p.id}`) #{fmtnum (p.num_comments)} ↩
+            a(href=`/comments/${p.id}?from=${from}`) #{fmtnum (p.num_comments)} ↩
       div.media-preview
         if isPostGallery(p)
           - var item = postGalleryItems(p)[0]
diff --git a/src/public/styles.css b/src/public/styles.css
index d401fc7..754eb54 100644
--- a/src/public/styles.css
+++ b/src/public/styles.css
@@ -93,14 +93,14 @@ a:visited {
 }
 
 .sort-opts {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  justify-content: space-between;
+  display: grid;
+  margin: 10px;
 }
 
-.sort-opts a {
-  margin: 10px;
+.sort-opts {
+  grid-template-columns: repeat(2, 1fr);
+  grid-template-rows: repeat(5, 1fr);
+  grid-auto-flow: column;
 }
 
 .footer {
@@ -234,6 +234,11 @@ form {
   form {
     width: 40%;
   }
+  .sort-opts {
+    grid-template-columns: repeat(9, 1fr);
+    grid-template-rows: repeat(1, 1fr);
+    grid-auto-flow: row;
+  }
 }
 
 @media (min-width: 1080px) {
@@ -260,6 +265,11 @@ form {
   form {
     width: 20%;
   }
+  .sort-opts {
+    grid-template-columns: repeat(9, 1fr);
+    grid-template-rows: repeat(1, 1fr);
+    grid-auto-flow: row;
+  }
 }
 
 @media (min-width: 2560px) {
@@ -267,6 +277,11 @@ form {
     flex: 1 1 40%;
     width: 40%;
   }
+  .sort-opts {
+    grid-template-columns: repeat(9, 1fr);
+    grid-template-rows: repeat(1, 1fr);
+    grid-auto-flow: row;
+  }
 }
 
 .comment, .more {
@@ -583,3 +598,10 @@ a.nav-link {
 .comment-info-container > p {
   margin-top: 0px;
 }
+
+select {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  text-indent: 1px;
+  text-overflow: '';
+}
diff --git a/src/routes/index.js b/src/routes/index.js
index ef395ed..3e2f04d 100644
--- a/src/routes/index.js
+++ b/src/routes/index.js
@@ -6,6 +6,7 @@ const { JWT_KEY } = require("../");
 const { db } = require("../db");
 const { authenticateToken, authenticateAdmin } = require("../auth");
 const { validateInviteToken } = require("../invite");
+const url = require("url");
 
 const router = express.Router();
 const G = new geddit.Geddit();
@@ -54,6 +55,7 @@ router.get("/r/:subreddit", authenticateToken, async (req, res) => {
                 isMulti,
                 user: req.user,
                 isSubbed,
+                currentUrl: req.url,
         });
 });
 
@@ -65,10 +67,10 @@ router.get("/comments/:id", authenticateToken, async (req, res) => {
                 limit: 50,
         };
         response = await G.getSubmissionComments(id, params);
-
         res.render("comments", {
                 data: unescape_submission(response),
                 user: req.user,
+                from: req.query.from,
         });
 });
 
diff --git a/src/views/comments.pug b/src/views/comments.pug
index b006d03..17af45a 100644
--- a/src/views/comments.pug
+++ b/src/views/comments.pug
@@ -22,6 +22,11 @@ html
       +header(user)
       div.hero
         h3.sub-title
+          if from
+            a(href=`${from}#${post.id}`) <- back
+            | &nbsp;&nbsp;
+            | ·
+            | &nbsp;&nbsp;
           a(href=`/r/${post.subreddit}`) r/#{post.subreddit}
 
         div.info-container 
diff --git a/src/views/index.pug b/src/views/index.pug
index 9f5a774..0f00efe 100644
--- a/src/views/index.pug
+++ b/src/views/index.pug
@@ -35,20 +35,29 @@ html
         details
           summary.sorting sorting by #{query.sort + (query.t?' '+query.t:'')}
           div.sort-opts
-            a(href=`/r/${subreddit}?sort=hot`) hot
-            a(href=`/r/${subreddit}?sort=new`) new
-            a(href=`/r/${subreddit}?sort=rising`) rising
-            a(href=`/r/${subreddit}?sort=top`) top
-            a(href=`/r/${subreddit}?sort=top&t=day`) top day
-            a(href=`/r/${subreddit}?sort=top&t=week`) top week
-            a(href=`/r/${subreddit}?sort=top&t=month`) top month
-            a(href=`/r/${subreddit}?sort=top&t=year`) top year
-            a(href=`/r/${subreddit}?sort=top&t=all`) top all
+            div
+              a(href=`/r/${subreddit}?sort=hot`) hot
+            div
+              a(href=`/r/${subreddit}?sort=new`) new
+            div
+              a(href=`/r/${subreddit}?sort=rising`) rising
+            div
+              a(href=`/r/${subreddit}?sort=top`) top
+            div
+              a(href=`/r/${subreddit}?sort=top&t=day`) top day
+            div
+              a(href=`/r/${subreddit}?sort=top&t=week`) top week
+            div
+              a(href=`/r/${subreddit}?sort=top&t=month`) top month
+            div
+              a(href=`/r/${subreddit}?sort=top&t=year`) top year
+            div
+              a(href=`/r/${subreddit}?sort=top&t=all`) top all
 
       if posts
         each child in posts.posts
-          +post(child.data)
-        
+          +post(child.data, currentUrl)
+
         if posts.after
           div.footer
             div.footer-item