diff --git a/content/welcome.md b/content/welcome.md index 6e7d475..f8b46e9 100644 --- a/content/welcome.md +++ b/content/welcome.md @@ -1,5 +1,6 @@ --- name: "Welcome!" +description: "Welcome to my website!" date: "October 20 2024" tags: ["welcome"] --- diff --git a/lib/markdown.go b/lib/markdown.go index afe4f72..a700125 100644 --- a/lib/markdown.go +++ b/lib/markdown.go @@ -13,9 +13,10 @@ import ( ) type FrontMatter struct { - Name string - Date string - Tags []string + Name string + Description string + Date string + Tags []string } func ExtractFrontMatter(file fs.DirEntry, contentFS fs.FS) (CardLink, error) { diff --git a/pages/post.go b/pages/post.go index a8a5047..151804e 100644 --- a/pages/post.go +++ b/pages/post.go @@ -16,10 +16,11 @@ import ( ) type PostProps struct { - Content template.HTML - Name string - Date string - Tags []string + Content template.HTML + Name string + Description string + Date string + Tags []string } func Post(c echo.Context) error { @@ -64,10 +65,11 @@ func Post(c echo.Context) error { } props := PostProps{ - Content: template.HTML(buf.String()), - Name: frontmatter.Name, - Date: frontmatter.Date, - Tags: frontmatter.Tags, + Content: template.HTML(buf.String()), + Name: frontmatter.Name, + Description: frontmatter.Description, + Date: frontmatter.Date, + Tags: frontmatter.Tags, } // Specify the partials used by this page diff --git a/pages/templates/home.html b/pages/templates/home.html index d58cd3d..7f9448f 100644 --- a/pages/templates/home.html +++ b/pages/templates/home.html @@ -2,7 +2,11 @@ Atridad Lahiji // Root {{end}} -{{define "headercontent"}} +{{define "description"}} +Researcher, Full-Stack Developer, and IT Professional. +{{end}} + +{{define "navcontent"}} Atridad Lahiji // Root {{end}} diff --git a/pages/templates/layouts/base.html b/pages/templates/layouts/base.html index d91b021..4d25e6b 100644 --- a/pages/templates/layouts/base.html +++ b/pages/templates/layouts/base.html @@ -6,7 +6,7 @@ {{template "title" .}} - + {{template "head" .}} diff --git a/pages/templates/layouts/post.html b/pages/templates/layouts/post.html index cc8cb78..1601495 100644 --- a/pages/templates/layouts/post.html +++ b/pages/templates/layouts/post.html @@ -5,8 +5,8 @@ - {{.Name}} - + {{template "title" .}} + {{template "head" .}} diff --git a/pages/templates/papers.html b/pages/templates/papers.html index a13e2b1..e8ba780 100644 --- a/pages/templates/papers.html +++ b/pages/templates/papers.html @@ -2,7 +2,11 @@ Atridad Lahiji // Papers {{end}} -{{define "headercontent"}} +{{define "description"}} +Papers I've Written +{{end}} + +{{define "navcontent"}} Atridad Lahiji // Papers {{end}} diff --git a/pages/templates/partials/header.html b/pages/templates/partials/header.html index a037feb..5c4717a 100644 --- a/pages/templates/partials/header.html +++ b/pages/templates/partials/header.html @@ -1,7 +1,7 @@ {{define "header"}}
- {{template "headercontent".}} + {{template "navcontent".}}
diff --git a/pages/templates/post.html b/pages/templates/post.html index 18fefa9..fcb2867 100644 --- a/pages/templates/post.html +++ b/pages/templates/post.html @@ -1,9 +1,13 @@ {{define "title"}} -Atridad Lahiji // Post +Atridad Lahiji // Post // {{.Name}} {{end}} -{{define "headercontent"}} -Atridad Lahiji // Post +{{define "description"}} +{{.Description}} +{{end}} + +{{define "navcontent"}} +Atridad Lahiji // Post // {{.Name}} {{end}} {{define "head"}} diff --git a/pages/templates/posts.html b/pages/templates/posts.html index 6c96f49..3289032 100644 --- a/pages/templates/posts.html +++ b/pages/templates/posts.html @@ -1,9 +1,13 @@ {{define "title"}} -Atridad Lahiji // Blog +Atridad Lahiji // Posts {{end}} -{{define "headercontent"}} -Atridad Lahiji // Blog +{{define "description"}} +Posts I've Written +{{end}} + +{{define "navcontent"}} +Atridad Lahiji // Posts {{end}} {{define "head"}} diff --git a/pages/templates/projects.html b/pages/templates/projects.html index 794b0c5..e42aca3 100644 --- a/pages/templates/projects.html +++ b/pages/templates/projects.html @@ -2,7 +2,11 @@ Atridad Lahiji // Projects {{end}} -{{define "headercontent"}} +{{define "description"}} +Projects I've Done +{{end}} + +{{define "navcontent"}} Atridad Lahiji // Projects {{end}} diff --git a/pages/templates/talks.html b/pages/templates/talks.html index c36c0b9..4ca72cc 100644 --- a/pages/templates/talks.html +++ b/pages/templates/talks.html @@ -2,7 +2,11 @@ Atridad Lahiji // Talks {{end}} -{{define "headercontent"}} +{{define "description"}} +Talks I've Given +{{end}} + +{{define "navcontent"}} Atridad Lahiji // Talks {{end}} diff --git a/pages/templates/tools.html b/pages/templates/tools.html index 4aab138..22c423a 100644 --- a/pages/templates/tools.html +++ b/pages/templates/tools.html @@ -2,7 +2,11 @@ Atridad Lahiji // Tools {{end}} -{{define "headercontent"}} +{{define "description"}} +Tools I've Built +{{end}} + +{{define "navcontent"}} Atridad Lahiji // Tools {{end}} diff --git a/pages/templates/tools.resize.html b/pages/templates/tools.resize.html index 3067911..84c328e 100644 --- a/pages/templates/tools.resize.html +++ b/pages/templates/tools.resize.html @@ -2,7 +2,11 @@ Atridad Lahiji // Tools // Resizer {{end}} -{{define "headercontent"}} +{{define "description"}} +A tool to re-size images. +{{end}} + +{{define "navcontent"}} Atridad Lahiji // Tools // Resizer {{end}} @@ -28,4 +32,4 @@ Atridad Lahiji // Tools // Resizer {{end}} {{define "foot"}} -{{end}} \ No newline at end of file +{{end}} diff --git a/pages/templates/tools.ssedemo.html b/pages/templates/tools.ssedemo.html index b1afe35..ee09af0 100644 --- a/pages/templates/tools.ssedemo.html +++ b/pages/templates/tools.ssedemo.html @@ -1,9 +1,15 @@ -{{define "title"}}Atridad Lahiji // Tools // SSE Demo{{end}} - -{{define "headercontent"}} +{{define "title"}} Atridad Lahiji // Tools // SSE Demo {{end}} +{{define "navcontent"}} +Atridad Lahiji // Tools // SSE Demo +{{end}} + +{{define "description"}} +A demo of my SSE implimentation. +{{end}} + {{define "head"}} {{end}}