+8 -9

appview/issues/issues.go

··· 129 } 130 131 rp.pages.RepoSingleIssue(w, pages.RepoSingleIssueParams{ 132 - LoggedInUser: user, 133 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 134 - Issue: issue, 135 - CommentList: issue.CommentList(), 136 - Backlinks: backlinks, 137 - OrderedReactionKinds: models.OrderedReactionKinds, 138 - Reactions: reactionMap, 139 - UserReacted: userReactions, 140 - LabelDefs: defs, 141 }) 142 } 143

··· 129 } 130 131 rp.pages.RepoSingleIssue(w, pages.RepoSingleIssueParams{ 132 + LoggedInUser: user, 133 + RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 134 + Issue: issue, 135 + CommentList: issue.CommentList(), 136 + Backlinks: backlinks, 137 + Reactions: reactionMap, 138 + UserReacted: userReactions, 139 + LabelDefs: defs, 0 140 }) 141 } 142

-15

appview/knots/knots.go

··· 40 Knotstream *eventconsumer.Consumer 41 } 42 43 - type tab = map[string]any 44 - 45 - var ( 46 - knotsTabs []tab = []tab{ 47 - {"Name": "profile", "Icon": "user"}, 48 - {"Name": "keys", "Icon": "key"}, 49 - {"Name": "emails", "Icon": "mail"}, 50 - {"Name": "notifications", "Icon": "bell"}, 51 - {"Name": "knots", "Icon": "volleyball"}, 52 - {"Name": "spindles", "Icon": "spool"}, 53 - } 54 - ) 55 - 56 func (k *Knots) Router() http.Handler { 57 r := chi.NewRouter() 58 ··· 84 k.Pages.Knots(w, pages.KnotsParams{ 85 LoggedInUser: user, 86 Registrations: registrations, 87 - Tabs: knotsTabs, 88 Tab: "knots", 89 }) 90 } ··· 148 Members: members, 149 Repos: repoMap, 150 IsOwner: true, 151 - Tabs: knotsTabs, 152 Tab: "knots", 153 }) 154 }

··· 40 Knotstream *eventconsumer.Consumer 41 } 42 0 0 0 0 0 0 0 0 0 0 0 0 0 43 func (k *Knots) Router() http.Handler { 44 r := chi.NewRouter() 45 ··· 71 k.Pages.Knots(w, pages.KnotsParams{ 72 LoggedInUser: user, 73 Registrations: registrations, 0 74 Tab: "knots", 75 }) 76 } ··· 134 Members: members, 135 Repos: repoMap, 136 IsOwner: true, 0 137 Tab: "knots", 138 }) 139 }

-39

appview/models/pipeline.go

··· 1 package models 2 3 import ( 4 - "fmt" 5 "slices" 6 - "strings" 7 "time" 8 9 "github.com/bluesky-social/indigo/atproto/syntax" ··· 52 } 53 54 return 0 55 - } 56 - 57 - // produces short summary of successes: 58 - // - "0/4" when zero successes of 4 workflows 59 - // - "4/4" when all successes of 4 workflows 60 - // - "0/0" when no workflows run in this pipeline 61 - func (p Pipeline) ShortStatusSummary() string { 62 - counts := make(map[spindle.StatusKind]int) 63 - for _, w := range p.Statuses { 64 - counts[w.Latest().Status] += 1 65 - } 66 - 67 - total := len(p.Statuses) 68 - successes := counts[spindle.StatusKindSuccess] 69 - 70 - return fmt.Sprintf("%d/%d", successes, total) 71 - } 72 - 73 - // produces a string of the form "3/4 success, 2/4 failed, 1/4 pending" 74 - func (p Pipeline) LongStatusSummary() string { 75 - counts := make(map[spindle.StatusKind]int) 76 - for _, w := range p.Statuses { 77 - counts[w.Latest().Status] += 1 78 - } 79 - 80 - total := len(p.Statuses) 81 - 82 - var result []string 83 - // finish states first, followed by start states 84 - states := append(spindle.FinishStates[:], spindle.StartStates[:]...) 85 - for _, state := range states { 86 - if count, ok := counts[state]; ok { 87 - result = append(result, fmt.Sprintf("%d/%d %s", count, total, state.String())) 88 - } 89 - } 90 - 91 - return strings.Join(result, ", ") 92 } 93 94 func (p Pipeline) Counts() map[string]int {

··· 1 package models 2 3 import ( 0 4 "slices" 0 5 "time" 6 7 "github.com/bluesky-social/indigo/atproto/syntax" ··· 50 } 51 52 return 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 53 } 54 55 func (p Pipeline) Counts() map[string]int {

+29 -20

appview/pages/funcmap.go

··· 32 "tangled.org/core/crypto" 33 ) 34 0 0 35 func (p *Pages) funcMap() template.FuncMap { 36 return template.FuncMap{ 37 "split": func(s string) []string { ··· 334 }, 335 "deref": func(v any) any { 336 val := reflect.ValueOf(v) 337 - if val.Kind() == reflect.Pointer && !val.IsNil() { 338 return val.Elem().Interface() 339 } 340 return nil ··· 366 return p.AvatarUrl(handle, "") 367 }, 368 "langColor": enry.GetColor, 369 - "reverse": func(s any) any { 370 - if s == nil { 371 - return nil 372 - } 373 - 374 - v := reflect.ValueOf(s) 375 - 376 - if v.Kind() != reflect.Slice { 377 - return s 378 - } 379 - 380 - length := v.Len() 381 - reversed := reflect.MakeSlice(v.Type(), length, length) 382 383 - for i := range length { 384 - reversed.Index(i).Set(v.Index(length - 1 - i)) 385 - } 386 - 387 - return reversed.Interface() 388 - }, 389 "normalizeForHtmlId": func(s string) string { 390 normalized := strings.ReplaceAll(s, ":", "_") 391 normalized = strings.ReplaceAll(normalized, ".", "_") ··· 397 return "error" 398 } 399 return fp 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 400 }, 401 } 402 }

··· 32 "tangled.org/core/crypto" 33 ) 34 35 + type tab map[string]string 36 + 37 func (p *Pages) funcMap() template.FuncMap { 38 return template.FuncMap{ 39 "split": func(s string) []string { ··· 336 }, 337 "deref": func(v any) any { 338 val := reflect.ValueOf(v) 339 + if val.Kind() == reflect.Ptr && !val.IsNil() { 340 return val.Elem().Interface() 341 } 342 return nil ··· 368 return p.AvatarUrl(handle, "") 369 }, 370 "langColor": enry.GetColor, 371 + "layoutSide": func() string { 372 + return "col-span-1 md:col-span-2 lg:col-span-3" 373 + }, 374 + "layoutCenter": func() string { 375 + return "col-span-1 md:col-span-8 lg:col-span-6" 376 + }, 0 0 0 0 0 0 0 377 0 0 0 0 0 0 378 "normalizeForHtmlId": func(s string) string { 379 normalized := strings.ReplaceAll(s, ":", "_") 380 normalized = strings.ReplaceAll(normalized, ".", "_") ··· 386 return "error" 387 } 388 return fp 389 + }, 390 + // constant values used to define a template 391 + "const": func() map[string]any { 392 + return map[string]any{ 393 + "OrderedReactionKinds": models.OrderedReactionKinds, 394 + // would be great to have ordered maps right about now 395 + "UserSettingsTabs": []tab{ 396 + {"Name": "profile", "Icon": "user"}, 397 + {"Name": "keys", "Icon": "key"}, 398 + {"Name": "emails", "Icon": "mail"}, 399 + {"Name": "notifications", "Icon": "bell"}, 400 + {"Name": "knots", "Icon": "volleyball"}, 401 + {"Name": "spindles", "Icon": "spool"}, 402 + }, 403 + "RepoSettingsTabs": []tab{ 404 + {"Name": "general", "Icon": "sliders-horizontal"}, 405 + {"Name": "access", "Icon": "users"}, 406 + {"Name": "pipelines", "Icon": "layers-2"}, 407 + }, 408 + } 409 }, 410 } 411 }

+18 -36

appview/pages/pages.go

··· 336 337 type UserProfileSettingsParams struct { 338 LoggedInUser *oauth.User 339 - Tabs []map[string]any 340 Tab string 341 } 342 ··· 375 type UserKeysSettingsParams struct { 376 LoggedInUser *oauth.User 377 PubKeys []models.PublicKey 378 - Tabs []map[string]any 379 Tab string 380 } 381 ··· 386 type UserEmailsSettingsParams struct { 387 LoggedInUser *oauth.User 388 Emails []models.Email 389 - Tabs []map[string]any 390 Tab string 391 } 392 ··· 397 type UserNotificationSettingsParams struct { 398 LoggedInUser *oauth.User 399 Preferences *models.NotificationPreferences 400 - Tabs []map[string]any 401 Tab string 402 } 403 ··· 417 type KnotsParams struct { 418 LoggedInUser *oauth.User 419 Registrations []models.Registration 420 - Tabs []map[string]any 421 Tab string 422 } 423 ··· 431 Members []string 432 Repos map[string][]models.Repo 433 IsOwner bool 434 - Tabs []map[string]any 435 Tab string 436 } 437 ··· 450 type SpindlesParams struct { 451 LoggedInUser *oauth.User 452 Spindles []models.Spindle 453 - Tabs []map[string]any 454 Tab string 455 } 456 ··· 460 461 type SpindleListingParams struct { 462 models.Spindle 463 - Tabs []map[string]any 464 Tab string 465 } 466 ··· 473 Spindle models.Spindle 474 Members []string 475 Repos map[string][]models.Repo 476 - Tabs []map[string]any 477 Tab string 478 } 479 ··· 881 SubscribedLabels map[string]struct{} 882 ShouldSubscribeAll bool 883 Active string 884 - Tabs []map[string]any 885 Tab string 886 Branches []types.Branch 887 } ··· 895 LoggedInUser *oauth.User 896 RepoInfo repoinfo.RepoInfo 897 Active string 898 - Tabs []map[string]any 899 Tab string 900 Collaborators []Collaborator 901 } ··· 909 LoggedInUser *oauth.User 910 RepoInfo repoinfo.RepoInfo 911 Active string 912 - Tabs []map[string]any 913 Tab string 914 Spindles []string 915 CurrentSpindle string ··· 947 Backlinks []models.RichReferenceLink 948 LabelDefs map[string]*models.LabelDefinition 949 950 - OrderedReactionKinds []models.ReactionKind 951 - Reactions map[models.ReactionKind]models.ReactionDisplayData 952 - UserReacted map[models.ReactionKind]bool 953 } 954 955 func (p *Pages) RepoSingleIssue(w io.Writer, params RepoSingleIssueParams) error { ··· 1103 MergeCheck types.MergeCheckResponse 1104 ResubmitCheck ResubmitResult 1105 Pipelines map[string]models.Pipeline 1106 - Diff *types.NiceDiff 1107 - DiffOpts types.DiffOpts 1108 1109 - OrderedReactionKinds []models.ReactionKind 1110 - Reactions map[models.ReactionKind]models.ReactionDisplayData 1111 - UserReacted map[models.ReactionKind]bool 1112 1113 LabelDefs map[string]*models.LabelDefinition 1114 } ··· 1119 } 1120 1121 type RepoPullPatchParams struct { 1122 - LoggedInUser *oauth.User 1123 - RepoInfo repoinfo.RepoInfo 1124 - Pull *models.Pull 1125 - Stack models.Stack 1126 - Diff *types.NiceDiff 1127 - Round int 1128 - Submission *models.PullSubmission 1129 - OrderedReactionKinds []models.ReactionKind 1130 - DiffOpts types.DiffOpts 1131 } 1132 1133 // this name is a mouthful ··· 1136 } 1137 1138 type RepoPullInterdiffParams struct { 1139 - LoggedInUser *oauth.User 1140 - RepoInfo repoinfo.RepoInfo 1141 - Pull *models.Pull 1142 - Round int 1143 - Interdiff *patchutil.InterdiffResult 1144 - OrderedReactionKinds []models.ReactionKind 1145 - DiffOpts types.DiffOpts 1146 } 1147 1148 // this name is a mouthful

