scaffolding and platform updates
This commit is contained in:
parent
5edb77eb80
commit
843e03d4f7
@ -35,7 +35,7 @@ import Network.Wai.Middleware.RequestLogger
|
|||||||
)
|
)
|
||||||
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
import Network.HTTP.Conduit (newManager, conduitManagerSettings)
|
import Network.HTTP.Client.Conduit (newManager)
|
||||||
import Control.Concurrent (forkIO, threadDelay)
|
import Control.Concurrent (forkIO, threadDelay)
|
||||||
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
||||||
import Network.Wai.Logger (clockDateCacher)
|
import Network.Wai.Logger (clockDateCacher)
|
||||||
@ -77,7 +77,7 @@ makeApplication conf = do
|
|||||||
-- performs some initialization.
|
-- performs some initialization.
|
||||||
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
||||||
makeFoundation conf = do
|
makeFoundation conf = do
|
||||||
manager <- newManager conduitManagerSettings
|
manager <- newManager
|
||||||
s <- staticSite
|
s <- staticSite
|
||||||
dbconf <- withYamlEnvironment "config/mongoDB.yml" (appEnv conf)
|
dbconf <- withYamlEnvironment "config/mongoDB.yml" (appEnv conf)
|
||||||
Database.Persist.loadConfig >>=
|
Database.Persist.loadConfig >>=
|
||||||
@ -122,7 +122,7 @@ import Yesod.Auth.BrowserId
|
|||||||
import Yesod.Auth.GoogleEmail
|
import Yesod.Auth.GoogleEmail
|
||||||
import Yesod.Default.Config
|
import Yesod.Default.Config
|
||||||
import Yesod.Default.Util (addStaticContentExternal)
|
import Yesod.Default.Util (addStaticContentExternal)
|
||||||
import Network.HTTP.Conduit (Manager)
|
import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager))
|
||||||
import qualified Settings
|
import qualified Settings
|
||||||
import Settings.Development (development)
|
import Settings.Development (development)
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
@ -147,6 +147,9 @@ data App = App
|
|||||||
, appLogger :: Logger
|
, appLogger :: Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
|
instance HasHttpManager App where
|
||||||
|
getHttpManager = httpManager
|
||||||
|
|
||||||
-- Set up i18n messages. See the message folder.
|
-- Set up i18n messages. See the message folder.
|
||||||
mkMessage "App" "messages" "en"
|
mkMessage "App" "messages" "en"
|
||||||
|
|
||||||
@ -405,7 +408,7 @@ library
|
|||||||
build-depends: base >= 4 && < 5
|
build-depends: base >= 4 && < 5
|
||||||
, yesod >= 1.2.5 && < 1.3
|
, yesod >= 1.2.5 && < 1.3
|
||||||
, yesod-core >= 1.2 && < 1.3
|
, yesod-core >= 1.2 && < 1.3
|
||||||
, yesod-auth >= 1.2 && < 1.3
|
, yesod-auth >= 1.3 && < 1.4
|
||||||
, yesod-static >= 1.2 && < 1.3
|
, yesod-static >= 1.2 && < 1.3
|
||||||
, yesod-form >= 1.3 && < 1.4
|
, yesod-form >= 1.3 && < 1.4
|
||||||
, bytestring >= 0.9 && < 0.11
|
, bytestring >= 0.9 && < 0.11
|
||||||
@ -414,15 +417,12 @@ library
|
|||||||
, persistent-mongoDB >= 1.3 && < 1.4
|
, persistent-mongoDB >= 1.3 && < 1.4
|
||||||
, persistent-template >= 1.3 && < 1.4
|
, persistent-template >= 1.3 && < 1.4
|
||||||
, template-haskell
|
, template-haskell
|
||||||
, hamlet >= 1.1 && < 1.2
|
, shakespeare >= 2.0 && < 2.1
|
||||||
, shakespeare-css >= 1.0 && < 1.1
|
|
||||||
, shakespeare-js >= 1.2 && < 1.3
|
|
||||||
, shakespeare-text >= 1.0 && < 1.1
|
|
||||||
, hjsmin >= 0.1 && < 0.2
|
, hjsmin >= 0.1 && < 0.2
|
||||||
, monad-control >= 0.3 && < 0.4
|
, monad-control >= 0.3 && < 0.4
|
||||||
, wai-extra >= 2.1 && < 2.2
|
, wai-extra >= 2.1 && < 2.2
|
||||||
, yaml >= 0.8 && < 0.9
|
, yaml >= 0.8 && < 0.9
|
||||||
, http-conduit >= 2.0 && < 2.1
|
, http-conduit >= 2.1 && < 2.2
|
||||||
, directory >= 1.1 && < 1.3
|
, directory >= 1.1 && < 1.3
|
||||||
, warp >= 2.1 && < 2.2
|
, warp >= 2.1 && < 2.2
|
||||||
, data-default
|
, data-default
|
||||||
|
|||||||
@ -36,7 +36,7 @@ import Network.Wai.Middleware.RequestLogger
|
|||||||
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
import Database.Persist.Sql (runMigration)
|
import Database.Persist.Sql (runMigration)
|
||||||
import Network.HTTP.Conduit (newManager, conduitManagerSettings)
|
import Network.HTTP.Client.Conduit (newManager)
|
||||||
import Control.Monad.Logger (runLoggingT)
|
import Control.Monad.Logger (runLoggingT)
|
||||||
import Control.Concurrent (forkIO, threadDelay)
|
import Control.Concurrent (forkIO, threadDelay)
|
||||||
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
||||||
@ -79,7 +79,7 @@ makeApplication conf = do
|
|||||||
-- performs some initialization.
|
-- performs some initialization.
|
||||||
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
||||||
makeFoundation conf = do
|
makeFoundation conf = do
|
||||||
manager <- newManager conduitManagerSettings
|
manager <- newManager
|
||||||
s <- staticSite
|
s <- staticSite
|
||||||
dbconf <- withYamlEnvironment "config/mysql.yml" (appEnv conf)
|
dbconf <- withYamlEnvironment "config/mysql.yml" (appEnv conf)
|
||||||
Database.Persist.loadConfig >>=
|
Database.Persist.loadConfig >>=
|
||||||
@ -129,7 +129,7 @@ import Yesod.Auth.BrowserId
|
|||||||
import Yesod.Auth.GoogleEmail
|
import Yesod.Auth.GoogleEmail
|
||||||
import Yesod.Default.Config
|
import Yesod.Default.Config
|
||||||
import Yesod.Default.Util (addStaticContentExternal)
|
import Yesod.Default.Util (addStaticContentExternal)
|
||||||
import Network.HTTP.Conduit (Manager)
|
import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager))
|
||||||
import qualified Settings
|
import qualified Settings
|
||||||
import Settings.Development (development)
|
import Settings.Development (development)
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
@ -154,6 +154,9 @@ data App = App
|
|||||||
, appLogger :: Logger
|
, appLogger :: Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
|
instance HasHttpManager App where
|
||||||
|
getHttpManager = httpManager
|
||||||
|
|
||||||
-- Set up i18n messages. See the message folder.
|
-- Set up i18n messages. See the message folder.
|
||||||
mkMessage "App" "messages" "en"
|
mkMessage "App" "messages" "en"
|
||||||
|
|
||||||
@ -409,7 +412,7 @@ library
|
|||||||
build-depends: base >= 4 && < 5
|
build-depends: base >= 4 && < 5
|
||||||
, yesod >= 1.2.5 && < 1.3
|
, yesod >= 1.2.5 && < 1.3
|
||||||
, yesod-core >= 1.2 && < 1.3
|
, yesod-core >= 1.2 && < 1.3
|
||||||
, yesod-auth >= 1.2 && < 1.3
|
, yesod-auth >= 1.3 && < 1.4
|
||||||
, yesod-static >= 1.2 && < 1.3
|
, yesod-static >= 1.2 && < 1.3
|
||||||
, yesod-form >= 1.3 && < 1.4
|
, yesod-form >= 1.3 && < 1.4
|
||||||
, bytestring >= 0.9 && < 0.11
|
, bytestring >= 0.9 && < 0.11
|
||||||
@ -418,15 +421,12 @@ library
|
|||||||
, persistent-mysql >= 1.3 && < 1.4
|
, persistent-mysql >= 1.3 && < 1.4
|
||||||
, persistent-template >= 1.3 && < 1.4
|
, persistent-template >= 1.3 && < 1.4
|
||||||
, template-haskell
|
, template-haskell
|
||||||
, hamlet >= 1.1 && < 1.2
|
, shakespeare >= 2.0 && < 2.1
|
||||||
, shakespeare-css >= 1.0 && < 1.1
|
|
||||||
, shakespeare-js >= 1.2 && < 1.3
|
|
||||||
, shakespeare-text >= 1.0 && < 1.1
|
|
||||||
, hjsmin >= 0.1 && < 0.2
|
, hjsmin >= 0.1 && < 0.2
|
||||||
, monad-control >= 0.3 && < 0.4
|
, monad-control >= 0.3 && < 0.4
|
||||||
, wai-extra >= 2.1 && < 2.2
|
, wai-extra >= 2.1 && < 2.2
|
||||||
, yaml >= 0.8 && < 0.9
|
, yaml >= 0.8 && < 0.9
|
||||||
, http-conduit >= 2.0 && < 2.1
|
, http-conduit >= 2.1 && < 2.2
|
||||||
, directory >= 1.1 && < 1.3
|
, directory >= 1.1 && < 1.3
|
||||||
, warp >= 2.1 && < 2.2
|
, warp >= 2.1 && < 2.2
|
||||||
, data-default
|
, data-default
|
||||||
|
|||||||
@ -37,7 +37,7 @@ import Network.Wai.Middleware.RequestLogger
|
|||||||
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
import Database.Persist.Sql (runMigration)
|
import Database.Persist.Sql (runMigration)
|
||||||
import Network.HTTP.Conduit (newManager, conduitManagerSettings)
|
import Network.HTTP.Client.Conduit (newManager)
|
||||||
import Yesod.Fay (getFaySite)
|
import Yesod.Fay (getFaySite)
|
||||||
import Control.Monad.Logger (runLoggingT)
|
import Control.Monad.Logger (runLoggingT)
|
||||||
import Control.Concurrent (forkIO, threadDelay)
|
import Control.Concurrent (forkIO, threadDelay)
|
||||||
@ -82,7 +82,7 @@ makeApplication conf = do
|
|||||||
-- performs some initialization.
|
-- performs some initialization.
|
||||||
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
||||||
makeFoundation conf = do
|
makeFoundation conf = do
|
||||||
manager <- newManager conduitManagerSettings
|
manager <- newManager
|
||||||
s <- staticSite
|
s <- staticSite
|
||||||
dbconf <- withYamlEnvironment "config/postgresql.yml" (appEnv conf)
|
dbconf <- withYamlEnvironment "config/postgresql.yml" (appEnv conf)
|
||||||
Database.Persist.loadConfig >>=
|
Database.Persist.loadConfig >>=
|
||||||
@ -132,7 +132,7 @@ import Yesod.Auth.BrowserId
|
|||||||
import Yesod.Auth.GoogleEmail
|
import Yesod.Auth.GoogleEmail
|
||||||
import Yesod.Default.Config
|
import Yesod.Default.Config
|
||||||
import Yesod.Default.Util (addStaticContentExternal)
|
import Yesod.Default.Util (addStaticContentExternal)
|
||||||
import Network.HTTP.Conduit (Manager)
|
import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager))
|
||||||
import qualified Settings
|
import qualified Settings
|
||||||
import Settings.Development (development)
|
import Settings.Development (development)
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
@ -158,6 +158,9 @@ data App = App
|
|||||||
, appLogger :: Logger
|
, appLogger :: Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
|
instance HasHttpManager App where
|
||||||
|
getHttpManager = httpManager
|
||||||
|
|
||||||
-- Set up i18n messages. See the message folder.
|
-- Set up i18n messages. See the message folder.
|
||||||
mkMessage "App" "messages" "en"
|
mkMessage "App" "messages" "en"
|
||||||
|
|
||||||
@ -445,10 +448,10 @@ library
|
|||||||
build-depends: base >= 4 && < 5
|
build-depends: base >= 4 && < 5
|
||||||
, yesod >= 1.2.5 && < 1.3
|
, yesod >= 1.2.5 && < 1.3
|
||||||
, yesod-core >= 1.2 && < 1.3
|
, yesod-core >= 1.2 && < 1.3
|
||||||
, yesod-auth >= 1.2 && < 1.3
|
, yesod-auth >= 1.3 && < 1.4
|
||||||
, yesod-static >= 1.2 && < 1.3
|
, yesod-static >= 1.2 && < 1.3
|
||||||
, yesod-form >= 1.3 && < 1.4
|
, yesod-form >= 1.3 && < 1.4
|
||||||
, yesod-fay >= 0.4
|
, yesod-fay >= 0.5.0.1
|
||||||
, fay >= 0.16
|
, fay >= 0.16
|
||||||
, bytestring >= 0.9 && < 0.11
|
, bytestring >= 0.9 && < 0.11
|
||||||
, text >= 0.11 && < 2.0
|
, text >= 0.11 && < 2.0
|
||||||
@ -456,14 +459,11 @@ library
|
|||||||
, persistent-postgresql >= 1.3 && < 1.4
|
, persistent-postgresql >= 1.3 && < 1.4
|
||||||
, persistent-template >= 1.3 && < 1.4
|
, persistent-template >= 1.3 && < 1.4
|
||||||
, template-haskell
|
, template-haskell
|
||||||
, hamlet >= 1.1 && < 1.2
|
, shakespeare >= 2.0 && < 2.1
|
||||||
, shakespeare-css >= 1.0 && < 1.1
|
|
||||||
, shakespeare-js >= 1.2 && < 1.3
|
|
||||||
, shakespeare-text >= 1.0 && < 1.1
|
|
||||||
, monad-control >= 0.3 && < 0.4
|
, monad-control >= 0.3 && < 0.4
|
||||||
, wai-extra >= 2.1 && < 2.2
|
, wai-extra >= 2.1 && < 2.2
|
||||||
, yaml >= 0.8 && < 0.9
|
, yaml >= 0.8 && < 0.9
|
||||||
, http-conduit >= 2.0 && < 2.1
|
, http-conduit >= 2.1 && < 2.2
|
||||||
, directory >= 1.1 && < 1.3
|
, directory >= 1.1 && < 1.3
|
||||||
, warp >= 2.1 && < 2.2
|
, warp >= 2.1 && < 2.2
|
||||||
, data-default
|
, data-default
|
||||||
|
|||||||
@ -36,7 +36,7 @@ import Network.Wai.Middleware.RequestLogger
|
|||||||
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
import Database.Persist.Sql (runMigration)
|
import Database.Persist.Sql (runMigration)
|
||||||
import Network.HTTP.Conduit (newManager, conduitManagerSettings)
|
import Network.HTTP.Client.Conduit (newManager)
|
||||||
import Control.Monad.Logger (runLoggingT)
|
import Control.Monad.Logger (runLoggingT)
|
||||||
import Control.Concurrent (forkIO, threadDelay)
|
import Control.Concurrent (forkIO, threadDelay)
|
||||||
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
||||||
@ -79,7 +79,7 @@ makeApplication conf = do
|
|||||||
-- performs some initialization.
|
-- performs some initialization.
|
||||||
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
||||||
makeFoundation conf = do
|
makeFoundation conf = do
|
||||||
manager <- newManager conduitManagerSettings
|
manager <- newManager
|
||||||
s <- staticSite
|
s <- staticSite
|
||||||
dbconf <- withYamlEnvironment "config/postgresql.yml" (appEnv conf)
|
dbconf <- withYamlEnvironment "config/postgresql.yml" (appEnv conf)
|
||||||
Database.Persist.loadConfig >>=
|
Database.Persist.loadConfig >>=
|
||||||
@ -129,7 +129,7 @@ import Yesod.Auth.BrowserId
|
|||||||
import Yesod.Auth.GoogleEmail
|
import Yesod.Auth.GoogleEmail
|
||||||
import Yesod.Default.Config
|
import Yesod.Default.Config
|
||||||
import Yesod.Default.Util (addStaticContentExternal)
|
import Yesod.Default.Util (addStaticContentExternal)
|
||||||
import Network.HTTP.Conduit (Manager)
|
import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager))
|
||||||
import qualified Settings
|
import qualified Settings
|
||||||
import Settings.Development (development)
|
import Settings.Development (development)
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
@ -154,6 +154,9 @@ data App = App
|
|||||||
, appLogger :: Logger
|
, appLogger :: Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
|
instance HasHttpManager App where
|
||||||
|
getHttpManager = httpManager
|
||||||
|
|
||||||
-- Set up i18n messages. See the message folder.
|
-- Set up i18n messages. See the message folder.
|
||||||
mkMessage "App" "messages" "en"
|
mkMessage "App" "messages" "en"
|
||||||
|
|
||||||
@ -409,7 +412,7 @@ library
|
|||||||
build-depends: base >= 4 && < 5
|
build-depends: base >= 4 && < 5
|
||||||
, yesod >= 1.2.5 && < 1.3
|
, yesod >= 1.2.5 && < 1.3
|
||||||
, yesod-core >= 1.2 && < 1.3
|
, yesod-core >= 1.2 && < 1.3
|
||||||
, yesod-auth >= 1.2 && < 1.3
|
, yesod-auth >= 1.3 && < 1.4
|
||||||
, yesod-static >= 1.2 && < 1.3
|
, yesod-static >= 1.2 && < 1.3
|
||||||
, yesod-form >= 1.3 && < 1.4
|
, yesod-form >= 1.3 && < 1.4
|
||||||
, bytestring >= 0.9 && < 0.11
|
, bytestring >= 0.9 && < 0.11
|
||||||
@ -418,15 +421,12 @@ library
|
|||||||
, persistent-postgresql >= 1.3 && < 1.4
|
, persistent-postgresql >= 1.3 && < 1.4
|
||||||
, persistent-template >= 1.3 && < 1.4
|
, persistent-template >= 1.3 && < 1.4
|
||||||
, template-haskell
|
, template-haskell
|
||||||
, hamlet >= 1.1 && < 1.2
|
, shakespeare >= 2.0 && < 2.1
|
||||||
, shakespeare-css >= 1.0 && < 1.1
|
|
||||||
, shakespeare-js >= 1.2 && < 1.3
|
|
||||||
, shakespeare-text >= 1.0 && < 1.1
|
|
||||||
, hjsmin >= 0.1 && < 0.2
|
, hjsmin >= 0.1 && < 0.2
|
||||||
, monad-control >= 0.3 && < 0.4
|
, monad-control >= 0.3 && < 0.4
|
||||||
, wai-extra >= 2.1 && < 2.2
|
, wai-extra >= 2.1 && < 2.2
|
||||||
, yaml >= 0.8 && < 0.9
|
, yaml >= 0.8 && < 0.9
|
||||||
, http-conduit >= 2.0 && < 2.1
|
, http-conduit >= 2.1 && < 2.2
|
||||||
, directory >= 1.1 && < 1.3
|
, directory >= 1.1 && < 1.3
|
||||||
, warp >= 2.1 && < 2.2
|
, warp >= 2.1 && < 2.2
|
||||||
, data-default
|
, data-default
|
||||||
|
|||||||
@ -32,7 +32,7 @@ import Network.Wai.Middleware.RequestLogger
|
|||||||
( mkRequestLogger, outputFormat, OutputFormat (..), IPAddrSource (..), destination
|
( mkRequestLogger, outputFormat, OutputFormat (..), IPAddrSource (..), destination
|
||||||
)
|
)
|
||||||
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
||||||
import Network.HTTP.Conduit (newManager, conduitManagerSettings)
|
import Network.HTTP.Client.Conduit (newManager)
|
||||||
import Control.Concurrent (forkIO, threadDelay)
|
import Control.Concurrent (forkIO, threadDelay)
|
||||||
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
||||||
import Network.Wai.Logger (clockDateCacher)
|
import Network.Wai.Logger (clockDateCacher)
|
||||||
@ -74,7 +74,7 @@ makeApplication conf = do
|
|||||||
-- performs some initialization.
|
-- performs some initialization.
|
||||||
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
||||||
makeFoundation conf = do
|
makeFoundation conf = do
|
||||||
manager <- newManager conduitManagerSettings
|
manager <- newManager
|
||||||
s <- staticSite
|
s <- staticSite
|
||||||
|
|
||||||
loggerSet' <- newStdoutLoggerSet defaultBufSize
|
loggerSet' <- newStdoutLoggerSet defaultBufSize
|
||||||
@ -112,7 +112,7 @@ import Yesod
|
|||||||
import Yesod.Static
|
import Yesod.Static
|
||||||
import Yesod.Default.Config
|
import Yesod.Default.Config
|
||||||
import Yesod.Default.Util (addStaticContentExternal)
|
import Yesod.Default.Util (addStaticContentExternal)
|
||||||
import Network.HTTP.Conduit (Manager)
|
import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager))
|
||||||
import qualified Settings
|
import qualified Settings
|
||||||
import Settings.Development (development)
|
import Settings.Development (development)
|
||||||
import Settings.StaticFiles
|
import Settings.StaticFiles
|
||||||
@ -132,6 +132,9 @@ data App = App
|
|||||||
, appLogger :: Logger
|
, appLogger :: Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
|
instance HasHttpManager App where
|
||||||
|
getHttpManager = httpManager
|
||||||
|
|
||||||
-- Set up i18n messages. See the message folder.
|
-- Set up i18n messages. See the message folder.
|
||||||
mkMessage "App" "messages" "en"
|
mkMessage "App" "messages" "en"
|
||||||
|
|
||||||
@ -336,21 +339,18 @@ library
|
|||||||
build-depends: base >= 4 && < 5
|
build-depends: base >= 4 && < 5
|
||||||
, yesod >= 1.2.5 && < 1.3
|
, yesod >= 1.2.5 && < 1.3
|
||||||
, yesod-core >= 1.2 && < 1.3
|
, yesod-core >= 1.2 && < 1.3
|
||||||
, yesod-auth >= 1.2 && < 1.3
|
, yesod-auth >= 1.3 && < 1.4
|
||||||
, yesod-static >= 1.2 && < 1.3
|
, yesod-static >= 1.2 && < 1.3
|
||||||
, yesod-form >= 1.3 && < 1.4
|
, yesod-form >= 1.3 && < 1.4
|
||||||
, bytestring >= 0.9 && < 0.11
|
, bytestring >= 0.9 && < 0.11
|
||||||
, text >= 0.11 && < 2.0
|
, text >= 0.11 && < 2.0
|
||||||
, template-haskell
|
, template-haskell
|
||||||
, hamlet >= 1.1 && < 1.2
|
, shakespeare >= 2.0 && < 2.1
|
||||||
, shakespeare-css >= 1.0 && < 1.1
|
|
||||||
, shakespeare-js >= 1.2 && < 1.3
|
|
||||||
, shakespeare-text >= 1.0 && < 1.1
|
|
||||||
, hjsmin >= 0.1 && < 0.2
|
, hjsmin >= 0.1 && < 0.2
|
||||||
, monad-control >= 0.3 && < 0.4
|
, monad-control >= 0.3 && < 0.4
|
||||||
, wai-extra >= 2.1 && < 2.2
|
, wai-extra >= 2.1 && < 2.2
|
||||||
, yaml >= 0.8 && < 0.9
|
, yaml >= 0.8 && < 0.9
|
||||||
, http-conduit >= 2.0 && < 2.1
|
, http-conduit >= 2.1 && < 2.2
|
||||||
, directory >= 1.1 && < 1.3
|
, directory >= 1.1 && < 1.3
|
||||||
, warp >= 2.1 && < 2.2
|
, warp >= 2.1 && < 2.2
|
||||||
, data-default
|
, data-default
|
||||||
|
|||||||
@ -36,7 +36,7 @@ import Network.Wai.Middleware.RequestLogger
|
|||||||
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
import Database.Persist.Sql (runMigration)
|
import Database.Persist.Sql (runMigration)
|
||||||
import Network.HTTP.Conduit (newManager, conduitManagerSettings)
|
import Network.HTTP.Client.Conduit (newManager)
|
||||||
import Control.Monad.Logger (runLoggingT)
|
import Control.Monad.Logger (runLoggingT)
|
||||||
import Control.Concurrent (forkIO, threadDelay)
|
import Control.Concurrent (forkIO, threadDelay)
|
||||||
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
import System.Log.FastLogger (newStdoutLoggerSet, defaultBufSize)
|
||||||
@ -79,7 +79,7 @@ makeApplication conf = do
|
|||||||
-- performs some initialization.
|
-- performs some initialization.
|
||||||
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
makeFoundation :: AppConfig DefaultEnv Extra -> IO App
|
||||||
makeFoundation conf = do
|
makeFoundation conf = do
|
||||||
manager <- newManager conduitManagerSettings
|
manager <- newManager
|
||||||
s <- staticSite
|
s <- staticSite
|
||||||
dbconf <- withYamlEnvironment "config/sqlite.yml" (appEnv conf)
|
dbconf <- withYamlEnvironment "config/sqlite.yml" (appEnv conf)
|
||||||
Database.Persist.loadConfig >>=
|
Database.Persist.loadConfig >>=
|
||||||
@ -129,7 +129,7 @@ import Yesod.Auth.BrowserId
|
|||||||
import Yesod.Auth.GoogleEmail
|
import Yesod.Auth.GoogleEmail
|
||||||
import Yesod.Default.Config
|
import Yesod.Default.Config
|
||||||
import Yesod.Default.Util (addStaticContentExternal)
|
import Yesod.Default.Util (addStaticContentExternal)
|
||||||
import Network.HTTP.Conduit (Manager)
|
import Network.HTTP.Client.Conduit (Manager, HasHttpManager (getHttpManager))
|
||||||
import qualified Settings
|
import qualified Settings
|
||||||
import Settings.Development (development)
|
import Settings.Development (development)
|
||||||
import qualified Database.Persist
|
import qualified Database.Persist
|
||||||
@ -154,6 +154,9 @@ data App = App
|
|||||||
, appLogger :: Logger
|
, appLogger :: Logger
|
||||||
}
|
}
|
||||||
|
|
||||||
|
instance HasHttpManager App where
|
||||||
|
getHttpManager = httpManager
|
||||||
|
|
||||||
-- Set up i18n messages. See the message folder.
|
-- Set up i18n messages. See the message folder.
|
||||||
mkMessage "App" "messages" "en"
|
mkMessage "App" "messages" "en"
|
||||||
|
|
||||||
@ -409,7 +412,7 @@ library
|
|||||||
build-depends: base >= 4 && < 5
|
build-depends: base >= 4 && < 5
|
||||||
, yesod >= 1.2.5 && < 1.3
|
, yesod >= 1.2.5 && < 1.3
|
||||||
, yesod-core >= 1.2 && < 1.3
|
, yesod-core >= 1.2 && < 1.3
|
||||||
, yesod-auth >= 1.2 && < 1.3
|
, yesod-auth >= 1.3 && < 1.4
|
||||||
, yesod-static >= 1.2 && < 1.3
|
, yesod-static >= 1.2 && < 1.3
|
||||||
, yesod-form >= 1.3 && < 1.4
|
, yesod-form >= 1.3 && < 1.4
|
||||||
, bytestring >= 0.9 && < 0.11
|
, bytestring >= 0.9 && < 0.11
|
||||||
@ -418,15 +421,12 @@ library
|
|||||||
, persistent-sqlite >= 1.3 && < 1.4
|
, persistent-sqlite >= 1.3 && < 1.4
|
||||||
, persistent-template >= 1.3 && < 1.4
|
, persistent-template >= 1.3 && < 1.4
|
||||||
, template-haskell
|
, template-haskell
|
||||||
, hamlet >= 1.1 && < 1.2
|
, shakespeare >= 2.0 && < 2.1
|
||||||
, shakespeare-css >= 1.0 && < 1.1
|
|
||||||
, shakespeare-js >= 1.2 && < 1.3
|
|
||||||
, shakespeare-text >= 1.0 && < 1.1
|
|
||||||
, hjsmin >= 0.1 && < 0.2
|
, hjsmin >= 0.1 && < 0.2
|
||||||
, monad-control >= 0.3 && < 0.4
|
, monad-control >= 0.3 && < 0.4
|
||||||
, wai-extra >= 2.1 && < 2.2
|
, wai-extra >= 2.1 && < 2.2
|
||||||
, yaml >= 0.8 && < 0.9
|
, yaml >= 0.8 && < 0.9
|
||||||
, http-conduit >= 2.0 && < 2.1
|
, http-conduit >= 2.1 && < 2.2
|
||||||
, directory >= 1.1 && < 1.3
|
, directory >= 1.1 && < 1.3
|
||||||
, warp >= 2.1 && < 2.2
|
, warp >= 2.1 && < 2.2
|
||||||
, data-default
|
, data-default
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
name: yesod-platform
|
name: yesod-platform
|
||||||
version: 1.2.8.2
|
version: 1.2.9
|
||||||
license: MIT
|
license: MIT
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
author: Michael Snoyman <michael@snoyman.com>
|
author: Michael Snoyman <michael@snoyman.com>
|
||||||
@ -14,7 +14,6 @@ homepage: http://www.yesodweb.com/
|
|||||||
|
|
||||||
library
|
library
|
||||||
build-depends: base >= 4 && < 5
|
build-depends: base >= 4 && < 5
|
||||||
, ReadArgs == 1.2.1
|
|
||||||
, SHA == 1.6.4
|
, SHA == 1.6.4
|
||||||
, aeson == 0.7.0.2
|
, aeson == 0.7.0.2
|
||||||
, ansi-terminal == 0.6.1.1
|
, ansi-terminal == 0.6.1.1
|
||||||
@ -24,25 +23,25 @@ library
|
|||||||
, asn1-types == 0.2.3
|
, asn1-types == 0.2.3
|
||||||
, async == 2.0.1.5
|
, async == 2.0.1.5
|
||||||
, attoparsec == 0.11.2.1
|
, attoparsec == 0.11.2.1
|
||||||
, attoparsec-conduit == 1.0.1.2
|
, attoparsec-conduit == 1.1.0
|
||||||
, authenticate == 1.3.2.6
|
, authenticate == 1.3.2.8
|
||||||
, base-unicode-symbols == 0.2.2.4
|
, base-unicode-symbols == 0.2.2.4
|
||||||
|
, base16-bytestring == 0.1.1.6
|
||||||
, base64-bytestring == 1.0.0.1
|
, base64-bytestring == 1.0.0.1
|
||||||
, basic-prelude == 0.3.6.0
|
|
||||||
, blaze-builder == 0.3.3.2
|
, blaze-builder == 0.3.3.2
|
||||||
, blaze-builder-conduit == 1.0.0
|
, blaze-builder-conduit == 1.1.0
|
||||||
, blaze-html == 0.7.0.1
|
, blaze-html == 0.7.0.1
|
||||||
, blaze-markup == 0.6.0.0
|
, blaze-markup == 0.6.0.0
|
||||||
, byteable == 0.1.1
|
, byteable == 0.1.1
|
||||||
, byteorder == 1.0.4
|
, byteorder == 1.0.4
|
||||||
, case-insensitive == 1.1.0.3
|
, case-insensitive == 1.2.0.0
|
||||||
, cereal == 0.4.0.1
|
, cereal == 0.4.0.1
|
||||||
, cipher-aes == 0.2.7
|
, cipher-aes == 0.2.7
|
||||||
, cipher-rc4 == 0.1.4
|
, cipher-rc4 == 0.1.4
|
||||||
, clientsession == 0.9.0.3
|
, clientsession == 0.9.0.3
|
||||||
, conduit == 1.0.15.1
|
, conduit == 1.1.0
|
||||||
|
, conduit-extra == 1.1.0
|
||||||
, connection == 0.2.0
|
, connection == 0.2.0
|
||||||
, control-monad-loop == 0.1
|
|
||||||
, cookie == 0.4.0.1
|
, cookie == 0.4.0.1
|
||||||
, cprng-aes == 0.5.2
|
, cprng-aes == 0.5.2
|
||||||
, crypto-api == 0.13
|
, crypto-api == 0.13
|
||||||
@ -51,8 +50,8 @@ library
|
|||||||
, crypto-pubkey == 0.2.4
|
, crypto-pubkey == 0.2.4
|
||||||
, crypto-pubkey-types == 0.4.2.2
|
, crypto-pubkey-types == 0.4.2.2
|
||||||
, crypto-random == 0.0.7
|
, crypto-random == 0.0.7
|
||||||
, cryptohash == 0.11.2
|
, cryptohash == 0.11.4
|
||||||
, cryptohash-conduit == 0.1.0
|
, cryptohash-conduit == 0.1.1
|
||||||
, css-text == 0.1.2.1
|
, css-text == 0.1.2.1
|
||||||
, data-default == 0.5.3
|
, data-default == 0.5.3
|
||||||
, data-default-class == 0.0.1
|
, data-default-class == 0.0.1
|
||||||
@ -60,72 +59,69 @@ library
|
|||||||
, data-default-instances-containers == 0.0.1
|
, data-default-instances-containers == 0.0.1
|
||||||
, data-default-instances-dlist == 0.0.1
|
, data-default-instances-dlist == 0.0.1
|
||||||
, data-default-instances-old-locale == 0.0.1
|
, data-default-instances-old-locale == 0.0.1
|
||||||
, dlist == 0.7
|
, dlist == 0.7.0.1
|
||||||
, email-validate == 2.0.1
|
, email-validate == 2.0.1
|
||||||
, entropy == 0.2.2.4
|
, entropy == 0.2.2.4
|
||||||
, esqueleto == 1.3.5
|
, esqueleto == 1.3.5
|
||||||
, failure == 0.2.0.1
|
, exceptions == 0.5
|
||||||
, fast-logger == 2.1.5
|
, fast-logger == 2.1.5
|
||||||
, file-embed == 0.0.6
|
, file-embed == 0.0.6
|
||||||
, filesystem-conduit == 1.0.0.1
|
, hamlet == 1.2.0
|
||||||
, hamlet == 1.1.9.2
|
, hjsmin == 0.1.4.6
|
||||||
, hjsmin == 0.1.4.5
|
|
||||||
, hspec == 1.9.0
|
, hspec == 1.9.0
|
||||||
, hspec-expectations == 0.5.0.1
|
, hspec-expectations == 0.5.0.1
|
||||||
, html-conduit == 1.1.0.1
|
, html-conduit == 1.1.0.4
|
||||||
, http-client == 0.2.2.2
|
, http-client == 0.3.0.1
|
||||||
, http-client-conduit == 0.2.0.1
|
|
||||||
, http-client-tls == 0.2.1.1
|
, http-client-tls == 0.2.1.1
|
||||||
, http-conduit == 2.0.0.8
|
, http-conduit == 2.1.0
|
||||||
, http-date == 0.0.4
|
, http-date == 0.0.4
|
||||||
, http-reverse-proxy == 0.3.1.1
|
, http-reverse-proxy == 0.3.1.4
|
||||||
, http-types == 0.8.3
|
, http-types == 0.8.4
|
||||||
, language-javascript == 0.5.9
|
, language-javascript == 0.5.9
|
||||||
, lifted-base == 0.2.2.1
|
, lifted-base == 0.2.2.1
|
||||||
, mime-mail == 0.4.4.1
|
, mime-mail == 0.4.5
|
||||||
, mime-types == 0.1.0.3
|
, mime-types == 0.1.0.3
|
||||||
, mmorph == 1.0.2
|
, mmorph == 1.0.2
|
||||||
, monad-control == 0.3.2.3
|
, monad-control == 0.3.2.3
|
||||||
, monad-logger == 0.3.4.0
|
, monad-logger == 0.3.4.1
|
||||||
, monad-loops == 0.4.2
|
, monad-loops == 0.4.2
|
||||||
, network-conduit == 1.0.4
|
, network-conduit == 1.1.0
|
||||||
, optparse-applicative == 0.7.0.2
|
, optparse-applicative == 0.8.0.1
|
||||||
, path-pieces == 0.1.3.1
|
, path-pieces == 0.1.3.1
|
||||||
, pem == 0.2.1
|
, pem == 0.2.1
|
||||||
, persistent == 1.3.0.3
|
, persistent == 1.3.0.6
|
||||||
, persistent-template == 1.3.1.2
|
, persistent-template == 1.3.1.3
|
||||||
, pool-conduit == 0.1.2.1
|
|
||||||
, primitive == 0.5.2.1
|
, primitive == 0.5.2.1
|
||||||
, process-conduit == 1.0.0.1
|
|
||||||
, publicsuffixlist == 0.1
|
, publicsuffixlist == 0.1
|
||||||
, pureMD5 == 2.1.2.1
|
|
||||||
, pwstore-fast == 2.4.1
|
, pwstore-fast == 2.4.1
|
||||||
, quickcheck-io == 0.1.0
|
, quickcheck-io == 0.1.0
|
||||||
, resource-pool == 0.2.1.1
|
, resource-pool == 0.2.1.1
|
||||||
, resourcet == 0.4.10.1
|
, resourcet == 1.1.0
|
||||||
, safe == 0.3.4
|
, safe == 0.3.4
|
||||||
, scientific == 0.2.0.2
|
, scientific == 0.2.0.2
|
||||||
, securemem == 0.1.3
|
, securemem == 0.1.3
|
||||||
, semigroups == 0.12.2
|
, semigroups == 0.12.2
|
||||||
, setenv == 0.1.1.1
|
, setenv == 0.1.1.1
|
||||||
, shakespeare == 1.2.1.1
|
, shakespeare == 2.0.0.1
|
||||||
, shakespeare-css == 1.0.7.1
|
, shakespeare-css == 1.1.0
|
||||||
, shakespeare-i18n == 1.0.0.5
|
, shakespeare-i18n == 1.1.0
|
||||||
, shakespeare-js == 1.2.0.4
|
, shakespeare-js == 1.3.0
|
||||||
, shakespeare-text == 1.0.2
|
, shakespeare-text == 1.1.0
|
||||||
, silently == 1.2.4.1
|
, silently == 1.2.4.1
|
||||||
, simple-sendfile == 0.2.13
|
, simple-sendfile == 0.2.13
|
||||||
, skein == 1.0.9
|
, skein == 1.0.9
|
||||||
, socks == 0.5.4
|
, socks == 0.5.4
|
||||||
, stm-chans == 3.0.0
|
, stm-chans == 3.0.0.2
|
||||||
|
, streaming-commons == 0.1.0.2
|
||||||
, stringsearch == 0.3.6.5
|
, stringsearch == 0.3.6.5
|
||||||
, system-fileio == 0.3.12
|
, system-fileio == 0.3.12
|
||||||
, system-filepath == 0.4.9
|
, system-filepath == 0.4.10
|
||||||
, tagged == 0.7.1
|
, tagged == 0.7.1
|
||||||
, tagsoup == 0.13.1
|
, tagsoup == 0.13.1
|
||||||
, tagstream-conduit == 0.5.5
|
, tagstream-conduit == 0.5.5.1
|
||||||
, text-stream-decode == 0.1.0.4
|
, text-stream-decode == 0.1.0.5
|
||||||
, tls == 1.2.2
|
, tf-random == 0.4
|
||||||
|
, tls == 1.2.6
|
||||||
, transformers-base == 0.4.1
|
, transformers-base == 0.4.1
|
||||||
, unix-compat == 0.4.1.1
|
, unix-compat == 0.4.1.1
|
||||||
, unordered-containers == 0.2.3.3
|
, unordered-containers == 0.2.3.3
|
||||||
@ -133,32 +129,31 @@ library
|
|||||||
, utf8-string == 0.3.7
|
, utf8-string == 0.3.7
|
||||||
, vector == 0.10.9.1
|
, vector == 0.10.9.1
|
||||||
, void == 0.6.1
|
, void == 0.6.1
|
||||||
, wai == 2.1.0
|
, wai == 2.1.0.1
|
||||||
, wai-app-static == 2.0.0.4
|
, wai-app-static == 2.0.1
|
||||||
, wai-extra == 2.1.0.1
|
, wai-extra == 2.1.1.1
|
||||||
, wai-logger == 2.1.1
|
, wai-logger == 2.1.1
|
||||||
, wai-test == 2.0.0.2
|
, wai-test == 2.0.1.1
|
||||||
, warp == 2.1.1.2
|
, warp == 2.1.3.3
|
||||||
, warp-tls == 2.0.3.1
|
, warp-tls == 2.0.3.2
|
||||||
, word8 == 0.0.4
|
, word8 == 0.0.4
|
||||||
, x509 == 1.4.11
|
, x509 == 1.4.11
|
||||||
, x509-store == 1.4.4
|
, x509-store == 1.4.4
|
||||||
, x509-system == 1.4.2
|
, x509-system == 1.4.2
|
||||||
, x509-validation == 1.5.0
|
, x509-validation == 1.5.0
|
||||||
, xml-conduit == 1.1.0.9
|
, xml-conduit == 1.2.0.1
|
||||||
, xml-types == 0.3.4
|
, xml-types == 0.3.4
|
||||||
, xss-sanitize == 0.3.5
|
, xss-sanitize == 0.3.5.2
|
||||||
, yaml == 0.8.7.2
|
, yaml == 0.8.8.1
|
||||||
, yesod == 1.2.5
|
, yesod == 1.2.5.2
|
||||||
, yesod-auth == 1.2.7
|
, yesod-auth == 1.3.0.2
|
||||||
, yesod-core == 1.2.8
|
, yesod-core == 1.2.10
|
||||||
, yesod-form == 1.3.8
|
, yesod-form == 1.3.8.1
|
||||||
, yesod-persistent == 1.2.2.1
|
, yesod-persistent == 1.2.2.2
|
||||||
, yesod-routes == 1.2.0.6
|
, yesod-routes == 1.2.0.6
|
||||||
, yesod-static == 1.2.2.2
|
, yesod-static == 1.2.2.4
|
||||||
, yesod-test == 1.2.1
|
, yesod-test == 1.2.1.2
|
||||||
, zlib-bindings == 0.1.1.3
|
, zlib-conduit == 1.1.0
|
||||||
, zlib-conduit == 1.0.0
|
|
||||||
|
|
||||||
exposed-modules: Yesod.Platform
|
exposed-modules: Yesod.Platform
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user