diff --git a/internal/web/index.go b/internal/web/index.go index 25960cf7f..94b68690c 100644 --- a/internal/web/index.go +++ b/internal/web/index.go @@ -60,7 +60,7 @@ func (m *Module) indexHandler(c *gin.Context) { Instance: instance, OGMeta: apiutil.OGBase(instance), Stylesheets: []string{cssAbout, cssIndex}, - Extra: map[string]any{"showStrap": true}, + Extra: map[string]any{"showStrap": true, "showLoginButton": true}, } apiutil.TemplateWebPage(c, page) diff --git a/internal/web/login.go b/internal/web/login.go new file mode 100644 index 000000000..6154d009a --- /dev/null +++ b/internal/web/login.go @@ -0,0 +1,63 @@ +// 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 . + +package web + +import ( + "context" + + "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/gtserror" +) + +const ( + loginPath = "/login" +) + +func (m *Module) loginGETHandler(c *gin.Context) { + instance, errWithCode := m.processor.InstanceGetV1(c.Request.Context()) + if errWithCode != nil { + apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1) + return + } + + // Return instance we already got from the db, + // don't try to fetch it again when erroring. + instanceGet := func(ctx context.Context) (*apimodel.InstanceV1, gtserror.WithCode) { + return instance, nil + } + + // We only serve text/html at this endpoint. + if _, err := apiutil.NegotiateAccept(c, apiutil.TextHTML); err != nil { + apiutil.WebErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), instanceGet) + return + } + + page := apiutil.WebPage{ + Template: "login.tmpl", + Instance: instance, + OGMeta: apiutil.OGBase(instance), + Stylesheets: []string{cssLogin}, + Extra: map[string]any{ + "showStrap": false, + }, + } + + apiutil.TemplateWebPage(c, page) +} diff --git a/internal/web/web.go b/internal/web/web.go index 185bf7120..3a5fbb7fe 100644 --- a/internal/web/web.go +++ b/internal/web/web.go @@ -61,6 +61,7 @@ cssFA = assetsPathPrefix + "/Fork-Awesome/css/fork-awesome.min.css" cssAbout = distPathPrefix + "/about.css" cssIndex = distPathPrefix + "/index.css" + cssLogin = distPathPrefix + "/login.css" cssStatus = distPathPrefix + "/status.css" cssThread = distPathPrefix + "/thread.css" cssProfile = distPathPrefix + "/profile.css" @@ -119,6 +120,7 @@ func (m *Module) Route(r *router.Router, mi ...gin.HandlerFunc) { r.AttachHandler(http.MethodPost, confirmEmailPath, m.confirmEmailPOSTHandler) r.AttachHandler(http.MethodGet, robotsPath, m.robotsGETHandler) r.AttachHandler(http.MethodGet, aboutPath, m.aboutGETHandler) + r.AttachHandler(http.MethodGet, loginPath, m.loginGETHandler) r.AttachHandler(http.MethodGet, domainBlockListPath, m.domainBlockListGETHandler) r.AttachHandler(http.MethodGet, tagsPath, m.tagGETHandler) r.AttachHandler(http.MethodGet, signupPath, m.signupGETHandler) diff --git a/web/source/css/login.css b/web/source/css/login.css new file mode 100644 index 000000000..f2adc4890 --- /dev/null +++ b/web/source/css/login.css @@ -0,0 +1,119 @@ +/* + 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 . +*/ + +.about-section.settings { + display: flex; + flex-direction: row; + gap: 1rem; + align-items: center; + justify-content: center; + + padding-top: 1rem !important; + padding-bottom: 1rem !important; + + p.settings-text { + margin-top: auto; + margin-bottom: auto; + flex: auto; + } + + .settings-button { + flex: auto; + } + +} + +/* + Reuse about styling, but rework it + to separate sections a bit more. +*/ +.about { + display: flex; + flex-direction: column; + gap: 2rem; + padding: 0; + + background: initial; + box-shadow: initial; + border: initial; + border-radius: initial; + + .about-section { + padding: 2rem; + background: $bg-accent; + box-shadow: $boxshadow; + border: $boxshadow-border; + border-radius: $br; + + h3 { + margin-top: 0px; + } + } +} + +.apps { + align-self: start; + + .applist { + margin: 0; + padding: 0; + + display: grid; + grid-template-columns: 1fr 1fr; + grid-gap: 0.5rem; + align-content: start; + + .applist-entry { + display: grid; + grid-template-columns: 25% 1fr; + grid-template-areas: "logo text"; + gap: 1.5rem; + padding: 0.5rem; + + .applist-logo { + grid-area: logo; + align-self: center; + justify-self: center; + width: 100%; + object-fit: contain; + flex: 1 1 auto; + } + + .applist-logo.redraw { + fill: $fg; + stroke: $fg; + } + + .applist-text { + grid-area: text; + + a { + font-weight: bold; + } + } + } + } +} + +@media screen and (max-width: 600px) { + .apps .applist { + grid-template-columns: 1fr; + } +} + diff --git a/web/source/css/page.css b/web/source/css/page.css index 642586048..cbeeb2ff3 100644 --- a/web/source/css/page.css +++ b/web/source/css/page.css @@ -116,3 +116,9 @@ text-align: center; } } + +.login { + position: absolute; + top: 2vh; + right: 2vh; +} diff --git a/web/template/login.tmpl b/web/template/login.tmpl new file mode 100644 index 000000000..31d626191 --- /dev/null +++ b/web/template/login.tmpl @@ -0,0 +1,28 @@ +{{- /* +// 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 . +*/ -}} + +
+
+

+ Looking to configure your profile and other settings? +

+ Settings +
+ {{- include "index_apps.tmpl" . | indent 1 }} +
diff --git a/web/template/login_button.tmpl b/web/template/login_button.tmpl new file mode 100644 index 000000000..5c961545b --- /dev/null +++ b/web/template/login_button.tmpl @@ -0,0 +1,22 @@ +{{- /* +// 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 . +*/ -}} + +{{- if .showLoginButton }} + +{{- end }} \ No newline at end of file diff --git a/web/template/page.tmpl b/web/template/page.tmpl index d2edc5277..52599a531 100644 --- a/web/template/page.tmpl +++ b/web/template/page.tmpl @@ -71,7 +71,9 @@ image/webp {{- end }} {{- template "instanceTitle" . -}} - + + {{- include "login_button.tmpl" . | indent 3 }} +
{{- include "page_header.tmpl" . | indent 3 }}
@@ -81,5 +83,6 @@ image/webp +
\ No newline at end of file