WIP

Author: Marcelo Amancio de Lima Santos

src/Apps/Browser/Config.elm

@@ -6,11 +6,11 @@ import Core.Flags as Core
 import Utils.Core exposing (..)
 import Apps.Params as AppParams exposing (AppParams)
 import Game.Account.Database.Models exposing (HackedServers)
-import Game.Account.Finances.Requests.Login as LoginRequest
-import Game.Account.Finances.Requests.Transfer as TransferRequest
+import Game.Account.Finances.Models as Finances exposing (AccountNumber)
+import Game.Bank.Models as Bank
 import Game.Meta.Types.Desktop.Apps as DesktopApp exposing (DesktopApp)
 import Game.Meta.Types.Context exposing (Context(..))
-import Game.Meta.Types.Network as Network exposing (NIP)
+import Game.Meta.Types.Network as Network exposing (NIP, IP)
 import Game.Meta.Types.Desktop.Apps exposing (Reference, Requester)
 import Game.Servers.Models as Servers
 import Game.Servers.Shared as Servers exposing (CId)
@@ -37,6 +37,7 @@ type alias Config msg =
     , activeServer : ( CId, Servers.Server )
     , activeGateway : ( CId, Servers.Server )
     , hackedServers : HackedServers
+    , bank : Bank.Model
     , onNewApp : DesktopApp -> Maybe Context -> Maybe AppParams -> CId -> msg
     , onOpenApp : AppParams -> CId -> msg
     , onSetContext : Context -> msg
@@ -45,18 +46,28 @@ type alias Config msg =
     , onSetEndpoint : Maybe CId -> msg
     , onNewPublicDownload : NIP -> Download.StorageId -> Filesystem.FileEntry -> msg
     , onNewBruteforceProcess : Network.IP -> msg
-    , onBankAccountLogin : LoginRequest.Payload -> Requester -> msg
-    , onBankAccountTransfer : TransferRequest.Payload -> Requester -> msg
+    , onBankAccountLogin : Finances.AccountId -> String -> Requester -> msg
+    , onBankAccountLoginToken : Finances.AccountId -> String -> Requester -> msg
+    , onBankAccountChangePass : String -> Requester -> msg
+    , onBankAccountCreate : Finances.AtmId -> Requester -> msg
+    , onBankAccountClose : String -> Requester -> msg
+    , onBankAccountLogout : String -> Requester -> msg
+    , onBankResync : String -> Requester -> msg
+    , onBankAccountTransfer : String -> IP -> AccountNumber -> Int -> Requester -> msg
     , menuAttr : ContextMenuAttribute msg
     }
 
 
 bankConfig : Config msg -> Bank.Config msg
 bankConfig config =
     { toMsg = BankMsg >> ActiveTabMsg >> config.toMsg
-    , onLogin = BankLogin >> config.toMsg
-    , onTransfer = BankTransfer >> config.toMsg
-    , onLogout = BankLogout |> config.toMsg
+    , batchMsg = config.batchMsg
+    , bank = config.bank
+    , onLogin = BankLogin >>> config.toMsg
+    , onLoginToken = BankLoginToken >>> config.toMsg
+    , onTransfer = BankTransfer >>>>> config.toMsg
+    , onChangePassword = BankChangePass >> config.toMsg
+    , onLogout = BankLogout >> config.toMsg
     }
 
 

src/Apps/Browser/Messages.elm

@@ -1,8 +1,7 @@
 module Apps.Browser.Messages exposing (..)
 
-import Game.Account.Finances.Requests.Login as LoginRequest
-import Game.Account.Finances.Requests.Transfer as TransferRequest
-import Game.Meta.Types.Network as Network exposing (NIP)
+import Game.Account.Finances.Models as Finances
+import Game.Meta.Types.Network as Network exposing (NIP, IP)
 import Game.Servers.Shared exposing (StorageId)
 import Game.Servers.Filesystem.Shared as Filesystem
 import Game.Servers.Requests.Browse as BrowseRequest
@@ -29,9 +28,11 @@ type Msg
     | ReqDownload Network.NIP Filesystem.FileEntry StorageId
     | PublicDownload NIP Filesystem.FileEntry
     | HandlePasswordAcquired PasswordAcquired.Data
-    | BankLogin LoginRequest.Payload
-    | BankTransfer TransferRequest.Payload
-    | BankLogout
+    | BankLogin Finances.AccountId String
+    | BankLoginToken Finances.AccountId String
+    | BankTransfer String IP Finances.AccountNumber Int
+    | BankChangePass String
+    | BankLogout String
 
 
 type TabMsg
@@ -44,8 +45,8 @@ type TabMsg
     | Cracked NIP String
     | AnyMap NIP
     | Login NIP String
-    | HandleBankLogin LoginRequest.Data
-    | HandleBankTransfer TransferRequest.Data
+    | HandleBankLogin String
+    | HandleBankTransfer String
     | HandleLoginFailed
     | SelectEndpoint
     | NewApp DesktopApp

src/Apps/Browser/Pages/Bank/Config.elm

@@ -1,13 +1,18 @@
 module Apps.Browser.Pages.Bank.Config exposing (Config)
 
-import Game.Account.Finances.Requests.Login as LoginRequest
-import Game.Account.Finances.Requests.Transfer as TransferRequest
+import Game.Account.Finances.Models exposing (AccountId, AccountNumber)
+import Game.Bank.Models as Bank
+import Game.Meta.Types.Network exposing (IP)
 import Apps.Browser.Pages.Bank.Messages exposing (..)
 
 
 type alias Config msg =
     { toMsg : Msg -> msg
-    , onLogin : LoginRequest.Payload -> msg
-    , onTransfer : TransferRequest.Payload -> msg
-    , onLogout : msg
+    , batchMsg : List msg -> msg
+    , bank : Bank.Model
+    , onLogin : AccountId -> String -> msg
+    , onLoginToken : AccountId -> String -> msg
+    , onChangePassword : String -> msg
+    , onTransfer : String -> IP -> AccountNumber -> Int -> msg
+    , onLogout : String -> msg
     }

src/Apps/Browser/Pages/Bank/Messages.elm

@@ -1,13 +1,13 @@
 module Apps.Browser.Pages.Bank.Messages exposing (Msg(..))
 
-import Game.Account.Finances.Shared exposing (BankAccountData)
-
 
 type Msg
-    = HandleLogin BankAccountData
+    = HandleLogin String
     | HandleLoginError
-    | HandleTransfer
+    | SetTransfer
     | HandleTransferError
+    | SetLoading
+    | Logout
     | UpdateLoginField String
     | UpdatePasswordField String
     | UpdateTransferBankField String