+13 -3

appview/db/pulls.go

··· 122 122 return len(p.Submissions) - 1 123 123 } 124 124 125 125 - func (p *Pull) IsSameRepoBranch() bool { 125 125 + func (p *Pull) IsPatchBased() bool { 126 126 + return p.PullSource == nil 127 127 + } 128 128 + 129 129 + func (p *Pull) IsBranchBased() bool { 126 130 if p.PullSource != nil { 127 131 if p.PullSource.RepoAt != nil { 128 132 return p.PullSource.RepoAt == &p.RepoAt ··· 134 138 return false 135 139 } 136 140 137 137 - func (p *Pull) IsPatch() bool { 138 138 - return p.PullSource == nil 141 141 + func (p *Pull) IsForkBased() bool { 142 142 + if p.PullSource != nil { 143 143 + if p.PullSource.RepoAt != nil { 144 144 + // make sure repos are different 145 145 + return p.PullSource.RepoAt != &p.RepoAt 146 146 + } 147 147 + } 148 148 + return false 139 149 } 140 150 141 151 func (s PullSubmission) AsNiceDiff(targetBranch string) types.NiceDiff {

+4

appview/pages/funcmap.go

··· 33 33 "add": func(a, b int) int { 34 34 return a + b 35 35 }, 36 36 + // the absolute state of go templates 37 37 + "add64": func(a, b int64) int64 { 38 38 + return a + b 39 39 + }, 36 40 "sub": func(a, b int) int { 37 41 return a - b 38 42 },

+80 -41

appview/pages/pages.go

··· 39 39 func NewPages() *Pages { 40 40 templates := make(map[string]*template.Template) 41 41 42 42 - // Walk through embedded templates directory and parse all .html files 42 42 + var fragmentPaths []string 43 43 + // First, collect all fragment paths 43 44 err := fs.WalkDir(Files, "templates", func(path string, d fs.DirEntry, err error) error { 44 45 if err != nil { 45 46 return err 46 47 } 47 48 48 48 - if !d.IsDir() && strings.HasSuffix(path, ".html") { 49 49 - name := strings.TrimPrefix(path, "templates/") 50 50 - name = strings.TrimSuffix(name, ".html") 49 49 + if d.IsDir() { 50 50 + return nil 51 51 + } 52 52 + 53 53 + if !strings.HasSuffix(path, ".html") { 54 54 + return nil 55 55 + } 56 56 + 57 57 + if !strings.Contains(path, "fragments/") { 58 58 + return nil 59 59 + } 60 60 + 61 61 + name := strings.TrimPrefix(path, "templates/") 62 62 + name = strings.TrimSuffix(name, ".html") 63 63 + 64 64 + tmpl, err := template.New(name). 65 65 + Funcs(funcMap()). 66 66 + ParseFS(Files, path) 67 67 + if err != nil { 68 68 + log.Fatalf("setting up fragment: %v", err) 69 69 + } 70 70 + 71 71 + templates[name] = tmpl 72 72 + fragmentPaths = append(fragmentPaths, path) 73 73 + log.Printf("loaded fragment: %s", name) 74 74 + return nil 75 75 + }) 76 76 + if err != nil { 77 77 + log.Fatalf("walking template dir for fragments: %v", err) 78 78 + } 51 79 52 52 - // add fragments as templates 53 53 - if strings.HasPrefix(path, "templates/fragments/") { 54 54 - tmpl, err := template.New(name). 55 55 - Funcs(funcMap()). 56 56 - ParseFS(Files, path) 57 57 - if err != nil { 58 58 - return fmt.Errorf("setting up fragment: %w", err) 59 59 - } 80 80 + // Then walk through and setup the rest of the templates 81 81 + err = fs.WalkDir(Files, "templates", func(path string, d fs.DirEntry, err error) error { 82 82 + if err != nil { 83 83 + return err 84 84 + } 60 85 61 61 - templates[name] = tmpl 62 62 - log.Printf("loaded fragment: %s", name) 63 63 - } 86 86 + if d.IsDir() { 87 87 + return nil 88 88 + } 64 89 65 65 - // layouts and fragments are applied first 66 66 - if !strings.HasPrefix(path, "templates/layouts/") && 67 67 - !strings.HasPrefix(path, "templates/fragments/") { 68 68 - // Add the page template on top of the base 69 69 - tmpl, err := template.New(name). 70 70 - Funcs(funcMap()). 71 71 - ParseFS(Files, "templates/layouts/*.html", "templates/fragments/*.html", path) 72 72 - if err != nil { 73 73 - return fmt.Errorf("setting up template: %w", err) 74 74 - } 90 90 + if !strings.HasSuffix(path, "html") { 91 91 + return nil 92 92 + } 75 93 76 76 - templates[name] = tmpl 77 77 - log.Printf("loaded template: %s", name) 78 78 - } 94 94 + // Skip fragments as they've already been loaded 95 95 + if strings.Contains(path, "fragments/") { 96 96 + return nil 97 97 + } 79 98 99 99 + // Skip layouts 100 100 + if strings.Contains(path, "layouts/") { 80 101 return nil 81 102 } 103 103 + 104 104 + name := strings.TrimPrefix(path, "templates/") 105 105 + name = strings.TrimSuffix(name, ".html") 106 106 + 107 107 + // Add the page template on top of the base 108 108 + allPaths := []string{} 109 109 + allPaths = append(allPaths, "templates/layouts/*.html") 110 110 + allPaths = append(allPaths, fragmentPaths...) 111 111 + allPaths = append(allPaths, path) 112 112 + tmpl, err := template.New(name). 113 113 + Funcs(funcMap()). 114 114 + ParseFS(Files, allPaths...) 115 115 + if err != nil { 116 116 + return fmt.Errorf("setting up template: %w", err) 117 117 + } 118 118 + 119 119 + templates[name] = tmpl 120 120 + log.Printf("loaded template: %s", name) 82 121 return nil 83 122 }) 84 123 if err != nil { ··· 200 239 } 201 240 202 241 func (p *Pages) FollowFragment(w io.Writer, params FollowFragmentParams) error { 203 203 - return p.executePlain("fragments/follow", w, params) 242 242 + return p.executePlain("user/fragments/follow", w, params) 204 243 } 205 244 206 245 type RepoActionsFragmentParams struct { ··· 210 249 } 211 250 212 251 func (p *Pages) RepoActionsFragment(w io.Writer, params RepoActionsFragmentParams) error { 213 213 - return p.executePlain("fragments/repoActions", w, params) 252 252 + return p.executePlain("repo/fragments/repoActions", w, params) 214 253 } 215 254 216 255 type RepoDescriptionParams struct { ··· 218 257 } 219 258 220 259 func (p *Pages) EditRepoDescriptionFragment(w io.Writer, params RepoDescriptionParams) error { 221 221 - return p.executePlain("fragments/editRepoDescription", w, params) 260 260 + return p.executePlain("repo/fragments/editRepoDescription", w, params) 222 261 } 223 262 224 263 func (p *Pages) RepoDescriptionFragment(w io.Writer, params RepoDescriptionParams) error { 225 225 - return p.executePlain("fragments/repoDescription", w, params) 264 264 + return p.executePlain("repo/fragments/repoDescription", w, params) 226 265 } 227 266 228 267 type RepoInfo struct { ··· 580 619 } 581 620 582 621 func (p *Pages) EditIssueCommentFragment(w io.Writer, params EditIssueCommentParams) error { 583 583 - return p.executePlain("fragments/editIssueComment", w, params) 622 622 + return p.executePlain("repo/issues/fragments/editIssueComment", w, params) 584 623 } 585 624 586 625 type SingleIssueCommentParams struct { ··· 592 631 } 593 632 594 633 func (p *Pages) SingleIssueCommentFragment(w io.Writer, params SingleIssueCommentParams) error { 595 595 - return p.executePlain("fragments/issueComment", w, params) 634 634 + return p.executePlain("repo/issues/fragments/issueComment", w, params) 596 635 } 597 636 598 637 type RepoNewPullParams struct { ··· 675 714 } 676 715 677 716 func (p *Pages) PullPatchUploadFragment(w io.Writer, params PullPatchUploadParams) error { 678 678 - return p.executePlain("fragments/pullPatchUpload", w, params) 717 717 + return p.executePlain("repo/pulls/fragments/pullPatchUpload", w, params) 679 718 } 680 719 681 720 type PullCompareBranchesParams struct { ··· 684 723 } 685 724 686 725 func (p *Pages) PullCompareBranchesFragment(w io.Writer, params PullCompareBranchesParams) error { 687 687 - return p.executePlain("fragments/pullCompareBranches", w, params) 726 726 + return p.executePlain("repo/pulls/fragments/pullCompareBranches", w, params) 688 727 } 689 728 690 729 type PullCompareForkParams struct { ··· 693 732 } 694 733 695 734 func (p *Pages) PullCompareForkFragment(w io.Writer, params PullCompareForkParams) error { 696 696 - return p.executePlain("fragments/pullCompareForks", w, params) 735 735 + return p.executePlain("repo/pulls/fragments/pullCompareForks", w, params) 697 736 } 698 737 699 738 type PullCompareForkBranchesParams struct { ··· 703 742 } 704 743 705 744 func (p *Pages) PullCompareForkBranchesFragment(w io.Writer, params PullCompareForkBranchesParams) error { 706 706 - return p.executePlain("fragments/pullCompareForksBranches", w, params) 745 745 + return p.executePlain("repo/pulls/fragments/pullCompareForksBranches", w, params) 707 746 } 708 747 709 748 type PullResubmitParams struct { ··· 714 753 } 715 754 716 755 func (p *Pages) PullResubmitFragment(w io.Writer, params PullResubmitParams) error { 717 717 - return p.executePlain("fragments/pullResubmit", w, params) 756 756 + return p.executePlain("repo/pulls/fragments/pullResubmit", w, params) 718 757 } 719 758 720 759 type PullActionsParams struct { ··· 727 766 } 728 767 729 768 func (p *Pages) PullActionsFragment(w io.Writer, params PullActionsParams) error { 730 730 - return p.executePlain("fragments/pullActions", w, params) 769 769 + return p.executePlain("repo/pulls/fragments/pullActions", w, params) 731 770 } 732 771 733 772 type PullNewCommentParams struct { ··· 738 777 } 739 778 740 779 func (p *Pages) PullNewCommentFragment(w io.Writer, params PullNewCommentParams) error { 741 741 - return p.executePlain("fragments/pullNewComment", w, params) 780 780 + return p.executePlain("repo/pulls/fragments/pullNewComment", w, params) 742 781 } 743 782 744 783 func (p *Pages) Static() http.Handler {

-33

appview/pages/templates/fragments/cloneInstructions.html

··· 1 1 - {{ define "fragments/cloneInstructions" }} 2 2 - <section class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto flex flex-col gap-4"> 3 3 - <div class="flex flex-col gap-2"> 4 4 - <strong>push</strong> 5 5 - <div class="md:pl-4 overflow-x-auto whitespace-nowrap"> 6 6 - <code class="dark:text-gray-100">git remote add origin git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code> 7 7 - </div> 8 8 - </div> 9 9 - 10 10 - <div class="flex flex-col gap-2"> 11 11 - <strong>clone</strong> 12 12 - <div class="md:pl-4 flex flex-col gap-2"> 13 13 - 14 14 - <div class="flex items-center gap-3"> 15 15 - <span class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white">HTTP</span> 16 16 - <div class="overflow-x-auto whitespace-nowrap flex-1"> 17 17 - <code class="dark:text-gray-100">git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code> 18 18 - </div> 19 19 - </div> 20 20 - 21 21 - <div class="flex items-center gap-3"> 22 22 - <span class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white">SSH</span> 23 23 - <div class="overflow-x-auto whitespace-nowrap flex-1"> 24 24 - <code class="dark:text-gray-100">git clone git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code> 25 25 - </div> 26 26 - </div> 27 27 - </div> 28 28 - </div> 29 29 - 30 30 - 31 31 - <p class="py-2 text-gray-500 dark:text-gray-400">Note that for self-hosted knots, clone URLs may be different based on your setup.</p> 32 32 - </section> 33 33 - {{ end }}

-116

appview/pages/templates/fragments/diff.html

··· 1 1 - {{ define "fragments/diff" }} 2 2 - {{ $repo := index . 0 }} 3 3 - {{ $diff := index . 1 }} 4 4 - {{ $commit := $diff.Commit }} 5 5 - {{ $stat := $diff.Stat }} 6 6 - {{ $diff := $diff.Diff }} 7 7 - 8 8 - {{ $this := $commit.This }} 9 9 - {{ $parent := $commit.Parent }} 10 10 - 11 11 - {{ $last := sub (len $diff) 1 }} 12 12 - {{ range $idx, $hunk := $diff }} 13 13 - {{ with $hunk }} 14 14 - <section class="mt-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 15 15 - <div id="file-{{ .Name.New }}"> 16 16 - <div id="diff-file"> 17 17 - <details open> 18 18 - <summary class="list-none cursor-pointer sticky top-0"> 19 19 - <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between"> 20 20 - <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto" style="direction: rtl;"> 21 21 - {{ $markerstyle := "diff-type p-1 mr-1 font-mono text-sm rounded select-none" }} 22 22 - 23 23 - <div class="flex gap-2 items-center" style="direction: ltr;"> 24 24 - {{ if .IsNew }} 25 25 - <span class="bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400 {{ $markerstyle }}">ADDED</span> 26 26 - {{ else if .IsDelete }} 27 27 - <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">DELETED</span> 28 28 - {{ else if .IsCopy }} 29 29 - <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">COPIED</span> 30 30 - {{ else if .IsRename }} 31 31 - <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">RENAMED</span> 32 32 - {{ else }} 33 33 - <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">MODIFIED</span> 34 34 - {{ end }} 35 35 - 36 36 - {{ if .IsDelete }} 37 37 - <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this }}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.Old }}"{{end}}> 38 38 - {{ .Name.Old }} 39 39 - </a> 40 40 - {{ else if (or .IsCopy .IsRename) }} 41 41 - <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $parent}}href="/{{ $repo }}/blob/{{ $parent }}/{{ .Name.Old }}"{{end}}> 42 42 - {{ .Name.Old }} 43 43 - </a> 44 44 - {{ i "arrow-right" "w-4 h-4" }} 45 45 - <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}> 46 46 - {{ .Name.New }} 47 47 - </a> 48 48 - {{ else }} 49 49 - <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}> 50 50 - {{ .Name.New }} 51 51 - </a> 52 52 - {{ end }} 53 53 - </div> 54 54 - </div> 55 55 - 56 56 - {{ $iconstyle := "p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" }} 57 57 - <div id="right-side-items" class="p-2 flex items-center"> 58 58 - <a title="top of file" href="#file-{{ .Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up-to-line" "w-4 h-4" }}</a> 59 59 - {{ if gt $idx 0 }} 60 60 - {{ $prev := index $diff (sub $idx 1) }} 61 61 - <a title="previous file" href="#file-{{ $prev.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up" "w-4 h-4" }}</a> 62 62 - {{ end }} 63 63 - 64 64 - {{ if lt $idx $last }} 65 65 - {{ $next := index $diff (add $idx 1) }} 66 66 - <a title="next file" href="#file-{{ $next.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-down" "w-4 h-4" }}</a> 67 67 - {{ end }} 68 68 - </div> 69 69 - 70 70 - </div> 71 71 - </summary> 72 72 - 73 73 - <div class="transition-all duration-700 ease-in-out"> 74 74 - {{ if .IsDelete }} 75 75 - <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 76 76 - This file has been deleted in this commit. 77 77 - </p> 78 78 - {{ else }} 79 79 - {{ if .IsBinary }} 80 80 - <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 81 81 - This is a binary file and will not be displayed. 82 82 - </p> 83 83 - {{ else }} 84 84 - <pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none">{{- .Header -}}</div>{{- range .Lines -}} 85 85 - {{- if eq .Op.String "+" -}} 86 86 - <div class="bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 flex min-w-full"> 87 87 - <div class="w-10 flex-shrink-0 select-none p-1 text-center">{{ .Op.String }}</div> 88 88 - <div class="p-1 whitespace-pre">{{ .Line }}</div> 89 89 - </div> 90 90 - {{- end -}} 91 91 - {{- if eq .Op.String "-" -}} 92 92 - <div class="bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 flex min-w-full"> 93 93 - <div class="w-10 flex-shrink-0 select-none p-1 text-center">{{ .Op.String }}</div> 94 94 - <div class="p-1 whitespace-pre">{{ .Line }}</div> 95 95 - </div> 96 96 - {{- end -}} 97 97 - {{- if eq .Op.String " " -}} 98 98 - <div class="bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 flex min-w-full"> 99 99 - <div class="w-10 flex-shrink-0 select-none p-1 text-center">{{ .Op.String }}</div> 100 100 - <div class="p-1 whitespace-pre">{{ .Line }}</div> 101 101 - </div> 102 102 - {{- end -}} 103 103 - {{- end -}} 104 104 - {{- end -}}</div></div></pre> 105 105 - {{- end -}} 106 106 - {{ end }} 107 107 - </div> 108 108 - 109 109 - </details> 110 110 - 111 111 - </div> 112 112 - </div> 113 113 - </section> 114 114 - {{ end }} 115 115 - {{ end }} 116 116 - {{ end }}

-52

appview/pages/templates/fragments/editIssueComment.html

