jolheiser
/
ugit
mirror of https://git.jolheiser.com/ugit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: base breadcrumb requires ending slash 

Signed-off-by: jolheiser <john.olheiser@gmail.com>
form
jolheiser 2024-07-09 15:54:04 -05:00
parent d20394e093
commit c33dfdc42a
Signed by: jolheiser
GPG Key ID: B853ADA5DA7BBF7A
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/html/repo_breadcrumb.templ
View File

@ -3,6 +3,7 @@ package html
import ( import (
"fmt" "fmt"
"strings" "strings"
"path"
) )
type RepoBreadcrumbComponentContext struct { type RepoBreadcrumbComponentContext struct {
@ -22,13 +23,13 @@ func (r RepoBreadcrumbComponentContext) crumbs() []breadcrumb {
breadcrumbs := []breadcrumb{ breadcrumbs := []breadcrumb{
{ {
label: r.Repo, label: r.Repo,
href: fmt.Sprintf("/%s/tree/%s", r.Repo, r.Ref), href: fmt.Sprintf("/%s/tree/%s/", r.Repo, r.Ref),
}, },
} }
for idx, part := range parts { for idx, part := range parts {
breadcrumbs = append(breadcrumbs, breadcrumb{ breadcrumbs = append(breadcrumbs, breadcrumb{
label: part, label: part,
href: breadcrumbs[idx].href + "/" + part, href: path.Join(breadcrumbs[idx].href, part),
}) })
} }
breadcrumbs[len(breadcrumbs)-1].end = true breadcrumbs[len(breadcrumbs)-1].end = true

11
internal/html/repo_breadcrumb_templ.go
View File

@ -12,6 +12,7 @@ import "bytes"
import ( import (
"fmt" "fmt"
"path"
"strings" "strings"
) )
@ -32,13 +33,13 @@ func (r RepoBreadcrumbComponentContext) crumbs() []breadcrumb {
breadcrumbs := []breadcrumb{ breadcrumbs := []breadcrumb{
{ {
label: r.Repo, label: r.Repo,
href: fmt.Sprintf("/%s/tree/%s", r.Repo, r.Ref), href: fmt.Sprintf("/%s/tree/%s/", r.Repo, r.Ref),
}, },
} }
for idx, part := range parts { for idx, part := range parts {
breadcrumbs = append(breadcrumbs, breadcrumb{ breadcrumbs = append(breadcrumbs, breadcrumb{
label: part, label: part,
href: breadcrumbs[idx].href + "/" + part, href: path.Join(breadcrumbs[idx].href, part),
}) })
} }
breadcrumbs[len(breadcrumbs)-1].end = true breadcrumbs[len(breadcrumbs)-1].end = true
@ -72,7 +73,7 @@ func repoBreadcrumbComponent(rbcc RepoBreadcrumbComponentContext) templ.Componen
var templ_7745c5c3_Var2 string var templ_7745c5c3_Var2 string
templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(crumb.label) templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(crumb.label)
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `repo_breadcrumb.templ`, Line: 43, Col: 24} return templ.Error{Err: templ_7745c5c3_Err, FileName: `repo_breadcrumb.templ`, Line: 44, Col: 24}
} }
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
@ -99,7 +100,7 @@ func repoBreadcrumbComponent(rbcc RepoBreadcrumbComponentContext) templ.Componen
var templ_7745c5c3_Var4 string var templ_7745c5c3_Var4 string
templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(crumb.label) templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(crumb.label)
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `repo_breadcrumb.templ`, Line: 45, Col: 134} return templ.Error{Err: templ_7745c5c3_Err, FileName: `repo_breadcrumb.templ`, Line: 46, Col: 134}
} }
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
@ -112,7 +113,7 @@ func repoBreadcrumbComponent(rbcc RepoBreadcrumbComponentContext) templ.Componen
var templ_7745c5c3_Var5 string var templ_7745c5c3_Var5 string
templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(" / ") templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(" / ")
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {
return templ.Error{Err: templ_7745c5c3_Err, FileName: `repo_breadcrumb.templ`, Line: 46, Col: 12} return templ.Error{Err: templ_7745c5c3_Err, FileName: `repo_breadcrumb.templ`, Line: 47, Col: 12}
} }
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
if templ_7745c5c3_Err != nil { if templ_7745c5c3_Err != nil {