diff --git a/package-lock.json b/package-lock.json index a937d1a..2a6b894 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6826,9 +6826,9 @@ "dev": true }, "fluence": { - "version": "0.7.83", - "resolved": "https://registry.npmjs.org/fluence/-/fluence-0.7.83.tgz", - "integrity": "sha512-3AQzIBqyrGeFo2RkiUa0gI5wTJ2mK7Ik1+b0hYd57ugImMSMzQzl/htRx5R5HGpqRWdtJeyGM8GIfTd1Awwi7w==", + "version": "0.7.85", + "resolved": "https://registry.npmjs.org/fluence/-/fluence-0.7.85.tgz", + "integrity": "sha512-qN0mBYgF6Y09Z+qhxnfXyTqmgY++eyWYOUHsRtsmzdTWQuFhlgenLg3861tG9sGCaOUJTfSrrTcdYluC1bgrAw==", "requires": { "@fluencelabs/aquamarine-stepper": "0.0.13", "async": "3.2.0", diff --git a/package.json b/package.json index 9b24440..398448e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ }, "homepage": "https://github.com/fluencelabs/fluence-admin#readme", "dependencies": { - "fluence": "0.7.83", + "fluence": "0.7.85", "tachyons": "^4.12.0" }, "devDependencies": { diff --git a/src/HubPage/View.elm b/src/HubPage/View.elm index 6f5b348..5d02681 100644 --- a/src/HubPage/View.elm +++ b/src/HubPage/View.elm @@ -3,12 +3,12 @@ module HubPage.View exposing (..) import Html exposing (Html) import HubPage.Model exposing (Model) import HubPage.Msg exposing (Msg) -import Modules.Model exposing (Module) +import Modules.Model exposing (ModuleInfo) import Modules.View -import Services.Model exposing (Service) +import Services.Model exposing (ServiceInfo) import Services.View -servicesExample : List Service +servicesExample : List ServiceInfo servicesExample = [ { name = "SQLite", author = "Company Inc", instanceNumber = 2 } , { name = "Redis", author = "Roga Kopita", instanceNumber = 3 } @@ -16,7 +16,7 @@ servicesExample = , { name = "Imagemagick", author = "Magic Corp", instanceNumber = 0 } ] -modulesExample : List Module +modulesExample : List ModuleInfo modulesExample = [ { name = "sqlite3", instanceNumber = 2 } , { name = "ipfs_adapter", instanceNumber = 3 } diff --git a/src/Modules/Model.elm b/src/Modules/Model.elm index eb1abeb..f427f8d 100644 --- a/src/Modules/Model.elm +++ b/src/Modules/Model.elm @@ -1,10 +1,10 @@ module Modules.Model exposing (..) -type alias Module = +type alias ModuleInfo = { name: String , instanceNumber: Int } type alias Model = - { modules : List Module + { modules : List ModuleInfo } \ No newline at end of file diff --git a/src/Modules/View.elm b/src/Modules/View.elm index 076c226..588e859 100644 --- a/src/Modules/View.elm +++ b/src/Modules/View.elm @@ -1,7 +1,7 @@ module Modules.View exposing (..) import Html exposing (Html) -import Modules.Model exposing (Model, Module) +import Modules.Model exposing (Model, ModuleInfo) import Palette exposing (classes) import Utils.Utils exposing (instancesText) view : Model -> Html msg @@ -11,7 +11,7 @@ view model = in Html.div [classes "cf ph2-ns"] modulesView -viewService : Module -> Html msg +viewService : ModuleInfo -> Html msg viewService service = Html.div [classes "fl w-third-ns pa2"] [ Html.div [classes "fl w-100 br2 ba solid pa2 mh2"] diff --git a/src/Services/Model.elm b/src/Services/Model.elm index 109fbd0..b9e8dfb 100644 --- a/src/Services/Model.elm +++ b/src/Services/Model.elm @@ -1,11 +1,38 @@ module Services.Model exposing (..) +type alias Argument = + { name: String + , argType: String } + +type alias Signature = + { arguments: List Argument + , name: String + , outputTypes: String + } + +type alias Module = + { functionSignatures: List Signature + + } + +type alias Interface = + { modules: List Module + + } + type alias Service = + { serviceId: String + , blueprintId: String + , interface: Interface + + } + +type alias ServiceInfo = { name: String, author: String, instanceNumber: Int } type alias Model = - { services : List Service + { services : List ServiceInfo } \ No newline at end of file diff --git a/src/Services/View.elm b/src/Services/View.elm index 51bf704..4698ee4 100644 --- a/src/Services/View.elm +++ b/src/Services/View.elm @@ -2,7 +2,7 @@ module Services.View exposing (..) import Html exposing (Html) import Palette exposing (classes) -import Services.Model exposing (Model, Service) +import Services.Model exposing (Model, ServiceInfo) import Utils.Utils exposing (instancesText) view : Model -> Html msg @@ -12,7 +12,7 @@ view model = in Html.div [classes "cf ph2-ns"] servicesView -viewService : Service -> Html msg +viewService : ServiceInfo -> Html msg viewService service = Html.div [classes "fl w-third-ns pa2"] [ Html.div [classes "fl w-100 br2 ba solid ma2 pa3"] diff --git a/src/index.ts b/src/index.ts index b63d440..2434936 100644 --- a/src/index.ts +++ b/src/index.ts @@ -48,6 +48,7 @@ function genFlags(peerId: string): any { let eventService = new ServiceOne("event", (fnName, args: any[]) => { console.log("event service called: ", fnName) + console.log("from: ", args[0]) console.log("event service args: ", args) app.ports.eventReceiver.send({name: fnName, args})