diff --git a/back/src/Guide/Database/Add.hs b/back/src/Guide/Database/Add.hs index ace3757..d150ee0 100644 --- a/back/src/Guide/Database/Add.hs +++ b/back/src/Guide/Database/Add.hs @@ -27,7 +27,7 @@ import qualified Hasql.Transaction as HT import Guide.Database.Set import Guide.Database.Types import Guide.Database.Utils (execute) -import Guide.Types.Core (Category (..), CategoryStatus (..), Item (..), Trait (..), TraitType (..), ItemSection) +import Guide.Types.Core import Guide.Utils (Uid (..)) diff --git a/back/src/Guide/Database/Get.hs b/back/src/Guide/Database/Get.hs index f80be0a..73e5c21 100644 --- a/back/src/Guide/Database/Get.hs +++ b/back/src/Guide/Database/Get.hs @@ -42,7 +42,7 @@ import qualified Hasql.Transaction as HT import Guide.Database.Types import Guide.Database.Utils -import Guide.Types.Core (Category (..), Item (..), Trait (..), TraitType (..)) +import Guide.Types.Core import Guide.Utils (Uid (..)) diff --git a/back/src/Guide/Database/Set.hs b/back/src/Guide/Database/Set.hs index 7485b95..e1ab215 100644 --- a/back/src/Guide/Database/Set.hs +++ b/back/src/Guide/Database/Set.hs @@ -33,7 +33,7 @@ import qualified Hasql.Transaction as HT import Guide.Database.Get import Guide.Database.Types import Guide.Database.Utils -import Guide.Types.Core (Category (..), Item (..), Trait (..), TraitType (..), CategoryStatus (..), ItemSection (..)) +import Guide.Types.Core import Guide.Utils (Uid (..), fieldsPrefixed) diff --git a/back/src/Guide/Database/Types.hs b/back/src/Guide/Database/Types.hs index 2505614..5cc4188 100644 --- a/back/src/Guide/Database/Types.hs +++ b/back/src/Guide/Database/Types.hs @@ -33,8 +33,7 @@ import Imports import Named import Guide.Markdown (toMarkdownBlock, toMarkdownTree, toMarkdownInline, markdownBlockSource, markdownTreeSource, markdownInlineSource) -import Guide.Types.Core (Category (..), CategoryStatus, Item (..), ItemSection, Trait (..), - TraitType) +import Guide.Types.Core import Guide.Utils (Uid (..), makeClassWithLenses, fields) import Guide.Database.Utils