133c307 · bridge · git.iko.soy

README.md+4

compare with master

unifiedsplit

@@ -104,6 +104,10 @@ Chrome by pasting the following into the URL bar:

104chrome://flags/#allow-insecure-localhost

105```

106

107+In Firefox, you may need to allow connecting to the unsecured local node

108+websocket. Do this by going to `about:config` and setting the

109+`network.websocket.allowInsecureFromHTTPS` flag to `true`.

110+

107Additionally you need to run with the `HTTPS` environment variable set to

111Additionally you need to run with the `HTTPS` environment variable set to

108`true`. Note that `npm run pilot` will handle this automatically.

112`true`. Note that `npm run pilot` will handle this automatically.

109

113

src/Bridge.js+6−1

@@ -76,6 +76,12 @@ class Bridge extends React.Component {

76 }

77

78 componentDidMount() {

79+ window.history.pushState(null, null, null);

80+

81+ window.onpopstate = (e) => {

82+ window.history.pushState(null, null, null);

83+ this.popRoute();

84+ }

79

85

80 // NB (jtobin):

86 // NB (jtobin):

81 //

87 //

@@ -275,7 +281,6 @@ class Bridge extends React.Component {

275

281

276 <Footer />

282 <Footer />

277 </Col>

283 </Col>

278− <Col className='col-md-1' />

279 </Row>

284 </Row>

280 </Container>

285 </Container>

281 )

286 )

src/components/DropdownItem.js+1−1

@@ -12,7 +12,7 @@ const DropdownItem = props => {

12 <button

13 disabled={props.disabled}

14 style={props.style}

15− className={`h-10 m-0 p-0 ph-2 bg-white flex items-start bs-solid brw-2 blw-2 btw-0 bbw-0 sans ${_disabled} ${props.className}`}

15+ className={`h-10 m-0 p-0 ph-2 bg-white flex align-center items-start bs-solid brw-2 blw-2 btw-0 bbw-0 sans ${_disabled} ${props.className}`}

16 onClick={props.onClick}>

17 { props.children }

18 </button>

src/components/RenderedPoint.js+12−2

@@ -20,10 +20,20 @@ const RenderedPoint = (props) => {

20

21 return (

22 <Col className={'col-md-3 mb-8'} key={ `rendered-${point}` }>

23− <div key={ `rendered-sigil-${point}` }>

23+ <div key={ `rendered-sigil-${point}` }

24+ className="clickable"

25+ onClick={ () => {

26+ setPointCursor(Maybe.Just(point))

27+ routeHandler(ROUTE_NAMES.SHIP)

28+ }}>

24 { sigil }

29 { sigil }

25 </div>

30 </div>

26− <div key={ `rendered-name-${point}` }>

31+ <div key={ `rendered-name-${point}` }

32+ className="clickable"

33+ onClick={ () => {

34+ setPointCursor(Maybe.Just(point))

35+ routeHandler(ROUTE_NAMES.SHIP)

36+ }}>

27 <code>{ name }</code>

37 <code>{ name }</code>

28 </div>

38 </div>

29 <div key={ `rendered-deets-${point}` }>

39 <div key={ `rendered-deets-${point}` }>

src/style/extend.css+8

@@ -455,3 +455,11 @@ code {

455.align-baseline {

456 align-items: baseline;

457}

458+

459+.align-center {

460+ align-items: center;

461+}

462+

463+.clickable {

464+ cursor: pointer;

465+}

src/views/Network.js+1−1

@@ -45,7 +45,7 @@ class Network extends React.Component {

45 if (network === NETWORK_NAMES.LOCAL) {

46 setNetworkType(network)

47

48− const endpoint = 'wss://localhost:8545'

48+ const endpoint = 'ws://localhost:8545'

49 const provider = new Web3.providers.WebsocketProvider(endpoint)

50 const web3 = new Web3(provider)

51 const contracts = azimuth.initContracts(web3, CONTRACT_ADDRESSES.DEV)