Fix remaining type errors after addition of login handler.

[?]

Jan 21, 2015, 12:21 AM

VJPT6HDRMJAJD5PT3VOYJYW43ISKLICEHLSDWSROX2XZWO2OFZPQC

Dependencies

[2] BROSTG5K Beginning of modularization of server.
[3] 2Y2QZFVF Switch to more modern cabal2nix-based workflow.
[4] TNR3TEHK Switch to Postgres + snaplet arch compiles.
[5] TCOAKCGG Completed conversion to snap.
[6] WZUHEZSB Start of migration back toward snap.
[7] Z3M53KTL Adrift.
[8] 64VI73NP Server now compiles using abstracted SQLite
[9] RSEB2NFG Replacing Snap with Scotty.
[10] EYGIUUQZ Restore remainder of endpoints to compiling status.
[11] IZEVQF62 Work in progress replacing sqlite with postgres.
[12] ADMKQQGC Initial empty Snap project.
[13] W35DDBFY Factor common JSON conversions up into client lib module.
[14] 7XN3I3QJ Add 'loggedIntervals' endpoint.
[15] EMVTF2IW WIP moving back to snap.
[16] 64C6AWH6 Rename Ananke -> Quixotic, project reboot.

Change contents

edit in server/Main.hs at line 8

[3.5260]→[3.623:643](∅→∅),[3.643]→[3.1110:1165](∅→∅),[3.1165]→[3.2:35](∅→∅)

import Control.Lens
import Control.Monad.Reader
import Control.Monad.State
import qualified Data.Aeson as A
edit in server/Main.hs at line 10

[3.170]→[3.36:52](∅→∅),[3.52]→[3.7590:7624](∅→∅),[3.7590]→[3.7590:7624](∅→∅)

import Data.Map
import Database.PostgreSQL.Simple
edit in server/Main.hs at line 11

[3.184]→[3.2502:2543](∅→∅),[3.256]→[3.2502:2543](∅→∅),[3.919]→[3.2502:2543](∅→∅),[3.2502]→[3.2502:2543](∅→∅),[3.2543]→[3.7625:7661](∅→∅),[3.7661]→[3.53:74](∅→∅)

import Quixotic
import Quixotic.Database
import Quixotic.Database.PostgreSQL
import Quixotic.Json
edit in server/Main.hs at line 12

[3.2567]→[3.1166:1188](∅→∅)

import Quixotic.Users
edit in server/Main.hs at line 22

[3.1226]→[3.1226:1267](∅→∅)

import qualified Snap.Snaplet.Auth as AU
edit in server/Main.hs at line 23

[3.7795]→[3.7795:7823](∅→∅)

import Snap.Snaplet.Session
replacement in server/Main.hs at line 44

[3.8476]→[3.8476:8526](∅→∅)

qdbs <- nestSnaplet "qdb" qdb qdbpgSnapletInit

[3.8476]

[3.8526]

qms <- nestSnaplet "qmodules" qm qdbpgSnapletInit
replacement in server/Main.hs at line 49

[3.8755]→[2.784:823](∅→∅)

addRoutes [ ("login", loginHandler)

[3.8755]

[2.823]

addRoutes [ ("login", loginHandler (const ok))
replacement in server/Main.hs at line 53

[3.8878]→[2.930:1047](∅→∅)

, ("loggedIntervals/:btcAddr", loggedIntervalsHandler qdb)
, ("payouts", payoutsHandler qdb)

[3.8878]

[3.8999]

, ("loggedIntervals/:btcAddr", loggedIntervalsHandler)
, ("payouts", payoutsHandler)
replacement in server/Main.hs at line 56

[3.9014]→[3.9014:9050](∅→∅)

return $ App qdbs sesss pgs auths

[3.9014]

[3.9050]

return $ App qms sesss pgs auths