diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-10-22 21:14:44 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-10-22 21:14:44 +0200 |
| commit | b24a594ebc4d1f98cb93d7f6b706f91c92a011dc (patch) | |
| tree | 655257f9431907e45b703f7abdb0a8b6c076f971 | |
| parent | 2892a202e7c4e630181fc6c9a56a5f445b8aa63a (diff) | |
| download | thermoprint-b24a594ebc4d1f98cb93d7f6b706f91c92a011dc.tar thermoprint-b24a594ebc4d1f98cb93d7f6b706f91c92a011dc.tar.gz thermoprint-b24a594ebc4d1f98cb93d7f6b706f91c92a011dc.tar.bz2 thermoprint-b24a594ebc4d1f98cb93d7f6b706f91c92a011dc.tar.xz thermoprint-b24a594ebc4d1f98cb93d7f6b706f91c92a011dc.zip | |
Revert "Merged PrintOut into Main.hs"
This reverts commit 9ca0799435aca9f4380ca7e80358dc77236d1b24.
| -rw-r--r-- | servant/src/Main.hs | 6 | ||||
| -rw-r--r-- | servant/src/PrintOut.hs | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/servant/src/Main.hs b/servant/src/Main.hs index 680f1c6..70d244c 100644 --- a/servant/src/Main.hs +++ b/servant/src/Main.hs | |||
| @@ -7,8 +7,6 @@ | |||
| 7 | {-# LANGUAGE QuasiQuotes #-} | 7 | {-# LANGUAGE QuasiQuotes #-} |
| 8 | {-# LANGUAGE TemplateHaskell #-} | 8 | {-# LANGUAGE TemplateHaskell #-} |
| 9 | {-# LANGUAGE TypeFamilies #-} | 9 | {-# LANGUAGE TypeFamilies #-} |
| 10 | {-# LANGUAGE FlexibleInstances #-} | ||
| 11 | {-# LANGUAGE TypeSynonymInstances #-} | ||
| 12 | 10 | ||
| 13 | import Thermoprint | 11 | import Thermoprint |
| 14 | import Thermoprint.Api | 12 | import Thermoprint.Api |
| @@ -45,10 +43,6 @@ import Data.Int (Int64) | |||
| 45 | 43 | ||
| 46 | import Prelude hiding (print) | 44 | import Prelude hiding (print) |
| 47 | 45 | ||
| 48 | type PrintOut = Block String | ||
| 49 | |||
| 50 | derivePersistFieldJSON "PrintOut" | ||
| 51 | |||
| 52 | share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistLowerCase| | 46 | share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistLowerCase| |
| 53 | Draft | 47 | Draft |
| 54 | title String | 48 | title String |
diff --git a/servant/src/PrintOut.hs b/servant/src/PrintOut.hs new file mode 100644 index 0000000..5f95a22 --- /dev/null +++ b/servant/src/PrintOut.hs | |||
| @@ -0,0 +1,14 @@ | |||
| 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" | ||
