mirror of
https://github.com/simonmichael/hledger.git
synced 2024-09-20 02:37:12 +03:00
web: make it build again
This commit is contained in:
parent
f713022e50
commit
0403a5c123
@ -13,6 +13,7 @@ module App
|
||||
, liftIO
|
||||
) where
|
||||
|
||||
import Control.Monad
|
||||
import Control.Monad.Trans.Class (lift)
|
||||
import Control.Monad.IO.Class (liftIO)
|
||||
import qualified Data.Text as T
|
||||
|
@ -4,11 +4,16 @@ module Handlers where
|
||||
import Control.Applicative ((<$>), (<*>))
|
||||
import Data.ByteString (ByteString)
|
||||
import Data.Either (lefts,rights)
|
||||
import Data.List
|
||||
import Data.Maybe
|
||||
import Data.Text(Text,pack,unpack)
|
||||
import Data.Time.Calendar
|
||||
import System.FilePath (takeFileName, (</>))
|
||||
import System.IO.Storage (putValue, getValue)
|
||||
import Text.Hamlet hiding (hamletFile)
|
||||
import Text.ParserCombinators.Parsec hiding (string)
|
||||
import Text.Printf
|
||||
import Text.RegexPR
|
||||
import Yesod.Form
|
||||
|
||||
import Hledger.Cli.Add
|
||||
@ -18,9 +23,11 @@ import Hledger.Cli.Register
|
||||
import Hledger.Cli.Options hiding (value)
|
||||
import Hledger.Cli.Utils
|
||||
import Hledger.Cli.Version (version)
|
||||
import Hledger.Data hiding (insert, today)
|
||||
import Hledger.Cli.Version -- XXX
|
||||
import Hledger.Data hiding (today)
|
||||
import Hledger.Read (journalFromPathAndString)
|
||||
import Hledger.Read.JournalReader (someamount)
|
||||
import Hledger.Utils
|
||||
|
||||
import App
|
||||
import Settings
|
||||
|
@ -111,7 +111,7 @@ toJuliusFile x = datadir++"templates/" ++ x ++ ".julius"
|
||||
toLuciusFile x = datadir++"templates/" ++ x ++ ".lucius"
|
||||
|
||||
hamletFile :: FilePath -> Q Exp
|
||||
hamletFile = H.hamletFile . toHamletFile
|
||||
hamletFile = H.hamletFile . toHamletFile -- debug variant not used, http://www.yesodweb.com/book/faq#q1
|
||||
|
||||
cassiusFile :: FilePath -> Q Exp
|
||||
#ifdef PRODUCTION
|
||||
|
@ -72,11 +72,11 @@ executable hledger-web
|
||||
-- ,old-time
|
||||
,parsec
|
||||
-- ,process
|
||||
-- ,regexpr >= 0.5.1
|
||||
,regexpr >= 0.5.1
|
||||
,safe >= 0.2
|
||||
-- ,split == 0.1.*
|
||||
,text
|
||||
-- ,time
|
||||
,time
|
||||
-- ,utf8-string >= 0.3.5 && < 0.4
|
||||
,io-storage >= 0.3 && < 0.4
|
||||
-- ,convertible-text >= 0.3.0.1 && < 0.4
|
||||
|
@ -10,6 +10,7 @@ where
|
||||
|
||||
import Prelude hiding (putStr, putStrLn)
|
||||
-- import Control.Concurrent (forkIO, threadDelay)
|
||||
import Data.Maybe
|
||||
import Data.Text(pack)
|
||||
import Network.Wai.Handler.Warp (run)
|
||||
#if PRODUCTION
|
||||
@ -19,6 +20,7 @@ import Network.Wai.Middleware.Debug (debug)
|
||||
import System.Console.GetOpt
|
||||
import System.Exit (exitFailure)
|
||||
import System.IO.Storage (withStore, putValue,)
|
||||
import Text.Printf
|
||||
import Yesod.Helpers.Static
|
||||
|
||||
import Hledger.Cli.Options
|
||||
|
Loading…
Reference in New Issue
Block a user