From fcfabeb0dd6e124e7bc8b349bbbe52216567112c Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Wed, 24 Sep 2025 14:32:44 +0100 Subject: [PATCH] appview/pages: prevent action button overflow in timeline cards Change-Id: rrsulrtnsmtwxrvpqurxxusxzuopzwtw Signed-off-by: oppiliappan --- appview/pages/pages.go | 1 + .../timeline/fragments/timeline.html | 43 +++++-------------- appview/pages/templates/user/followers.html | 9 +++- appview/pages/templates/user/following.html | 9 +++- .../templates/user/fragments/follow.html | 8 +++- .../templates/user/fragments/followCard.html | 35 ++++++++------- .../templates/user/fragments/repoCard.html | 20 ++++----- appview/state/profile.go | 1 + 8 files changed, 63 insertions(+), 63 deletions(-) diff --git a/appview/pages/pages.go b/appview/pages/pages.go index df37834b..1d8c2044 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -484,6 +484,7 @@ func (p *Pages) ProfileStrings(w io.Writer, params ProfileStringsParams) error { type FollowCard struct { UserDid string + LoggedInUser *oauth.User FollowStatus models.FollowStatus FollowersCount int64 FollowingCount int64 diff --git a/appview/pages/templates/timeline/fragments/timeline.html b/appview/pages/templates/timeline/fragments/timeline.html index b420c048..081e112a 100644 --- a/appview/pages/templates/timeline/fragments/timeline.html +++ b/appview/pages/templates/timeline/fragments/timeline.html @@ -82,7 +82,8 @@ {{ $event := index . 1 }} {{ $follow := $event.Follow }} {{ $profile := $event.Profile }} - {{ $stat := $event.FollowStats }} + {{ $followStats := $event.FollowStats }} + {{ $followStatus := $event.FollowStatus }} {{ $userHandle := resolve $follow.UserDid }} {{ $subjectHandle := resolve $follow.SubjectDid }} @@ -92,36 +93,12 @@ {{ template "user/fragments/picHandleLink" $subjectHandle }} {{ template "repo/fragments/time" $follow.FollowedAt }} -
-
-
- -
- -
- - {{ $subjectHandle | truncateAt30 }} - - {{ with $profile }} - {{ with .Description }} -

{{.}}

- {{ end }} - {{ end }} - {{ with $stat }} -
- {{ i "users" "size-4" }} - {{ .Followers }} followers - - {{ .Following }} following -
- {{ end }} -
-
- - {{ if and $root.LoggedInUser (ne $event.FollowStatus.String "IsSelf") }} -
- {{ template "user/fragments/follow" (dict "UserDid" $follow.SubjectDid "FollowStatus" $event.FollowStatus) }} -
- {{ end }} -
+ {{ template "user/fragments/followCard" + (dict + "LoggedInUser" $root.LoggedInUser + "UserDid" $follow.SubjectDid + "Profile" $profile + "FollowStatus" $followStatus + "FollowersCount" $followStats.Followers + "FollowingCount" $followStats.Following) }} {{ end }} diff --git a/appview/pages/templates/user/followers.html b/appview/pages/templates/user/followers.html index e30405cd..9e8e5956 100644 --- a/appview/pages/templates/user/followers.html +++ b/appview/pages/templates/user/followers.html @@ -10,7 +10,14 @@

ALL FOLLOWERS

{{ range .Followers }} - {{ template "user/fragments/followCard" . }} + {{ template "user/fragments/followCard" + (dict + "LoggedInUser" $.LoggedInUser + "UserDid" .UserDid + "Profile" .Profile + "FollowStatus" .FollowStatus + "FollowersCount" .FollowersCount + "FollowingCount" .FollowingCount) }} {{ else }}

This user does not have any followers yet.

{{ end }} diff --git a/appview/pages/templates/user/following.html b/appview/pages/templates/user/following.html index ce77f1a5..1a5fb1ec 100644 --- a/appview/pages/templates/user/following.html +++ b/appview/pages/templates/user/following.html @@ -10,7 +10,14 @@

ALL FOLLOWING

{{ range .Following }} - {{ template "user/fragments/followCard" . }} + {{ template "user/fragments/followCard" + (dict + "LoggedInUser" $.LoggedInUser + "UserDid" .UserDid + "Profile" .Profile + "FollowStatus" .FollowStatus + "FollowersCount" .FollowersCount + "FollowingCount" .FollowingCount) }} {{ else }}

This user does not follow anyone yet.

{{ end }} diff --git a/appview/pages/templates/user/fragments/follow.html b/appview/pages/templates/user/fragments/follow.html index 6cb96740..b5214caa 100644 --- a/appview/pages/templates/user/fragments/follow.html +++ b/appview/pages/templates/user/fragments/follow.html @@ -1,6 +1,6 @@ {{ define "user/fragments/follow" }} {{ end }} diff --git a/appview/pages/templates/user/fragments/followCard.html b/appview/pages/templates/user/fragments/followCard.html index 13b0ab48..a38661b9 100644 --- a/appview/pages/templates/user/fragments/followCard.html +++ b/appview/pages/templates/user/fragments/followCard.html @@ -6,24 +6,27 @@
-
- - {{ $userIdent | truncateAt30 }} - -

{{.Profile.Description}}

-
- {{ i "users" "size-4" }} - {{ .FollowersCount }} followers - - {{ .FollowingCount }} following +
+
+ + {{ $userIdent | truncateAt30 }} + + {{ with .Profile }} +

{{.Description}}

+ {{ end }} +
+ {{ i "users" "size-4" }} + {{ .FollowersCount }} followers + + {{ .FollowingCount }} following +
-
- - {{ if ne .FollowStatus.String "IsSelf" }} -
+ {{ if and .LoggedInUser (ne .FollowStatus.String "IsSelf") }} +
{{ template "user/fragments/follow" . }}
- {{ end }} + {{ end }} +
-{{ end }} \ No newline at end of file +{{ end }} diff --git a/appview/pages/templates/user/fragments/repoCard.html b/appview/pages/templates/user/fragments/repoCard.html index c3722b4e..bd3eb8e1 100644 --- a/appview/pages/templates/user/fragments/repoCard.html +++ b/appview/pages/templates/user/fragments/repoCard.html @@ -14,23 +14,23 @@ {{ with $repo }}
-
- {{ if .Source }} - {{ i "git-fork" "w-4 h-4 mr-1.5 shrink-0" }} - {{ else }} - {{ i "book-marked" "w-4 h-4 mr-1.5 shrink-0" }} - {{ end }} - +
+ {{ if .Source }} + {{ i "git-fork" "w-4 h-4 mr-1.5 shrink-0" }} + {{ else }} + {{ i "book-marked" "w-4 h-4 mr-1.5 shrink-0" }} + {{ end }} {{ $repoOwner := resolve .Did }} {{- if $fullName -}} - {{ $repoOwner }}/{{ .Name }} + {{ $repoOwner }}/{{ .Name }} {{- else -}} - {{ .Name }} + {{ .Name }} {{- end -}}
- {{ if and $starButton $root.LoggedInUser }} +
{{ template "repo/fragments/repoStar" $starData }} +
{{ end }}
{{ with .Description }} diff --git a/appview/state/profile.go b/appview/state/profile.go index d01c6814..aa252f98 100644 --- a/appview/state/profile.go +++ b/appview/state/profile.go @@ -336,6 +336,7 @@ func (s *State) followPage( profile.Did = did } followCards[i] = pages.FollowCard{ + LoggedInUser: loggedInUser, UserDid: did, FollowStatus: followStatus, FollowersCount: followStats.Followers, -- 2.43.0