From 0ff52b71f2c0e970b1f0d43793c019bbed93e112 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Wed, 27 Dec 2023 11:23:52 +0100
Subject: [chore] Refactor HTML templates and CSS (#2480)

* [chore] Refactor HTML templates and CSS

* eslint

* ignore "Local"

* rss tests

* fiddle with OG just a tiny bit

* dick around with polls a bit more so SR stops saying "clickable"

* remove break

* oh lord

* don't lazy load avatar

* fix ogmeta tests

* clean up some cruft

* catch remaining calls to c.HTML

* fix error rendering + stack overflow in tag

* allow templating attributes

* fix indent

* set aria-hidden on status complementary content, since it's already present in the label anyway

* tidy up templating calls a little

* try to make styling a bit more consistent + readable

* fix up some remaining CSS issues

* fix up reports
---
 internal/router/template_test.go | 204 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 204 insertions(+)
 create mode 100644 internal/router/template_test.go

(limited to 'internal/router/template_test.go')

diff --git a/internal/router/template_test.go b/internal/router/template_test.go
new file mode 100644
index 000000000..19bf759e0
--- /dev/null
+++ b/internal/router/template_test.go
@@ -0,0 +1,204 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package router
+
+import (
+	"html/template"
+	"testing"
+)
+
+func TestOutdentPre(t *testing.T) {
+	const html = template.HTML(`
+        <div class="text">
+            <div class="content" lang="en">                
+                <p>Here's a bunch of HTML, read it and weep, weep then!</p>
+                <pre><code class="language-html">&lt;section class=&#34;about-user&#34;&gt;
+                    &lt;div class=&#34;col-header&#34;&gt;
+                        &lt;h2&gt;About&lt;/h2&gt;
+                    &lt;/div&gt;            
+                    &lt;div class=&#34;fields&#34;&gt;
+                        &lt;h3 class=&#34;sr-only&#34;&gt;Fields&lt;/h3&gt;
+                        &lt;dl&gt;
+                            &lt;div class=&#34;field&#34;&gt;
+                                &lt;dt&gt;should you follow me?&lt;/dt&gt;
+                                &lt;dd&gt;maybe!&lt;/dd&gt;
+                            &lt;/div&gt;
+                            &lt;div class=&#34;field&#34;&gt;
+                                &lt;dt&gt;age&lt;/dt&gt;
+                                &lt;dd&gt;120&lt;/dd&gt;
+                            &lt;/div&gt;
+                        &lt;/dl&gt;
+                    &lt;/div&gt;
+                    &lt;div class=&#34;bio&#34;&gt;
+                        &lt;h3 class=&#34;sr-only&#34;&gt;Bio&lt;/h3&gt;
+                        &lt;p&gt;i post about things that concern me&lt;/p&gt;
+                    &lt;/div&gt;
+                    &lt;div class=&#34;sr-only&#34; role=&#34;group&#34;&gt;
+                        &lt;h3 class=&#34;sr-only&#34;&gt;Stats&lt;/h3&gt;
+                        &lt;span&gt;Joined in Jun, 2022.&lt;/span&gt;
+                        &lt;span&gt;8 posts.&lt;/span&gt;
+                        &lt;span&gt;Followed by 1.&lt;/span&gt;
+                        &lt;span&gt;Following 1.&lt;/span&gt;
+                    &lt;/div&gt;
+                    &lt;div class=&#34;accountstats&#34; aria-hidden=&#34;true&#34;&gt;
+                        &lt;b&gt;Joined&lt;/b&gt;&lt;time datetime=&#34;2022-06-04T13:12:00.000Z&#34;&gt;Jun, 2022&lt;/time&gt;
+                        &lt;b&gt;Posts&lt;/b&gt;&lt;span&gt;8&lt;/span&gt;
+                        &lt;b&gt;Followed by&lt;/b&gt;&lt;span&gt;1&lt;/span&gt;
+                        &lt;b&gt;Following&lt;/b&gt;&lt;span&gt;1&lt;/span&gt;
+                    &lt;/div&gt;
+                &lt;/section&gt;
+                </code></pre>
+                <p>There, hope you liked that!</p>
+            </div>
+        </div>
+        <div class="text">
+            <div class="content" lang="en">                
+                <p>Here's a bunch of HTML, read it and weep, weep then!</p>
+                <pre><code class="language-html">&lt;section class=&#34;about-user&#34;&gt;
+                    &lt;div class=&#34;col-header&#34;&gt;
+                        &lt;h2&gt;About&lt;/h2&gt;
+                    &lt;/div&gt;            
+                    &lt;div class=&#34;fields&#34;&gt;
+                        &lt;h3 class=&#34;sr-only&#34;&gt;Fields&lt;/h3&gt;
+                        &lt;dl&gt;
+                            &lt;div class=&#34;field&#34;&gt;
+                                &lt;dt&gt;should you follow me?&lt;/dt&gt;
+                                &lt;dd&gt;maybe!&lt;/dd&gt;
+                            &lt;/div&gt;
+                            &lt;div class=&#34;field&#34;&gt;
+                                &lt;dt&gt;age&lt;/dt&gt;
+                                &lt;dd&gt;120&lt;/dd&gt;
+                            &lt;/div&gt;
+                        &lt;/dl&gt;
+                    &lt;/div&gt;
+                    &lt;div class=&#34;bio&#34;&gt;
+                        &lt;h3 class=&#34;sr-only&#34;&gt;Bio&lt;/h3&gt;
+                        &lt;p&gt;i post about things that concern me&lt;/p&gt;
+                    &lt;/div&gt;
+                    &lt;div class=&#34;sr-only&#34; role=&#34;group&#34;&gt;
+                        &lt;h3 class=&#34;sr-only&#34;&gt;Stats&lt;/h3&gt;
+                        &lt;span&gt;Joined in Jun, 2022.&lt;/span&gt;
+                        &lt;span&gt;8 posts.&lt;/span&gt;
+                        &lt;span&gt;Followed by 1.&lt;/span&gt;
+                        &lt;span&gt;Following 1.&lt;/span&gt;
+                    &lt;/div&gt;
+                    &lt;div class=&#34;accountstats&#34; aria-hidden=&#34;true&#34;&gt;
+                        &lt;b&gt;Joined&lt;/b&gt;&lt;time datetime=&#34;2022-06-04T13:12:00.000Z&#34;&gt;Jun, 2022&lt;/time&gt;
+                        &lt;b&gt;Posts&lt;/b&gt;&lt;span&gt;8&lt;/span&gt;
+                        &lt;b&gt;Followed by&lt;/b&gt;&lt;span&gt;1&lt;/span&gt;
+                        &lt;b&gt;Following&lt;/b&gt;&lt;span&gt;1&lt;/span&gt;
+                    &lt;/div&gt;
+                &lt;/section&gt;
+                </code></pre>
+                <p>There, hope you liked that!</p>
+            </div>
+        </div>
+`)
+
+	const expected = template.HTML(`
+        <div class="text">
+            <div class="content" lang="en">                
+                <p>Here's a bunch of HTML, read it and weep, weep then!</p>
+<pre><code class="language-html">&lt;section class=&#34;about-user&#34;&gt;
+    &lt;div class=&#34;col-header&#34;&gt;
+        &lt;h2&gt;About&lt;/h2&gt;
+    &lt;/div&gt;            
+    &lt;div class=&#34;fields&#34;&gt;
+        &lt;h3 class=&#34;sr-only&#34;&gt;Fields&lt;/h3&gt;
+        &lt;dl&gt;
+            &lt;div class=&#34;field&#34;&gt;
+&lt;dt&gt;should you follow me?&lt;/dt&gt;
+&lt;dd&gt;maybe!&lt;/dd&gt;
+            &lt;/div&gt;
+            &lt;div class=&#34;field&#34;&gt;
+&lt;dt&gt;age&lt;/dt&gt;
+&lt;dd&gt;120&lt;/dd&gt;
+            &lt;/div&gt;
+        &lt;/dl&gt;
+    &lt;/div&gt;
+    &lt;div class=&#34;bio&#34;&gt;
+        &lt;h3 class=&#34;sr-only&#34;&gt;Bio&lt;/h3&gt;
+        &lt;p&gt;i post about things that concern me&lt;/p&gt;
+    &lt;/div&gt;
+    &lt;div class=&#34;sr-only&#34; role=&#34;group&#34;&gt;
+        &lt;h3 class=&#34;sr-only&#34;&gt;Stats&lt;/h3&gt;
+        &lt;span&gt;Joined in Jun, 2022.&lt;/span&gt;
+        &lt;span&gt;8 posts.&lt;/span&gt;
+        &lt;span&gt;Followed by 1.&lt;/span&gt;
+        &lt;span&gt;Following 1.&lt;/span&gt;
+    &lt;/div&gt;
+    &lt;div class=&#34;accountstats&#34; aria-hidden=&#34;true&#34;&gt;
+        &lt;b&gt;Joined&lt;/b&gt;&lt;time datetime=&#34;2022-06-04T13:12:00.000Z&#34;&gt;Jun, 2022&lt;/time&gt;
+        &lt;b&gt;Posts&lt;/b&gt;&lt;span&gt;8&lt;/span&gt;
+        &lt;b&gt;Followed by&lt;/b&gt;&lt;span&gt;1&lt;/span&gt;
+        &lt;b&gt;Following&lt;/b&gt;&lt;span&gt;1&lt;/span&gt;
+    &lt;/div&gt;
+&lt;/section&gt;
+</code></pre>
+                <p>There, hope you liked that!</p>
+            </div>
+        </div>
+        <div class="text">
+            <div class="content" lang="en">                
+                <p>Here's a bunch of HTML, read it and weep, weep then!</p>
+<pre><code class="language-html">&lt;section class=&#34;about-user&#34;&gt;
+    &lt;div class=&#34;col-header&#34;&gt;
+        &lt;h2&gt;About&lt;/h2&gt;
+    &lt;/div&gt;            
+    &lt;div class=&#34;fields&#34;&gt;
+        &lt;h3 class=&#34;sr-only&#34;&gt;Fields&lt;/h3&gt;
+        &lt;dl&gt;
+            &lt;div class=&#34;field&#34;&gt;
+&lt;dt&gt;should you follow me?&lt;/dt&gt;
+&lt;dd&gt;maybe!&lt;/dd&gt;
+            &lt;/div&gt;
+            &lt;div class=&#34;field&#34;&gt;
+&lt;dt&gt;age&lt;/dt&gt;
+&lt;dd&gt;120&lt;/dd&gt;
+            &lt;/div&gt;
+        &lt;/dl&gt;
+    &lt;/div&gt;
+    &lt;div class=&#34;bio&#34;&gt;
+        &lt;h3 class=&#34;sr-only&#34;&gt;Bio&lt;/h3&gt;
+        &lt;p&gt;i post about things that concern me&lt;/p&gt;
+    &lt;/div&gt;
+    &lt;div class=&#34;sr-only&#34; role=&#34;group&#34;&gt;
+        &lt;h3 class=&#34;sr-only&#34;&gt;Stats&lt;/h3&gt;
+        &lt;span&gt;Joined in Jun, 2022.&lt;/span&gt;
+        &lt;span&gt;8 posts.&lt;/span&gt;
+        &lt;span&gt;Followed by 1.&lt;/span&gt;
+        &lt;span&gt;Following 1.&lt;/span&gt;
+    &lt;/div&gt;
+    &lt;div class=&#34;accountstats&#34; aria-hidden=&#34;true&#34;&gt;
+        &lt;b&gt;Joined&lt;/b&gt;&lt;time datetime=&#34;2022-06-04T13:12:00.000Z&#34;&gt;Jun, 2022&lt;/time&gt;
+        &lt;b&gt;Posts&lt;/b&gt;&lt;span&gt;8&lt;/span&gt;
+        &lt;b&gt;Followed by&lt;/b&gt;&lt;span&gt;1&lt;/span&gt;
+        &lt;b&gt;Following&lt;/b&gt;&lt;span&gt;1&lt;/span&gt;
+    &lt;/div&gt;
+&lt;/section&gt;
+</code></pre>
+                <p>There, hope you liked that!</p>
+            </div>
+        </div>
+`)
+
+	out := outdentPre(html)
+	if out != expected {
+		t.Fatalf("unexpected output:\n`%s`\n", out)
+	}
+}
-- 
cgit v1.2.3