appview: adds issues into timeline #297

+29

appview/db/timeline.go

reviewed

··· 42 42 return nil, err 43 43 } 44 44 45 45 + issues, err := getTimelineIssues(e, limit, loggedInUserDid, userIsFollowing) 46 46 + if err != nil { 47 47 + return nil, err 48 48 + } 49 49 + 45 50 events = append(events, repos...) 46 51 events = append(events, stars...) 47 52 events = append(events, follows...) 53 53 + events = append(events, issues...) 48 54 49 55 sort.Slice(events, func(i, j int) bool { 50 56 return events[i].EventAt.After(events[j].EventAt) ··· 240 246 241 247 return events, nil 242 248 } 249 249 + 250 250 + func getTimelineIssues(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) { 251 251 + filters := make([]orm.Filter, 0) 252 252 + if userIsFollowing != nil { 253 253 + filters = append(filters, orm.FilterIn("owner_did", userIsFollowing)) 254 254 + } 255 255 + filters = append(filters, orm.FilterEq("open", 1)) 256 256 + 257 257 + issues, err := GetIssuesPaginated(e, pagination.Page{Limit: limit}, filters...) 258 258 + if err != nil { 259 259 + return nil, err 260 260 + } 261 261 + 262 262 + var events []models.TimelineEvent 263 263 + for _, issue := range issues { 264 264 + events = append(events, models.TimelineEvent{ 265 265 + Issue: &issue, 266 266 + EventAt: issue.Created, 267 267 + }) 268 268 + } 269 269 + 270 270 + return events, nil 271 271 + }

+1

appview/models/timeline.go

reviewed

··· 6 6 *Repo 7 7 *Follow 8 8 *RepoStar 9 9 + *Issue 9 10 10 11 EventAt time.Time 11 12

+49 -1

appview/pages/templates/timeline/fragments/timeline.html

reviewed

··· 19 19 {{ template "timeline/fragments/starEvent" (list $ .) }} 20 20 {{ else if .Follow }} 21 21 {{ template "timeline/fragments/followEvent" (list $ .) }} 22 22 + {{ else if .Issue }} 23 23 + {{ template "timeline/fragments/issueEvent" (list $ .) }} 22 24 {{ end }} 23 25 </div> 24 26 {{ end }} ··· 78 80 {{ end }} 79 81 {{ end }} 80 82 83 83 + {{ define "timeline/fragments/issueEvent" }} 84 84 + {{ $root := index . 0 }} 85 85 + {{ $event := index . 1 }} 86 86 + {{ $issue := $event.Issue }} 87 87 + {{ with $issue }} 88 88 + {{ $repo := .Repo}} 89 89 + {{ $userHandle := resolve .Did }} 90 90 + {{ $repoOwnerHandle := resolve $repo.Did }} 91 91 + <div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm"> 92 92 + {{ template "user/fragments/picHandleLink" .Did }} 93 93 + created an issue in 94 94 + <a href="/{{ $repoOwnerHandle }}/{{ $repo.Name }}" class="no-underline hover:underline"> 95 95 + {{ $repoOwnerHandle | truncateAt30 }}/{{ $repo.Name }} 96 96 + </a> 97 97 + <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" .Created }}</span> 98 98 + </div> 99 99 + <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 100 100 + <div class="pb-2"> 101 101 + <a href="/{{ $repoOwnerHandle }}/{{ $repo.Name }}" class="no-underline hover:underline"> 102 102 + {{ .Title }} 103 103 + <span class="text-gray-500 dark:text-gray-400">#{{ .IssueId }}</span> 104 104 + </a> 105 105 + </div> 106 106 + <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 107 107 + {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 108 108 + {{ $icon := "ban" }} 109 109 + {{ $state := "closed" }} 110 110 + {{ if .Open }} 111 111 + {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 112 112 + {{ $icon = "circle-dot" }} 113 113 + {{ $state = "open" }} 114 114 + {{ end }} 115 115 + 116 116 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}"> 117 117 + {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 118 118 + <span class="text-white dark:text-white text-sm">{{ $state }}</span> 119 119 + </span> 120 120 + 121 121 + <span class="before:content-['·']"> 122 122 + {{ template "repo/fragments/time" .Created }} 123 123 + </span> 124 124 + </div> 125 125 + </div> 126 126 + {{ end }} 127 127 + {{ end }} 128 128 + 81 129 {{ define "timeline/fragments/followEvent" }} 82 130 {{ $root := index . 0 }} 83 131 {{ $event := index . 1 }} ··· 94 142 {{ template "user/fragments/picHandleLink" $subjectHandle }} 95 143 <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $follow.FollowedAt }}</span> 96 144 </div> 97 97 - {{ template "user/fragments/followCard" 145 145 + {{ template "user/fragments/followCard" 98 146 (dict 99 147 "LoggedInUser" $root.LoggedInUser 100 148 "UserDid" $follow.SubjectDid