summaryrefslogtreecommitdiff
path: root/internal/web/profile.go
diff options
context:
space:
mode:
authorLibravatar tobi <31960611+tsmethurst@users.noreply.github.com>2023-12-27 11:23:52 +0100
committerLibravatar GitHub <noreply@github.com>2023-12-27 11:23:52 +0100
commit0ff52b71f2c0e970b1f0d43793c019bbed93e112 (patch)
treeeff120472b4b6f837121536ada03f530d213b13e /internal/web/profile.go
parent[bugfix] :innocent: (#2476) (diff)
downloadgotosocial-0ff52b71f2c0e970b1f0d43793c019bbed93e112.tar.xz
[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
Diffstat (limited to 'internal/web/profile.go')
-rw-r--r--internal/web/profile.go45
1 files changed, 22 insertions, 23 deletions
diff --git a/internal/web/profile.go b/internal/web/profile.go
index b2c3bb944..b629c98b9 100644
--- a/internal/web/profile.go
+++ b/internal/web/profile.go
@@ -27,7 +27,6 @@ import (
"github.com/gin-gonic/gin"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util"
- "github.com/superseriousbusiness/gotosocial/internal/config"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
)
@@ -141,28 +140,28 @@ func (m *Module) profileGETHandler(c *gin.Context) {
return
}
- stylesheets := []string{
- assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css",
- distPathPrefix + "/status.css",
- distPathPrefix + "/profile.css",
- }
- if config.GetAccountsAllowCustomCSS() {
- stylesheets = append(stylesheets, "/@"+targetAccount.Username+"/custom.css")
- }
-
- c.HTML(http.StatusOK, "profile.tmpl", gin.H{
- "instance": instance,
- "account": targetAccount,
- "ogMeta": ogBase(instance).withAccount(targetAccount),
- "rssFeed": rssFeed,
- "robotsMeta": robotsMeta,
- "statuses": statusResp.Items,
- "statuses_next": statusResp.NextLink,
- "pinned_statuses": pinnedStatuses,
- "show_back_to_top": paging,
- "stylesheets": stylesheets,
- "javascript": []string{distPathPrefix + "/frontend.js"},
- })
+ page := apiutil.WebPage{
+ Template: "profile.tmpl",
+ Instance: instance,
+ OGMeta: apiutil.OGBase(instance).WithAccount(targetAccount),
+ Stylesheets: []string{
+ cssFA, cssStatus, cssThread, cssProfile,
+ // Custom CSS for this user last in cascade.
+ "/@" + targetAccount.Username + "/custom.css",
+ },
+ Javascript: []string{jsFrontend},
+ Extra: map[string]any{
+ "account": targetAccount,
+ "rssFeed": rssFeed,
+ "robotsMeta": robotsMeta,
+ "statuses": statusResp.Items,
+ "statuses_next": statusResp.NextLink,
+ "pinned_statuses": pinnedStatuses,
+ "show_back_to_top": paging,
+ },
+ }
+
+ apiutil.TemplateWebPage(c, page)
}
// returnAPAccount returns an ActivityPub representation of