From b6143c9ab8bb2aac6517b9580bf72ebe485eb738 Mon Sep 17 00:00:00 2001 From: f0x52 Date: Mon, 20 Feb 2023 16:29:29 +0100 Subject: [PATCH] [feature] About page (#1495) * about page basics * more info, styling * update emoji sizing on about page contact card --- internal/web/about.go | 50 +++++++++++++++++++ internal/web/domain-blocklist.go | 2 +- internal/web/web.go | 1 + web/source/css/base.css | 51 +++++++++++++++++++ web/template/about.tmpl | 85 ++++++++++++++++++++++++++++++++ 5 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 internal/web/about.go create mode 100644 web/template/about.tmpl diff --git a/internal/web/about.go b/internal/web/about.go new file mode 100644 index 000000000..7e8fa89a8 --- /dev/null +++ b/internal/web/about.go @@ -0,0 +1,50 @@ +/* + GoToSocial + Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org + + 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 . +*/ + +package web + +import ( + "net/http" + + "github.com/gin-gonic/gin" + apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" + "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/gtserror" +) + +const ( + aboutPath = "/about" +) + +func (m *Module) aboutGETHandler(c *gin.Context) { + instance, err := m.processor.InstanceGetV1(c.Request.Context()) + if err != nil { + apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) + return + } + + c.HTML(http.StatusOK, "about.tmpl", gin.H{ + "instance": instance, + "ogMeta": ogBase(instance), + "blocklistExposed": config.GetInstanceExposeSuspendedWeb(), + "stylesheets": []string{ + assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css", + }, + "javascript": []string{distPathPrefix + "/frontend.js"}, + }) +} diff --git a/internal/web/domain-blocklist.go b/internal/web/domain-blocklist.go index 6f28a0fe7..dc15a5702 100644 --- a/internal/web/domain-blocklist.go +++ b/internal/web/domain-blocklist.go @@ -30,7 +30,7 @@ import ( ) const ( - domainBlockListPath = "/about/suspended" + domainBlockListPath = aboutPath + "/suspended" ) func (m *Module) domainBlockListGETHandler(c *gin.Context) { diff --git a/internal/web/web.go b/internal/web/web.go index 08bac4583..a6b5a45da 100644 --- a/internal/web/web.go +++ b/internal/web/web.go @@ -104,6 +104,7 @@ func (m *Module) Route(r router.Router, mi ...gin.HandlerFunc) { r.AttachHandler(http.MethodGet, rssFeedPath, m.rssFeedGETHandler) r.AttachHandler(http.MethodGet, confirmEmailPath, m.confirmEmailGETHandler) r.AttachHandler(http.MethodGet, robotsPath, m.robotsGETHandler) + r.AttachHandler(http.MethodGet, aboutPath, m.aboutGETHandler) r.AttachHandler(http.MethodGet, domainBlockListPath, m.domainBlockListGETHandler) // Attach redirects from old endpoints to current ones for backwards compatibility diff --git a/web/source/css/base.css b/web/source/css/base.css index d9b3e170e..29dafef84 100644 --- a/web/source/css/base.css +++ b/web/source/css/base.css @@ -502,6 +502,57 @@ label { } } +.about { + display: flex; + flex-direction: column; + gap: 1rem; + + h2 { + margin: 0.5rem 0; + } + + ul { + margin-bottom: 0; + } + + .contact-account-card { + /* display: inline-grid; + grid-template-columns: 4rem auto; + grid-template-rows: 4rem; + gap: 1rem; + padding: 0.5rem; */ + display: inline-grid; + grid-template-columns: auto 1fr; + grid-template-rows: auto auto; + text-decoration: none; + gap: 0.5rem 1rem; + border-radius: $br; + padding: 0.5rem; + min-width: 40%; + margin-bottom: 0.3rem; + + background: $list-entry-bg; + + &:hover { + background: $list-entry-alternate-bg; + } + + h3 { + align-self: end; + margin: 0; + color: $fg; + } + + img.avatar { + border-radius: 0.5rem; + width: 5rem; + height: 5rem; + object-fit: cover; + grid-row: 1 / span 2; + } + } +} + @media screen and (max-width: 30rem) { .domain-blocklist .entry { grid-template-columns: 1fr; diff --git a/web/template/about.tmpl b/web/template/about.tmpl new file mode 100644 index 000000000..48d7d2174 --- /dev/null +++ b/web/template/about.tmpl @@ -0,0 +1,85 @@ +{{- /* + GoToSocial + Copyright (C) 2021-2023 GoToSocial Authors admin@gotosocial.org + + 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 . +*/ -}} + +{{ template "header.tmpl" .}} +
+
+

About

+
+ {{.instance.Description |noescape}} +
+ + + +
+

Features

+
    +
  • + Registration is + {{if .instance.Registrations}} + enabled{{if .instance.ApprovalRequired}}, but requires admin approval{{end}}. + {{else}} + disabled. + {{end}} +
  • + {{if .instance.Configuration.Accounts.AllowCustomCSS}} +
  • + Users are allowed to set Custom CSS for their profiles. +
  • + {{end}} +
  • + Toots can contain up to {{.instance.Configuration.Statuses.MaxCharacters}} characters and + {{.instance.Configuration.Statuses.MaxMediaAttachments}} media attachments. +
  • +
  • + Polls can have up to {{.instance.Configuration.Polls.MaxOptions}} options, with + {{.instance.Configuration.Polls.MaxCharactersPerOption}} characters each. +
  • +
+
+
+

Moderated servers

+

+ ActivityPub instances exchange (federate) data with other servers, including accounts and toots. + This can be prevented for specific domains by suspending them. None of their content is stored, + and interaction with their users is blocked both ways.
+ {{if .blocklistExposed}} + View the list of suspended domains + {{else}} + This instance does not publically share this list. + {{end}} +

+
+
+
+{{ template "footer.tmpl" .}} \ No newline at end of file