From f09d7fba42cb1b5a10ac697e7b34c66b8ad10e97 Mon Sep 17 00:00:00 2001 From: Ryan Stafford Date: Mon, 3 Jun 2024 15:00:46 +0000 Subject: [PATCH] display children count on minimize, block comments, reports, improved responsiveness. fixes #41 --- public/dark.css | 5 +- public/link.png | Bin 5784 -> 6400 bytes public/photo.png | Bin 6179 -> 6722 bytes public/style.css | 305 ++++++++++++++++++++++------------ public/text.png | Bin 5981 -> 6361 bytes public/utils.js | 31 ++-- routes.go | 49 +++++- templates/block.html | 28 +++- templates/comment.html | 17 +- templates/create_comment.html | 16 +- templates/frontpage.html | 4 +- templates/login.html | 11 +- templates/main.html | 4 +- templates/nav.html | 4 +- templates/post.html | 37 +++-- templates/sidebar.html | 4 +- 16 files changed, 346 insertions(+), 169 deletions(-) diff --git a/public/dark.css b/public/dark.css index 25c6d5b..100f070 100644 --- a/public/dark.css +++ b/public/dark.css @@ -1,4 +1,4 @@ -body { +body, .blockpopup { background-color: #262626; color: #ddd; } @@ -16,6 +16,9 @@ input[type=text], input[type=password], textarea { .post .score { color: #646464; } +.post .thumb { + background-color: #424242; +} .score form.link-btn input { color: #646464; } diff --git a/public/link.png b/public/link.png index 0daeb9c6e3476ddb3beb8058300b053f20b4113f..0233fc283baed0178a7b9f9d260a67a6bb7e0687 100644 GIT binary patch delta 2861 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 diff --git a/public/photo.png b/public/photo.png index 96eec15cfb4a3a62cb677de863ce2df2b1518ddf..b5a755f7e353f45349122042a83c7e60eb5238c2 100644 GIT binary patch delta 2957 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 delta 2581 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 div { line-height: 20px; overflow:hidden; max-width: 840px; + text-align: left; +} +.expando > div { + text-align: center; } .comment.hidden { padding-bottom:5px; + padding-left: 4px; +} +.comment.hidden .score form input { + display: none; +} +.comment .score { + min-height: 32px; + min-width: 4px; } .comment.hidden .score { - visibility: hidden; + min-height: 1px; +} +.comment .score form { + margin-right: 2px; + min-width: 20px; + position: relative; + bottom: 2px; } .score form.link-btn input { display: inline-block; @@ -113,7 +143,6 @@ summary { .post .title { color: #888; font-size: 10px; - margin-bottom: 2px; } .post .title.visited a { color: #551A8B; @@ -132,6 +161,7 @@ summary { } .activity .post { margin-bottom: 10px; + min-height: 50px; } .activity .comment { padding-bottom: 1px; @@ -148,10 +178,10 @@ summary { .comment { overflow: hidden; font-size: 14px; - margin: 0px 0px 10px 0px; + margin: 5px 0px 8px 0px; border: 1px solid #e6e6e6; border-radius: 3px; - padding: 10px 10px 0px 7px; + padding: 7px 8px 0px 4px; } .activity .comment { border: 0px; @@ -159,8 +189,6 @@ summary { .comment img { max-height: 300px; } -.comment .comment { -} .comment .comment, .comment .comment .comment .comment, .comment .comment .comment .comment .comment .comment, @@ -176,7 +204,8 @@ summary { } .comment .meta { font-size: 10px; - margin-bottom: 6px; + overflow: hidden; + margin-bottom: 2px; } .preview h3 { background-color: #f0f3fc; @@ -232,20 +261,22 @@ summary { .commentmenu div { border-top: 1px dotted gray; font-size: 12px; + padding-top: 3px; } form.savecomment { - margin: 0px 0px 10px 0px; - width: 500px; + max-width: 500px; + padding: 0 4px; } .comment > .children > form.savecomment { margin: 0px 0px 10px 20px; } .comment .children { - margin: 5px 0px 5px 15px; + margin: 3px 0px 5px 21px; } .savecomment textarea { margin: 5px 0px; width: 100%; + box-sizing: border-box; height: 100px; } @@ -270,8 +301,11 @@ form.savecomment { .savecomment .right a { line-height: 28px; font-size: 10px; + margin-right: 4px; +} +.comment.hidden .meta span, .comment.hidden .meta b { + font-style: italic; } - .comment .meta a.minimize { color: #369; font-size: 10px; @@ -281,15 +315,21 @@ form.savecomment { color: gray; font-weight: 400; } -.comment.hidden .meta a:last-child { +.numChildren { + display: none; + color: gray; + font-style: italic; +} +.comment.hidden .numChildren { + display: inline +} +.comment.hidden .meta a.creator { font-style: italic; font-weight: 700; } .comment.hidden .content, .comment.hidden .children, .comment.hidden .morecomments { display: none; } -.children .morecomments { -} .morecomments { height: 15px; clear: left; @@ -417,7 +457,7 @@ form.nsfw div { .buttons li { display: inline; } -.buttons, .buttons > form input, .buttons li form input { +.buttons, .buttons > form input, .buttons li > form input { font-weight: bold; font-size: 10px; padding: 0; @@ -426,7 +466,8 @@ form.nsfw div { width: 100%; } .comment .buttons { - margin: 3px 0px 0px 0px; + margin: 3px 0px 2px 0px; + line-height: 16px; } .comment.hidden .buttons { display: none; @@ -436,28 +477,39 @@ form.nsfw div { border-left: 2px solid #c5c1ad; padding: 0 8px; } -.buttons a, .buttons > form input, .comment .buttons form input { +.buttons a, .buttons > form input, .comment .buttons li > form input { text-decoration: none; color: #888; display: inline-block; margin-right: 5px !important; } -.buttons a:hover, .buttons > form input:hover, .comment .buttons form input:hover { +.buttons a:hover, .buttons > form input:hover, .comment .buttons li > form input:hover { text-decoration: underline; } .entry { + display: inline-block; color: #888; - overflow:hidden; + overflow: hidden; + padding: 4px 0 0 0; } -.entry .buttons .blockpopup { +.blockpopup { display: inline-block; position: absolute; z-index: 100; background-color: white; } +.blockpopup fieldset { + border-color: gray; +} .entry .meta { margin: -1px 0px 1px 0px; } +.entry .meta > span { + white-space: nowrap; +} +.entry > div:last-child { + overflow: hidden; +} form.blockpost { padding: 2px; border: 1px solid #888; @@ -479,20 +531,22 @@ form.blockpost { float: left; position: relative; color: #fff; - font-size: 16px; - left: 11px; - top: 3px; + font-size: 12px; + left: 12px; + top: 7px; } .open.expando-button { border-radius: 30px; } .open.expando-button::before { - content: "x"; + content: "✖"; color: #fff; - left: 7px; - top: 0px; font-weight: bold; font-family: sans-serif; + left: 5px; + top: 1px; + font-size: 15px; + line-height: 22px; } .expando-button:hover{ background-color: #466599; @@ -506,7 +560,7 @@ form.blockpost { .hidechildren.hidden .show { display: inline; } -.hidechildren.hidden .hide { +.hidechildren.hidden span:first-child { display: none; } .hidechildren span { @@ -518,7 +572,6 @@ form.blockpost { .expando { display: none; max-width: 900px; - margin-top: 5px; position: relative; color: #000; } @@ -563,17 +616,19 @@ form.blockpost { } .expando.open{ display: block; + clear: left; } .expando .image { max-width: 100%; cursor: nwse-resize; + margin-top:4px; } .expando .md { + margin-top:4px; background-color: #fafafa; border: 1px solid #369; border-radius: 7px; padding: 5px 10px; - margin: 5px auto; font-size: 14px; overflow: auto; } @@ -613,44 +668,30 @@ form.blockpost { white-space: nowrap; } -#sidetoggle button::before { - content: '[+]'; - visibility: visible; - cursor: pointer; - position: relative; - top: 12px; -} -#sidetoggle.o button::before { - content: '[-]'; - visibility: visible; - cursor: pointer; - position: relative; - top: 12px; -} -#sidetoggle button { - visibility: hidden; - width: 10px; - margin-right: 16px; - background: unset; - border: unset; -} #sidetoggle { position: absolute; - cursor: pointer; right: 0; - display: inline-flex; - align-items: end; - height: 20px; - font-size: 12px; +} +#sidetoggle button { + background: unset; + border: unset; cursor: pointer; } +#sidetoggle span:last-child { + display: none; +} +.sidetoggle #sidetoggle span:last-child { + display: inline +} +.sidetoggle #sidetoggle span:first-child { + display: none +} .side { display: none; margin: 0 auto; font-size: 12px; - width: 300px; padding: 0 5px 0 10px; - margin-bottom: 10px; + margin: 0px auto; border-radius: 0px 0px 0px 4px; } .side img, .md img{ @@ -658,37 +699,80 @@ form.blockpost { } main { position: relative; - margin: 0px 10px; + margin: 0px 5px; } -.wide .side { +.sidetoggle .side { display: block !important; + margin: 0 auto; } -@media (min-width: 900px) { - .wide .side { - display: none !important; +#search input { + width: 100%; + box-sizing: border-box; +} +#search { + overflow: hidden; +} +@media (min-width: 600px) { + main > .community { + margin: 20px 50px; } - #sidetoggle button::before { - content: '[-]'; + .community .details { + margin-left: 36px; } - #sidetoggle.o button::before { - content: '[+]'; + .side { + float:right; + width: 300px; } - .expando { - text-align: left; + main { + margin-right: 0px; + margin-left: 10px; + } + main > .comment, .commentmenu, #tagline, .menu, .activity, .expando { + margin-right: 10px; + } + .entry { + display: block; + } +} +@media (min-width: 800px) { + .expando .thumb, .expando .score, .expando .rank { + display: block; } .expando .image { max-width: 578px; } + .expando > div { + text-align: left; + } +} +@media (min-width: 1064px) { + .signup > div:first-child { + position: unset !important; + } + .signup > div:first-child { + border-right: 1px solid #e0e0e0; + padding-right: 60px; + } + .sidetoggle .side { + display: none !important; + } + #sidetoggle span:last-child { + display: inline + } + #sidetoggle span:first-child { + display: none + } + .sidetoggle #sidetoggle span:last-child { + display: none; + } + .sidetoggle #sidetoggle span:first-child { + display: inline; + } + .side { display: block; - float:right; - } - main { - margin-right: 0px; - } - main > .comment { - margin-right: 10px; } + } .side form { margin: 0px 0px 5px 0px; @@ -781,7 +865,7 @@ h1, h2 { color: #369; } main > .community { - margin: 20px 50px; + margin: 20px 5px; max-width: 840px; position: relative; } @@ -795,15 +879,12 @@ main > .community { max-height: 170px; overflow: auto; } -.community .details { - margin-left: 36px; -} nav { + position: relative; border-bottom: 1px solid #00a846; background-color: #9ad59b; z-index: 99; - margin-bottom: 5px; - position: relative; + margin-bottom: 8px; } nav .communities { background-color: #f0f0f0; @@ -835,7 +916,7 @@ nav .communities a { text-decoration: none; color: black; } -nav .title a:hover { +nav .title:hover { text-decoration: underline; } @@ -870,7 +951,7 @@ nav .space a { nav .icon { height: 54px; width: 60px; - margin: 2px 5px; + margin: 2px 3px; background-repeat: no-repeat; background-size: contain; background-position: center bottom; @@ -902,6 +983,10 @@ nav li { font-weight: 700; } +nav li:nth-last-child(2) { + margin-right: 26px; +} + nav ul a { color: #369; background-color: #eff7ff; @@ -936,6 +1021,7 @@ body nav .right a.mailbox { position: relative; top: 4px; color: gray; + line-height: 0; } nav .right a, nav .right input[type=submit] { color: #369; @@ -945,7 +1031,7 @@ nav .right form, .comment form, form.link-btn { display: inline-block; margin: 0; } -nav .right form input, .comment .buttons input, form.link-btn input { +nav .right form input, .comment .buttons li > form input, form.link-btn input { background-color: rgba(0, 0, 0, 0); border: 0px; font-size: unset; @@ -958,6 +1044,10 @@ nav .right form input, .comment .buttons input, form.link-btn input { overflow: hidden; font-size: 12px; font-weight: bold; + background-color: #fffcd4; + color: #000; + margin-bottom: 5px; + padding: 0px 5px; } .menu { border-bottom: 1px dotted gray; @@ -1042,7 +1132,7 @@ form.create input[type=file], form.create select { .signup { margin: 0px 30px; } -.signup h2 { +.signup h1 { margin-bottom: 10px; } .signup > div { @@ -1050,8 +1140,8 @@ form.create input[type=file], form.create select { margin: 30px; } .signup > div:first-child { - border-right: 1px solid #e0e0e0; - padding-right: 60px; + position: absolute; + top: 316px; } .root label, .signup label { font-size: 15px; @@ -1073,7 +1163,10 @@ form.create input[type=file], form.create select { } .signup input[type=submit] { margin-top: 20px; - float: right; + display: block; +} +.signup figure { + margin: 16px 0 4px 0; } .signup .question { max-width: 500px; diff --git a/public/text.png b/public/text.png index 4dc124668c8ad4cd93431d1f4af00587539b272b..1b83da0f5863895819e8dce1dcb34134cf63e866 100644 GIT binary patch delta 2822 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 O^^a`tY*%X&aQ@%Z3%s!a delta 2610 zcmYjT2{hDeAO0JR$xfCbUnR<}+058wkR^o5PBTrTu|+14iNRRos;p%Y^AXl8Ecjlb$#QW@1Aqt_dLJn`MvM+JLf&`a?bl6&e5f&IyqX42`dT%03c>- zW9hadM@R9=nz$XCk?R$9O`0 zgn@V$rhbf0Wwz4Im4)fGL812~kzE0-MYpNW&%VbW>XG~<73sOnNq^BiX(RDR)#Fp@ zzcuIH9dFcBFPmSV*jS_VuZFHP;>0dzKbwF{y!SR2`4L?`+?C(+m!rJJCIPQq`Gt#x zK}&;w8rv1UrHw8PH&+ukI}SF1a<5K%SPcvRi4cpUR>cRb7q69OW^^Q;O)$w9RlgO; ztyOG!P+0jjuiI1q1;n-Pk=F3r+7qsWp01HDV@16(IXlL4dHT|gImB+2u+yvq)1Ap_ zP%Ct|6I07T%_wlWpmHa-E6w^|gWUlKC5^$EtrXAf>I2=jtb^;9)gMsyTF#mnAbl2B z*39Rh;_$)JVMv{l^ z8JuK&?MY!3FT7UzZ$4r-q(Gc6rtj)~gLEz^4MmduU)K&Le8^R@p3Ec`)ogPTgWeZ& zx(qXeiA#KV>ifd&tzAm-d~~z;nwjR%GMLRix3eB*f`?Aur>j4@-To6ouxD>g)zt@! zeW(|t_wFU7lrAP|CD;rvo>}EKO`kr-O0_FTm>5PqloU?1qku<9DDl4k{#@K#5BsG} z8071Cc&)RRA7B~?Nd+HZXfBrE?c=r2MCi-!DM6uB`y9LWhMJ3eUfe$u({7D26C~|U zASu-@8YPTp9U7h2=!-hjyY+`Wd^?eH=4#pVnF9uMfXyxEmHB0Pmx8H$ar!cbu!o zQaeRObZ7z-a#(M4@29HbxN^3JAX5Zr7GjRI;kK=TllT3?Dmb*DfIZm zU6Ym5KDclm$|M6Zz|oJ^{@h+!iG01@hhMrb@n(gmjAKK#6=Z;0Qp}Tp(n6Q4+KCA< z{zy3{23T5T&&+55HILX&z6R3-X=T*k0bPEZ(w5H}$C_SO8KL#U*;5}WoNx|V!qUO! zdLI17#K!9edt`URi?J%Nb4jyflh=H<8->cpWU-=@;%!aB(ok;o{T>|`Z8@sFb2j^p zdPc-3DF_7>jmaffhk(*7!9$)^VM%1uX3qu_{bPR?ceecT$6bRL3mFcM6W^(#^FJG~ zDVFn^{MStq+_k|DNKY#NNaZeL{Y>eThPnO=$HP|W-nwPpx~<_pX4iWxHxDYm#W*1S zyMd`D-Gbuc4;}l~f~=*$ zXgG_c&8TQCDsG2i197QuEkZbN3Vtcg`<52qO4WtMm7uN7(H5pTZ=I`hoptk~OUy3} zOL*cwhb{CJZnW@cuN^uC9F-i9ggj&D<_-h%N>~U)naXU8mApmEDcJJc*c}{{4r{d1 z&zRL}kd}J)d8XeB$MEdUQJwp~vDzExJ!*9VnH<1)4N`WULeDib0CqxM@T;wWCuyIS zUNBEvA7KPAxEDndKO&1>^><9_^kC6O$ynuvJ_Kl-U%j3c2r9{RCH}rJ@}mwGy$< z)6D6@Qzv5cR_9}yt?gG^s3s(6D}kCj{1P(YF&YjslCX;4ZG|#niJN+`q;K`hQV?GG z;6>l+mheZcfx2wD2i8 ztc|G_gpVnQeVM8H27}6e8MZc67LoFJC9uVp6cH0+DjrFw52k9Av_we9dOuWucdhf< zCc0hgihVv=iP8s4cQH1-6&@4w?PT1k(x|1e*_>*-s{b@Xv0onicj+?Ph`JfmztH4N m{XT6m`P*rsi|u 0 { Render(w, "create_comment.html", state) return } + state.GetPost(state.PostID) Render(w, "index.html", state) } @@ -1058,7 +1064,7 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { } state.Client.BlockPerson(context.Background(), lemmy.BlockPerson{ PersonID: personId, - Block: r.FormValue("submit") == "block", + Block: r.FormValue("submit") != "unblock", }) if r.FormValue("xhr") == "1" { w.Write([]byte{}) @@ -1337,6 +1343,43 @@ func UserOp(w http.ResponseWriter, r *http.Request, ps httprouter.Params) { Block: true, }) } + if reason := r.FormValue("reason"); reason != "" { + state.Client.CreatePostReport(context.Background(), lemmy.CreatePostReport{ + PostID: postid, + Reason: reason, + }) + } + if r.FormValue("xhr") != "" { + w.Write([]byte{}) + return + } + case "block_comment": + commentid, _ := strconv.ParseInt(r.FormValue("commentid"), 10, 64) + state.GetComment(commentid) + if r.FormValue("blockuser") != "" && len(state.Comments) > 0 { + fmt.Println("blockuser") + state.Client.BlockPerson(context.Background(), lemmy.BlockPerson{ + PersonID: state.Comments[0].P.Creator.ID, + Block: true, + }) + } + if r.FormValue("blockuserinstance") != "" && len(state.Comments) > 0 { + fmt.Println("blockuserinstance") + state.Client.BlockInstance(context.Background(), lemmy.BlockInstance{ + InstanceID: state.Comments[0].P.Creator.InstanceID, + Block: true, + }) + } + if reason := r.FormValue("reason"); reason != "" { + state.Client.CreateCommentReport(context.Background(), lemmy.CreateCommentReport{ + CommentID: commentid, + Reason: r.FormValue("reason"), + }) + } + if r.FormValue("xhr") != "" { + w.Write([]byte{}) + return + } case "read_post": postid, _ := strconv.ParseInt(r.FormValue("postid"), 10, 64) post := lemmy.MarkPostAsRead{ diff --git a/templates/block.html b/templates/block.html index 4beaa8c..f03c9dd 100644 --- a/templates/block.html +++ b/templates/block.html @@ -3,16 +3,25 @@ {{ template "nav.html" . }} {{ end }}
+
+ block
- +
- {{ if and (not (index .Posts 0).Creator.Local) (ne (index .Posts 0).Creator.InstanceID .Community.CommunityView.Community.InstanceID) }} + {{ if and .Comments (not (index .Comments 0).P.Creator.Local) }} +
+ + +
+ {{ end }} + {{ if and .Posts (not (index .Posts 0).Creator.Local) (ne (index .Posts 0).Creator.InstanceID .Community.CommunityView.Community.InstanceID) }}
{{ end }} + {{ if .Community }}
@@ -23,12 +32,25 @@
{{ end }} + {{ end }} +
+
+ report {{ if .Posts }}post{{ else }}comment{{ end }} + +
+
+
+ {{ if .Posts }} - + {{ else }} + + + {{ end }} +
diff --git a/templates/comment.html b/templates/comment.html index 7e8a846..b7d4ea8 100644 --- a/templates/comment.html +++ b/templates/comment.html @@ -15,10 +15,10 @@
-{{- if or (lt .P.Counts.Score -5) .P.Comment.Deleted -}} +{{- if or (lt .P.Counts.Score -5) .P.Comment.Deleted .P.Comment.Removed -}} [+] {{- else -}} - [-] + [–] {{- end -}} @@ -32,6 +32,9 @@ {{- if gt .P.Comment.Updated.ValueOrZero.Time.Unix .P.Comment.Published.Time.Unix -}} * (last edited {{ humanize .P.Comment.Updated.ValueOrZero.Time }}) {{ end }} + {{ if .P.Counts.ChildCount }} + ({{ .P.Counts.ChildCount }} children) + {{ end }}
{{- if eq .Op "edit" }} @@ -83,12 +86,16 @@
  • -
    + +
    • +
  • + block +
  • @@ -107,7 +114,7 @@
    • {{- end }} {{- if and .State.PostID (gt (add .P.Counts.ChildCount .ChildCount) 0) }} -
  • hideshow {{add .P.Counts.ChildCount .ChildCount }} child comments
    • +
  • hideshow {{add .P.Counts.ChildCount .ChildCount }} child comments
    • {{- end }}
    diff --git a/templates/create_comment.html b/templates/create_comment.html index 476a3f8..1fd93c9 100644 --- a/templates/create_comment.html +++ b/templates/create_comment.html @@ -8,15 +8,13 @@ -
    - -
    + {{- if eq .Op "edit" }} diff --git a/templates/frontpage.html b/templates/frontpage.html index e99e132..d38753b 100644 --- a/templates/frontpage.html +++ b/templates/frontpage.html @@ -8,7 +8,7 @@ {{- end }} - + @@ -16,7 +16,7 @@ {{- if and (not .ShowNSFW) .Community .Community.CommunityView.Community.NSFW }} {{ template "nsfw.html" }} {{- else }} - +
    {{ template "sidebar.html" . }} {{- if and (not .Community) .Tagline }}
    diff --git a/templates/login.html b/templates/login.html index 7ce4439..3bb5480 100644 --- a/templates/login.html +++ b/templates/login.html @@ -27,7 +27,7 @@
    - {{ host .Host}} - sign up or login + {{ host .Host}} {{ if .Alert }} @@ -41,7 +41,7 @@