summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFélix Sipma <felix.sipma@no-log.org>2014-12-06 15:59:34 +0100
committerFélix Sipma <felix.sipma@no-log.org>2014-12-06 16:01:15 +0100
commite102d65ae823e730aaf18d650afd40d6fdb4125a (patch)
treea882317577f266a1b88cef4f8d16d45cd045a78a
parenta0bba0e0756d6885b607de80f85fd57d07b43366 (diff)
move Shop.Quantity.Types to Model.Quantity
-rw-r--r--Foundation.hs2
-rw-r--r--Handler/CartItem.hs2
-rw-r--r--Handler/CartItemEdit.hs2
-rw-r--r--Handler/ShopAdmin.hs2
-rw-r--r--Model.hs2
-rw-r--r--Model/Quantity.hs (renamed from Shop/Quantity/Types.hs)2
-rw-r--r--Shop/Quantity/Fields.hs2
-rw-r--r--mokupona.cabal2
8 files changed, 8 insertions, 8 deletions
diff --git a/Foundation.hs b/Foundation.hs
index f777913..d1904d2 100644
--- a/Foundation.hs
+++ b/Foundation.hs
@@ -19,7 +19,7 @@ import Text.Blaze.Html.Renderer.Utf8 (renderHtml)
import Text.Cassius (PixelSize (..))
import Shop.Unit.Types (Unit (..))
import Model.Amount (Amount (..))
-import Shop.Quantity.Types (Quantity (..), toAmount)
+import Model.Quantity (Quantity (..), toAmount)
import Yesod.Form.Bootstrap3
import qualified Database.Esqueleto as E
diff --git a/Handler/CartItem.hs b/Handler/CartItem.hs
index d7b1ee9..dd2d185 100644
--- a/Handler/CartItem.hs
+++ b/Handler/CartItem.hs
@@ -2,7 +2,7 @@ module Handler.CartItem where
import Import
import Shop.Quantity.Fields (cartField)
-import Shop.Quantity.Types (Quantity (..))
+import Model.Quantity (Quantity (..))
-- | Render a form using Bootstrap-friendly shamlet syntax.
--
diff --git a/Handler/CartItemEdit.hs b/Handler/CartItemEdit.hs
index b28641b..a39088d 100644
--- a/Handler/CartItemEdit.hs
+++ b/Handler/CartItemEdit.hs
@@ -2,7 +2,7 @@ module Handler.CartItemEdit where
import Import
import Shop.Quantity.Fields (cartField)
-import Shop.Quantity.Types (Quantity (..))
+import Model.Quantity (Quantity (..))
-- | Render a form using Bootstrap-friendly shamlet syntax.
--
diff --git a/Handler/ShopAdmin.hs b/Handler/ShopAdmin.hs
index 0236403..56a0b56 100644
--- a/Handler/ShopAdmin.hs
+++ b/Handler/ShopAdmin.hs
@@ -6,7 +6,7 @@ import Shop.Image.Functions (getImageId)
import Shop.Image.Fields (selectImageField, bootstrapFileField)
import Shop.Amount.Fields (amountField)
import Model.Amount (Amount (..))
-import Shop.Quantity.Types (Quantity (..))
+import Model.Quantity (Quantity (..))
import Shop.Quantity.Fields (quantityField)
data FormItem = FormItem
diff --git a/Model.hs b/Model.hs
index 02dd680..c79ae72 100644
--- a/Model.hs
+++ b/Model.hs
@@ -5,7 +5,7 @@ import ClassyPrelude.Yesod
import Database.Persist.Quasi
import Shop.Unit.Types (Unit)
import Model.Amount (Amount)
-import Shop.Quantity.Types (Quantity)
+import Model.Quantity (Quantity)
import Shop.Place.Types (Point (..))
import Data.Aeson ((.:?))
diff --git a/Shop/Quantity/Types.hs b/Model/Quantity.hs
index 54b00d4..163f863 100644
--- a/Shop/Quantity/Types.hs
+++ b/Model/Quantity.hs
@@ -1,4 +1,4 @@
-module Shop.Quantity.Types where
+module Model.Quantity where
import Prelude
import Database.Persist.Class (PersistField (..))
diff --git a/Shop/Quantity/Fields.hs b/Shop/Quantity/Fields.hs
index 06a96b9..5c0e5d3 100644
--- a/Shop/Quantity/Fields.hs
+++ b/Shop/Quantity/Fields.hs
@@ -1,7 +1,7 @@
module Shop.Quantity.Fields where
import Import
-import Shop.Quantity.Types (Quantity (..))
+import Model.Quantity (Quantity (..))
import qualified Data.Text.Read
cartFieldAux :: ( Monad m
diff --git a/mokupona.cabal b/mokupona.cabal
index da13cae..bc99f44 100644
--- a/mokupona.cabal
+++ b/mokupona.cabal
@@ -19,6 +19,7 @@ library
Settings
Settings.StaticFiles
Model.Amount
+ Model.Quantity
Widget.Navbar
Handler.Common
Handler.Home
@@ -43,7 +44,6 @@ library
Shop.Image.Fields
Shop.Unit.Types
Shop.Amount.Fields
- Shop.Quantity.Types
Shop.Quantity.Fields
Shop.Place.Types
Shop.Place.Functions