summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFélix Sipma <felix.sipma@no-log.org>2014-12-06 15:53:44 +0100
committerFélix Sipma <felix.sipma@no-log.org>2014-12-06 15:53:44 +0100
commita0bba0e0756d6885b607de80f85fd57d07b43366 (patch)
tree74e0632282a294d24fc3e5ced43ea1f98392bae1
parent1c097e77b5f9fa68c75254ea90afde81a6e15cd5 (diff)
move Shop.Amount.Types to Model.Amount
-rw-r--r--Foundation.hs2
-rw-r--r--Handler/ShopAdmin.hs2
-rw-r--r--Model.hs2
-rw-r--r--Model/Amount.hs (renamed from Shop/Amount/Types.hs)2
-rw-r--r--Shop/Amount/Fields.hs2
-rw-r--r--Shop/Quantity/Types.hs2
-rw-r--r--mokupona.cabal2
7 files changed, 7 insertions, 7 deletions
diff --git a/Foundation.hs b/Foundation.hs
index ff3f897..f777913 100644
--- a/Foundation.hs
+++ b/Foundation.hs
@@ -18,7 +18,7 @@ import Text.Shakespeare.Text (stext)
import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
import Text.Cassius (PixelSize (..))
import Shop.Unit.Types (Unit (..))
-import Shop.Amount.Types (Amount (..))
+import Model.Amount (Amount (..))
import Shop.Quantity.Types (Quantity (..), toAmount)
import Yesod.Form.Bootstrap3
import qualified Database.Esqueleto as E
diff --git a/Handler/ShopAdmin.hs b/Handler/ShopAdmin.hs
index fae37cb..0236403 100644
--- a/Handler/ShopAdmin.hs
+++ b/Handler/ShopAdmin.hs
@@ -5,7 +5,7 @@ import Shop.Unit.Types (Unit (..))
import Shop.Image.Functions (getImageId)
import Shop.Image.Fields (selectImageField, bootstrapFileField)
import Shop.Amount.Fields (amountField)
-import Shop.Amount.Types (Amount (..))
+import Model.Amount (Amount (..))
import Shop.Quantity.Types (Quantity (..))
import Shop.Quantity.Fields (quantityField)
diff --git a/Model.hs b/Model.hs
index 2432473..02dd680 100644
--- a/Model.hs
+++ b/Model.hs
@@ -4,7 +4,7 @@ module Model where
import ClassyPrelude.Yesod
import Database.Persist.Quasi
import Shop.Unit.Types (Unit)
-import Shop.Amount.Types (Amount)
+import Model.Amount (Amount)
import Shop.Quantity.Types (Quantity)
import Shop.Place.Types (Point (..))
import Data.Aeson ((.:?))
diff --git a/Shop/Amount/Types.hs b/Model/Amount.hs
index 2b2b75f..6def9df 100644
--- a/Shop/Amount/Types.hs
+++ b/Model/Amount.hs
@@ -1,4 +1,4 @@
-module Shop.Amount.Types where
+module Model.Amount where
import Prelude
import Text.Printf (printf)
diff --git a/Shop/Amount/Fields.hs b/Shop/Amount/Fields.hs
index ef0a482..7872e57 100644
--- a/Shop/Amount/Fields.hs
+++ b/Shop/Amount/Fields.hs
@@ -1,7 +1,7 @@
module Shop.Amount.Fields where
import Import
-import Shop.Amount.Types
+import Model.Amount
import qualified Data.Text.Read
amountField :: Monad m => RenderMessage (HandlerSite m) FormMessage => Field m Amount
diff --git a/Shop/Quantity/Types.hs b/Shop/Quantity/Types.hs
index d2b1af8..54b00d4 100644
--- a/Shop/Quantity/Types.hs
+++ b/Shop/Quantity/Types.hs
@@ -5,7 +5,7 @@ import Database.Persist.Class (PersistField (..))
import Database.Persist.Sql (PersistFieldSql (..), SqlType (..))
import Text.Blaze (ToMarkup (..))
import Text.Shakespeare.I18N (ToMessage (..))
-import Shop.Amount.Types (Amount (..))
+import Model.Amount (Amount (..))
import Data.Bits (bitSize)
data Quantity = Quantity Int
diff --git a/mokupona.cabal b/mokupona.cabal
index 3afb543..da13cae 100644
--- a/mokupona.cabal
+++ b/mokupona.cabal
@@ -18,6 +18,7 @@ library
Model
Settings
Settings.StaticFiles
+ Model.Amount
Widget.Navbar
Handler.Common
Handler.Home
@@ -41,7 +42,6 @@ library
Shop.Image.Functions
Shop.Image.Fields
Shop.Unit.Types
- Shop.Amount.Types
Shop.Amount.Fields
Shop.Quantity.Types
Shop.Quantity.Fields