add baseURL + fix active link check

zyra · Nov 11, 2019 · 69b5e20 · 69b5e20
1 parent e5b9da3
commit 69b5e20
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/parser.go b/parser.go
@@ -58,6 +58,7 @@ type ParserConfig struct {
 	SiteTitle   string         `yaml:"siteTitle"`
 	Description string         `yaml:"description"`
 	Repo        string         `yaml:"repo"`
+	BaseURL     string         `yaml:"baseUrl"`
 }
 
 type File struct {
@@ -183,6 +184,8 @@ type RenderContext struct {
 	Content     template.HTML
 	OutDir      string
 	OutFile     string
+	BaseURL     string
+	Link        string
 }
 
 func (p *Parser) Render() error {
@@ -223,6 +226,7 @@ func (p *Parser) Render() error {
 				Content: template.HTML(o),
 				OutDir:  outDir,
 				OutFile: outFile,
+				Link:    f.Path,
 			}
 
 			rndCtxs = append(rndCtxs, &ctx)
@@ -280,13 +284,14 @@ func (p *Parser) Render() error {
 		ctx.SiteTitle = p.Config.SiteTitle
 		ctx.Description = p.Config.Description
 		ctx.MenuItems = menuItems
+		ctx.BaseURL = p.Config.BaseURL
 
 		for _, mit := range menuItems {
 			if mit.Group {
 				for _, cmit := range mit.Items {
-					cmit.Active = cmit.Title == ctx.Title
+					cmit.Active = cmit.Link == ctx.Link
 				}
-			} else if mit.Title == ctx.Title {
+			} else if mit.Link == ctx.Link {
 				mit.Active = true
 			} else {
 				mit.Active = false

diff --git a/templates/base.go b/templates/base.go
@@ -6,6 +6,7 @@ const BaseTemplate = `<!DOCTYPE html>
     <meta charset="UTF-8">
     <title>{{ .Title }}</title>
     {{ if .Description }}<meta name="description" content="{{ .Description }}">{{ end }}
+    {{ if .BaseURL }}<base href="{{ .BaseURL }}" />{{ end }}
     <link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#fafafa">