From 034685e40ef9cc52660f088a5bf6ba492c0a100d Mon Sep 17 00:00:00 2001 From: Braden Walters Date: Sun, 6 Dec 2015 21:03:30 +0100 Subject: [PATCH 1/7] Redundant imports --- Foundation.hs | 2 -- Handler/Avatar.hs | 1 - Handler/Buy.hs | 1 - Handler/Supplier.hs | 1 - 4 files changed, 5 deletions(-) diff --git a/Foundation.hs b/Foundation.hs index c75b415..987cc2d 100755 --- a/Foundation.hs +++ b/Foundation.hs @@ -19,10 +19,8 @@ import Import.NoFoundation import Database.Persist.Sql (ConnectionPool, runSqlPool) import Text.Hamlet (hamletFile) import Text.Jasmine (minifym) -import Yesod.Auth.BrowserId (authBrowserId) import Yesod.Default.Util (addStaticContentExternal) import Yesod.Core.Types (Logger) -import Settings.StaticFiles --snip import qualified Data.Text as T import Network.Wai as Wai diff --git a/Handler/Avatar.hs b/Handler/Avatar.hs index f37ead0..14d4e95 100755 --- a/Handler/Avatar.hs +++ b/Handler/Avatar.hs @@ -18,7 +18,6 @@ module Handler.Avatar where import Import import Handler.Common import Data.Conduit.Binary -import qualified Data.Text as T import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as L import Data.ByteString.Base64 diff --git a/Handler/Buy.hs b/Handler/Buy.hs index 502f72d..7b7788f 100755 --- a/Handler/Buy.hs +++ b/Handler/Buy.hs @@ -17,7 +17,6 @@ module Handler.Buy where import Import import Handler.Common -import Text.Blaze.Internal import Text.Shakespeare.Text getBuyR :: UserId -> BeverageId -> Handler Html diff --git a/Handler/Supplier.hs b/Handler/Supplier.hs index 5e00f8d..857ebd7 100755 --- a/Handler/Supplier.hs +++ b/Handler/Supplier.hs @@ -3,7 +3,6 @@ module Handler.Supplier where import Import import Handler.Common import Data.Maybe -import qualified Data.Text as T getSupplierR :: Handler Html getSupplierR = do From e0092b300a835599a4712c55f62143ce6fffea30 Mon Sep 17 00:00:00 2001 From: Braden Walters Date: Sun, 6 Dec 2015 21:14:58 +0100 Subject: [PATCH 2/7] Removed warnings about unused symbols --- Handler/Avatar.hs | 8 ++++---- Handler/Buy.hs | 2 +- Handler/Home.hs | 2 +- Handler/SupplierActions.hs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Handler/Avatar.hs b/Handler/Avatar.hs index 14d4e95..3a3e87f 100755 --- a/Handler/Avatar.hs +++ b/Handler/Avatar.hs @@ -44,8 +44,8 @@ postNewAvatarR = do case res of FormSuccess na -> do raw <- runResourceT $ fileSource (avatarNewFile na) $$ sinkLbs - (thumb, hash) <- generateThumb $ B.concat $ L.toChunks raw - runDB $ insert_ $ Avatar (avatarNewIdent na) thumb hash + (thumb, hash') <- generateThumb $ B.concat $ L.toChunks raw + runDB $ insert_ $ Avatar (avatarNewIdent na) thumb hash' setMessageI MsgAvatarUploadSuccessfull redirect HomeR _ -> do @@ -113,11 +113,11 @@ updateAvatar aId (AvatarMod ident Nothing) = runDB $ update aId [AvatarIdent =. ident] updateAvatar aId (AvatarMod ident (Just fi)) = do raw <- runResourceT $ fileSource fi $$ sinkLbs - (thumb, hash) <- generateThumb $ B.concat $ L.toChunks raw + (thumb, hash') <- generateThumb $ B.concat $ L.toChunks raw runDB $ update aId [ AvatarIdent =. ident , AvatarData =. thumb - , AvatarHash =. hash + , AvatarHash =. hash' ] generateThumb :: ByteString -> Handler (ByteString, ByteString) diff --git a/Handler/Buy.hs b/Handler/Buy.hs index 7b7788f..3527681 100755 --- a/Handler/Buy.hs +++ b/Handler/Buy.hs @@ -23,7 +23,7 @@ getBuyR :: UserId -> BeverageId -> Handler Html getBuyR uId bId = do mTup <- checkData uId bId case mTup of - Just (user, bev) -> do + Just (_, bev) -> do master <- getYesod (buyWidget, enctype) <- generateFormPost $ renderBootstrap3 BootstrapBasicForm diff --git a/Handler/Home.hs b/Handler/Home.hs index c936a27..7ec6ce1 100755 --- a/Handler/Home.hs +++ b/Handler/Home.hs @@ -47,7 +47,7 @@ getUserReactivateR :: UserId -> Handler Html getUserReactivateR uId = do mUser <- runDB $ get uId case mUser of - Just user -> do + Just _ -> do time <- liftIO getCurrentTime let secs = R.read $ formatTime defaultTimeLocale "%s" time runDB $ update uId [UserTimestamp =. secs] diff --git a/Handler/SupplierActions.hs b/Handler/SupplierActions.hs index 4f64f82..5decbc5 100755 --- a/Handler/SupplierActions.hs +++ b/Handler/SupplierActions.hs @@ -102,7 +102,7 @@ getDeleteSupplierR :: SupplierId -> Handler Html getDeleteSupplierR sId = do mSup <- runDB $ get sId case mSup of - Just sup -> do + Just _ -> do a <- runDB $ selectList [BeverageSupplier ==. (Just sId)] [] if null a then do From 0c5a864986c6ed32b8c099c7bf4f4b4b74043aac Mon Sep 17 00:00:00 2001 From: Braden Walters Date: Thu, 21 Jan 2016 22:06:14 +0100 Subject: [PATCH 3/7] Remove some more warnings --- Handler/Journal.hs | 2 +- Handler/Modify.hs | 2 +- Handler/Supplier.hs | 1 - yammat.cabal | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Handler/Journal.hs b/Handler/Journal.hs index 3f37efb..dbfc52d 100755 --- a/Handler/Journal.hs +++ b/Handler/Journal.hs @@ -41,7 +41,7 @@ merge [] (c:cs) = (Right $ entityVal c) : merge [] cs merge (t:ts) [] = (Left $ entityVal t) : merge ts [] merge (t:ts) (c:cs) | transactionTime (entityVal t) < cashCheckTime (entityVal c) = (Left $ entityVal t) : merge ts (c:cs) - | transactionTime (entityVal t) > cashCheckTime (entityVal c) = (Right $ entityVal c) : merge (t:ts) cs + | otherwise = (Right $ entityVal c) : merge (t:ts) cs getJournalPageR :: Int -> Handler Html getJournalPageR p = do diff --git a/Handler/Modify.hs b/Handler/Modify.hs index 0eeb1bb..ab991e5 100755 --- a/Handler/Modify.hs +++ b/Handler/Modify.hs @@ -110,7 +110,7 @@ getDeleteBeverageR :: BeverageId -> Handler Html getDeleteBeverageR bId = do mBev <- runDB $ get bId case mBev of - Just bev -> do + Just _ -> do runDB $ delete bId setMessageI MsgItemDeleted redirect HomeR diff --git a/Handler/Supplier.hs b/Handler/Supplier.hs index 857ebd7..fcba778 100755 --- a/Handler/Supplier.hs +++ b/Handler/Supplier.hs @@ -103,7 +103,6 @@ modifySupplierForm sup = SupConf <*> aopt (selectField avatars) (bfs MsgSelectAvatar) (Just $ supplierAvatar sup) <* bootstrapSubmit (msgToBSSubmit MsgSubmit) where - master = getYesod avatars = do ents <- runDB $ selectList [] [Asc AvatarIdent] optionsPairs $ map (\ent -> ((avatarIdent $ entityVal ent), entityKey ent)) ents diff --git a/yammat.cabal b/yammat.cabal index 15b66b0..2369bab 100755 --- a/yammat.cabal +++ b/yammat.cabal @@ -90,7 +90,7 @@ library , aeson >= 0.6 && < 0.11 , conduit >= 1.0 && < 2.0 , monad-logger >= 0.3 && < 0.4 - , fast-logger >= 2.2 && < 2.3 + , fast-logger >= 2.2 , wai-logger >= 2.2 && < 2.3 , file-embed , safe From 8398c1354ef93ff98124318c6589814af6fcbd1b Mon Sep 17 00:00:00 2001 From: Braden Walters Date: Thu, 21 Jan 2016 22:09:29 +0100 Subject: [PATCH 4/7] Change favicon.ico mode --- config/favicon.ico | Bin 1342 -> 318 bytes 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 config/favicon.ico diff --git a/config/favicon.ico b/config/favicon.ico old mode 100755 new mode 100644 index 9dd5f356d4119b9f50f2cfc370d84b975688ca3f..bba52f352b2f65466294a60f1e7b08292dd7f5ea GIT binary patch literal 318 zcmb7;Jr2S!3`Sp+9>5GRS4`czFjlCSVneFbkvnh|7B)r>0GD73pYyXK;ppYXb}Si! zj+yE17y|5oL73=;*MCJ)b9+2-eZEP_v;QNG<3?e!4_hQ=v+s+`3RYJ!W-n{S34G3T n?W_J&tVYh8TfP0u<8ZEag->CT?_yQ$BHXtFyej@)#Y21n$EX?^ literal 1342 zcmZQzU}Ruo5D;Jh(h3Y2EDQ{43=BX%6OhlyumQ;K1Bz*Y#DG`9fi}^UD+ED^lEv4=~bZE?Oa#QNJ z+cU2q@Jy_cXbVuDRgi&!Pndy$Uj&FjG%!r~G*}n}eN{LmftXW(osr#3fhE^klz}@^ zU$|;Qg2VkYvnvl)`{~~bP+{8=sLs_J1jT`BoV|gnVB8(3%DyR3nI&CMh(Rw@h3UVq z976)oLHzLs0y{P~#GTvJ7=J#|Q0S1eI75h=9Fw`b9HR{w%Q9NKNHZGw$TO`BQDl7J zB*l;!s>tv^SdrnOhYW+Vqd0?Ip`+sMGqWlVOi6OO5U9ko&Rv=z-&2+$3yQ1#2)2Iyt@UV6l_ZOK%y5iLO!%E~8CEhtTI!F91gl`Au7IhU0E0?}kN(w@ z(@GAltcg2Y=&tj-&|Ulg{DQz6r)QS$ZjG{eR_vksuf$95e~GvL|56`=|G7@8hd^n- zM_a_T#Lx6fU6|F+{xt7rP0@~@>%wjS*G1U>Z;o;N-k;|6qA}9`6OjL}G1~EeW3=^5DjW<90fw^D6(KfPd$WT6cc%IO1Eo_)x()sZqPsJK{&i;t{p-yR`PY{n z`maAX{C`cD?VMyQIW~~}Y`~P9?rvnzn&NkBR(1OSnN?~3XI7^E1JWS;e-;Q=r~jK( zlL?~#x2O27D)F}fCP`F~?PDR|ni?=~ZbR<>vMam ze^E`iJs(V`ngAn=$#81rbOtk7PUZ{`6Xo`dki6+t8S`h>Wv`xIl|HpC#V@MB$4ofh z$&hh#oH1ArFpV<&kY`}{z|O$%fSG~e;eQ|-XxxTB3=A_W7#Jih7#Jo1Rc-*{2S9uP eCz> Date: Thu, 21 Jan 2016 22:19:41 +0100 Subject: [PATCH 5/7] Resolved warnings in Handler/Common.hs --- Handler/Common.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Handler/Common.hs b/Handler/Common.hs index 228b650..f6239bf 100755 --- a/Handler/Common.hs +++ b/Handler/Common.hs @@ -19,6 +19,7 @@ module Handler.Common where import Data.FileEmbed (embedFile) import Yesod.Form.Bootstrap3 import qualified Data.Text as T +import qualified Data.Text.Lazy as TL import qualified Data.List as L import qualified Data.Text.Lazy.Encoding as E import qualified Data.Text.Read as R @@ -40,7 +41,7 @@ getRobotsR :: Handler TypedContent getRobotsR = return $ TypedContent typePlain $ toContent $(embedFile "config/robots.txt") --- msgToBSSubmit :: T.Text -> BootstrapSubmit T.Text +msgToBSSubmit :: AppMessage -> BootstrapSubmit AppMessage msgToBSSubmit t = BootstrapSubmit { bsValue = t , bsClasses = "btn-default" @@ -105,6 +106,7 @@ volumeField = Field showVal = either id (pack . showA) showA x = show ((fromIntegral x :: Double) / 1000) +barcodeField :: (RenderMessage (HandlerSite m) FormMessage, Monad m) => Field m [Text] barcodeField = Field { fieldParse = parseHelper $ Right . removeItem "" . L.nub . T.splitOn ", " , fieldView = \theId name attrs val isReq -> toWidget [hamlet|$newline never @@ -185,7 +187,7 @@ checkAlert bId = do if beverageAmount bev < beverageAlertAmount bev then do master <- getYesod - let to = appEmail $ appSettings master + let to = appEmail $ appSettings master liftIO $ sendMail to "Niedriger Bestand" [stext| Hallo, @@ -200,7 +202,7 @@ der Matemat else return () -- do nothing ---sendMail :: MonadIO m => Text -> Text -> Text -> m () +sendMail :: Text -> Text -> TL.Text -> IO () sendMail to subject body = renderSendMail Mail From 926a8b5bd828b3f9483172eeff404d8f973f9d95 Mon Sep 17 00:00:00 2001 From: Braden Walters Date: Thu, 21 Jan 2016 22:32:25 +0100 Subject: [PATCH 6/7] Fixed warnings in Foundation and Handler.SupplierActions --- Foundation.hs | 1 + Handler/SupplierActions.hs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Foundation.hs b/Foundation.hs index 987cc2d..f56228e 100755 --- a/Foundation.hs +++ b/Foundation.hs @@ -69,6 +69,7 @@ instance HasHttpManager App where mkMessage "App" "messages" "de" +renderMessage' :: (RenderMessage (HandlerSite m) message, MonadHandler m) => message -> m Text renderMessage' e = do m <- getYesod l <- languages diff --git a/Handler/SupplierActions.hs b/Handler/SupplierActions.hs index 5decbc5..de78dcd 100755 --- a/Handler/SupplierActions.hs +++ b/Handler/SupplierActions.hs @@ -3,6 +3,7 @@ module Handler.SupplierActions where import Import import Handler.Common import qualified Data.Text as T +import Text.Blaze getSupplierActionsR :: SupplierId -> Handler Html getSupplierActionsR sId = do @@ -69,6 +70,7 @@ getSupplierDigestR sId = do redirect SupplierR -- tableLayout :: Widget -> WidgetT site0 IO () +tableLayout :: WidgetT App IO () -> HandlerT App IO Markup tableLayout widget = do cont <- widgetToPageContent $ do $(combineStylesheets 'StaticR From 587a4e499ae6287c95188cf63f3a808290e9c568 Mon Sep 17 00:00:00 2001 From: Braden Walters Date: Thu, 21 Jan 2016 23:17:35 +0100 Subject: [PATCH 7/7] Use MonadIO --- Handler/Common.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Handler/Common.hs b/Handler/Common.hs index f6239bf..7b7a449 100755 --- a/Handler/Common.hs +++ b/Handler/Common.hs @@ -202,9 +202,9 @@ der Matemat else return () -- do nothing -sendMail :: Text -> Text -> TL.Text -> IO () +sendMail :: MonadIO m => Text -> Text -> TL.Text -> m () sendMail to subject body = - renderSendMail + liftIO $ renderSendMail Mail { mailFrom = Address Nothing "noreply" , mailTo = [Address Nothing to]