git.iko.soy/obelisk
on master help sign in
route: Sort imports
a945901Elliot Cameron
lib/route/src/Obelisk/Route.hs+7−6
compare with master
unifiedsplit
@@ -140,15 +140,18 @@ import Control.Lens
140 , view
140 , view
141 , Wrapped (..)
141 , Wrapped (..)
142 )
142 )
143+
143import Control.Monad.Except
144import Control.Monad.Except
144−import Control.Monad.Writer (execWriter, tell)
145import qualified Control.Monad.State.Strict as State
145import qualified Control.Monad.State.Strict as State
146import Control.Monad.Trans (lift)
146import Control.Monad.Trans (lift)
147+import Control.Monad.Writer (execWriter, tell)
148+import Data.Aeson (FromJSON, ToJSON)
149+import qualified Data.Aeson as Aeson
147import qualified Data.ByteString as BS
150import qualified Data.ByteString as BS
148import qualified Data.ByteString.Lazy as BSL
151import qualified Data.ByteString.Lazy as BSL
149−import Data.Dependent.Sum (DSum (..))
150import Data.Dependent.Map (DMap)
152import Data.Dependent.Map (DMap)
151import qualified Data.Dependent.Map as DMap
153import qualified Data.Dependent.Map as DMap
154+import Data.Dependent.Sum (DSum (..))
152import Data.Either.Validation (Validation (..))
155import Data.Either.Validation (Validation (..))
153import Data.Foldable
156import Data.Foldable
154import Data.Functor.Sum
157import Data.Functor.Sum
@@ -163,19 +166,17 @@ import Data.Monoid ((<>))
163import Data.Set (Set)
166import Data.Set (Set)
164import qualified Data.Set as Set
167import qualified Data.Set as Set
165import Data.Some (Some(Some))
168import Data.Some (Some(Some))
169+import Data.Tabulation
166import Data.Text (Text)
170import Data.Text (Text)
167−import Data.Text.Lens (IsText, packed, unpacked)
168import qualified Data.Text as T
171import qualified Data.Text as T
169import qualified Data.Text.Encoding as T
172import qualified Data.Text.Encoding as T
173+import Data.Text.Lens (IsText, packed, unpacked)
170import Data.Universe
174import Data.Universe
171import Data.Universe.Some
175import Data.Universe.Some
172import Network.HTTP.Types.URI
176import Network.HTTP.Types.URI
173import qualified Numeric.Lens
177import qualified Numeric.Lens
174import Obelisk.Route.TH
178import Obelisk.Route.TH
175import Text.Read (readMaybe)
179import Text.Read (readMaybe)
176−import Data.Tabulation
177−import qualified Data.Aeson as Aeson
178−import Data.Aeson (FromJSON, ToJSON)
179
180
180-- Design goals:
181-- Design goals:
181-- No start-up time on the frontend (not yet met)
182-- No start-up time on the frontend (not yet met)
lib/route/src/Obelisk/Route/Frontend.hs+16−18
@@ -57,8 +57,6 @@ module Obelisk.Route.Frontend
57
57
58import Prelude hiding ((.), id)
58import Prelude hiding ((.), id)
59
59
60−import Obelisk.Route
61−
62import Control.Category (Category (..), (.))
60import Control.Category (Category (..), (.))
63import Control.Category.Cartesian ((&&&))
61import Control.Category.Cartesian ((&&&))
64import Control.Lens hiding (Bifunctor, bimap, universe, element)
62import Control.Lens hiding (Bifunctor, bimap, universe, element)
@@ -70,36 +68,36 @@ import Control.Monad.Ref
70import Control.Monad.Trans.Control
68import Control.Monad.Trans.Control
71import Data.Coerce
69import Data.Coerce
72import Data.Dependent.Sum (DSum (..))
70import Data.Dependent.Sum (DSum (..))
71+import Data.Functor.Compose
72+import Data.Functor.Misc
73import Data.GADT.Compare
73import Data.GADT.Compare
74+import qualified Data.List as L
74import Data.Map (Map)
75import Data.Map (Map)
76+import Data.Maybe (fromMaybe)
75import Data.Monoid
77import Data.Monoid
76import Data.Proxy
78import Data.Proxy
77import Data.Text (Text)
79import Data.Text (Text)
78import qualified Data.Text as T
80import qualified Data.Text as T
79−import Data.Functor.Compose
80−import Data.Functor.Misc
81−import Reflex.Class
82−import Reflex.Host.Class
83−import Reflex.PostBuild.Class
84−import Reflex.TriggerEvent.Class
85−import Reflex.PerformEvent.Class
86−import Reflex.EventWriter.Class
87−import Reflex.EventWriter.Base
88−import Reflex.Dynamic
89−import Reflex.Dom.Builder.Class
90import Data.Type.Coercion
81import Data.Type.Coercion
91−import Language.Javascript.JSaddle --TODO: Get rid of this - other platforms can also be routed
92−import Reflex.Dom.Core
93import qualified GHCJS.DOM as DOM
82import qualified GHCJS.DOM as DOM
94import qualified GHCJS.DOM.Types as DOM
83import qualified GHCJS.DOM.Types as DOM
95import qualified GHCJS.DOM.Window as Window
84import qualified GHCJS.DOM.Window as Window
85+import Language.Javascript.JSaddle --TODO: Get rid of this - other platforms can also be routed
96import Network.URI
86import Network.URI
97−import Data.Maybe (fromMaybe)
87+import Reflex.Class
98−import qualified Data.List as L
88+import Reflex.Dom.Builder.Class
99−
89+import Reflex.Dom.Core
90+import Reflex.Dynamic
91+import Reflex.EventWriter.Base
92+import Reflex.EventWriter.Class
93+import Reflex.Host.Class
94+import Reflex.PerformEvent.Class
95+import Reflex.PostBuild.Class
96+import Reflex.TriggerEvent.Class
100import Unsafe.Coerce
97import Unsafe.Coerce
101
98
102import Obelisk.Configs
99import Obelisk.Configs
100+import Obelisk.Route
103
101
104infixr 5 :~
102infixr 5 :~
105pattern (:~) :: Reflex t => f a -> Dynamic t a -> DSum f (Compose (Dynamic t) Identity)
103pattern (:~) :: Reflex t => f a -> Dynamic t a -> DSum f (Compose (Dynamic t) Identity)