nek0/eidolon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

now getting url from request

Browse source
This commit is contained in:
nek0 2015-04-02 14:11:59 +02:00
parent 54be0d162e
commit 297df5d12f
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Foundation.hs
View file

@ -29,7 +29,7 @@ import Text.Jasmine (minifym)
import Text.Hamlet (hamletFile) import Text.Hamlet (hamletFile)
import Yesod.Core.Types import Yesod.Core.Types
-- costom imports -- costom imports
import Data.Text import Data.Text as T
import Data.Text.Encoding import Data.Text.Encoding
import Network.Wai import Network.Wai
import Helper import Helper
@ -74,14 +74,14 @@ renderLayout widget = do
user <- runDB $ getJust uId user <- runDB $ getJust uId
return $ userName user return $ userName user
Nothing -> do Nothing -> do
return ("" :: Text) return ("" :: T.Text)
slug <- case msu of slug <- case msu of
Just a -> do Just a -> do
uId <- return $ getUserIdFromText a uId <- return $ getUserIdFromText a
user <- runDB $ getJust uId user <- runDB $ getJust uId
return $ userSlug user return $ userSlug user
Nothing -> do Nothing -> do
return ("" :: Text) return ("" :: T.Text)
block <- return $ appSignupBlocked $ appSettings master block <- return $ appSignupBlocked $ appSettings master
-- We break up the default layout into two components: -- We break up the default layout into two components:
@ -112,17 +112,22 @@ formLayout :: Widget -> Handler Html
formLayout widget = do formLayout widget = do
renderLayout $(widgetFile "form-widget") renderLayout $(widgetFile "form-widget")
approotRequest :: App -> Request -> Text approotRequest :: App -> Request -> T.Text
approotRequest master req = approotRequest master req =
case requestHeaderHost req of case requestHeaderHost req of
Just a -> decodeUtf8 a Just a -> prefix `T.append` decodeUtf8 a
Nothing -> appRoot $ appSettings master Nothing -> appRoot $ appSettings master
where
prefix =
case isSecure req of
True -> "https://"
False -> "http://"
-- Please see the documentation for the Yesod typeclass. There are a number -- Please see the documentation for the Yesod typeclass. There are a number
-- of settings which can be configured by overriding methods here. -- of settings which can be configured by overriding methods here.
instance Yesod App where instance Yesod App where
--approot = ApprootMaster $ appRoot . appSettings --approot = ApprootMaster $ appRoot . appSettings
approot = ApprootRelative approot = ApprootRequest approotRequest
-- change maximum content length -- change maximum content length
maximumContentLength _ _ = Just $ 1024 ^ (5 :: Int) maximumContentLength _ _ = Just $ 1024 ^ (5 :: Int)