606dad4 · elk · git.iko.soy

elm.cabal−1

compare with master

unifiedsplit

@@ -57,7 +57,6 @@ Executable elm

57 Develop.Compile

58 Develop.Generate.Help

59 Develop.Generate.Index

60− Develop.Generate.NotFound

61 Develop.StaticFiles

60 Develop.StaticFiles

62 Develop.StaticFiles.Build

61 Develop.StaticFiles.Build

63 Diff

62 Diff

ui/terminal/src/Develop.hs+5−10

@@ -22,7 +22,6 @@ import qualified Text.Blaze.Html.Renderer.Utf8 as Blaze

22import qualified Develop.Compile as Compile

23import qualified Develop.Generate.Help as Generate

24import qualified Develop.Generate.Index as Index

25−import qualified Develop.Generate.NotFound as NotFound

26import qualified Develop.StaticFiles as StaticFiles

25import qualified Develop.StaticFiles as StaticFiles

27

26

28

27

@@ -38,14 +37,6 @@ data Flags =

38

37

39run :: () -> Flags -> IO ()

38run :: () -> Flags -> IO ()

40run () (Flags maybePort) =

39run () (Flags maybePort) =

41− -- TODO get `elm reactor` running again

42− if True then

43− putStrLn $

44− "The reactor is not available in the ALPHA period.\n\

45− \\n\

46− \The goal is for package authors to get code updated and give early feedback.\n\

47− \Professionals and hobbyists should NOT be ugrading at this time!\n"

48− else

49 let

40 let

50 port =

41 port =

51 maybe 8000 id maybePort

42 maybe 8000 id maybePort

@@ -111,7 +102,11 @@ error404 :: Snap ()

111error404 =

102error404 =

112 do modifyResponse $ setResponseStatus 404 "Not Found"

103 do modifyResponse $ setResponseStatus 404 "Not Found"

113 modifyResponse $ setContentType "text/html; charset=utf-8"

104 modifyResponse $ setContentType "text/html; charset=utf-8"

114− writeBuilder (Blaze.renderHtmlBuilder NotFound.html)

105+ writeBuilder $ Blaze.renderHtmlBuilder $

106+ Generate.makeHtml

107+ "Page Not Found"

108+ ("/" ++ StaticFiles.elmPath)

109+ "Elm.NotFound.fullscreen();"

115

110

116

111

117

112

ui/terminal/src/Develop/Generate/NotFound.hsdeleted−14

@@ -1,14 +0,0 @@

1−module Develop.Generate.NotFound where

2−

3−import qualified Text.Blaze.Html5 as H

4−

5−import qualified Develop.StaticFiles as StaticFiles

6−import qualified Develop.Generate.Help as Help

7−

8−

9−html :: H.Html

10−html =

11− Help.makeHtml

12− "Page Not Found"

13− ("/" ++ StaticFiles.elmPath)

14− "Elm.NotFound.fullscreen();"