cadey
/
time-wasting-thread-memorial
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use renderMarkup instead of renderHtml

This commit is contained in:
Christine Dodrill 2015-07-28 09:10:57 -07:00
parent fd944b3e34
commit e255e6672e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/Main.hs
View File

@ -5,9 +5,9 @@ import Data.Text.Lazy (toStrict)
import qualified Database.SQLite.Simple as Db import qualified Database.SQLite.Simple as Db
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
import qualified Network.Wai.Middleware.Static as Static import qualified Network.Wai.Middleware.Static as Static
import Text.Blaze.Html.Renderer.Text import Text.Blaze.Renderer.Text
import Web.Spock.Safe ((<//>)) 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.Post as Post
import qualified Within.DBMemorial.User as User import qualified Within.DBMemorial.User as User
import qualified Within.DBMemorial.Views.Materialize as Materialize import qualified Within.DBMemorial.Views.Materialize as Materialize
@ -28,7 +28,7 @@ main = do
S.middleware $ RequestLogger.logStdout S.middleware $ RequestLogger.logStdout
S.get S.root $ 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.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)))

1
web/time-wasting-thread-memorial.cabal
View File

@ -62,6 +62,7 @@ executable time-wasting-thread-memorial
, sqlite-simple >=0.4.9.0 , sqlite-simple >=0.4.9.0
, text >=1.2.1.1 , text >=1.2.1.1
, blaze-html >=0.8.0.2 , blaze-html >=0.8.0.2
, blaze-markup >=0.7.0.2
, wai-middleware-static >=0.7.0.1 , wai-middleware-static >=0.7.0.1
, wai-extra >=1.3.0 , wai-extra >=1.3.0