+8 -9

appview/issues/issues.go

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

-15

appview/knots/knots.go

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

+29 -20

appview/pages/funcmap.go

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

+18 -36

appview/pages/pages.go

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

+1 -1

appview/pages/templates/layouts/repobase.html

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

+50

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

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

-30

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

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

+22 -35

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

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

+63

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

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

+1 -2

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

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

+2 -2

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

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

+1 -1

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

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

+3 -3

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

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

+10 -26

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

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

+7 -7

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

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

+12 -22

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

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

+1 -1

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

··· 28 28 class="btn flex items-center gap-2 group" 29 29 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions" 30 30 hx-swap="outerHTML" 31 31 - hx-target="#actions-{{.RoundNumber}}" 31 31 + hx-target="#pull-comment-card-{{ .RoundNumber }}" 32 32 > 33 33 {{ i "x" "w-4 h-4" }} 34 34 <span>cancel</span>

-20

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

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

+28 -235

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

··· 6 6 {{ template "repo/pulls/fragments/og" (dict "RepoInfo" .RepoInfo "Pull" .Pull) }} 7 7 {{ end }} 8 8 9 9 - {{ define "mainLayout" }} 10 10 - <div class="px-1 col-span-full flex-grow flex flex-col gap-4"> 11 11 - {{ block "contentLayout" . }} 12 12 - {{ block "content" . }}{{ end }} 13 13 - {{ end }} 14 14 - </div> 15 15 - {{ end }} 16 16 - 17 9 {{ define "repoContentLayout" }} 18 10 <div class="grid grid-cols-1 md:grid-cols-10 gap-4 w-full"> 19 19 - <div class="col-span-1 md:col-span-7"> 20 20 - <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white h-full"> 11 11 + <div class="col-span-1 md:col-span-8"> 12 12 + <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white"> 21 13 {{ block "repoContent" . }}{{ end }} 22 14 </section> 23 15 {{ block "repoAfter" . }}{{ end }} 24 16 </div> 25 25 - <div class="col-span-1 md:col-span-3 flex flex-col gap-6"> 17 17 + <div class="col-span-1 md:col-span-2 flex flex-col gap-6"> 26 18 {{ template "repo/fragments/labelPanel" 27 19 (dict "RepoInfo" $.RepoInfo 28 20 "Defs" $.LabelDefs ··· 34 26 "Backlinks" $.Backlinks) }} 35 27 {{ template "repo/fragments/externalLinkPanel" $.Pull.AtUri }} 36 28 </div> 37 37 - 38 38 - <div class="col-span-1 md:col-span-7"> 39 39 - {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} 40 40 - </div> 41 41 - <div class="col-span-1 md:col-span-3 flex flex-col max-h-dvh sticky top-0"> 42 42 - <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"> 43 43 - <h2 class="font-bold uppercase">history</h2> 44 44 - </div> 45 45 - <div class="flex flex-col-reverse gap-4 overflow-y-auto"> 46 46 - {{ template "submissions2" . }} 47 47 - </div> 48 48 - </div> 49 29 </div> 50 30 {{ end }} 51 31 ··· 60 40 {{ end }} 61 41 62 42 {{ define "repoAfter" }} 63 63 - <div id="pull-close"></div> 64 64 - <div id="pull-reopen"></div> 65 65 - {{ end }} 66 66 - 67 67 - {{ define "submissions2" }} 68 68 - {{ $lastIdx := sub (len .Pull.Submissions) 1 }} 69 69 - {{ range $ridx, $item := reverse .Pull.Submissions }} 70 70 - {{ $idx := sub $lastIdx $ridx }} 71 71 - <div class="rounded border border-gray-200 dark:border-gray-700 w-full shadow-sm bg-gray-50 dark:bg-gray-800/50"> 72 72 - {{ with $item }} 73 73 - {{ $patches := .AsFormatPatch }} 74 74 - {{ $round := .RoundNumber }} 75 75 - <div class="rounded px-6 py-4 bg-white dark:bg-gray-800 flex gap-2"> 76 76 - <div class="flex-shrink-0"> 77 77 - <img 78 78 - src="{{ tinyAvatar $.Pull.OwnerDid }}" 79 79 - alt="" 80 80 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 81 81 - /> 82 82 - </div> 83 83 - <!-- right column: name and body in two rows --> 84 84 - <div class="flex-1 min-w-0 flex flex-col gap-2"> 85 85 - <div class="flex gap-2 items-center justify-between mb-1"> 86 86 - <span class="inline-flex items-center gap-2 text-sm text-gray-500 dark:text-gray-400 hover:text-gray-500"> 87 87 - {{ resolve $.Pull.OwnerDid }} submitted v{{ $round }} 88 88 - <span class="select-none before:content-['\00B7']"></span> 89 89 - <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ $round }}">{{ template "repo/fragments/shortTimeAgo" .Created }}</a> 90 90 - </span> 91 91 - {{ if ne $idx 0 }} 92 92 - <a class="flex items-center gap-2 no-underline hover:no-underline text-sm" 93 93 - hx-boost="true" 94 94 - href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{$round}}/interdiff"> 95 95 - {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} 96 96 - <span class="hidden md:inline">interdiff</span> 97 97 - </a> 98 98 - {{ end }} 99 99 - </div> 100 100 - <div> 101 101 - {{ if eq 1 (len $patches) }} 102 102 - <!-- only one commit, just inline the message into the round header --> 103 103 - {{ $commit := index $patches 0 }} 104 104 - <span>{{ $commit.Title | description }}</span> 105 105 - {{ if gt (len $commit.Body) 0 }} 106 106 - <p id="body-{{$round}}-{{$commit.SHA}}" class="mt-1 pb-2"> 107 107 - {{ nl2br $commit.Body }} 108 108 - </p> 109 109 - {{ end }} 110 110 - {{ else }} 111 111 - <span>Commits:</span> 112 112 - {{ range $patches }} 113 113 - <div id="commit-{{.SHA}}" class="py-1 px-2 relative w-full md:max-w-3/5 md:w-fit flex flex-col"> 114 114 - <div class="flex items-center gap-2"> 115 115 - {{ i "git-commit-horizontal" "w-4 h-4 flex-shrink-0" }} 116 116 - <div class="flex items-center"> 117 117 - <span>{{ .Title | description }}</span> 118 118 - {{ if gt (len .Body) 0 }} 119 119 - <button 120 120 - 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" 121 121 - hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')" 122 122 - > 123 123 - {{ i "ellipsis" "w-3 h-3" }} 124 124 - </button> 125 125 - {{ end }} 126 126 - </div> 127 127 - </div> 128 128 - {{ if gt (len .Body) 0 }} 129 129 - <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 text-sm pb-2"> 130 130 - {{ nl2br .Body }} 131 131 - </p> 132 132 - {{ end }} 133 133 - </div> 134 134 - {{ end }} 135 135 - {{ end }} 136 136 - </div> 137 137 - <div> 138 138 - {{ block "pipelineStatus" (list $ .) }} {{ end }} 139 139 - </div> 140 140 - </div> 141 141 - </div> 142 142 - <div class="relative ml-10 border-l-2 border-gray-200 dark:border-gray-700"> 143 143 - {{ range $cidx, $c := .Comments }} 144 144 - <div id="comment-{{$c.ID}}" class="flex gap-2 -ml-4 py-4 w-full mx-auto"> 145 145 - <!-- left column: profile picture --> 146 146 - <div class="flex-shrink-0"> 147 147 - <img 148 148 - src="{{ tinyAvatar $c.OwnerDid }}" 149 149 - alt="" 150 150 - class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900" 151 151 - /> 152 152 - </div> 153 153 - <!-- right column: name and body in two rows --> 154 154 - <div class="flex-1 min-w-0"> 155 155 - <!-- Row 1: Author and timestamp --> 156 156 - <div class="text-sm text-gray-500 dark:text-gray-400 flex items-center gap-1"> 157 157 - <span>{{ resolve $c.OwnerDid }}</span> 158 158 - <span class="before:content-['·']"></span> 159 159 - <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> 160 160 - </div> 161 161 - <!-- Row 2: Body text --> 162 162 - <div class="prose dark:prose-invert mt-1"> 163 163 - {{ $c.Body | markdown }} 164 164 - </div> 165 165 - </div> 166 166 - </div> 167 167 - {{ end }} 168 168 - </div> 169 169 - {{ end }} 170 170 - {{ if eq $lastIdx .RoundNumber }} 171 171 - {{ block "mergeStatus" $ }} {{ end }} 172 172 - {{ block "resubmitStatus" $ }} {{ end }} 173 173 - {{ end }} 174 174 - {{ if $.LoggedInUser }} 175 175 - {{ template "repo/pulls/fragments/pullActions" 176 176 - (dict 177 177 - "LoggedInUser" $.LoggedInUser 178 178 - "Pull" $.Pull 179 179 - "RepoInfo" $.RepoInfo 180 180 - "RoundNumber" .RoundNumber 181 181 - "MergeCheck" $.MergeCheck 182 182 - "ResubmitCheck" $.ResubmitCheck 183 183 - "BranchDeleteStatus" $.BranchDeleteStatus 184 184 - "Stack" $.Stack) }} 185 185 - {{ else }} 186 186 - <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"> 187 187 - <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 188 188 - sign up 189 189 - </a> 190 190 - <span class="text-gray-500 dark:text-gray-400">or</span> 191 191 - <a href="/login" class="underline">login</a> 192 192 - to add to the discussion 193 193 - </div> 194 194 - {{ end }} 195 195 - </div> 196 196 - {{ end }} 197 197 - {{ end }} 198 198 - 199 199 - {{ define "newComment" }} 200 200 - {{ $root := index . 0 }} 201 201 - {{ $submission := index . 1 }} 202 202 - <form 203 203 - id="comment-form" 204 204 - hx-post="/{{ $root.RepoInfo.FullName }}/pulls/{{ $root.Pull.PullId }}/round/{{ $submission.RoundNumber }}/comment" 205 205 - hx-on::after-request="if(event.detail.successful) this.reset()" 206 206 - > 207 207 - <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full"> 208 208 - <div class="text-sm pb-2 text-gray-500 dark:text-gray-400"> 209 209 - {{ template "user/fragments/picHandleLink" $root.LoggedInUser.Did }} 43 43 + <section id="submissions" class="mt-4"> 44 44 + <div class="flex flex-col gap-4"> 45 45 + {{ block "submissions" . }} {{ end }} 210 46 </div> 211 211 - <textarea 212 212 - id="comment-textarea" 213 213 - name="body" 214 214 - class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 215 215 - placeholder="Add to the discussion" 216 216 - rows="8" 217 217 - ></textarea> 218 218 - <div id="pull-comment"></div> 219 219 - </div> 220 220 - {{ template "replyActions" . }} 221 221 - </form> 222 222 - {{ end }} 47 47 + </section> 223 48 224 224 - {{ define "replyActions" }} 225 225 - <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm"> 226 226 - {{ template "cancel" . }} 227 227 - {{ template "reply" . }} 228 228 - </div> 229 229 - {{ end }} 230 230 - 231 231 - {{ define "cancel" }} 232 232 - <button 233 233 - class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group" 234 234 - hx-get="TODO" 235 235 - hx-target="TODO" 236 236 - hx-swap="outerHTML"> 237 237 - {{ i "x" "size-4" }} 238 238 - cancel 239 239 - </button> 240 240 - {{ end }} 241 241 - 242 242 - {{ define "reply" }} 243 243 - <button 244 244 - id="TODO" 245 245 - type="submit" 246 246 - class="btn-create flex items-center gap-2 no-underline hover:no-underline"> 247 247 - {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 248 248 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 249 249 - reply 250 250 - </button> 49 49 + <div id="pull-close"></div> 50 50 + <div id="pull-reopen"></div> 251 51 {{ end }} 252 52 253 53 {{ define "submissions" }} ··· 416 216 417 217 {{ define "mergeStatus" }} 418 218 {{ if .Pull.State.IsClosed }} 419 419 - <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"> 219 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"> 420 220 <div class="flex items-center gap-2 text-black dark:text-white"> 421 221 {{ i "ban" "w-4 h-4" }} 422 222 <span class="font-medium">closed without merging</span ··· 424 224 </div> 425 225 </div> 426 226 {{ else if .Pull.State.IsMerged }} 427 427 - <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative"> 227 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"> 428 228 <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300"> 429 229 {{ i "git-merge" "w-4 h-4" }} 430 230 <span class="font-medium">pull request successfully merged</span ··· 432 232 </div> 433 233 </div> 434 234 {{ else if .Pull.State.IsDeleted }} 435 435 - <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 235 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"> 436 236 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 437 237 {{ i "git-pull-request-closed" "w-4 h-4" }} 438 238 <span class="font-medium">This pull has been deleted (possibly by jj abandon or jj squash)</span> 439 239 </div> 440 240 </div> 441 241 {{ else if and .MergeCheck .MergeCheck.Error }} 442 442 - <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 242 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"> 443 243 <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> 444 244 {{ i "triangle-alert" "w-4 h-4" }} 445 245 <span class="font-medium">{{ .MergeCheck.Error }}</span> 446 246 </div> 447 247 </div> 448 248 {{ else if and .MergeCheck .MergeCheck.IsConflicted }} 449 449 - <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative"> 450 450 - <details class="text-red-500 dark:text-red-300 group"> 451 451 - <summary class="flex items-center justify-between cursor-pointer list-none"> 452 452 - <div class="flex items-center gap-2 "> 453 453 - {{ i "triangle-alert" "w-4 h-4" }} 454 454 - <span class="font-medium">merge conflicts detected</span> 455 455 - </div> 456 456 - <div> 457 457 - <span class="group-open:hidden inline">{{ i "chevrons-up-down" "w-4 h-4" }}</span> 458 458 - <span class="hidden group-open:inline">{{ i "chevrons-down-up" "w-4 h-4" }}</span> 459 459 - </div> 460 460 - </summary> 249 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 250 + <div class="flex flex-col gap-2 text-red-500 dark:text-red-300"> 251 251 + <div class="flex items-center gap-2"> 252 252 + {{ i "triangle-alert" "w-4 h-4" }} 253 253 + <span class="font-medium">merge conflicts detected</span> 254 254 + </div> 461 255 {{ if gt (len .MergeCheck.Conflicts) 0 }} 462 462 - <ul class="space-y-1 mt-2"> 256 256 + <ul class="space-y-1"> 463 257 {{ range .MergeCheck.Conflicts }} 464 258 {{ if .Filename }} 465 465 - <li class="flex items-center"> 466 466 - {{ i "file-warning" "inline-flex w-4 h-4 mr-1.5 text-red-500 dark:text-red-300 flex-shrink-0" }} 467 467 - <span class="font-mono" style="word-break: keep-all; overflow-wrap: break-word;">{{ .Filename }}</span> 468 468 - </li> 259 259 + <li class="flex items-center"> 260 260 + {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} 261 261 + <span class="font-mono">{{ .Filename }}</span> 262 262 + </li> 469 263 {{ else if .Reason }} 470 264 <li class="flex items-center"> 471 265 {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} ··· 475 269 {{ end }} 476 270 </ul> 477 271 {{ end }} 478 478 - </details> 272 272 + </div> 479 273 </div> 480 274 {{ else if .MergeCheck }} 481 481 - <div class="bg-green-50 dark:bg-green-900 border border-green-500 rounded drop-shadow-sm px-6 py-2 relative"> 275 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"> 482 276 <div class="flex items-center gap-2 text-green-500 dark:text-green-300"> 483 277 {{ i "circle-check-big" "w-4 h-4" }} 484 278 <span class="font-medium">no conflicts, ready to merge</span> ··· 489 283 490 284 {{ define "resubmitStatus" }} 491 285 {{ if .ResubmitCheck.Yes }} 492 492 - <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative"> 286 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"> 493 287 <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> 494 288 {{ i "triangle-alert" "w-4 h-4" }} 495 289 <span class="font-medium">this branch has been updated, consider resubmitting</span> ··· 505 299 {{ with $pipeline }} 506 300 {{ $id := .Id }} 507 301 {{ if .Statuses }} 508 508 - <span>Workflows:</span> 509 509 - <div class=" 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"> 302 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"> 510 303 {{ range $name, $all := .Statuses }} 511 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"> 512 305 <div

