diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-10-18 00:49:46 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-10-18 00:49:46 +0200 |
commit | 9ca0799435aca9f4380ca7e80358dc77236d1b24 (patch) | |
tree | faa7f72b761648148e307099a9e68b6f253e0f3e | |
parent | 196c14be08e5c17514c7d199085a44d094d8b0c3 (diff) | |
download | thermoprint-9ca0799435aca9f4380ca7e80358dc77236d1b24.tar thermoprint-9ca0799435aca9f4380ca7e80358dc77236d1b24.tar.gz thermoprint-9ca0799435aca9f4380ca7e80358dc77236d1b24.tar.bz2 thermoprint-9ca0799435aca9f4380ca7e80358dc77236d1b24.tar.xz thermoprint-9ca0799435aca9f4380ca7e80358dc77236d1b24.zip |
Merged PrintOut into Main.hs
-rw-r--r-- | servant/src/Main.hs | 6 | ||||
-rw-r--r-- | servant/src/PrintOut.hs | 14 |
2 files changed, 6 insertions, 14 deletions
diff --git a/servant/src/Main.hs b/servant/src/Main.hs index 7def207..e93972f 100644 --- a/servant/src/Main.hs +++ b/servant/src/Main.hs | |||
@@ -7,6 +7,8 @@ | |||
7 | {-# LANGUAGE QuasiQuotes #-} | 7 | {-# LANGUAGE QuasiQuotes #-} |
8 | {-# LANGUAGE TemplateHaskell #-} | 8 | {-# LANGUAGE TemplateHaskell #-} |
9 | {-# LANGUAGE TypeFamilies #-} | 9 | {-# LANGUAGE TypeFamilies #-} |
10 | {-# LANGUAGE FlexibleInstances #-} | ||
11 | {-# LANGUAGE TypeSynonymInstances #-} | ||
10 | 12 | ||
11 | import Thermoprint | 13 | import Thermoprint |
12 | import Thermoprint.Api | 14 | import Thermoprint.Api |
@@ -44,6 +46,10 @@ import Data.Int (Int64) | |||
44 | 46 | ||
45 | import Prelude hiding (print) | 47 | import Prelude hiding (print) |
46 | 48 | ||
49 | type PrintOut = Block String | ||
50 | |||
51 | derivePersistFieldJSON "PrintOut" | ||
52 | |||
47 | share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistLowerCase| | 53 | share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistLowerCase| |
48 | Draft | 54 | Draft |
49 | title String | 55 | title String |
diff --git a/servant/src/PrintOut.hs b/servant/src/PrintOut.hs deleted file mode 100644 index 5f95a22..0000000 --- a/servant/src/PrintOut.hs +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | {-# LANGUAGE TemplateHaskell #-} | ||
2 | {-# LANGUAGE TypeSynonymInstances #-} | ||
3 | {-# LANGUAGE FlexibleInstances #-} | ||
4 | module PrintOut | ||
5 | ( PrintOut | ||
6 | ) where | ||
7 | |||
8 | import Thermoprint | ||
9 | import Thermoprint.Api | ||
10 | import Database.Persist.TH | ||
11 | |||
12 | type PrintOut = Block String | ||
13 | |||
14 | derivePersistFieldJSON "PrintOut" | ||