forked from tangled.org/core
Monorepo for Tangled

appview: fix repo ordering on timeline

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 096eb308 62ef376d

verified
Changed files
+20 -16
appview
+1
appview/db/repos.go
··· 106 from 107 repos r 108 %s 109 %s`, 110 whereClause, 111 limitClause,
··· 106 from 107 repos r 108 %s 109 + order by created desc 110 %s`, 111 whereClause, 112 limitClause,
+2 -5
appview/db/timeline.go
··· 174 175 var events []TimelineEvent 176 for _, f := range follows { 177 - profile, ok1 := profileMap[f.SubjectDid] 178 - followStatMap, ok2 := followStatMap[f.SubjectDid] 179 - if !ok1 || !ok2 { 180 - continue 181 - } 182 183 events = append(events, TimelineEvent{ 184 Follow: &f,
··· 174 175 var events []TimelineEvent 176 for _, f := range follows { 177 + profile, _ := profileMap[f.SubjectDid] 178 + followStatMap, _ := followStatMap[f.SubjectDid] 179 180 events = append(events, TimelineEvent{ 181 Follow: &f,
+1 -1
appview/pages/templates/layouts/base.html
··· 18 <div class="px-1" style="z-index: 20"> 19 {{ block "topbarLayout" . }} 20 <div class="grid grid-cols-1 md:grid-cols-12"> 21 - <header class="col-span-1 md:col-start-3 md:col-span-8"> 22 {{ template "layouts/topbar" . }} 23 </header> 24 </div>
··· 18 <div class="px-1" style="z-index: 20"> 19 {{ block "topbarLayout" . }} 20 <div class="grid grid-cols-1 md:grid-cols-12"> 21 + <header class="col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;"> 22 {{ template "layouts/topbar" . }} 23 </header> 24 </div>
+3 -1
appview/pages/templates/repo/commit.html
··· 80 {{end}} 81 82 {{ define "topbarLayout" }} 83 - {{ template "layouts/topbar" . }} 84 {{ end }} 85 86 {{ define "contentLayout" }}
··· 80 {{end}} 81 82 {{ define "topbarLayout" }} 83 + <header style="z-index: 20;"> 84 + {{ template "layouts/topbar" . }} 85 + </header> 86 {{ end }} 87 88 {{ define "contentLayout" }}
+1 -1
appview/pages/templates/repo/index.html
··· 386 dark:[&_pre]:border dark:[&_pre]:border-gray-700 387 {{ end }}" 388 > 389 - <article class="{{ if .Raw }}whitespace-pre{{ end }}">{{- if .Raw -}}<pre class="dark:bg-gray-800 dark:text-white overflow-x-scroll"> 390 {{- .HTMLReadme -}} 391 </pre> 392 {{- else -}}
··· 386 dark:[&_pre]:border dark:[&_pre]:border-gray-700 387 {{ end }}" 388 > 389 + <article class="{{ if .Raw }}whitespace-pre{{ end }}">{{- if .Raw -}}<pre class="dark:bg-gray-800 dark:text-white overflow-x-auto"> 390 {{- .HTMLReadme -}} 391 </pre> 392 {{- else -}}
+12 -8
appview/pages/templates/timeline.html
··· 143 <a href="/{{ $subjectHandle }}"> 144 <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ $subjectHandle | truncateAt30 }}</span> 145 </a> 146 - {{ with $profile.Description }} 147 - <p class="text-sm pb-2 md:pb-2">{{.}}</p> 148 {{ end }} 149 - <div class="text-sm flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full text-sm"> 150 - <span class="flex-shrink-0">{{ i "users" "size-4" }}</span> 151 - <span id="followers">{{ $stat.Followers }} followers</span> 152 - <span class="select-none after:content-['·']"></span> 153 - <span id="following">{{ $stat.Following }} following</span> 154 - </div> 155 </div> 156 </div> 157 {{ end }}
··· 143 <a href="/{{ $subjectHandle }}"> 144 <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ $subjectHandle | truncateAt30 }}</span> 145 </a> 146 + {{ with $profile }} 147 + {{ with .Description }} 148 + <p class="text-sm pb-2 md:pb-2">{{.}}</p> 149 + {{ end }} 150 {{ end }} 151 + {{ with $stat }} 152 + <div class="text-sm flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full text-sm"> 153 + <span class="flex-shrink-0">{{ i "users" "size-4" }}</span> 154 + <span id="followers">{{ .Followers }} followers</span> 155 + <span class="select-none after:content-['·']"></span> 156 + <span id="following">{{ .Following }} following</span> 157 + </div> 158 + {{ end }} 159 </div> 160 </div> 161 {{ end }}