fix client

This commit is contained in:
DieMyst 2020-11-25 16:27:26 +03:00
parent ee25bcd78d
commit a23e64013e
8 changed files with 43 additions and 15 deletions

6
package-lock.json generated
View File

@ -6826,9 +6826,9 @@
"dev": true "dev": true
}, },
"fluence": { "fluence": {
"version": "0.7.83", "version": "0.7.85",
"resolved": "https://registry.npmjs.org/fluence/-/fluence-0.7.83.tgz", "resolved": "https://registry.npmjs.org/fluence/-/fluence-0.7.85.tgz",
"integrity": "sha512-3AQzIBqyrGeFo2RkiUa0gI5wTJ2mK7Ik1+b0hYd57ugImMSMzQzl/htRx5R5HGpqRWdtJeyGM8GIfTd1Awwi7w==", "integrity": "sha512-qN0mBYgF6Y09Z+qhxnfXyTqmgY++eyWYOUHsRtsmzdTWQuFhlgenLg3861tG9sGCaOUJTfSrrTcdYluC1bgrAw==",
"requires": { "requires": {
"@fluencelabs/aquamarine-stepper": "0.0.13", "@fluencelabs/aquamarine-stepper": "0.0.13",
"async": "3.2.0", "async": "3.2.0",

View File

@ -19,7 +19,7 @@
}, },
"homepage": "https://github.com/fluencelabs/fluence-admin#readme", "homepage": "https://github.com/fluencelabs/fluence-admin#readme",
"dependencies": { "dependencies": {
"fluence": "0.7.83", "fluence": "0.7.85",
"tachyons": "^4.12.0" "tachyons": "^4.12.0"
}, },
"devDependencies": { "devDependencies": {

View File

@ -3,12 +3,12 @@ module HubPage.View exposing (..)
import Html exposing (Html) import Html exposing (Html)
import HubPage.Model exposing (Model) import HubPage.Model exposing (Model)
import HubPage.Msg exposing (Msg) import HubPage.Msg exposing (Msg)
import Modules.Model exposing (Module) import Modules.Model exposing (ModuleInfo)
import Modules.View import Modules.View
import Services.Model exposing (Service) import Services.Model exposing (ServiceInfo)
import Services.View import Services.View
servicesExample : List Service servicesExample : List ServiceInfo
servicesExample = servicesExample =
[ { name = "SQLite", author = "Company Inc", instanceNumber = 2 } [ { name = "SQLite", author = "Company Inc", instanceNumber = 2 }
, { name = "Redis", author = "Roga Kopita", instanceNumber = 3 } , { name = "Redis", author = "Roga Kopita", instanceNumber = 3 }
@ -16,7 +16,7 @@ servicesExample =
, { name = "Imagemagick", author = "Magic Corp", instanceNumber = 0 } , { name = "Imagemagick", author = "Magic Corp", instanceNumber = 0 }
] ]
modulesExample : List Module modulesExample : List ModuleInfo
modulesExample = modulesExample =
[ { name = "sqlite3", instanceNumber = 2 } [ { name = "sqlite3", instanceNumber = 2 }
, { name = "ipfs_adapter", instanceNumber = 3 } , { name = "ipfs_adapter", instanceNumber = 3 }

View File

@ -1,10 +1,10 @@
module Modules.Model exposing (..) module Modules.Model exposing (..)
type alias Module = type alias ModuleInfo =
{ name: String { name: String
, instanceNumber: Int , instanceNumber: Int
} }
type alias Model = type alias Model =
{ modules : List Module { modules : List ModuleInfo
} }

View File

@ -1,7 +1,7 @@
module Modules.View exposing (..) module Modules.View exposing (..)
import Html exposing (Html) import Html exposing (Html)
import Modules.Model exposing (Model, Module) import Modules.Model exposing (Model, ModuleInfo)
import Palette exposing (classes) import Palette exposing (classes)
import Utils.Utils exposing (instancesText) import Utils.Utils exposing (instancesText)
view : Model -> Html msg view : Model -> Html msg
@ -11,7 +11,7 @@ view model =
in in
Html.div [classes "cf ph2-ns"] modulesView Html.div [classes "cf ph2-ns"] modulesView
viewService : Module -> Html msg viewService : ModuleInfo -> Html msg
viewService service = viewService service =
Html.div [classes "fl w-third-ns pa2"] Html.div [classes "fl w-third-ns pa2"]
[ Html.div [classes "fl w-100 br2 ba solid pa2 mh2"] [ Html.div [classes "fl w-100 br2 ba solid pa2 mh2"]

View File

@ -1,11 +1,38 @@
module Services.Model exposing (..) 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 = type alias Service =
{ serviceId: String
, blueprintId: String
, interface: Interface
}
type alias ServiceInfo =
{ name: String, { name: String,
author: String, author: String,
instanceNumber: Int instanceNumber: Int
} }
type alias Model = type alias Model =
{ services : List Service { services : List ServiceInfo
} }

View File

@ -2,7 +2,7 @@ module Services.View exposing (..)
import Html exposing (Html) import Html exposing (Html)
import Palette exposing (classes) import Palette exposing (classes)
import Services.Model exposing (Model, Service) import Services.Model exposing (Model, ServiceInfo)
import Utils.Utils exposing (instancesText) import Utils.Utils exposing (instancesText)
view : Model -> Html msg view : Model -> Html msg
@ -12,7 +12,7 @@ view model =
in in
Html.div [classes "cf ph2-ns"] servicesView Html.div [classes "cf ph2-ns"] servicesView
viewService : Service -> Html msg viewService : ServiceInfo -> Html msg
viewService service = viewService service =
Html.div [classes "fl w-third-ns pa2"] Html.div [classes "fl w-third-ns pa2"]
[ Html.div [classes "fl w-100 br2 ba solid ma2 pa3"] [ Html.div [classes "fl w-100 br2 ba solid ma2 pa3"]

View File

@ -48,6 +48,7 @@ function genFlags(peerId: string): any {
let eventService = new ServiceOne("event", (fnName, args: any[]) => { let eventService = new ServiceOne("event", (fnName, args: any[]) => {
console.log("event service called: ", fnName) console.log("event service called: ", fnName)
console.log("from: ", args[0])
console.log("event service args: ", args) console.log("event service args: ", args)
app.ports.eventReceiver.send({name: fnName, args}) app.ports.eventReceiver.send({name: fnName, args})