··· 1 1 - {{ define "fragments/editIssueComment" }} 2 2 - {{ with .Comment }} 3 3 - <div id="comment-container-{{.CommentId}}"> 4 4 - <div class="flex items-center gap-2 mb-2 text-gray-500 text-sm"> 5 5 - {{ $owner := didOrHandle $.LoggedInUser.Did $.LoggedInUser.Handle }} 6 6 - <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a> 7 7 - 8 8 - <!-- show user "hats" --> 9 9 - {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }} 10 10 - {{ if $isIssueAuthor }} 11 11 - <span class="before:content-['·']"></span> 12 12 - <span class="rounded bg-gray-100 text-black font-mono px-2 mx-1/2 inline-flex items-center"> 13 13 - author 14 14 - </span> 15 15 - {{ end }} 16 16 - 17 17 - <span class="before:content-['·']"></span> 18 18 - <a 19 19 - href="#{{ .CommentId }}" 20 20 - class="text-gray-500 hover:text-gray-500 hover:underline no-underline" 21 21 - id="{{ .CommentId }}"> 22 22 - {{ .Created | timeFmt }} 23 23 - </a> 24 24 - 25 25 - <button 26 26 - class="btn px-2 py-1 flex items-center gap-2 text-sm" 27 27 - hx-post="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit" 28 28 - hx-include="#edit-textarea-{{ .CommentId }}" 29 29 - hx-target="#comment-container-{{ .CommentId }}" 30 30 - hx-swap="outerHTML"> 31 31 - {{ i "check" "w-4 h-4" }} 32 32 - </button> 33 33 - <button 34 34 - class="btn px-2 py-1 flex items-center gap-2 text-sm" 35 35 - hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/" 36 36 - hx-target="#comment-container-{{ .CommentId }}" 37 37 - hx-swap="outerHTML"> 38 38 - {{ i "x" "w-4 h-4" }} 39 39 - </button> 40 40 - <span id="comment-{{.CommentId}}-status"></span> 41 41 - </div> 42 42 - 43 43 - <div> 44 44 - <textarea 45 45 - id="edit-textarea-{{ .CommentId }}" 46 46 - name="body" 47 47 - class="w-full p-2 border rounded min-h-[100px]">{{ .Body }}</textarea> 48 48 - </div> 49 49 - </div> 50 50 - {{ end }} 51 51 - {{ end }} 52 52 -

-11

appview/pages/templates/fragments/editRepoDescription.html

··· 1 1 - {{ define "fragments/editRepoDescription" }} 2 2 - <form hx-put="/{{ .RepoInfo.FullName }}/description" hx-target="this" hx-swap="outerHTML" class="flex flex-wrap gap-2"> 3 3 - <input type="text" class="p-1" name="description" value="{{ .RepoInfo.Description }}"> 4 4 - <button type="submit" class="btn p-2 flex items-center gap-2 no-underline text-sm"> 5 5 - {{ i "check" "w-3 h-3" }} save 6 6 - </button> 7 7 - <button type="button" class="btn p-2 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description" > 8 8 - {{ i "x" "w-3 h-3" }} cancel 9 9 - </button> 10 10 - </form> 11 11 - {{ end }}

-17

appview/pages/templates/fragments/follow.html

··· 1 1 - {{ define "fragments/follow" }} 2 2 - <button id="followBtn" 3 3 - class="btn mt-2 w-full" 4 4 - 5 5 - {{ if eq .FollowStatus.String "IsNotFollowing" }} 6 6 - hx-post="/follow?subject={{.UserDid}}" 7 7 - {{ else }} 8 8 - hx-delete="/follow?subject={{.UserDid}}" 9 9 - {{ end }} 10 10 - 11 11 - hx-trigger="click" 12 12 - hx-target="#followBtn" 13 13 - hx-swap="outerHTML" 14 14 - > 15 15 - {{ if eq .FollowStatus.String "IsNotFollowing" }}Follow{{ else }}Unfollow{{ end }} 16 16 - </button> 17 17 - {{ end }}

-60

appview/pages/templates/fragments/issueComment.html

··· 1 1 - {{ define "fragments/issueComment" }} 2 2 - {{ with .Comment }} 3 3 - <div id="comment-container-{{.CommentId}}"> 4 4 - <div class="flex items-center gap-2 mb-2 text-gray-500 text-sm"> 5 5 - {{ $owner := index $.DidHandleMap .OwnerDid }} 6 6 - <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a> 7 7 - 8 8 - <!-- show user "hats" --> 9 9 - {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }} 10 10 - {{ if $isIssueAuthor }} 11 11 - <span class="before:content-['·']"></span> 12 12 - <span class="rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center"> 13 13 - author 14 14 - </span> 15 15 - {{ end }} 16 16 - 17 17 - <span class="before:content-['·']"></span> 18 18 - <a 19 19 - href="#{{ .CommentId }}" 20 20 - class="text-gray-500 hover:text-gray-500 hover:underline no-underline" 21 21 - id="{{ .CommentId }}"> 22 22 - {{ if .Deleted }} 23 23 - deleted {{ .Deleted | timeFmt }} 24 24 - {{ else if .Edited }} 25 25 - edited {{ .Edited | timeFmt }} 26 26 - {{ else }} 27 27 - {{ .Created | timeFmt }} 28 28 - {{ end }} 29 29 - </a> 30 30 - 31 31 - {{ $isCommentOwner := and $.LoggedInUser (eq $.LoggedInUser.Did .OwnerDid) }} 32 32 - {{ if and $isCommentOwner (not .Deleted) }} 33 33 - <button 34 34 - class="btn px-2 py-1 text-sm" 35 35 - hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit" 36 36 - hx-swap="outerHTML" 37 37 - hx-target="#comment-container-{{.CommentId}}" 38 38 - > 39 39 - {{ i "pencil" "w-4 h-4" }} 40 40 - </button> 41 41 - <button 42 42 - class="btn px-2 py-1 text-sm text-red-500" 43 43 - hx-delete="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/" 44 44 - hx-confirm="Are you sure you want to delete your comment?" 45 45 - hx-swap="outerHTML" 46 46 - hx-target="#comment-container-{{.CommentId}}" 47 47 - > 48 48 - {{ i "trash-2" "w-4 h-4" }} 49 49 - </button> 50 50 - {{ end }} 51 51 - 52 52 - </div> 53 53 - {{ if not .Deleted }} 54 54 - <div class="prose dark:prose-invert"> 55 55 - {{ .Body | markdown }} 56 56 - </div> 57 57 - {{ end }} 58 58 - </div> 59 59 - {{ end }} 60 60 - {{ end }}

-91

appview/pages/templates/fragments/pullActions.html

··· 1 1 - {{ define "fragments/pullActions" }} 2 2 - {{ $lastIdx := sub (len .Pull.Submissions) 1 }} 3 3 - {{ $roundNumber := .RoundNumber }} 4 4 - 5 5 - {{ $isPushAllowed := .RepoInfo.Roles.IsPushAllowed }} 6 6 - {{ $isMerged := .Pull.State.IsMerged }} 7 7 - {{ $isClosed := .Pull.State.IsClosed }} 8 8 - {{ $isOpen := .Pull.State.IsOpen }} 9 9 - {{ $isConflicted := and .MergeCheck (or .MergeCheck.Error .MergeCheck.IsConflicted) }} 10 10 - {{ $isPullAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Pull.OwnerDid) }} 11 11 - {{ $isLastRound := eq $roundNumber $lastIdx }} 12 12 - {{ $isSameRepoBranch := .Pull.IsSameRepoBranch }} 13 13 - {{ $isUpToDate := .ResubmitCheck.No }} 14 14 - <div class="relative w-fit"> 15 15 - <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> 16 16 - <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2"> 17 17 - <button 18 18 - hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 19 19 - hx-target="#actions-{{$roundNumber}}" 20 20 - hx-swap="outerHtml" 21 21 - class="btn p-2 flex items-center gap-2 no-underline hover:no-underline"> 22 22 - {{ i "message-square-plus" "w-4 h-4" }} 23 23 - <span>comment</span> 24 24 - </button> 25 25 - {{ if and $isPushAllowed $isOpen $isLastRound }} 26 26 - {{ $disabled := "" }} 27 27 - {{ if $isConflicted }} 28 28 - {{ $disabled = "disabled" }} 29 29 - {{ end }} 30 30 - <button 31 31 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge" 32 32 - hx-swap="none" 33 33 - hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?" 34 34 - class="btn p-2 flex items-center gap-2" {{ $disabled }}> 35 35 - {{ i "git-merge" "w-4 h-4" }} 36 36 - <span>merge</span> 37 37 - </button> 38 38 - {{ end }} 39 39 - 40 40 - {{ if and $isPullAuthor $isOpen $isLastRound }} 41 41 - {{ $disabled := "" }} 42 42 - {{ if $isUpToDate }} 43 43 - {{ $disabled = "disabled" }} 44 44 - {{ end }} 45 45 - <button id="resubmitBtn" 46 46 - {{ if not .Pull.IsPatch }} 47 47 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 48 48 - {{ else }} 49 49 - hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 50 50 - hx-target="#actions-{{$roundNumber}}" 51 51 - hx-swap="outerHtml" 52 52 - {{ end }} 53 53 - 54 54 - hx-disabled-elt="#resubmitBtn" 55 55 - class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" {{ $disabled }} 56 56 - 57 57 - {{ if $disabled }} 58 58 - title="Update this branch to resubmit this pull request" 59 59 - {{ else }} 60 60 - title="Resubmit this pull request" 61 61 - {{ end }} 62 62 - > 63 63 - {{ i "rotate-ccw" "w-4 h-4" }} 64 64 - <span>resubmit</span> 65 65 - </button> 66 66 - {{ end }} 67 67 - 68 68 - {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }} 69 69 - <button 70 70 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close" 71 71 - hx-swap="none" 72 72 - class="btn p-2 flex items-center gap-2"> 73 73 - {{ i "ban" "w-4 h-4" }} 74 74 - <span>close</span> 75 75 - </button> 76 76 - {{ end }} 77 77 - 78 78 - {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }} 79 79 - <button 80 80 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen" 81 81 - hx-swap="none" 82 82 - class="btn p-2 flex items-center gap-2"> 83 83 - {{ i "circle-dot" "w-4 h-4" }} 84 84 - <span>reopen</span> 85 85 - </button> 86 86 - {{ end }} 87 87 - </div> 88 88 - </div> 89 89 - {{ end }} 90 90 - 91 91 -

-20

appview/pages/templates/fragments/pullCompareBranches.html

··· 1 1 - {{ define "fragments/pullCompareBranches" }} 2 2 - <div id="patch-upload"> 3 3 - <label for="targetBranch" class="dark:text-white" 4 4 - >select a branch</label 5 5 - > 6 6 - <div class="flex flex-wrap gap-2 items-center"> 7 7 - <select 8 8 - name="sourceBranch" 9 9 - class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 10 10 - > 11 11 - <option disabled selected>source branch</option> 12 12 - {{ range .Branches }} 13 13 - <option value="{{ .Reference.Name }}" class="py-1"> 14 14 - {{ .Reference.Name }} 15 15 - </option> 16 16 - {{ end }} 17 17 - </select> 18 18 - </div> 19 19 - </div> 20 20 - {{ end }}

-42

appview/pages/templates/fragments/pullCompareForks.html

··· 1 1 - {{ define "fragments/pullCompareForks" }} 2 2 - <div id="patch-upload"> 3 3 - <label for="forkSelect" class="dark:text-white" 4 4 - >select a fork to compare</label 5 5 - > 6 6 - <div class="flex flex-wrap gap-4 items-center mb-4"> 7 7 - <div class="flex flex-wrap gap-2 items-center"> 8 8 - <select 9 9 - id="forkSelect" 10 10 - name="fork" 11 11 - required 12 12 - class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 13 13 - hx-get="/{{ $.RepoInfo.FullName }}/pulls/new/fork-branches" 14 14 - hx-target="#branch-selection" 15 15 - hx-vals='{"fork": this.value}' 16 16 - hx-swap="innerHTML" 17 17 - onchange="document.getElementById('hiddenForkInput').value = this.value;" 18 18 - > 19 19 - <option disabled selected>select a fork</option> 20 20 - {{ range .Forks }} 21 21 - <option value="{{ .Name }}" class="py-1"> 22 22 - {{ .Name }} 23 23 - </option> 24 24 - {{ end }} 25 25 - </select> 26 26 - 27 27 - <input 28 28 - type="hidden" 29 29 - id="hiddenForkInput" 30 30 - name="fork" 31 31 - value="" 32 32 - /> 33 33 - </div> 34 34 - 35 35 - <div id="branch-selection"> 36 36 - <div class="text-sm text-gray-500 dark:text-gray-400"> 37 37 - Select a fork first to view available branches 38 38 - </div> 39 39 - </div> 40 40 - </div> 41 41 - </div> 42 42 - {{ end }}

-15

appview/pages/templates/fragments/pullCompareForksBranches.html

··· 1 1 - {{ define "fragments/pullCompareForksBranches" }} 2 2 - <div class="flex flex-wrap gap-2 items-center"> 3 3 - <select 4 4 - name="sourceBranch" 5 5 - class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 6 6 - > 7 7 - <option disabled selected>source branch</option> 8 8 - {{ range .SourceBranches }} 9 9 - <option value="{{ .Reference.Name }}" class="py-1"> 10 10 - {{ .Reference.Name }} 11 11 - </option> 12 12 - {{ end }} 13 13 - </select> 14 14 - </div> 15 15 - {{ end }}

-32

appview/pages/templates/fragments/pullNewComment.html

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

-14

appview/pages/templates/fragments/pullPatchUpload.html

··· 1 1 - {{ define "fragments/pullPatchUpload" }} 2 2 - <div id="patch-upload"> 3 3 - <textarea 4 4 - name="patch" 5 5 - id="patch" 6 6 - rows="12" 7 7 - class="w-full resize-y font-mono dark:bg-gray-700 dark:text-white dark:border-gray-600" 8 8 - placeholder="diff --git a/file.txt b/file.txt 9 9 - index 1234567..abcdefg 100644 10 10 - --- a/file.txt 11 11 - +++ b/file.txt" 12 12 - ></textarea> 13 13 - </div> 14 14 - {{ end }}

-52

appview/pages/templates/fragments/pullResubmit.html

··· 1 1 - {{ define "fragments/pullResubmit" }} 2 2 - <div 3 3 - id="resubmit-pull-card" 4 4 - class="rounded relative border bg-amber-50 dark:bg-amber-900 border-amber-200 dark:border-amber-500 px-6 py-2"> 5 5 - 6 6 - <div class="flex items-center gap-2 text-amber-500 dark:text-amber-50"> 7 7 - {{ i "pencil" "w-4 h-4" }} 8 8 - <span class="font-medium">resubmit your patch</span> 9 9 - </div> 10 10 - 11 11 - <div class="mt-2 text-sm text-gray-700 dark:text-gray-200"> 12 12 - You can update this patch to address any reviews. 13 13 - This will begin a new round of reviews, 14 14 - but you'll still be able to view your previous submissions and feedback. 15 15 - </div> 16 16 - 17 17 - <div class="mt-4 flex flex-col"> 18 18 - <form 19 19 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 20 20 - hx-swap="none" 21 21 - class="w-full flex flex-wrap gap-2"> 22 22 - <textarea 23 23 - name="patch" 24 24 - class="w-full p-2 mb-2" 25 25 - placeholder="Paste your updated patch here." 26 26 - rows="15" 27 27 - >{{.Pull.LatestPatch}}</textarea> 28 28 - <button 29 29 - type="submit" 30 30 - class="btn flex items-center gap-2" 31 31 - {{ if or .Pull.State.IsClosed }} 32 32 - disabled 33 33 - {{ end }}> 34 34 - {{ i "rotate-ccw" "w-4 h-4" }} 35 35 - <span>resubmit</span> 36 36 - </button> 37 37 - <button 38 38 - type="button" 39 39 - class="btn flex items-center gap-2" 40 40 - hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Pull.LastRoundNumber }}/actions" 41 41 - hx-swap="outerHTML" 42 42 - hx-target="#resubmit-pull-card"> 43 43 - {{ i "x" "w-4 h-4" }} 44 44 - <span>cancel</span> 45 45 - </button> 46 46 - </form> 47 47 - 48 48 - <div id="resubmit-error" class="error"></div> 49 49 - <div id="resubmit-success" class="success"></div> 50 50 - </div> 51 51 - </div> 52 52 - {{ end }}

-41

appview/pages/templates/fragments/repoActions.html

