web: define our own hamlet so it can be tweaked for debugging
This commit is contained in:
		
							parent
							
								
									cfa59cc4f8
								
							
						
					
					
						commit
						f6f615196f
					
				| @ -26,11 +26,10 @@ import Yesod.Static | |||||||
| import Yesod.Logger (Logger, logMsg, formatLogText) | import Yesod.Logger (Logger, logMsg, formatLogText) | ||||||
| import Control.Monad.IO.Class (liftIO) | import Control.Monad.IO.Class (liftIO) | ||||||
| import Web.ClientSession (getKey) | import Web.ClientSession (getKey) | ||||||
| import Text.Hamlet |  | ||||||
| 
 | 
 | ||||||
| import Hledger.Web.Options | import Hledger.Web.Options | ||||||
| import qualified Hledger.Web.Settings | import qualified Hledger.Web.Settings (staticDir) | ||||||
| import Hledger.Web.Settings (Extra (..)) | import Hledger.Web.Settings (Extra (..), hamlet) | ||||||
| import Hledger.Web.Settings.StaticFiles | import Hledger.Web.Settings.StaticFiles | ||||||
| 
 | 
 | ||||||
| -- | The web application's configuration and data, available to all request handlers. | -- | The web application's configuration and data, available to all request handlers. | ||||||
|  | |||||||
| @ -53,7 +53,7 @@ import System.FilePath (takeFileName) | |||||||
| import System.IO.Storage (putValue, getValue) | import System.IO.Storage (putValue, getValue) | ||||||
| import System.Locale (defaultTimeLocale) | import System.Locale (defaultTimeLocale) | ||||||
| import Text.Blaze (preEscapedString, toHtml) | import Text.Blaze (preEscapedString, toHtml) | ||||||
| import Text.Hamlet hiding (hamletFile) | import Text.Hamlet hiding (hamlet) | ||||||
| import Text.Printf | import Text.Printf | ||||||
| import Yesod.Core | import Yesod.Core | ||||||
| -- import Yesod.Json | -- import Yesod.Json | ||||||
|  | |||||||
| @ -10,6 +10,7 @@ module Hledger.Web.Settings | |||||||
|     , staticDir |     , staticDir | ||||||
|     , Extra (..) |     , Extra (..) | ||||||
|     , parseExtra |     , parseExtra | ||||||
|  |     , hamlet | ||||||
|     , defport |     , defport | ||||||
|     , defbaseurl |     , defbaseurl | ||||||
|     , hledgerorgurl |     , hledgerorgurl | ||||||
| @ -20,11 +21,13 @@ import Control.Applicative | |||||||
| import Data.Text (Text) | import Data.Text (Text) | ||||||
| import Data.Yaml | import Data.Yaml | ||||||
| import Language.Haskell.TH.Syntax | import Language.Haskell.TH.Syntax | ||||||
|  | import Language.Haskell.TH.Quote | ||||||
| import Prelude | import Prelude | ||||||
| import Text.Printf | import Text.Printf | ||||||
| import Text.Shakespeare.Text (st) | import Text.Shakespeare.Text (st) | ||||||
| import Yesod.Default.Config | import Yesod.Default.Config | ||||||
| import qualified Yesod.Default.Util | import qualified Yesod.Default.Util | ||||||
|  | import qualified Text.Hamlet (hamlet) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| hledgerorgurl, manualurl :: String | hledgerorgurl, manualurl :: String | ||||||
| @ -78,3 +81,10 @@ parseExtra :: DefaultEnv -> Object -> Parser Extra | |||||||
| parseExtra _ o = Extra | parseExtra _ o = Extra | ||||||
|     <$> o .:  "copyright" |     <$> o .:  "copyright" | ||||||
|     <*> o .:? "analytics" |     <*> o .:? "analytics" | ||||||
|  | 
 | ||||||
|  | hamlet :: QuasiQuoter | ||||||
|  | #if DEVELOPMENT | ||||||
|  | hamlet = Text.Hamlet.hamlet -- Text.Hamlet.hamlet' when available | ||||||
|  | #else | ||||||
|  | hamlet = Text.Hamlet.hamlet | ||||||
|  | #endif | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user