From 3a53ab0f243aa06b89a1e9983a0a9688365e1706 Mon Sep 17 00:00:00 2001 From: nek0 Date: Sun, 12 Feb 2017 11:58:54 +0100 Subject: [PATCH] loading script only when needed --- Foundation.hs | 2 +- Handler/Home.hs | 6 ++++-- Handler/Select.hs | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Foundation.hs b/Foundation.hs index f71bc62..3863084 100644 --- a/Foundation.hs +++ b/Foundation.hs @@ -130,7 +130,7 @@ instance Yesod App where ] mapM_ addScript $ map StaticR [ js_crementing_js - , js_barcode_js + -- , js_barcode_js ] $(widgetFile "default-layout") withUrlRenderer $(hamletFile "templates/default-layout-wrapper.hamlet") diff --git a/Handler/Home.hs b/Handler/Home.hs index 4ab1576..b6a6865 100644 --- a/Handler/Home.hs +++ b/Handler/Home.hs @@ -31,14 +31,16 @@ getHomeR = do beverages <- runDB $ selectList [BeverageAmount !=. 0] [Desc BeverageIdent] today <- liftIO $ utctDay <$> getCurrentTime users <- runDB $ selectList [UserTimestamp >=. addDays (-30) today] [Asc UserIdent] - defaultLayout $ + defaultLayout $ do + addScript $ StaticR js_barcode_js $(widgetFile "home") getReactivateR :: Handler Html getReactivateR = do today <- liftIO $ return . utctDay =<< getCurrentTime users <- runDB $ selectList [UserTimestamp <. addDays (-30) today] [Asc UserIdent] - defaultLayout $ + defaultLayout $ do + addScript $ StaticR js_barcode_js $(widgetFile "reactivate") getUserReactivateR :: UserId -> Handler Html diff --git a/Handler/Select.hs b/Handler/Select.hs index 310c165..15daa5a 100644 --- a/Handler/Select.hs +++ b/Handler/Select.hs @@ -25,14 +25,16 @@ getSelectR uId = isUser uId HomeR >>= (\user -> do master <- getYesod beverages <- runDB $ selectList [BeverageAmount >. 0] [Asc BeverageIdent] - defaultLayout $ + defaultLayout $ do + addScript $ StaticR js_barcode_js $(widgetFile "select") ) getSelectCashR :: Handler Html getSelectCashR = do beverages <- runDB $ selectList [BeverageAmount >. 0] [Asc BeverageIdent] - defaultLayout $ + defaultLayout $ do + addScript $ StaticR js_barcode_js $(widgetFile "selectCash") getRechargeR :: UserId -> Handler Html