s464900/gonito
1
0
Fork 0
forked from filipg/gonito
Code Issues Pull Requests Projects Releases Wiki Activity

setting up an account more intuitive

Browse Source
This commit is contained in:
Filip Gralinski 2017-09-23 15:30:10 +02:00
parent e3a3f28da0
commit 7a9eb28b48
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Handler/AccountReset.hs
View File

@ -112,7 +112,7 @@ doResetPassword' :: Bool -> Text -> Key User -> Text -> Handler Html
doResetPassword' True _ userId password = do doResetPassword' True _ userId password = do
updatePassword userId (Just password) updatePassword userId (Just password)
runDB $ update userId removeVerificationKeyStatement runDB $ update userId removeVerificationKeyStatement
setMessage $ toHtml ("Password set! You can log in now." :: Text) setMessage $ toHtml ("Password set! Now, you can log in with your e-mail address." :: Text)
redirect HomeR redirect HomeR
doResetPassword' False key _ _ = do doResetPassword' False key _ _ = do

6
Handler/Home.hs
View File

@ -18,6 +18,12 @@ getHomeR = do
let maybeLocalId = case maybeUser of let maybeLocalId = case maybeUser of
Just user -> userLocalId $ entityVal user Just user -> userLocalId $ entityVal user
Nothing -> Nothing Nothing -> Nothing
if maybe False ((\u -> isNothing (userLocalId u) && isNothing (userName u)) . entityVal) maybeUser
then
do
setMessage $ toHtml ("First, set up your name and/or ID!" :: Text)
redirect $ YourAccountR
else
defaultLayout $ do defaultLayout $ do
aDomId <- newIdent aDomId <- newIdent
setTitle "Welcome To Gonito.net!" setTitle "Welcome To Gonito.net!"