From 9cd6573ea7d03aa77826d32efc0d5bd7185d562a Mon Sep 17 00:00:00 2001 From: Anthony Burzillo Date: Sun, 11 Aug 2013 13:55:44 -0400 Subject: [PATCH 1/3] Remove uneeded whitespace from files created on init --- yesod-bin/hsfiles/mongo.hsfiles | 4 ++-- yesod-bin/hsfiles/mysql.hsfiles | 4 ++-- yesod-bin/hsfiles/postgres-fay.hsfiles | 4 ++-- yesod-bin/hsfiles/postgres.hsfiles | 4 ++-- yesod-bin/hsfiles/simple.hsfiles | 4 ++-- yesod-bin/hsfiles/sqlite.hsfiles | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/yesod-bin/hsfiles/mongo.hsfiles b/yesod-bin/hsfiles/mongo.hsfiles index d523d061..7586fdf6 100644 --- a/yesod-bin/hsfiles/mongo.hsfiles +++ b/yesod-bin/hsfiles/mongo.hsfiles @@ -5729,10 +5729,10 @@ $maybe msg <- mmsg
  • A Widget's Html, Css and Javascript are separated in three files with the # - \.hamlet, .lucius and .julius extensions. + \.hamlet, .lucius and .julius extensions.
  • If you had javascript enabled then you wouldn't be seeing this. - +
  • This is an example trivial Form. Read the # \Forms chapter # diff --git a/yesod-bin/hsfiles/mysql.hsfiles b/yesod-bin/hsfiles/mysql.hsfiles index f71ba69a..d8009cfe 100644 --- a/yesod-bin/hsfiles/mysql.hsfiles +++ b/yesod-bin/hsfiles/mysql.hsfiles @@ -5759,10 +5759,10 @@ $maybe msg <- mmsg
  • A Widget's Html, Css and Javascript are separated in three files with the # - \.hamlet, .lucius and .julius extensions. + \.hamlet, .lucius and .julius extensions.
  • If you had javascript enabled then you wouldn't be seeing this. - +
  • This is an example trivial Form. Read the # \Forms chapter # diff --git a/yesod-bin/hsfiles/postgres-fay.hsfiles b/yesod-bin/hsfiles/postgres-fay.hsfiles index 15dea3bf..a732e3ab 100644 --- a/yesod-bin/hsfiles/postgres-fay.hsfiles +++ b/yesod-bin/hsfiles/postgres-fay.hsfiles @@ -5840,10 +5840,10 @@ $maybe msg <- mmsg
  • A Widget's Html, Css and Javascript are separated in three files with the # - \.hamlet, .lucius and .julius extensions. + \.hamlet, .lucius and .julius extensions.
  • If you had javascript enabled then you wouldn't be seeing this. - +
  • This is an example trivial Form. Read the # \Forms chapter # diff --git a/yesod-bin/hsfiles/postgres.hsfiles b/yesod-bin/hsfiles/postgres.hsfiles index 81355918..c1f773d7 100644 --- a/yesod-bin/hsfiles/postgres.hsfiles +++ b/yesod-bin/hsfiles/postgres.hsfiles @@ -5733,10 +5733,10 @@ $maybe msg <- mmsg
  • A Widget's Html, Css and Javascript are separated in three files with the # - \.hamlet, .lucius and .julius extensions. + \.hamlet, .lucius and .julius extensions.
  • If you had javascript enabled then you wouldn't be seeing this. - +
  • This is an example trivial Form. Read the # \Forms chapter # diff --git a/yesod-bin/hsfiles/simple.hsfiles b/yesod-bin/hsfiles/simple.hsfiles index 1c452855..6ae4d11c 100644 --- a/yesod-bin/hsfiles/simple.hsfiles +++ b/yesod-bin/hsfiles/simple.hsfiles @@ -5610,10 +5610,10 @@ $maybe msg <- mmsg
  • A Widget's Html, Css and Javascript are separated in three files with the # - \.hamlet, .lucius and .julius extensions. + \.hamlet, .lucius and .julius extensions.
  • If you had javascript enabled then you wouldn't be seeing this. - +
  • This is an example trivial Form. Read the # \Forms chapter # diff --git a/yesod-bin/hsfiles/sqlite.hsfiles b/yesod-bin/hsfiles/sqlite.hsfiles index 961133fc..5889d322 100644 --- a/yesod-bin/hsfiles/sqlite.hsfiles +++ b/yesod-bin/hsfiles/sqlite.hsfiles @@ -5729,10 +5729,10 @@ $maybe msg <- mmsg
  • A Widget's Html, Css and Javascript are separated in three files with the # - \.hamlet, .lucius and .julius extensions. + \.hamlet, .lucius and .julius extensions.
  • If you had javascript enabled then you wouldn't be seeing this. - +
  • This is an example trivial Form. Read the # \Forms chapter # From 3e100451d4712e6e8c9f665e5e187aa70702cf87 Mon Sep 17 00:00:00 2001 From: Anthony Burzillo Date: Sun, 6 Jul 2014 23:21:46 -0400 Subject: [PATCH 2/3] Fix import error --- yesod-newsfeed/Yesod/Feed.hs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yesod-newsfeed/Yesod/Feed.hs b/yesod-newsfeed/Yesod/Feed.hs index 3af91575..1601cff4 100644 --- a/yesod-newsfeed/Yesod/Feed.hs +++ b/yesod-newsfeed/Yesod/Feed.hs @@ -26,6 +26,8 @@ import Yesod.AtomFeed import Yesod.RssFeed import Yesod.Core +import Data.Text + newsFeed :: MonadHandler m => Feed (Route (HandlerSite m)) -> m TypedContent newsFeed f = selectRep $ do provideRep $ atomFeed f From 54a4417f54157f63443f1dddce1d9bb14c2d193e Mon Sep 17 00:00:00 2001 From: Anthony Burzillo Date: Sun, 6 Jul 2014 23:25:17 -0400 Subject: [PATCH 3/3] Add color to "Build failure" warning --- yesod-bin/Devel.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs index ccd4c358..77f34286 100644 --- a/yesod-bin/Devel.hs +++ b/yesod-bin/Devel.hs @@ -266,7 +266,7 @@ devel opts passThroughArgs = withSocketsDo $ withManager $ \manager -> do unless (anyTouched || haskellFileChanged) $ loop list1 if not success then liftIO $ do - putStrLn "Build failure, pausing..." + putStrLn "\x1b[1;31mBuild failure, pausing...\x1b[0m" runBuildHook $ failHook opts else do liftIO $ runBuildHook $ successHook opts