Rename the h-card implementation to match up with the naming of h-feed and h-entry

This commit is contained in:
Danielle McLean 2017-10-08 16:55:21 +11:00
parent 4b7a8a7198
commit 3ff560e07e
Signed by: 00dani
GPG key ID: 5A5D2D1AFF12EEC5
5 changed files with 6 additions and 6 deletions

View file

@ -6,7 +6,7 @@
module Handler.Home where module Handler.Home where
import Import import Import
import Widget.Hcard (hcard) import Widget.Card ( hCard )
getHomeR :: Handler Html getHomeR :: Handler Html
getHomeR = do getHomeR = do

View file

@ -1,7 +1,7 @@
{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TemplateHaskell #-}
module Widget.Hcard (hcard) where module Widget.Card ( hCard ) where
import Import import Import
import Data.Maybe (fromJust) import Data.Maybe (fromJust)
@ -28,8 +28,8 @@ prettyPgp = T.unwords . T.chunksOf 4 . pgpKeyFingerprint
routeFromPgp :: PgpKey -> Route App routeFromPgp :: PgpKey -> Route App
routeFromPgp PgpKey { pgpKeyFingerprint = f } = staticR ["pgp", T.takeEnd 8 f ++ ".asc"] routeFromPgp PgpKey { pgpKeyFingerprint = f } = staticR ["pgp", T.takeEnd 8 f ++ ".asc"]
hcard :: Entity User -> Widget hCard :: Entity User -> Widget
hcard (Entity userId user) = do hCard (Entity userId user) = do
maybeAvatar <- libravatar user maybeAvatar <- libravatar user
mcurrentRoute <- getCurrentRoute mcurrentRoute <- getCurrentRoute
userProfiles <- handlerToWidget . runDB $ do userProfiles <- handlerToWidget . runDB $ do
@ -37,4 +37,4 @@ hcard (Entity userId user) = do
sites <- M.fromList . map entityToTuple <$> selectList [SiteId <-. (profileSiteId <$> profiles)] [] sites <- M.fromList . map entityToTuple <$> selectList [SiteId <-. (profileSiteId <$> profiles)] []
return $ arrangeProfiles sites profiles return $ arrangeProfiles sites profiles
pgpKeys <- handlerToWidget . runDB $ map entityVal <$> selectList [PgpKeyUserId ==. userId] [] pgpKeys <- handlerToWidget . runDB $ map entityVal <$> selectList [PgpKeyUserId ==. userId] []
$(widgetFile "hcard") $(widgetFile "mf2/h-card")

View file

@ -1 +1 @@
^{hcard user} ^{hCard user}