on master help sign in
* updated elm-happstack example
commit4dd5937996503909ae8c07291d22bb6279962afd authorVincent Ambo <v.ambo@me.com> dateWed 30 May 2012, 20:05 (14 years ago) parentc10efa0
2 files changed+14−14
Examples/elm-happstack/Main.hs+11−11 Examples/elm-happstack/elm_source/index.elm+3−3
Examples/elm-happstack/Main.hs+11−11
@@ -1,18 +1,18 @@
1−{-# LANGUAGE QuasiQuotes #-}
1+{-# LANGUAGE QuasiQuotes, TemplateHaskell #-}
22
33import Control.Monad (msum)
44import Happstack.Server
5−import Language.Elm (elmFile, elm)
6−
7−import qualified Language.Elm as Elm
5+import Language.Elm
6+import Language.Elm.Quasi
87
98elmLoc :: String
109elmLoc = "http://f.cl.ly/items/2e3Z3r3v29263U393c3x/elm-min.js"
1110
12−elmResponse :: String -- ^ Page title
13− -> String -- ^ elm source
11+elmResponse :: ElmSource a
12+ => String -- ^ Page title
13+ -> a -- ^ elm source
1414 -> Response
15−elmResponse title = toResponse . Elm.toHtml elmLoc title
15+elmResponse title = toResponse . toHtml elmLoc title
1616
1717-- embedding variables (in this case URLs)
1818rootHandler :: ServerPart Response
@@ -21,16 +21,16 @@ rootHandler = ok $ elmResponse "Welcome!" $ elmIndex
2121 mouse = "/mouse"
2222 clock = "/clock"
2323 shapes = "/shapes"
24− elmIndex = [elmFile|elm_source/index.elm|]
24+ elmIndex = $(elmFile "elm_source/index.elm")
2525
2626-- loading elm source from file
2727
2828mouseHandler :: ServerPart Response
29−mouseHandler = ok $ elmResponse "Mouse position demo" $
30− [elmFile|elm_source/mouse.elm|]
29+mouseHandler = ok $ elmResponse "Mouse position demo"
30+ $(elmFile "elm_source/mouse.elm")
3131
3232clockHandler :: ServerPart Response
33−clockHandler = ok $ elmResponse "A clock" $ [elmFile|elm_source/clock.elm|]
33+clockHandler = ok $ elmResponse "A clock" $(elmFile "elm_source/clock.elm")
3434
3535-- embedding elm code inside Haskell using the QuasiQuoter:
3636shapesPage = [elm|
Examples/elm-happstack/elm_source/index.elm+3−3
@@ -25,9 +25,9 @@ info w = List.map (\f -> f ()) . List.intersperse (\x -> plainText "&nbsp;") . L
2525 toText ". Since you are looking at this page it is safe to assume that you already have the example code. "
2626 , text $ toText "A second Happstack example using web-routes will be added later on."
2727 , section "More examples:"
28− , text $ toText "- " ++ link ^{mouse} (toText "A simple mouse input example")
29− , text $ toText "- " ++ link ^{clock} (toText "An animated analog clock")
30− , text $ toText "- " ++ link ^{shapes} (toText "Some simple rendered shapes")
28+ , text $ toText "- " ++ link "#{mouse}" (toText "A simple mouse input example")
29+ , text $ toText "- " ++ link "#{clock}" (toText "An animated analog clock")
30+ , text $ toText "- " ++ link "#{shapes}" (toText "Some simple rendered shapes")
3131 ]
3232
3333body outer inner = width outer . box 2 . flow down . (:) (plainText "&nbsp;") $ info inner