··· 1 1 - {{ define "fragments/repoActions" }} 2 2 - <div class="flex items-center gap-2 z-auto"> 3 3 - <button id="starBtn" 4 4 - class="btn disabled:opacity-50 disabled:cursor-not-allowed" 5 5 - 6 6 - {{ if .IsStarred }} 7 7 - hx-delete="/star?subject={{.RepoAt}}&countHint={{.Stats.StarCount}}" 8 8 - {{ else }} 9 9 - hx-post="/star?subject={{.RepoAt}}&countHint={{.Stats.StarCount}}" 10 10 - {{ end }} 11 11 - 12 12 - hx-trigger="click" 13 13 - hx-target="#starBtn" 14 14 - hx-swap="outerHTML" 15 15 - hx-disabled-elt="#starBtn" 16 16 - > 17 17 - <div class="flex gap-2 items-center"> 18 18 - {{ if .IsStarred }} 19 19 - {{ i "star" "w-4 h-4 fill-current" }} 20 20 - {{ else }} 21 21 - {{ i "star" "w-4 h-4" }} 22 22 - {{ end }} 23 23 - <span> 24 24 - {{ .Stats.StarCount }} 25 25 - </span> 26 26 - </div> 27 27 - </button> 28 28 - {{ if .DisableFork }} 29 29 - <button class="btn no-underline hover:no-underline flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" disabled title="Empty repositories cannot be forked"> 30 30 - {{ i "git-fork" "w-4 h-4"}} 31 31 - fork 32 32 - </button> 33 33 - {{ else }} 34 34 - <a class="btn no-underline hover:no-underline flex items-center gap-2" href="/{{ .FullName }}/fork"> 35 35 - {{ i "git-fork" "w-4 h-4"}} 36 36 - fork 37 37 - </a> 38 38 - {{ end }} 39 39 - </div> 40 40 - {{ end }} 41 41 -

-15

appview/pages/templates/fragments/repoDescription.html

··· 1 1 - {{ define "fragments/repoDescription" }} 2 2 - <span id="repo-description" class="flex flex-wrap items-center gap-2" hx-target="this" hx-swap="outerHTML"> 3 3 - {{ if .RepoInfo.Description }} 4 4 - {{ .RepoInfo.Description }} 5 5 - {{ else }} 6 6 - <span class="italic">this repo has no description</span> 7 7 - {{ end }} 8 8 - 9 9 - {{ if .RepoInfo.Roles.IsOwner }} 10 10 - <button class="btn p-2 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description/edit"> 11 11 - {{ i "pencil" "w-3 h-3" }} edit 12 12 - </button> 13 13 - {{ end }} 14 14 - </span> 15 15 - {{ end }}

+2 -2

appview/pages/templates/layouts/repobase.html

··· 19 19 <a href="/{{ .RepoInfo.FullName }}" class="font-bold">{{ .RepoInfo.Name }}</a> 20 20 </div> 21 21 22 22 - {{ template "fragments/repoActions" .RepoInfo }} 22 22 + {{ template "repo/fragments/repoActions" .RepoInfo }} 23 23 </div> 24 24 - {{ template "fragments/repoDescription" . }} 24 24 + {{ template "repo/fragments/repoDescription" . }} 25 25 </section> 26 26 <section class="min-h-screen flex flex-col drop-shadow-sm"> 27 27 <nav class="w-full pl-4 overflow-auto">

+1 -1

appview/pages/templates/repo/blob.html

··· 60 60 {{ else }} 61 61 <div class="overflow-auto relative"> 62 62 {{ if .ShowRendered }} 63 63 - <div id="blob-contents" class="prose dark:prose-invert p-6">{{ .RenderedContents }}</div> 63 63 + <div id="blob-contents" class="prose dark:prose-invert">{{ .RenderedContents }}</div> 64 64 {{ else }} 65 65 <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ $.Contents | escapeHtml }}</div> 66 66 {{ end }}

+2 -21

appview/pages/templates/repo/commit.html

··· 4 4 5 5 {{ $repo := .RepoInfo.FullName }} 6 6 {{ $commit := .Diff.Commit }} 7 7 - {{ $stat := .Diff.Stat }} 8 8 - {{ $diff := .Diff.Diff }} 9 7 10 8 <section class="commit dark:text-white"> 11 9 <div id="commit-message"> ··· 13 11 <div> 14 12 <p class="pb-2">{{ index $messageParts 0 }}</p> 15 13 {{ if gt (len $messageParts) 1 }} 16 16 - <p class="mt-1 cursor-text pb-2 text-sm">{{ nl2br (unwrapText (index $messageParts 1)) }}</p> 14 14 + <p class="mt-1 cursor-text pb-2 text-sm">{{ nl2br (index $messageParts 1) }}</p> 17 15 {{ end }} 18 16 </div> 19 17 </div> ··· 29 27 {{ end }} 30 28 <span class="px-1 select-none before:content-['\00B7']"></span> 31 29 {{ timeFmt $commit.Author.When }} 32 32 - <span class="px-1 select-none before:content-['\00B7']"></span> 33 33 - <span>{{ $stat.FilesChanged }}</span> files <span class="font-mono">(+{{ $stat.Insertions }}, -{{ $stat.Deletions }})</span> 34 30 <span class="px-1 select-none before:content-['\00B7']"></span> 35 31 </p> 36 32 ··· 43 39 </p> 44 40 </div> 45 41 46 46 - <div class="diff-stat"> 47 47 - <br> 48 48 - <strong class="text-sm uppercase mb-4 dark:text-gray-200">Changed files</strong> 49 49 - <div class="overflow-x-auto"> 50 50 - {{ range $diff }} 51 51 - <ul class="dark:text-gray-200"> 52 52 - {{ if .IsDelete }} 53 53 - <li><a href="#file-{{ .Name.Old }}" class="dark:hover:text-gray-300">{{ .Name.Old }}</a></li> 54 54 - {{ else }} 55 55 - <li><a href="#file-{{ .Name.New }}" class="dark:hover:text-gray-300">{{ .Name.New }}</a></li> 56 56 - {{ end }} 57 57 - </ul> 58 58 - {{ end }} 59 59 - </div> 60 60 - </div> 61 42 </section> 62 43 63 44 {{end}} 64 45 65 46 {{ define "repoAfter" }} 66 66 - {{ template "fragments/diff" (list .RepoInfo.FullName .Diff) }} 47 47 + {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff) }} 67 48 {{end}}

+1 -1

appview/pages/templates/repo/empty.html

··· 9 9 {{ end }} 10 10 11 11 {{ define "repoAfter" }} 12 12 - {{ template "fragments/cloneInstructions" . }} 12 12 + {{ template "repo/fragments/cloneInstructions" . }} 13 13 {{ end }}

+51

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

··· 1 1 + {{ define "repo/fragments/cloneInstructions" }} 2 2 + <section 3 3 + class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto flex flex-col gap-4" 4 4 + > 5 5 + <div class="flex flex-col gap-2"> 6 6 + <strong>push</strong> 7 7 + <div class="md:pl-4 overflow-x-auto whitespace-nowrap"> 8 8 + <code class="dark:text-gray-100" 9 9 + >git remote add origin 10 10 + git@{{ .RepoInfo.Knot }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code 11 11 + > 12 12 + </div> 13 13 + </div> 14 14 + 15 15 + <div class="flex flex-col gap-2"> 16 16 + <strong>clone</strong> 17 17 + <div class="md:pl-4 flex flex-col gap-2"> 18 18 + <div class="flex items-center gap-3"> 19 19 + <span 20 20 + class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white" 21 21 + >HTTP</span 22 22 + > 23 23 + <div class="overflow-x-auto whitespace-nowrap flex-1"> 24 24 + <code class="dark:text-gray-100" 25 25 + >git clone 26 26 + https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code 27 27 + > 28 28 + </div> 29 29 + </div> 30 30 + 31 31 + <div class="flex items-center gap-3"> 32 32 + <span 33 33 + class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white" 34 34 + >SSH</span 35 35 + > 36 36 + <div class="overflow-x-auto whitespace-nowrap flex-1"> 37 37 + <code class="dark:text-gray-100" 38 38 + >git clone 39 39 + git@{{ .RepoInfo.Knot }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code 40 40 + > 41 41 + </div> 42 42 + </div> 43 43 + </div> 44 44 + </div> 45 45 + 46 46 + <p class="py-2 text-gray-500 dark:text-gray-400"> 47 47 + Note that for self-hosted knots, clone URLs may be different based 48 48 + on your setup. 49 49 + </p> 50 50 + </section> 51 51 + {{ end }}

+175

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

··· 1 1 + {{ define "repo/fragments/diff" }} 2 2 + {{ $repo := index . 0 }} 3 3 + {{ $diff := index . 1 }} 4 4 + {{ $commit := $diff.Commit }} 5 5 + {{ $stat := $diff.Stat }} 6 6 + {{ $diff := $diff.Diff }} 7 7 + 8 8 + {{ $this := $commit.This }} 9 9 + {{ $parent := $commit.Parent }} 10 10 + 11 11 + <section class="mt-6 p-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 12 12 + <div class="diff-stat"> 13 13 + <div class="flex gap-2 items-center"> 14 14 + <strong class="text-sm uppercase dark:text-gray-200">Changed files</strong> 15 15 + {{ block "statPill" $stat }} {{ end }} 16 16 + </div> 17 17 + <div class="overflow-x-auto"> 18 18 + {{ range $diff }} 19 19 + <ul class="dark:text-gray-200"> 20 20 + {{ if .IsDelete }} 21 21 + <li><a href="#file-{{ .Name.Old }}" class="dark:hover:text-gray-300">{{ .Name.Old }}</a></li> 22 22 + {{ else }} 23 23 + <li><a href="#file-{{ .Name.New }}" class="dark:hover:text-gray-300">{{ .Name.New }}</a></li> 24 24 + {{ end }} 25 25 + </ul> 26 26 + {{ end }} 27 27 + </div> 28 28 + </div> 29 29 + </section> 30 30 + 31 31 + {{ $last := sub (len $diff) 1 }} 32 32 + {{ range $idx, $hunk := $diff }} 33 33 + {{ with $hunk }} 34 34 + <section class="mt-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 35 35 + <div id="file-{{ .Name.New }}"> 36 36 + <div id="diff-file"> 37 37 + <details open> 38 38 + <summary class="list-none cursor-pointer sticky top-0"> 39 39 + <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between"> 40 40 + <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto" style="direction: rtl;"> 41 41 + {{ $markerstyle := "diff-type p-1 mr-1 font-mono text-sm rounded select-none" }} 42 42 + 43 43 + <div class="flex gap-2 items-center" style="direction: ltr;"> 44 44 + {{ if .IsNew }} 45 45 + <span class="bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400 {{ $markerstyle }}">ADDED</span> 46 46 + {{ else if .IsDelete }} 47 47 + <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">DELETED</span> 48 48 + {{ else if .IsCopy }} 49 49 + <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">COPIED</span> 50 50 + {{ else if .IsRename }} 51 51 + <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">RENAMED</span> 52 52 + {{ else }} 53 53 + <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">MODIFIED</span> 54 54 + {{ end }} 55 55 + 56 56 + {{ block "statPill" .Stats }} {{ end }} 57 57 + 58 58 + {{ if .IsDelete }} 59 59 + <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this }}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.Old }}"{{end}}> 60 60 + {{ .Name.Old }} 61 61 + </a> 62 62 + {{ else if (or .IsCopy .IsRename) }} 63 63 + <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $parent}}href="/{{ $repo }}/blob/{{ $parent }}/{{ .Name.Old }}"{{end}}> 64 64 + {{ .Name.Old }} 65 65 + </a> 66 66 + {{ i "arrow-right" "w-4 h-4" }} 67 67 + <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}> 68 68 + {{ .Name.New }} 69 69 + </a> 70 70 + {{ else }} 71 71 + <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}> 72 72 + {{ .Name.New }} 73 73 + </a> 74 74 + {{ end }} 75 75 + </div> 76 76 + </div> 77 77 + 78 78 + {{ $iconstyle := "p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" }} 79 79 + <div id="right-side-items" class="p-2 flex items-center"> 80 80 + <a title="top of file" href="#file-{{ .Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up-to-line" "w-4 h-4" }}</a> 81 81 + {{ if gt $idx 0 }} 82 82 + {{ $prev := index $diff (sub $idx 1) }} 83 83 + <a title="previous file" href="#file-{{ $prev.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up" "w-4 h-4" }}</a> 84 84 + {{ end }} 85 85 + 86 86 + {{ if lt $idx $last }} 87 87 + {{ $next := index $diff (add $idx 1) }} 88 88 + <a title="next file" href="#file-{{ $next.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-down" "w-4 h-4" }}</a> 89 89 + {{ end }} 90 90 + </div> 91 91 + 92 92 + </div> 93 93 + </summary> 94 94 + 95 95 + <div class="transition-all duration-700 ease-in-out"> 96 96 + {{ if .IsDelete }} 97 97 + <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 98 98 + This file has been deleted. 99 99 + </p> 100 100 + {{ else if .IsCopy }} 101 101 + <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 102 102 + This file has been copied. 103 103 + </p> 104 104 + {{ else if .IsRename }} 105 105 + <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 106 106 + This file has been renamed. 107 107 + </p> 108 108 + {{ else if .IsBinary }} 109 109 + <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 110 110 + This is a binary file and will not be displayed. 111 111 + </p> 112 112 + {{ else }} 113 113 + {{ $name := .Name.New }} 114 114 + <pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div> 115 115 + {{- $oldStart := .OldPosition -}} 116 116 + {{- $newStart := .NewPosition -}} 117 117 + {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800 scroll-mt-10 target:border target:border-amber-500 target:rounded " -}} 118 118 + {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}} 119 119 + {{- $lineNrSepStyle1 := "" -}} 120 120 + {{- $lineNrSepStyle2 := "pr-2" -}} 121 121 + {{- range .Lines -}} 122 122 + {{- if eq .Op.String "+" -}} 123 123 + <div class="bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 flex min-w-full items-center"> 124 124 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><span aria-hidden="true" class="invisible">{{$newStart}}</span></div> 125 125 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}" id="{{$name}}-N{{$newStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div> 126 126 + <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div> 127 127 + <div class="px-2">{{ .Line }}</div> 128 128 + </div> 129 129 + {{- $newStart = add64 $newStart 1 -}} 130 130 + {{- end -}} 131 131 + {{- if eq .Op.String "-" -}} 132 132 + <div class="bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 flex min-w-full items-center"> 133 133 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}" id="{{$name}}-O{{$oldStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div> 134 134 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><span aria-hidden="true" class="invisible">{{$oldStart}}</span></div> 135 135 + <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div> 136 136 + <div class="px-2">{{ .Line }}</div> 137 137 + </div> 138 138 + {{- $oldStart = add64 $oldStart 1 -}} 139 139 + {{- end -}} 140 140 + {{- if eq .Op.String " " -}} 141 141 + <div class="bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 flex min-w-full items-center"> 142 142 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}" id="{{$name}}-O{{$oldStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div> 143 143 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}" id="{{$name}}-N{{$newStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div> 144 144 + <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div> 145 145 + <div class="px-2">{{ .Line }}</div> 146 146 + </div> 147 147 + {{- $newStart = add64 $newStart 1 -}} 148 148 + {{- $oldStart = add64 $oldStart 1 -}} 149 149 + {{- end -}} 150 150 + {{- end -}} 151 151 + {{- end -}}</div></div></pre> 152 152 + {{- end -}} 153 153 + </div> 154 154 + 155 155 + </details> 156 156 + 157 157 + </div> 158 158 + </div> 159 159 + </section> 160 160 + {{ end }} 161 161 + {{ end }} 162 162 + {{ end }} 163 163 + 164 164 + {{ define "statPill" }} 165 165 + <div class="flex items-center font-mono text-sm"> 166 166 + {{ if and .Insertions .Deletions }} 167 167 + <span class="rounded-l p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span> 168 168 + <span class="rounded-r p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span> 169 169 + {{ else if .Insertions }} 170 170 + <span class="rounded p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span> 171 171 + {{ else if .Deletions }} 172 172 + <span class="rounded p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span> 173 173 + {{ end }} 174 174 + </div> 175 175 + {{ end }}

+11

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

··· 1 1 + {{ define "repo/fragments/editRepoDescription" }} 2 2 + <form hx-put="/{{ .RepoInfo.FullName }}/description" hx-target="this" hx-swap="outerHTML" class="flex flex-wrap gap-2"> 3 3 + <input type="text" class="p-1" name="description" value="{{ .RepoInfo.Description }}"> 4 4 + <button type="submit" class="btn p-1 flex items-center gap-2 no-underline text-sm"> 5 5 + {{ i "check" "w-3 h-3" }} save 6 6 + </button> 7 7 + <button type="button" class="btn p-1 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description" > 8 8 + {{ i "x" "w-3 h-3" }} cancel 9 9 + </button> 10 10 + </form> 11 11 + {{ end }}

+47

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

··· 1 1 + {{ define "repo/fragments/repoActions" }} 2 2 + <div class="flex items-center gap-2 z-auto"> 3 3 + <button 4 4 + id="starBtn" 5 5 + class="btn disabled:opacity-50 disabled:cursor-not-allowed" 6 6 + {{ if .IsStarred }} 7 7 + hx-delete="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}" 8 8 + {{ else }} 9 9 + hx-post="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}" 10 10 + {{ end }} 11 11 + 12 12 + hx-trigger="click" 13 13 + hx-target="#starBtn" 14 14 + hx-swap="outerHTML" 15 15 + hx-disabled-elt="#starBtn" 16 16 + > 17 17 + <div class="flex gap-2 items-center"> 18 18 + {{ if .IsStarred }} 19 19 + {{ i "star" "w-4 h-4 fill-current" }} 20 20 + {{ else }} 21 21 + {{ i "star" "w-4 h-4" }} 22 22 + {{ end }} 23 23 + <span class="text-sm"> 24 24 + {{ .Stats.StarCount }} 25 25 + </span> 26 26 + </div> 27 27 + </button> 28 28 + {{ if .DisableFork }} 29 29 + <button 30 30 + class="btn text-sm no-underline hover:no-underline flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" 31 31 + disabled 32 32 + title="Empty repositories cannot be forked" 33 33 + > 34 34 + {{ i "git-fork" "w-4 h-4" }} 35 35 + fork 36 36 + </button> 37 37 + {{ else }} 38 38 + <a 39 39 + class="btn text-sm no-underline hover:no-underline flex items-center gap-2" 40 40 + href="/{{ .FullName }}/fork" 41 41 + > 42 42 + {{ i "git-fork" "w-4 h-4" }} 43 43 + fork 44 44 + </a> 45 45 + {{ end }} 46 46 + </div> 47 47 + {{ end }}