··· 336 337 type UserProfileSettingsParams struct { 338 LoggedInUser *oauth.User 0 339 Tab string 340 } 341 ··· 374 type UserKeysSettingsParams struct { 375 LoggedInUser *oauth.User 376 PubKeys []models.PublicKey 0 377 Tab string 378 } 379 ··· 384 type UserEmailsSettingsParams struct { 385 LoggedInUser *oauth.User 386 Emails []models.Email 0 387 Tab string 388 } 389 ··· 394 type UserNotificationSettingsParams struct { 395 LoggedInUser *oauth.User 396 Preferences *models.NotificationPreferences 0 397 Tab string 398 } 399 ··· 413 type KnotsParams struct { 414 LoggedInUser *oauth.User 415 Registrations []models.Registration 0 416 Tab string 417 } 418 ··· 426 Members []string 427 Repos map[string][]models.Repo 428 IsOwner bool 0 429 Tab string 430 } 431 ··· 444 type SpindlesParams struct { 445 LoggedInUser *oauth.User 446 Spindles []models.Spindle 0 447 Tab string 448 } 449 ··· 453 454 type SpindleListingParams struct { 455 models.Spindle 0 456 Tab string 457 } 458 ··· 465 Spindle models.Spindle 466 Members []string 467 Repos map[string][]models.Repo 0 468 Tab string 469 } 470 ··· 872 SubscribedLabels map[string]struct{} 873 ShouldSubscribeAll bool 874 Active string 0 875 Tab string 876 Branches []types.Branch 877 } ··· 885 LoggedInUser *oauth.User 886 RepoInfo repoinfo.RepoInfo 887 Active string 0 888 Tab string 889 Collaborators []Collaborator 890 } ··· 898 LoggedInUser *oauth.User 899 RepoInfo repoinfo.RepoInfo 900 Active string 0 901 Tab string 902 Spindles []string 903 CurrentSpindle string ··· 935 Backlinks []models.RichReferenceLink 936 LabelDefs map[string]*models.LabelDefinition 937 938 + Reactions map[models.ReactionKind]models.ReactionDisplayData 939 + UserReacted map[models.ReactionKind]bool 0 940 } 941 942 func (p *Pages) RepoSingleIssue(w io.Writer, params RepoSingleIssueParams) error { ··· 1090 MergeCheck types.MergeCheckResponse 1091 ResubmitCheck ResubmitResult 1092 Pipelines map[string]models.Pipeline 0 0 1093 1094 + Reactions map[models.ReactionKind]models.ReactionDisplayData 1095 + UserReacted map[models.ReactionKind]bool 0 1096 1097 LabelDefs map[string]*models.LabelDefinition 1098 } ··· 1103 } 1104 1105 type RepoPullPatchParams struct { 1106 + LoggedInUser *oauth.User 1107 + RepoInfo repoinfo.RepoInfo 1108 + Pull *models.Pull 1109 + Stack models.Stack 1110 + Diff *types.NiceDiff 1111 + Round int 1112 + Submission *models.PullSubmission 1113 + DiffOpts types.DiffOpts 0 1114 } 1115 1116 // this name is a mouthful ··· 1119 } 1120 1121 type RepoPullInterdiffParams struct { 1122 + LoggedInUser *oauth.User 1123 + RepoInfo repoinfo.RepoInfo 1124 + Pull *models.Pull 1125 + Round int 1126 + Interdiff *patchutil.InterdiffResult 1127 + DiffOpts types.DiffOpts 0 1128 } 1129 1130 // this name is a mouthful

-1

appview/pages/templates/fragments/tabSelector.html

··· 9 {{ range $index, $value := $all }} 10 {{ $isActive := eq $value.Key $active }} 11 <a href="?{{ $name }}={{ $value.Key }}" 12 - hx-boost=true 13 {{ if $include }} 14 hx-get="?{{ $name }}={{ $value.Key }}" 15 hx-include="{{ $include }}"

··· 9 {{ range $index, $value := $all }} 10 {{ $isActive := eq $value.Key $active }} 11 <a href="?{{ $name }}={{ $value.Key }}" 0 12 {{ if $include }} 13 hx-get="?{{ $name }}={{ $value.Key }}" 14 hx-include="{{ $include }}"

+1 -1

appview/pages/templates/layouts/repobase.html

··· 1 {{ define "title" }}{{ .RepoInfo.FullName }}{{ end }} 2 3 {{ define "content" }} 4 - <section id="repo-header" class="mb-2 py-2 px-4 dark:text-white"> 5 <div class="text-lg flex flex-col sm:flex-row items-start gap-4 justify-between"> 6 <!-- left items --> 7 <div class="flex flex-col gap-2">

··· 1 {{ define "title" }}{{ .RepoInfo.FullName }}{{ end }} 2 3 {{ define "content" }} 4 + <section id="repo-header" class="mb-4 p-2 dark:text-white"> 5 <div class="text-lg flex flex-col sm:flex-row items-start gap-4 justify-between"> 6 <!-- left items --> 7 <div class="flex flex-col gap-2">

+1 -1

appview/pages/templates/repo/fragments/diff.html

··· 18 {{ range $idx, $hunk := $diff }} 19 {{ with $hunk }} 20 <details open id="file-{{ .Id }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}"> 21 - <summary class="list-none cursor-pointer sticky top-12"> 22 <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between"> 23 <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto"> 24 <span class="group-open:hidden inline">{{ i "chevron-right" "w-4 h-4" }}</span>

··· 18 {{ range $idx, $hunk := $diff }} 19 {{ with $hunk }} 20 <details open id="file-{{ .Id }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}"> 21 + <summary class="list-none cursor-pointer sticky top-0"> 22 <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between"> 23 <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto"> 24 <span class="group-open:hidden inline">{{ i "chevron-right" "w-4 h-4" }}</span>

+8 -1

appview/pages/templates/repo/fragments/diffChangedFiles.html

··· 1 {{ define "repo/fragments/diffChangedFiles" }} 0 2 {{ $fileTree := fileTree .ChangedFiles }} 3 <section class="overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto min-h-full rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 4 - {{ template "repo/fragments/fileTree" $fileTree }} 0 0 0 0 0 0 5 </section> 6 {{ end }}

··· 1 {{ define "repo/fragments/diffChangedFiles" }} 2 + {{ $stat := .Stat }} 3 {{ $fileTree := fileTree .ChangedFiles }} 4 <section class="overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto min-h-full rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 5 + <div class="diff-stat"> 6 + <div class="flex gap-2 items-center"> 7 + <strong class="text-sm uppercase dark:text-gray-200">Changed files</strong> 8 + {{ template "repo/fragments/diffStatPill" $stat }} 9 + </div> 10 + {{ template "repo/fragments/fileTree" $fileTree }} 11 + </div> 12 </section> 13 {{ end }}

+25 -22

appview/pages/templates/repo/fragments/diffOpts.html

··· 1 {{ define "repo/fragments/diffOpts" }} 2 - {{ $active := "unified" }} 3 - {{ if .Split }} 4 - {{ $active = "split" }} 5 - {{ end }} 0 0 6 7 - {{ $unified := 8 - (dict 9 - "Key" "unified" 10 - "Value" "unified" 11 - "Icon" "square-split-vertical" 12 - "Meta" "") }} 13 - {{ $split := 14 - (dict 15 - "Key" "split" 16 - "Value" "split" 17 - "Icon" "square-split-horizontal" 18 - "Meta" "") }} 19 - {{ $values := list $unified $split }} 20 21 - {{ template "fragments/tabSelector" 22 - (dict 23 - "Name" "diff" 24 - "Values" $values 25 - "Active" $active) }} 0 26 {{ end }} 27

··· 1 {{ define "repo/fragments/diffOpts" }} 2 + <section class="flex flex-col gap-2 overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 3 + <strong class="text-sm uppercase dark:text-gray-200">options</strong> 4 + {{ $active := "unified" }} 5 + {{ if .Split }} 6 + {{ $active = "split" }} 7 + {{ end }} 8 9 + {{ $unified := 10 + (dict 11 + "Key" "unified" 12 + "Value" "unified" 13 + "Icon" "square-split-vertical" 14 + "Meta" "") }} 15 + {{ $split := 16 + (dict 17 + "Key" "split" 18 + "Value" "split" 19 + "Icon" "square-split-horizontal" 20 + "Meta" "") }} 21 + {{ $values := list $unified $split }} 22 23 + {{ template "fragments/tabSelector" 24 + (dict 25 + "Name" "diff" 26 + "Values" $values 27 + "Active" $active) }} 28 + </section> 29 {{ end }} 30

+50

appview/pages/templates/repo/fragments/reactions.html

··· 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

··· 1 + {{ define "repo/fragments/reactions" }} 2 + <div class="flex flex-wrap items-center gap-2"> 3 + {{- $reactions := .Reactions -}} 4 + {{- $userReacted := .UserReacted -}} 5 + {{- $threadAt := .ThreadAt -}} 6 + 7 + {{ template "reactionsPopup" }} 8 + {{ range $kind := const.OrderedReactionKinds }} 9 + {{ $reactionData := index $reactions $kind }} 10 + {{ template "repo/fragments/reaction" 11 + (dict 12 + "Kind" $kind 13 + "Count" $reactionData.Count 14 + "IsReacted" (index $userReacted $kind) 15 + "ThreadAt" $threadAt 16 + "Users" $reactionData.Users) }} 17 + {{ end }} 18 + </div> 19 + {{ end }} 20 + 21 + {{ define "reactionsPopup" }} 22 + <details 23 + id="reactionsPopUp" 24 + class="relative inline-block" 25 + > 26 + <summary 27 + class="flex justify-center items-center min-w-8 min-h-8 rounded border border-gray-200 dark:border-gray-700 28 + hover:bg-gray-50 29 + hover:border-gray-300 30 + dark:hover:bg-gray-700 31 + dark:hover:border-gray-600 32 + cursor-pointer list-none" 33 + > 34 + {{ i "smile" "size-4" }} 35 + </summary> 36 + <div 37 + class="absolute flex left-0 z-10 mt-4 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg" 38 + > 39 + {{ range $kind := const.OrderedReactionKinds }} 40 + <button 41 + id="reactBtn-{{ $kind }}" 42 + class="size-12 hover:bg-gray-100 dark:hover:bg-gray-700" 43 + hx-on:click="this.parentElement.parentElement.removeAttribute('open')" 44 + > 45 + {{ $kind }} 46 + </button> 47 + {{ end }} 48 + </div> 49 + </details> 50 + {{ end }}

-30

appview/pages/templates/repo/fragments/reactionsPopUp.html

··· 1 - {{ define "repo/fragments/reactionsPopUp" }} 2 - <details 3 - id="reactionsPopUp" 4 - class="relative inline-block" 5 - > 6 - <summary 7 - class="flex justify-center items-center min-w-8 min-h-8 rounded border border-gray-200 dark:border-gray-700 8 - hover:bg-gray-50 9 - hover:border-gray-300 10 - dark:hover:bg-gray-700 11 - dark:hover:border-gray-600 12 - cursor-pointer list-none" 13 - > 14 - {{ i "smile" "size-4" }} 15 - </summary> 16 - <div 17 - class="absolute flex left-0 z-10 mt-4 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg" 18 - > 19 - {{ range $kind := . }} 20 - <button 21 - id="reactBtn-{{ $kind }}" 22 - class="size-12 hover:bg-gray-100 dark:hover:bg-gray-700" 23 - hx-on:click="this.parentElement.parentElement.removeAttribute('open')" 24 - > 25 - {{ $kind }} 26 - </button> 27 - {{ end }} 28 - </div> 29 - </details> 30 - {{ end }}

