on master help sign in
Move "NotFound" out of its own module
commit606dad4d56d35a00c6014be650542a8ddff0d6a1 authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 5 Apr 2018, 14:04 (9 years ago) parentd7f0ce2
3 files changed+5−25
elm.cabal−1 ui/terminal/src/Develop.hs+5−10 ui/terminal/src/Develop/Generate/NotFound.hs−14
elm.cabal−1
@@ -57,7 +57,6 @@ Executable elm
5757 Develop.Compile
5858 Develop.Generate.Help
5959 Develop.Generate.Index
60− Develop.Generate.NotFound
6160 Develop.StaticFiles
6261 Develop.StaticFiles.Build
6362 Diff
ui/terminal/src/Develop.hs+5−10
@@ -22,7 +22,6 @@ import qualified Text.Blaze.Html.Renderer.Utf8 as Blaze
2222import qualified Develop.Compile as Compile
2323import qualified Develop.Generate.Help as Generate
2424import qualified Develop.Generate.Index as Index
25−import qualified Develop.Generate.NotFound as NotFound
2625import qualified Develop.StaticFiles as StaticFiles
2726
2827
@@ -38,14 +37,6 @@ data Flags =
3837
3938run :: () -> Flags -> IO ()
4039run () (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
4940 let
5041 port =
5142 maybe 8000 id maybePort
@@ -111,7 +102,11 @@ error404 :: Snap ()
111102error404 =
112103 do modifyResponse $ setResponseStatus 404 "Not Found"
113104 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();"
115110
116111
117112
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();"