delete nodes, refactor scripts

gray background, one column on small devices
This commit is contained in:
DieMyst 2020-12-07 13:56:36 +03:00
parent ed1d9b72b9
commit 0bbc73c1b5
6 changed files with 52 additions and 49 deletions

View File

@ -3,29 +3,15 @@ module AirScripts.GetAll exposing (..)
import Air exposing (Air, callBI, fold, next, par, relayEvent, seq, set) import Air exposing (Air, callBI, fold, next, par, relayEvent, seq, set)
import Json.Encode exposing (list, string) import Json.Encode exposing (list, string)
air : String -> String -> List String -> Air askRelayScript : Air
air peerId relayId peers = askRelayScript =
let
clientIdSet =
set "clientId" <| string peerId
relayIdSet =
set "relayId" <| string relayId
peersSet =
set "knownPeers" <| list string peers
askRelay = (\innerAir ->
par
(seq (seq
(callBI "relayId" ( "op", "identity" ) [] Nothing) (callBI "relayId" ( "op", "identity" ) [] Nothing)
(askAllAndSend "relayId") (askAllAndSend "relayId")
) )
innerAir
)
askPeers = (\innerAir -> askPeersScript : Air
par askPeersScript =
(fold "knownPeers" "p" <| (fold "knownPeers" "p" <|
par par
(seq (seq
@ -34,10 +20,9 @@ air peerId relayId peers =
) )
(next "p") (next "p")
) )
innerAir
)
findAndAskNeighbours = findAndAskNeighbours : Air
findAndAskNeighbours =
seq seq
(callBI "relayId" ( "op", "identity" ) [] Nothing) (callBI "relayId" ( "op", "identity" ) [] Nothing)
(seq (seq
@ -55,6 +40,29 @@ air peerId relayId peers =
(next "n") (next "n")
)) ))
air : String -> String -> List String -> Air
air peerId relayId peers =
let
clientIdSet =
set "clientId" <| string peerId
relayIdSet =
set "relayId" <| string relayId
peersSet =
set "knownPeers" <| list string peers
askRelay = (\innerAir ->
par
askRelayScript
innerAir
)
askPeers = (\innerAir ->
par
askPeersScript
innerAir
)
in in
clientIdSet <| relayIdSet <| peersSet <| (askRelay <| askPeers <| findAndAskNeighbours) clientIdSet <| relayIdSet <| peersSet <| (askRelay <| askPeers <| findAndAskNeighbours)

View File

