diff --git a/yesod-auth/Yesod/Auth.hs b/yesod-auth/Yesod/Auth.hs index 93e8445e..9d447fd4 100644 --- a/yesod-auth/Yesod/Auth.hs +++ b/yesod-auth/Yesod/Auth.hs @@ -1,9 +1,9 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE QuasiQuotes, TypeFamilies, TemplateHaskell #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -27,8 +27,6 @@ module Yesod.Auth , AuthException (..) ) where -#include "qq.h" - import Control.Monad (when) import Control.Monad.Trans.Maybe @@ -132,7 +130,7 @@ mkYesodSub "Auth" [ ClassP ''YesodAuth [VarT $ mkName "master"] ] #define STRINGS *Texts - [QQ(parseRoutes)| + [parseRoutes| /check CheckR GET /login LoginR GET /logout LogoutR GET POST @@ -151,7 +149,7 @@ setCreds doRedirects creds = do Nothing -> when doRedirects $ do case authRoute y of - Nothing -> do rh <- defaultLayout $ addHtml [QQ(shamlet)|

Invalid login |] + Nothing -> do rh <- defaultLayout $ addHtml [shamlet|

Invalid login |] sendResponse rh Just ar -> do setMessageI Msg.InvalidLogin redirect ar @@ -169,7 +167,7 @@ getCheckR = do addHtml $ html' creds) (jsonCreds creds) where html' creds = - [QQ(shamlet)| + [shamlet|

Authentication Status $maybe _ <- creds

Logged in. diff --git a/yesod-auth/Yesod/Auth/BrowserId.hs b/yesod-auth/Yesod/Auth/BrowserId.hs index 9b8fd429..f5d6a835 100644 --- a/yesod-auth/Yesod/Auth/BrowserId.hs +++ b/yesod-auth/Yesod/Auth/BrowserId.hs @@ -1,5 +1,4 @@ {-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} module Yesod.Auth.BrowserId ( authBrowserId @@ -16,8 +15,6 @@ import Data.Maybe (fromMaybe) import Control.Monad.IO.Class (liftIO) import Control.Exception (throwIO) -#include "qq.h" - pid :: Text pid = "browserid" @@ -64,7 +61,7 @@ helper maudience = AuthPlugin _ -> notFound , apLogin = \toMaster -> do addScriptRemote browserIdJs - addHamlet [QQ(hamlet)| + addHamlet [hamlet|

diff --git a/yesod-auth/Yesod/Auth/Dummy.hs b/yesod-auth/Yesod/Auth/Dummy.hs index bd42c1bc..427c8230 100644 --- a/yesod-auth/Yesod/Auth/Dummy.hs +++ b/yesod-auth/Yesod/Auth/Dummy.hs @@ -1,5 +1,4 @@ {-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} -- | Provides a dummy authentication module that simply lets a user specify -- his/her identifier. This is not intended for real world use, just for @@ -8,8 +7,6 @@ module Yesod.Auth.Dummy ( authDummy ) where -#include "qq.h" - import Yesod.Auth import Yesod.Form (runInputPost, textField, ireq) import Yesod.Handler (notFound) @@ -26,7 +23,7 @@ authDummy = dispatch _ _ = notFound url = PluginR "dummy" [] login authToMaster = - addHamlet [QQ(hamlet)| + addHamlet [hamlet|

\Your new identifier is: diff --git a/yesod-auth/Yesod/Auth/Email.hs b/yesod-auth/Yesod/Auth/Email.hs index f1c45063..f6036617 100644 --- a/yesod-auth/Yesod/Auth/Email.hs +++ b/yesod-auth/Yesod/Auth/Email.hs @@ -1,5 +1,4 @@ {-# LANGUAGE QuasiQuotes, TypeFamilies #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE FlexibleContexts #-} module Yesod.Auth.Email @@ -15,8 +14,6 @@ module Yesod.Auth.Email , isValidPass ) where -#include "qq.h" - import Network.Mail.Mime (randomString) import Yesod.Auth import System.Random @@ -82,7 +79,7 @@ class (YesodAuth m, PathPiece (AuthEmailId m)) => YesodAuthEmail m where authEmail :: YesodAuthEmail m => AuthPlugin m authEmail = AuthPlugin "email" dispatch $ \tm -> - [QQ(whamlet)| + [whamlet| @@ -116,7 +113,7 @@ getRegisterR = do defaultLayout $ do setTitleI Msg.RegisterLong addWidget - [QQ(whamlet)| + [whamlet|

_{Msg.EnterEmail}

_{Msg.ConfirmationEmailSent email} |] + [whamlet|

_{Msg.ConfirmationEmailSent email} |] getVerifyR :: YesodAuthEmail m => AuthEmailId m -> Text -> GHandler Auth m RepHtml @@ -168,7 +165,7 @@ getVerifyR lid key = do defaultLayout $ do setTitleI Msg.InvalidKey addWidget - [QQ(whamlet)|

_{Msg.InvalidKey} |] + [whamlet|

_{Msg.InvalidKey} |] postLoginR :: YesodAuthEmail master => GHandler Auth master () postLoginR = do @@ -207,7 +204,7 @@ getPasswordR = do defaultLayout $ do setTitleI Msg.SetPassTitle addWidget - [QQ(whamlet)| + [whamlet|

_{Msg.SetPass}

diff --git a/yesod-auth/Yesod/Auth/GoogleEmail.hs b/yesod-auth/Yesod/Auth/GoogleEmail.hs index 233866ca..6c289526 100644 --- a/yesod-auth/Yesod/Auth/GoogleEmail.hs +++ b/yesod-auth/Yesod/Auth/GoogleEmail.hs @@ -1,5 +1,4 @@ {-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} -- | Use an email address as an identifier via Google's OpenID login system. -- diff --git a/yesod-auth/Yesod/Auth/HashDB.hs b/yesod-auth/Yesod/Auth/HashDB.hs index 93be6f40..207bc40a 100644 --- a/yesod-auth/Yesod/Auth/HashDB.hs +++ b/yesod-auth/Yesod/Auth/HashDB.hs @@ -2,7 +2,6 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE GADTs #-} @@ -72,8 +71,6 @@ module Yesod.Auth.HashDB , migrateUsers ) where -#include "qq.h" - import Yesod.Persist import Yesod.Handler import Yesod.Form @@ -179,7 +176,7 @@ postLoginR uniq = do (validateUser <$> (uniq =<< mu) <*> mp) if isValid then setCreds True $ Creds "hashdb" (fromMaybe "" mu) [] - else do setMessage [QQ(shamlet)| Invalid username/password |] + else do setMessage [shamlet| Invalid username/password |] toMaster <- getRouteToMaster redirect $ toMaster LoginR @@ -210,7 +207,7 @@ getAuthIdHashDB authR uniq creds = do -- user exists Just (Entity uid _) -> return $ Just uid Nothing -> do - setMessage [QQ(shamlet)| User not found |] + setMessage [shamlet| User not found |] redirect $ authR LoginR -- | Prompt for username and password, validate that against a database @@ -224,7 +221,7 @@ authHashDB :: ( YesodAuth m, YesodPersist m , PersistUnique b (GHandler Auth m)) => (Text -> Maybe (Unique user b)) -> AuthPlugin m authHashDB uniq = AuthPlugin "hashdb" dispatch $ \tm -> addHamlet - [QQ(hamlet)| + [hamlet|