··· 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

+22 -35

appview/pages/templates/repo/issues/fragments/commentList.html

··· 1 {{ define "repo/issues/fragments/commentList" }} 2 - <div class="flex flex-col gap-4"> 3 {{ range $item := .CommentList }} 4 {{ template "commentListing" (list $ .) }} 5 {{ end }} ··· 19 <div class="rounded border border-gray-200 dark:border-gray-700 w-full overflow-hidden shadow-sm bg-gray-50 dark:bg-gray-800/50"> 20 {{ template "topLevelComment" $params }} 21 22 - <div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700"> 23 {{ range $index, $reply := $comment.Replies }} 24 - <div class="-ml-4"> 25 - {{ 26 - template "replyComment" 27 - (dict 28 - "RepoInfo" $root.RepoInfo 29 - "LoggedInUser" $root.LoggedInUser 30 - "Issue" $root.Issue 31 - "Comment" $reply) 32 - }} 0 0 0 0 0 33 </div> 34 {{ end }} 35 </div> ··· 39 {{ end }} 40 41 {{ define "topLevelComment" }} 42 - <div class="rounded px-6 py-4 bg-white dark:bg-gray-800 flex gap-2 "> 43 - <div class="flex-shrink-0"> 44 - <img 45 - src="{{ tinyAvatar .Comment.Did }}" 46 - alt="" 47 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 48 - /> 49 - </div> 50 - <div class="flex-1 min-w-0"> 51 - {{ template "repo/issues/fragments/issueCommentHeader" . }} 52 - {{ template "repo/issues/fragments/issueCommentBody" . }} 53 - </div> 54 </div> 55 {{ end }} 56 57 {{ define "replyComment" }} 58 - <div class="py-4 pr-4 w-full mx-auto overflow-hidden flex gap-2 "> 59 - <div class="flex-shrink-0"> 60 - <img 61 - src="{{ tinyAvatar .Comment.Did }}" 62 - alt="" 63 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 64 - /> 65 - </div> 66 - <div class="flex-1 min-w-0"> 67 - {{ template "repo/issues/fragments/issueCommentHeader" . }} 68 - {{ template "repo/issues/fragments/issueCommentBody" . }} 69 - </div> 70 </div> 71 {{ end }}

··· 1 {{ define "repo/issues/fragments/commentList" }} 2 + <div class="flex flex-col gap-8"> 3 {{ range $item := .CommentList }} 4 {{ template "commentListing" (list $ .) }} 5 {{ end }} ··· 19 <div class="rounded border border-gray-200 dark:border-gray-700 w-full overflow-hidden shadow-sm bg-gray-50 dark:bg-gray-800/50"> 20 {{ template "topLevelComment" $params }} 21 22 + <div class="relative ml-4 border-l-2 border-gray-200 dark:border-gray-700"> 23 {{ range $index, $reply := $comment.Replies }} 24 + <div class="relative "> 25 + <!-- Horizontal connector --> 26 + <div class="absolute left-0 top-6 w-4 h-1 bg-gray-200 dark:bg-gray-700"></div> 27 + 28 + <div class="pl-2"> 29 + {{ 30 + template "replyComment" 31 + (dict 32 + "RepoInfo" $root.RepoInfo 33 + "LoggedInUser" $root.LoggedInUser 34 + "Issue" $root.Issue 35 + "Comment" $reply) 36 + }} 37 + </div> 38 </div> 39 {{ end }} 40 </div> ··· 44 {{ end }} 45 46 {{ define "topLevelComment" }} 47 + <div class="rounded px-6 py-4 bg-white dark:bg-gray-800"> 48 + {{ template "repo/issues/fragments/issueCommentHeader" . }} 49 + {{ template "repo/issues/fragments/issueCommentBody" . }} 0 0 0 0 0 0 0 0 0 50 </div> 51 {{ end }} 52 53 {{ define "replyComment" }} 54 + <div class="p-4 w-full mx-auto overflow-hidden"> 55 + {{ template "repo/issues/fragments/issueCommentHeader" . }} 56 + {{ template "repo/issues/fragments/issueCommentBody" . }} 0 0 0 0 0 0 0 0 0 57 </div> 58 {{ end }}

+63

appview/pages/templates/repo/issues/fragments/globalIssueListing.html

··· 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

··· 1 + {{ define "repo/issues/fragments/globalIssueListing" }} 2 + <div class="flex flex-col gap-2"> 3 + {{ range .Issues }} 4 + <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 5 + <div class="pb-2 mb-3"> 6 + <div class="flex items-center gap-3 mb-2"> 7 + <a 8 + href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}" 9 + class="text-blue-600 dark:text-blue-400 font-medium hover:underline text-sm" 10 + > 11 + {{ resolve .Repo.Did }}/{{ .Repo.Name }} 12 + </a> 13 + </div> 14 + <a 15 + href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" 16 + class="no-underline hover:underline" 17 + > 18 + {{ .Title | description }} 19 + <span class="text-gray-500">#{{ .IssueId }}</span> 20 + </a> 21 + </div> 22 + <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 23 + {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 24 + {{ $icon := "ban" }} 25 + {{ $state := "closed" }} 26 + {{ if .Open }} 27 + {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 28 + {{ $icon = "circle-dot" }} 29 + {{ $state = "open" }} 30 + {{ end }} 31 + 32 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 33 + {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 34 + <span class="text-white dark:text-white">{{ $state }}</span> 35 + </span> 36 + 37 + <span class="ml-1"> 38 + {{ template "user/fragments/picHandleLink" .Did }} 39 + </span> 40 + 41 + <span class="before:content-['·']"> 42 + {{ template "repo/fragments/time" .Created }} 43 + </span> 44 + 45 + <span class="before:content-['·']"> 46 + {{ $s := "s" }} 47 + {{ if eq (len .Comments) 1 }} 48 + {{ $s = "" }} 49 + {{ end }} 50 + <a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a> 51 + </span> 52 + 53 + {{ $state := .Labels }} 54 + {{ range $k, $d := $.LabelDefs }} 55 + {{ range $v, $s := $state.GetValSet $d.AtUri.String }} 56 + {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 57 + {{ end }} 58 + {{ end }} 59 + </div> 60 + </div> 61 + {{ end }} 62 + </div> 63 + {{ end }}

+1 -2

appview/pages/templates/repo/issues/fragments/issueCommentHeader.html

··· 1 {{ define "repo/issues/fragments/issueCommentHeader" }} 2 <div class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-400 "> 3 - {{ resolve .Comment.Did }} 4 {{ template "hats" $ }} 5 - <span class="before:content-['·']"></span> 6 {{ template "timestamp" . }} 7 {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did) }} 8 {{ if and $isCommentOwner (not .Comment.Deleted) }}

··· 1 {{ define "repo/issues/fragments/issueCommentHeader" }} 2 <div class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-400 "> 3 + {{ template "user/fragments/picHandleLink" .Comment.Did }} 4 {{ template "hats" $ }} 0 5 {{ template "timestamp" . }} 6 {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did) }} 7 {{ if and $isCommentOwner (not .Comment.Deleted) }}

+2 -2

appview/pages/templates/repo/issues/fragments/issueListing.html

··· 21 {{ $state = "open" }} 22 {{ end }} 23 24 - <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}"> 25 {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 26 - <span class="text-white dark:text-white text-sm">{{ $state }}</span> 27 </span> 28 29 <span class="ml-1">

··· 21 {{ $state = "open" }} 22 {{ end }} 23 24 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 25 {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 26 + <span class="text-white dark:text-white">{{ $state }}</span> 27 </span> 28 29 <span class="ml-1">

+1 -1

appview/pages/templates/repo/issues/fragments/putIssue.html

··· 18 <textarea 19 name="body" 20 id="body" 21 - rows="15" 22 class="w-full resize-y" 23 placeholder="Describe your issue. Markdown is supported." 24 >{{ if .Issue }}{{ .Issue.Body }}{{ end }}</textarea>

··· 18 <textarea 19 name="body" 20 id="body" 21 + rows="6" 22 class="w-full resize-y" 23 placeholder="Describe your issue. Markdown is supported." 24 >{{ if .Issue }}{{ .Issue.Body }}{{ end }}</textarea>

+3 -3

appview/pages/templates/repo/issues/fragments/replyIssueCommentPlaceholder.html

··· 1 {{ define "repo/issues/fragments/replyIssueCommentPlaceholder" }} 2 - <div class="py-2 px-6 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 3 {{ if .LoggedInUser }} 4 <img 5 src="{{ tinyAvatar .LoggedInUser.Did }}" 6 alt="" 7 - class="rounded-full size-8 mr-1 border-2 border-gray-300 dark:border-gray-700" 8 /> 9 {{ end }} 10 <input 11 - class="w-full p-0 border-none focus:outline-none" 12 placeholder="Leave a reply..." 13 hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/reply" 14 hx-trigger="focus"

··· 1 {{ define "repo/issues/fragments/replyIssueCommentPlaceholder" }} 2 + <div class="p-2 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 3 {{ if .LoggedInUser }} 4 <img 5 src="{{ tinyAvatar .LoggedInUser.Did }}" 6 alt="" 7 + class="rounded-full h-6 w-6 mr-1 border border-gray-300 dark:border-gray-700" 8 /> 9 {{ end }} 10 <input 11 + class="w-full py-2 border-none focus:outline-none" 12 placeholder="Leave a reply..." 13 hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/reply" 14 hx-trigger="focus"

+10 -26

appview/pages/templates/repo/issues/issue.html

··· 35 {{ if .Issue.Body }} 36 <article id="body" class="mt-4 prose dark:prose-invert">{{ .Issue.Body | markdown }}</article> 37 {{ end }} 38 - <div class="flex flex-wrap gap-2 items-stretch mt-4"> 39 - {{ template "issueReactions" . }} 0 0 0 40 </div> 41 </section> 42 {{ end }} ··· 58 {{ $icon = "circle-dot" }} 59 {{ end }} 60 <div class="inline-flex items-center gap-2"> 61 - <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}"> 62 - {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 63 - <span class="text-white dark:text-white text-sm">{{ .Issue.State }}</span> 64 - </span> 65 - 66 <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 67 opened by 68 {{ template "user/fragments/picHandleLink" .Issue.Did }} ··· 106 {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }} 107 </a> 108 {{ end }} 109 - 110 - {{ define "issueReactions" }} 111 - <div class="flex items-center gap-2"> 112 - {{ template "repo/fragments/reactionsPopUp" .OrderedReactionKinds }} 113 - {{ range $kind := .OrderedReactionKinds }} 114 - {{ $reactionData := index $.Reactions $kind }} 115 - {{ 116 - template "repo/fragments/reaction" 117 - (dict 118 - "Kind" $kind 119 - "Count" $reactionData.Count 120 - "IsReacted" (index $.UserReacted $kind) 121 - "ThreadAt" $.Issue.AtUri 122 - "Users" $reactionData.Users) 123 - }} 124 - {{ end }} 125 - </div> 126 - {{ end }} 127 - 128 129 {{ define "repoAfter" }} 130 <div class="flex flex-col gap-4 mt-4">