+15

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

··· 1 1 + {{ define "repo/fragments/repoDescription" }} 2 2 + <span id="repo-description" class="flex flex-wrap items-center gap-2 text-sm" hx-target="this" hx-swap="outerHTML"> 3 3 + {{ if .RepoInfo.Description }} 4 4 + {{ .RepoInfo.Description }} 5 5 + {{ else }} 6 6 + <span class="italic">this repo has no description</span> 7 7 + {{ end }} 8 8 + 9 9 + {{ if .RepoInfo.Roles.IsOwner }} 10 10 + <button class="flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description/edit"> 11 11 + {{ i "pencil" "w-3 h-3" }} 12 12 + </button> 13 13 + {{ end }} 14 14 + </span> 15 15 + {{ end }}

+207 -172

appview/pages/templates/repo/index.html

··· 1 1 {{ define "title" }}{{ .RepoInfo.FullName }} at {{ .Ref }}{{ end }} 2 2 3 3 - 4 3 {{ define "extrameta" }} 5 5 - <meta name="vcs:clone" content="https://tangled.sh/{{ .RepoInfo.FullName }}"/> 6 6 - <meta name="forge:summary" content="https://tangled.sh/{{ .RepoInfo.FullName }}"> 7 7 - <meta name="forge:dir" content="https://tangled.sh/{{ .RepoInfo.FullName }}/tree/{ref}/{path}"> 8 8 - <meta name="forge:file" content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}"> 9 9 - <meta name="forge:line" content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}"> 10 10 - <meta name="go-import" content="tangled.sh/{{ .RepoInfo.FullNameWithoutAt }} git https://tangled.sh/{{ .RepoInfo.FullName }}"> 4 4 + <meta 5 5 + name="vcs:clone" 6 6 + content="https://tangled.sh/{{ .RepoInfo.FullName }}" 7 7 + /> 8 8 + <meta 9 9 + name="forge:summary" 10 10 + content="https://tangled.sh/{{ .RepoInfo.FullName }}" 11 11 + /> 12 12 + <meta 13 13 + name="forge:dir" 14 14 + content="https://tangled.sh/{{ .RepoInfo.FullName }}/tree/{ref}/{path}" 15 15 + /> 16 16 + <meta 17 17 + name="forge:file" 18 18 + content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}" 19 19 + /> 20 20 + <meta 21 21 + name="forge:line" 22 22 + content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}" 23 23 + /> 24 24 + <meta 25 25 + name="go-import" 26 26 + content="tangled.sh/{{ .RepoInfo.FullNameWithoutAt }} git https://tangled.sh/{{ .RepoInfo.FullName }}" 27 27 + /> 11 28 {{ end }} 12 12 - 13 29 14 30 {{ define "repoContent" }} 15 31 <main> 16 16 - {{ block "branchSelector" . }} {{ end }} 32 32 + {{ block "branchSelector" . }}{{ end }} 17 33 <div class="grid grid-cols-1 md:grid-cols-2 gap-2"> 18 18 - {{ block "fileTree" . }} {{ end }} 19 19 - {{ block "commitLog" . }} {{ end }} 34 34 + {{ block "fileTree" . }}{{ end }} 35 35 + {{ block "commitLog" . }}{{ end }} 20 36 </div> 21 37 </main> 22 38 {{ end }} 23 39 24 40 {{ define "branchSelector" }} 25 25 - <div class="flex justify-between pb-5"> 26 26 - <select 27 27 - onchange="window.location.href = '/{{ .RepoInfo.FullName }}/tree/' + encodeURIComponent(this.value)" 28 28 - class="p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700" 29 29 - > 30 30 - <optgroup label="branches" class="bold text-sm"> 31 31 - {{ range .Branches }} 32 32 - <option 33 33 - value="{{ .Reference.Name }}" 34 34 - class="py-1" 35 35 - {{ if eq .Reference.Name $.Ref }} 36 36 - selected 37 37 - {{ end }} 38 38 - > 39 39 - {{ .Reference.Name }} 40 40 - </option> 41 41 - {{ end }} 42 42 - </optgroup> 43 43 - <optgroup label="tags" class="bold text-sm"> 44 44 - {{ range .Tags }} 45 45 - <option 46 46 - value="{{ .Reference.Name }}" 47 47 - class="py-1" 48 48 - {{ if eq .Reference.Name $.Ref }} 49 49 - selected 50 50 - {{ end }} 51 51 - > 52 52 - {{ .Reference.Name }} 53 53 - </option> 54 54 - {{ else }} 55 55 - <option class="py-1" disabled>no tags found</option> 56 56 - {{ end }} 57 57 - </optgroup> 58 58 - </select> 59 59 - <a 60 60 - href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}" 61 61 - class="ml-2 no-underline flex items-center gap-2 text-sm uppercase font-bold dark:text-white" 62 62 - > 63 63 - {{ i "logs" "w-4 h-4" }} 64 64 - {{ .TotalCommits }} 65 65 - {{ if eq .TotalCommits 1 }}commit{{ else }}commits{{ end }} 66 66 - </a> 67 67 - </div> 41 41 + <div class="flex justify-between pb-5"> 42 42 + <select 43 43 + onchange="window.location.href = '/{{ .RepoInfo.FullName }}/tree/' + encodeURIComponent(this.value)" 44 44 + class="p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700" 45 45 + > 46 46 + <optgroup label="branches" class="bold text-sm"> 47 47 + {{ range .Branches }} 48 48 + <option 49 49 + value="{{ .Reference.Name }}" 50 50 + class="py-1" 51 51 + {{ if eq .Reference.Name $.Ref }} 52 52 + selected 53 53 + {{ end }} 54 54 + > 55 55 + {{ .Reference.Name }} 56 56 + </option> 57 57 + {{ end }} 58 58 + </optgroup> 59 59 + <optgroup label="tags" class="bold text-sm"> 60 60 + {{ range .Tags }} 61 61 + <option 62 62 + value="{{ .Reference.Name }}" 63 63 + class="py-1" 64 64 + {{ if eq .Reference.Name $.Ref }} 65 65 + selected 66 66 + {{ end }} 67 67 + > 68 68 + {{ .Reference.Name }} 69 69 + </option> 70 70 + {{ else }} 71 71 + <option class="py-1" disabled>no tags found</option> 72 72 + {{ end }} 73 73 + </optgroup> 74 74 + </select> 75 75 + <a 76 76 + href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}" 77 77 + class="ml-2 no-underline flex items-center gap-2 text-sm uppercase font-bold dark:text-white" 78 78 + > 79 79 + {{ i "logs" "w-4 h-4" }} 80 80 + {{ .TotalCommits }} 81 81 + {{ if eq .TotalCommits 1 }}commit{{ else }}commits{{ end }} 82 82 + </a> 83 83 + </div> 68 84 {{ end }} 69 85 70 86 {{ define "fileTree" }} 71 71 - <div id="file-tree" class="col-span-1 pr-2 md:border-r md:border-gray-200 dark:md:border-gray-700"> 72 72 - {{ $containerstyle := "py-1" }} 73 73 - {{ $linkstyle := "no-underline hover:underline dark:text-white" }} 87 87 + <div 88 88 + id="file-tree" 89 89 + class="col-span-1 pr-2 md:border-r md:border-gray-200 dark:md:border-gray-700" 90 90 + > 91 91 + {{ $containerstyle := "py-1" }} 92 92 + {{ $linkstyle := "no-underline hover:underline dark:text-white" }} 74 93 75 75 - {{ range .Files }} 76 76 - {{ if not .IsFile }} 77 77 - <div class="{{ $containerstyle }}"> 78 78 - <div class="flex justify-between items-center"> 79 79 - <a 80 80 - href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref | urlquery }}/{{ .Name }}" 81 81 - class="{{ $linkstyle }}" 82 82 - > 83 83 - <div class="flex items-center gap-2"> 84 84 - {{ i "folder" "w-3 h-3 fill-current" }} 85 85 - {{ .Name }} 86 86 - </div> 87 87 - </a> 94 94 + {{ range .Files }} 95 95 + {{ if not .IsFile }} 96 96 + <div class="{{ $containerstyle }}"> 97 97 + <div class="flex justify-between items-center"> 98 98 + <a 99 99 + href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref | urlquery }}/{{ .Name }}" 100 100 + class="{{ $linkstyle }}" 101 101 + > 102 102 + <div class="flex items-center gap-2"> 103 103 + {{ i "folder" "w-3 h-3 fill-current" }} 104 104 + {{ .Name }} 105 105 + </div> 106 106 + </a> 88 107 89 89 - <time class="text-xs text-gray-500 dark:text-gray-400" 90 90 - >{{ timeFmt .LastCommit.When }}</time 91 91 - > 108 108 + <time class="text-xs text-gray-500 dark:text-gray-400" 109 109 + >{{ timeFmt .LastCommit.When }}</time 110 110 + > 111 111 + </div> 92 112 </div> 93 93 - </div> 113 113 + {{ end }} 94 114 {{ end }} 95 95 - {{ end }} 96 115 97 97 - {{ range .Files }} 98 98 - {{ if .IsFile }} 99 99 - <div class="{{ $containerstyle }}"> 100 100 - <div class="flex justify-between items-center"> 101 101 - <a 102 102 - href="/{{ $.RepoInfo.FullName }}/blob/{{ $.Ref | urlquery }}/{{ .Name }}" 103 103 - class="{{ $linkstyle }}" 104 104 - > 105 105 - <div class="flex items-center gap-2"> 106 106 - {{ i "file" "w-3 h-3" }}{{ .Name }} 107 107 - </div> 108 108 - </a> 116 116 + {{ range .Files }} 117 117 + {{ if .IsFile }} 118 118 + <div class="{{ $containerstyle }}"> 119 119 + <div class="flex justify-between items-center"> 120 120 + <a 121 121 + href="/{{ $.RepoInfo.FullName }}/blob/{{ $.Ref | urlquery }}/{{ .Name }}" 122 122 + class="{{ $linkstyle }}" 123 123 + > 124 124 + <div class="flex items-center gap-2"> 125 125 + {{ i "file" "w-3 h-3" }}{{ .Name }} 126 126 + </div> 127 127 + </a> 109 128 110 110 - <time class="text-xs text-gray-500 dark:text-gray-400" 111 111 - >{{ timeFmt .LastCommit.When }}</time 112 112 - > 129 129 + <time class="text-xs text-gray-500 dark:text-gray-400" 130 130 + >{{ timeFmt .LastCommit.When }}</time 131 131 + > 132 132 + </div> 113 133 </div> 114 114 - </div> 134 134 + {{ end }} 115 135 {{ end }} 116 116 - {{ end }} 117 117 - </div> 136 136 + </div> 118 137 {{ end }} 119 138 120 120 - 121 139 {{ define "commitLog" }} 122 122 - <div id="commit-log" class="hidden md:block md:col-span-1"> 123 123 - {{ range .Commits }} 124 124 - <div class="relative px-2 pb-8"> 125 125 - <div id="commit-message"> 126 126 - {{ $messageParts := splitN .Message "\n\n" 2 }} 127 127 - <div class="text-base cursor-pointer"> 128 128 - <div> 129 129 - <div> 130 130 - <a 131 131 - href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}" 132 132 - class="inline no-underline hover:underline dark:text-white" 133 133 - >{{ index $messageParts 0 }}</a 134 134 - > 135 135 - {{ if gt (len $messageParts) 1 }} 140 140 + <div id="commit-log" class="hidden md:block md:col-span-1"> 141 141 + {{ range .Commits }} 142 142 + <div class="relative px-2 pb-8"> 143 143 + <div id="commit-message"> 144 144 + {{ $messageParts := splitN .Message "\n\n" 2 }} 145 145 + <div class="text-base cursor-pointer"> 146 146 + <div> 147 147 + <div> 148 148 + <a 149 149 + href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}" 150 150 + class="inline no-underline hover:underline dark:text-white" 151 151 + >{{ index $messageParts 0 }}</a 152 152 + > 153 153 + {{ if gt (len $messageParts) 1 }} 136 154 137 137 - <button 138 138 - class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600" 139 139 - hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')" 140 140 - > 141 141 - {{ i "ellipsis" "w-3 h-3" }} 142 142 - </button> 143 143 - {{ end }} 144 144 - </div> 145 145 - {{ if gt (len $messageParts) 1 }} 146 146 - <p 147 147 - class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300" 148 148 - > 149 149 - {{ nl2br (unwrapText (index $messageParts 1)) }} 150 150 - </p> 151 151 - {{ end }} 152 152 - </div> 153 153 - </div> 154 154 - </div> 155 155 + <button 156 156 + class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600" 157 157 + hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')" 158 158 + > 159 159 + {{ i "ellipsis" "w-3 h-3" }} 160 160 + </button> 161 161 + {{ end }} 162 162 + </div> 163 163 + {{ if gt (len $messageParts) 1 }} 164 164 + <p 165 165 + class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300" 166 166 + > 167 167 + {{ nl2br (index $messageParts 1) }} 168 168 + </p> 169 169 + {{ end }} 170 170 + </div> 171 171 + </div> 172 172 + </div> 155 173 156 156 - <div class="text-xs text-gray-500 dark:text-gray-400"> 157 157 - <span class="font-mono"> 158 158 - <a 159 159 - href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}" 160 160 - class="text-gray-500 dark:text-gray-400 no-underline hover:underline" 161 161 - >{{ slice .Hash.String 0 8 }}</a 162 162 - > 163 163 - </span> 164 164 - <span 165 165 - class="mx-2 before:content-['·'] before:select-none" 166 166 - ></span> 167 167 - <span> 168 168 - {{ $didOrHandle := index $.EmailToDidOrHandle .Author.Email }} 169 169 - <a 170 170 - href="{{ if $didOrHandle }}/{{ $didOrHandle }}{{ else }}mailto:{{ .Author.Email }}{{ end }}" 171 171 - class="text-gray-500 dark:text-gray-400 no-underline hover:underline" 172 172 - >{{ if $didOrHandle }}{{ $didOrHandle }}{{ else }}{{ .Author.Name }}{{ end }}</a 173 173 - > 174 174 - </span> 175 175 - <div 176 176 - class="inline-block px-1 select-none after:content-['·']" 177 177 - ></div> 178 178 - <span>{{ timeFmt .Author.When }}</span> 179 179 - {{ $tagsForCommit := index $.TagMap .Hash.String }} 180 180 - {{ if gt (len $tagsForCommit) 0 }} 174 174 + <div class="text-xs text-gray-500 dark:text-gray-400"> 175 175 + <span class="font-mono"> 176 176 + <a 177 177 + href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}" 178 178 + class="text-gray-500 dark:text-gray-400 no-underline hover:underline" 179 179 + >{{ slice .Hash.String 0 8 }}</a></span> 180 180 + <span 181 181 + class="mx-2 before:content-['·'] before:select-none" 182 182 + ></span> 183 183 + <span> 184 184 + {{ $didOrHandle := index $.EmailToDidOrHandle .Author.Email }} 185 185 + <a 186 186 + href="{{ if $didOrHandle }} 187 187 + /{{ $didOrHandle }} 188 188 + {{ else }} 189 189 + mailto:{{ .Author.Email }} 190 190 + {{ end }}" 191 191 + class="text-gray-500 dark:text-gray-400 no-underline hover:underline" 192 192 + >{{ if $didOrHandle }} 193 193 + {{ $didOrHandle }} 194 194 + {{ else }} 195 195 + {{ .Author.Name }} 196 196 + {{ end }}</a 197 197 + > 198 198 + </span> 181 199 <div 182 200 class="inline-block px-1 select-none after:content-['·']" 183 201 ></div> 184 184 - {{ end }} 185 185 - {{ range $tagsForCommit }} 186 186 - <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center"> 187 187 - {{ . }} 188 188 - </span> 189 189 - {{ end }} 190 190 - </div> 191 191 - </div> 192 192 - {{ end }} 193 193 - </div> 202 202 + <span>{{ timeFmt .Author.When }}</span> 203 203 + {{ $tagsForCommit := index $.TagMap .Hash.String }} 204 204 + {{ if gt (len $tagsForCommit) 0 }} 205 205 + <div 206 206 + class="inline-block px-1 select-none after:content-['·']" 207 207 + ></div> 208 208 + {{ end }} 209 209 + {{ range $tagsForCommit }} 210 210 + <span 211 211 + class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center" 212 212 + > 213 213 + {{ . }} 214 214 + </span> 215 215 + {{ end }} 216 216 + </div> 217 217 + </div> 218 218 + {{ end }} 219 219 + </div> 194 220 {{ end }} 195 195 - 196 221 197 222 {{ define "repoAfter" }} 198 223 {{- if .HTMLReadme }} 199 199 - <section class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto {{ if not .Raw }} prose dark:prose-invert dark:[&_pre]:bg-gray-900 dark:[&_code]:text-gray-300 dark:[&_pre_code]:bg-gray-900 dark:[&_pre]:border dark:[&_pre]:border-gray-700 {{ end }}"> 200 200 - <article class="{{ if .Raw }}whitespace-pre{{end}}"> 201 201 - {{ if .Raw }} 202 202 - <pre class="dark:bg-gray-900 dark:text-gray-200 dark:border dark:border-gray-700 dark:p-4 dark:rounded">{{ .HTMLReadme }}</pre> 203 203 - {{ else }} 204 204 - {{ .HTMLReadme }} 205 205 - {{ end }} 206 206 - </article> 207 207 - </section> 224 224 + <section 225 225 + class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto {{ if not .Raw }} 226 226 + prose dark:prose-invert dark:[&_pre]:bg-gray-900 227 227 + dark:[&_code]:text-gray-300 dark:[&_pre_code]:bg-gray-900 228 228 + dark:[&_pre]:border dark:[&_pre]:border-gray-700 229 229 + {{ end }}" 230 230 + > 231 231 + <article class="{{ if .Raw }}whitespace-pre{{ end }}"> 232 232 + {{ if .Raw }} 233 233 + <pre 234 234 + class="dark:bg-gray-900 dark:text-gray-200 dark:border dark:border-gray-700 dark:p-4 dark:rounded" 235 235 + > 236 236 + {{ .HTMLReadme }}</pre 237 237 + > 238 238 + {{ else }} 239 239 + {{ .HTMLReadme }} 240 240 + {{ end }} 241 241 + </article> 242 242 + </section> 208 243 {{- end -}} 209 244 210 210 - {{ template "fragments/cloneInstructions" . }} 245 245 + {{ template "repo/fragments/cloneInstructions" . }} 211 246 {{ end }}

