nuttycom/aftok - Change U7YAT2ZK6GMS7KVFFEQTDRFX6GIN7HVHNWGKIFDGJGE2G2IXSF6QC

Add error reporting to signup form.

Created by Kris Nuttycombe on January 30, 2021

U7YAT2ZK6GMS7KVFFEQTDRFX6GIN7HVHNWGKIFDGJGE2G2IXSF6QC

Dependencies

In channels

main

Change contents

Replacement in client/src/Aftok/Api/Account.purs at line 93 [5.149]

B:BD[5.2809] → [5.2809:2832]

  pure UsernameCheckOK

[5.2809]

[5.2832]

  result <- get RF.ignore ("/api/validate_username?username=" <> uname)
  pure
    $ case result of
        Left err -> UsernameCheckTaken
        Right r
          | r.status == StatusCode 200 -> UsernameCheckOK
        Right r -> UsernameCheckTaken

Replacement in client/src/Aftok/Api/Account.purs at line 104 [5.149]

∅:D[6.1318] → [7.521:644]

B:BD[7.521] → [7.521:644]

B:BD[7.644] → [6.1319:1401]

∅:D[6.1401] → [7.718:832]

B:BD[7.718] → [7.718:832]

  case result of
    Left err -> do
      log ("ZAddr validation failed: " <> printError err)
      pure ZAddrCheckInvalid
    Right r
      | r.status == StatusCode 200 -> do
        pure ZAddrCheckValid
    Right r -> do
      log ("ZAddr was determined to be invalid: " <> r.statusText)
      pure ZAddrCheckInvalid

[6.1318]

[5.2922]

  pure
    $ case result of
        Left err -> ZAddrCheckInvalid
        Right r
          | r.status == StatusCode 200 -> ZAddrCheckValid
        Right r -> ZAddrCheckInvalid

Insertion in client/src/Aftok/Api/Json.purs at line 58 [8.22]
[8.2130]
[8.2130]
```
type Decode a
  = Json -> Either String a
```

Replacement in client/src/Aftok/Api/Json.purs at line 62 [8.22]

B:BD[8.2131] → [8.2131:2309]

decodeDatedJson :: forall t. Traversable t => DecodeJson (t String) => Json -> ExceptT String Effect (t DateTime)
decodeDatedJson json = do
  decoded <- except $ decodeJson json

[8.2131]

[8.2309]

decodeDatedJson :: forall t. Traversable t => Decode (t String) -> Json -> ExceptT String Effect (t DateTime)
decodeDatedJson decode json = do
  decoded <- except $ decode json

Replacement in client/src/Aftok/Api/Json.purs at line 70 [8.22]
B:BD[8.2392] → [8.2392:2419]
```
  DecodeJson (t String) =>
```
[8.2392]
[8.2419]
```
  Decode (t String) ->
```
Replacement in client/src/Aftok/Api/Json.purs at line 73 [8.22]
B:BD[8.2496] → [8.2496:2527]
```
parseDatedResponse = case _ of
```
[8.2496]
[8.2527]
```
parseDatedResponse decode = case _ of
```

Replacement in client/src/Aftok/Api/Json.purs at line 77 [8.22]

B:BD[8.2680] → [8.2680:2782]

    StatusCode 200 -> withExceptT (ParseFailure r.body) $ map fromDateTime <$> decodeDatedJson r.body

[8.2680]

[9.5]

    StatusCode 200 -> withExceptT (ParseFailure r.body) $ map fromDateTime <$> decodeDatedJson decode r.body

Replacement in client/src/Aftok/Api/Json.purs at line 83 [8.22]
B:BD[9.140] → [9.140:167]
```
  DecodeJson (t String) =>
```
[9.140]
[9.167]
```
  Decode (t String) ->
```
Replacement in client/src/Aftok/Api/Json.purs at line 86 [8.22]
B:BD[9.252] → [9.252:286]
```
parseDatedResponseMay = case _ of
```
[9.252]
[9.286]
```
parseDatedResponseMay decode = case _ of
```

Replacement in client/src/Aftok/Api/Json.purs at line 91 [8.22]

B:BD[9.474] → [9.474:585]

    StatusCode 200 -> withExceptT (ParseFailure r.body) $ Just <<< map fromDateTime <$> decodeDatedJson r.body

[9.474]

[8.2782]

    StatusCode 200 ->
      withExceptT (ParseFailure r.body)
        $ Just
        <<< map fromDateTime
        <$> decodeDatedJson decode r.body

Replacement in client/src/Aftok/Api/Project.purs at line 7 [8.2899]
B:BD[9.763] → [9.763:799]
```
-- import Data.Argonaut.Core (Json)
```
[9.763]
[8.3103]
```
import Data.Argonaut.Core (Json)
```
Deletion in client/src/Aftok/Api/Project.purs at line 9 [8.2899]
B:BD[8.3168] → [9.800:832]
```
-- import Data.Bifunctor (lmap)
```
Replacement in client/src/Aftok/Api/Project.purs at line 17 [8.2899]
∅:D[3.296] → [9.963:1000]
B:BD[8.3333] → [9.963:1000]
```
import Data.Rational (Rational, (%))
```
[3.296]
[9.1000]
```
import Data.Ratio (Ratio, (%))
```
Insertion in client/src/Aftok/Api/Project.purs at line 19 [8.2899]
[9.1048]
[9.1048]
```
import Data.Tuple (Tuple(..))
```
Insertion in client/src/Aftok/Api/Project.purs at line 24 [8.2899]
[8.3542]
[9.1129]
```
import Foreign.Object (Object)
```

Replacement in client/src/Aftok/Api/Project.purs at line 33 [8.2899]

B:BD[8.3726] → [9.1176:1228]

  ( APIError )