··· 35 {{ if .Issue.Body }} 36 <article id="body" class="mt-4 prose dark:prose-invert">{{ .Issue.Body | markdown }}</article> 37 {{ end }} 38 + <div class="mt-4"> 39 + {{ template "repo/fragments/reactions" 40 + (dict "Reactions" .Reactions 41 + "UserReacted" .UserReacted 42 + "ThreadAt" .Issue.AtUri) }} 43 </div> 44 </section> 45 {{ end }} ··· 61 {{ $icon = "circle-dot" }} 62 {{ end }} 63 <div class="inline-flex items-center gap-2"> 64 + <div id="state" 65 + class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}"> 66 + {{ i $icon "w-4 h-4 mr-1.5 text-white" }} 67 + <span class="text-white">{{ .Issue.State }}</span> 68 + </div> 69 <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 70 opened by 71 {{ template "user/fragments/picHandleLink" .Issue.Did }} ··· 109 {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }} 110 </a> 111 {{ end }} 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 112 113 {{ define "repoAfter" }} 114 <div class="flex flex-col gap-4 mt-4">

+69 -60

appview/pages/templates/repo/pipelines/fragments/pipelineSymbol.html

··· 1 {{ define "repo/pipelines/fragments/pipelineSymbol" }} 2 - <div class="cursor-pointer flex gap-2 items-center"> 3 - {{ template "symbol" .Pipeline }} 4 - {{ if .ShortSummary }} 5 - {{ .Pipeline.ShortStatusSummary }} 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 6 {{ else }} 7 - {{ .Pipeline.LongStatusSummary }} 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 8 {{ end }} 9 </div> 10 {{ end }} 11 - 12 - {{ define "symbol" }} 13 - {{ $c := .Counts }} 14 - {{ $statuses := .Statuses }} 15 - {{ $total := len $statuses }} 16 - {{ $success := index $c "success" }} 17 - {{ $fail := index $c "failed" }} 18 - {{ $timeout := index $c "timeout" }} 19 - {{ $empty := eq $total 0 }} 20 - {{ $allPass := eq $success $total }} 21 - {{ $allFail := eq $fail $total }} 22 - {{ $allTimeout := eq $timeout $total }} 23 - 24 - {{ if $empty }} 25 - {{ i "hourglass" "size-4 text-gray-600 dark:text-gray-400 " }} 26 - {{ else if $allPass }} 27 - {{ i "check" "size-4 text-green-600 dark:text-green-500" }} 28 - {{ else if $allFail }} 29 - {{ i "x" "size-4 text-red-600 dark:text-red-500" }} 30 - {{ else if $allTimeout }} 31 - {{ i "clock-alert" "size-4 text-orange-500" }} 32 - {{ else }} 33 - {{ $radius := f64 8 }} 34 - {{ $circumference := mulf64 2.0 (mulf64 3.1416 $radius) }} 35 - {{ $offset := 0.0 }} 36 - <svg class="w-4 h-4 transform -rotate-90" viewBox="0 0 20 20"> 37 - <circle cx="10" cy="10" r="{{ $radius }}" fill="none" class="stroke-gray-200 dark:stroke-gray-700" stroke-width="2"/> 38 - {{ range $kind, $count := $c }} 39 - {{ $colorClass := "" }} 40 - {{ if or (eq $kind "pending") (eq $kind "running") }} 41 - {{ $colorClass = "stroke-yellow-600 dark:stroke-yellow-500" }} 42 - {{ else if eq $kind "success" }} 43 - {{ $colorClass = "stroke-green-600 dark:stroke-green-500" }} 44 - {{ else if eq $kind "cancelled" }} 45 - {{ $colorClass = "stroke-gray-600 dark:stroke-gray-500" }} 46 - {{ else if eq $kind "timeout" }} 47 - {{ $colorClass = "stroke-orange-600 dark:stroke-orange-500" }} 48 - {{ else }} 49 - {{ $colorClass = "stroke-red-600 dark:stroke-red-500" }} 50 - {{ end }} 51 - {{ $percent := divf64 (f64 $count) (f64 $total) }} 52 - {{ $length := mulf64 $percent $circumference }} 53 - <circle 54 - cx="10" cy="10" r="{{ $radius }}" 55 - fill="none" 56 - class="{{ $colorClass }}" 57 - stroke-width="2" 58 - stroke-dasharray="{{ printf "%.2f %.2f" $length (subf64 $circumference $length) }}" 59 - stroke-dashoffset="{{ printf "%.2f" (negf64 $offset) }}" 60 - /> 61 - {{ $offset = addf64 $offset $length }} 62 - {{ end }} 63 - </svg> 64 - {{ end }} 65 - {{ end }}

··· 1 {{ define "repo/pipelines/fragments/pipelineSymbol" }} 2 + <div class="cursor-pointer"> 3 + {{ $c := .Counts }} 4 + {{ $statuses := .Statuses }} 5 + {{ $total := len $statuses }} 6 + {{ $success := index $c "success" }} 7 + {{ $fail := index $c "failed" }} 8 + {{ $timeout := index $c "timeout" }} 9 + {{ $empty := eq $total 0 }} 10 + {{ $allPass := eq $success $total }} 11 + {{ $allFail := eq $fail $total }} 12 + {{ $allTimeout := eq $timeout $total }} 13 + 14 + {{ if $empty }} 15 + <div class="flex gap-1 items-center"> 16 + {{ i "hourglass" "size-4 text-gray-600 dark:text-gray-400 " }} 17 + <span>0/{{ $total }}</span> 18 + </div> 19 + {{ else if $allPass }} 20 + <div class="flex gap-1 items-center"> 21 + {{ i "check" "size-4 text-green-600" }} 22 + <span>{{ $total }}/{{ $total }}</span> 23 + </div> 24 + {{ else if $allFail }} 25 + <div class="flex gap-1 items-center"> 26 + {{ i "x" "size-4 text-red-500" }} 27 + <span>0/{{ $total }}</span> 28 + </div> 29 + {{ else if $allTimeout }} 30 + <div class="flex gap-1 items-center"> 31 + {{ i "clock-alert" "size-4 text-orange-500" }} 32 + <span>0/{{ $total }}</span> 33 + </div> 34 {{ else }} 35 + {{ $radius := f64 8 }} 36 + {{ $circumference := mulf64 2.0 (mulf64 3.1416 $radius) }} 37 + {{ $offset := 0.0 }} 38 + <div class="flex gap-1 items-center"> 39 + <svg class="w-4 h-4 transform -rotate-90" viewBox="0 0 20 20"> 40 + <circle cx="10" cy="10" r="{{ $radius }}" fill="none" stroke="#f3f4f633" stroke-width="2"/> 41 + 42 + {{ range $kind, $count := $c }} 43 + {{ $color := "" }} 44 + {{ if or (eq $kind "pending") (eq $kind "running") }} 45 + {{ $color = "#eab308" }} {{/* amber-500 */}} 46 + {{ else if eq $kind "success" }} 47 + {{ $color = "#10b981" }} {{/* green-500 */}} 48 + {{ else if eq $kind "cancelled" }} 49 + {{ $color = "#6b7280" }} {{/* gray-500 */}} 50 + {{ else if eq $kind "timeout" }} 51 + {{ $color = "#fb923c" }} {{/* orange-400 */}} 52 + {{ else }} 53 + {{ $color = "#ef4444" }} {{/* red-500 for failed or unknown */}} 54 + {{ end }} 55 + 56 + {{ $percent := divf64 (f64 $count) (f64 $total) }} 57 + {{ $length := mulf64 $percent $circumference }} 58 + 59 + <circle 60 + cx="10" cy="10" r="{{ $radius }}" 61 + fill="none" 62 + stroke="{{ $color }}" 63 + stroke-width="2" 64 + stroke-dasharray="{{ printf "%.2f %.2f" $length (subf64 $circumference $length) }}" 65 + stroke-dashoffset="{{ printf "%.2f" (negf64 $offset) }}" 66 + /> 67 + {{ $offset = addf64 $offset $length }} 68 + {{ end }} 69 + </svg> 70 + <span>{{ $success }}/{{ $total }}</span> 71 + </div> 72 {{ end }} 73 </div> 74 {{ end }} 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

+1 -1

appview/pages/templates/repo/pipelines/fragments/pipelineSymbolLong.html

··· 4 <div class="relative inline-block"> 5 <details class="relative"> 6 <summary class="cursor-pointer list-none"> 7 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" true) }} 8 </summary> 9 {{ template "repo/pipelines/fragments/tooltip" $ }} 10 </details>

··· 4 <div class="relative inline-block"> 5 <details class="relative"> 6 <summary class="cursor-pointer list-none"> 7 + {{ template "repo/pipelines/fragments/pipelineSymbol" .Pipeline }} 8 </summary> 9 {{ template "repo/pipelines/fragments/tooltip" $ }} 10 </details>

+17 -17

appview/pages/templates/repo/pulls/fragments/pullActions.html

··· 22 {{ $isLastRound := eq $roundNumber $lastIdx }} 23 {{ $isSameRepoBranch := .Pull.IsBranchBased }} 24 {{ $isUpToDate := .ResubmitCheck.No }} 25 - <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative p-2"> 26 <button 27 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 28 hx-target="#actions-{{$roundNumber}}" 29 hx-swap="outerHtml" 30 - class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group"> 31 - {{ i "message-square-plus" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 0 32 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 33 - comment 34 </button> 35 {{ if .BranchDeleteStatus }} 36 <button 37 hx-delete="/{{ .BranchDeleteStatus.Repo.Did }}/{{ .BranchDeleteStatus.Repo.Name }}/branches" 38 hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }' 39 hx-swap="none" 40 - class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 41 {{ i "git-branch" "w-4 h-4" }} 42 <span>delete branch</span> 43 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} ··· 52 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge" 53 hx-swap="none" 54 hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?" 55 - class="btn-flat p-2 flex items-center gap-2 group" {{ $disabled }}> 56 - {{ i "git-merge" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 0 57 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 58 - merge{{if $stackCount}} {{$stackCount}}{{end}} 59 </button> 60 {{ end }} 61 ··· 74 {{ end }} 75 76 hx-disabled-elt="#resubmitBtn" 77 - class="btn-flat p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }} 78 79 {{ if $disabled }} 80 title="Update this branch to resubmit this pull request" ··· 82 title="Resubmit this pull request" 83 {{ end }} 84 > 85 - {{ i "rotate-ccw" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 0 86 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 87 - resubmit 88 </button> 89 {{ end }} 90 ··· 92 <button 93 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close" 94 hx-swap="none" 95 - class="btn-flat p-2 flex items-center gap-2 group"> 96 - {{ i "ban" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 0 97 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 98 - close 99 </button> 100 {{ end }} 101 ··· 103 <button 104 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen" 105 hx-swap="none" 106 - class="btn-flat p-2 flex items-center gap-2 group"> 107 - {{ i "refresh-ccw-dot" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 0 108 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 109 - reopen 110 </button> 111 {{ end }} 112 </div>

