diff --git a/Yesod/Auth.hs b/Yesod/Auth.hs --- a/Yesod/Auth.hs +++ b/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 @@ , AuthException (..) ) where -#include "qq.h" - import Control.Monad (when) import Control.Monad.Trans.Maybe @@ -132,7 +130,7 @@ [ 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 @@ Nothing -> when doRedirects $ do case authRoute y of - Nothing -> do rh <- defaultLayout $ addHtml [QQ(shamlet)|

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

Invalid login |] sendResponse rh Just ar -> do setMessageI Msg.InvalidLogin redirect ar @@ -166,10 +164,10 @@ creds <- maybeAuthId defaultLayoutJson (do setTitle "Authentication Status" - addHtml $ html' creds) (jsonCreds creds) + toWidget $ html' creds) (jsonCreds creds) where html' creds = - [QQ(shamlet)| + [shamlet|

Authentication Status $maybe _ <- creds

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

diff --git a/Yesod/Auth/Dummy.hs b/Yesod/Auth/Dummy.hs --- a/Yesod/Auth/Dummy.hs +++ b/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,13 +7,11 @@ ( authDummy ) where -#include "qq.h" - import Yesod.Auth import Yesod.Form (runInputPost, textField, ireq) import Yesod.Handler (notFound) import Text.Hamlet (hamlet) -import Yesod.Widget (addHamlet) +import Yesod.Widget (toWidget) authDummy :: YesodAuth m => AuthPlugin m authDummy = @@ -26,9 +23,9 @@ dispatch _ _ = notFound url = PluginR "dummy" [] login authToMaster = - addHamlet [QQ(hamlet)| + toWidget [hamlet|

- \Your new identifier is: + Your new identifier is: # |] diff --git a/Yesod/Auth/Email.hs b/Yesod/Auth/Email.hs --- a/Yesod/Auth/Email.hs +++ b/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 @@ , isValidPass ) where -#include "qq.h" - import Network.Mail.Mime (randomString) import Yesod.Auth import System.Random @@ -33,8 +30,7 @@ import Yesod.Form import Yesod.Handler import Yesod.Content -import Yesod.Widget -import Yesod.Core +import Yesod.Core (PathPiece, fromPathPiece, whamlet, defaultLayout, setTitleI, toPathPiece) import Control.Monad.IO.Class (liftIO) import qualified Yesod.Auth.Message as Msg @@ -82,7 +78,7 @@ authEmail :: YesodAuthEmail m => AuthPlugin m authEmail = AuthPlugin "email" dispatch $ \tm -> - [QQ(whamlet)| + [whamlet| @@ -115,8 +111,7 @@ toMaster <- getRouteToMaster 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 @@ -167,8 +161,7 @@ _ -> return () defaultLayout $ do setTitleI Msg.InvalidKey - addWidget - [QQ(whamlet)|

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

_{Msg.InvalidKey} |] postLoginR :: YesodAuthEmail master => GHandler Auth master () postLoginR = do @@ -206,8 +199,7 @@ redirect $ toMaster LoginR defaultLayout $ do setTitleI Msg.SetPassTitle - addWidget - [QQ(whamlet)| + [whamlet|

_{Msg.SetPass}

diff --git a/Yesod/Auth/GoogleEmail.hs b/Yesod/Auth/GoogleEmail.hs --- a/Yesod/Auth/GoogleEmail.hs +++ b/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. -- @@ -18,9 +17,8 @@ import Yesod.Auth import qualified Web.Authenticate.OpenId as OpenId -import Yesod.Form import Yesod.Handler -import Yesod.Widget +import Yesod.Widget (whamlet) import Yesod.Request import Text.Blaze (toHtml) import Data.Text (Text) @@ -39,7 +37,6 @@ AuthPlugin "googleemail" dispatch login where complete = PluginR "googleemail" ["complete"] - name = "openid_identifier" login tm = [whamlet|_{Msg.LoginGoogle}|] dispatch "GET" ["forward"] = do diff --git a/Yesod/Auth/HashDB.hs b/Yesod/Auth/HashDB.hs --- a/Yesod/Auth/HashDB.hs +++ b/Yesod/Auth/HashDB.hs @@ -2,7 +2,6 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE CPP #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE GADTs #-} @@ -72,13 +71,11 @@ , migrateUsers ) where -#include "qq.h" - import Yesod.Persist import Yesod.Handler import Yesod.Form import Yesod.Auth -import Yesod.Widget (addHamlet) +import Yesod.Widget (toWidget) import Text.Hamlet (hamlet, shamlet) import Control.Applicative ((<$>), (<*>)) @@ -179,7 +176,7 @@ (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 @@ -- 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 @@ -223,8 +220,7 @@ , PersistStore b (GHandler Auth m) , PersistUnique b (GHandler Auth m)) => (Text -> Maybe (Unique user b)) -> AuthPlugin m -authHashDB uniq = AuthPlugin "hashdb" dispatch $ \tm -> addHamlet - [QQ(hamlet)| +authHashDB uniq = AuthPlugin "hashdb" dispatch $ \tm -> toWidget [hamlet|