back round 0 view raw

appview: pages: refactor pullStack fragment #200

merged

opened by

oppi.li 6 months ago targeting master from push-ykwytywspowp

break out summarizedHeader and summarizedPullState into resuable fragments.

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

options

unified split

Changed files

+53 -53

appview

pages

templates

repo

pulls

fragments

pullStack.html

summarizedPullHeader.html

summarizedPullState.html

+1 -53

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

···

       8
       8
        
         {{ end }}

     

       9
       9
        
       {{ end }}

     

       10
       10
        
       

     

       11
       11
       -
       {{ define "summarizedHeader" }}

     

       12
       12
       -
         <div class="flex text-sm items-center justify-between w-full">

     

       13
       13
       -
           <div class="flex items-center gap-2 min-w-0 flex-1 pr-2">

     

       14
       14
       -
             <div class="flex-shrink-0">

     

       15
       15
       -
               {{ block "summarizedPullState" . }} {{ end }}

     

       16
       16
       -
             </div>

     

       17
       17
       -
             <span class="truncate text-sm text-gray-800 dark:text-gray-200">

     

       18
       18
       -
               <span class="text-gray-500 dark:text-gray-400">#{{ .PullId }}</span>

     

       19
       19
       -
               {{ .Title }}

     

       20
       20
       -
             </span>

     

       21
       21
       -
           </div>

     

       22
       22
       -
       

     

       23
       23
       -
           <div class="flex-shrink-0">

     

       24
       24
       -
             {{ $latestRound := .LastRoundNumber }}

     

       25
       25
       -
             {{ $lastSubmission := index .Submissions $latestRound }}

     

       26
       26
       -
             {{ $commentCount := len $lastSubmission.Comments }}

     

       27
       27
       -
             <span>

     

       28
       28
       -
               <div class="inline-flex items-center gap-2">

     

       29
       29
       -
                 {{ i "message-square" "w-3 h-3 md:hidden" }}

     

       30
       30
       -
                 {{ $commentCount }}

     

       31
       31
       -
                 <span class="hidden md:inline">comment{{if ne $commentCount 1}}s{{end}}</span>

     

       32
       32
       -
               </div>

     

       33
       33
       -
             </span>

     

       34
       34
       -
             <span class="mx-2 before:content-['·'] before:select-none"></span>

     

       35
       35
       -
             <span>

     

       36
       36
       -
               <span class="hidden md:inline">round</span>

     

       37
       37
       -
               <span class="font-mono">#{{ $latestRound }}</span>

     

       38
       38
       -
             </span>

     

       39
       39
       -
           </div>

     

       40
       40
       -
         </div>

     

       41
       41
       -
       {{ end }}

     

       42
       42
       -
       

     

       43
       43
       -
       {{ define "summarizedPullState" }}

     

       44
       44
       -
         {{ $fgColor := "text-gray-600 dark:text-gray-300" }}

     

       45
       45
       -
         {{ $icon := "ban" }}

     

       46
       46
       -
       

     

       47
       47
       -
         {{ if .State.IsOpen }}

     

       48
       48
       -
           {{ $fgColor = "text-green-600 dark:text-green-500" }}

     

       49
       49
       -
           {{ $icon = "git-pull-request" }}

     

       50
       50
       -
         {{ else if .State.IsMerged }}

     

       51
       51
       -
           {{ $fgColor = "text-purple-600 dark:text-purple-500" }}

     

       52
       52
       -
           {{ $icon = "git-merge" }}

     

       53
       53
       -
         {{ else if .State.IsDeleted }}

     

       54
       54
       -
           {{ $fgColor = "text-red-600 dark:text-red-500" }}

     

       55
       55
       -
           {{ $icon = "git-pull-request-closed" }}

     

       56
       56
       -
         {{ end }}

     

       57
       57
       -
       

     

       58
       58
       -
         {{ $style := printf "w-4 h-4 %s" $fgColor }}

     

       59
       59
       -
       

     

       60
       60
       -
         {{ i $icon $style }}

     

       61
       61
       -
       {{ end }}

     

       62
       62
       -
       

     

       63
       11
        
       {{ define "pullList" }}

     

       64
       12
        
         {{ $list := index . 0 }}

     

       65
       13
        
         {{ $root := index . 1 }}

     
