nuttycom/aftok - Change NAFJ6RB3KYDBSTSNB3WQSVUQEPUGG2RZCBWRF4XNT2UKSOXDNMDQC

Minor module reorg.

Created by Kris Nuttycombe on January 26, 2021

NAFJ6RB3KYDBSTSNB3WQSVUQEPUGG2RZCBWRF4XNT2UKSOXDNMDQC

Dependencies

In channels

main

Change contents

Insertion in client/spago.dhall at line 10 [3.294942]
[3.295116]
[4.157]
```
    , "rationals"
```

File addition: Json.purs (----------)

[5.1]

module Aftok.Api.Json where
import Prelude
import Control.Monad.Error.Class (throwError)
import Control.Monad.Except.Trans (ExceptT, except, withExceptT)
import Control.Monad.Trans.Class (lift)
import Data.Argonaut.Core (Json)
import Data.Argonaut.Decode (class DecodeJson, decodeJson)
import Data.DateTime (DateTime)
import Data.DateTime.Instant (Instant, fromDateTime)
import Data.Functor.Compose (Compose(..))
import Data.Either (Either(..), note)
import Data.Foldable (class Foldable, foldr, foldl, foldMap)
import Data.JSDate as JD
import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype, unwrap, over)
import Data.Traversable (class Traversable, traverse)
import Effect (Effect)
import Affjax as AJAX
import Affjax (Response, printError)
import Affjax.StatusCode (StatusCode(..))
import Aftok.Api.Types (APIError(..))
newtype JsonCompose f g a
  = JsonCompose (Compose f g a)
derive instance jsonComposeNewtype :: Newtype (JsonCompose f g a) _
instance jsonComposeFunctor :: (Functor f, Functor g) => Functor (JsonCompose f g) where
  map f = over JsonCompose (map f)
instance jsonComposeFoldable :: (Foldable f, Foldable g) => Foldable (JsonCompose f g) where
  foldr f b = foldr f b <<< unwrap
  foldl f b = foldl f b <<< unwrap
  foldMap f = foldMap f <<< unwrap
instance jsonComposeTraversable :: (Traversable f, Traversable g) => Traversable (JsonCompose f g) where
  traverse f = map JsonCompose <<< traverse f <<< unwrap
  sequence = traverse identity
instance jsonComposeDecodeJson :: (DecodeJson (f (g a))) => DecodeJson (JsonCompose f g a) where
  decodeJson json = JsonCompose <<< Compose <$> decodeJson json
decompose :: forall f g a. JsonCompose f g a -> f (g a)
decompose (JsonCompose (Compose fga)) = fga
parseJsonDate :: Json -> ExceptT String Effect DateTime
parseJsonDate json = do
  str <- except $ decodeJson json
  parseDate str
parseDate :: String -> ExceptT String Effect DateTime
parseDate str = do
  jsDate <- lift $ JD.parse str
  except
    $ note ("Unable to convert date " <> show jsDate <> " to a valid DateTime value.")
        (JD.toDateTime jsDate)
decodeDatedJson :: forall t. Traversable t => DecodeJson (t String) => Json -> ExceptT String Effect (t DateTime)
decodeDatedJson json = do
  decoded <- except $ decodeJson json
  traverse parseDate decoded
parseDatedResponse ::
  forall t.
  Traversable t =>
  DecodeJson (t String) =>
  Either AJAX.Error (Response Json) ->
  ExceptT APIError Effect (t Instant)
parseDatedResponse = case _ of
  Left err -> throwError $ Error { status: Nothing, message: printError err }
  Right r -> case r.status of
    StatusCode 403 -> throwError $ Forbidden
    StatusCode 200 -> withExceptT (ParseFailure r.body) $ map fromDateTime <$> decodeDatedJson r.body
    other -> throwError $ Error { status: Just other, message: r.statusText }

File addition: Project.purs (----------)

[5.1]