+1 -2

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

··· 1 1 {{ define "repo/settings/fragments/sidebar" }} 2 2 {{ $active := .Tab }} 3 3 - {{ $tabs := .Tabs }} 4 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"> 5 4 {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 6 5 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 7 7 - {{ range $tabs }} 6 6 + {{ range const.RepoSettingsTabs }} 8 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"> 9 8 <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 10 9 {{ i .Icon "size-4" }}

+2 -3

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

··· 1 1 {{ define "user/settings/fragments/sidebar" }} 2 2 {{ $active := .Tab }} 3 3 - {{ $tabs := .Tabs }} 4 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"> 5 4 {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 6 5 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 7 7 - {{ range $tabs }} 6 6 + {{ range const.UserSettingsTabs }} 8 7 <a href="/settings/{{.Name}}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 9 8 <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 10 9 {{ i .Icon "size-4" }} ··· 13 12 </a> 14 13 {{ end }} 15 14 </div> 16 16 - {{ end }} 15 15 + {{ end }}

+4 -14

appview/pulls/pulls.go

··· 232 232 defs[l.AtUri().String()] = &l 233 233 } 234 234 235 235 - patch := pull.LatestSubmission().CombinedPatch() 236 236 - diff := patchutil.AsNiceDiff(patch, pull.TargetBranch) 237 237 - var diffOpts types.DiffOpts 238 238 - if d := r.URL.Query().Get("diff"); d == "split" { 239 239 - diffOpts.Split = true 240 240 - } 241 241 - 242 242 - log.Println(s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 235 235 + s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 243 236 LoggedInUser: user, 244 237 RepoInfo: s.repoResolver.GetRepoInfo(r, user), 245 238 Pull: pull, ··· 250 243 MergeCheck: mergeCheckResponse, 251 244 ResubmitCheck: resubmitResult, 252 245 Pipelines: m, 253 253 - Diff: &diff, 254 254 - DiffOpts: diffOpts, 255 246 256 256 - OrderedReactionKinds: models.OrderedReactionKinds, 257 257 - Reactions: reactionMap, 258 258 - UserReacted: userReactions, 247 247 + Reactions: reactionMap, 248 248 + UserReacted: userReactions, 259 249 260 250 LabelDefs: defs, 261 261 - })) 251 251 + }) 262 252 } 263 253 264 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 22 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 23 23 ) 24 24 25 25 - type tab = map[string]any 26 26 - 27 27 - var ( 28 28 - // would be great to have ordered maps right about now 29 29 - settingsTabs []tab = []tab{ 30 30 - {"Name": "general", "Icon": "sliders-horizontal"}, 31 31 - {"Name": "access", "Icon": "users"}, 32 32 - {"Name": "pipelines", "Icon": "layers-2"}, 33 33 - } 34 34 - ) 35 35 - 36 25 func (rp *Repo) SetDefaultBranch(w http.ResponseWriter, r *http.Request) { 37 26 l := rp.logger.With("handler", "SetDefaultBranch") 38 27 ··· 262 251 DefaultLabels: defaultLabels, 263 252 SubscribedLabels: subscribedLabels, 264 253 ShouldSubscribeAll: shouldSubscribeAll, 265 265 - Tabs: settingsTabs, 266 254 Tab: "general", 267 255 }) 268 256 } ··· 308 296 rp.pages.RepoAccessSettings(w, pages.RepoAccessSettingsParams{ 309 297 LoggedInUser: user, 310 298 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 311 311 - Tabs: settingsTabs, 312 299 Tab: "access", 313 300 Collaborators: collaborators, 314 301 }) ··· 369 356 rp.pages.RepoPipelineSettings(w, pages.RepoPipelineSettingsParams{ 370 357 LoggedInUser: user, 371 358 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 372 372 - Tabs: settingsTabs, 373 359 Tab: "pipelines", 374 360 Spindles: spindles, 375 361 CurrentSpindle: f.Spindle,

-17

appview/settings/settings.go

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

-15

appview/spindles/spindles.go

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

+5 -6

docs/template.html

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

-13

input.css

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