back round 0 view raw

appview/pages: refactor fragments to be one-per-file #535

merged

opened by

oppi.li 3 months ago targeting master from push-mvmrzuxwmzvs

this is a limitation of how fragments are loaded at the moment. multiple definitions per file are unsupported.

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

options

unified split

Changed files

+20 -19

appview

pages

templates

repo

fragments

duration.html

shortTime.html

shortTimeAgo.html

time.html

timeWrapper.html

pulls

fragments

pullStack.html

summarizedPullHeader.html

pulls.html

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

···

       1
       1
       +
       {{ define "repo/fragments/duration" }}

     

       2
       2
       +
       <time datetime="{{ . | iso8601DurationFmt }}" title="{{ . | longDurationFmt }}">{{ . | durationFmt }}</time>

     

       3
       3
       +
       {{ end }}

     

       4
       4
       +

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

···

       1
       1
       +
       {{ define "repo/fragments/shortTime" }}

     

       2
       2
       +
       {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | shortRelTimeFmt)) }}

     

       3
       3
       +
       {{ end }}

     

       4
       4
       +

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

···

       1
       1
       +
       {{ define "repo/fragments/shortTimeAgo" }}

     

       2
       2
       +
       {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (print (. | shortRelTimeFmt) " ago")) }}

     

       3
       3
       +
       {{ end }}

     

       4
       4
       +

-16

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

···

       1
       1
       -
       {{ define "repo/fragments/timeWrapper" }}

     

       2
       2
       -
       <time datetime="{{ .Time | iso8601DateTimeFmt }}" title="{{ .Time | longTimeFmt }}">{{ .Content }}</time>

     

       3
       3
       -
       {{ end }}

     

       4
       4
       -
       

     

       5
       1
        
       {{ define "repo/fragments/time" }}

     

       6
       2
        
       {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | relTimeFmt)) }}

     

       7
       3
        
       {{ end }}

     

       8
       8
       -
       

     

       9
       9
       -
       {{ define "repo/fragments/shortTime" }}

     

       10
       10
       -
       {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | shortRelTimeFmt)) }}

     

       11
       11
       -
       {{ end }}

     

       12
       12
       -
       

     

       13
       13
       -
       {{ define "repo/fragments/shortTimeAgo" }}

     

       14
       14
       -
       {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (print (. | shortRelTimeFmt) " ago")) }}

     

       15
       15
       -
       {{ end }}

     

       16
       16
       -
       

     

       17
       17
       -
       {{ define "repo/fragments/duration" }}

     

       18
       18
       -
       <time datetime="{{ . | iso8601DurationFmt }}" title="{{ . | longDurationFmt }}">{{ . | durationFmt }}</time>

     

       19
       19
       -
       {{ end }}

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

···

       1
       1
       +
       {{ define "repo/fragments/timeWrapper" }}

     

       2
       2
       +
       <time datetime="{{ .Time | iso8601DateTimeFmt }}" title="{{ .Time | longTimeFmt }}">{{ .Content }}</time>

     

       3
       3
       +
       {{ end }}

     

       4
       4
       +
       

     

       5
       5
       +

+1 -1

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

···

       52
       52
        
                   </div>

     

       53
       53
        
                 {{ end }}

     

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

     

       55
       55
       -
                   {{ template "repo/pulls/fragments/summarizedHeader" (list $pull $pipeline) }}

     

       55
       55
       +
                   {{ template "repo/pulls/fragments/summarizedPullHeader" (list $pull $pipeline) }}

     

       56
       56
        
                 </div>

     

       57
       57
        
               </div>

     

       58
       58
        
             </a>

+1 -1

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

···

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

     

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

     

       2
       2
        
         {{ $pull := index . 0 }}

     

       3
       3
        
         {{ $pipeline := index . 1 }}

     

       4
       4
        
         {{ with $pull }}

+1 -1

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

···

       144
       144
        
             <a href="/{{ $root.RepoInfo.FullName }}/pulls/{{ $pull.PullId }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25">

     

       145
       145
        
               <div class="flex gap-2 items-center px-6">

     

       146
       146
        
                 <div class="flex-grow min-w-0 w-full py-2">

     

       147
       147
       -
                   {{ template "repo/pulls/fragments/summarizedHeader" (list $pull $pipeline) }}

     

       147
       147
       +
                   {{ template "repo/pulls/fragments/summarizedPullHeader" (list $pull $pipeline) }}

     

       148
       148
        
                 </div>

     

       149
       149
        
               </div>

     

       150
       150
        
             </a>