pageUrl functionality complete
This commit is contained in:
parent
4d45ab4bd5
commit
1ee03ea495
2 changed files with 7 additions and 3 deletions
|
@ -93,16 +93,16 @@ markdownPost src = do
|
||||||
|
|
||||||
post <- readMarkdownPost src
|
post <- readMarkdownPost src
|
||||||
let rPost = fromPost post
|
let rPost = fromPost post
|
||||||
-- Shake.putInfo $ show . toJSON $ rPost
|
|
||||||
postHtml <- applyTemplate "post.html" rPost
|
postHtml <- applyTemplate "post.html" rPost
|
||||||
|
|
||||||
time <- Utilities.now
|
time <- Utilities.now
|
||||||
|
-- Shake.putInfo $ T.unpack $ urlConvert target
|
||||||
let page =
|
let page =
|
||||||
Page
|
Page
|
||||||
{ pageTitle = rPostTitle rPost,
|
{ pageTitle = rPostTitle rPost,
|
||||||
pageContent = postHtml,
|
pageContent = postHtml,
|
||||||
pageNow = time,
|
pageNow = time,
|
||||||
pageUrl = T.pack ""
|
pageUrl = urlConvert target
|
||||||
}
|
}
|
||||||
applyTemplateAndWrite "default.html" page target
|
applyTemplateAndWrite "default.html" page target
|
||||||
|
|
||||||
|
@ -118,12 +118,13 @@ home =
|
||||||
let posts' = map fromPost posts
|
let posts' = map fromPost posts
|
||||||
html <- applyTemplate "home.html" $ HM.singleton "posts" posts'
|
html <- applyTemplate "home.html" $ HM.singleton "posts" posts'
|
||||||
time <- Utilities.now
|
time <- Utilities.now
|
||||||
|
-- Shake.putInfo $ T.unpack $ urlConvert target
|
||||||
let page =
|
let page =
|
||||||
Page
|
Page
|
||||||
{ pageTitle = T.pack "Home",
|
{ pageTitle = T.pack "Home",
|
||||||
pageContent = html,
|
pageContent = html,
|
||||||
pageNow = time,
|
pageNow = time,
|
||||||
pageUrl = T.pack ""
|
pageUrl = urlConvert target
|
||||||
}
|
}
|
||||||
applyTemplateAndWrite "default.html" page target
|
applyTemplateAndWrite "default.html" page target
|
||||||
|
|
||||||
|
|
|
@ -138,3 +138,6 @@ parseDate str = do
|
||||||
date <- parseTimeM False defaultTimeLocale "%Y-%-m-%-d" $ T.unpack str
|
date <- parseTimeM False defaultTimeLocale "%Y-%-m-%-d" $ T.unpack str
|
||||||
-- need to append the time to avoid potential issues
|
-- need to append the time to avoid potential issues
|
||||||
return $ T.pack $ formatTime @UTCTime defaultTimeLocale "%Y-%m-%dT00:00:00Z" date
|
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"
|
||||||
|
|
Loading…
Reference in a new issue