··· 22 {{ $isLastRound := eq $roundNumber $lastIdx }} 23 {{ $isSameRepoBranch := .Pull.IsBranchBased }} 24 {{ $isUpToDate := .ResubmitCheck.No }} 25 + <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2 relative"> 26 <button 27 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 28 hx-target="#actions-{{$roundNumber}}" 29 hx-swap="outerHtml" 30 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group"> 31 + {{ i "message-square-plus" "w-4 h-4" }} 32 + <span>comment</span> 33 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 0 34 </button> 35 {{ if .BranchDeleteStatus }} 36 <button 37 hx-delete="/{{ .BranchDeleteStatus.Repo.Did }}/{{ .BranchDeleteStatus.Repo.Name }}/branches" 38 hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }' 39 hx-swap="none" 40 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 41 {{ i "git-branch" "w-4 h-4" }} 42 <span>delete branch</span> 43 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} ··· 52 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge" 53 hx-swap="none" 54 hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?" 55 + class="btn p-2 flex items-center gap-2 group" {{ $disabled }}> 56 + {{ i "git-merge" "w-4 h-4" }} 57 + <span>merge{{if $stackCount}} {{$stackCount}}{{end}}</span> 58 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 0 59 </button> 60 {{ end }} 61 ··· 74 {{ end }} 75 76 hx-disabled-elt="#resubmitBtn" 77 + class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed group" {{ $disabled }} 78 79 {{ if $disabled }} 80 title="Update this branch to resubmit this pull request" ··· 82 title="Resubmit this pull request" 83 {{ end }} 84 > 85 + {{ i "rotate-ccw" "w-4 h-4" }} 86 + <span>resubmit</span> 87 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 0 88 </button> 89 {{ end }} 90 ··· 92 <button 93 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close" 94 hx-swap="none" 95 + class="btn p-2 flex items-center gap-2 group"> 96 + {{ i "ban" "w-4 h-4" }} 97 + <span>close</span> 98 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 0 99 </button> 100 {{ end }} 101 ··· 103 <button 104 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen" 105 hx-swap="none" 106 + class="btn p-2 flex items-center gap-2 group"> 107 + {{ i "refresh-ccw-dot" "w-4 h-4" }} 108 + <span>reopen</span> 109 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 0 110 </button> 111 {{ end }} 112 </div>

+12 -22

appview/pages/templates/repo/pulls/fragments/pullHeader.html

··· 1 {{ define "repo/pulls/fragments/pullHeader" }} 2 - <header class="pb-2"> 3 <h1 class="text-2xl dark:text-white"> 4 {{ .Pull.Title | description }} 5 <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span> ··· 17 {{ $icon = "git-merge" }} 18 {{ end }} 19 20 - <section> 21 <div class="flex items-center gap-2"> 22 - <span 23 - class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm" 0 24 > 25 - {{ i $icon "w-3 h-3 mr-1.5 text-white" }} 26 <span class="text-white">{{ .Pull.State.String }}</span> 27 - </span> 28 <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 29 opened by 30 {{ template "user/fragments/picHandleLink" .Pull.OwnerDid }} ··· 63 </article> 64 {{ end }} 65 66 - {{ with .OrderedReactionKinds }} 67 - <div class="flex items-center gap-2 mt-2"> 68 - {{ template "repo/fragments/reactionsPopUp" . }} 69 - {{ range $kind := . }} 70 - {{ $reactionData := index $.Reactions $kind }} 71 - {{ 72 - template "repo/fragments/reaction" 73 - (dict 74 - "Kind" $kind 75 - "Count" $reactionData.Count 76 - "IsReacted" (index $.UserReacted $kind) 77 - "ThreadAt" $.Pull.AtUri 78 - "Users" $reactionData.Users) 79 - }} 80 - {{ end }} 81 </div> 82 - {{ end }} 83 </section> 84 85

··· 1 {{ define "repo/pulls/fragments/pullHeader" }} 2 + <header class="pb-4"> 3 <h1 class="text-2xl dark:text-white"> 4 {{ .Pull.Title | description }} 5 <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span> ··· 17 {{ $icon = "git-merge" }} 18 {{ end }} 19 20 + <section class="mt-2"> 21 <div class="flex items-center gap-2"> 22 + <div 23 + id="state" 24 + class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}" 25 > 26 + {{ i $icon "w-4 h-4 mr-1.5 text-white" }} 27 <span class="text-white">{{ .Pull.State.String }}</span> 28 + </div> 29 <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1"> 30 opened by 31 {{ template "user/fragments/picHandleLink" .Pull.OwnerDid }} ··· 64 </article> 65 {{ end }} 66 67 + <div class="mt-2"> 68 + {{ template "repo/fragments/reactions" 69 + (dict "Reactions" .Reactions 70 + "UserReacted" .UserReacted 71 + "ThreadAt" .Pull.AtUri) }} 0 0 0 0 0 0 0 0 0 0 72 </div> 0 73 </section> 74 75

+24 -39

appview/pages/templates/repo/pulls/fragments/pullNewComment.html

··· 1 {{ define "repo/pulls/fragments/pullNewComment" }} 2 <div 3 id="pull-comment-card-{{ .RoundNumber }}" 4 - class="w-full flex flex-col gap-2"> 5 - {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} 0 0 6 <form 7 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment" 0 8 hx-swap="none" 9 - hx-on::after-request="if(event.detail.successful) this.reset()" 10 - hx-disabled-elt="#reply-{{ .RoundNumber }}" 11 - class="w-full flex flex-wrap gap-2 group" 12 > 13 <textarea 14 name="body" 15 class="w-full p-2 rounded border border-gray-200" 16 - rows=8 17 placeholder="Add to the discussion..."></textarea 18 > 19 - {{ template "replyActions" . }} 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 20 <div id="pull-comment"></div> 21 </form> 22 </div> 23 {{ end }} 24 - 25 - {{ define "replyActions" }} 26 - <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm w-full"> 27 - {{ template "cancel" . }} 28 - {{ template "reply" . }} 29 - </div> 30 - {{ end }} 31 - 32 - {{ define "cancel" }} 33 - <button 34 - type="button" 35 - class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 36 - hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions" 37 - hx-swap="outerHTML" 38 - hx-target="#actions-{{.RoundNumber}}" 39 - > 40 - {{ i "x" "w-4 h-4" }} 41 - <span>cancel</span> 42 - </button> 43 - {{ end }} 44 - 45 - {{ define "reply" }} 46 - <button 47 - type="submit" 48 - id="reply-{{ .RoundNumber }}" 49 - class="btn-create flex items-center gap-2"> 50 - {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 51 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 52 - reply 53 - </button> 54 - {{ end }} 55 -

··· 1 {{ define "repo/pulls/fragments/pullNewComment" }} 2 <div 3 id="pull-comment-card-{{ .RoundNumber }}" 4 + class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2"> 5 + <div class="text-sm text-gray-500 dark:text-gray-400"> 6 + {{ resolve .LoggedInUser.Did }} 7 + </div> 8 <form 9 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment" 10 + hx-indicator="#create-comment-spinner" 11 hx-swap="none" 12 + class="w-full flex flex-wrap gap-2" 0 0 13 > 14 <textarea 15 name="body" 16 class="w-full p-2 rounded border border-gray-200" 0 17 placeholder="Add to the discussion..."></textarea 18 > 19 + <button type="submit" class="btn flex items-center gap-2"> 20 + {{ i "message-square" "w-4 h-4" }} 21 + <span>comment</span> 22 + <span id="create-comment-spinner" class="group"> 23 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 24 + </span> 25 + </button> 26 + <button 27 + type="button" 28 + class="btn flex items-center gap-2 group" 29 + hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions" 30 + hx-swap="outerHTML" 31 + hx-target="#pull-comment-card-{{ .RoundNumber }}" 32 + > 33 + {{ i "x" "w-4 h-4" }} 34 + <span>cancel</span> 35 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 36 + </button> 37 <div id="pull-comment"></div> 38 </form> 39 </div> 40 {{ end }} 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

-20

appview/pages/templates/repo/pulls/fragments/replyPullCommentPlaceholder.html

··· 1 - {{ define "repo/pulls/fragments/replyPullCommentPlaceholder" }} 2 - <div class="py-2 px-6 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700"> 3 - {{ if .LoggedInUser }} 4 - <img 5 - src="{{ tinyAvatar .LoggedInUser.Did }}" 6 - alt="" 7 - class="rounded-full size-8 mr-1 border-2 border-gray-300 dark:border-gray-700" 8 - /> 9 - {{ end }} 10 - <input 11 - class="w-full p-0 border-none focus:outline-none" 12 - placeholder="Leave a reply..." 13 - hx-get="/{{ .Submission.ID }}/reply" 14 - hx-trigger="focus" 15 - hx-target="closest div" 16 - hx-swap="outerHTML" 17 - > 18 - </input> 19 - </div> 20 - {{ end }}

··· 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

+1 -1

appview/pages/templates/repo/pulls/fragments/summarizedPullHeader.html

··· 18 {{ $lastSubmission := index .Submissions $latestRound }} 19 {{ $commentCount := len $lastSubmission.Comments }} 20 {{ if and $pipeline $pipeline.Id }} 21 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" true) }} 22 <span class="before:content-['·'] before:select-none text-gray-500 dark:text-gray-400"></span> 23 {{ end }} 24 <span>

··· 18 {{ $lastSubmission := index .Submissions $latestRound }} 19 {{ $commentCount := len $lastSubmission.Comments }} 20 {{ if and $pipeline $pipeline.Id }} 21 + {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }} 22 <span class="before:content-['·'] before:select-none text-gray-500 dark:text-gray-400"></span> 23 {{ end }} 24 <span>

+77 -334

appview/pages/templates/repo/pulls/pull.html