@ -35,7 +35,7 @@ view model =
viewService : BlueprintInfo -> Html msg viewService : BlueprintInfo -> Html msg
viewService blueprint = viewService blueprint =
div [ classes "fl w-third pr3 lucida" ] div [ classes "fl w-100 w-third-ns pr3 lucida" ]
[ a [ attribute "href" ("/blueprint/" ++ blueprint.id), classes "fl w-100 bg-white black mw6 mr3 mb3 ph3 hide-child pa2 br3 element-box ba b--white bw1 no-underline" ] [ a [ attribute "href" ("/blueprint/" ++ blueprint.id), classes "fl w-100 bg-white black mw6 mr3 mb3 ph3 hide-child pa2 br3 element-box ba b--white bw1 no-underline" ]
[ div [ classes "w-100 mb2 pt1 b" ] [ text blueprint.name ] [ div [ classes "w-100 mb2 pt1 b" ] [ text blueprint.name ]
, div [ classes "w-100 mb4 f7" ] [ text "By ", span [classes "b lucida-in"] [text blueprint.author] ] , div [ classes "w-100 mb4 f7" ] [ text "By ", span [classes "b lucida-in"] [text blueprint.author] ]

View File

@ -59,7 +59,7 @@ view modules =
viewService : ModuleShortInfo -> Html msg viewService : ModuleShortInfo -> Html msg
viewService moduleInfo = viewService moduleInfo =
div [ classes "fl w-third pr3" ] div [ classes "fl w-100 w-third-ns pr3" ]
[ a [ attribute "href" ("/module/" ++ moduleInfo.moduleInfo.name), classes "fl w-100 bg-white black mw6 mr2 mb3 ph3 hide-child pa2 br3 element-box ba b--white bw1" ] [ a [ attribute "href" ("/module/" ++ moduleInfo.moduleInfo.name), classes "fl w-100 bg-white black mw6 mr2 mb3 ph3 hide-child pa2 br3 element-box ba b--white bw1" ]
[ p [ classes "tl di" ] [ div [ classes "fl b w-100 mb1 lucida" ] [ b [] [text moduleInfo.moduleInfo.name ] ], div [ classes "fl w-100 mt1 lucida gray" ] [ instancesText moduleInfo.instanceNumber ] ] [ p [ classes "tl di" ] [ div [ classes "fl b w-100 mb1 lucida" ] [ b [] [text moduleInfo.moduleInfo.name ] ], div [ classes "fl w-100 mt1 lucida gray" ] [ instancesText moduleInfo.instanceNumber ] ]
] ]

View File

@ -40,7 +40,8 @@ body model =
layout <| layout <|
List.concat List.concat
[ [ header [ classes "w-100" ] [ [ header [ classes "w-100" ]
[ div [ classes "fl pa2 pb1 bg-white w-100 one-edge-shadow" ] [ div [ classes "w-100 fl pa2 pb1 bg-white one-edge-shadow" ]
[ div [ classes "mw8-ns center ph3"]
[ div [ classes "fl mv1 pl3", style "max-width" "96px" ] [ div [ classes "fl mv1 pl3", style "max-width" "96px" ]
[ a [ attribute "href" "/" ] [ a [ attribute "href" "/" ]
[ img [ classes "v-mid dib mw-100 h-auto", attribute "src" "/images/logo_new.svg" ] [] [ img [ classes "v-mid dib mw-100 h-auto", attribute "src" "/images/logo_new.svg" ] []
@ -50,14 +51,15 @@ body model =
] ]
] ]
] ]
, [ div [ classes "w-100 pa4 pt3 mt4" ] [ routeView model model.page ] ] ]
, [ div [ classes "mw8-ns center w-100 pa4 pt3 mt4" ] [ routeView model model.page ] ]
] ]
layout : List (Html Msg) -> Html Msg layout : List (Html Msg) -> Html Msg
layout elms = layout elms =
div [ classes "mw8-ns center w-100" ] div [ classes "center w-100" ]
[ div [ classes "fl w-100 bg-near-white" ] [ div [ classes "fl w-100" ]
([] ([]
++ elms ++ elms
) )

View File

@ -53,10 +53,6 @@ export const faasNet: Node[] = [
multiaddr: '/ip4/165.227.164.206/tcp/9990/ws/p2p/12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz', multiaddr: '/ip4/165.227.164.206/tcp/9990/ws/p2p/12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz',
peerId: '12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz', peerId: '12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz',
}, },
{
multiaddr: '/ip4/165.227.164.206/tcp/9100/ws/p2p/12D3KooWPnLxnY71JDxvB3zbjKu9k1BCYNthGZw6iGrLYsR1RnWM',
peerId: '12D3KooWPnLxnY71JDxvB3zbjKu9k1BCYNthGZw6iGrLYsR1RnWM',
},
{ {
multiaddr: '/ip4/138.197.189.50/tcp/9001/ws/p2p/12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er', multiaddr: '/ip4/138.197.189.50/tcp/9001/ws/p2p/12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er',
peerId: '12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er', peerId: '12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er',
@ -104,10 +100,6 @@ export const faasNetHttps: Node[] = [
multiaddr: '/dns4/net01.fluence.dev/tcp/19990/wss/p2p/12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz', multiaddr: '/dns4/net01.fluence.dev/tcp/19990/wss/p2p/12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz',
peerId: '12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz', peerId: '12D3KooWMhVpgfQxBLkQkJed8VFNvgN4iE6MD7xCybb1ZYWW2Gtz',
}, },
{
multiaddr: '/dns4/net01.fluence.dev/tcp/19100/wss/p2p/12D3KooWPnLxnY71JDxvB3zbjKu9k1BCYNthGZw6iGrLYsR1RnWM',
peerId: '12D3KooWPnLxnY71JDxvB3zbjKu9k1BCYNthGZw6iGrLYsR1RnWM',
},
{ {
multiaddr: '/dns4/net02.fluence.dev/tcp/19001/wss/p2p/12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er', multiaddr: '/dns4/net02.fluence.dev/tcp/19001/wss/p2p/12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er',
peerId: '12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er', peerId: '12D3KooWHk9BjDQBUqnavciRPhAYFvqKBe4ZiPPvde7vDaqgn5er',

View File

@ -11,6 +11,7 @@
body { body {
font-family: 'Roboto Mono', monospace; font-family: 'Roboto Mono', monospace;
background-color: #F4F4F4;
} }
h1 { h1 {