+52

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

··· 1 1 + {{ define "repo/issues/fragments/editIssueComment" }} 2 2 + {{ with .Comment }} 3 3 + <div id="comment-container-{{.CommentId}}"> 4 4 + <div class="flex items-center gap-2 mb-2 text-gray-500 text-sm"> 5 5 + {{ $owner := didOrHandle $.LoggedInUser.Did $.LoggedInUser.Handle }} 6 6 + <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a> 7 7 + 8 8 + <!-- show user "hats" --> 9 9 + {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }} 10 10 + {{ if $isIssueAuthor }} 11 11 + <span class="before:content-['·']"></span> 12 12 + <span class="rounded bg-gray-100 text-black font-mono px-2 mx-1/2 inline-flex items-center"> 13 13 + author 14 14 + </span> 15 15 + {{ end }} 16 16 + 17 17 + <span class="before:content-['·']"></span> 18 18 + <a 19 19 + href="#{{ .CommentId }}" 20 20 + class="text-gray-500 hover:text-gray-500 hover:underline no-underline" 21 21 + id="{{ .CommentId }}"> 22 22 + {{ .Created | timeFmt }} 23 23 + </a> 24 24 + 25 25 + <button 26 26 + class="btn px-2 py-1 flex items-center gap-2 text-sm" 27 27 + hx-post="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit" 28 28 + hx-include="#edit-textarea-{{ .CommentId }}" 29 29 + hx-target="#comment-container-{{ .CommentId }}" 30 30 + hx-swap="outerHTML"> 31 31 + {{ i "check" "w-4 h-4" }} 32 32 + </button> 33 33 + <button 34 34 + class="btn px-2 py-1 flex items-center gap-2 text-sm" 35 35 + hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/" 36 36 + hx-target="#comment-container-{{ .CommentId }}" 37 37 + hx-swap="outerHTML"> 38 38 + {{ i "x" "w-4 h-4" }} 39 39 + </button> 40 40 + <span id="comment-{{.CommentId}}-status"></span> 41 41 + </div> 42 42 + 43 43 + <div> 44 44 + <textarea 45 45 + id="edit-textarea-{{ .CommentId }}" 46 46 + name="body" 47 47 + class="w-full p-2 border rounded min-h-[100px]">{{ .Body }}</textarea> 48 48 + </div> 49 49 + </div> 50 50 + {{ end }} 51 51 + {{ end }} 52 52 +

+59

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

··· 1 1 + {{ define "repo/issues/fragments/issueComment" }} 2 2 + {{ with .Comment }} 3 3 + <div id="comment-container-{{.CommentId}}"> 4 4 + <div class="flex items-center gap-2 mb-2 text-gray-500 dark:text-gray-400 text-sm"> 5 5 + {{ $owner := index $.DidHandleMap .OwnerDid }} 6 6 + <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a> 7 7 + 8 8 + <span class="before:content-['·']"></span> 9 9 + <a 10 10 + href="#{{ .CommentId }}" 11 11 + class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-400 hover:underline no-underline" 12 12 + id="{{ .CommentId }}"> 13 13 + {{ if .Deleted }} 14 14 + deleted {{ .Deleted | timeFmt }} 15 15 + {{ else if .Edited }} 16 16 + edited {{ .Edited | timeFmt }} 17 17 + {{ else }} 18 18 + {{ .Created | timeFmt }} 19 19 + {{ end }} 20 20 + </a> 21 21 + 22 22 + <!-- show user "hats" --> 23 23 + {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }} 24 24 + {{ if $isIssueAuthor }} 25 25 + <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center"> 26 26 + author 27 27 + </span> 28 28 + {{ end }} 29 29 + 30 30 + {{ $isCommentOwner := and $.LoggedInUser (eq $.LoggedInUser.Did .OwnerDid) }} 31 31 + {{ if and $isCommentOwner (not .Deleted) }} 32 32 + <button 33 33 + class="btn px-2 py-1 text-sm" 34 34 + hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit" 35 35 + hx-swap="outerHTML" 36 36 + hx-target="#comment-container-{{.CommentId}}" 37 37 + > 38 38 + {{ i "pencil" "w-4 h-4" }} 39 39 + </button> 40 40 + <button 41 41 + class="btn px-2 py-1 text-sm text-red-500" 42 42 + hx-delete="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/" 43 43 + hx-confirm="Are you sure you want to delete your comment?" 44 44 + hx-swap="outerHTML" 45 45 + hx-target="#comment-container-{{.CommentId}}" 46 46 + > 47 47 + {{ i "trash-2" "w-4 h-4" }} 48 48 + </button> 49 49 + {{ end }} 50 50 + 51 51 + </div> 52 52 + {{ if not .Deleted }} 53 53 + <div class="prose dark:prose-invert"> 54 54 + {{ .Body | markdown }} 55 55 + </div> 56 56 + {{ end }} 57 57 + </div> 58 58 + {{ end }} 59 59 + {{ end }}

+112 -42

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

··· 44 44 {{ end }} 45 45 46 46 {{ define "repoAfter" }} 47 47 - {{ if gt (len .Comments) 0 }} 48 48 - <section id="comments" class="mt-8 space-y-4 relative"> 47 47 + <section id="comments" class="my-2 mt-2 space-y-2 relative"> 49 48 {{ range $index, $comment := .Comments }} 50 49 <div 51 50 id="comment-{{ .CommentId }}" 52 52 - class="rounded bg-white px-6 py-4 relative dark:bg-gray-800"> 53 53 - {{ if eq $index 0 }} 54 54 - <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div> 55 55 - {{ else }} 56 56 - <div class="absolute left-8 -top-4 w-px h-4 bg-gray-300 dark:bg-gray-700" ></div> 51 51 + class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit"> 52 52 + {{ if gt $index 0 }} 53 53 + <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> 57 54 {{ end }} 58 58 - 59 59 - {{ template "fragments/issueComment" (dict "RepoInfo" $.RepoInfo "LoggedInUser" $.LoggedInUser "DidHandleMap" $.DidHandleMap "Issue" $.Issue "Comment" .)}} 55 55 + {{ template "repo/issues/fragments/issueComment" (dict "RepoInfo" $.RepoInfo "LoggedInUser" $.LoggedInUser "DidHandleMap" $.DidHandleMap "Issue" $.Issue "Comment" .)}} 60 56 </div> 61 57 {{ end }} 62 58 </section> 63 63 - {{ end }} 64 59 65 60 {{ block "newComment" . }} {{ end }} 66 61 67 67 - {{ $isIssueAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Issue.OwnerDid) }} 68 68 - {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }} 69 69 - {{ if or $isIssueAuthor $isRepoCollaborator }} 70 70 - {{ $action := "close" }} 71 71 - {{ $icon := "circle-x" }} 72 72 - {{ $hoverColor := "red" }} 73 73 - {{ if eq .State "closed" }} 74 74 - {{ $action = "reopen" }} 75 75 - {{ $icon = "circle-dot" }} 76 76 - {{ $hoverColor = "green" }} 77 77 - {{ end }} 78 78 - <form 79 79 - hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/{{ $action }}" 80 80 - hx-swap="none" 81 81 - class="mt-8" 82 82 - > 83 83 - <button type="submit" class="btn hover:bg-{{ $hoverColor }}-300"> 84 84 - {{ i $icon "w-4 h-4 mr-2" }} 85 85 - <span class="text-black dark:text-gray-400">{{ $action }}</span> 86 86 - </button> 87 87 - <div id="issue-action" class="error"></div> 88 88 - </form> 89 89 - {{ end }} 90 62 {{ end }} 91 63 92 64 {{ define "newComment" }} 93 65 {{ if .LoggedInUser }} 94 94 - <div class="bg-white rounded drop-shadow-sm py-4 px-6 relative w-full flex flex-col gap-2 mt-8 dark:bg-gray-800 dark:text-gray-400"> 95 95 - <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div> 96 96 - <div class="text-sm text-gray-500 dark:text-gray-400"> 66 66 + <form 67 67 + id="comment-form" 68 68 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 69 69 + hx-on::after-request="if(event.detail.successful) this.reset()" 70 70 + > 71 71 + <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full md:w-3/5"> 72 72 + <div class="text-sm pb-2 text-gray-500 dark:text-gray-400"> 97 73 {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }} 98 74 </div> 99 99 - <form hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment"> 100 75 <textarea 76 76 + id="comment-textarea" 101 77 name="body" 102 78 class="w-full p-2 rounded border border-gray-200 dark:border-gray-700" 103 103 - placeholder="Add to the discussion..." 79 79 + placeholder="Add to the discussion. Markdown is supported." 80 80 + onkeyup="updateCommentForm()" 104 81 ></textarea> 105 105 - <button type="submit" class="btn mt-2">comment</button> 106 82 <div id="issue-comment"></div> 107 107 - </form> 83 83 + <div id="issue-action" class="error"></div> 108 84 </div> 85 85 + 86 86 + <div class="flex gap-2 mt-2"> 87 87 + <button 88 88 + id="comment-button" 89 89 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 90 90 + type="submit" 91 91 + hx-disabled-elt="#comment-button" 92 92 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline" 93 93 + disabled 94 94 + > 95 95 + {{ i "message-square-plus" "w-4 h-4" }} 96 96 + comment 97 97 + </button> 98 98 + 99 99 + {{ $isIssueAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Issue.OwnerDid) }} 100 100 + {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }} 101 101 + {{ if and (or $isIssueAuthor $isRepoCollaborator) (eq .State "open") }} 102 102 + <button 103 103 + id="close-button" 104 104 + type="button" 105 105 + class="btn flex items-center gap-2" 106 106 + hx-trigger="click" 107 107 + > 108 108 + {{ i "ban" "w-4 h-4" }} 109 109 + close 110 110 + </button> 111 111 + <div 112 112 + id="close-with-comment" 113 113 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment" 114 114 + hx-trigger="click from:#close-button" 115 115 + hx-disabled-elt="#close-with-comment" 116 116 + hx-target="#issue-comment" 117 117 + hx-vals="js:{body: document.getElementById('comment-textarea').value.trim() !== '' ? document.getElementById('comment-textarea').value : ''}" 118 118 + hx-swap="none" 119 119 + > 120 120 + </div> 121 121 + <div 122 122 + id="close-issue" 123 123 + hx-disabled-elt="#close-issue" 124 124 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/close" 125 125 + hx-trigger="click from:#close-button" 126 126 + hx-target="#issue-action" 127 127 + hx-swap="none" 128 128 + > 129 129 + </div> 130 130 + <script> 131 131 + document.addEventListener('htmx:configRequest', function(evt) { 132 132 + if (evt.target.id === 'close-with-comment') { 133 133 + const commentText = document.getElementById('comment-textarea').value.trim(); 134 134 + if (commentText === '') { 135 135 + evt.detail.parameters = {}; 136 136 + evt.preventDefault(); 137 137 + } 138 138 + } 139 139 + }); 140 140 + </script> 141 141 + {{ else if and (or $isIssueAuthor $isRepoCollaborator) (eq .State "closed") }} 142 142 + <button 143 143 + type="button" 144 144 + class="btn flex items-center gap-2" 145 145 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/reopen" 146 146 + hx-swap="none" 147 147 + > 148 148 + {{ i "refresh-ccw-dot" "w-4 h-4" }} 149 149 + reopen 150 150 + </button> 151 151 + {{ end }} 152 152 + 153 153 + <script> 154 154 + function updateCommentForm() { 155 155 + const textarea = document.getElementById('comment-textarea'); 156 156 + const commentButton = document.getElementById('comment-button'); 157 157 + const closeButton = document.getElementById('close-button'); 158 158 + 159 159 + if (textarea.value.trim() !== '') { 160 160 + commentButton.removeAttribute('disabled'); 161 161 + } else { 162 162 + commentButton.setAttribute('disabled', ''); 163 163 + } 164 164 + 165 165 + if (closeButton) { 166 166 + if (textarea.value.trim() !== '') { 167 167 + closeButton.innerHTML = '{{ i "ban" "w-4 h-4" }} close with comment'; 168 168 + } else { 169 169 + closeButton.innerHTML = '{{ i "ban" "w-4 h-4" }} close'; 170 170 + } 171 171 + } 172 172 + } 173 173 + 174 174 + document.addEventListener('DOMContentLoaded', function() { 175 175 + updateCommentForm(); 176 176 + }); 177 177 + </script> 178 178 + </div> 179 179 + </form> 109 180 {{ else }} 110 110 - <div class="bg-white dark:bg-gray-800 dark:text-gray-400 rounded drop-shadow-sm px-6 py-4 mt-8"> 111 111 - <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div> 181 181 + <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-fit"> 112 182 <a href="/login" class="underline">login</a> to join the discussion 113 183 </div> 114 184 {{ end }}

+3 -3

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

··· 4 4 <div class="flex justify-between items-center"> 5 5 <p> 6 6 filtering 7 7 - <select class="border px-1 bg-white border-gray-200 dark:bg-gray-800 dark:border-gray-700" onchange="window.location.href = '/{{ .RepoInfo.FullName }}/issues?state=' + this.value"> 7 7 + <select class="border p-1 bg-white border-gray-200 dark:bg-gray-800 dark:border-gray-700" onchange="window.location.href = '/{{ .RepoInfo.FullName }}/issues?state=' + this.value"> 8 8 <option value="open" {{ if .FilteringByOpen }}selected{{ end }}>open ({{ .RepoInfo.Stats.IssueCount.Open }})</option> 9 9 <option value="closed" {{ if not .FilteringByOpen }}selected{{ end }}>closed ({{ .RepoInfo.Stats.IssueCount.Closed }})</option> 10 10 </select> ··· 13 13 <a 14 14 href="/{{ .RepoInfo.FullName }}/issues/new" 15 15 class="btn text-sm flex items-center gap-2 no-underline hover:no-underline"> 16 16 - {{ i "plus" "w-4 h-4" }} 17 17 - <span>new issue</span> 16 16 + {{ i "circle-plus" "w-4 h-4" }} 17 17 + <span>new</span> 18 18 </a> 19 19 </div> 20 20 <div class="error" id="issues"></div>

+1 -1

appview/pages/templates/repo/log.html

··· 83 83 <p 84 84 class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300" 85 85 > 86 86 - {{ nl2br (unwrapText (index $messageParts 1)) }} 86 86 + {{ nl2br (index $messageParts 1) }} 87 87 </p> 88 88 {{ end }} 89 89 </div>

+90

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