···

       77
       25
        
                   </div>

     

       78
       26
        
                 {{ end }}

     

       79
       27
        
                 <div class="{{ if not $isCurrent }} pl-6 {{ end }} flex-grow min-w-0 w-full py-2">

     

       80
       80
       -
                   {{ block "summarizedHeader" $pull }} {{ end }}

     

       28
       28
       +
                   {{ template "repo/pulls/fragments/summarizedHeader" $pull }}

     

       81
       29
        
                 </div>

     

       82
       30
        
               </div>

     

       83
       31
        
             </a>

+32

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

···

       1
       1
       +
       {{ define "repo/pulls/fragments/summarizedHeader" }}

     

       2
       2
       +
         <div class="flex text-sm items-center justify-between w-full">

     

       3
       3
       +
           <div class="flex items-center gap-2 min-w-0 flex-1 pr-2">

     

       4
       4
       +
             <div class="flex-shrink-0">

     

       5
       5
       +
               {{ template "repo/pulls/fragments/summarizedPullState" .State }}

     

       6
       6
       +
             </div>

     

       7
       7
       +
             <span class="truncate text-sm text-gray-800 dark:text-gray-200">

     

       8
       8
       +
               <span class="text-gray-500 dark:text-gray-400">#{{ .PullId }}</span>

     

       9
       9
       +
               {{ .Title }}

     

       10
       10
       +
             </span>

     

       11
       11
       +
           </div>

     

       12
       12
       +
       

     

       13
       13
       +
           <div class="flex-shrink-0">

     

       14
       14
       +
             {{ $latestRound := .LastRoundNumber }}

     

       15
       15
       +
             {{ $lastSubmission := index .Submissions $latestRound }}

     

       16
       16
       +
             {{ $commentCount := len $lastSubmission.Comments }}

     

       17
       17
       +
             <span>

     

       18
       18
       +
               <div class="inline-flex items-center gap-2">

     

       19
       19
       +
                 {{ i "message-square" "w-3 h-3 md:hidden" }}

     

       20
       20
       +
                 {{ $commentCount }}

     

       21
       21
       +
                 <span class="hidden md:inline">comment{{if ne $commentCount 1}}s{{end}}</span>

     

       22
       22
       +
               </div>

     

       23
       23
       +
             </span>

     

       24
       24
       +
             <span class="mx-2 before:content-['·'] before:select-none"></span>

     

       25
       25
       +
             <span>

     

       26
       26
       +
               <span class="hidden md:inline">round</span>

     

       27
       27
       +
               <span class="font-mono">#{{ $latestRound }}</span>

     

       28
       28
       +
             </span>

     

       29
       29
       +
           </div>

     

       30
       30
       +
         </div>

     

       31
       31
       +
       {{ end }}

     

       32
       32
       +

+20

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

···

       1
       1
       +
       {{ define "repo/pulls/fragments/summarizedPullState" }}

     

       2
       2
       +
         {{ $fgColor := "text-gray-600 dark:text-gray-300" }}

     

       3
       3
       +
         {{ $icon := "ban" }}

     

       4
       4
       +
       

     

       5
       5
       +
         {{ if .IsOpen }}

     

       6
       6
       +
           {{ $fgColor = "text-green-600 dark:text-green-500" }}

     

       7
       7
       +
           {{ $icon = "git-pull-request" }}

     

       8
       8
       +
         {{ else if .IsMerged }}

     

       9
       9
       +
           {{ $fgColor = "text-purple-600 dark:text-purple-500" }}

     

       10
       10
       +
           {{ $icon = "git-merge" }}

     

       11
       11
       +
         {{ else if .IsDeleted }}

     

       12
       12
       +
           {{ $fgColor = "text-red-600 dark:text-red-500" }}

     

       13
       13
       +
           {{ $icon = "git-pull-request-closed" }}

     

       14
       14
       +
         {{ end }}

     

       15
       15
       +
       

     

       16
       16
       +
         {{ $style := printf "w-4 h-4 %s" $fgColor }}

     

       17
       17
       +
       

     

       18
       18
       +
         {{ i $icon $style }}

     

       19
       19
       +
       {{ end }}

     

       20
       20
       +