fix: fix paths of robots.txt and sitemap.xml

anna-ssg · Apr 2, 2024 · c152bf8 · c152bf8
1 parent bc9caab
commit c152bf8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 33 deletions.
diff --git a/cmd/anna/anna.go b/cmd/anna/anna.go
@@ -44,15 +44,15 @@ func (cmd *Cmd) VanillaRender() {
 	fileSystem := os.DirFS(helpers.SiteDataPath + "content/")
 	p.ParseMDDir(helpers.SiteDataPath+"content/", fileSystem)
 
-	p.ParseRobots(helpers.SiteDataPath+"layout/robots.txt", helpers.SiteDataPath+"rendered/layout/robots.txt")
+	p.ParseRobots(helpers.SiteDataPath+"layout/robots.txt", helpers.SiteDataPath+"rendered/robots.txt")
 	p.ParseLayoutFiles()
 
 	e.Templates = p.Templates
 	e.TagsMap = p.TagsMap
 	e.LayoutConfig = p.LayoutConfig
 	e.Posts = p.Posts
 
-	e.GenerateSitemap(helpers.SiteDataPath + "rendered/layout/sitemap.xml")
+	e.GenerateSitemap(helpers.SiteDataPath + "rendered/sitemap.xml")
 	e.GenerateFeed()
 	e.GenerateJSONIndex(helpers.SiteDataPath)
 	helper.CopyDirectoryContents(helpers.SiteDataPath+"static/", helpers.SiteDataPath+"rendered/static/")

diff --git a/site/layout/partials/head.html b/site/layout/partials/head.html
@@ -1,33 +1,29 @@
 {{define "head"}}
 <!doctype html>
 <html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>{{.Frontmatter.Title}}</title>
 
-        <link rel="preload stylesheet" href="{{.Layout.ThemeURL}}" />
-        <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/highlight.min.js"></script>
-        <link
-            rel="alternate"
-            type="application/atom+xml"
-            title="feed"
-            href="/feed.atom"
-        />
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>{{.Frontmatter.Title}}</title>
 
-        {{range .Frontmatter.JSFiles}}
-        <script src="/script/{{.}}" defer></script>
-        {{end}} {{range .Layout.SiteScripts}}
-        <script src="/script/{{.}}" defer></script>
-        {{end}}
+    <link rel="preload stylesheet" href="{{.Layout.ThemeURL}}" />
+    <script src="https://cdn.jsdelivr.net/gh/highlightjs/cdn-release@11.9.0/build/highlight.min.js"></script>
+    <link rel="alternate" type="application/atom+xml" title="feed" href="/feed.atom" />
 
-        <meta property="og:type" content="website" />
-        <meta property="og:title" content="{{ .Frontmatter.Title }}" />
-        <meta
-            property="og:description"
-            content="{{ .Frontmatter.Description }}"
-        />
-        <meta property="og:image" content="{{ .Frontmatter.PreviewImage }}" />
-    </head>
+    {{range .Frontmatter.JSFiles}}
+    <script src="/script/{{.}}" defer></script>
+    {{end}} {{range .Layout.SiteScripts}}
+    <script src="/script/{{.}}" defer></script>
     {{end}}
-</html>
+
+    <meta property="og:type" content="website" />
+    <meta property="og:title" content="{{ .Frontmatter.Title }}" />
+    <meta property="og:description" content="{{ .Frontmatter.Description }}" />
+    <meta property="og:image" content="{{ .Frontmatter.PreviewImage }}" />
+
+    <meta name="description" content="{{ .Frontmatter.Description }}">
+</head>
+{{end}}
+
+</html>
diff --git a/site/static/index.json b/site/static/index.json
diff --git a/test/engine/render_user_defined/rendered/.html b/test/engine/render_user_defined/rendered/.html
@@ -8,4 +8,3 @@
 <h1>Index Page</h1>
 </body>
 </html>
-
diff --git a/test/engine/sitemap/got_sitemap.xml b/test/engine/sitemap/got_sitemap.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 	<url>
-		<loc>example.org/index.html</loc>
+		<loc>example.org/about.html</loc>
 		<lastmod>2024-02-23</lastmod>
 	</url>
 	<url>
-		<loc>example.org/research.html</loc>
+		<loc>example.org/index.html</loc>
 		<lastmod>2024-02-23</lastmod>
 	</url>
 	<url>
-		<loc>example.org/about.html</loc>
+		<loc>example.org/research.html</loc>
 		<lastmod>2024-02-23</lastmod>
 	</url>
 </urlset>