Skip to content

Commit 8fd28ae

Browse files
committed
add info to subs on visit, do not persist sort
1 parent 342b9f1 commit 8fd28ae

File tree

6 files changed

+28
-41
lines changed

6 files changed

+28
-41
lines changed

src/mixins/header.pug

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
mixin header(user)
22
- var viewQuery = 'view=' + (query && query.view ? query.view : 'compact')
3-
- var sortQuery = 'sort=' + (query ? (query.sort ? query.sort + (query.t ? '&t=' + query.t : '') : 'hot') : 'hot')
43
div.header
54
div.header-item
6-
a(href=`/?${sortQuery}&${viewQuery}`) home
5+
a(href=`/?${viewQuery}`) home
76
div.header-item
8-
a(href=`/r/all?${sortQuery}&${viewQuery}`) all
7+
a(href=`/r/all?${viewQuery}`) all
98
div.header-item
10-
a(href=`/search?${sortQuery}&${viewQuery}`) search
9+
a(href=`/search?${viewQuery}`) search
1110
div.header-item
12-
a(href=`/subs?${sortQuery}&${viewQuery}`) subs
11+
a(href=`/subs?${viewQuery}`) subs
1312
if user
1413
div.header-item
15-
a(href=`/dashboard?${sortQuery}&${viewQuery}`) #{user.username}
14+
a(href=`/dashboard${viewQuery}`) #{user.username}
1615
| 
1716
a(href='/logout') (logout)
1817
else

src/mixins/post.pug

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mixin post(p, currentUrl)
2525
|  · 
2626
| #{timeDifference(Date.now(), p.created * 1000)}
2727
|  · 
28-
a(href=`/r/${p.subreddit}`) r/#{p.subreddit}
28+
a(href=`/r/${p.subreddit}?view=${viewQuery}`) r/#{p.subreddit}
2929
|  · 
3030
a(href=`/comments/${p.id}?from=${from}`) #{fmtnum (p.num_comments)}
3131
if (query.view == "card" && !isPostMedia(p) && p.selftext_html)

src/public/styles.css

+9-32
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
--link-visited-color: #999;
1212
--accent: var(--link-color);
1313
--error-text-color: red;
14-
--border-radius-card: 2vmin;
15-
--border-radius-media: 1.5vmin;
16-
--border-radius-preview: 1vmin;
14+
--border-radius-card: 0.5vmin;
15+
--border-radius-media: 0.5vmin;
16+
--border-radius-preview: 0.3vmin;
1717

1818
font-family: Inter, sans-serif;
1919
font-feature-settings: 'ss01' 1, 'kern' 1, 'liga' 1, 'cv05' 1, 'dlig' 1, 'ss01' 1, 'ss07' 1, 'ss08' 1;
@@ -203,7 +203,6 @@ nav {
203203

204204
.image-viewer {
205205
position: relative;
206-
margin: 0.9rem;
207206
}
208207

209208
.image-viewer > img {
@@ -306,24 +305,12 @@ summary::before {
306305
max-height: 70vh;
307306
}
308307

309-
.image-viewer.main-content a {
310-
margin: unset;
311-
}
312-
313308
.image-viewer a:has(img) {
314309
font-size: 0rem;
315310
padding: unset;
316311
margin: unset;
317312
}
318313

319-
.media-preview a,
320-
.image-viewer a {
321-
font-size: 1.5rem;
322-
text-decoration: none;
323-
padding: unset;
324-
margin: 1rem;
325-
}
326-
327314
.media-maximized {
328315
max-width: 100vw;
329316
max-height: 100vh;
@@ -363,9 +350,9 @@ form {
363350

364351
@media (min-width: 768px) {
365352
:root {
366-
--border-radius-card: 1vmin;
367-
--border-radius-media: 1vmin;
368-
--border-radius-preview: 0.5vmin;
353+
--border-radius-card: 0.5vmin;
354+
--border-radius-media: 0.5vmin;
355+
--border-radius-preview: 0.3vmin;
369356
}
370357
.post, .comments-container, .hero, .header, .footer {
371358
flex: 1 1 90%;
@@ -380,12 +367,7 @@ form {
380367
.image-viewer img,
381368
.image-viewer video
382369
{
383-
max-height: 45vh;
384-
}
385-
.image-viewer a {
386-
font-size: 1rem;
387-
margin: 0.7rem;
388-
padding: initial;
370+
max-height: 50vh;
389371
}
390372
.post-text.card {
391373
max-width: 100%;
@@ -429,17 +411,12 @@ form {
429411
.image-viewer img,
430412
.image-viewer video
431413
{
432-
max-height: 35vh;
414+
max-height: 45vh;
433415
}
434416
.media-preview a {
435417
font-size: 2rem;
436418
padding: 2rem;
437419
}
438-
.image-viewer a {
439-
font-size: 1rem;
440-
margin: 1rem;
441-
padding: initial;
442-
}
443420
.self-text.card {
444421
-webkit-line-clamp: 4;
445422
line-clamp: 4;
@@ -824,7 +801,7 @@ select {
824801

825802
.sticky {
826803
background-color: var(--sticky-color);
827-
border-radius: 2px;
804+
border-radius: var(--border-radius-card);
828805
border: 4px solid var(--sticky-color);
829806
}
830807

src/utils.pug

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
- var fmtnum = (n)=>n>=1000?(n/1000).toFixed(1)+'k':n;
1+
-
2+
function fmtnum(n) {
3+
return n >= 1e6 ? (n / 1e6).toFixed(1) + 'mil' :
4+
n >= 1e3 ? (n / 1e3).toFixed(1) + 'k' :
5+
n;
6+
}
27
- var fmttxt = (n,t)=>`${t}${n==1?'':'s'}`
38
- var stripPrefix = (s, p) => s.startsWith(p) ? s.slice(p.length) : s;
49
-

src/views/comments.pug

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ html
6464
video(controls data-dashjs-player src=`${url}`).post-media
6565
else if isPostLink(post)
6666
a(href=post.url)
67-
| #{post.domain}
67+
| #{post.url}
6868

6969
if post.selftext_html
7070
div.self-text

src/views/index.pug

+6
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ html
3333
| consider donating to 
3434
a(href="https://donate.stripe.com/dR62bTaZH1295Da4gg") oppiliappan
3535
|, author of lurker
36+
if about && !isMulti
37+
div.info-container
38+
p
39+
| #{fmtnum(about.accounts_active)} active
40+
|  · 
41+
| #{fmtnum(about.subscribers)} subscribers
3642
hr
3743
details.sort-details
3844
summary.sorting sorting by #{query.sort + (query.t?' '+query.t:'')}

0 commit comments

Comments
 (0)