From 69ab9059c23d24ddaf1ca8096d91eddbf1e32c1d Mon Sep 17 00:00:00 2001 From: nek0 Date: Sun, 14 Dec 2014 20:22:50 +0100 Subject: [PATCH] signup can now be blocked --- Foundation.hs | 2 +- Handler/Signup.hs | 4 ++-- Settings.hs | 6 ++++-- templates/default-layout.hamlet | 5 +++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Foundation.hs b/Foundation.hs index 03d2655..9d1b0f0 100644 --- a/Foundation.hs +++ b/Foundation.hs @@ -84,7 +84,7 @@ instance Yesod App where return $ userSlug user Nothing -> do return ("" :: Text) - + block <- fmap extraSignupBlocked getExtra -- We break up the default layout into two components: -- default-layout is the contents of the body tag, and diff --git a/Handler/Signup.hs b/Handler/Signup.hs index 096cc82..a69c10d 100644 --- a/Handler/Signup.hs +++ b/Handler/Signup.hs @@ -8,7 +8,7 @@ import Data.Maybe getSignupR :: Handler Html getSignupR = do - block <- fmap extraSignupBlocked appExtra + block <- fmap extraSignupBlocked I.getExtra case block of False -> do defaultLayout $ do @@ -20,7 +20,7 @@ getSignupR = do postSignupR :: Handler Html postSignupR = do - block <- fmap extraSignupBlocked appExtra + block <- fmap I.extraSignupBlocked I.getExtra case block of False -> do mUserName <- lookupPostParam "username" diff --git a/Settings.hs b/Settings.hs index 87173c1..1b43cab 100644 --- a/Settings.hs +++ b/Settings.hs @@ -67,10 +67,12 @@ widgetFile = (if development then widgetFileReload data Extra = Extra { extraCopyright :: Text - , extraAnalytics :: Maybe Text -- ^ Google Analytics +-- , extraAnalytics :: Maybe Text -- ^ Google Analytics + , extraSignupBlocked :: Bool } deriving Show parseExtra :: DefaultEnv -> Object -> Parser Extra parseExtra _ o = Extra <$> o .: "copyright" - <*> o .:? "analytics" +-- <*> o .:? "analytics" + <*> o .: "signupBlocked" diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet index a8deac3..ded6e5b 100644 --- a/templates/default-layout.hamlet +++ b/templates/default-layout.hamlet @@ -14,8 +14,9 @@ $nothing
  • Login -
  • - Signup + $if block == False +
  • + Signup $maybe msg <- mmsg