-
-
Notifications
You must be signed in to change notification settings - Fork 365
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[feature/frontend] Add login button to index page which reiterates in…
…fo about clients (#3377) * Add login button to index page which reiterates info about clients * bit of CSS fiddling, move apps from front page to login info * fix indentation --------- Co-authored-by: tobi <[email protected]>
- Loading branch information
1 parent
702d492
commit 7b7fc52
Showing
12 changed files
with
386 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // GoToSocial | ||
| // Copyright (C) GoToSocial Authors [email protected] | ||
| // 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 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_info.tmpl", | ||
| Instance: instance, | ||
| OGMeta: apiutil.OGBase(instance), | ||
| Stylesheets: []string{cssAbout, cssLoginInfo}, | ||
| } | ||
|
|
||
| apiutil.TemplateWebPage(c, page) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /* | ||
| GoToSocial | ||
| Copyright (C) GoToSocial Authors [email protected] | ||
| 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/>. | ||
| */ | ||
|
|
||
| /* | ||
| Reuse about styling, but rework it | ||
| to separate sections a bit more. | ||
| */ | ||
| .about { | ||
| 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; | ||
| } | ||
| } | ||
|
|
||
| & > .about-section.settings { | ||
| display: flex; | ||
| flex-direction: row; | ||
| gap: 1rem; | ||
| align-items: center; | ||
| justify-content: center; | ||
|
|
||
| padding-top: 1rem; | ||
| padding-bottom: 1rem; | ||
|
|
||
| p.settings-text { | ||
| margin-top: auto; | ||
| margin-bottom: auto; | ||
| flex: auto; | ||
| } | ||
|
|
||
| .settings-button { | ||
| flex: auto; | ||
| } | ||
| } | ||
|
|
||
| & > .about-section.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) { | ||
| .applist { | ||
| grid-template-columns: 1fr; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -135,3 +135,9 @@ | |
| text-align: center; | ||
| } | ||
| } | ||
|
|
||
| .login { | ||
| position: absolute; | ||
| top: 2vh; | ||
| right: 2vh; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.