··· 6 {{ template "repo/pulls/fragments/og" (dict "RepoInfo" .RepoInfo "Pull" .Pull) }} 7 {{ end }} 8 9 - {{ define "mainLayout" }} 10 - <div class="px-1 col-span-full flex-grow flex flex-col gap-4"> 11 - {{ block "contentLayout" . }} 12 - {{ block "content" . }}{{ end }} 13 - {{ end }} 14 - </div> 15 - {{ end }} 16 - 17 {{ define "repoContentLayout" }} 18 - <div class="grid grid-cols-1 md:grid-cols-10 gap-y-2 gap-x-4 w-full"> 19 - <div class="col-span-1 md:col-span-7"> 20 - <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white h-full"> 21 {{ block "repoContent" . }}{{ end }} 22 </section> 23 {{ block "repoAfter" . }}{{ end }} 24 </div> 25 - <div class="col-span-1 md:col-span-3 flex flex-col gap-6"> 26 {{ template "repo/fragments/labelPanel" 27 (dict "RepoInfo" $.RepoInfo 28 "Defs" $.LabelDefs ··· 34 "Backlinks" $.Backlinks) }} 35 {{ template "repo/fragments/externalLinkPanel" $.Pull.AtUri }} 36 </div> 37 - 38 - <style> 39 - #filesToggle:checked ~ div label[for="filesToggle"] .show-text { display: none; } 40 - #filesToggle:checked ~ div label[for="filesToggle"] .hide-text { display: inline; } 41 - #filesToggle:not(:checked) ~ div label[for="filesToggle"] .hide-text { display: none; } 42 - 43 - #filesToggle:checked ~ div div#files { width: 10vw; margin-right: 1rem; } 44 - #filesToggle:not(:checked) ~ div div#files { width: 0; display: hidden; margin-right: 0; } 45 - 46 - #subsToggle:checked ~ div div#subs { width: 25vw; margin-left: 1rem; } 47 - #subsToggle:not(:checked) ~ div div#subs { width: 0; display: hidden; margin-left: 0; } 48 - </style> 49 - 50 - <!-- Checkboxes must come first as siblings --> 51 - <input type="checkbox" id="filesToggle" class="peer/files hidden" checked/> 52 - <input type="checkbox" id="subsToggle" class="peer/subs hidden" checked/> 53 - 54 - <!-- Top bar with controls --> 55 - <div class="sticky top-0 z-30 bg-slate-100 dark:bg-gray-900 flex items-center gap-2 col-span-full h-12"> 56 - <label for="filesToggle" class="inline-flex items-center justify-center rounded cursor-pointer p-2 text-normal font-normal normalcase"> 57 - <span class="show-text">{{ i "panel-left-open" "size-5" }}</span> 58 - <span class="hide-text">{{ i "panel-left-close" "size-5" }}</span> 59 - </label> 60 - {{ template "repo/fragments/diffStatPill" .Diff.Stat }} 61 - {{ .Diff.Stat.FilesChanged }} changed file{{ if ne .Diff.Stat.FilesChanged 1 }}s{{ end }} 62 - <div class="flex-grow"></div> 63 - {{ template "repo/fragments/diffOpts" .DiffOpts }} 64 - <label for="subsToggle" class="inline-flex items-center justify-center rounded cursor-pointer p-2"> 65 - {{ i "message-square-more" "size-5" }} 66 - </label> 67 - </div> 68 - 69 - <div class="flex col-span-full"> 70 - <!-- left panel --> 71 - <div id="files" class="w-0 overflow-hidden sticky top-12 max-h-screen overflow-y-auto pb-12"> 72 - {{ template "repo/fragments/diffChangedFiles" .Diff }} 73 - </div> 74 - 75 - <!-- main content --> 76 - <div class="flex-1 min-w-0 sticky top-12 pb-12"> 77 - {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} 78 - </div> 79 - 80 - <!-- right panel --> 81 - <div id="subs" class="w-0 overflow-hidden max-h-screen flex flex-col sticky top-12 pb-12"> 82 - <div class="z-20 sticky top-0 rounded-t p-3 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700"> 83 - <h2 class="font-bold uppercase">history</h2> 84 - </div> 85 - <div class="flex flex-col-reverse gap-4 overflow-y-auto"> 86 - {{ template "submissions2" . }} 87 - </div> 88 - </div> 89 - </div> 90 </div> 91 {{ end }} 92 93 {{ define "repoContent" }} 94 {{ template "repo/pulls/fragments/pullHeader" . }} 0 95 {{ if .Pull.IsStacked }} 96 <div class="mt-8"> 97 {{ template "repo/pulls/fragments/pullStack" . }} ··· 100 {{ end }} 101 102 {{ define "repoAfter" }} 103 - <div id="pull-close"></div> 104 - <div id="pull-reopen"></div> 105 - {{ end }} 106 - 107 - {{ define "submissions2" }} 108 - {{ $lastIdx := sub (len .Pull.Submissions) 1 }} 109 - {{ range $ridx, $item := reverse .Pull.Submissions }} 110 - {{ $idx := sub $lastIdx $ridx }} 111 - <div class="rounded border border-gray-200 dark:border-gray-700 w-full shadow-sm bg-gray-50 dark:bg-gray-800/50"> 112 - {{ with $item }} 113 - {{ $patches := .AsFormatPatch }} 114 - {{ $round := .RoundNumber }} 115 - <div class="rounded px-6 py-4 bg-white dark:bg-gray-800 flex gap-2"> 116 - <div class="flex-shrink-0"> 117 - <img 118 - src="{{ tinyAvatar $.Pull.OwnerDid }}" 119 - alt="" 120 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 121 - /> 122 - </div> 123 - <!-- right column: name and body in two rows --> 124 - <div class="flex-1 min-w-0 flex flex-col gap-1"> 125 - <div class="flex gap-2 items-center justify-between mb-1"> 126 - <span class="inline-flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400"> 127 - {{ resolve $.Pull.OwnerDid }} submitted v{{ $round }} 128 - <span class="select-none before:content-['\00B7']"></span> 129 - <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ $round }}">{{ template "repo/fragments/shortTimeAgo" .Created }}</a> 130 - </span> 131 - {{ if ne $idx 0 }} 132 - <a class="flex items-center gap-2 no-underline hover:no-underline text-sm" 133 - hx-boost="true" 134 - href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{$round}}/interdiff"> 135 - {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} 136 - <span class="hidden md:inline">interdiff</span> 137 - </a> 138 - {{ end }} 139 - </div> 140 - <details class="group"> 141 - <summary class="list-none cursor-pointer flex items-center gap-2"> 142 - <span>{{ i "git-commit-horizontal" "w-4 h-4" }}</span> 143 - {{ len $patches }} commit{{ if ne (len $patches) 1 }}s{{ end }} 144 - </summary> 145 - {{ range $patches }} 146 - <div id="commit-{{.SHA}}" class="py-1 relative w-full md:max-w-3/5 md:w-fit flex flex-col text-gray-600 dark:text-gray-300"> 147 - <div class="flex items-baseline gap-2"> 148 - <div> 149 - <!-- attempt to resolve $fullRepo: this is possible only on non-deleted forks and branches --> 150 - {{ $fullRepo := "" }} 151 - {{ if and $.Pull.IsForkBased $.Pull.PullSource.Repo }} 152 - {{ $fullRepo = printf "%s/%s" $.Pull.OwnerDid $.Pull.PullSource.Repo.Name }} 153 - {{ else if $.Pull.IsBranchBased }} 154 - {{ $fullRepo = $.RepoInfo.FullName }} 155 - {{ end }} 156 - 157 - <!-- if $fullRepo was resolved, link to it, otherwise just span without a link --> 158 - {{ if $fullRepo }} 159 - <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-600 dark:text-gray-300">{{ slice .SHA 0 8 }}</a> 160 - {{ else }} 161 - <span class="font-mono">{{ slice .SHA 0 8 }}</span> 162 - {{ end }} 163 - </div> 164 - 165 - <div> 166 - <span>{{ .Title | description }}</span> 167 - {{ if gt (len .Body) 0 }} 168 - <button 169 - class="py-1/2 px-1 mx-2 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600" 170 - hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')" 171 - > 172 - {{ i "ellipsis" "w-3 h-3" }} 173 - </button> 174 - {{ end }} 175 - {{ if gt (len .Body) 0 }} 176 - <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 text-sm pb-2">{{ nl2br .Body }}</p> 177 - {{ end }} 178 - </div> 179 - </div> 180 - </div> 181 - {{ end }} 182 - </details> 183 - <div> 184 - {{ block "pipelineStatus" (list $ .) }} {{ end }} 185 - </div> 186 - {{ if eq $lastIdx .RoundNumber }} 187 - {{ block "mergeCheck" $ }} {{ end }} 188 - {{ end }} 189 - </div> 190 - </div> 191 - <div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700"> 192 - {{ range $cidx, $c := .Comments }} 193 - <div id="comment-{{$c.ID}}" class="flex gap-2 -ml-4 py-4 w-full mx-auto"> 194 - <!-- left column: profile picture --> 195 - <div class="flex-shrink-0"> 196 - <img 197 - src="{{ tinyAvatar $c.OwnerDid }}" 198 - alt="" 199 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 200 - /> 201 - </div> 202 - <!-- right column: name and body in two rows --> 203 - <div class="flex-1 min-w-0"> 204 - <!-- Row 1: Author and timestamp --> 205 - <div class="text-sm text-gray-500 dark:text-gray-400 flex items-center gap-1"> 206 - <span>{{ resolve $c.OwnerDid }}</span> 207 - <span class="before:content-['·']"></span> 208 - <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="#comment-{{.ID}}">{{ template "repo/fragments/time" $c.Created }}</a> 209 - </div> 210 - <!-- Row 2: Body text --> 211 - <div class="prose dark:prose-invert mt-1"> 212 - {{ $c.Body | markdown }} 213 - </div> 214 - </div> 215 - </div> 216 - {{ end }} 217 - </div> 218 - {{ end }} 219 - {{ if eq $lastIdx .RoundNumber }} 220 - {{ block "mergeStatus" $ }} {{ end }} 221 - {{ block "resubmitStatus" $ }} {{ end }} 222 - {{ end }} 223 - {{ if $.LoggedInUser }} 224 - {{ template "repo/pulls/fragments/pullActions" 225 - (dict 226 - "LoggedInUser" $.LoggedInUser 227 - "Pull" $.Pull 228 - "RepoInfo" $.RepoInfo 229 - "RoundNumber" .RoundNumber 230 - "MergeCheck" $.MergeCheck 231 - "ResubmitCheck" $.ResubmitCheck 232 - "BranchDeleteStatus" $.BranchDeleteStatus 233 - "Stack" $.Stack) }} 234 - {{ else }} 235 - <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm p-2 relative flex gap-2 items-center"> 236 - <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 237 - sign up 238 - </a> 239 - <span class="text-gray-500 dark:text-gray-400">or</span> 240 - <a href="/login" class="underline">login</a> 241 - to add to the discussion 242 - </div> 243 - {{ end }} 244 - </div> 245 - {{ end }} 246 - {{ end }} 247 - 248 - {{ define "newComment" }} 249 - {{ $root := index . 0 }} 250 - {{ $submission := index . 1 }} 251 - <form 252 - id="comment-form" 253 - hx-post="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $submission.RoundNumber }}/comment" 254 - hx-on::after-request="if(event.detail.successful) this.reset()" 255 - > 256 - <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full"> 257 - <div class="text-sm pb-2 text-gray-500 dark:text-gray-400"> 258 - {{ template "user/fragments/picHandleLink" $root.LoggedInUser.Did }} 259 </div> 260 - <textarea 261 - id="comment-textarea" 262 - name="body" 263 - class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 264 - placeholder="Add to the discussion" 265 - rows="8" 266 - ></textarea> 267 - <div id="pull-comment"></div> 268 - </div> 269 - {{ template "replyActions" . }} 270 - </form> 271 - {{ end }} 272 273 - {{ define "replyActions" }} 274 - <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm"> 275 - {{ template "cancel" . }} 276 - {{ template "reply" . }} 277 - </div> 278 - {{ end }} 279 - 280 - {{ define "cancel" }} 281 - <button 282 - class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 283 - hx-get="TODO" 284 - hx-target="TODO" 285 - hx-swap="outerHTML"> 286 - {{ i "x" "size-4" }} 287 - cancel 288 - </button> 289 - {{ end }} 290 - 291 - {{ define "reply" }} 292 - <button 293 - id="TODO" 294 - type="submit" 295 - class="btn-create flex items-center gap-2 no-underline hover:no-underline"> 296 - {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 297 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 298 - reply 299 - </button> 300 {{ end }} 301 302 {{ define "submissions" }} ··· 463 {{ end }} 464 {{ end }} 465 466 - {{ define "mergeCheck" }} 467 - {{ $isOpen := .Pull.State.IsOpen }} 468 - {{ if and $isOpen .MergeCheck .MergeCheck.Error }} 469 - <div class="flex items-center gap-2"> 470 - {{ i "triangle-alert" "w-4 h-4 text-red-500 dark:text-red-300" }} 471 - {{ .MergeCheck.Error }} 472 - </div> 473 - {{ else if and $isOpen .MergeCheck .MergeCheck.IsConflicted }} 474 - <details class="group"> 475 - <summary class="flex items-center justify-between cursor-pointer list-none"> 476 - <div class="flex items-center gap-2 "> 477 - {{ i "triangle-alert" "w-4 h-4" }} 478 - <span class="font-medium">merge conflicts detected</span> 479 - </div> 480 - <div> 481 - <span class="group-open:hidden inline">{{ i "chevrons-up-down" "w-4 h-4" }}</span> 482 - <span class="hidden group-open:inline">{{ i "chevrons-down-up" "w-4 h-4" }}</span> 483 - </div> 484 - </summary> 485 - {{ if gt (len .MergeCheck.Conflicts) 0 }} 486 - <ul class="space-y-1 mt-2"> 487 - {{ range .MergeCheck.Conflicts }} 488 - {{ if .Filename }} 489 - <li class="flex items-center"> 490 - {{ i "file-warning" "inline-flex w-4 h-4 mr-1.5 text-red-500 dark:text-red-300 flex-shrink-0" }} 491 - <span class="font-mono" style="word-break: keep-all; overflow-wrap: break-word;">{{ .Filename }}</span> 492 - </li> 493 - {{ else if .Reason }} 494 - <li class="flex items-center"> 495 - {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 496 - <span>{{.Reason}}</span> 497 - </li> 498 - {{ end }} 499 - {{ end }} 500 - </ul> 501 - {{ end }} 502 - </details> 503 - {{ else if and $isOpen .MergeCheck }} 504 - <div class="flex items-center gap-2"> 505 - {{ i "check" "w-4 h-4 text-green-600 dark:text-green-500" }} 506 - <span>no conflicts, ready to merge</span> 507 - </div> 508 - {{ end }} 509 - {{ end }} 510 - 511 {{ define "mergeStatus" }} 512 {{ if .Pull.State.IsClosed }} 513 - <div class="bg-gray-50 dark:bg-gray-700 border border-black dark:border-gray-500 rounded drop-shadow-sm px-6 py-2 relative"> 514 <div class="flex items-center gap-2 text-black dark:text-white"> 515 {{ i "ban" "w-4 h-4" }} 516 <span class="font-medium">closed without merging</span ··· 518 </div> 519 </div> 520 {{ else if .Pull.State.IsMerged }} 521 - <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative"> 522 <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300"> 523 {{ i "git-merge" "w-4 h-4" }} 524 <span class="font-medium">pull request successfully merged</span ··· 526 </div> 527 </div> 528 {{ else if .Pull.State.IsDeleted }} 529 - <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 530 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 531 {{ i "git-pull-request-closed" "w-4 h-4" }} 532 <span class="font-medium">This pull has been deleted (possibly by jj abandon or jj squash)</span> 533 </div> 534 </div> 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 535 {{ end }} 536 {{ end }} 537 538 {{ define "resubmitStatus" }} 539 {{ if .ResubmitCheck.Yes }} 540 - <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative"> 541 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 542 {{ i "triangle-alert" "w-4 h-4" }} 543 <span class="font-medium">this branch has been updated, consider resubmitting</span> ··· 553 {{ with $pipeline }} 554 {{ $id := .Id }} 555 {{ if .Statuses }} 556 - <details> 557 - <summary class="cursor-pointer list-none">{{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" false) }}</summary> 558 - <div class="my-2 grid grid-cols-1 bg-white dark:bg-gray-800 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700"> 559 - {{ range $name, $all := .Statuses }} 560 - <a href="/{{ $root.RepoInfo.FullName }}/pipelines/{{ $id }}/workflow/{{ $name }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 561 - <div 562 - class="flex gap-2 items-center justify-between p-2"> 563 - {{ $lastStatus := $all.Latest }} 564 - {{ $kind := $lastStatus.Status.String }} 565 566 - <div id="left" class="flex items-center gap-2 flex-shrink-0"> 567 - {{ template "repo/pipelines/fragments/workflowSymbol" $all }} 568 - {{ $name }} 569 - </div> 570 - <div id="right" class="flex items-center gap-2 flex-shrink-0"> 571 - <span class="font-bold">{{ $kind }}</span> 572 - {{ if .TimeTaken }} 573 - {{ template "repo/fragments/duration" .TimeTaken }} 574 - {{ else }} 575 - {{ template "repo/fragments/shortTimeAgo" $lastStatus.Created }} 576 - {{ end }} 577 - </div> 578 - </div> 579 - </a> 580 - {{ end }} 581 </div> 582 - </details> 0 0 583 {{ end }} 584 {{ end }} 585 {{ end }}