module Aftok.Api.Project where
import Prelude
import Control.Monad.Except.Trans (ExceptT, runExceptT, except, withExceptT)
import Control.Monad.Error.Class (throwError)
import Data.Argonaut.Core (Json)
import Data.Argonaut.Decode (class DecodeJson, decodeJson, (.:))
import Data.Bifunctor (lmap)
import Data.DateTime (DateTime)
import Data.Either (Either(..), note)
import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype)
import Data.Rational (Rational)
import Data.Time.Duration (Hours)
import Data.Traversable (traverse)
import Data.UUID (UUID, parseUUID)
import Effect (Effect)
import Effect.Aff (Aff)
import Effect.Class as EC
import Affjax (get, printError)
import Affjax.StatusCode (StatusCode(..))
import Affjax.ResponseFormat as RF
import Aftok.Types
  ( UserId
  , ProjectId(..)
  )
import Aftok.Api.Types
  ( APIError(..) )
import Aftok.Api.Json (parseDate)
newtype Project' date
  = Project'
  { projectId :: ProjectId
  , projectName :: String
  , inceptionDate :: date
  , initiator :: UUID
  }
derive instance newtypeProject :: Newtype (Project' a) _
type Project
  = Project' DateTime
data ProjectEvent
  = ProjectChange Project
instance decodeJsonProject :: DecodeJson (Project' String) where
  decodeJson json = do
    x <- decodeJson json
    project <- x .: "project"
    projectIdStr <- x .: "projectId"
    projectId <- ProjectId <$> (note "Failed to decode project UUID" $ parseUUID projectIdStr)
    projectName <- project .: "projectName"
    inceptionDate <- project .: "inceptionDate"
    initiatorStr <- project .: "initiator"
    initiator <- note "Failed to decode initiator UUID" $ parseUUID initiatorStr
    pure $ Project' { projectId, projectName, inceptionDate, initiator }
newtype Member' date
  = Member'
  { userId :: UserId
  , handle :: String
  , joinedOn :: date
  , timeDevoted :: Hours
  , revShareFrac :: Rational
  }
listProjects :: Aff (Either APIError (Array Project))
listProjects = do
  result <- get RF.json "/api/projects"
  EC.liftEffect <<< runExceptT
    $ case result of
        Left err -> throwError $ Error { status: Nothing, message: printError err }
        Right r -> case r.status of
          StatusCode 403 -> throwError Forbidden
          StatusCode 200 -> do
            records <- except $ lmap (ParseFailure r.body) (decodeJson r.body)
            traverse parseProject records
          other -> throwError $ Error { status: Just other, message: r.statusText }
parseProject :: Json -> ExceptT APIError Effect Project
parseProject json = do
  Project' p <- except <<< lmap (ParseFailure json) $ decodeJson json
  pdate <- withExceptT (ParseFailure json) $ parseDate p.inceptionDate
  pure $ Project' (p { inceptionDate = pdate })

Replacement in client/src/Aftok/Api/Timeline.purs at line 28 [5.18]

B:BD[5.912] → [6.5:89]

import Aftok.Types (APIError, decompose, parseDatedResponse, ProjectId(..), pidStr)

[5.911]

[5.1031]

import Aftok.Types (ProjectId(..), pidStr)
import Aftok.Api.Types (APIError)
import Aftok.Api.Json (decompose, parseDatedResponse)

File addition: Types.purs (----------)

[5.1]

module Aftok.Api.Types where
import Prelude
import Affjax.StatusCode (StatusCode)
import Data.Argonaut.Core (Json, stringify)
import Data.Maybe (Maybe)
data APIError
  = Forbidden
  | ParseFailure Json String
  | Error { status :: Maybe StatusCode, message :: String }
instance showAPIError :: Show APIError where
  show = case _ of
    Forbidden -> "Forbidden"
    ParseFailure js e -> "ParseFailure (" <> show (stringify js) <> ") " <> show e
    Error r -> "Error { status: " <> show r.status <> ", message: " <> r.message <> "}"

Replacement in client/src/Aftok/Overview.purs at line 14 [6.91]

B:BD[6.534] → [6.534:613]

-- import Data.DateTime.Instant (Instant, unInstant, fromDateTime, toDateTime)

[6.534]

[6.613]

import Data.DateTime.Instant (Instant)

Replacement in client/src/Aftok/Overview.purs at line 55 [6.91]
B:BD[6.1984] → [6.1984:2016]
```
import Aftok.Project as Project
```
[6.1984]
[6.2016]
```
import Aftok.ProjectList as ProjectList
```

Replacement in client/src/Aftok/Overview.purs at line 57 [6.91]

B:BD[6.2087] → [6.2087:2142]

import Aftok.Types (System, Project, ProjectEvent(..))

[6.2087]

[6.2143]

import Aftok.Types (System, ProjectId)
import Aftok.Api.Project (Project, ProjectEvent(..), Member')

Replacement in client/src/Aftok/Overview.purs at line 80 [6.91]
B:BD[2.9840] → [2.9840:9890]
```
  = ( projectList :: Project.ProjectListSlot Unit
```
[2.9840]
[2.9890]
```
  = ( projectList :: ProjectList.Slot Unit
```
Replacement in client/src/Aftok/Overview.purs at line 86 [6.91]
B:BD[2.9933] → [2.9933:9939]
```
  = {
```
[2.9933]
[2.9939]
```
  = { getProjectMembers :: ProjectId -> m (Array (Member' Instant))
```
Replacement in client/src/Aftok/Overview.purs at line 94 [6.91]
B:BD[2.10022] → [2.10022:10048]
```
  Project.Capability m ->
```
[2.10022]
[2.10048]
```
  ProjectList.Capability m ->
```

Replacement in client/src/Aftok/Overview.purs at line 124 [6.91]

B:BD[2.10977] → [2.10977:11027]

              [ HH.text "Your project timeline" ]

[2.10977]

[2.11027]

              [ HH.text "Your project details" ]

Replacement in client/src/Aftok/Overview.purs at line 126 [6.91]

B:BD[2.11047] → [2.11047:11181]

              [ HH.slot _projectList unit (Project.projectListComponent system pcaps) st.selectedProject (Just <<< ProjectSelected) ]

[2.11047]

[2.11181]

              [ HH.slot _projectList unit (ProjectList.component system pcaps) st.selectedProject (Just <<< ProjectSelected) ]

Replacement in client/src/Aftok/Overview.purs at line 148 [6.91]
B:BD[6.4470] → [2.11828:11847]
```
apiCapability = {}
```
[6.4470]
[6.4490]
```
apiCapability = 
  { getProjectMembers: \_ -> pure []
  }
```
Replacement in client/src/Aftok/Overview.purs at line 153 [6.91]
B:BD[6.4524] → [2.11848:11868]
```
mockCapability = {}
```
[6.4524]
```
mockCapability = 
  { getProjectMembers: \_ -> pure []
  }
```
File move: Project.purs → ProjectList.purs
BF:BFD[7.1] → [8.3356:3392]
BF:BF[8.3392] → [8.532:532]
[7.1]
[8.532]
Replacement in client/src/Aftok/ProjectList.purs at line 1 [8.532]
B:BD[8.532] → [8.533:560]
```
module Aftok.Project where
```
[8.532]
[8.560]
```
module Aftok.ProjectList where
```
Deletion in client/src/Aftok/ProjectList.purs at line 5 [8.532]
B:BD[8.617] → [9.4:81]
∅:D[9.81] → [8.681:727]
B:BD[8.681] → [8.681:727]
```
import Control.Monad.Except.Trans (ExceptT, runExceptT, except, withExceptT)
import Control.Monad.Error.Class (throwError)
```
Replacement in client/src/Aftok/ProjectList.purs at line 6 [8.532]
∅:D[10.107] → [8.728:761]
B:BD[8.728] → [8.728:761]
B:BD[8.761] → [6.4585:4626]
∅:D[6.4626] → [8.826:855]
B:BD[8.826] → [8.826:855]
```
import Data.Argonaut.Core (Json)
import Data.Argonaut.Decode (decodeJson)
import Data.Bifunctor (lmap)
```
[10.107]
[6.4627]
```
-- import Data.Bifunctor (lmap)
```
Replacement in client/src/Aftok/ProjectList.purs at line 10 [8.532]
∅:D[11.70] → [10.108:154]
∅:D[12.329] → [10.108:154]
B:BD[8.1026] → [10.108:154]
B:BD[8.1097] → [8.1097:1120]
```
import Data.Traversable (traverse, traverse_)
import Effect (Effect)
```
[12.329]
[8.1120]
```
import Data.Traversable (traverse_)
```
Deletion in client/src/Aftok/ProjectList.purs at line 12 [8.532]
B:BD[8.1144] → [10.155:181]
∅:D[10.181] → [8.1177:1286]
B:BD[8.1177] → [8.1177:1286]
```
import Effect.Class as EC
import Affjax (get, printError)
import Affjax.StatusCode (StatusCode(..))
import Affjax.ResponseFormat as RF
```
Replacement in client/src/Aftok/ProjectList.purs at line 13 [8.532]
∅:D[2.11889] → [6.4680:4722]
B:BD[6.4680] → [6.4680:4722]
```
  ( APIError(..)
  , System
  , parseDate
```
[2.11889]
[6.4722]
```
  ( System
```
Replacement in client/src/Aftok/ProjectList.purs at line 15 [8.532]
B:BD[6.4733] → [6.4733:4750]
```
  , Project'(..)
```
[6.4733]
[6.4750]
```
  )
import Aftok.Api.Types
  ( APIError
  )
import Aftok.Api.Project
  ( Project'(..)
```
Insertion in client/src/Aftok/ProjectList.purs at line 22 [8.532]
[6.4762]
[6.4762]
```
  , listProjects
```
Replacement in client/src/Aftok/ProjectList.purs at line 30 [8.532]
B:BD[8.1524] → [2.11890:11908]
```
type ProjectInput
```
[8.1524]
[2.11908]
```
type Input
```
Replacement in client/src/Aftok/ProjectList.purs at line 33 [8.532]
B:BD[12.365] → [2.11927:11946]
```
type ProjectCState
```
[12.365]
[2.11946]
```
type Output 
  = Project
type Slot id
  = forall query. H.Slot query Project id
type CState
```
Replacement in client/src/Aftok/ProjectList.purs at line 44 [8.532]
B:BD[10.583] → [2.12024:12043]
```
data ProjectAction
```
[10.583]
[10.603]
```
data Action
```
Deletion in client/src/Aftok/ProjectList.purs at line 48 [8.532]
B:BD[10.634] → [2.12044:12110]
∅:D[10.698] → [8.1669:1670]
∅:D[2.12110] → [8.1669:1670]
B:BD[8.1669] → [8.1669:1670]
```
type ProjectListSlot id
  = forall query. H.Slot query Project id
```
Replacement in client/src/Aftok/ProjectList.purs at line 52 [8.532]
B:BD[8.1751] → [2.12194:12242]
```
projectListComponent ::
  forall query input m.
```
[8.1751]
[2.12242]
```
component ::
  forall query m.
```

Replacement in client/src/Aftok/ProjectList.purs at line 57 [8.532]

B:BD[2.12287] → [2.12287:12374]

  H.Component HH.HTML query ProjectInput Project m
projectListComponent console caps =

[2.12287]

[2.12374]

  H.Component HH.HTML query Input Output m
component console caps =

Replacement in client/src/Aftok/ProjectList.purs at line 70 [8.532]
B:BD[2.12588] → [2.12588:12636]
```
  initialState :: ProjectInput -> ProjectCState
```
[2.12588]
[2.12636]
```
  initialState :: Input -> CState
```

Replacement in client/src/Aftok/ProjectList.purs at line 73 [8.532]

B:BD[10.1107] → [2.12701:12782]

  render :: forall slots. ProjectCState -> H.ComponentHTML ProjectAction slots m

[10.1107]

[2.12782]

  render :: forall slots. CState -> H.ComponentHTML Action slots m

Replacement in client/src/Aftok/ProjectList.purs at line 99 [8.532]

B:BD[10.1519] → [2.13496:13580]

  eval :: ProjectAction -> H.HalogenM ProjectCState ProjectAction () Project m Unit

[10.1519]

[2.13580]

  eval :: Action -> H.HalogenM CState Action () Project m Unit

Deletion in client/src/Aftok/ProjectList.purs at line 111 [8.532]

B:BD[8.2248] → [8.2248:2320]

B:BD[8.2320] → [2.13988:14485]

∅:D[2.14485] → [8.2801:2951]

B:BD[8.2801] → [8.2801:2951]

B:BD[8.2951] → [9.128:199]

∅:D[9.199] → [8.3130:3179]

B:BD[8.3130] → [8.3130:3179]

listProjects :: Aff (Either APIError (Array Project))
listProjects = do
  result <- get RF.json "/api/projects"
  EC.liftEffect <<< runExceptT
    $ case result of
        Left err -> throwError $ Error { status: Nothing, message: printError err }
        Right r -> case r.status of
          StatusCode 403 -> throwError Forbidden
          StatusCode 200 -> do
            records <- except $ lmap (ParseFailure r.body) (decodeJson r.body)
            traverse parseProject records
          other -> throwError $ Error { status: Just other, message: r.statusText }
parseProject :: Json -> ExceptT APIError Effect Project
parseProject json = do
  Project' p <- except <<< lmap (ParseFailure json) $ decodeJson json
  pdate <- withExceptT (ParseFailure json) $ parseDate p.inceptionDate
  pure $ Project' (p { inceptionDate = pdate })

Replacement in client/src/Aftok/Timeline.purs at line 58 [14.2287]
∅:D[13.924] → [10.2875:2907]
∅:D[15.5960] → [10.2875:2907]
∅:D[5.6787] → [10.2875:2907]
∅:D[2.25738] → [10.2875:2907]
B:BD[3.301880] → [10.2875:2907]
```
import Aftok.Project as Project
```
[2.25738]
[2.25739]
```
import Aftok.ProjectList as ProjectList
```
Insertion in client/src/Aftok/Timeline.purs at line 61 [14.2287]
[2.25769]
[2.25769]
```
  , ProjectId
  )
import Aftok.Api.Project
  ( Project
  , Project'(..)
```
Deletion in client/src/Aftok/Timeline.purs at line 67 [14.2287]
B:BD[2.25790] → [2.25790:25833]
```
  , Project
  , Project'(..)
  , ProjectId
```
Replacement in client/src/Aftok/Timeline.purs at line 96 [14.2287]
B:BD[12.1433] → [2.26074:26093]
```
type TimelineInput
```
[12.1433]
[2.26093]
```
type Input
```
Replacement in client/src/Aftok/Timeline.purs at line 117 [14.2287]
B:BD[2.26384] → [2.26384:26434]
```
  = ( projectList :: Project.ProjectListSlot Unit
```
[2.26384]
[2.26434]
```
  = ( projectList :: ProjectList.Slot Unit
```

Replacement in client/src/Aftok/Timeline.purs at line 135 [14.2287]

B:BD[2.26942] → [2.26942:27025]

  Project.Capability m ->
  H.Component HH.HTML query TimelineInput ProjectEvent m

[2.26942]

[2.27025]

  ProjectList.Capability m ->
  H.Component HH.HTML query Input ProjectEvent m

Replacement in client/src/Aftok/Timeline.purs at line 149 [14.2287]
B:BD[2.27269] → [2.27269:27318]
```
  initialState :: TimelineInput -> TimelineState
```
[2.27269]
[2.27318]
```
  initialState :: Input -> TimelineState
```

Replacement in client/src/Aftok/Timeline.purs at line 170 [14.2287]

B:BD[2.28037] → [2.28037:28171]

              [ HH.slot _projectList unit (Project.projectListComponent system pcaps) st.selectedProject (Just <<< ProjectSelected) ]

[2.28037]

[2.28171]

              [ HH.slot _projectList unit (ProjectList.component system pcaps) st.selectedProject (Just <<< ProjectSelected) ]

Deletion in client/src/Aftok/Types.purs at line 4 [10.7400]

B:BD[9.3259] → [16.10750:10861]

∅:D[16.10861] → [9.3259:3299]

B:BD[9.3259] → [9.3259:3299]

B:BD[10.7427] → [9.3352:3396]

B:BD[9.3396] → [6.5525:5590]

import Control.Monad.Error.Class (throwError)
import Control.Monad.Except.Trans (ExceptT, except, withExceptT)
import Control.Monad.Trans.Class (lift)
import Data.Argonaut.Core (Json, stringify)
import Data.Argonaut.Decode (class DecodeJson, decodeJson, (.:))

Replacement in client/src/Aftok/Types.purs at line 6 [10.7400]

B:BD[9.3469] → [16.10922:11116]

import Data.DateTime.Instant (Instant, fromDateTime)
import Data.Functor.Compose (Compose(..))
import Data.Either (Either(..), note)
import Data.Foldable (class Foldable, foldr, foldl, foldMap)

[9.3469]

[13.7206]

import Data.DateTime.Instant (Instant)

Replacement in client/src/Aftok/Types.purs at line 8 [10.7400]

∅:D[13.7231] → [16.11117:11251]

B:BD[9.3524] → [16.11117:11251]

import Data.Maybe (Maybe(..))
import Data.Newtype (class Newtype, unwrap, over)
import Data.Traversable (class Traversable, traverse)

[13.7231]

[13.7232]

import Data.Maybe (Maybe)
import Data.Newtype (class Newtype)

Replacement in client/src/Aftok/Types.purs at line 11 [10.7400]
B:BD[13.7262] → [6.5591:5636]
```
import Data.UUID (UUID, toString, parseUUID)
```
[13.7262]
[9.3526]
```
import Data.UUID (UUID, toString)
```

Deletion in client/src/Aftok/Types.purs at line 16 [10.7400]

B:BD[16.11346] → [16.11346:11447]

import Affjax as AJAX
import Affjax (Response, printError)
import Affjax.StatusCode (StatusCode(..))

Replacement in client/src/Aftok/Types.purs at line 81 [10.7400]

B:BD[13.8201] → [2.37101:37115]

∅:D[2.37115] → [10.7540:7643]

B:BD[10.7540] → [10.7540:7643]

data APIError
  = Forbidden
  | ParseFailure Json String
  | Error { status :: Maybe StatusCode, message :: String }

[13.8201]

[10.7643]

newtype UserId
  = UserId UUID
derive instance userIdEq :: Eq UserId

Replacement in client/src/Aftok/Types.purs at line 86 [10.7400]

B:BD[10.7644] → [9.3550:3643]

B:BD[9.3643] → [2.37116:37199]

∅:D[2.37199] → [9.3727:3815]

B:BD[9.3727] → [9.3727:3815]

instance showAPIError :: Show APIError where
  show = case _ of
    Forbidden -> "Forbidden"
    ParseFailure js e -> "ParseFailure (" <> show (stringify js) <> ") " <> show e
    Error r -> "Error { status: " <> show r.status <> ", message: " <> r.message <> "}"

[10.7644]

[6.5637]

derive instance userIdNewtype :: Newtype UserId _

Deletion in client/src/Aftok/Types.purs at line 97 [10.7400]

B:BD[6.5844] → [6.5844:5845]

B:BD[6.5845] → [2.37241:37276]

∅:D[2.37276] → [6.5878:5983]

B:BD[6.5878] → [6.5878:5983]

B:BD[6.5983] → [2.37277:37278]

∅:D[2.37278] → [6.5983:6041]

B:BD[6.5983] → [6.5983:6041]

B:BD[6.6041] → [2.37279:37314]

∅:D[2.37314] → [6.6074:6263]

B:BD[6.6074] → [6.6074:6263]

B:BD[6.6264] → [6.6264:6301]

B:BD[6.6301] → [2.37315:37454]

∅:D[2.37454] → [6.6446:6494]

B:BD[6.6446] → [6.6446:6494]

B:BD[6.6494] → [2.37455:37579]

∅:D[2.37579] → [6.6623:6697]

B:BD[6.6623] → [6.6623:6697]

B:BD[6.6697] → [2.37580:37638]


newtype Project' date
  = Project'
  { projectId :: ProjectId
  , projectName :: String
  , inceptionDate :: date
  , initiator :: UUID
  }
derive instance newtypeProject :: Newtype (Project' a) _
type Project
  = Project' DateTime
data ProjectEvent
  = ProjectChange Project
instance decodeJsonProject :: DecodeJson (Project' String) where
  decodeJson json = do
    x <- decodeJson json
    project <- x .: "project"
    projectIdStr <- x .: "projectId"
    projectId <- ProjectId <$> (note "Failed to decode project UUID" $ parseUUID projectIdStr)
    projectName <- project .: "projectName"
    inceptionDate <- project .: "inceptionDate"
    initiatorStr <- project .: "initiator"
    initiator <- note "Failed to decode initiator UUID" $ parseUUID initiatorStr
    pure $ Project' { projectId, projectName, inceptionDate, initiator }
newtype JsonCompose f g a
  = JsonCompose (Compose f g a)

Deletion in client/src/Aftok/Types.purs at line 98 [10.7400]

∅:D[2.37639] → [16.11965:12158]

B:BD[16.11965] → [16.11965:12158]

∅:D[16.12158] → [9.3815:3816]

B:BD[9.3815] → [9.3815:3816]

B:BD[9.3816] → [16.12159:12815]

∅:D[16.12815] → [9.3816:3896]

B:BD[9.3816] → [9.3816:3896]

B:BD[9.3896] → [2.37640:37674]

∅:D[2.37674] → [9.3933:3949]

B:BD[9.3933] → [9.3933:3949]

∅:D[9.3949] → [10.7644:7645]

B:BD[10.7644] → [10.7644:7645]

B:BD[10.7645] → [9.3950:4023]

B:BD[9.4023] → [13.8202:8234]

B:BD[13.8234] → [2.37675:37802]

∅:D[13.8274] → [16.12816:13024]

∅:D[2.37802] → [16.12816:13024]

B:BD[9.4195] → [16.12816:13024]

∅:D[16.13024] → [9.4195:4196]

B:BD[9.4195] → [9.4195:4196]

B:BD[9.4196] → [2.37803:37960]

∅:D[2.37960] → [16.13187:13218]

B:BD[16.13187] → [16.13187:13218]

B:BD[16.13218] → [2.37961:38039]

∅:D[2.38039] → [16.13301:13331]

B:BD[16.13301] → [16.13301:13331]

B:BD[16.13331] → [2.38040:38265]

derive instance jsonComposeNewtype :: Newtype (JsonCompose f g a) _
instance jsonComposeFunctor :: (Functor f, Functor g) => Functor (JsonCompose f g) where
  map f = over JsonCompose (map f)
instance jsonComposeFoldable :: (Foldable f, Foldable g) => Foldable (JsonCompose f g) where
  foldr f b = foldr f b <<< unwrap
  foldl f b = foldl f b <<< unwrap
  foldMap f = foldMap f <<< unwrap
instance jsonComposeTraversable :: (Traversable f, Traversable g) => Traversable (JsonCompose f g) where
  traverse f = map JsonCompose <<< traverse f <<< unwrap
  sequence = traverse identity
instance jsonComposeDecodeJson :: (DecodeJson (f (g a))) => DecodeJson (JsonCompose f g a) where
  decodeJson json = JsonCompose <<< Compose <$> decodeJson json
decompose :: forall f g a. JsonCompose f g a -> f (g a)
decompose (JsonCompose (Compose fga)) = fga
parseJsonDate :: Json -> ExceptT String Effect DateTime
parseJsonDate json = do
  str <- except $ decodeJson json
  parseDate str
parseDate :: String -> ExceptT String Effect DateTime
parseDate str = do
  jsDate <- lift $ JD.parse str
  except
    $ note ("Unable to convert date " <> show jsDate <> " to a valid DateTime value.")
        (JD.toDateTime jsDate)
decodeDatedJson :: forall t. Traversable t => DecodeJson (t String) => Json -> ExceptT String Effect (t DateTime)
decodeDatedJson json = do
  decoded <- except $ decodeJson json
  traverse parseDate decoded
parseDatedResponse ::
  forall t.
  Traversable t =>
  DecodeJson (t String) =>
  Either AJAX.Error (Response Json) ->
  ExceptT APIError Effect (t Instant)
parseDatedResponse = case _ of
  Left err -> throwError $ Error { status: Nothing, message: printError err }
  Right r -> case r.status of
    StatusCode 403 -> throwError $ Forbidden
    StatusCode 200 -> withExceptT (ParseFailure r.body) $ map fromDateTime <$> decodeDatedJson r.body
    other -> throwError $ Error { status: Just other, message: r.statusText }

Replacement in client/src/Main.purs at line 22 [18.410]

B:BD[17.1095] → [6.6746:6813]

import Aftok.Types (System, Project, ProjectEvent(..), liveSystem)

[19.400]

[3.307686]

import Aftok.Types (System, liveSystem)

Insertion in client/src/Main.purs at line 25 [18.410]
[20.9265]
[4.1541]
```
import Aftok.Api.Project (Project, ProjectEvent(ProjectChange))
```
Replacement in client/src/Main.purs at line 29 [18.410]
∅:D[6.6848] → [8.3755:3787]
B:BD[3.307748] → [8.3755:3787]
```
import Aftok.Project as Project
```
[6.6848]
[17.1189]
```
import Aftok.ProjectList as ProjectList
```
Replacement in client/src/Main.purs at line 42 [18.410]
∅:D[10.7722] → [8.3788:3826]
∅:D[2.38718] → [8.3788:3826]
B:BD[21.1658] → [8.3788:3826]
```
      project = Project.apiCapability
```
[2.38718]
[2.38719]
```
      project = ProjectList.apiCapability
```
Replacement in client/src/Main.purs at line 120 [18.410]
B:BD[2.39666] → [2.39666:39692]
```
  Project.Capability m ->
```
[2.39666]
[2.39692]
```
  ProjectList.Capability m ->
```

Minor module reorg.

Dependencies

In channels

Change contents

Insertion in client/spago.dhall at line 10 [3.294942]

File addition: Json.purs (----------)

File addition: Project.purs (----------)

Replacement in client/src/Aftok/Api/Timeline.purs at line 28 [5.18]

File addition: Types.purs (----------)

Replacement in client/src/Aftok/Overview.purs at line 14 [6.91]

Replacement in client/src/Aftok/Overview.purs at line 55 [6.91]

Replacement in client/src/Aftok/Overview.purs at line 57 [6.91]

Replacement in client/src/Aftok/Overview.purs at line 80 [6.91]

Replacement in client/src/Aftok/Overview.purs at line 86 [6.91]

Replacement in client/src/Aftok/Overview.purs at line 94 [6.91]

Replacement in client/src/Aftok/Overview.purs at line 124 [6.91]

Replacement in client/src/Aftok/Overview.purs at line 126 [6.91]

Replacement in client/src/Aftok/Overview.purs at line 148 [6.91]

Replacement in client/src/Aftok/Overview.purs at line 153 [6.91]

File move: Project.purs → ProjectList.purs

Replacement in client/src/Aftok/ProjectList.purs at line 1 [8.532]

Deletion in client/src/Aftok/ProjectList.purs at line 5 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 6 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 10 [8.532]

Deletion in client/src/Aftok/ProjectList.purs at line 12 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 13 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 15 [8.532]

Insertion in client/src/Aftok/ProjectList.purs at line 22 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 30 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 33 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 44 [8.532]

Deletion in client/src/Aftok/ProjectList.purs at line 48 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 52 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 57 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 70 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 73 [8.532]

Replacement in client/src/Aftok/ProjectList.purs at line 99 [8.532]

Deletion in client/src/Aftok/ProjectList.purs at line 111 [8.532]

Replacement in client/src/Aftok/Timeline.purs at line 58 [14.2287]

Insertion in client/src/Aftok/Timeline.purs at line 61 [14.2287]

Deletion in client/src/Aftok/Timeline.purs at line 67 [14.2287]

Replacement in client/src/Aftok/Timeline.purs at line 96 [14.2287]

Replacement in client/src/Aftok/Timeline.purs at line 117 [14.2287]

Replacement in client/src/Aftok/Timeline.purs at line 135 [14.2287]

Replacement in client/src/Aftok/Timeline.purs at line 149 [14.2287]

Replacement in client/src/Aftok/Timeline.purs at line 170 [14.2287]

Deletion in client/src/Aftok/Types.purs at line 4 [10.7400]

Replacement in client/src/Aftok/Types.purs at line 6 [10.7400]

Replacement in client/src/Aftok/Types.purs at line 8 [10.7400]

Replacement in client/src/Aftok/Types.purs at line 11 [10.7400]

Deletion in client/src/Aftok/Types.purs at line 16 [10.7400]

Replacement in client/src/Aftok/Types.purs at line 81 [10.7400]

Replacement in client/src/Aftok/Types.purs at line 86 [10.7400]

Deletion in client/src/Aftok/Types.purs at line 97 [10.7400]

Deletion in client/src/Aftok/Types.purs at line 98 [10.7400]

Replacement in client/src/Main.purs at line 22 [18.410]

Insertion in client/src/Main.purs at line 25 [18.410]

Replacement in client/src/Main.purs at line 29 [18.410]

Replacement in client/src/Main.purs at line 42 [18.410]

Replacement in client/src/Main.purs at line 120 [18.410]