From 5ca255e9c8d6e073449d466d7952c4c93a7dfe16 Mon Sep 17 00:00:00 2001 From: Robert Pearce Date: Tue, 10 Nov 2020 10:34:58 -0500 Subject: [PATCH] rss description should be post body --- generator/src/Main.hs | 6 ------ src/index.html | 2 +- src/posts/2020-09-21-hello-world.md | 2 +- src/posts/2020-09-22-hola-mundo.md | 2 +- src/templates/default.html | 6 +++--- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/generator/src/Main.hs b/generator/src/Main.hs index d72da72..f610117 100644 --- a/generator/src/Main.hs +++ b/generator/src/Main.hs @@ -59,7 +59,6 @@ main = hakyllWith config $ do match "css/*" $ do route idRoute compile compressCssCompiler - match "posts/*" $ do let ctx = constField "type" "article" <> postCtx route $ metadataRoute titleRoute @@ -68,7 +67,6 @@ main = hakyllWith config $ do >>= loadAndApplyTemplate "templates/post.html" ctx >>= saveSnapshot "content" >>= loadAndApplyTemplate "templates/default.html" ctx - match "index.html" $ do route idRoute compile $ do @@ -81,10 +79,8 @@ main = hakyllWith config $ do getResourceBody >>= applyAsTemplate indexCtx >>= loadAndApplyTemplate "templates/default.html" indexCtx - match "templates/*" $ compile templateBodyCompiler - create ["sitemap.xml"] $ do route idRoute compile $ do @@ -96,11 +92,9 @@ main = hakyllWith config $ do <> listField "pages" postCtx (return pages) makeItem ("" :: String) >>= loadAndApplyTemplate "templates/sitemap.xml" sitemapCtx - create ["rss.xml"] $ do route idRoute compile (feedCompiler renderRss) - create ["atom.xml"] $ do route idRoute compile (feedCompiler renderAtom) diff --git a/src/index.html b/src/index.html index 37f39af..6fc847e 100644 --- a/src/index.html +++ b/src/index.html @@ -1,5 +1,5 @@ --- -description: "This is me saying hello to the world" +desc: "This is me saying hello to the world" image: "./images/robert-pearce-UwHN0jU_YqQ-unsplash-800w.jpg" lang: "en" stylesheet: "default" diff --git a/src/posts/2020-09-21-hello-world.md b/src/posts/2020-09-21-hello-world.md index df73bca..c8d2e2b 100644 --- a/src/posts/2020-09-21-hello-world.md +++ b/src/posts/2020-09-21-hello-world.md @@ -1,7 +1,7 @@ --- author: "My name" authorTwitter: "@MyName" -description: "I announce myself to the world" +desc: "I announce myself to the world" image: "./images/waiheke-stony-batter.jpg" keywords: "hello, announcement" lang: "en" diff --git a/src/posts/2020-09-22-hola-mundo.md b/src/posts/2020-09-22-hola-mundo.md index 1bc908c..11b9109 100644 --- a/src/posts/2020-09-22-hola-mundo.md +++ b/src/posts/2020-09-22-hola-mundo.md @@ -1,7 +1,7 @@ --- author: "Mi nombre" authorTwitter: "@MiNombre" -description: "Me anuncio al mundo" +desc: "Me anuncio al mundo" image: "./images/waiheke-stony-batter.jpg" keywords: "hola, anuncio" lang: "es" diff --git a/src/templates/default.html b/src/templates/default.html index 414b9d9..264fdc0 100644 --- a/src/templates/default.html +++ b/src/templates/default.html @@ -5,7 +5,7 @@ - + $if(author)$ $endif$ @@ -16,7 +16,7 @@ - + $if(image)$ $endif$ @@ -29,7 +29,7 @@ - + $if(image)$ $endif$