diff --git a/Handler/Wallet.hs b/Handler/Wallet.hs index d668a75..b0332d8 100644 --- a/Handler/Wallet.hs +++ b/Handler/Wallet.hs @@ -2,23 +2,13 @@ module Handler.Wallet where import Import -import Eve.Api.Char -import Eve.Api.Types as T - getWalletR :: Handler Html -getWalletR = loginOrDo $ (\(uid,user) -> do - man <- getHttpManager <$> ask - apiKey <- runDB $ getBy $ UniqueApiUser uid - acc <- case apiKey of - Just (Entity _ (Api _ k v)) -> do - a <- liftIO $ getAccountBalance man (ApiComplete (T.ApiKey (VCode v) (KeyId k)) (T.CharacterId (userCharId user))) - return (Just a) - Nothing -> return Nothing +getWalletR = do defaultLayout $ [whamlet|

Transactions in the last xx hours

Statistices for the last xx days - #{show acc} - |] - ) + + |] + diff --git a/install.sh b/install.sh index 2c7b8cd..cfcba26 100755 --- a/install.sh +++ b/install.sh @@ -3,9 +3,7 @@ mkdir deps cd deps git clone https://github.com/Drezil/yesod-auth-oauth2 -git clone https://github.com/Drezil/eve-api cd .. cabal sandbox init cabal sandbox add-source deps/yesod-auth-oauth2 -cabal sandbox add-source deps/eve-api cabal install --only-dependencies --reorder-goals diff --git a/neat.cabal b/neat.cabal index 2c5f4ff..cbefeaf 100644 --- a/neat.cabal +++ b/neat.cabal @@ -84,11 +84,10 @@ library , unordered-containers , containers , vector - , time >= 1.5 + , time >=1.5 , HTTP , xml-lens , xml-conduit - , eve-api executable neat diff --git a/templates/default-layout-wrapper.hamlet b/templates/default-layout-wrapper.hamlet index 8d5d71e..9893adf 100644 --- a/templates/default-layout-wrapper.hamlet +++ b/templates/default-layout-wrapper.hamlet @@ -34,13 +34,12 @@ $newline never - NEAT + Brand