diff options
| author | r <r@freesoftwareextremist.com> | 2019-12-24 14:55:05 +0000 |
|---|---|---|
| committer | r <r@freesoftwareextremist.com> | 2019-12-24 14:55:05 +0000 |
| commit | a24d87ad2044db01b5ce35c5fe581967fbde4cf6 (patch) | |
| tree | 52fe7e1ded0aeaf11e801093f416d2fea55e3ebd | |
| parent | 16300c93c1cfc65c95d0e95ec1249fae182283bd (diff) | |
| download | bloat-a24d87ad2044db01b5ce35c5fe581967fbde4cf6.tar.gz bloat-a24d87ad2044db01b5ce35c5fe581967fbde4cf6.zip | |
Add userinfo in navigation
| -rw-r--r-- | renderer/model.go | 4 | ||||
| -rw-r--r-- | service/service.go | 7 | ||||
| -rw-r--r-- | static/main.css | 38 | ||||
| -rw-r--r-- | templates/navigation.tmpl | 27 |
4 files changed, 61 insertions, 15 deletions
diff --git a/renderer/model.go b/renderer/model.go index 2719dbe..9ec4a9a 100644 --- a/renderer/model.go +++ b/renderer/model.go @@ -6,12 +6,14 @@ import ( ) type NavbarTemplateData struct { + User *mastodon.Account NotificationCount int } -func NewNavbarTemplateData(notificationCount int) *NavbarTemplateData { +func NewNavbarTemplateData(notificationCount int, user *mastodon.Account) *NavbarTemplateData { return &NavbarTemplateData{ NotificationCount: notificationCount, + User: user, } } diff --git a/service/service.go b/service/service.go index 27ee6bf..8a262b6 100644 --- a/service/service.go +++ b/service/service.go @@ -478,7 +478,12 @@ func (svc *service) getNavbarTemplateData(ctx context.Context, client io.Writer, } } - data = renderer.NewNavbarTemplateData(notificationCount) + u, err := c.GetAccountCurrentUser(ctx) + if err != nil { + return + } + + data = renderer.NewNavbarTemplateData(notificationCount, u) return } diff --git a/static/main.css b/static/main.css index a4a069d..8237abb 100644 --- a/static/main.css +++ b/static/main.css @@ -104,14 +104,6 @@ font-size: 23pt; } -.navigation { - margin: 4px 0; -} - -.navigation a { - margin-right: 8px; -} - .post-form { margin: 8px 0; } @@ -343,3 +335,33 @@ .post-form-emoji-link i { font-size: 14pt !important; } + +.user-info { + margin-bottom: 8px; +} + +.user-info-img-container { + display: inline-block; + vertical-align: top; +} + +.user-info-img { + max-height: 64px; + max-width: 64px; + object-fit: contain; + vertical-align: middle; +} + +.user-info-details-container { + display: inline-block; + vertical-align: middle; +} + +.user-info-details-container>div { + margin-bottom: 4px; +} + +.nav-link { + margin-right: 2px; +} + diff --git a/templates/navigation.tmpl b/templates/navigation.tmpl index 5338677..0e745a2 100644 --- a/templates/navigation.tmpl +++ b/templates/navigation.tmpl @@ -1,6 +1,23 @@ -<div class="navigation"> - <a href="/timeline">home</a> - <a href="/notifications">notifications{{if gt .NotificationCount 0}} ({{.NotificationCount}}){{end}}</a> - <a href="/about">about</a> - <a href="/signout">sign out</a> +<div class="user-info"> + <div class="user-info-img-container"> + <a class="img-link" href="/timeline" title="home"> + <img class="user-info-img" src="{{.User.AvatarStatic}}" alt="profile-avatar" /> + </a> + </div> + <div class="user-info-details-container"> + <div> + <span class="status-dname"> {{EmojiFilter .User.DisplayName .User.Emojis}} </span> + <a class="nav-link" href="/user/{{.User.ID}}"> + <span class="status-uname"> {{.User.Acct}} </span> + </a> + </div> + <div> + <a class="nav-link" href="/timeline">home</a> + <a class="nav-link" href="/notifications">notifications{{if gt .NotificationCount 0}}({{.NotificationCount}}){{end}}</a> + <a class="nav-link" href="/about">about</a> + </div> + <div> + <a class="nav-link" href="/signout">sign out</a> + </div> + </div> </div> |