From e255e6672eb35bff743fca1142e46e6dcf00f9c8 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Tue, 28 Jul 2015 09:10:57 -0700 Subject: [PATCH] Use renderMarkup instead of renderHtml --- web/src/Main.hs | 8 ++++---- web/time-wasting-thread-memorial.cabal | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/src/Main.hs b/web/src/Main.hs index a4a5a7a..357bb2c 100644 --- a/web/src/Main.hs +++ b/web/src/Main.hs @@ -5,9 +5,9 @@ import Data.Text.Lazy (toStrict) import qualified Database.SQLite.Simple as Db import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Network.Wai.Middleware.Static as Static -import Text.Blaze.Html.Renderer.Text +import Text.Blaze.Renderer.Text import Web.Spock.Safe (()) -import qualified Web.Spock.Safe as S hiding (head) +import qualified Web.Spock.Safe as S import qualified Within.DBMemorial.Post as Post import qualified Within.DBMemorial.User as User import qualified Within.DBMemorial.Views.Materialize as Materialize @@ -28,7 +28,7 @@ main = do S.middleware $ RequestLogger.logStdout S.get S.root $ - S.html $ toStrict (renderHtml (Materialize.base "The OP" (Post.render h))) + S.html $ toStrict (renderMarkup (Materialize.base "The OP" (Post.render h))) S.get "user" $ - S.html $ toStrict (renderHtml (Materialize.base "The first poster" (User.render user))) + S.html $ toStrict (renderMarkup (Materialize.base "The first poster" (User.render user))) diff --git a/web/time-wasting-thread-memorial.cabal b/web/time-wasting-thread-memorial.cabal index 994bbd2..6becf59 100644 --- a/web/time-wasting-thread-memorial.cabal +++ b/web/time-wasting-thread-memorial.cabal @@ -62,6 +62,7 @@ executable time-wasting-thread-memorial , sqlite-simple >=0.4.9.0 , text >=1.2.1.1 , blaze-html >=0.8.0.2 + , blaze-markup >=0.7.0.2 , wai-middleware-static >=0.7.0.1 , wai-extra >=1.3.0