··· 1 1 + {{ define "repo/pulls/fragments/pullActions" }} 2 2 + {{ $lastIdx := sub (len .Pull.Submissions) 1 }} 3 3 + {{ $roundNumber := .RoundNumber }} 4 4 + 5 5 + {{ $isPushAllowed := .RepoInfo.Roles.IsPushAllowed }} 6 6 + {{ $isMerged := .Pull.State.IsMerged }} 7 7 + {{ $isClosed := .Pull.State.IsClosed }} 8 8 + {{ $isOpen := .Pull.State.IsOpen }} 9 9 + {{ $isConflicted := and .MergeCheck (or .MergeCheck.Error .MergeCheck.IsConflicted) }} 10 10 + {{ $isPullAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Pull.OwnerDid) }} 11 11 + {{ $isLastRound := eq $roundNumber $lastIdx }} 12 12 + {{ $isSameRepoBranch := .Pull.IsBranchBased }} 13 13 + {{ $isUpToDate := .ResubmitCheck.No }} 14 14 + <div class="relative w-fit"> 15 15 + <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2"> 16 16 + <button 17 17 + hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment" 18 18 + hx-target="#actions-{{$roundNumber}}" 19 19 + hx-swap="outerHtml" 20 20 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline"> 21 21 + {{ i "message-square-plus" "w-4 h-4" }} 22 22 + <span>comment</span> 23 23 + </button> 24 24 + {{ if and $isPushAllowed $isOpen $isLastRound }} 25 25 + {{ $disabled := "" }} 26 26 + {{ if $isConflicted }} 27 27 + {{ $disabled = "disabled" }} 28 28 + {{ end }} 29 29 + <button 30 30 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge" 31 31 + hx-swap="none" 32 32 + hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?" 33 33 + class="btn p-2 flex items-center gap-2" {{ $disabled }}> 34 34 + {{ i "git-merge" "w-4 h-4" }} 35 35 + <span>merge</span> 36 36 + </button> 37 37 + {{ end }} 38 38 + 39 39 + {{ if and $isPullAuthor $isOpen $isLastRound }} 40 40 + {{ $disabled := "" }} 41 41 + {{ if $isUpToDate }} 42 42 + {{ $disabled = "disabled" }} 43 43 + {{ end }} 44 44 + <button id="resubmitBtn" 45 45 + {{ if not .Pull.IsPatchBased }} 46 46 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 47 47 + {{ else }} 48 48 + hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 49 49 + hx-target="#actions-{{$roundNumber}}" 50 50 + hx-swap="outerHtml" 51 51 + {{ end }} 52 52 + 53 53 + hx-disabled-elt="#resubmitBtn" 54 54 + class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" {{ $disabled }} 55 55 + 56 56 + {{ if $disabled }} 57 57 + title="Update this branch to resubmit this pull request" 58 58 + {{ else }} 59 59 + title="Resubmit this pull request" 60 60 + {{ end }} 61 61 + > 62 62 + {{ i "rotate-ccw" "w-4 h-4" }} 63 63 + <span>resubmit</span> 64 64 + </button> 65 65 + {{ end }} 66 66 + 67 67 + {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }} 68 68 + <button 69 69 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close" 70 70 + hx-swap="none" 71 71 + class="btn p-2 flex items-center gap-2"> 72 72 + {{ i "ban" "w-4 h-4" }} 73 73 + <span>close</span> 74 74 + </button> 75 75 + {{ end }} 76 76 + 77 77 + {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }} 78 78 + <button 79 79 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen" 80 80 + hx-swap="none" 81 81 + class="btn p-2 flex items-center gap-2"> 82 82 + {{ i "refresh-ccw-dot" "w-4 h-4" }} 83 83 + <span>reopen</span> 84 84 + </button> 85 85 + {{ end }} 86 86 + </div> 87 87 + </div> 88 88 + {{ end }} 89 89 + 90 90 +

+20

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

··· 1 1 + {{ define "repo/pulls/fragments/pullCompareBranches" }} 2 2 + <div id="patch-upload"> 3 3 + <label for="targetBranch" class="dark:text-white" 4 4 + >select a branch</label 5 5 + > 6 6 + <div class="flex flex-wrap gap-2 items-center"> 7 7 + <select 8 8 + name="sourceBranch" 9 9 + class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 10 10 + > 11 11 + <option disabled selected>source branch</option> 12 12 + {{ range .Branches }} 13 13 + <option value="{{ .Reference.Name }}" class="py-1"> 14 14 + {{ .Reference.Name }} 15 15 + </option> 16 16 + {{ end }} 17 17 + </select> 18 18 + </div> 19 19 + </div> 20 20 + {{ end }}

+42

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

··· 1 1 + {{ define "repo/pulls/fragments/pullCompareForks" }} 2 2 + <div id="patch-upload"> 3 3 + <label for="forkSelect" class="dark:text-white" 4 4 + >select a fork to compare</label 5 5 + > 6 6 + <div class="flex flex-wrap gap-4 items-center mb-4"> 7 7 + <div class="flex flex-wrap gap-2 items-center"> 8 8 + <select 9 9 + id="forkSelect" 10 10 + name="fork" 11 11 + required 12 12 + class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 13 13 + hx-get="/{{ $.RepoInfo.FullName }}/pulls/new/fork-branches" 14 14 + hx-target="#branch-selection" 15 15 + hx-vals='{"fork": this.value}' 16 16 + hx-swap="innerHTML" 17 17 + onchange="document.getElementById('hiddenForkInput').value = this.value;" 18 18 + > 19 19 + <option disabled selected>select a fork</option> 20 20 + {{ range .Forks }} 21 21 + <option value="{{ .Name }}" class="py-1"> 22 22 + {{ .Name }} 23 23 + </option> 24 24 + {{ end }} 25 25 + </select> 26 26 + 27 27 + <input 28 28 + type="hidden" 29 29 + id="hiddenForkInput" 30 30 + name="fork" 31 31 + value="" 32 32 + /> 33 33 + </div> 34 34 + 35 35 + <div id="branch-selection"> 36 36 + <div class="text-sm text-gray-500 dark:text-gray-400"> 37 37 + Select a fork first to view available branches 38 38 + </div> 39 39 + </div> 40 40 + </div> 41 41 + </div> 42 42 + {{ end }}

+15

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

··· 1 1 + {{ define "repo/pulls/fragments/pullCompareForksBranches" }} 2 2 + <div class="flex flex-wrap gap-2 items-center"> 3 3 + <select 4 4 + name="sourceBranch" 5 5 + class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 6 6 + > 7 7 + <option disabled selected>source branch</option> 8 8 + {{ range .SourceBranches }} 9 9 + <option value="{{ .Reference.Name }}" class="py-1"> 10 10 + {{ .Reference.Name }} 11 11 + </option> 12 12 + {{ end }} 13 13 + </select> 14 14 + </div> 15 15 + {{ end }}

+32

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

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

+14

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

··· 1 1 + {{ define "repo/pulls/fragments/pullPatchUpload" }} 2 2 + <div id="patch-upload"> 3 3 + <textarea 4 4 + name="patch" 5 5 + id="patch" 6 6 + rows="12" 7 7 + class="w-full resize-y font-mono dark:bg-gray-700 dark:text-white dark:border-gray-600" 8 8 + placeholder="diff --git a/file.txt b/file.txt 9 9 + index 1234567..abcdefg 100644 10 10 + --- a/file.txt 11 11 + +++ b/file.txt" 12 12 + ></textarea> 13 13 + </div> 14 14 + {{ end }}

+52

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

··· 1 1 + {{ define "repo/pulls/fragments/pullResubmit" }} 2 2 + <div 3 3 + id="resubmit-pull-card" 4 4 + class="rounded relative border bg-amber-50 dark:bg-amber-900 border-amber-200 dark:border-amber-500 px-6 py-2"> 5 5 + 6 6 + <div class="flex items-center gap-2 text-amber-500 dark:text-amber-50"> 7 7 + {{ i "pencil" "w-4 h-4" }} 8 8 + <span class="font-medium">resubmit your patch</span> 9 9 + </div> 10 10 + 11 11 + <div class="mt-2 text-sm text-gray-700 dark:text-gray-200"> 12 12 + You can update this patch to address any reviews. 13 13 + This will begin a new round of reviews, 14 14 + but you'll still be able to view your previous submissions and feedback. 15 15 + </div> 16 16 + 17 17 + <div class="mt-4 flex flex-col"> 18 18 + <form 19 19 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 20 20 + hx-swap="none" 21 21 + class="w-full flex flex-wrap gap-2"> 22 22 + <textarea 23 23 + name="patch" 24 24 + class="w-full p-2 mb-2" 25 25 + placeholder="Paste your updated patch here." 26 26 + rows="15" 27 27 + >{{.Pull.LatestPatch}}</textarea> 28 28 + <button 29 29 + type="submit" 30 30 + class="btn flex items-center gap-2" 31 31 + {{ if or .Pull.State.IsClosed }} 32 32 + disabled 33 33 + {{ end }}> 34 34 + {{ i "rotate-ccw" "w-4 h-4" }} 35 35 + <span>resubmit</span> 36 36 + </button> 37 37 + <button 38 38 + type="button" 39 39 + class="btn flex items-center gap-2" 40 40 + hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Pull.LastRoundNumber }}/actions" 41 41 + hx-swap="outerHTML" 42 42 + hx-target="#resubmit-pull-card"> 43 43 + {{ i "x" "w-4 h-4" }} 44 44 + <span>cancel</span> 45 45 + </button> 46 46 + </form> 47 47 + 48 48 + <div id="resubmit-error" class="error"></div> 49 49 + <div id="resubmit-success" class="success"></div> 50 50 + </div> 51 51 + </div> 52 52 + {{ end }}

+1 -1

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

··· 84 84 </nav> 85 85 86 86 <section id="patch-strategy"> 87 87 - {{ template "fragments/pullPatchUpload" . }} 87 87 + {{ template "repo/pulls/fragments/pullPatchUpload" . }} 88 88 </section> 89 89 90 90 <div class="flex justify-start items-center gap-2 mt-4">

+1 -14

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

··· 69 69 {{ end }} 70 70 </section> 71 71 72 72 - <div id="diff-stat"> 73 73 - <br> 74 74 - <strong class="text-sm uppercase mb-4">Changed files</strong> 75 75 - {{ range .Diff.Diff }} 76 76 - <ul> 77 77 - {{ if .IsDelete }} 78 78 - <li><a href="#file-{{ .Name.Old }}">{{ .Name.Old }}</a></li> 79 79 - {{ else }} 80 80 - <li><a href="#file-{{ .Name.New }}">{{ .Name.New }}</a></li> 81 81 - {{ end }} 82 82 - </ul> 83 83 - {{ end }} 84 84 - </div> 85 72 </div> 86 73 87 74 <section> 88 88 - {{ template "fragments/diff" (list .RepoInfo.FullName .Diff) }} 75 75 + {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff) }} 89 76 </section> 90 77 {{ end }}

+7 -7

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

··· 21 21 {{ $icon = "git-merge" }} 22 22 {{ end }} 23 23 24 24 - <section> 24 24 + <section class="mt-2"> 25 25 <div class="flex items-center gap-2"> 26 26 <div 27 27 id="state" ··· 45 45 <a href="/{{ .RepoInfo.FullName }}/tree/{{ .Pull.TargetBranch }}" class="no-underline hover:underline">{{ .Pull.TargetBranch }}</a> 46 46 </span> 47 47 </span> 48 48 - {{ if not .Pull.IsPatch }} 48 48 + {{ if not .Pull.IsPatchBased }} 49 49 <span>from 50 50 - {{ if not .Pull.IsSameRepoBranch }} 50 50 + {{ if not .Pull.IsBranchBased }} 51 51 <a href="/{{ $owner }}/{{ .PullSourceRepo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSourceRepo.Name }}</a> 52 52 {{ end }} 53 53 54 54 {{ $fullRepo := .RepoInfo.FullName }} 55 55 - {{ if not .Pull.IsSameRepoBranch }} 55 55 + {{ if not .Pull.IsBranchBased }} 56 56 {{ $fullRepo = printf "%s/%s" $owner .PullSourceRepo.Name }} 57 57 {{ end }} 58 58 <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center"> ··· 64 64 </div> 65 65 66 66 {{ if .Pull.Body }} 67 67 - <article id="body" class="mt-2 prose dark:prose-invert"> 67 67 + <article id="body" class="mt-8 prose dark:prose-invert"> 68 68 {{ .Pull.Body | markdown }} 69 69 </article> 70 70 {{ end }} ··· 147 147 {{ end }} 148 148 149 149 {{ if $.LoggedInUser }} 150 150 - {{ template "fragments/pullActions" (dict "LoggedInUser" $.LoggedInUser "Pull" $.Pull "RepoInfo" $.RepoInfo "RoundNumber" .RoundNumber "MergeCheck" $.MergeCheck "ResubmitCheck" $.ResubmitCheck) }} 150 150 + {{ template "repo/pulls/fragments/pullActions" (dict "LoggedInUser" $.LoggedInUser "Pull" $.Pull "RepoInfo" $.RepoInfo "RoundNumber" .RoundNumber "MergeCheck" $.MergeCheck "ResubmitCheck" $.ResubmitCheck) }} 151 151 {{ else }} 152 152 <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm px-6 py-4 w-fit dark:text-white"> 153 153 <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> ··· 156 156 {{ end }} 157 157 </div> 158 158 </details> 159 159 - <hr class="md:hidden"/> 159 159 + <hr class="md:hidden border-t border-gray-300 dark:border-gray-600"/> 160 160 {{ end }} 161 161 {{ end }} 162 162 {{ end }}

+10 -6

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

··· 5 5 <p class="dark:text-white"> 6 6 filtering 7 7 <select 8 8 - class="border px-1 bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-600 dark:text-white" 8 8 + class="border p-1 bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-600 dark:text-white" 9 9 onchange="window.location.href = '/{{ .RepoInfo.FullName }}/pulls?state=' + this.value" 10 10 > 11 11 <option value="open" {{ if .FilteringBy.IsOpen }}selected{{ end }}> ··· 22 22 </p> 23 23 <a 24 24 href="/{{ .RepoInfo.FullName }}/pulls/new" 25 25 - class="btn text-sm flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:bg-gray-700 dark:hover:bg-gray-600" 25 25 + class="btn text-sm flex items-center gap-2 no-underline hover:no-underline" 26 26 > 27 27 - {{ i "git-pull-request" "w-4 h-4" }} 28 28 - <span>new pull request</span> 27 27 + {{ i "git-pull-request-create" "w-4 h-4" }} 28 28 + <span>new</span> 29 29 </a> 30 30 </div> 31 31 <div class="error" id="pulls"></div> ··· 78 78 {{ .TargetBranch }} 79 79 </span> 80 80 </span> 81 81 - {{ if not .IsPatch }} 81 81 + {{ if not .IsPatchBased }} 82 82 <span>from 83 83 - {{ if not .IsSameRepoBranch }} 83 83 + {{ if .IsForkBased }} 84 84 + {{ if .PullSource.Repo }} 84 85 <a href="/{{ $owner }}/{{ .PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSource.Repo.Name }}</a> 86 86 + {{ else }} 87 87 + <span class="italic">[deleted fork]</span> 88 88 + {{ end }} 85 89 {{ end }} 86 90 87 91 <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

+4 -3

appview/pages/templates/repo/tree.html

··· 28 28 {{ $stats := .TreeStats }} 29 29 30 30 <span>at <a href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref }}">{{ $.Ref }}</a></span> 31 31 - <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 32 31 {{ if eq $stats.NumFolders 1 }} 33 33 - <span>{{ $stats.NumFolders }} folder</span> 34 32 <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 33 33 + <span>{{ $stats.NumFolders }} folder</span> 35 34 {{ else if gt $stats.NumFolders 1 }} 35 35 + <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 36 36 <span>{{ $stats.NumFolders }} folders</span> 37 37 - <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 38 37 {{ end }} 39 38 40 39 {{ if eq $stats.NumFiles 1 }} 40 40 + <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 41 41 <span>{{ $stats.NumFiles }} file</span> 42 42 {{ else if gt $stats.NumFiles 1 }} 43 43 + <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span> 43 44 <span>{{ $stats.NumFiles }} files</span> 44 45 {{ end }} 45 46

+17

appview/pages/templates/user/fragments/follow.html

··· 1 1 + {{ define "user/fragments/follow" }} 2 2 + <button id="followBtn" 3 3 + class="btn mt-2 w-full" 4 4 + 5 5 + {{ if eq .FollowStatus.String "IsNotFollowing" }} 6 6 + hx-post="/follow?subject={{.UserDid}}" 7 7 + {{ else }} 8 8 + hx-delete="/follow?subject={{.UserDid}}" 9 9 + {{ end }} 10 10 + 11 11 + hx-trigger="click" 12 12 + hx-target="#followBtn" 13 13 + hx-swap="outerHTML" 14 14 + > 15 15 + {{ if eq .FollowStatus.String "IsNotFollowing" }}Follow{{ else }}Unfollow{{ end }} 16 16 + </button> 17 17 + {{ end }}

+1 -1

appview/pages/templates/user/profile.html

··· 247 247 </div> 248 248 249 249 {{ if ne .FollowStatus.String "IsSelf" }} 250 250 - {{ template "fragments/follow" . }} 250 250 + {{ template "user/fragments/follow" . }} 251 251 {{ end }} 252 252 </div> 253 253 {{ end }}

+347 -194

appview/state/pull.go