import Aftok.Api.Json 
  ( decompose

[8.3726]

[9.1228]

  (APIError)
import Aftok.Api.Json
  ( Decode
  , decompose

Insertion in client/src/Aftok/Api/Project.purs at line 81 [8.2899]

[10.140]

[9.2254]

parseProject :: ProjectId -> Object Json -> Either String (Project' String)
parseProject projectId pjson = do
  projectName <- pjson .: "projectName"
  inceptionDate <- pjson .: "inceptionDate"
  initiator <- pjson .: "initiator"
  depf <- pjson .: "depf"
  pure $ Project' { projectId, projectName, inceptionDate, initiator, depf }

Replacement in client/src/Aftok/Api/Project.purs at line 92 [8.2899]
B:BD[9.2367] → [9.2367:2397]
```
    project <- x .: "project"
```
[9.2367]
[9.2397]
```
    pjson <- x .: "project"
```

Replacement in client/src/Aftok/Api/Project.purs at line 94 [8.2899]

B:BD[9.2431] → [9.2431:2563]

B:BD[9.2563] → [3.388:497]

    projectName <- project .: "projectName"
    inceptionDate <- project .: "inceptionDate"
    initiator <- project .: "initiator"
    depf <- project .: "depf"
    pure $ Project' { projectId, projectName, inceptionDate, initiator, depf }

[9.2431]

[8.4014]

    parseProject projectId pjson

Replacement in client/src/Aftok/Api/Project.purs at line 102 [8.2899]
B:BD[9.2796] → [9.2796:2821]
```
  , revShare :: Rational
```
[9.2796]
[10.377]
```
  , revShare :: Ratio Number
```

Replacement in client/src/Aftok/Api/Project.purs at line 115 [8.2899]

B:BD[3.875] → [3.875:975]

  traverse f (Contributor' p) = 
    Contributor' <<< (\b -> p { joinedOn = b }) <$> f (p.joinedOn)

[3.875]

[3.975]

  traverse f (Contributor' p) = Contributor' <<< (\b -> p { joinedOn = b }) <$> f (p.joinedOn)

Replacement in client/src/Aftok/Api/Project.purs at line 125 [8.2899]
B:BD[9.3081] → [9.3081:3120]
```
    revShareObj <- x .: "revenueShare"
```
[9.3081]
[9.3120]
```
    revShareObj <- x .: "revenureShare"
```
Replacement in client/src/Aftok/Api/Project.purs at line 128 [8.2899]
B:BD[9.3198] → [9.3198:3227]
```
    let revShare = num % den
```
[9.3198]
[9.3227]
```
    let
      revShare = num % den
```

Replacement in client/src/Aftok/Api/Project.purs at line 138 [8.2899]

B:BD[3.1009] → [3.1009:1102]

projectDetail :: 
  forall date. 
  Project' date -> 
  M.Map UserId (Contributor' date) ->

[3.1009]

[3.1102]

projectDetail ::
  forall date.
  Project' date ->
  M.Map UserId (Contributor' date) ->

Replacement in client/src/Aftok/Api/Project.purs at line 143 [8.2899]

B:BD[3.1124] → [3.1124:1205]

projectDetail project contributors = 
  ProjectDetail' { project, contributors }

[3.1124]

[10.554]

projectDetail project contributors = ProjectDetail' { project, contributors }

Replacement in client/src/Aftok/Api/Project.purs at line 145 [8.2899]
B:BD[10.555] → [10.555:600]
```
type ProjectDetail = ProjectDetail' DateTime
```
[10.555]
[10.600]
```
type ProjectDetail
  = ProjectDetail' DateTime
```

Replacement in client/src/Aftok/Api/Project.purs at line 158 [8.2899]

B:BD[3.1683] → [3.1683:1835]

  traverse f (ProjectDetail' p) = 
    projectDetail <$> traverse f p.project 
                  <*> (map unwrap $ traverse f (Compose p.contributors))

[3.1683]

[3.1835]

  traverse f (ProjectDetail' p) =
    projectDetail <$> traverse f p.project
      <*> (map unwrap $ traverse f (Compose p.contributors))

Replacement in client/src/Aftok/Api/Project.purs at line 163 [8.2899]

B:BD[8.4060] → [9.3469:3546]

∅:D[9.3546] → [8.4125:4203]

B:BD[8.4125] → [8.4125:4203]

B:BD[8.4203] → [9.3547:3639]

instance decodeJsonProjectDetail :: DecodeJson (ProjectDetail' String) where
  decodeJson json = do
    x <- decodeJson json
    project <- x .: "project"
    contributors <- x .: "contributors"
    pure $ ProjectDetail' { project, contributors }

[8.4060]

[8.4624]

parseProjectDetail :: ProjectId -> Decode (ProjectDetail' String)
parseProjectDetail pid json = do
  x <- decodeJson json
  project <- parseProject pid =<< x .: "project"
  (contribList :: Array (Contributor' String)) <- x .: "contributors"
  let
    contributors = M.fromFoldable $ map (\c@(Contributor' xs) -> Tuple xs.userId c) contribList
  pure $ ProjectDetail' { project, contributors }

Replacement in client/src/Aftok/Api/Project.purs at line 175 [8.2899]
B:BD[9.3682] → [9.3682:3699]
```
  EC.liftEffect 
```
[9.3682]
[9.3699]
```
  EC.liftEffect
```
Replacement in client/src/Aftok/Api/Project.purs at line 179 [8.2899]
B:BD[9.3769] → [9.3769:3803]
```
    $ parseDatedResponse response
```
[9.3769]
[8.5349]
```
    $ parseDatedResponse decodeJson response
```

Replacement in client/src/Aftok/Api/Project.purs at line 183 [8.2899]

B:BD[3.1970] → [3.1970:2183]

  response <- get RF.json ("/api/user/projects/" <> pidStr pid <> "/detail")
  let parsed :: ExceptT APIError Effect (Maybe (ProjectDetail' Instant))
      parsed = parseDatedResponseMay response
  EC.liftEffect

[3.1970]

[3.2183]

  response <- get RF.json ("/api/projects/" <> pidStr pid <> "/detail")
  let
    parsed :: ExceptT APIError Effect (Maybe (ProjectDetail' Instant))
    parsed = parseDatedResponseMay (parseProjectDetail pid) response
  EC.liftEffect

Deletion in client/src/Aftok/Api/Project.purs at line 191 [8.2899]
∅:D[3.2250] → [8.5618:5619]
∅:D[9.4185] → [8.5618:5619]
B:BD[8.5618] → [8.5618:5619]
B:BD[8.5619] → [9.4186:4187]

Insertion in client/src/Aftok/Api/Recaptcha.js at line 10 [5.3046]

[5.3248]


exports.recaptchaRenderInternal = siteKey => elemId => () => {
  grecaptcha.render(
    document.getElementById(elemId), 
    { 'sitekey': siteKey }
  );
}

Replacement in client/src/Aftok/Api/Recaptcha.purs at line 5 [5.3287]
B:BD[5.3352] → [5.3352:3391]
```
import Prelude (bind, (==), ($), pure)
```
[5.3352]
[5.3391]
```
import Prelude (bind, (==), ($), pure, Unit)
```

Insertion in client/src/Aftok/Api/Recaptcha.purs at line 16 [5.3287]

[5.3725]

recaptchaRender :: String -> String -> Effect Unit
recaptchaRender = recaptchaRenderInternal

Insertion in client/src/Aftok/Api/Recaptcha.purs at line 20 [5.3287]

[5.3807]


foreign import recaptchaRenderInternal :: String -> String -> Effect Unit

Replacement in client/src/Aftok/Api/Timeline.purs at line 191 [11.18]

B:BD[6.3077] → [6.3077:3145]

        kev <- withExceptT LogFailure $ parseDatedResponse response

[6.3077]

[6.3145]

        kev <- withExceptT LogFailure $ parseDatedResponse decodeJson response

Replacement in client/src/Aftok/Api/Timeline.purs at line 203 [11.18]

B:BD[6.3415] → [6.3415:3483]

        kev <- withExceptT LogFailure $ parseDatedResponse response

[6.3415]

[6.3483]

        kev <- withExceptT LogFailure $ parseDatedResponse decodeJson response

Replacement in client/src/Aftok/Api/Timeline.purs at line 247 [11.18]
B:BD[12.5507] → [6.4104:4138]
```
    $ parseDatedResponse response
```
[12.5507]
[11.6498]
```
    $ parseDatedResponse decodeJson response
```
Replacement in client/src/Aftok/Api/Timeline.purs at line 257 [11.18]
B:BD[12.5660] → [6.4139:4173]
```
    $ parseDatedResponse response
```
[12.5660]
```
    $ parseDatedResponse decodeJson response
```
Deletion in client/src/Aftok/Api/Types.purs at line 18 [8.5791]
B:BD[8.6328] → [8.6328:6329]
Replacement in client/src/Aftok/Overview.purs at line 20 [14.91]
B:BD[13.686] → [13.686:712]
```
import Data.Rational as R
```
[13.686]
[10.702]
```
import Data.Ratio as R
```
Replacement in client/src/Aftok/Overview.purs at line 63 [14.91]
∅:D[4.71] → [10.873:899]
∅:D[15.315] → [10.873:899]
∅:D[13.849] → [10.873:899]
B:BD[8.6486] → [10.873:899]
B:BD[10.899] → [9.4228:4288]
```
import Aftok.Api.Project 
  (Project, Project'(..), ProjectDetail, ProjectDetail'(..)
```
[4.71]
[10.986]
```
import Aftok.Api.Project
  ( Project
  , Project'(..)
  , ProjectDetail
  , ProjectDetail'(..)
```

Replacement in client/src/Aftok/Overview.purs at line 133 [14.91]

B:BD[6.10644] → [10.1113:1491]

B:BD[10.1491] → [9.4427:4662]

        [ P.classes (ClassName <$> [ "container", "pt-6" ]) ]
        [ HH.h1
          [ P.classes (ClassName <$> [ "mb-0", "font-weight-bold", "text-center" ]) ]
          [ HH.text "Project Overview" ]
        , HH.p
          [ P.classes (ClassName <$> [ "col-md-5", "text-muted", "text-center", "mx-auto" ]) ]
          [ HH.text "Your project details" ]
        , HH.div_
          [ HH.slot 
              _projectList 
              unit 
              (ProjectList.component system pcaps) 
              st.selectedProject 
              (Just <<< (\(ProjectList.ProjectChange p) -> ProjectSelected p))

[6.10644]

[9.4662]

          [ P.classes (ClassName <$> [ "container", "pt-6" ]) ]
          [ HH.h1
              [ P.classes (ClassName <$> [ "mb-0", "font-weight-bold", "text-center" ]) ]
              [ HH.text "Project Overview" ]
          , HH.p
              [ P.classes (ClassName <$> [ "col-md-5", "text-muted", "text-center", "mx-auto" ]) ]
              [ HH.text "Your project details" ]
          , HH.div_
              [ HH.slot
                  _projectList
                  unit
                  (ProjectList.component system pcaps)
                  st.selectedProject
                  (Just <<< (\(ProjectList.ProjectChange p) -> ProjectSelected p))
              ]
          , HH.div
              [ P.classes (ClassName <$> if isNothing st.selectedProject then [ "collapse" ] else []) ]
              (U.fromMaybe $ projectDetail <$> st.projectDetail)

Deletion in client/src/Aftok/Overview.purs at line 152 [14.91]

∅:D[9.4674] → [10.1614:1731]

B:BD[10.1614] → [10.1614:1731]

B:BD[10.1731] → [13.1443:1504]

∅:D[13.1504] → [10.1790:1800]

B:BD[10.1790] → [10.1790:1800]

        , HH.div
          [ P.classes (ClassName <$> if isNothing st.selectedProject then [ "collapse" ] else []) ]
          (U.fromMaybe $ projectDetail <$> st.projectDetail)
        ]

Replacement in client/src/Aftok/Overview.purs at line 156 [14.91]
B:BD[10.1929] → [10.1929:1973]
```
    let (Project' project) = detail.project
```
[10.1929]
[10.1973]
```
    let
      (Project' project) = detail.project
```

Replacement in client/src/Aftok/Overview.purs at line 161 [14.91]

B:BD[10.2061] → [10.2061:2247]

B:BD[10.2247] → [13.1505:1546]

∅:D[13.1546] → [10.2315:2498]

B:BD[10.2315] → [10.2315:2498]

        [ P.id_ "projectOverview", P.classes (ClassName <$> ["pt-3"]) ]
        [ HH.div
          -- header
          [ P.classes (ClassName <$> ["row", "pt-3", "font-weight-bold" ]) ]
          [ colmd2 (Just "Project Name")
          , colmd2 (Just "Undepreciated Period")
          , colmd2 (Just "Depreciation Duration")
          , colmd2 (Just "Originator")
          , colmd2 (Just "Origination Date")

[10.2061]

[14.3898]

          [ P.id_ "projectOverview", P.classes (ClassName <$> [ "pt-3" ]) ]
          [ HH.div
              -- header
              [ P.classes (ClassName <$> [ "row", "pt-3", "font-weight-bold" ]) ]
              [ colmd2 (Just "Project Name")
              , colmd2 (Just "Undepreciated Period")
              , colmd2 (Just "Depreciation Duration")
              , colmd2 (Just "Originator")
              , colmd2 (Just "Origination Date")
              ]
          , HH.div
              [ P.classes (ClassName <$> [ "row", "pt-3" ]) ]
              ( [ colmd2 (Just project.projectName) ]
                  <> depreciationCols project.depf
                  <> [ colmd2 ((\(Contributor' p) -> p.handle) <$> M.lookup project.initiator detail.contributors)
                    , colmd2 (Just $ dateStr (date project.inceptionDate))
                    ]
              )

Deletion in client/src/Aftok/Overview.purs at line 180 [14.91]

B:BD[14.3910] → [10.2499:2516]

B:BD[10.2516] → [13.1547:1655]

B:BD[13.1655] → [3.2252:2296]

∅:D[3.2296] → [9.4720:4825]

B:BD[9.4720] → [9.4720:4825]

∅:D[9.4825] → [13.1656:1722]

B:BD[10.2822] → [13.1656:1722]

∅:D[13.1722] → [10.2878:2902]

B:BD[10.2878] → [10.2878:2902]

        , HH.div
          [ P.classes (ClassName <$> ["row", "pt-3"]) ]
          ([ colmd2 (Just project.projectName) ] <>
           depreciationCols project.depf <>
           [ colmd2 ((\(Contributor' p) -> p.handle) <$> M.lookup project.initiator detail.contributors)
           , colmd2 (Just $ dateStr (date project.inceptionDate))
           ])
        ]

Replacement in client/src/Aftok/Overview.purs at line 181 [14.91]

B:BD[13.1742] → [13.1742:2177]

        [ P.id_ "contributors" ]
        ([ HH.div
          -- header
          [ P.classes (ClassName <$> ["row", "pt-3", "font-weight-bold" ]) ]
          [ colmd2 (Just "Contributor")
          , colmd2 (Just "Joined")
          , colmd2 (Just "Contributed Hours")
          , colmd2 (Just "Current Revenue Share")
          ]
        ] <> 
          (contributorCols <$> (L.toUnfoldable $ M.values detail.contributors))
        )

[13.1742]

[10.2902]

          [ P.id_ "contributors" ]
          ( [ HH.div
                -- header
                [ P.classes (ClassName <$> [ "row", "pt-3", "font-weight-bold" ]) ]
                [ colmd2 (Just "Contributor")
                , colmd2 (Just "Joined")
                , colmd2 (Just "Contributed Hours")
                , colmd2 (Just "Current Revenue Share")
                ]
            ]
              <> (contributorCols <$> (L.toUnfoldable $ M.values detail.contributors))
          )

Replacement in client/src/Aftok/Overview.purs at line 203 [14.91]

B:BD[9.4911] → [9.4911:5086]

∅:D[9.5086] → [13.2571:2647]

B:BD[13.2571] → [13.2571:2647]

B:BD[13.2647] → [9.5087:5120]

∅:D[9.5120] → [13.2682:2734]

B:BD[13.2682] → [13.2682:2734]

B:BD[13.2734] → [9.5121:5175]

∅:D[9.5175] → [13.2794:2829]

B:BD[13.2794] → [13.2794:2829]

∅:D[13.2829] → [6.11322:11330]

∅:D[10.3157] → [6.11322:11330]

B:BD[14.3910] → [6.11322:11330]

  contributorCols (Contributor' pud) = 
    let pct = maybe "N/A" (\f -> F.toString (f * F.fromInt 100)) (F.fromNumber (R.toNumber pud.revShare) :: Maybe (F.Fixed F.P10000)) 
     in HH.div
      [ P.classes (ClassName <$> ["row", "pt-3", "pb-2" ]) ]
      [ colmd2 (Just pud.handle)
      , colmd2 (Just $ dateStr (date pud.joinedOn))
      , colmd2 (Just $ show (unwrap pud.timeDevoted))
      , colmd2 (Just $ pct <> "%")
      ]

[9.4911]

[10.3158]

  contributorCols (Contributor' pud) =
    let
      shareFrac = R.numerator pud.revShare `div` R.denominator pud.revShare
      pct = maybe "N/A" (\f -> F.toString (f * F.fromInt 100)) (F.fromNumber shareFrac :: Maybe (F.Fixed F.P10000))
    in
      HH.div
        [ P.classes (ClassName <$> [ "row", "pt-3", "pb-2" ]) ]
        [ colmd2 (Just pud.handle)
        , colmd2 (Just $ dateStr (date pud.joinedOn))
        , colmd2 (Just $ show (unwrap pud.timeDevoted))
        , colmd2 (Just $ pct <> "%")
        ]

Replacement in client/src/Aftok/Overview.purs at line 218 [14.91]

B:BD[10.3226] → [13.2830:2925]

  colmd2 xs = HH.div [ P.classes (ClassName <$> ["col-md-2"]) ] (U.fromMaybe $ HH.text <$> xs)

[10.3226]

[10.3319]

  colmd2 xs = HH.div [ P.classes (ClassName <$> [ "col-md-2" ]) ] (U.fromMaybe $ HH.text <$> xs)

Replacement in client/src/Aftok/Overview.purs at line 220 [14.91]

B:BD[10.5940] → [10.5940:10364]

∅:D[10.10364] → [14.3920:3921]

∅:D[6.11330] → [14.3920:3921]

B:BD[14.3920] → [14.3920:3921]

--         </section>
--              <!-- Map payouts -->
--              <div class="row font-weight-bold">
--                 <div class="col-md-2">
--                 </div>
--                 <div class="col-md-4">
--                     Payments
--                 </div>
--                 <div class="col-md-6">
--
--                 </div>
--              </div>
--              <div class="row">
--                 <div class="col-md-2">
--                 </div>
--                 <div class="col-md-2">
--                     Oct 20 2020
--                 </div>
--                 <div class="col-md-2">
--                     100 zec
--                 </div>
--                 <div class="col-md-2">
--                     Acme PaidUsRight
--                 </div>
--                 <div class="col-md-4">
--                 </div>
--             </div>
--             <!-- map payout creditTos-->
--             <div class="row pt-3">
--                 <div class="col-md-4">
--                 </div>
--                 <div class="col-md-2">
--                     Freuline Fred
--                 </div>
--                 <div class="col-md-2">
--                     2.4 zec
--                 </div>
--                 <div class="col-md-2">
--                     2.4 %
--                 </div>
--                 <div class="col-md-2">
--                 </div>
--             </div>
--             <div class="row pt-3">
--                 <div class="col-md-4">
--                 </div>
--                 <div class="col-md-2">
--                     Goobie Works A Lot
--                 </div>
--                 <div class="col-md-2">
--                     50 zec
--                 </div>
--                 <div class="col-md-2">
--                     50 %
--                 </div>
--                 <div class="col-md-2">
--                 </div>
--             </div> <div class="row pt-3">
--                 <div class="col-md-4">
--                 </div>
--                 <div class="col-md-2">
--                     Average Fella
--                 </div>
--                 <div class="col-md-2">
--                     25 zec
--                 </div>
--                 <div class="col-md-2">
--                     25 %
--                 </div>
--                 <div class="col-md-2">
--                 </div>
--             </div> <div class="row pt-3">
--                 <div class="col-md-4">
--                 </div>
--                 <div class="col-md-2">
--                     Cool Kid
--                 </div>
--                 <div class="col-md-2">
--                     24.6 zec
--                 </div>
--                 <div class="col-md-2">
--                     24.6 %
--                 </div>
--                 <div class="col-md-2">
--                 </div>
--             </div>
--
--         </section>
--
--
--         <!-- New Project form-->
--         <section id="addProject">
--
--             <div class="row pt-3">
--                 <div class="col-md-4">
--                     <span class="float-right">Project Name</span>
--                 </div>
--                 <div class="col-md-4">
--                     <input type="text" id="projectName" name="projectName" />
--                 </div>
--             </div>
--
--             <div class="row pt-3">
--                 <div class="col-md-4">
--                     <span class="float-right">Undepreciated Period ( Months )</span>
--                 </div>
--                 <div class="col-md-4">
--                     <input type="text" id="undepreciatedPeriod" name="undepreciatedPeriod" />
--                 </div>
--             </div>
--
--             <div class="row pt-3">
--                 <div class="col-md-4">
--                     <span class="float-right">Depreciation Duration ( Months )</span>
--                 </div>
--                 <div class="col-md-4">
--                     <input type="text" id="depreciationDuration" name="depreciationDuration" />
--                 </div>
--             </div>
--
--             <div class="row pt-3 pb-3">
--                 <div class="col-md-2">
--                 </div>
--                 <div class="col-md-10">
--                     <button class="btn btn-sm btn-primary lift ml-auto">Add Project</button>
--                 </div>
--             </div>
--
--         </section>

[10.3320]

[9.5176]

  --         </section>
  --              <!-- Map payouts -->
  --              <div class="row font-weight-bold">
  --                 <div class="col-md-2">
  --                 </div>
  --                 <div class="col-md-4">
  --                     Payments
  --                 </div>
  --                 <div class="col-md-6">
  --
  --                 </div>
  --              </div>
  --              <div class="row">
  --                 <div class="col-md-2">
  --                 </div>
  --                 <div class="col-md-2">
  --                     Oct 20 2020
  --                 </div>
  --                 <div class="col-md-2">
  --                     100 zec
  --                 </div>
  --                 <div class="col-md-2">
  --                     Acme PaidUsRight
  --                 </div>
  --                 <div class="col-md-4">
  --                 </div>
  --             </div>
  --             <!-- map payout creditTos-->
  --             <div class="row pt-3">
  --                 <div class="col-md-4">
  --                 </div>
  --                 <div class="col-md-2">
  --                     Freuline Fred
  --                 </div>
  --                 <div class="col-md-2">
  --                     2.4 zec
  --                 </div>
  --                 <div class="col-md-2">
  --                     2.4 %
  --                 </div>
  --                 <div class="col-md-2">
  --                 </div>
  --             </div>
  --             <div class="row pt-3">
  --                 <div class="col-md-4">
  --                 </div>
  --                 <div class="col-md-2">
  --                     Goobie Works A Lot
  --                 </div>
  --                 <div class="col-md-2">
  --                     50 zec
  --                 </div>
  --                 <div class="col-md-2">
  --                     50 %
  --                 </div>
  --                 <div class="col-md-2">
  --                 </div>
  --             </div> <div class="row pt-3">
  --                 <div class="col-md-4">
  --                 </div>
  --                 <div class="col-md-2">
  --                     Average Fella
  --                 </div>
  --                 <div class="col-md-2">
  --                     25 zec
  --                 </div>
  --                 <div class="col-md-2">
  --                     25 %
  --                 </div>
  --                 <div class="col-md-2">
  --                 </div>
  --             </div> <div class="row pt-3">
  --                 <div class="col-md-4">
  --                 </div>
  --                 <div class="col-md-2">
  --                     Cool Kid
  --                 </div>
  --                 <div class="col-md-2">
  --                     24.6 zec
  --                 </div>
  --                 <div class="col-md-2">
  --                     24.6 %
  --                 </div>
  --                 <div class="col-md-2">
  --                 </div>
  --             </div>
  --
  --         </section>
  --
  --
  --         <!-- New Project form-->
  --         <section id="addProject">
  --
  --             <div class="row pt-3">
  --                 <div class="col-md-4">
  --                     <span class="float-right">Project Name</span>
  --                 </div>
  --                 <div class="col-md-4">
  --                     <input type="text" id="projectName" name="projectName" />
  --                 </div>
  --             </div>
  --
  --             <div class="row pt-3">
  --                 <div class="col-md-4">
  --                     <span class="float-right">Undepreciated Period ( Months )</span>
  --                 </div>
  --                 <div class="col-md-4">
  --                     <input type="text" id="undepreciatedPeriod" name="undepreciatedPeriod" />
  --                 </div>
  --             </div>
  --
  --             <div class="row pt-3">
  --                 <div class="col-md-4">
  --                     <span class="float-right">Depreciation Duration ( Months )</span>
  --                 </div>
  --                 <div class="col-md-4">
  --                     <input type="text" id="depreciationDuration" name="depreciationDuration" />
  --                 </div>
  --             </div>
  --
  --             <div class="row pt-3 pb-3">
  --                 <div class="col-md-2">
  --                 </div>
  --                 <div class="col-md-10">
  --                     <button class="btn btn-sm btn-primary lift ml-auto">Add Project</button>
  --                 </div>
  --             </div>
  --
  --         </section>

Replacement in client/src/Aftok/Overview.purs at line 367 [14.91]

B:BD[15.810] → [15.810:859]

B:BD[15.859] → [4.176:305]

      detail <- lift $ caps.getProjectDetail pid
      case detail of
         Left err -> lift $ system.error (show err)
         Right d -> H.modify_ (_ { projectDetail = d })

[15.810]

[15.906]

    detail <- lift $ caps.getProjectDetail pid
    case detail of
      Left err -> lift $ system.error (show err)
      Right d -> H.modify_ (_ { projectDetail = d })

Replacement in client/src/Aftok/Overview.purs at line 379 [14.91]

B:BD[10.10399] → [15.950:1066]

B:BD[15.1066] → [4.346:394]

∅:D[4.394] → [15.1104:1255]

B:BD[15.1104] → [15.1104:1255]

B:BD[15.1255] → [3.2297:2372]

∅:D[3.2372] → [15.1255:1267]

∅:D[9.5512] → [15.1255:1267]

B:BD[15.1255] → [15.1255:1267]

B:BD[15.1267] → [9.5513:5619]

∅:D[9.5619] → [15.1436:1460]

B:BD[15.1436] → [15.1436:1460]

B:BD[15.1460] → [9.5620:5690]

∅:D[9.5690] → [15.1546:1568]

B:BD[15.1546] → [15.1546:1568]

  { getProjectDetail: \pid -> do
      t <- liftEffect nowDateTime      
      uid <- UserId <$> liftEffect genUUID
      pure <<< Right <<< Just $ ProjectDetail' 
        { project: Project'
          { projectId: pid
          , projectName: "Fake Project"
          , inceptionDate: t
          , initiator: uid
          , depf: LinearDepreciation { undep: Days 30.0, dep: Days 300.0 }
          }
        , contributors: M.singleton uid $ Contributor' 
          { userId: uid
          , handle: "Joe"
          , joinedOn: t
          , timeDevoted: Hours 100.0
          , revShare: 55 R.% 100
          }
        }

[10.10399]

[8.6985]

  { getProjectDetail:
      \pid -> do
        t <- liftEffect nowDateTime
        uid <- UserId <$> liftEffect genUUID
        pure <<< Right <<< Just
          $ ProjectDetail'
              { project:
                  Project'
                    { projectId: pid
                    , projectName: "Fake Project"
                    , inceptionDate: t
                    , initiator: uid
                    , depf: LinearDepreciation { undep: Days 30.0, dep: Days 300.0 }
                    }
              , contributors:
                  M.singleton uid
                    $ Contributor'
                        { userId: uid
                        , handle: "Joe"
                        , joinedOn: t
                        , timeDevoted: Hours 100.0
                        , revShare: 55.0 R.% 100.0
                        }
              }

Insertion in client/src/Aftok/Signup.purs at line 9 [16.1]
[5.5110]
[5.5111]
```
import Data.Map as M
import Data.Tuple (Tuple(..))
```
Deletion in client/src/Aftok/Signup.purs at line 22 [16.1]
B:BD[16.451] → [16.451:487]
```
import Web.UIEvent.MouseEvent as ME
```

Insertion in client/src/Aftok/Signup.purs at line 43 [16.1]

[5.5575]

[16.707]


data SignupField
  = UsernameField
  | PasswordField
  | ConfirmField
  | EmailField
  | ZAddrField
  | CaptchaField
  | ErrField
derive instance signupFieldEq :: Eq SignupField
derive instance signupFieldOrd :: Ord SignupField

Replacement in client/src/Aftok/Signup.purs at line 70 [16.1]
B:BD[6.14711] → [6.14711:14751]
```
    , signupErrors :: Array SignupError
```
[6.14711]
[6.14751]
```
    , signupErrors :: M.Map SignupField SignupError
```
Deletion in client/src/Aftok/Signup.purs at line 80 [16.1]
B:BD[16.1255] → [16.1255:1280]
```
  | Signin ME.MouseEvent
```
Replacement in client/src/Aftok/Signup.purs at line 122 [16.1]
B:BD[6.15690] → [6.15690:15713]
```
    , signupErrors: []
```
[6.15690]
[6.15713]
```
    , signupErrors: M.empty
```

Replacement in client/src/Aftok/Signup.purs at line 138 [16.1]

B:BD[6.16356] → [6.16356:16471]

                  [ HH.text "You can use either an email address or zcash payment address for account recovery." ]

[6.16356]

[6.16471]

                  [ HH.text "You can use either an email address or shielded zcash address for account recovery." ]

Replacement in client/src/Aftok/Signup.purs at line 150 [16.1]

B:BD[6.16989] → [6.16989:17654]

                          [ HH.label [ P.for "username" ] [ HH.text "Username" ]
                          , HH.input
                              [ P.type_ P.InputText
                              , P.classes (ClassName <$> [ "form-control" ])
                              , P.id_ "username"
                              , P.placeholder "Choose a handle (username)"
                              , P.required true
                              , P.autofocus true
                              , P.value (fromMaybe "" st.username)
                              , E.onValueInput (Just <<< SetUsername)
                              ]
                          ]

[6.16989]

[6.17654]

                          $ [ HH.label [ P.for "username" ] [ HH.text "Username" ]
                            , HH.input
                                [ P.type_ P.InputText
                                , P.classes (ClassName <$> [ "form-control" ])
                                , P.id_ "username"
                                , P.placeholder "Choose a handle (username)"
                                , P.required true
                                , P.autofocus true
                                , P.value (fromMaybe "" st.username)
                                , E.onValueInput (Just <<< SetUsername)
                                ]
                            ]
                          <> signupErrors UsernameField st

Replacement in client/src/Aftok/Signup.purs at line 165 [16.1]

B:BD[6.17758] → [6.17758:18901]

                          [ HH.label [ P.for "password" ] [ HH.text "Password" ]
                          , HH.input
                              [ P.type_ P.InputPassword
                              , P.classes (ClassName <$> [ "form-control" ])
                              , P.id_ "password"
                              , P.placeholder "Enter a unique password"
                              , P.required true
                              , P.value (fromMaybe "" st.password)
                              , E.onValueInput (Just <<< SetPassword)
                              ]
                          , HH.input
                              [ P.type_ P.InputPassword
                              , P.classes (ClassName <$> [ "form-control" ])
                              , P.id_ "passwordConfirm"
                              , P.placeholder "Enter a unique password"
                              , P.required true
                              , P.value (fromMaybe "" st.passwordConfirm)
                              , E.onValueInput (Just <<< ConfirmPassword)
                              ]
                          ]

[6.17758]

[6.18901]

                          $ [ HH.label [ P.for "password" ] [ HH.text "Password" ]
                            , HH.input
                                [ P.type_ P.InputPassword
                                , P.classes (ClassName <$> [ "form-control" ])
                                , P.id_ "password"
                                , P.placeholder "Enter a unique password"
                                , P.required true
                                , P.value (fromMaybe "" st.password)
                                , E.onValueInput (Just <<< SetPassword)
                                ]
                            ]
                          <> signupErrors PasswordField st
                          <> [ HH.input
                                [ P.type_ P.InputPassword
                                , P.classes (ClassName <$> [ "form-control" ])
                                , P.id_ "passwordConfirm"
                                , P.placeholder "Enter a unique password"
                                , P.required true
                                , P.value (fromMaybe "" st.passwordConfirm)
                                , E.onValueInput (Just <<< ConfirmPassword)
                                ]
                            ]
                          <> signupErrors ConfirmField st

Replacement in client/src/Aftok/Signup.purs at line 220 [16.1]

B:BD[6.20197] → [6.20197:20323]

        Acc.UsernameCheckOK -> pure unit
        Acc.UsernameCheckTaken -> H.modify_ (_ { signupErrors = [ UsernameTaken ] })

[6.20197]

[6.20323]

        Acc.UsernameCheckOK -> H.modify_ (\st -> st { signupErrors = M.delete UsernameField st.signupErrors })
        Acc.UsernameCheckTaken -> H.modify_ (\st -> st { signupErrors = M.insert UsernameField UsernameTaken st.signupErrors })

Replacement in client/src/Aftok/Signup.purs at line 225 [16.1]

B:BD[6.20439] → [6.20439:20533]

      when (any (notEq pass) confirm) (H.modify_ (_ { signupErrors = [ PasswordMismatch ] }))

[6.20439]

[6.20533]

      if (any (notEq pass) confirm) then
        (H.modify_ (\st -> st { signupErrors = M.insert ConfirmField PasswordMismatch st.signupErrors }))
      else
        (H.modify_ (\st -> st { signupErrors = M.delete ConfirmField st.signupErrors }))

Replacement in client/src/Aftok/Signup.purs at line 231 [16.1]

B:BD[6.20622] → [6.20622:20758]

      password <- H.gets (_.password)
      when (any (notEq confirm) password) (H.modify_ (_ { signupErrors = [ PasswordMismatch ] }))

[6.20622]

[6.20758]

      pass <- H.gets (_.password)
      if (any (notEq confirm) pass) then
        (H.modify_ (\st -> st { signupErrors = M.insert ConfirmField PasswordMismatch st.signupErrors }))
      else
        (H.modify_ (\st -> st { signupErrors = M.delete ConfirmField st.signupErrors }))

Replacement in client/src/Aftok/Signup.purs at line 238 [16.1]

B:BD[6.20893] → [6.20893:21353]

    SetRecoveryZAddr addr -> do
      lift $ system.log "Switching to signin..."
      zres <- lift $ caps.checkZAddr addr
      H.modify_ (_ { recoveryZAddr = Just addr })
      case zres of
        Acc.ZAddrCheckValid -> pure unit
        Acc.ZAddrCheckInvalid -> H.modify_ (_ { signupErrors = [ ZAddrInvalid ] })
    Signin ev -> do
      lift $ system.log "Switching to signin..."
      lift $ system.preventDefault (ME.toEvent ev)
      H.raise SigninNav

[6.20893]

[6.21353]

    SetRecoveryZAddr addr ->
      --lift $ system.log "Switching to signin..."
      when (addr /= "")
        $ do
            zres <- lift $ caps.checkZAddr addr
            H.modify_ (_ { recoveryZAddr = Just addr })
            case zres of
              Acc.ZAddrCheckValid -> H.modify_ (\st -> st { signupErrors = M.delete ZAddrField st.signupErrors })
              Acc.ZAddrCheckInvalid -> H.modify_ (\st -> st { signupErrors = M.insert ZAddrField ZAddrInvalid st.signupErrors })

Replacement in client/src/Aftok/Signup.purs at line 258 [16.1]

B:BD[6.22076] → [6.22076:22128]

      lift $ system.log "Sending signup request..."

[6.22076]

[6.22128]

      --lift $ system.log "Sending signup request..."

Replacement in client/src/Aftok/Signup.purs at line 271 [16.1]

B:BD[6.22518] → [6.22518:22621]

          lift $ system.log "Got signup HTTP error."
          H.modify_ (_ { signupErrors = errors })

[6.22518]

[6.22621]

          let
            errMap = M.fromFoldable $ map (\e -> Tuple (errField e) e) errors
          --lift $ system.log "Got signup HTTP error."
          H.modify_ (_ { signupErrors = errMap })

Replacement in client/src/Aftok/Signup.purs at line 277 [16.1]

B:BD[6.22690] → [6.22690:22762]

          lift <<< system.log $ "Got signup response " <> show response

[6.22690]

[6.22762]

          --lift <<< system.log $ "Got signup response " <> show response

Replacement in client/src/Aftok/Signup.purs at line 280 [16.1]

B:BD[6.22857] → [6.22857:23215]

            Acc.CaptchaInvalid -> H.modify_ (_ { signupErrors = [ CaptchaError ] })
            Acc.ZAddrInvalid -> H.modify_ (_ { signupErrors = [ ZAddrInvalid ] })
            Acc.UsernameTaken -> H.modify_ (_ { signupErrors = [ UsernameTaken ] })
            Acc.ServiceError c m -> H.modify_ (_ { signupErrors = [ APIError { status: c, message: m } ] })

[6.22857]

[5.7340]

            Acc.CaptchaInvalid -> H.modify_ (_ { signupErrors = M.singleton CaptchaField CaptchaError })
            Acc.ZAddrInvalid -> H.modify_ (_ { signupErrors = M.singleton ZAddrField ZAddrInvalid })
            Acc.UsernameTaken -> H.modify_ (_ { signupErrors = M.singleton UsernameField UsernameTaken })
            Acc.ServiceError c m -> H.modify_ (_ { signupErrors = M.singleton ErrField (APIError { status: c, message: m }) })
errField :: SignupError -> SignupField
errField = case _ of
  UsernameRequired -> UsernameField
  UsernameTaken -> UsernameField
  PasswordRequired -> PasswordField
  ConfirmRequired -> ConfirmField
  PasswordMismatch -> ConfirmField
  EmailRequired -> EmailField
  ZAddrRequired -> ZAddrField
  ZAddrInvalid -> ZAddrField
  CaptchaError -> CaptchaField
  APIError _ -> ErrField
signupErrors :: forall i a. SignupField -> SignupState -> Array (HH.HTML i a)
signupErrors field st = case M.lookup field st.signupErrors of
  (Just UsernameRequired) -> err "Username is required"
  (Just UsernameTaken) -> err "Username is already taken"
  (Just PasswordRequired) -> err "Password is required"
  (Just ConfirmRequired) -> err "Confirm your password"
  (Just PasswordMismatch) -> err "Passwords do not match"
  (Just EmailRequired) -> err "Email address is required"
  (Just ZAddrRequired) -> err "Zcash address is required"
  (Just ZAddrInvalid) -> err "Not a valid Zcash address"
  (Just CaptchaError) -> err "Captcha failed; please try again"
  _ -> []
  where
  err str = [ HH.div_ [ HH.span [ P.classes (ClassName <$> [ "badge", "badge-danger-soft" ]) ] [ HH.text str ] ] ]

Replacement in client/src/Aftok/Signup.purs at line 328 [16.1]
B:BD[6.23670] → [6.23670:23702]
```
            [ HH.text "Email" ]
```
[6.23670]
[6.23702]
```
            $ [ HH.text "Email" ]
```

Replacement in client/src/Aftok/Signup.purs at line 350 [16.1]

B:BD[16.7363] → [16.7363:7426]

B:BD[16.7426] → [6.24447:24744]

∅:D[6.24744] → [16.7708:7716]

B:BD[16.7708] → [16.7708:7716]

      [ HH.label [ P.for "email" ] [ HH.text "Email Address" ]
      , HH.input
          [ P.type_ P.InputEmail
          , P.classes (ClassName <$> [ "form-control" ])
          , P.id_ "email"
          , P.placeholder "name@address.com"
          , P.value (fromMaybe "" st.recoveryEmail)
          , E.onValueInput (Just <<< SetRecoveryEmail)
          ]
      ]

[16.7363]

[16.7716]

      $ [ HH.label [ P.for "email" ] [ HH.text "Email Address" ]
        , HH.input
            [ P.type_ P.InputEmail
            , P.classes (ClassName <$> [ "form-control" ])
            , P.id_ "email"
            , P.placeholder "name@address.com"
            , P.value (fromMaybe "" st.recoveryEmail)
            , E.onValueInput (Just <<< SetRecoveryEmail)
            ]
        ]
      <> signupErrors EmailField st

Replacement in client/src/Aftok/Signup.purs at line 364 [16.1]

B:BD[16.7779] → [6.24757:25082]

∅:D[6.25082] → [16.7975:7987]

B:BD[16.7975] → [16.7975:7987]

B:BD[16.7987] → [6.25083:25381]

∅:D[17.1342] → [16.8072:8084]

∅:D[6.25381] → [16.8072:8084]

B:BD[16.8072] → [16.8072:8084]

B:BD[16.8389] → [16.8389:8397]

      [ HH.label
          [ P.for "zaddr" ]
          [ HH.text "Zcash Shielded Address"
          , HH.a
              [ P.attr (AttrName "data-toggle") "modal"
              , P.href "#modalAboutZAddr"
              ]
              [ HH.img [ P.src "/assets/img/icons/duotone-icons/Code/Info-circle.svg" ]
              ]
          ]
      , HH.input
          [ P.type_ P.InputText
          , P.classes (ClassName <$> [ "form-control" ])
          , P.id_ "email"
          , P.placeholder "Enter a Zcash shielded address"
          , P.value (fromMaybe "" st.recoveryZAddr)
          , E.onValueInput (Just <<< SetRecoveryZAddr)
          ]
      ]

[16.7779]

[7.2735]

      $ [ HH.label
            [ P.for "zaddr" ]
            [ HH.text "Zcash Shielded Address"
            , HH.a
                [ P.attr (AttrName "data-toggle") "modal"
                , P.href "#modalAboutZAddr"
                ]
                [ HH.img [ P.src "/assets/img/icons/duotone-icons/Code/Info-circle.svg" ]
                ]
            ]
        , HH.input
            [ P.type_ P.InputText
            , P.classes (ClassName <$> [ "form-control" ])
            , P.id_ "email"
            , P.placeholder "Enter a Zcash shielded address"
            , P.value (fromMaybe "" st.recoveryZAddr)
            , E.onValueInput (Just <<< SetRecoveryZAddr)
            ]
        ]
      <> signupErrors ZAddrField st

Replacement in client/src/Aftok/Signup.purs at line 387 [16.1]
∅:D[6.25398] → [7.2785:2835]
B:BD[7.2785] → [7.2785:2835]
```
  { checkUsername: \_ -> pure Acc.UsernameCheckOK
```
[6.25398]
[7.2835]
```
  { checkUsername: Acc.checkUsername
```

Replacement in client/src/Aftok/Timeline.purs at line 169 [18.2287]

B:BD[6.28037] → [9.6055:6314]

              [ HH.slot 
                  _projectList 
                  unit 
                  (ProjectList.component system pcaps) 
                  st.selectedProject 
                  (Just <<< (\(ProjectList.ProjectChange p) -> ProjectSelected p))

[6.28037]

[9.6314]

              [ HH.slot
                  _projectList
                  unit
                  (ProjectList.component system pcaps)
                  st.selectedProject
                  (Just <<< (\(ProjectList.ProjectChange p) -> ProjectSelected p))

Insertion in client/src/Aftok/Types.purs at line 86 [19.7400]

[8.8230]


derive instance userIdEq :: Eq UserId
derive instance userIdOrd :: Ord UserId

Deletion in client/src/Aftok/Types.purs at line 91 [19.7400]
B:BD[8.8231] → [8.8231:8270]
B:BD[8.8270] → [10.10401:10442]
```
derive instance userIdEq :: Eq UserId 
derive instance userIdOrd :: Ord UserId 
```
Replacement in client/src/Aftok/Types.purs at line 95 [19.7400]
B:BD[9.7038] → [9.7038:7070]
```
    uuidStr <- decodeJson json 
```
[9.7038]
[9.7070]
```
    uuidStr <- decodeJson json
```
Insertion in client/src/Aftok/Types.purs at line 102 [19.7400]
[14.5717]
[9.7142]
Insertion in client/src/Aftok/Types.purs at line 104 [19.7400]
[9.7188]
[9.7188]
Replacement in client/src/Aftok/Types.purs at line 109 [19.7400]
B:BD[9.7327] → [9.7327:7359]
```
    uuidStr <- decodeJson json 
```
[9.7327]
[9.7359]
```
    uuidStr <- decodeJson json
```
Deletion in client/src/Aftok/Types.purs at line 112 [19.7400]
B:BD[20.11909] → [9.7437:7438]
Deletion in client/src/Aftok/Types.purs at line 121 [19.7400]
∅:D[13.3198] → [6.37638:37639]
B:BD[6.37638] → [6.37638:37639]
Replacement in client/src/Main.purs at line 44 [21.410]
B:BD[6.38720] → [15.1570:1611]
```
      overview = Overview.mockCapability
```
[6.38720]
[17.1684]
```
      overview = Overview.apiCapability
```

Replacement in client/src/Main.purs at line 170 [21.410]

B:BD[6.41379] → [15.1612:1822]

          pure $ case result of
            Acc.LoginForbidden -> VLogin
            Acc.LoginError _ -> VLogin
            _ -> case other of
              "timeline" -> VTimeline
              _ -> VOverview

[6.41379]

[6.41526]

          pure
            $ case result of
                Acc.LoginForbidden -> VLogin
                Acc.LoginError _ -> VLogin
                _ -> case other of
                  "timeline" -> VTimeline
                  _ -> VOverview

Replacement in client/src/Main.purs at line 178 [21.410]

B:BD[6.41550] → [6.41550:41615]

    SignupAction (Signup.SignupComplete _) -> navigate VTimeline

[6.41550]

[6.41615]

    SignupAction (Signup.SignupComplete _) -> navigate VOverview

Replacement in client/src/Main.purs at line 180 [21.410]

B:BD[6.41670] → [6.41670:41732]

    LoginAction (Login.LoginComplete _) -> navigate VTimeline

[6.41670]

[6.41732]

    LoginAction (Login.LoginComplete _) -> navigate VOverview

Replacement in client/src/Main.purs at line 225 [21.410]
B:BD[6.42931] → [6.42931:42959]
```
        [ HH.text "Aftok" ]
```
[6.42931]
[6.42959]
```
        [ HH.a [ P.href "/" ] [ HH.text "Aftok" ] ]
```

Deletion in docker-compose.yml at line 31 [23.23741]

B:BD[12.9859] → [22.1372:1642]

        target: /opt/aftok/client/dist-volume
  aftok-reactclient:
    image: aftok/aftok-reactclient:latest
    container_name: aftok-reactclient
    entrypoint: /opt/aftok/aftok-client-cp.sh build
    volumes:
      - type: volume
        source: v_aftok-reactclient

Deletion in docker-compose.yml at line 65 [23.23741]
∅:D[24.2106] → [22.1667:1757]
B:BD[22.1667] → [22.1667:1757]
∅:D[22.1757] → [25.2788:2812]
B:BD[25.2788] → [25.2788:2812]
```
      - type: volume
        source: v_aftok-reactclient
        target: /opt/static/app2
        read_only: true
```
Deletion in docker-compose.yml at line 111 [23.23741]
B:BD[12.10513] → [22.1758:1781]
```
  v_aftok-reactclient:
```

Replacement in lib/Aftok/Billing.hs at line 10 [27.760]

B:BD[26.8452] → [26.8452:8526]

import Data.Thyme.Clock as C
import Data.Thyme.Time as T
import Data.UUID

[26.8452]

[27.981]

import qualified Data.Thyme.Clock as C
import qualified Data.Thyme.Time as T
import Data.UUID (UUID)

Replacement in lib/Aftok/Billing.hs at line 62 [27.760]

∅:D[28.5671] → [26.8977:9007]

B:BD[26.8977] → [26.8977:9007]

B:BD[26.9007] → [28.5672:5721]

        _gracePeriod :: Days,
        _requestExpiryPeriod :: NominalDiffTime,

[28.5671]

[26.9064]

        _gracePeriod :: T.Days,
        _requestExpiryPeriod :: T.NominalDiffTime,

Replacement in lib/Aftok/Billing.hs at line 87 [27.760]

B:BD[26.9309] → [28.6030:6095]

        _startTime :: UTCTime,
        _endTime :: Maybe UTCTime

[26.9309]

[26.9378]

        _startTime :: C.UTCTime,
        _endTime :: Maybe C.UTCTime

Replacement in lib/Aftok/Database/PostgreSQL/Events.hs at line 26 [28.34007]
B:BD[28.34477] → [12.10556:10590]
```
    KeyedLogEntry(KeyedLogEntry),
```
[28.34477]
[29.5021]
```
    KeyedLogEntry (KeyedLogEntry),
```

Replacement in lib/Aftok/Database/PostgreSQL/Events.hs at line 54 [28.34007]

B:BD[28.34844] → [12.10677:10933]

import Aftok.TimeLog (
  WorkIndex,
  LogEntry(LogEntry),
  LogEvent(..),
  EventId(..),
  EventAmendment(..),
  AmendmentId(..),
  eventMeta,
  _ModTime,
  _EventId,
  _AmendmentId,
  creditTo,
  eventTime,
  event,
  workIndex,
  eventName,
  nameEvent,

[28.34844]

[12.10933]

import Aftok.TimeLog
  ( AmendmentId (..),
    EventAmendment (..),
    EventId (..),
    LogEntry (LogEntry),
    LogEvent (..),
    WorkIndex,
    _AmendmentId,
    _EventId,
    _ModTime,
    creditTo,
    event,
    eventMeta,
    eventName,
    eventTime,
    nameEvent,
    workIndex,

Insertion in lib/Aftok/Database/PostgreSQL/Users.hs at line 11 [28.57195]
[28.57438]
[28.57438]
```
    findUserProjectDetail,
```
Insertion in lib/Aftok/Database/PostgreSQL/Users.hs at line 27 [28.57195]
[28.57748]
[28.57748]
```
    utcParser,
```
Insertion in lib/Aftok/Database/PostgreSQL/Users.hs at line 33 [28.57195]
[28.57835]
[28.57835]
```
import qualified Data.Thyme.Clock as C
```

Insertion in lib/Aftok/Database/PostgreSQL/Users.hs at line 67 [28.57195]

[28.58835]


findUserProjectDetail :: UserId -> ProjectId -> DBM (Maybe (User, C.UTCTime))
findUserProjectDetail (UserId uid) (ProjectId pid) = do
  headMay
    <$> pquery
      ((,) <$> userParser <*> utcParser)
      [sql| SELECT u.handle, u.recovery_email, u.recovery_zaddr, p.joined_at
            FROM users u
            JOIN project_companions p on p.user_id = u.id
            WHERE u.id = ? AND p.project_id = ? |]
      (uid, pid)

Insertion in lib/Aftok/Database/PostgreSQL.hs at line 57 [30.456]
[28.61899]
[28.61899]
```
    (FindUserProjectDetail uid pid) -> Q.findUserProjectDetail uid pid
```
Insertion in lib/Aftok/Database.hs at line 30 [31.4936]
[28.64111]
[28.64111]
```
    HasLogEntry,
```
Deletion in lib/Aftok/Database.hs at line 33 [31.4936]
B:BD[28.64140] → [12.16657:16674]
```
    HasLogEntry,
```

Replacement in lib/Aftok/Database.hs at line 57 [31.4936]

B:BD[12.16693] → [12.16693:16786]

data KeyedLogEntry = KeyedLogEntry {
    _workId :: !EventId,
    _logEntry :: !LogEntry
  }

[12.16693]

[12.16786]

data KeyedLogEntry
  = KeyedLogEntry
      { _workId :: !EventId,
        _logEntry :: !LogEntry
      }

Insertion in lib/Aftok/Database.hs at line 77 [31.4936]

[26.27065]

  FindUserProjectDetail :: UserId -> ProjectId -> DBOp (Maybe (User, C.UTCTime))

Insertion in lib/Aftok/Database.hs at line 164 [31.4936]

[31.5045]

[32.2715]

findUserProjectDetail :: (MonadDB m) => UserId -> ProjectId -> MaybeT m (User, C.UTCTime)
findUserProjectDetail uid pid = MaybeT . liftdb $ FindUserProjectDetail uid pid

Replacement in lib/Aftok/Database.hs at line 273 [31.4936]

B:BD[12.17495] → [12.17495:17600]

      in if uid' == uid
        then liftdb act
        else raiseOpForbidden uid UserNotEventLogger act

[12.17495]

[33.1146]

       in if uid' == uid
            then liftdb act
            else raiseOpForbidden uid UserNotEventLogger act

Replacement in lib/Aftok/Payments/Util.hs at line 31 [28.79668]
B:BD[28.80386] → [28.80386:80411]
```
  m TL.FractionalPayouts
```
[28.80386]
[28.80411]
```
  m TL.WorkShares
```
Replacement in lib/Aftok/Payments/Util.hs at line 52 [28.79668]
B:BD[28.81142] → [28.81142:81168]
```
  TL.FractionalPayouts ->
```
[28.81142]
[28.81168]
```
  TL.WorkShares ->
```

Replacement in lib/Aftok/Payments/Util.hs at line 59 [28.79668]

B:BD[28.81401] → [29.6705:6766]

∅:D[29.6766] → [28.81478:81665]

B:BD[28.81478] → [28.81478:81665]

      let scaled frac = note AmountInvalid $ cscale amt frac
      payoutFractions <- except $ traverse scaled (payouts ^. TL._Payouts)
      fromListWith (<>) . join <$> traverse (uncurry (getPayoutAmounts t currency mp)) (assocs payoutFractions)

[28.81401]

[28.81665]

      let scaled ws = note AmountInvalid $ cscale amt (ws ^. TL.wsShare)
      payoutFractions <- except $ traverse scaled (payouts ^. TL.creditToShares)
      fromListWith (<>) . join
        <$> traverse (uncurry (getPayoutAmounts t currency mp)) (assocs payoutFractions)

Replacement in lib/Aftok/TimeLog/Serialization.hs at line 21 [34.29337]
B:BD[34.29760] → [26.50034:50082]
```
  LinearDepreciation (Months up) (Months dp) ->
```
[34.29760]
[26.50082]
```
  LinearDepreciation undep dep ->
```

Replacement in lib/Aftok/TimeLog/Serialization.hs at line 24 [34.29337]

B:BD[26.50143] → [26.50143:50202]

        "arguments" .= object ["undep" .= up, "dep" .= dp]

[26.50143]

[26.50202]

        "arguments" .= object ["undep" .= undep, "dep" .= dep]

Replacement in lib/Aftok/TimeLog/Serialization.hs at line 34 [34.29337]

B:BD[34.30220] → [34.30220:30269]

B:BD[34.30269] → [26.50248:50293]

        let undep = Months <$> (args .: "undep")
            dep = Months <$> (args .: "dep")

[34.30220]

[26.50293]

        let undep = (args .: "undep")
            dep = (args .: "dep")

Replacement in lib/Aftok/TimeLog.hs at line 6 [36.846]
B:BD[35.4159] → [26.50409:50428]
B:BD[26.50428] → [12.19028:19050]
```
  ( LogEntry (..),
    HasLogEntry (..),
```
[35.4159]
[26.50468]
```
  ( module Aftok.TimeLog,
```

Deletion in lib/Aftok/TimeLog.hs at line 11 [36.846]

B:BD[26.50569] → [26.50569:50588]

B:BD[26.50588] → [12.19051:19082]

∅:D[12.19082] → [26.50588:50893]

B:BD[26.50588] → [26.50588:50893]

B:BD[26.50893] → [28.90213:90236]

∅:D[28.90236] → [26.50893:50930]

B:BD[26.50893] → [26.50893:50930]

    LogEvent (..),
    _StartWork,
    _StopWork,
    eventName,
    nameEvent,
    eventTime,
    WorkIndex (WorkIndex),
    _WorkIndex,
    workIndex,
    DepF,
    toDepF,
    EventId (EventId),
    _EventId,
    ModTime (ModTime),
    _ModTime,
    EventAmendment (..),
    AmendmentId (AmendmentId),
    _AmendmentId,
    Payouts (..),
    _Payouts,
    FractionalPayouts,
    payouts,
    linearDepreciation,

Replacement in lib/Aftok/TimeLog.hs at line 16 [36.846]

B:BD[26.51001] → [26.51001:51021]

B:BD[26.51021] → [29.6807:6836]

import Control.Lens
import Data.AdditiveGroup ()

[26.50972]

[26.51047]

  ( CreditTo (..),
    DepreciationFunction (..),
    _CreditToAccount,
    _CreditToProject,
    _CreditToUser,
  )
import Control.Lens ((.~), (^.), makeClassy, makeLenses, makePrisms, view)

Replacement in lib/Aftok/TimeLog.hs at line 24 [36.846]
B:BD[26.51070] → [26.51070:51094]
B:BD[26.51183] → [26.51183:51209]
```
import Data.AffineSpace
import Data.Foldable as F
```
[26.51070]
[12.19083]
```
import Data.AffineSpace ((.-.))
import qualified Data.Foldable as F
```
Replacement in lib/Aftok/TimeLog.hs at line 27 [36.846]
∅:D[12.19122] → [26.51506:51535]
B:BD[26.51506] → [26.51506:51535]
```
import Data.Thyme.Clock as C
```
[12.19122]
[12.19123]
```
import qualified Data.Thyme.Clock as C
import qualified Data.Thyme.Time as C
```

Replacement in lib/Aftok/TimeLog.hs at line 99 [36.846]

B:BD[37.5971] → [28.90533:90578]

newtype Payouts a = Payouts (Map CreditTo a)

[37.5971]

[26.52471]

data WorkShare a
  = WorkShare
      { _wsLogged :: NDT,
        _wsDepreciated :: NDT,
        _wsShare :: a
      }

Replacement in lib/Aftok/TimeLog.hs at line 106 [36.846]
∅:D[38.5110] → [37.6021:6042]
∅:D[34.31997] → [37.6021:6042]
∅:D[26.52472] → [37.6021:6042]
B:BD[37.6021] → [37.6021:6042]
```
makePrisms ''Payouts
```
[26.52472]
[37.6042]
```
makeLenses ''WorkShare
```

Replacement in lib/Aftok/TimeLog.hs at line 108 [36.846]

B:BD[37.6043] → [28.90579:90621]

type FractionalPayouts = Payouts Rational

[37.6043]

[28.90621]

data WorkShares
  = WorkShares
      { _loggedTotal :: NDT,
        _creditToShares :: Map CreditTo (WorkShare Rational)
      }
makeLenses ''WorkShares

Replacement in lib/Aftok/TimeLog.hs at line 126 [36.846]

B:BD[26.52577] → [26.52577:52658]

B:BD[26.52658] → [12.19567:19761]

-- - produce the total, depreciated length of work to be credited to an address.
workCredit :: (Foldable f, HasLogEntry le) => DepF -> C.UTCTime -> f (Interval le) -> NDT
workCredit df ptime ivals = getSum $ F.foldMap (Sum . df ptime . fmap (view $ event . eventTime)) ivals

[26.52577]

[39.1576]

-- - produce the total length and depreciated length of work to be credited to an recipient.
workCredit :: (Foldable f, HasLogEntry le) => DepF -> C.UTCTime -> f (Interval le) -> (NDT, NDT)
workCredit depf ptime ivals =
  bimap getSum getSum $ F.foldMap ((Sum . ilen &&& Sum . depf ptime) . fmap (view $ event . eventTime)) ivals

Replacement in lib/Aftok/TimeLog.hs at line 135 [36.846]

B:BD[28.90753] → [12.19762:19859]

payouts :: forall le. (HasLogEntry le) => DepF -> C.UTCTime -> WorkIndex le -> FractionalPayouts

[28.90753]

[35.4834]

payouts :: forall le. (HasLogEntry le) => DepF -> C.UTCTime -> WorkIndex le -> WorkShares

Replacement in lib/Aftok/TimeLog.hs at line 137 [36.846]

B:BD[35.4871] → [12.19860:19938]

  let addIntervalDiff :: (Foldable f) => NDT -> f (Interval le) -> (NDT, NDT)

[35.4871]

[40.12318]

  let addIntervalDiff :: (Foldable f) => NDT -> f (Interval le) -> (NDT, WorkShare ())

Replacement in lib/Aftok/TimeLog.hs at line 139 [36.846]

B:BD[40.12354] → [26.52852:52908]

        (^+^ total) &&& id $ workCredit dep ptime ivals

[40.12354]

[41.1333]

        let (logged, depreciated) = workCredit dep ptime ivals
         in (total ^+^ depreciated, WorkShare logged depreciated ())

Replacement in lib/Aftok/TimeLog.hs at line 142 [36.846]

B:BD[41.1402] → [26.52909:52977]

   in Payouts $ fmap ((/ toSeconds totalTime) . toSeconds) keyTimes

[41.1402]

[42.1581]

      withShareFraction t = t & wsShare .~ (C.toSeconds (t ^. wsDepreciated) / C.toSeconds totalTime)
   in WorkShares totalTime (fmap withShareFraction keyTimes)

Replacement in lib/Aftok/TimeLog.hs at line 203 [36.846]

B:BD[26.53991] → [26.53991:54167]

  -- | The number of initial months during which no depreciation occurs
  Months ->
  -- | The number of months over which each logged interval will be depreciated
  Months ->

[26.53991]

[26.54167]

  -- | The number of initial days during which no depreciation occurs
  C.Days ->
  -- | The number of days over which each logged interval will be depreciated
  C.Days ->

Replacement in lib/Aftok/TimeLog.hs at line 210 [36.846]

∅:D[35.5170] → [39.2404:2508]

∅:D[43.9933] → [39.2404:2508]

B:BD[39.2404] → [39.2404:2508]

  let monthsLength :: Months -> NDT
      monthsLength (Months i) = fromSeconds $ 60 * 60 * 24 * 30 * i

[35.5170]

[39.2509]

  let daysLength :: C.Days -> NDT
      daysLength d = C.fromSeconds $ 60 * 60 * 24 * d

Replacement in lib/Aftok/TimeLog.hs at line 213 [36.846]

B:BD[39.2537] → [35.5171:5246]

      maxDepreciable = monthsLength undepLength ^+^ monthsLength depLength

[39.2537]

[39.2614]

      maxDepreciable = daysLength undepLength ^+^ daysLength depLength

Replacement in lib/Aftok/TimeLog.hs at line 216 [36.846]
B:BD[26.54248] → [26.54248:54289]
```
        if dt < monthsLength undepLength
```
[26.54248]
[26.54289]
```
        if dt < daysLength undepLength
```

Replacement in lib/Aftok/TimeLog.hs at line 219 [36.846]

B:BD[26.54321] → [26.54321:54420]

            toSeconds (max zeroV (maxDepreciable ^-^ dt))
              / toSeconds maxDepreciable

[26.54321]

[26.54420]

            C.toSeconds (max zeroV (maxDepreciable ^-^ dt))
              / C.toSeconds maxDepreciable

Replacement in lib/Aftok/Types.hs at line 10 [44.805]
B:BD[26.54639] → [26.54639:54659]
B:BD[26.54689] → [26.54689:54735]
```
import Data.Eq (Eq)
import Data.Ord (Ord)
import Data.Text (Text)
```
[26.54639]
[26.54735]
```
import qualified Data.Thyme.Time as C
```
Deletion in lib/Aftok/Types.hs at line 12 [44.805]
B:BD[26.54759] → [26.54759:54808]
```
import Text.Show (Show)
import Prelude (Integer)
```

Replacement in lib/Aftok/Types.hs at line 63 [44.805]

B:BD[34.33915] → [34.33915:33976]

data DepreciationFunction = LinearDepreciation Months Months

[44.1037]

[34.33976]

data DepreciationFunction = LinearDepreciation C.Days C.Days

Deletion in lib/Aftok/Types.hs at line 65 [44.805]
B:BD[34.33998] → [34.33998:34053]
```
newtype Months = Months Integer
  deriving (Eq, Show)
```
File move: list_project_contributors.sh → get_project_detail.sh
BF:BFD[45.1220] → [46.1269:1321]
BF:BF[46.1321] → [46.907:907]
[45.1220]
[46.907]

Replacement in scripts/get_project_detail.sh at line 24 [46.907]

B:BD[46.1213] → [46.1213:1268]

  "https://$AFTOK_HOST/api/projects/$PID/contributors"

[46.1213]

  "https://$AFTOK_HOST/api/projects/$PID/detail"

Insertion in server/Aftok/Snaplet/Projects.hs at line 3 [45.2363]
[45.2397]
[45.2397]
```
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE TypeApplications #-}
```
Replacement in server/Aftok/Snaplet/Projects.hs at line 11 [45.2363]
B:BD[26.63460] → [46.1327:1356]
```
    listContributorsHandler,
```
[26.63460]
[46.1356]
```
    projectDetailGetHandler,
```
Insertion in server/Aftok/Snaplet/Projects.hs at line 14 [45.2363]
[12.27435]
[12.27435]
```
    payoutsHandler,
    payoutsJSON,
```
Insertion in server/Aftok/Snaplet/Projects.hs at line 17 [45.2363]
[12.27455]
[47.52743]
```
    projectDetailJSON,
```
Replacement in server/Aftok/Snaplet/Projects.hs at line 23 [45.2363]
B:BD[26.63503] → [12.27456:27509]
```
import Aftok.Json (idValue, identifiedJSON, obj, v1)
```
[26.63503]
[26.63503]
```
import Aftok.Json (creditToJSON, idValue, identifiedJSON, obj, v1)
```

Insertion in server/Aftok/Snaplet/Projects.hs at line 28 [45.2363]

[26.63598]

import Aftok.TimeLog
  ( WorkShare,
    WorkShares,
    creditToShares,
    payouts,
    toDepF,
    wsLogged,
    wsShare,
  )

Replacement in server/Aftok/Snaplet/Projects.hs at line 40 [45.2363]
B:BD[26.63698] → [12.27510:27549]
```
import Control.Lens ((^.), _1, _2, to)
```
[26.63698]
[26.63718]
```
import Control.Lens ((^.), _1, _2, makeLenses, to)
```
Insertion in server/Aftok/Snaplet/Projects.hs at line 45 [45.2363]
[26.63837]
[46.1520]
```
import qualified Data.Map.Strict as M
```
Insertion in server/Aftok/Snaplet/Projects.hs at line 54 [45.2363]
[26.64089]
[45.2485]
```
import Time.Types (Hours (..))
```
Replacement in server/Aftok/Snaplet/Projects.hs at line 59 [45.2363]
∅:D[46.1651] → [34.34611:34636]
B:BD[48.4054] → [34.34611:34636]
```
  parseJSON (Object v) =
```
[46.1651]
[47.53505]
```
  parseJSON (A.Object v) =
```

Insertion in server/Aftok/Snaplet/Projects.hs at line 63 [45.2363]

[45.2915]

[49.18010]

data Contributor
  = Contributor
      { _userId :: UserId,
        _handle :: UserName,
        _joinedOn :: C.UTCTime,
        _timeDevoted :: Hours,
        _revenueShare :: Rational
      }
makeLenses ''Contributor
data ProjectDetail
  = ProjectDetail
      { _pdProject :: Project,
        _pdContributors :: M.Map UserId Contributor
      }
makeLenses ''ProjectDetail

Replacement in server/Aftok/Snaplet/Projects.hs at line 103 [45.2363]

B:BD[46.1653] → [46.1653:1865]

contributorJSON :: (UserId, UserName, C.UTCTime) -> Value
contributorJSON (uid, uname, t) =
  object
    [ "user_id" .= idValue _UserId uid,
      "username" .= (uname ^. _UserName),
      "joined_at" .= t
    ]

[46.1653]

[46.1865]

projectDetailGetHandler :: S.Handler App App ProjectDetail
projectDetailGetHandler = do
  uid <- requireUserId
  pid <- requireProjectId
  project <-
    fromMaybeT
      (snapError 404 $ "Project not found for id " <> show pid)
      (mapMaybeT snapEval $ findUserProject uid pid)
  widx <- snapEval $ readWorkIndex pid uid
  ptime <- liftIO $ C.getCurrentTime
  let p = payouts (toDepF $ project ^. depf) ptime widx
      toContributorRecord = \case
        (CreditToUser uid', ws) -> do
          (user, joinedOn') <-
            fromMaybeT
              (snapError 500 $ "No user record found for logged-in user.")
              (mapMaybeT snapEval $ findUserProjectDetail uid pid)
          pure . Just . (uid',) $
            Contributor
              { _userId = uid',
                _handle = user ^. username,
                _joinedOn = joinedOn',
                _timeDevoted = Hours . (`div` 360) . round . C.toSeconds' $ ws ^. wsLogged,
                _revenueShare = ws ^. wsShare
              }
        _ -> pure Nothing
  contributorRecords <-
    fmap (M.fromList . catMaybes)
      . traverse toContributorRecord
      $ M.assocs (p ^. creditToShares)
  pure $
    ProjectDetail
      { _pdProject = project,
        _pdContributors = contributorRecords
      }

Replacement in server/Aftok/Snaplet/Projects.hs at line 139 [45.2363]

B:BD[46.1866] → [46.1866:1972]

listContributorsHandler :: S.Handler App App [(UserId, UserName, C.UTCTime)]
listContributorsHandler = do

[46.1866]

[46.1972]

payoutsHandler :: S.Handler App App WorkShares
payoutsHandler = do

Replacement in server/Aftok/Snaplet/Projects.hs at line 143 [45.2363]

B:BD[46.2021] → [46.2021:2066]

  snapEval $ listProjectContributors pid uid

[46.2021]

[50.8936]

  project <-
    fromMaybeT
      (snapError 400 $ "Project not found for id " <> show pid)
      (mapMaybeT snapEval $ findUserProject uid pid)
  widx <- snapEval $ readWorkIndex pid uid
  ptime <- liftIO $ C.getCurrentTime
  pure $ payouts (toDepF $ project ^. depf) ptime widx

Insertion in server/Aftok/Snaplet/Projects.hs at line 209 [45.2363]

[26.65787]

[12.27550]


depfToJSON :: DepreciationFunction -> Value
depfToJSON = \case
  LinearDepreciation undep dep ->
    object
      [ "type" .= ("LinearDepreciation" :: Text),
        "arguments" .= object ["undep" .= undep, "dep" .= dep]
      ]

Replacement in server/Aftok/Snaplet/Projects.hs at line 218 [45.2363]
B:BD[12.27551] → [12.27551:27583]
```
projectJSON :: Project -> Value
```
[12.27551]
[12.27583]
```
projectJSON :: Project -> A.Object
```

Replacement in server/Aftok/Snaplet/Projects.hs at line 220 [45.2363]

B:BD[12.27599] → [12.27599:27766]

  v1 $
    obj
      [ "projectName" .= (p ^. projectName),
        "inceptionDate" .= (p ^. inceptionDate),
        "initiator" .= (p ^. initiator . _UserId)
      ]

[12.27599]

[12.27766]

  obj
    [ "projectName" .= (p ^. projectName),
      "inceptionDate" .= (p ^. inceptionDate),
      "initiator" .= (p ^. initiator . _UserId),
      "depf" .= depfToJSON (p ^. depf)
    ]

Replacement in server/Aftok/Snaplet/Projects.hs at line 228 [45.2363]

B:BD[12.27815] → [12.27815:27897]

qdbProjectJSON = identifiedJSON "project" (_1 . _ProjectId) (_2 . to projectJSON)

[12.27815]

qdbProjectJSON = identifiedJSON "project" (_1 . _ProjectId) (_2 . to (v1 . projectJSON))
contributorJSON :: Contributor -> Value
contributorJSON c =
  object
    [ "userId" .= idValue _UserId (c ^. userId),
      "username" .= (c ^. handle . _UserName),
      "joinedOn" .= (c ^. joinedOn),
      "timeDevoted" .= (c ^. timeDevoted . (to fromEnum)),
      "revenureShare"
        .= object
          [ "numerator" .= (c ^. revenueShare . (to numerator)),
            "denominator" .= (c ^. revenueShare . (to denominator))
          ]
    ]
projectDetailJSON :: ProjectDetail -> A.Object
projectDetailJSON detail =
  obj
    [ "project" .= Object (projectJSON $ detail ^. pdProject),
      "contributors" .= (M.elems $ fmap contributorJSON (detail ^. pdContributors))
    ]
payoutsJSON :: WorkShares -> A.Object
payoutsJSON ws =
  let payoutsRec :: (CreditTo, WorkShare Rational) -> Value
      payoutsRec (c, r) =
        object
          [ "creditTo" .= creditToJSON c,
            "payoutRatio" .= (r ^. wsShare),
            "payoutPercentage" .= (fromRational @Double (r ^. wsShare) * 100)
          ]
   in obj $ ["payouts" .= fmap payoutsRec (M.assocs (ws ^. creditToShares))]

Insertion in server/Aftok/Snaplet/Users.hs at line 8 [51.3234]
[26.65909]
[26.65909]
```
    checkUsernameHandler,
```

Replacement in server/Aftok/Snaplet/Users.hs at line 19 [51.3234]

B:BD[28.103472] → [2.1040:1116]

import Aftok.Database (acceptInvitation, createUser, findCurrentInvitation)

[28.103472]

[26.66138]

import Aftok.Database
  ( acceptInvitation,
    createUser,
    findCurrentInvitation,
    findUserByName,
  )

Insertion in server/Aftok/Snaplet/Users.hs at line 128 [51.3234]

[51.4425]

[28.103755]

checkUsernameHandler :: S.Handler App App ()
checkUsernameHandler = do
  params <- S.getParams
  uname <-
    maybe
      (snapError 400 "username parameter is required")
      (either (const $ snapError 400 "username must be valid UTF-8") (pure . UserName) . decodeUtf8')
      (listToMaybe =<< M.lookup "username" params)
  found <- snapEval (runMaybeT $ findUserByName uname)
  case found of
    Nothing -> pure ()
    Just _ -> snapError 400 "username is already taken"

Deletion in server/Aftok/Snaplet/WorkLog.hs at line 14 [51.5424]
B:BD[26.70398] → [26.70398:70419]
```
import Aftok.Project
```
Deletion in server/Aftok/Snaplet/WorkLog.hs at line 21 [51.5424]
B:BD[12.28122] → [12.28122:28145]
```
    FractionalPayouts,
```
Deletion in server/Aftok/Snaplet/WorkLog.hs at line 24 [51.5424]
B:BD[12.28202] → [12.28202:28220]
```
    Payouts (..),
```
Deletion in server/Aftok/Snaplet/WorkLog.hs at line 29 [51.5424]
B:BD[12.28302] → [12.28302:28327]
```
    payouts,
    toDepF,
```
Deletion in server/Aftok/Snaplet/WorkLog.hs at line 33 [51.5424]
B:BD[12.28366] → [12.28366:28378]
```
    UserId,
```
Insertion in server/Aftok/Snaplet/WorkLog.hs at line 34 [51.5424]
[12.28393]
[12.28393]
```
    UserId,
```
Deletion in server/Aftok/Snaplet/WorkLog.hs at line 38 [51.5424]
B:BD[26.70565] → [26.70565:70596]
```
import Aftok.Util (fromMaybeT)
```
Deletion in server/Aftok/Snaplet/WorkLog.hs at line 39 [51.5424]
∅:D[12.28443] → [26.70623:70668]
B:BD[26.70623] → [26.70623:70668]
```
import Control.Monad.Trans.Maybe (mapMaybeT)
```
Deletion in server/Aftok/Snaplet/WorkLog.hs at line 110 [51.5424]
∅:D[52.4950] → [20.15166:15167]
∅:D[40.15945] → [20.15166:15167]
∅:D[12.29601] → [20.15166:15167]
B:BD[20.15166] → [20.15166:15167]
B:BD[20.15167] → [28.104286:104340]
∅:D[49.18701] → [35.10183:10203]
∅:D[34.36147] → [35.10183:10203]
∅:D[28.104340] → [35.10183:10203]
B:BD[53.1704] → [35.10183:10203]
B:BD[35.10203] → [26.72174:72411]
∅:D[54.8682] → [39.3065:3102]
∅:D[43.13259] → [39.3065:3102]
∅:D[47.59528] → [39.3065:3102]
∅:D[26.72411] → [39.3065:3102]
B:BD[55.3780] → [39.3065:3102]
B:BD[39.3102] → [43.13260:13315]
```
payoutsHandler :: S.Handler App App FractionalPayouts
payoutsHandler = do
  uid <- requireUserId
  pid <- requireProjectId
  project <-
    fromMaybeT
      (snapError 400 $ "Project not found for id " <> show pid)
      (mapMaybeT snapEval $ findUserProject uid pid)
  widx <- snapEval $ readWorkIndex pid uid
  ptime <- liftIO $ C.getCurrentTime
  pure $ payouts (toDepF $ project ^. depf) ptime widx
```

Deletion in server/Aftok/Snaplet/WorkLog.hs at line 162 [51.5424]

B:BD[12.31028] → [12.31028:31385]


payoutsJSON :: FractionalPayouts -> Value
payoutsJSON (Payouts m) =
  v1 $
    let payoutsRec :: (CreditTo, Rational) -> Value
        payoutsRec (c, r) =
          object ["creditTo" .= creditToJSON c,
          "payoutRatio" .= r,
          "payoutPercentage" .= (fromRational @Double r * 100)]
     in obj $ ["payouts" .= fmap payoutsRec (MS.assocs m)]

Deletion in server/Aftok/Snaplet/WorkLog.hs at line 181 [51.5424]
B:BD[12.31970] → [12.31970:31971]

Insertion in server/Main.hs at line 80 [56.5188]

[26.76933]

      checkUsernameRoute = void $ method GET checkUsernameHandler

Replacement in server/Main.hs at line 85 [56.5188]

B:BD[26.77224] → [46.2160:2268]

      listContributorsRoute =
        serveJSON (fmap contributorJSON) $ method GET listContributorsHandler

[26.77224]

      projectDetailRoute =
        serveJSON (v1 . projectDetailJSON) $ method GET projectDetailGetHandler

Insertion in server/Main.hs at line 134 [56.5188]

[28.105494]

      ("validate_username", checkUsernameRoute), -- check_username.sh

Replacement in server/Main.hs at line 146 [56.5188]

B:BD[28.106406] → [46.2269:2368]

      ("projects/:projectId/contributors", listContributorsRoute), -- list_project_contributors.sh

[28.106406]

      ("projects/:projectId/detail", projectDetailRoute), -- list_project_contributors.sh

Add error reporting to signup form.

Dependencies

In channels

Change contents

Replacement in client/src/Aftok/Api/Account.purs at line 93 [5.149]

Replacement in client/src/Aftok/Api/Account.purs at line 104 [5.149]

Insertion in client/src/Aftok/Api/Json.purs at line 58 [8.22]

Replacement in client/src/Aftok/Api/Json.purs at line 62 [8.22]

Replacement in client/src/Aftok/Api/Json.purs at line 70 [8.22]

Replacement in client/src/Aftok/Api/Json.purs at line 73 [8.22]

Replacement in client/src/Aftok/Api/Json.purs at line 77 [8.22]

Replacement in client/src/Aftok/Api/Json.purs at line 83 [8.22]

Replacement in client/src/Aftok/Api/Json.purs at line 86 [8.22]

Replacement in client/src/Aftok/Api/Json.purs at line 91 [8.22]

Replacement in client/src/Aftok/Api/Project.purs at line 7 [8.2899]

Deletion in client/src/Aftok/Api/Project.purs at line 9 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 17 [8.2899]

Insertion in client/src/Aftok/Api/Project.purs at line 19 [8.2899]

Insertion in client/src/Aftok/Api/Project.purs at line 24 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 33 [8.2899]

Insertion in client/src/Aftok/Api/Project.purs at line 81 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 92 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 94 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 102 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 115 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 125 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 128 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 138 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 143 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 145 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 158 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 163 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 175 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 179 [8.2899]

Replacement in client/src/Aftok/Api/Project.purs at line 183 [8.2899]

Deletion in client/src/Aftok/Api/Project.purs at line 191 [8.2899]

Insertion in client/src/Aftok/Api/Recaptcha.js at line 10 [5.3046]

Replacement in client/src/Aftok/Api/Recaptcha.purs at line 5 [5.3287]

Insertion in client/src/Aftok/Api/Recaptcha.purs at line 16 [5.3287]

Insertion in client/src/Aftok/Api/Recaptcha.purs at line 20 [5.3287]

Replacement in client/src/Aftok/Api/Timeline.purs at line 191 [11.18]

Replacement in client/src/Aftok/Api/Timeline.purs at line 203 [11.18]

Replacement in client/src/Aftok/Api/Timeline.purs at line 247 [11.18]

Replacement in client/src/Aftok/Api/Timeline.purs at line 257 [11.18]

Deletion in client/src/Aftok/Api/Types.purs at line 18 [8.5791]

Replacement in client/src/Aftok/Overview.purs at line 20 [14.91]

Replacement in client/src/Aftok/Overview.purs at line 63 [14.91]