··· 6 {{ template "repo/pulls/fragments/og" (dict "RepoInfo" .RepoInfo "Pull" .Pull) }} 7 {{ end }} 8 0 0 0 0 0 0 0 0 9 {{ define "repoContentLayout" }} 10 + <div class="grid grid-cols-1 md:grid-cols-10 gap-4 w-full"> 11 + <div class="col-span-1 md:col-span-8"> 12 + <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white"> 13 {{ block "repoContent" . }}{{ end }} 14 </section> 15 {{ block "repoAfter" . }}{{ end }} 16 </div> 17 + <div class="col-span-1 md:col-span-2 flex flex-col gap-6"> 18 {{ template "repo/fragments/labelPanel" 19 (dict "RepoInfo" $.RepoInfo 20 "Defs" $.LabelDefs ··· 26 "Backlinks" $.Backlinks) }} 27 {{ template "repo/fragments/externalLinkPanel" $.Pull.AtUri }} 28 </div> 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 29 </div> 30 {{ end }} 31 32 {{ define "repoContent" }} 33 {{ template "repo/pulls/fragments/pullHeader" . }} 34 + 35 {{ if .Pull.IsStacked }} 36 <div class="mt-8"> 37 {{ template "repo/pulls/fragments/pullStack" . }} ··· 40 {{ end }} 41 42 {{ define "repoAfter" }} 43 + <section id="submissions" class="mt-4"> 44 + <div class="flex flex-col gap-4"> 45 + {{ block "submissions" . }} {{ end }} 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 46 </div> 47 + </section> 0 0 0 0 0 0 0 0 0 0 0 48 49 + <div id="pull-close"></div> 50 + <div id="pull-reopen"></div> 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 51 {{ end }} 52 53 {{ define "submissions" }} ··· 214 {{ end }} 215 {{ end }} 216 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 217 {{ define "mergeStatus" }} 218 {{ if .Pull.State.IsClosed }} 219 + <div class="bg-gray-50 dark:bg-gray-700 border border-black dark:border-gray-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 220 <div class="flex items-center gap-2 text-black dark:text-white"> 221 {{ i "ban" "w-4 h-4" }} 222 <span class="font-medium">closed without merging</span ··· 224 </div> 225 </div> 226 {{ else if .Pull.State.IsMerged }} 227 + <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 228 <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300"> 229 {{ i "git-merge" "w-4 h-4" }} 230 <span class="font-medium">pull request successfully merged</span ··· 232 </div> 233 </div> 234 {{ else if .Pull.State.IsDeleted }} 235 + <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 236 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 237 {{ i "git-pull-request-closed" "w-4 h-4" }} 238 <span class="font-medium">This pull has been deleted (possibly by jj abandon or jj squash)</span> 239 </div> 240 </div> 241 + {{ else if and .MergeCheck .MergeCheck.Error }} 242 + <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 243 + <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 244 + {{ i "triangle-alert" "w-4 h-4" }} 245 + <span class="font-medium">{{ .MergeCheck.Error }}</span> 246 + </div> 247 + </div> 248 + {{ else if and .MergeCheck .MergeCheck.IsConflicted }} 249 + <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 250 + <div class="flex flex-col gap-2 text-red-500 dark:text-red-300"> 251 + <div class="flex items-center gap-2"> 252 + {{ i "triangle-alert" "w-4 h-4" }} 253 + <span class="font-medium">merge conflicts detected</span> 254 + </div> 255 + {{ if gt (len .MergeCheck.Conflicts) 0 }} 256 + <ul class="space-y-1"> 257 + {{ range .MergeCheck.Conflicts }} 258 + {{ if .Filename }} 259 + <li class="flex items-center"> 260 + {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 261 + <span class="font-mono">{{ .Filename }}</span> 262 + </li> 263 + {{ else if .Reason }} 264 + <li class="flex items-center"> 265 + {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 266 + <span>{{.Reason}}</span> 267 + </li> 268 + {{ end }} 269 + {{ end }} 270 + </ul> 271 + {{ end }} 272 + </div> 273 + </div> 274 + {{ else if .MergeCheck }} 275 + <div class="bg-green-50 dark:bg-green-900 border border-green-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 276 + <div class="flex items-center gap-2 text-green-500 dark:text-green-300"> 277 + {{ i "circle-check-big" "w-4 h-4" }} 278 + <span class="font-medium">no conflicts, ready to merge</span> 279 + </div> 280 + </div> 281 {{ end }} 282 {{ end }} 283 284 {{ define "resubmitStatus" }} 285 {{ if .ResubmitCheck.Yes }} 286 + <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> 287 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 288 {{ i "triangle-alert" "w-4 h-4" }} 289 <span class="font-medium">this branch has been updated, consider resubmitting</span> ··· 299 {{ with $pipeline }} 300 {{ $id := .Id }} 301 {{ if .Statuses }} 302 + <div class="max-w-80 grid grid-cols-1 bg-white dark:bg-gray-800 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700"> 303 + {{ range $name, $all := .Statuses }} 304 + <a href="/{{ $root.RepoInfo.FullName }}/pipelines/{{ $id }}/workflow/{{ $name }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 305 + <div 306 + class="flex gap-2 items-center justify-between p-2"> 307 + {{ $lastStatus := $all.Latest }} 308 + {{ $kind := $lastStatus.Status.String }} 0 0 309 310 + <div id="left" class="flex items-center gap-2 flex-shrink-0"> 311 + {{ template "repo/pipelines/fragments/workflowSymbol" $all }} 312 + {{ $name }} 313 + </div> 314 + <div id="right" class="flex items-center gap-2 flex-shrink-0"> 315 + <span class="font-bold">{{ $kind }}</span> 316 + {{ if .TimeTaken }} 317 + {{ template "repo/fragments/duration" .TimeTaken }} 318 + {{ else }} 319 + {{ template "repo/fragments/shortTimeAgo" $lastStatus.Created }} 320 + {{ end }} 321 + </div> 0 0 0 322 </div> 323 + </a> 324 + {{ end }} 325 + </div> 326 {{ end }} 327 {{ end }} 328 {{ end }}

+1 -1

appview/pages/templates/repo/pulls/pulls.html

··· 136 {{ $pipeline := index $.Pipelines .LatestSha }} 137 {{ if and $pipeline $pipeline.Id }} 138 <span class="before:content-['·']"></span> 139 - {{ template "repo/pipelines/fragments/pipelineSymbol" (dict "Pipeline" $pipeline "ShortSummary" true) }} 140 {{ end }} 141 142 {{ $state := .Labels }}

··· 136 {{ $pipeline := index $.Pipelines .LatestSha }} 137 {{ if and $pipeline $pipeline.Id }} 138 <span class="before:content-['·']"></span> 139 + {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }} 140 {{ end }} 141 142 {{ $state := .Labels }}

+1 -2

appview/pages/templates/repo/settings/fragments/sidebar.html