··· 369 369 pullSourceRepo, err = db.GetRepoByAtUri(s.db, p.PullSource.RepoAt.String()) 370 370 if err != nil { 371 371 log.Printf("failed to get repo by at uri: %v", err) 372 372 - return 372 372 + continue 373 373 + } else { 374 374 + p.PullSource.Repo = pullSourceRepo 373 375 } 374 376 } 375 375 - p.PullSource.Repo = pullSourceRepo 376 377 } 377 378 } 378 379 ··· 634 635 return 635 636 } 636 637 637 637 - resp, err := ksClient.Compare(f.OwnerDid(), f.RepoName, targetBranch, sourceBranch) 638 638 - switch resp.StatusCode { 639 639 - case 404: 640 640 - case 400: 641 641 - s.pages.Notice(w, "pull", "Branch based pull requests are not supported on this knot.") 642 642 - return 643 643 - } 644 644 - 645 645 - respBody, err := io.ReadAll(resp.Body) 638 638 + diffTreeResponse, err := ksClient.Compare(f.OwnerDid(), f.RepoName, targetBranch, sourceBranch) 646 639 if err != nil { 647 647 - log.Println("failed to compare across branches") 648 648 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 649 649 - return 650 650 - } 651 651 - defer resp.Body.Close() 652 652 - 653 653 - var diffTreeResponse types.RepoDiffTreeResponse 654 654 - err = json.Unmarshal(respBody, &diffTreeResponse) 655 655 - if err != nil { 656 656 - log.Println("failed to unmarshal diff tree response", err) 657 657 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 640 640 + log.Println("failed to compare", err) 641 641 + s.pages.Notice(w, "pull", err.Error()) 658 642 return 659 643 } 660 644 ··· 730 714 // hiddenRef: hidden/feature-1/main (on repo-fork) 731 715 // targetBranch: main (on repo-1) 732 716 // sourceBranch: feature-1 (on repo-fork) 733 733 - diffResp, err := us.Compare(user.Did, fork.Name, hiddenRef, sourceBranch) 717 717 + diffTreeResponse, err := us.Compare(user.Did, fork.Name, hiddenRef, sourceBranch) 734 718 if err != nil { 735 719 log.Println("failed to compare across branches", err) 736 736 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 737 737 - return 738 738 - } 739 739 - 740 740 - respBody, err := io.ReadAll(diffResp.Body) 741 741 - if err != nil { 742 742 - log.Println("failed to read response body", err) 743 743 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 744 744 - return 745 745 - } 746 746 - 747 747 - defer resp.Body.Close() 748 748 - 749 749 - var diffTreeResponse types.RepoDiffTreeResponse 750 750 - err = json.Unmarshal(respBody, &diffTreeResponse) 751 751 - if err != nil { 752 752 - log.Println("failed to unmarshal diff tree response", err) 753 753 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 720 720 + s.pages.Notice(w, "pull", err.Error()) 754 721 return 755 722 } 756 723 ··· 1015 982 }) 1016 983 return 1017 984 case http.MethodPost: 1018 1018 - patch := r.FormValue("patch") 1019 1019 - var sourceRev string 1020 1020 - var recordPullSource *tangled.RepoPull_Source 985 985 + if pull.IsPatchBased() { 986 986 + s.resubmitPatch(w, r) 987 987 + return 988 988 + } else if pull.IsBranchBased() { 989 989 + s.resubmitBranch(w, r) 990 990 + return 991 991 + } else if pull.IsForkBased() { 992 992 + s.resubmitFork(w, r) 993 993 + return 994 994 + } 995 995 + } 996 996 + } 997 997 + 998 998 + func (s *State) resubmitPatch(w http.ResponseWriter, r *http.Request) { 999 999 + user := s.auth.GetUser(r) 1021 1000 1022 1022 - var ownerDid, repoName, knotName string 1023 1023 - var isSameRepo bool = pull.IsSameRepoBranch() 1024 1024 - sourceBranch := pull.PullSource.Branch 1025 1025 - targetBranch := pull.TargetBranch 1026 1026 - recordPullSource = &tangled.RepoPull_Source{ 1027 1027 - Branch: sourceBranch, 1028 1028 - } 1001 1001 + pull, ok := r.Context().Value("pull").(*db.Pull) 1002 1002 + if !ok { 1003 1003 + log.Println("failed to get pull") 1004 1004 + s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.") 1005 1005 + return 1006 1006 + } 1007 1007 + 1008 1008 + f, err := fullyResolvedRepo(r) 1009 1009 + if err != nil { 1010 1010 + log.Println("failed to get repo and knot", err) 1011 1011 + return 1012 1012 + } 1013 1013 + 1014 1014 + if user.Did != pull.OwnerDid { 1015 1015 + log.Println("unauthorized user") 1016 1016 + w.WriteHeader(http.StatusUnauthorized) 1017 1017 + return 1018 1018 + } 1019 1019 + 1020 1020 + patch := r.FormValue("patch") 1021 1021 + 1022 1022 + if err = validateResubmittedPatch(pull, patch); err != nil { 1023 1023 + s.pages.Notice(w, "resubmit-error", err.Error()) 1024 1024 + } 1025 1025 + 1026 1026 + tx, err := s.db.BeginTx(r.Context(), nil) 1027 1027 + if err != nil { 1028 1028 + log.Println("failed to start tx") 1029 1029 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1030 1030 + return 1031 1031 + } 1032 1032 + defer tx.Rollback() 1033 1033 + 1034 1034 + err = db.ResubmitPull(tx, pull, patch, "") 1035 1035 + if err != nil { 1036 1036 + log.Println("failed to resubmit pull request", err) 1037 1037 + s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull request. Try again later.") 1038 1038 + return 1039 1039 + } 1040 1040 + client, _ := s.auth.AuthorizedClient(r) 1041 1041 + 1042 1042 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey) 1043 1043 + if err != nil { 1044 1044 + // failed to get record 1045 1045 + s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.") 1046 1046 + return 1047 1047 + } 1048 1048 + 1049 1049 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1050 1050 + Collection: tangled.RepoPullNSID, 1051 1051 + Repo: user.Did, 1052 1052 + Rkey: pull.Rkey, 1053 1053 + SwapRecord: ex.Cid, 1054 1054 + Record: &lexutil.LexiconTypeDecoder{ 1055 1055 + Val: &tangled.RepoPull{ 1056 1056 + Title: pull.Title, 1057 1057 + PullId: int64(pull.PullId), 1058 1058 + TargetRepo: string(f.RepoAt), 1059 1059 + TargetBranch: pull.TargetBranch, 1060 1060 + Patch: patch, // new patch 1061 1061 + }, 1062 1062 + }, 1063 1063 + }) 1064 1064 + if err != nil { 1065 1065 + log.Println("failed to update record", err) 1066 1066 + s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") 1067 1067 + return 1068 1068 + } 1029 1069 1030 1030 - isPushAllowed := f.RepoInfo(s, user).Roles.IsPushAllowed() 1031 1031 - if isSameRepo && isPushAllowed { 1032 1032 - ownerDid = f.OwnerDid() 1033 1033 - repoName = f.RepoName 1034 1034 - knotName = f.Knot 1035 1035 - } else if !isSameRepo { 1036 1036 - sourceRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String()) 1037 1037 - if err != nil { 1038 1038 - log.Println("failed to get source repo", err) 1039 1039 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1040 1040 - return 1041 1041 - } 1042 1042 - ownerDid = sourceRepo.Did 1043 1043 - repoName = sourceRepo.Name 1044 1044 - knotName = sourceRepo.Knot 1045 1045 - } 1070 1070 + if err = tx.Commit(); err != nil { 1071 1071 + log.Println("failed to commit transaction", err) 1072 1072 + s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.") 1073 1073 + return 1074 1074 + } 1046 1075 1047 1047 - if sourceBranch != "" && knotName != "" { 1048 1048 - // extract patch by performing compare 1049 1049 - ksClient, err := NewUnsignedClient(knotName, s.config.Dev) 1050 1050 - if err != nil { 1051 1051 - log.Printf("failed to create client for %s: %s", knotName, err) 1052 1052 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1053 1053 - return 1054 1054 - } 1076 1076 + s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId)) 1077 1077 + return 1078 1078 + } 1055 1079 1056 1056 - if !isSameRepo { 1057 1057 - secret, err := db.GetRegistrationKey(s.db, knotName) 1058 1058 - if err != nil { 1059 1059 - log.Printf("failed to get registration key for %s: %s", knotName, err) 1060 1060 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1061 1061 - return 1062 1062 - } 1063 1063 - // update the hidden tracking branch to latest 1064 1064 - signedClient, err := NewSignedClient(knotName, secret, s.config.Dev) 1065 1065 - if err != nil { 1066 1066 - log.Printf("failed to create signed client for %s: %s", knotName, err) 1067 1067 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1068 1068 - return 1069 1069 - } 1070 1070 - resp, err := signedClient.NewHiddenRef(ownerDid, repoName, sourceBranch, targetBranch) 1071 1071 - if err != nil || resp.StatusCode != http.StatusNoContent { 1072 1072 - log.Printf("failed to update tracking branch: %s", err) 1073 1073 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1074 1074 - return 1075 1075 - } 1076 1076 - } 1080 1080 + func (s *State) resubmitBranch(w http.ResponseWriter, r *http.Request) { 1081 1081 + user := s.auth.GetUser(r) 1077 1082 1078 1078 - var compareResp *http.Response 1079 1079 - if !isSameRepo { 1080 1080 - hiddenRef := url.QueryEscape(fmt.Sprintf("hidden/%s/%s", sourceBranch, targetBranch)) 1081 1081 - compareResp, err = ksClient.Compare(ownerDid, repoName, hiddenRef, sourceBranch) 1082 1082 - } else { 1083 1083 - compareResp, err = ksClient.Compare(ownerDid, repoName, targetBranch, sourceBranch) 1084 1084 - } 1085 1085 - if err != nil { 1086 1086 - log.Printf("failed to compare branches: %s", err) 1087 1087 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1088 1088 - return 1089 1089 - } 1090 1090 - defer compareResp.Body.Close() 1083 1083 + pull, ok := r.Context().Value("pull").(*db.Pull) 1084 1084 + if !ok { 1085 1085 + log.Println("failed to get pull") 1086 1086 + s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.") 1087 1087 + return 1088 1088 + } 1091 1089 1092 1092 - switch compareResp.StatusCode { 1093 1093 - case 404: 1094 1094 - case 400: 1095 1095 - s.pages.Notice(w, "pull", "Branch based pull requests are not supported on this knot.") 1096 1096 - return 1097 1097 - } 1090 1090 + f, err := fullyResolvedRepo(r) 1091 1091 + if err != nil { 1092 1092 + log.Println("failed to get repo and knot", err) 1093 1093 + return 1094 1094 + } 1098 1095 1099 1099 - respBody, err := io.ReadAll(compareResp.Body) 1100 1100 - if err != nil { 1101 1101 - log.Println("failed to compare across branches") 1102 1102 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1103 1103 - return 1104 1104 - } 1105 1105 - defer compareResp.Body.Close() 1096 1096 + if user.Did != pull.OwnerDid { 1097 1097 + log.Println("unauthorized user") 1098 1098 + w.WriteHeader(http.StatusUnauthorized) 1099 1099 + return 1100 1100 + } 1106 1101 1107 1107 - var diffTreeResponse types.RepoDiffTreeResponse 1108 1108 - err = json.Unmarshal(respBody, &diffTreeResponse) 1109 1109 - if err != nil { 1110 1110 - log.Println("failed to unmarshal diff tree response", err) 1111 1111 - s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1112 1112 - return 1113 1113 - } 1102 1102 + if !f.RepoInfo(s, user).Roles.IsPushAllowed() { 1103 1103 + log.Println("unauthorized user") 1104 1104 + w.WriteHeader(http.StatusUnauthorized) 1105 1105 + return 1106 1106 + } 1114 1107 1115 1115 - sourceRev = diffTreeResponse.DiffTree.Rev2 1116 1116 - patch = diffTreeResponse.DiffTree.Patch 1117 1117 - } 1108 1108 + ksClient, err := NewUnsignedClient(f.Knot, s.config.Dev) 1109 1109 + if err != nil { 1110 1110 + log.Printf("failed to create client for %s: %s", f.Knot, err) 1111 1111 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1112 1112 + return 1113 1113 + } 1118 1114 1119 1119 - if patch == "" { 1120 1120 - s.pages.Notice(w, "resubmit-error", "Patch is empty.") 1121 1121 - return 1122 1122 - } 1115 1115 + diffTreeResponse, err := ksClient.Compare(f.OwnerDid(), f.RepoName, pull.TargetBranch, pull.PullSource.Branch) 1116 1116 + if err != nil { 1117 1117 + log.Printf("compare request failed: %s", err) 1118 1118 + s.pages.Notice(w, "resubmit-error", err.Error()) 1119 1119 + return 1120 1120 + } 1123 1121 1124 1124 - if patch == pull.LatestPatch() { 1125 1125 - s.pages.Notice(w, "resubmit-error", "Patch is identical to previous submission.") 1126 1126 - return 1127 1127 - } 1122 1122 + sourceRev := diffTreeResponse.DiffTree.Rev2 1123 1123 + patch := diffTreeResponse.DiffTree.Patch 1128 1124 1129 1129 - if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev { 1130 1130 - s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.") 1131 1131 - return 1132 1132 - } 1125 1125 + if err = validateResubmittedPatch(pull, patch); err != nil { 1126 1126 + s.pages.Notice(w, "resubmit-error", err.Error()) 1127 1127 + } 1133 1128 1134 1134 - if !isPatchValid(patch) { 1135 1135 - s.pages.Notice(w, "resubmit-error", "Invalid patch format. Please provide a valid diff.") 1136 1136 - return 1137 1137 - } 1129 1129 + if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev { 1130 1130 + s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.") 1131 1131 + return 1132 1132 + } 1138 1133 1139 1139 - tx, err := s.db.BeginTx(r.Context(), nil) 1140 1140 - if err != nil { 1141 1141 - log.Println("failed to start tx") 1142 1142 - s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1143 1143 - return 1144 1144 - } 1145 1145 - defer tx.Rollback() 1134 1134 + tx, err := s.db.BeginTx(r.Context(), nil) 1135 1135 + if err != nil { 1136 1136 + log.Println("failed to start tx") 1137 1137 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1138 1138 + return 1139 1139 + } 1140 1140 + defer tx.Rollback() 1146 1141 1147 1147 - err = db.ResubmitPull(tx, pull, patch, sourceRev) 1148 1148 - if err != nil { 1149 1149 - log.Println("failed to create pull request", err) 1150 1150 - s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1151 1151 - return 1152 1152 - } 1153 1153 - client, _ := s.auth.AuthorizedClient(r) 1142 1142 + err = db.ResubmitPull(tx, pull, patch, sourceRev) 1143 1143 + if err != nil { 1144 1144 + log.Println("failed to create pull request", err) 1145 1145 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1146 1146 + return 1147 1147 + } 1148 1148 + client, _ := s.auth.AuthorizedClient(r) 1154 1149 1155 1155 - ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey) 1156 1156 - if err != nil { 1157 1157 - // failed to get record 1158 1158 - s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.") 1159 1159 - return 1160 1160 - } 1150 1150 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey) 1151 1151 + if err != nil { 1152 1152 + // failed to get record 1153 1153 + s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.") 1154 1154 + return 1155 1155 + } 1161 1156 1162 1162 - _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1163 1163 - Collection: tangled.RepoPullNSID, 1164 1164 - Repo: user.Did, 1165 1165 - Rkey: pull.Rkey, 1166 1166 - SwapRecord: ex.Cid, 1167 1167 - Record: &lexutil.LexiconTypeDecoder{ 1168 1168 - Val: &tangled.RepoPull{ 1169 1169 - Title: pull.Title, 1170 1170 - PullId: int64(pull.PullId), 1171 1171 - TargetRepo: string(f.RepoAt), 1172 1172 - TargetBranch: pull.TargetBranch, 1173 1173 - Patch: patch, // new patch 1174 1174 - Source: recordPullSource, 1175 1175 - }, 1157 1157 + recordPullSource := &tangled.RepoPull_Source{ 1158 1158 + Branch: pull.PullSource.Branch, 1159 1159 + } 1160 1160 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1161 1161 + Collection: tangled.RepoPullNSID, 1162 1162 + Repo: user.Did, 1163 1163 + Rkey: pull.Rkey, 1164 1164 + SwapRecord: ex.Cid, 1165 1165 + Record: &lexutil.LexiconTypeDecoder{ 1166 1166 + Val: &tangled.RepoPull{ 1167 1167 + Title: pull.Title, 1168 1168 + PullId: int64(pull.PullId), 1169 1169 + TargetRepo: string(f.RepoAt), 1170 1170 + TargetBranch: pull.TargetBranch, 1171 1171 + Patch: patch, // new patch 1172 1172 + Source: recordPullSource, 1176 1173 }, 1177 1177 - }) 1178 1178 - if err != nil { 1179 1179 - log.Println("failed to update record", err) 1180 1180 - s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") 1181 1181 - return 1182 1182 - } 1174 1174 + }, 1175 1175 + }) 1176 1176 + if err != nil { 1177 1177 + log.Println("failed to update record", err) 1178 1178 + s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") 1179 1179 + return 1180 1180 + } 1181 1181 + 1182 1182 + if err = tx.Commit(); err != nil { 1183 1183 + log.Println("failed to commit transaction", err) 1184 1184 + s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.") 1185 1185 + return 1186 1186 + } 1187 1187 + 1188 1188 + s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId)) 1189 1189 + return 1190 1190 + } 1191 1191 + 1192 1192 + func (s *State) resubmitFork(w http.ResponseWriter, r *http.Request) { 1193 1193 + user := s.auth.GetUser(r) 1183 1194 1184 1184 - if err = tx.Commit(); err != nil { 1185 1185 - log.Println("failed to commit transaction", err) 1186 1186 - s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.") 1187 1187 - return 1188 1188 - } 1195 1195 + pull, ok := r.Context().Value("pull").(*db.Pull) 1196 1196 + if !ok { 1197 1197 + log.Println("failed to get pull") 1198 1198 + s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.") 1199 1199 + return 1200 1200 + } 1189 1201 1190 1190 - s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId)) 1202 1202 + f, err := fullyResolvedRepo(r) 1203 1203 + if err != nil { 1204 1204 + log.Println("failed to get repo and knot", err) 1191 1205 return 1192 1206 } 1207 1207 + 1208 1208 + if user.Did != pull.OwnerDid { 1209 1209 + log.Println("unauthorized user") 1210 1210 + w.WriteHeader(http.StatusUnauthorized) 1211 1211 + return 1212 1212 + } 1213 1213 + 1214 1214 + forkRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String()) 1215 1215 + if err != nil { 1216 1216 + log.Println("failed to get source repo", err) 1217 1217 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1218 1218 + return 1219 1219 + } 1220 1220 + 1221 1221 + // extract patch by performing compare 1222 1222 + ksClient, err := NewUnsignedClient(forkRepo.Knot, s.config.Dev) 1223 1223 + if err != nil { 1224 1224 + log.Printf("failed to create client for %s: %s", forkRepo.Knot, err) 1225 1225 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1226 1226 + return 1227 1227 + } 1228 1228 + 1229 1229 + secret, err := db.GetRegistrationKey(s.db, forkRepo.Knot) 1230 1230 + if err != nil { 1231 1231 + log.Printf("failed to get registration key for %s: %s", forkRepo.Knot, err) 1232 1232 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1233 1233 + return 1234 1234 + } 1235 1235 + 1236 1236 + // update the hidden tracking branch to latest 1237 1237 + signedClient, err := NewSignedClient(forkRepo.Knot, secret, s.config.Dev) 1238 1238 + if err != nil { 1239 1239 + log.Printf("failed to create signed client for %s: %s", forkRepo.Knot, err) 1240 1240 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1241 1241 + return 1242 1242 + } 1243 1243 + 1244 1244 + resp, err := signedClient.NewHiddenRef(forkRepo.Did, forkRepo.Name, pull.PullSource.Branch, pull.TargetBranch) 1245 1245 + if err != nil || resp.StatusCode != http.StatusNoContent { 1246 1246 + log.Printf("failed to update tracking branch: %s", err) 1247 1247 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1248 1248 + return 1249 1249 + } 1250 1250 + 1251 1251 + hiddenRef := url.QueryEscape(fmt.Sprintf("hidden/%s/%s", pull.PullSource.Branch, pull.TargetBranch)) 1252 1252 + diffTreeResponse, err := ksClient.Compare(forkRepo.Did, forkRepo.Name, hiddenRef, pull.PullSource.Branch) 1253 1253 + if err != nil { 1254 1254 + log.Printf("failed to compare branches: %s", err) 1255 1255 + s.pages.Notice(w, "resubmit-error", err.Error()) 1256 1256 + return 1257 1257 + } 1258 1258 + 1259 1259 + sourceRev := diffTreeResponse.DiffTree.Rev2 1260 1260 + patch := diffTreeResponse.DiffTree.Patch 1261 1261 + 1262 1262 + if err = validateResubmittedPatch(pull, patch); err != nil { 1263 1263 + s.pages.Notice(w, "resubmit-error", err.Error()) 1264 1264 + } 1265 1265 + 1266 1266 + if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev { 1267 1267 + s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.") 1268 1268 + return 1269 1269 + } 1270 1270 + 1271 1271 + tx, err := s.db.BeginTx(r.Context(), nil) 1272 1272 + if err != nil { 1273 1273 + log.Println("failed to start tx") 1274 1274 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1275 1275 + return 1276 1276 + } 1277 1277 + defer tx.Rollback() 1278 1278 + 1279 1279 + err = db.ResubmitPull(tx, pull, patch, sourceRev) 1280 1280 + if err != nil { 1281 1281 + log.Println("failed to create pull request", err) 1282 1282 + s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.") 1283 1283 + return 1284 1284 + } 1285 1285 + client, _ := s.auth.AuthorizedClient(r) 1286 1286 + 1287 1287 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey) 1288 1288 + if err != nil { 1289 1289 + // failed to get record 1290 1290 + s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.") 1291 1291 + return 1292 1292 + } 1293 1293 + 1294 1294 + repoAt := pull.PullSource.RepoAt.String() 1295 1295 + recordPullSource := &tangled.RepoPull_Source{ 1296 1296 + Branch: pull.PullSource.Branch, 1297 1297 + Repo: &repoAt, 1298 1298 + } 1299 1299 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1300 1300 + Collection: tangled.RepoPullNSID, 1301 1301 + Repo: user.Did, 1302 1302 + Rkey: pull.Rkey, 1303 1303 + SwapRecord: ex.Cid, 1304 1304 + Record: &lexutil.LexiconTypeDecoder{ 1305 1305 + Val: &tangled.RepoPull{ 1306 1306 + Title: pull.Title, 1307 1307 + PullId: int64(pull.PullId), 1308 1308 + TargetRepo: string(f.RepoAt), 1309 1309 + TargetBranch: pull.TargetBranch, 1310 1310 + Patch: patch, // new patch 1311 1311 + Source: recordPullSource, 1312 1312 + }, 1313 1313 + }, 1314 1314 + }) 1315 1315 + if err != nil { 1316 1316 + log.Println("failed to update record", err) 1317 1317 + s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.") 1318 1318 + return 1319 1319 + } 1320 1320 + 1321 1321 + if err = tx.Commit(); err != nil { 1322 1322 + log.Println("failed to commit transaction", err) 1323 1323 + s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.") 1324 1324 + return 1325 1325 + } 1326 1326 + 1327 1327 + s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId)) 1328 1328 + return 1329 1329 + } 1330 1330 + 1331 1331 + // validate a resubmission against a pull request 1332 1332 + func validateResubmittedPatch(pull *db.Pull, patch string) error { 1333 1333 + if patch == "" { 1334 1334 + return fmt.Errorf("Patch is empty.") 1335 1335 + } 1336 1336 + 1337 1337 + if patch == pull.LatestPatch() { 1338 1338 + return fmt.Errorf("Patch is identical to previous submission.") 1339 1339 + } 1340 1340 + 1341 1341 + if !isPatchValid(patch) { 1342 1342 + return fmt.Errorf("Invalid patch format. Please provide a valid diff.") 1343 1343 + } 1344 1344 + 1345 1345 + return nil 1193 1346 } 1194 1347 1195 1348 func (s *State) MergePull(w http.ResponseWriter, r *http.Request) {

