haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrate Contrib

Browse Source
This commit is contained in:
Michael Snoyman 2010-06-09 10:11:13 +03:00
parent f99852fd0f
commit f76d5a6442
4 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Yesod.hs
View File

@ -10,6 +10,7 @@ module Yesod
, module Yesod.Form , module Yesod.Form
, module Yesod.Hamlet , module Yesod.Hamlet
, module Yesod.Json , module Yesod.Json
, module Yesod.Contrib
, Application , Application
, liftIO , liftIO
, Routes , Routes
@ -26,10 +27,11 @@ import Yesod.Dispatch
#endif #endif
import Yesod.Request import Yesod.Request
import Yesod.Form import Yesod.Form hiding (Form)
import Yesod.Yesod import Yesod.Yesod
import Yesod.Handler hiding (runHandler) import Yesod.Handler hiding (runHandler)
import Network.Wai (Application) import Network.Wai (Application)
import Yesod.Hamlet import Yesod.Hamlet
import "transformers" Control.Monad.IO.Class (liftIO) import "transformers" Control.Monad.IO.Class (liftIO)
import Web.Routes.Quasi (Routes) import Web.Routes.Quasi (Routes)
import Yesod.Contrib

9
Yesod/Contrib/Crud.hs
View File

@ -3,7 +3,14 @@
{-# LANGUAGE Rank2Types #-} {-# LANGUAGE Rank2Types #-}
module Yesod.Contrib.Crud where module Yesod.Contrib.Crud where
import Yesod hiding (Form) import Yesod.Yesod
import Yesod.Dispatch
import Yesod.Content
import Yesod.Handler
import Yesod.Request
import Text.Hamlet
import Control.Monad.IO.Class (liftIO)
import Web.Routes.Quasi
import Database.Persist import Database.Persist
import Control.Applicative.Error import Control.Applicative.Error
import Yesod.Contrib.Formable hiding (runForm) import Yesod.Contrib.Formable hiding (runForm)

9
Yesod/Contrib/Persist.hs
View File

@ -1,7 +1,12 @@
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
module Yesod.Contrib.Persist where module Yesod.Contrib.Persist
( YesodPersist (..)
, Persist (..)
) where
import Yesod import Yesod.Handler
import Yesod.Yesod
import Database.Persist
class YesodPersist y where class YesodPersist y where
type YesodDB y :: (* -> *) -> * -> * type YesodDB y :: (* -> *) -> * -> *

7
Yesod/Helpers/Auth.hs
View File

@ -301,7 +301,7 @@ getEmailRegisterR = do
postEmailRegisterR :: YesodAuth master => GHandler Auth master RepHtml postEmailRegisterR :: YesodAuth master => GHandler Auth master RepHtml
postEmailRegisterR = do postEmailRegisterR = do
ae <- getAuthEmailSettings ae <- getAuthEmailSettings
email <- runFormPost $ checkEmail $ required $ input "email" email <- runFormPost $ notEmpty $ required $ input "email" -- FIXME checkEmail
y <- getYesod y <- getYesod
mecreds <- liftIO $ getEmailCreds ae email mecreds <- liftIO $ getEmailCreds ae email
(lid, verKey) <- (lid, verKey) <-
@ -319,9 +319,6 @@ postEmailRegisterR = do
%p A confirmation e-mail has been sent to $string.email$. %p A confirmation e-mail has been sent to $string.email$.
|] |]
checkEmail :: Form ParamValue -> Form ParamValue
checkEmail = notEmpty -- FIXME consider including e-mail validation
getEmailVerifyR :: YesodAuth master getEmailVerifyR :: YesodAuth master
=> Integer -> String -> GHandler Auth master RepHtml => Integer -> String -> GHandler Auth master RepHtml
getEmailVerifyR lid key = do getEmailVerifyR lid key = do
@ -368,7 +365,7 @@ postEmailLoginR :: YesodAuth master => GHandler Auth master ()
postEmailLoginR = do postEmailLoginR = do
ae <- getAuthEmailSettings ae <- getAuthEmailSettings
(email, pass) <- runFormPost $ (,) (email, pass) <- runFormPost $ (,)
<$> checkEmail (required $ input "email") <$> notEmpty (required $ input "email") -- FIXME valid e-mail?
<*> required (input "password") <*> required (input "password")
y <- getYesod y <- getYesod
mecreds <- liftIO $ getEmailCreds ae email mecreds <- liftIO $ getEmailCreds ae email