From 23f4e6fbe97aec19c26b2a26c2c46f41f74b8811 Mon Sep 17 00:00:00 2001 From: Philippe Pittoli Date: Fri, 25 Jul 2025 17:28:16 +0200 Subject: [PATCH] Refactoring (move somes modules in App.Type.ResourceRecord). --- src/App/Page/Zone.purs | 4 ++-- src/App/Templates/Modal.purs | 6 +++--- src/App/Templates/Table.purs | 2 +- src/App/Type/ResourceRecord.purs | 8 ++++---- src/App/Type/{ => ResourceRecord}/CAA.purs | 2 +- src/App/Type/{ => ResourceRecord}/DKIM.purs | 2 +- src/App/Type/{ => ResourceRecord}/DMARC.purs | 2 +- src/App/Validation/DNS.purs | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) rename src/App/Type/{ => ResourceRecord}/CAA.purs (97%) rename src/App/Type/{ => ResourceRecord}/DKIM.purs (98%) rename src/App/Type/{ => ResourceRecord}/DMARC.purs (99%) diff --git a/src/App/Page/Zone.purs b/src/App/Page/Zone.purs index 5cab811..1664950 100644 --- a/src/App/Page/Zone.purs +++ b/src/App/Page/Zone.purs @@ -44,8 +44,8 @@ import App.Type.RRId (RRId) import App.Type.ResourceRecord as RR import App.Type.Delegation (mkEmptyDelegationForm, update, Form, Field) as Delegation import App.Type.RRModal (RRModal(..)) -import App.Type.DKIM as DKIM -import App.Type.DMARC as DMARC +import App.Type.ResourceRecord.DKIM as DKIM +import App.Type.ResourceRecord.DMARC as DMARC import App.Type.LogMessage (LogMessage(..)) import App.Message.DNSManagerDaemon as DNSManager diff --git a/src/App/Templates/Modal.purs b/src/App/Templates/Modal.purs index 121b28e..c9585c1 100644 --- a/src/App/Templates/Modal.purs +++ b/src/App/Templates/Modal.purs @@ -12,14 +12,14 @@ import Data.Maybe (Maybe(..), fromMaybe, maybe) import Data.Tuple (Tuple) -import App.Type.CAA as CAA +import App.Type.ResourceRecord.CAA as CAA import App.Text.Explanations as Explanations import Web as Web import Halogen.HTML as HH import Halogen.HTML.Properties as HP import App.Type.RRId (RRId) -import App.Type.DMARC as DMARC -import App.Type.DKIM as DKIM +import App.Type.ResourceRecord.DMARC as DMARC +import App.Type.ResourceRecord.DKIM as DKIM import App.Type.Delegation as Delegation import App.Templates.Table as Table import Data.String (toLower) diff --git a/src/App/Templates/Table.purs b/src/App/Templates/Table.purs index 1a66a6b..711c9a9 100644 --- a/src/App/Templates/Table.purs +++ b/src/App/Templates/Table.purs @@ -29,7 +29,7 @@ import Halogen.HTML as HH import Halogen.HTML.Properties as HP import Data.String.CodePoints as CP import Utils (id, attach_id) -import App.Type.DMARC as DMARC +import App.Type.ResourceRecord.DMARC as DMARC import App.Type.ResourceRecord (ResourceRecord) import App.Type.ResourceRecord.SPF ( show_mechanism, show_mechanism_type diff --git a/src/App/Type/ResourceRecord.purs b/src/App/Type/ResourceRecord.purs index 2909b41..516b3a0 100644 --- a/src/App/Type/ResourceRecord.purs +++ b/src/App/Type/ResourceRecord.purs @@ -1,6 +1,6 @@ module App.Type.ResourceRecord where -import Prelude (($), (-), (<>), map, bind, pure, class Show) +import Prelude (class Show, ($), (-), (<>)) -- import Data.String (toLower) import Data.Generic.Rep (class Generic) import App.Type.GenericSerialization (generic_serialization) @@ -23,10 +23,10 @@ import Data.Codec.Argonaut as CA import Data.Codec.Argonaut.Record as CAR import Data.Int (fromString) -import App.Type.DKIM as DKIM -import App.Type.DMARC as DMARC +import App.Type.ResourceRecord.DKIM as DKIM +import App.Type.ResourceRecord.DMARC as DMARC import App.Type.ResourceRecord.SPF as SPF -import App.Type.CAA as CAA +import App.Type.ResourceRecord.CAA as CAA type ResourceRecord = { rrtype :: String diff --git a/src/App/Type/CAA.purs b/src/App/Type/ResourceRecord/CAA.purs similarity index 97% rename from src/App/Type/CAA.purs rename to src/App/Type/ResourceRecord/CAA.purs index d3ccbcc..cca130e 100644 --- a/src/App/Type/CAA.purs +++ b/src/App/Type/ResourceRecord/CAA.purs @@ -1,6 +1,6 @@ -- | The Certification Authority Authorization (CAA) record is described in RFC8859. -- | The CAA record allows to specify Certification Authorities (CAs) authorized to issue certificates. -module App.Type.CAA where +module App.Type.ResourceRecord.CAA where import Prelude import Data.Generic.Rep (class Generic) diff --git a/src/App/Type/DKIM.purs b/src/App/Type/ResourceRecord/DKIM.purs similarity index 98% rename from src/App/Type/DKIM.purs rename to src/App/Type/ResourceRecord/DKIM.purs index 222d452..251b4f0 100644 --- a/src/App/Type/DKIM.purs +++ b/src/App/Type/ResourceRecord/DKIM.purs @@ -1,4 +1,4 @@ -module App.Type.DKIM where +module App.Type.ResourceRecord.DKIM where import Prelude import Data.Generic.Rep (class Generic) diff --git a/src/App/Type/DMARC.purs b/src/App/Type/ResourceRecord/DMARC.purs similarity index 99% rename from src/App/Type/DMARC.purs rename to src/App/Type/ResourceRecord/DMARC.purs index e401481..93e6bf7 100644 --- a/src/App/Type/DMARC.purs +++ b/src/App/Type/ResourceRecord/DMARC.purs @@ -1,6 +1,6 @@ -- | DMARC is a spam mitigation mechanism described in RFC7489. -- | DMARC is built on top of DKIM and SPF. -module App.Type.DMARC where +module App.Type.ResourceRecord.DMARC where import Prelude import Data.Generic.Rep (class Generic) diff --git a/src/App/Validation/DNS.purs b/src/App/Validation/DNS.purs index 2c32ac1..0f5b99f 100644 --- a/src/App/Validation/DNS.purs +++ b/src/App/Validation/DNS.purs @@ -18,9 +18,9 @@ import GenericParser.DomainParser (name, sub_eof) as DomainParser import GenericParser.IPAddress as IPAddress import GenericParser.RFC5234 as RFC5234 -import App.Type.DKIM as DKIM -import App.Type.DMARC as DMARC -import App.Type.CAA as CAA +import App.Type.ResourceRecord.DKIM as DKIM +import App.Type.ResourceRecord.DMARC as DMARC +import App.Type.ResourceRecord.CAA as CAA import Utils (id)