··· 1 {{ define "repo/settings/fragments/sidebar" }} 2 {{ $active := .Tab }} 3 - {{ $tabs := .Tabs }} 4 <div class="sticky top-2 grid grid-cols-1 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 shadow-inner"> 5 {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 6 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 7 - {{ range $tabs }} 8 <a href="/{{ $.RepoInfo.FullName }}/settings?tab={{.Name}}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 9 <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 10 {{ i .Icon "size-4" }}

··· 1 {{ define "repo/settings/fragments/sidebar" }} 2 {{ $active := .Tab }} 0 3 <div class="sticky top-2 grid grid-cols-1 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 shadow-inner"> 4 {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 5 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 6 + {{ range const.RepoSettingsTabs }} 7 <a href="/{{ $.RepoInfo.FullName }}/settings?tab={{.Name}}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 8 <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 9 {{ i .Icon "size-4" }}

+2 -3

appview/pages/templates/user/settings/fragments/sidebar.html

··· 1 {{ define "user/settings/fragments/sidebar" }} 2 {{ $active := .Tab }} 3 - {{ $tabs := .Tabs }} 4 <div class="sticky top-2 grid grid-cols-1 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 shadow-inner"> 5 {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 6 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 7 - {{ range $tabs }} 8 <a href="/settings/{{.Name}}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 9 <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 10 {{ i .Icon "size-4" }} ··· 13 </a> 14 {{ end }} 15 </div> 16 - {{ end }}

··· 1 {{ define "user/settings/fragments/sidebar" }} 2 {{ $active := .Tab }} 0 3 <div class="sticky top-2 grid grid-cols-1 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 shadow-inner"> 4 {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 5 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 6 + {{ range const.UserSettingsTabs }} 7 <a href="/settings/{{.Name}}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 8 <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 9 {{ i .Icon "size-4" }} ··· 12 </a> 13 {{ end }} 14 </div> 15 + {{ end }}

+4 -14

appview/pulls/pulls.go

··· 232 defs[l.AtUri().String()] = &l 233 } 234 235 - patch := pull.LatestSubmission().CombinedPatch() 236 - diff := patchutil.AsNiceDiff(patch, pull.TargetBranch) 237 - var diffOpts types.DiffOpts 238 - if d := r.URL.Query().Get("diff"); d == "split" { 239 - diffOpts.Split = true 240 - } 241 - 242 - log.Println(s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 243 LoggedInUser: user, 244 RepoInfo: s.repoResolver.GetRepoInfo(r, user), 245 Pull: pull, ··· 250 MergeCheck: mergeCheckResponse, 251 ResubmitCheck: resubmitResult, 252 Pipelines: m, 253 - Diff: &diff, 254 - DiffOpts: diffOpts, 255 256 - OrderedReactionKinds: models.OrderedReactionKinds, 257 - Reactions: reactionMap, 258 - UserReacted: userReactions, 259 260 LabelDefs: defs, 261 - })) 262 } 263 264 func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, stack models.Stack) types.MergeCheckResponse {

··· 232 defs[l.AtUri().String()] = &l 233 } 234 235 + s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 0 0 0 0 0 0 0 236 LoggedInUser: user, 237 RepoInfo: s.repoResolver.GetRepoInfo(r, user), 238 Pull: pull, ··· 243 MergeCheck: mergeCheckResponse, 244 ResubmitCheck: resubmitResult, 245 Pipelines: m, 0 0 246 247 + Reactions: reactionMap, 248 + UserReacted: userReactions, 0 249 250 LabelDefs: defs, 251 + }) 252 } 253 254 func (s *Pulls) mergeCheck(r *http.Request, f *models.Repo, pull *models.Pull, stack models.Stack) types.MergeCheckResponse {

-14

appview/repo/settings.go

··· 22 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 23 ) 24 25 - type tab = map[string]any 26 - 27 - var ( 28 - // would be great to have ordered maps right about now 29 - settingsTabs []tab = []tab{ 30 - {"Name": "general", "Icon": "sliders-horizontal"}, 31 - {"Name": "access", "Icon": "users"}, 32 - {"Name": "pipelines", "Icon": "layers-2"}, 33 - } 34 - ) 35 - 36 func (rp *Repo) SetDefaultBranch(w http.ResponseWriter, r *http.Request) { 37 l := rp.logger.With("handler", "SetDefaultBranch") 38 ··· 262 DefaultLabels: defaultLabels, 263 SubscribedLabels: subscribedLabels, 264 ShouldSubscribeAll: shouldSubscribeAll, 265 - Tabs: settingsTabs, 266 Tab: "general", 267 }) 268 } ··· 308 rp.pages.RepoAccessSettings(w, pages.RepoAccessSettingsParams{ 309 LoggedInUser: user, 310 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 311 - Tabs: settingsTabs, 312 Tab: "access", 313 Collaborators: collaborators, 314 }) ··· 369 rp.pages.RepoPipelineSettings(w, pages.RepoPipelineSettingsParams{ 370 LoggedInUser: user, 371 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 372 - Tabs: settingsTabs, 373 Tab: "pipelines", 374 Spindles: spindles, 375 CurrentSpindle: f.Spindle,

··· 22 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 23 ) 24 0 0 0 0 0 0 0 0 0 0 0 25 func (rp *Repo) SetDefaultBranch(w http.ResponseWriter, r *http.Request) { 26 l := rp.logger.With("handler", "SetDefaultBranch") 27 ··· 251 DefaultLabels: defaultLabels, 252 SubscribedLabels: subscribedLabels, 253 ShouldSubscribeAll: shouldSubscribeAll, 0 254 Tab: "general", 255 }) 256 } ··· 296 rp.pages.RepoAccessSettings(w, pages.RepoAccessSettingsParams{ 297 LoggedInUser: user, 298 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 0 299 Tab: "access", 300 Collaborators: collaborators, 301 }) ··· 356 rp.pages.RepoPipelineSettings(w, pages.RepoPipelineSettingsParams{ 357 LoggedInUser: user, 358 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 0 359 Tab: "pipelines", 360 Spindles: spindles, 361 CurrentSpindle: f.Spindle,

-17

appview/settings/settings.go

··· 35 Config *config.Config 36 } 37 38 - type tab = map[string]any 39 - 40 - var ( 41 - settingsTabs []tab = []tab{ 42 - {"Name": "profile", "Icon": "user"}, 43 - {"Name": "keys", "Icon": "key"}, 44 - {"Name": "emails", "Icon": "mail"}, 45 - {"Name": "notifications", "Icon": "bell"}, 46 - {"Name": "knots", "Icon": "volleyball"}, 47 - {"Name": "spindles", "Icon": "spool"}, 48 - } 49 - ) 50 - 51 func (s *Settings) Router() http.Handler { 52 r := chi.NewRouter() 53 ··· 85 86 s.Pages.UserProfileSettings(w, pages.UserProfileSettingsParams{ 87 LoggedInUser: user, 88 - Tabs: settingsTabs, 89 Tab: "profile", 90 }) 91 } ··· 104 s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{ 105 LoggedInUser: user, 106 Preferences: prefs, 107 - Tabs: settingsTabs, 108 Tab: "notifications", 109 }) 110 } ··· 146 s.Pages.UserKeysSettings(w, pages.UserKeysSettingsParams{ 147 LoggedInUser: user, 148 PubKeys: pubKeys, 149 - Tabs: settingsTabs, 150 Tab: "keys", 151 }) 152 } ··· 161 s.Pages.UserEmailsSettings(w, pages.UserEmailsSettingsParams{ 162 LoggedInUser: user, 163 Emails: emails, 164 - Tabs: settingsTabs, 165 Tab: "emails", 166 }) 167 }

··· 35 Config *config.Config 36 } 37 0 0 0 0 0 0 0 0 0 0 0 0 0 38 func (s *Settings) Router() http.Handler { 39 r := chi.NewRouter() 40 ··· 72 73 s.Pages.UserProfileSettings(w, pages.UserProfileSettingsParams{ 74 LoggedInUser: user, 0 75 Tab: "profile", 76 }) 77 } ··· 90 s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{ 91 LoggedInUser: user, 92 Preferences: prefs, 0 93 Tab: "notifications", 94 }) 95 } ··· 131 s.Pages.UserKeysSettings(w, pages.UserKeysSettingsParams{ 132 LoggedInUser: user, 133 PubKeys: pubKeys, 0 134 Tab: "keys", 135 }) 136 } ··· 145 s.Pages.UserEmailsSettings(w, pages.UserEmailsSettingsParams{ 146 LoggedInUser: user, 147 Emails: emails, 0 148 Tab: "emails", 149 }) 150 }

-15

appview/spindles/spindles.go

··· 39 Logger *slog.Logger 40 } 41 42 - type tab = map[string]any 43 - 44 - var ( 45 - spindlesTabs []tab = []tab{ 46 - {"Name": "profile", "Icon": "user"}, 47 - {"Name": "keys", "Icon": "key"}, 48 - {"Name": "emails", "Icon": "mail"}, 49 - {"Name": "notifications", "Icon": "bell"}, 50 - {"Name": "knots", "Icon": "volleyball"}, 51 - {"Name": "spindles", "Icon": "spool"}, 52 - } 53 - ) 54 - 55 func (s *Spindles) Router() http.Handler { 56 r := chi.NewRouter() 57 ··· 83 s.Pages.Spindles(w, pages.SpindlesParams{ 84 LoggedInUser: user, 85 Spindles: all, 86 - Tabs: spindlesTabs, 87 Tab: "spindles", 88 }) 89 } ··· 143 Spindle: spindle, 144 Members: members, 145 Repos: repoMap, 146 - Tabs: spindlesTabs, 147 Tab: "spindles", 148 }) 149 }

··· 39 Logger *slog.Logger 40 } 41 0 0 0 0 0 0 0 0 0 0 0 0 0 42 func (s *Spindles) Router() http.Handler { 43 r := chi.NewRouter() 44 ··· 70 s.Pages.Spindles(w, pages.SpindlesParams{ 71 LoggedInUser: user, 72 Spindles: all, 0 73 Tab: "spindles", 74 }) 75 } ··· 129 Spindle: spindle, 130 Members: members, 131 Repos: repoMap, 0 132 Tab: "spindles", 133 }) 134 }

+5 -6

docs/template.html

··· 120 $endif$ 121 $endif$ 122 </header> 123 - $endif$ 124 - 125 - $if(abstract)$ 126 - <article class="prose dark:prose-invert max-w-none"> 127 - $abstract$ 128 - </article> 129 $endif$ 130 131 <article class="prose dark:prose-invert max-w-none">

··· 120 $endif$ 121 $endif$ 122 </header> 123 + $if(abstract)$ 124 + <article class="prose dark:prose-invert max-w-none"> 125 + $abstract$ 126 + </article> 127 + $endif$ 0 128 $endif$ 129 130 <article class="prose dark:prose-invert max-w-none">

-13

input.css

··· 124 dark:text-gray-100 dark:before:bg-gray-800 dark:before:border-gray-700; 125 } 126 127 - .btn-flat { 128 - @apply relative z-10 inline-flex min-h-[30px] cursor-pointer items-center justify-center 129 - bg-transparent px-2 pb-[0.2rem] text-sm text-gray-900 130 - before:absolute before:inset-0 before:-z-10 before:block before:rounded 131 - before:border before:border-gray-200 before:bg-white 132 - before:content-[''] before:transition-all before:duration-150 before:ease-in-out 133 - hover:before:bg-gray-50 134 - dark:hover:before:bg-gray-700 135 - focus:outline-none focus-visible:before:outline focus-visible:before:outline-2 focus-visible:before:outline-gray-400 136 - disabled:cursor-not-allowed disabled:opacity-50 137 - dark:text-gray-100 dark:before:bg-gray-800 dark:before:border-gray-700; 138 - } 139 - 140 .btn-create { 141 @apply btn text-white 142 before:bg-green-600 hover:before:bg-green-700

··· 124 dark:text-gray-100 dark:before:bg-gray-800 dark:before:border-gray-700; 125 } 126 0 0 0 0 0 0 0 0 0 0 0 0 0 127 .btn-create { 128 @apply btn text-white 129 before:bg-green-600 hover:before:bg-green-700

+2 -2

spindle/models/models.go

··· 53 StatusKindRunning, 54 } 55 FinishStates [4]StatusKind = [4]StatusKind{ 56 - StatusKindFailed, 57 - StatusKindTimeout, 58 StatusKindCancelled, 0 59 StatusKindSuccess, 0 60 } 61 ) 62

··· 53 StatusKindRunning, 54 } 55 FinishStates [4]StatusKind = [4]StatusKind{ 0 0 56 StatusKindCancelled, 57 + StatusKindFailed, 58 StatusKindSuccess, 59 + StatusKindTimeout, 60 } 61 ) 62

+2 -4

types/diff.go

··· 27 } 28 29 type DiffStat struct { 30 - Insertions int64 31 - Deletions int64 32 - FilesChanged int 33 } 34 35 func (d *Diff) Stats() DiffStat { ··· 38 stats.Insertions += f.LinesAdded 39 stats.Deletions += f.LinesDeleted 40 } 41 - stats.FilesChanged = len(d.TextFragments) 42 return stats 43 } 44

··· 27 } 28 29 type DiffStat struct { 30 + Insertions int64 31 + Deletions int64 0 32 } 33 34 func (d *Diff) Stats() DiffStat { ··· 37 stats.Insertions += f.LinesAdded 38 stats.Deletions += f.LinesDeleted 39 } 0 40 return stats 41 } 42