From c33dfdc42acc068a865200694b804bb21dd0e36e Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 9 Jul 2024 15:54:04 -0500 Subject: [PATCH] fix: base breadcrumb requires ending slash Signed-off-by: jolheiser --- internal/html/repo_breadcrumb.templ | 5 +++-- internal/html/repo_breadcrumb_templ.go | 11 ++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/internal/html/repo_breadcrumb.templ b/internal/html/repo_breadcrumb.templ index cf88dc2..5a4482c 100644 --- a/internal/html/repo_breadcrumb.templ +++ b/internal/html/repo_breadcrumb.templ @@ -3,6 +3,7 @@ package html import ( "fmt" "strings" + "path" ) type RepoBreadcrumbComponentContext struct { @@ -22,13 +23,13 @@ func (r RepoBreadcrumbComponentContext) crumbs() []breadcrumb { breadcrumbs := []breadcrumb{ { 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 { breadcrumbs = append(breadcrumbs, breadcrumb{ label: part, - href: breadcrumbs[idx].href + "/" + part, + href: path.Join(breadcrumbs[idx].href, part), }) } breadcrumbs[len(breadcrumbs)-1].end = true diff --git a/internal/html/repo_breadcrumb_templ.go b/internal/html/repo_breadcrumb_templ.go index 85f2379..98fc556 100644 --- a/internal/html/repo_breadcrumb_templ.go +++ b/internal/html/repo_breadcrumb_templ.go @@ -12,6 +12,7 @@ import "bytes" import ( "fmt" + "path" "strings" ) @@ -32,13 +33,13 @@ func (r RepoBreadcrumbComponentContext) crumbs() []breadcrumb { breadcrumbs := []breadcrumb{ { 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 { breadcrumbs = append(breadcrumbs, breadcrumb{ label: part, - href: breadcrumbs[idx].href + "/" + part, + href: path.Join(breadcrumbs[idx].href, part), }) } breadcrumbs[len(breadcrumbs)-1].end = true @@ -72,7 +73,7 @@ func repoBreadcrumbComponent(rbcc RepoBreadcrumbComponentContext) templ.Componen var templ_7745c5c3_Var2 string templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(crumb.label) 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)) if templ_7745c5c3_Err != nil { @@ -99,7 +100,7 @@ func repoBreadcrumbComponent(rbcc RepoBreadcrumbComponentContext) templ.Componen var templ_7745c5c3_Var4 string templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(crumb.label) 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)) if templ_7745c5c3_Err != nil { @@ -112,7 +113,7 @@ func repoBreadcrumbComponent(rbcc RepoBreadcrumbComponentContext) templ.Componen var templ_7745c5c3_Var5 string templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(" / ") 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)) if templ_7745c5c3_Err != nil {