chore: switch layouts to html

anna-ssg · Apr 11, 2024 · fd618a3 · fd618a3
1 parent 4471a9a
commit fd618a3
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 109 deletions.
diff --git a/cmd/anna/anna.go b/cmd/anna/anna.go
@@ -62,12 +62,12 @@ func (cmd *Cmd) VanillaRender() {
 		return e.DeepDataMerge.Posts[i].Frontmatter.Date > e.DeepDataMerge.Posts[j].Frontmatter.Date
 	})
 
-	templ, err := template.ParseGlob(helpers.SiteDataPath + "layout/*.layout")
+	templ, err := template.ParseGlob(helpers.SiteDataPath + "layout/*.html")
 	if err != nil {
 		e.ErrorLogger.Fatalf("%v", err)
 	}
 
-	templ, err = templ.ParseGlob(helpers.SiteDataPath + "layout/partials/*.layout")
+	templ, err = templ.ParseGlob(helpers.SiteDataPath + "layout/partials/*.html")
 	if err != nil {
 		e.ErrorLogger.Fatalf("%v", err)
 	}

diff --git a/pkg/engine/anna_engine.go b/pkg/engine/anna_engine.go
@@ -118,6 +118,7 @@ func (e *Engine) GenerateJSONIndex(outFilePath string) {
 		jsonIndexTemplate[templateURL] = JSONIndexTemplate{
 			CompleteURL: templateData.CompleteURL,
 			Frontmatter: templateData.Frontmatter,
+			Tags:        templateData.Frontmatter.Tags,
 		}
 	}
 

diff --git a/pkg/engine/anna_engine_test.go b/pkg/engine/anna_engine_test.go
@@ -57,7 +57,7 @@ func TestRenderTags(t *testing.T) {
 		},
 	}
 
-	templ, err := template.ParseFiles(TestDirPath+"render_tags/tags_template.layout", TestDirPath+"render_tags/tags_subpage_template.layout")
+	templ, err := template.ParseFiles(TestDirPath+"render_tags/tags_template.html", TestDirPath+"render_tags/tags_subpage_template.html")
 	if err != nil {
 		t.Errorf("%v", err)
 	}

diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
@@ -50,6 +50,7 @@ type PageData struct {
 type JSONIndexTemplate struct {
 	CompleteURL template.URL
 	Frontmatter parser.Frontmatter
+	Tags        []string
 }
 
 /*

diff --git a/pkg/engine/engine_integration_test.go b/pkg/engine/engine_integration_test.go
@@ -35,7 +35,7 @@ func TestRenderUserDefinedPages(t *testing.T) {
 
 	t.Run("render a set of user defined pages", func(t *testing.T) {
 
-		templ, err := template.ParseFiles(TestDirPath + "render_user_defined/template_input.layout")
+		templ, err := template.ParseFiles(TestDirPath + "render_user_defined/template_input.html")
 		if err != nil {
 			t.Errorf("%v", err)
 		}

diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
@@ -44,7 +44,7 @@ func TestRenderPage(t *testing.T) {
 			},
 		}
 
-		templ, err := template.ParseFiles(TestDirPath + "render_page/template_input.layout")
+		templ, err := template.ParseFiles(TestDirPath + "render_page/template_input.html")
 		if err != nil {
 			t.Errorf("%v", err)
 		}

diff --git a/pkg/engine/user_engine_test.go b/pkg/engine/user_engine_test.go
@@ -53,7 +53,7 @@ func TestRenderEngineGeneratedFiles(t *testing.T) {
 	}
 
 	t.Run("test rendering of post.html", func(t *testing.T) {
-		templ, err := template.ParseFiles(TestDirPath + "render_engine_generated/posts_template.layout")
+		templ, err := template.ParseFiles(TestDirPath + "render_engine_generated/posts_template.html")
 		if err != nil {
 			t.Errorf("%v", err)
 		}

diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
@@ -250,13 +250,13 @@ func (p *Parser) ParseRobots(inFilePath string, outFilePath string) {
 func (p *Parser) ParseLayoutFiles() *template.Template {
 
 	// Parsing all files in the layout/ dir which match the "*.html" pattern
-	templ, err := template.ParseGlob(helpers.SiteDataPath + "layout/*.layout")
+	templ, err := template.ParseGlob(helpers.SiteDataPath + "layout/*.html")
 	if err != nil {
 		p.ErrorLogger.Fatal(err)
 	}
 
 	// Parsing all files in the partials/ dir which match the "*.html" pattern
-	templ, err = templ.ParseGlob(helpers.SiteDataPath + "layout/partials/*.layout")
+	templ, err = templ.ParseGlob(helpers.SiteDataPath + "layout/partials/*.html")
 	if err != nil {
 		p.ErrorLogger.Fatal(err)
 	}

diff --git a/site/layout/page.layout → site/layout/page.html b/site/layout/page.layout → site/layout/page.html
diff --git a/site/layout/partials/footer.layout → site/layout/partials/footer.html b/site/layout/partials/footer.layout → site/layout/partials/footer.html
diff --git a/site/layout/partials/head.layout → site/layout/partials/head.html b/site/layout/partials/head.layout → site/layout/partials/head.html
diff --git a/site/layout/partials/header.layout → site/layout/partials/header.html b/site/layout/partials/header.layout → site/layout/partials/header.html
diff --git a/site/layout/partials/search.layout → site/layout/partials/search.html b/site/layout/partials/search.layout → site/layout/partials/search.html
diff --git a/site/layout/posts.layout → site/layout/posts.html b/site/layout/posts.layout → site/layout/posts.html
diff --git a/site/layout/tag-subpage.layout → site/layout/tag-subpage.html b/site/layout/tag-subpage.layout → site/layout/tag-subpage.html
diff --git a/site/layout/tags.layout → site/layout/tags.html b/site/layout/tags.layout → site/layout/tags.html
diff --git a/site/static/index.json b/site/static/index.json
@@ -1,100 +1 @@
-{
-  "docs.html": {
-    "CompleteURL": "docs.html",
-    "Frontmatter": {
-      "Title": "Anna Documentation",
-      "Date": "2024-04-10",
-      "Draft": false,
-      "JSFiles": null,
-      "Type": "",
-      "Description": "",
-      "PreviewImage": "",
-      "Tags": null,
-      "Authors": null
-    }
-  },
-  "index.html": {
-    "CompleteURL": "index.html",
-    "Frontmatter": {
-      "Title": "Home",
-      "Date": "2024-02-24",
-      "Draft": false,
-      "JSFiles": null,
-      "Type": "",
-      "Description": "homepage for our ssg",
-      "PreviewImage": "/static/plane.jpg",
-      "Tags": null,
-      "Authors": null
-    }
-  },
-  "posts/bench.html": {
-    "CompleteURL": "posts/bench.html",
-    "Frontmatter": {
-      "Title": "benchmark",
-      "Date": "2024-01-01",
-      "Draft": false,
-      "JSFiles": null,
-      "Type": "post",
-      "Description": "",
-      "PreviewImage": "",
-      "Tags": ["test-post"],
-      "Authors": null
-    }
-  },
-  "posts/building_anna.html": {
-    "CompleteURL": "posts/building_anna.html",
-    "Frontmatter": {
-      "Title": "Building anna",
-      "Date": "2024-04-04",
-      "Draft": false,
-      "JSFiles": null,
-      "Type": "post",
-      "Description": "This page contains a post about anna, a static site generator written in Go. This team project was built as part of AIEP 2024",
-      "PreviewImage": "",
-      "Tags": ["acm", "hsp", "go", "tech", "talk", "aiep"],
-      "Authors": ["Adhesh", "Aditya", "Nathan", "Anirudh"]
-    }
-  },
-  "posts/week-1.html": {
-    "CompleteURL": "posts/week-1.html",
-    "Frontmatter": {
-      "Title": "Week-1 Progress",
-      "Date": "2024-03-18",
-      "Draft": false,
-      "JSFiles": null,
-      "Type": "post",
-      "Description": "",
-      "PreviewImage": "",
-      "Tags": ["progress"],
-      "Authors": ["Adhesh", "Aditya", "Anirudh", "Nathan"]
-    }
-  },
-  "posts/week-2.html": {
-    "CompleteURL": "posts/week-2.html",
-    "Frontmatter": {
-      "Title": "Week-2 Progress",
-      "Date": "2024-03-25",
-      "Draft": false,
-      "JSFiles": null,
-      "Type": "post",
-      "Description": "",
-      "PreviewImage": "",
-      "Tags": ["progress"],
-      "Authors": ["Adhesh", "Aditya", "Anirudh", "Nathan"]
-    }
-  },
-  "posts/week-3.html": {
-    "CompleteURL": "posts/week-3.html",
-    "Frontmatter": {
-      "Title": "Week-3 Progress",
-      "Date": "2024-04-01",
-      "Draft": false,
-      "JSFiles": null,
-      "Type": "post",
-      "Description": "",
-      "PreviewImage": "",
-      "Tags": ["progress"],
-      "Authors": ["Adhesh", "Aditya", "Anirudh", "Nathan"]
-    }
-  }
-}
+{"docs.html":{"CompleteURL":"docs.html","Frontmatter":{"Title":"Anna Documentation","Date":"2024-04-10","Draft":false,"JSFiles":null,"Type":"","Description":"","PreviewImage":"","Tags":null,"Authors":null},"Tags":null},"index.html":{"CompleteURL":"index.html","Frontmatter":{"Title":"Home","Date":"2024-02-24","Draft":false,"JSFiles":null,"Type":"","Description":"homepage for our ssg","PreviewImage":"/static/plane.jpg","Tags":null,"Authors":null},"Tags":null},"posts/bench.html":{"CompleteURL":"posts/bench.html","Frontmatter":{"Title":"benchmark","Date":"2024-01-01","Draft":false,"JSFiles":null,"Type":"post","Description":"","PreviewImage":"","Tags":["test-post"],"Authors":null},"Tags":["test-post"]},"posts/building_anna.html":{"CompleteURL":"posts/building_anna.html","Frontmatter":{"Title":"Building anna","Date":"2024-04-04","Draft":false,"JSFiles":null,"Type":"post","Description":"This page contains a post about anna, a static site generator written in Go. This team project was built as part of AIEP 2024","PreviewImage":"","Tags":["acm","hsp","go","tech","talk","aiep"],"Authors":["Adhesh","Aditya","Nathan","Anirudh"]},"Tags":["acm","hsp","go","tech","talk","aiep"]},"posts/week-1.html":{"CompleteURL":"posts/week-1.html","Frontmatter":{"Title":"Week-1 Progress","Date":"2024-03-18","Draft":false,"JSFiles":null,"Type":"post","Description":"","PreviewImage":"","Tags":["progress"],"Authors":["Adhesh","Aditya","Anirudh","Nathan"]},"Tags":["progress"]},"posts/week-2.html":{"CompleteURL":"posts/week-2.html","Frontmatter":{"Title":"Week-2 Progress","Date":"2024-03-25","Draft":false,"JSFiles":null,"Type":"post","Description":"","PreviewImage":"","Tags":["progress"],"Authors":["Adhesh","Aditya","Anirudh","Nathan"]},"Tags":["progress"]},"posts/week-3.html":{"CompleteURL":"posts/week-3.html","Frontmatter":{"Title":"Week-3 Progress","Date":"2024-04-01","Draft":false,"JSFiles":null,"Type":"post","Description":"","PreviewImage":"","Tags":["progress"],"Authors":["Adhesh","Aditya","Anirudh","Nathan"]},"Tags":["progress"]}}
diff --git a/test/engine/json_index_test/want_index.json b/test/engine/json_index_test/want_index.json
@@ -1 +1 @@
-{"docs.md":{"CompleteURL":"docs.html","Frontmatter":{"Title":"Anna Documentation","Date":"","Draft":false,"JSFiles":null,"Type":"","Description":"","PreviewImage":"","Tags":null,"Authors":null}}}
+{"docs.md":{"CompleteURL":"docs.html","Frontmatter":{"Title":"Anna Documentation","Date":"","Draft":false,"JSFiles":null,"Type":"","Description":"","PreviewImage":"","Tags":null,"Authors":null},"Tags":null}}
diff --git a/...er_engine_generated/posts_template.layout → ...nder_engine_generated/posts_template.html b/...er_engine_generated/posts_template.layout → ...nder_engine_generated/posts_template.html
diff --git a/.../engine/render_page/template_input.layout → test/engine/render_page/template_input.html b/.../engine/render_page/template_input.layout → test/engine/render_page/template_input.html
diff --git a/.../render_tags/tags_subpage_template.layout → ...ne/render_tags/tags_subpage_template.html b/.../render_tags/tags_subpage_template.layout → ...ne/render_tags/tags_subpage_template.html
diff --git a/test/engine/render_tags/tags_template.layout → test/engine/render_tags/tags_template.html b/test/engine/render_tags/tags_template.layout → test/engine/render_tags/tags_template.html
diff --git a/...render_user_defined/template_input.layout → ...e/render_user_defined/template_input.html b/...render_user_defined/template_input.layout → ...e/render_user_defined/template_input.html
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"docs.md":{"CompleteURL":"docs.html","Frontmatter":{"Title":"Anna Documentation","Date":"","Draft":false,"JSFiles":null,"Type":"","Description":"","PreviewImage":"","Tags":null,"Authors":null}}}
		{"docs.md":{"CompleteURL":"docs.html","Frontmatter":{"Title":"Anna Documentation","Date":"","Draft":false,"JSFiles":null,"Type":"","Description":"","PreviewImage":"","Tags":null,"Authors":null},"Tags":null}}