+7

appview/state/repo.go

··· 21 21 "github.com/bluesky-social/indigo/atproto/syntax" 22 22 securejoin "github.com/cyphar/filepath-securejoin" 23 23 "github.com/go-chi/chi/v5" 24 24 + "github.com/go-git/go-git/v5/plumbing" 24 25 "tangled.sh/tangled.sh/core/api/tangled" 25 26 "tangled.sh/tangled.sh/core/appview/auth" 26 27 "tangled.sh/tangled.sh/core/appview/db" ··· 248 249 if !s.config.Dev { 249 250 protocol = "https" 250 251 } 252 252 + 253 253 + if !plumbing.IsHash(ref) { 254 254 + s.pages.Error404(w) 255 255 + return 256 256 + } 257 257 + 251 258 resp, err := http.Get(fmt.Sprintf("%s://%s/%s/%s/commit/%s", protocol, f.Knot, f.OwnerDid(), f.RepoName, ref)) 252 259 if err != nil { 253 260 log.Println("failed to reach knotserver", err)

+31 -3

appview/state/signer.go

··· 7 7 "encoding/hex" 8 8 "encoding/json" 9 9 "fmt" 10 10 + "io" 11 11 + "log" 10 12 "net/http" 11 13 "net/url" 12 14 "time" ··· 376 378 return &capabilities, nil 377 379 } 378 380 379 379 - func (us *UnsignedClient) Compare(ownerDid, repoName, rev1, rev2 string) (*http.Response, error) { 381 381 + func (us *UnsignedClient) Compare(ownerDid, repoName, rev1, rev2 string) (*types.RepoDiffTreeResponse, error) { 380 382 const ( 381 383 Method = "GET" 382 384 ) ··· 385 387 386 388 req, err := us.newRequest(Method, endpoint, nil) 387 389 if err != nil { 388 388 - return nil, err 390 390 + return nil, fmt.Errorf("Failed to create request.") 389 391 } 390 392 391 391 - return us.client.Do(req) 393 393 + compareResp, err := us.client.Do(req) 394 394 + if err != nil { 395 395 + return nil, fmt.Errorf("Failed to create request.") 396 396 + } 397 397 + defer compareResp.Body.Close() 398 398 + 399 399 + switch compareResp.StatusCode { 400 400 + case 404: 401 401 + case 400: 402 402 + return nil, fmt.Errorf("Branch comparisons not supported on this knot.") 403 403 + } 404 404 + 405 405 + respBody, err := io.ReadAll(compareResp.Body) 406 406 + if err != nil { 407 407 + log.Println("failed to compare across branches") 408 408 + return nil, fmt.Errorf("Failed to compare branches.") 409 409 + } 410 410 + defer compareResp.Body.Close() 411 411 + 412 412 + var diffTreeResponse types.RepoDiffTreeResponse 413 413 + err = json.Unmarshal(respBody, &diffTreeResponse) 414 414 + if err != nil { 415 415 + log.Println("failed to unmarshal diff tree response", err) 416 416 + return nil, fmt.Errorf("Failed to compare branches.") 417 417 + } 418 418 + 419 419 + return &diffTreeResponse, nil 392 420 }

+1 -1

docs/knot-hosting.md

··· 26 26 docker compose -f docker/docker-compose.yml up 27 27 ``` 28 28 29 29 - ### manual setup 29 29 + ## manual setup 30 30 31 31 First, clone this repository: 32 32

+1 -1

flake.nix

··· 420 420 g = config.services.tangled-knotserver.gitUser; 421 421 in [ 422 422 "d /var/lib/knotserver 0770 ${u} ${g} - -" # Create the directory first 423 423 - "f+ /var/lib/knotserver/secret 0660 ${u} ${g} - KNOT_SERVER_SECRET=6995e040e80e2d593b5e5e9ca611a70140b9ef8044add0a28b48b1ee34aa3e85" 423 423 + "f+ /var/lib/knotserver/secret 0660 ${u} ${g} - KNOT_SERVER_SECRET=5b42390da4c6659f34c9a545adebd8af82c4a19960d735f651e3d582623ba9f2" 424 424 ]; 425 425 services.tangled-knotserver = { 426 426 enable = true;

+1 -17

rbac/rbac.go

··· 3 3 import ( 4 4 "database/sql" 5 5 "fmt" 6 6 - "path" 7 6 "strings" 8 7 9 8 adapter "github.com/Blank-Xu/sql-adapter" ··· 26 25 e = some(where (p.eft == allow)) 27 26 28 27 [matchers] 29 29 - m = r.act == p.act && r.dom == p.dom && keyMatch2(r.obj, p.obj) && g(r.sub, p.sub, r.dom) 28 28 + m = r.act == p.act && r.dom == p.dom && r.obj == p.obj && g(r.sub, p.sub, r.dom) 30 29 ` 31 30 ) 32 31 ··· 34 33 E *casbin.Enforcer 35 34 } 36 35 37 37 - func keyMatch2(key1 string, key2 string) bool { 38 38 - matched, _ := path.Match(key2, key1) 39 39 - return matched 40 40 - } 41 41 - 42 36 func NewEnforcer(path string) (*Enforcer, error) { 43 37 m, err := model.NewModelFromString(Model) 44 38 if err != nil { ··· 61 55 } 62 56 63 57 e.EnableAutoSave(false) 64 64 - 65 65 - e.AddFunction("keyMatch2", keyMatch2Func) 66 58 67 59 return &Enforcer{e}, nil 68 60 } ··· 209 201 } 210 202 211 203 return permissions 212 212 - } 213 213 - 214 214 - // keyMatch2Func is a wrapper for keyMatch2 to make it compatible with Casbin 215 215 - func keyMatch2Func(args ...interface{}) (interface{}, error) { 216 216 - name1 := args[0].(string) 217 217 - name2 := args[1].(string) 218 218 - 219 219 - return keyMatch2(name1, name2), nil 220 204 } 221 205 222 206 func checkRepoFormat(repo string) error {

+9 -3

readme.md

··· 6 6 7 7 Read the introduction to Tangled [here](https://blog.tangled.sh/intro). 8 8 9 9 - Documentation: 9 9 + ## docs 10 10 + 10 11 * [knot hosting 11 11 - guide](https://tangled.sh/@tangled.sh/core/tree/master/docs/knot-hosting.md) 12 12 + guide](https://tangled.sh/@tangled.sh/core/blob/master/docs/knot-hosting.md) 12 13 * [contributing 13 13 - guide](https://tangled.sh/@tangled.sh/core/tree/master/docs/contributing.md)&mdash;**read this before opening a PR!** 14 14 + guide](https://tangled.sh/@tangled.sh/core/blob/master/docs/contributing.md)&mdash;**read this before opening a PR!** 15 15 + 16 16 + ## security 17 17 + 18 18 + If you've identified a security issue in Tangled, please email 19 19 + [security@tangled.sh](mailto:security@tangled.sh) with details!

+68 -45

tailwind.config.js

··· 2 2 const colors = require("tailwindcss/colors"); 3 3 4 4 module.exports = { 5 5 - content: ["./appview/pages/templates/**/*.html", "./appview/pages/chroma.go"], 6 6 - darkMode: "media", 7 7 - theme: { 8 8 - container: { 9 9 - padding: "2rem", 10 10 - center: true, 11 11 - screens: { 12 12 - sm: "500px", 13 13 - md: "600px", 14 14 - lg: "800px", 15 15 - xl: "1000px", 16 16 - "2xl": "1200px", 17 17 - }, 18 18 - }, 19 19 - extend: { 20 20 - fontFamily: { 21 21 - sans: ["InterVariable", "system-ui", "sans-serif", "ui-sans-serif"], 22 22 - mono: [ 23 23 - "IBMPlexMono", 24 24 - "ui-monospace", 25 25 - "SFMono-Regular", 26 26 - "Menlo", 27 27 - "Monaco", 28 28 - "Consolas", 29 29 - "Liberation Mono", 30 30 - "Courier New", 31 31 - "monospace", 32 32 - ], 33 33 - }, 34 34 - typography: { 35 35 - DEFAULT: { 36 36 - css: { 37 37 - maxWidth: "none", 38 38 - pre: { 39 39 - backgroundColor: colors.gray[100], 40 40 - color: colors.black, 41 41 - "@apply dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700 dark:border": 42 42 - {}, 43 43 - }, 44 44 - }, 45 45 - }, 46 46 - }, 47 47 - }, 48 48 - }, 49 49 - plugins: [require("@tailwindcss/typography")], 5 5 + content: ["./appview/pages/templates/**/*.html", "./appview/pages/chroma.go"], 6 6 + darkMode: "media", 7 7 + theme: { 8 8 + container: { 9 9 + padding: "2rem", 10 10 + center: true, 11 11 + screens: { 12 12 + sm: "500px", 13 13 + md: "600px", 14 14 + lg: "800px", 15 15 + xl: "1000px", 16 16 + "2xl": "1200px", 17 17 + }, 18 18 + }, 19 19 + extend: { 20 20 + fontFamily: { 21 21 + sans: ["InterVariable", "system-ui", "sans-serif", "ui-sans-serif"], 22 22 + mono: [ 23 23 + "IBMPlexMono", 24 24 + "ui-monospace", 25 25 + "SFMono-Regular", 26 26 + "Menlo", 27 27 + "Monaco", 28 28 + "Consolas", 29 29 + "Liberation Mono", 30 30 + "Courier New", 31 31 + "monospace", 32 32 + ], 33 33 + }, 34 34 + typography: { 35 35 + DEFAULT: { 36 36 + css: { 37 37 + maxWidth: "none", 38 38 + pre: { 39 39 + backgroundColor: colors.gray[100], 40 40 + color: colors.black, 41 41 + "@apply font-normal text-black bg-gray-100 dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700 dark:border": {}, 42 42 + }, 43 43 + code: { 44 44 + "@apply font-normal font-mono p-1 rounded text-black bg-gray-100 dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700": {}, 45 45 + }, 46 46 + "code::before": { 47 47 + content: '""', 48 48 + }, 49 49 + "code::after": { 50 50 + content: '""', 51 51 + }, 52 52 + blockquote: { 53 53 + quotes: "none", 54 54 + }, 55 55 + 'h1, h2, h3, h4': { 56 56 + "@apply mt-4 mb-2": {} 57 57 + }, 58 58 + h1: { 59 59 + "@apply mt-3 pb-3 border-b border-gray-300 dark:border-gray-600": {} 60 60 + }, 61 61 + h2: { 62 62 + "@apply mt-3 pb-3 border-b border-gray-200 dark:border-gray-700": {} 63 63 + }, 64 64 + h3: { 65 65 + "@apply mt-2": {} 66 66 + }, 67 67 + }, 68 68 + }, 69 69 + }, 70 70 + }, 71 71 + }, 72 72 + plugins: [require("@tailwindcss/typography")], 50 73 };

+14

types/diff.go

··· 23 23 IsRename bool `json:"is_rename"` 24 24 } 25 25 26 26 + type DiffStat struct { 27 27 + Insertions int64 28 28 + Deletions int64 29 29 + } 30 30 + 31 31 + func (d *Diff) Stats() DiffStat { 32 32 + var stats DiffStat 33 33 + for _, f := range d.TextFragments { 34 34 + stats.Insertions += f.LinesAdded 35 35 + stats.Deletions += f.LinesDeleted 36 36 + } 37 37 + return stats 38 38 + } 39 39 + 26 40 // A nicer git diff representation. 27 41 type NiceDiff struct { 28 42 Commit struct {