From 1ee03ea495e8d4d16aa0838078078cda24c76c5d Mon Sep 17 00:00:00 2001 From: Pagwin Date: Sun, 23 Feb 2025 18:20:28 -0500 Subject: [PATCH] pageUrl functionality complete --- app/Main.hs | 7 ++++--- app/Utilities.hs | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Main.hs b/app/Main.hs index d5d4c40..0d5305b 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -93,16 +93,16 @@ markdownPost src = do post <- readMarkdownPost src let rPost = fromPost post - -- Shake.putInfo $ show . toJSON $ rPost postHtml <- applyTemplate "post.html" rPost time <- Utilities.now + -- Shake.putInfo $ T.unpack $ urlConvert target let page = Page { pageTitle = rPostTitle rPost, pageContent = postHtml, pageNow = time, - pageUrl = T.pack "" + pageUrl = urlConvert target } applyTemplateAndWrite "default.html" page target @@ -118,12 +118,13 @@ home = let posts' = map fromPost posts html <- applyTemplate "home.html" $ HM.singleton "posts" posts' time <- Utilities.now + -- Shake.putInfo $ T.unpack $ urlConvert target let page = Page { pageTitle = T.pack "Home", pageContent = html, pageNow = time, - pageUrl = T.pack "" + pageUrl = urlConvert target } applyTemplateAndWrite "default.html" page target diff --git a/app/Utilities.hs b/app/Utilities.hs index b741827..e4f0270 100644 --- a/app/Utilities.hs +++ b/app/Utilities.hs @@ -138,3 +138,6 @@ parseDate str = do date <- parseTimeM False defaultTimeLocale "%Y-%-m-%-d" $ T.unpack str -- need to append the time to avoid potential issues return $ T.pack $ formatTime @UTCTime defaultTimeLocale "%Y-%m-%dT00:00:00Z" date + +urlConvert :: FilePath -> Text +urlConvert = T.pack . FP.dropFileName . flip FP.replaceDirectory1 "https://pagwin.xyz"