willdot.net / tangled-fork
forked from tangled.org/core
Monorepo for Tangled
fork atom

appview: make banner more generic

we can always display this for an upgrade situation now.

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

oppi.li 665c097b e262afed

verified
+51 -34
unified split
+34 -19
appview/pages/templates/banner.html
··· 1 {{ define "banner" }} 2 - <div class="px-6 py-2"> 3 - The following services that you administer will have to be upgraded to be compatible with the latest version of Tangled: 4 - {{ if .Registrations }} 5 - <ul class="list-disc mx-12 my-2"> 6 - {{range .Registrations}} 7 - <li>{{ .Domain }}</li> 8 - {{ end }} 9 - </ul> 10 - Repositories hosted on these knots may not be accessible until upgraded. 11 - {{ end }} 12 13 - {{ if .Spindles }} 14 - <ul class="list-disc mx-12 my-2"> 15 - {{range .Spindles}} 16 - <li>{{ .Instance }}</li> 17 - {{ end }} 18 - </ul> 19 - Pipelines may not be executed on these spindles until upgraded. 20 - {{ end }} 21 - <a href="https://tangled.sh/@tangled.sh/core/tree/master/docs/migrations/">Click to read the upgrade guide</a>. 22 </div> 23 {{ end }}
··· 1 {{ define "banner" }} 2 + <div class="flex items-center justify-center mx-auto w-full bg-red-100 dark:bg-red-900 border border-red-200 dark:border-red-800 rounded-b drop-shadow-sm text-red-800 dark:text-red-200"> 3 + <details class="group p-2"> 4 + <summary class="list-none cursor-pointer"> 5 + <div class="flex gap-4 items-center"> 6 + <span class="group-open:hidden inline">{{ i "triangle-alert" "w-4 h-4" }}</span> 7 + <span class="hidden group-open:inline">{{ i "x" "w-4 h-4" }}</span> 8 + 9 + <span class="group-open:hidden inline">Some services that you administer require an update. Click to show more.</span> 10 + <span class="hidden group-open:inline">Some services that you administer will have to be updated to be compatible with Tangled.</span> 11 + </div> 12 + </summary> 13 + 14 + {{ if .Registrations }} 15 + <ul class="list-disc mx-12 my-2"> 16 + {{range .Registrations}} 17 + <li>Knot: {{ .Domain }}</li> 18 + {{ end }} 19 + </ul> 20 + {{ end }} 21 + 22 + {{ if .Spindles }} 23 + <ul class="list-disc mx-12 my-2"> 24 + {{range .Spindles}} 25 + <li>Spindle: {{ .Instance }}</li> 26 + {{ end }} 27 + </ul> 28 + {{ end }} 29 30 + <div class="mx-6"> 31 + These services may not be fully accessible until upgraded. 32 + <a class="underline text-red-800 dark:text-red-200" 33 + href="https://tangled.sh/@tangled.sh/core/tree/master/docs/migrations/"> 34 + Click to read the upgrade guide</a>. 35 + </div> 36 + </details> 37 </div> 38 {{ end }}
+8 -9
appview/pages/templates/layouts/base.html
··· 24 <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200"> 25 {{ block "topbarLayout" . }} 26 <header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;"> 27 {{ template "layouts/fragments/topbar" . }} 28 </header> 29 {{ end }} ··· 48 <footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12"> 49 {{ template "layouts/fragments/footer" . }} 50 </footer> 51 - {{ end }} 52 - 53 - {{ if .LoggedInUser }} 54 - <div id="upgrade-banner" 55 - class="z-50 fixed bottom-0 left-0 right-0 w-full flex justify-center bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 border border-yellow-200 dark:border-yellow-800 rounded-b drop-shadow-sm" 56 - hx-get="/banner" 57 - hx-trigger="load" 58 - hx-swap="innerHTML"> 59 - </div> 60 {{ end }} 61 </body> 62 </html>
··· 24 <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200"> 25 {{ block "topbarLayout" . }} 26 <header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;"> 27 + 28 + {{ if .LoggedInUser }} 29 + <div id="upgrade-banner" 30 + hx-get="/upgradeBanner" 31 + hx-trigger="load" 32 + hx-swap="innerHTML"> 33 + </div> 34 + {{ end }} 35 {{ template "layouts/fragments/topbar" . }} 36 </header> 37 {{ end }} ··· 56 <footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12"> 57 {{ template "layouts/fragments/footer" . }} 58 </footer> 59 {{ end }} 60 </body> 61 </html>
+6 -1
appview/pages/templates/spindles/fragments/spindleListing.html
··· 30 {{ define "spindleRightSide" }} 31 <div id="right-side" class="flex gap-2"> 32 {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2 text-sm" }} 33 - {{ if .Verified }} 34 <span class="bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 {{$style}}">{{ i "shield-check" "w-4 h-4" }} verified</span> 35 {{ template "spindles/fragments/addMemberModal" . }} 36 {{ else }} 37 <span class="bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200 {{$style}}">{{ i "shield-off" "w-4 h-4" }} unverified</span> 38 {{ block "spindleRetryButton" . }} {{ end }} 39 {{ end }} 40 {{ block "spindleDeleteButton" . }} {{ end }} 41 </div> 42 {{ end }}
··· 30 {{ define "spindleRightSide" }} 31 <div id="right-side" class="flex gap-2"> 32 {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2 text-sm" }} 33 + 34 + {{ if .NeedsUpgrade }} 35 + <span class="bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 {{$style}}"> {{ i "shield-alert" "w-4 h-4" }} needs upgrade </span> 36 + {{ block "spindleRetryButton" . }} {{ end }} 37 + {{ else if .Verified }} 38 <span class="bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 {{$style}}">{{ i "shield-check" "w-4 h-4" }} verified</span> 39 {{ template "spindles/fragments/addMemberModal" . }} 40 {{ else }} 41 <span class="bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200 {{$style}}">{{ i "shield-off" "w-4 h-4" }} unverified</span> 42 {{ block "spindleRetryButton" . }} {{ end }} 43 {{ end }} 44 + 45 {{ block "spindleDeleteButton" . }} {{ end }} 46 </div> 47 {{ end }}
+3 -5
appview/state/state.go
··· 240 db.FilterEq("needs_upgrade", 1), 241 ) 242 if err != nil { 243 - l.Error("non-fatal: failed to get registrations") 244 - return 245 } 246 247 spindles, err := db.GetSpindles( 248 s.db, 249 - db.FilterEq("did", user.Did), 250 db.FilterEq("needs_upgrade", 1), 251 ) 252 if err != nil { 253 - l.Error("non-fatal: failed to get spindles") 254 - return 255 } 256 257 if regs == nil && spindles == nil {
··· 240 db.FilterEq("needs_upgrade", 1), 241 ) 242 if err != nil { 243 + l.Error("non-fatal: failed to get registrations", "err", err) 244 } 245 246 spindles, err := db.GetSpindles( 247 s.db, 248 + db.FilterEq("owner", user.Did), 249 db.FilterEq("needs_upgrade", 1), 250 ) 251 if err != nil { 252 + l.Error("non-fatal: failed to get spindles", "err", err) 253 } 254 255 if regs == nil && spindles == nil {