Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Embeddable ParityBar (#4222) #4287

Merged
merged 1 commit into from
Jan 24, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 120 additions & 0 deletions js/src/embed.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
// This file is part of Parity.

// Parity is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.

// Parity is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import 'babel-polyfill';
import 'whatwg-fetch';

import es6Promise from 'es6-promise';
es6Promise.polyfill();

import React from 'react';
import ReactDOM from 'react-dom';
import { AppContainer } from 'react-hot-loader';

import injectTapEventPlugin from 'react-tap-event-plugin';

import SecureApi from '~/secureApi';
import ContractInstances from '~/contracts';

import { initStore } from '~/redux';
import ContextProvider from '~/ui/ContextProvider';
import muiTheme from '~/ui/Theme';

import { patchApi } from '~/util/tx';
import { setApi } from '~/redux/providers/apiActions';

import '~/environment';

import '../assets/fonts/Roboto/font.css';
import '../assets/fonts/RobotoMono/font.css';

injectTapEventPlugin();

import ParityBar from '~/views/ParityBar';

// Test transport (std transport should be provided as global object)
class FakeTransport {
constructor () {
console.warn('Secure Transport not provided. Falling back to FakeTransport');
}

execute (method, ...params) {
console.log('Calling', method, params);
return Promise.reject('not connected');
}

on () {
}
}

class FrameSecureApi extends SecureApi {
constructor (transport) {
super('', null, () => {
return transport;
});
}

connect () {
// Do nothing - this API does not need connecting
this.emit('connecting');
// Fire connected event with some delay.
setTimeout(() => {
this.emit('connected');
});
}

needsToken () {
return false;
}

isConnecting () {
return false;
}

isConnected () {
return true;
}
}

const api = new FrameSecureApi(window.secureTransport || new FakeTransport());

patchApi(api);
ContractInstances.create(api);

const store = initStore(api, null, true);

store.dispatch({ type: 'initAll', api });
store.dispatch(setApi(api));

window.secureApi = api;

const app = (
<ParityBar dapp externalLink={ 'http://127.0.0.1:8180' } />
);
const container = document.querySelector('#container');

ReactDOM.render(
<AppContainer>
<ContextProvider
api={ api }
muiTheme={ muiTheme }
store={ store }
>
{ app }
</ContextProvider>
</AppContainer>,
container
);
2 changes: 1 addition & 1 deletion js/src/index.ejs
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
</head>
<body>
<div id="container">
<div class="loading">Loading</span>
<div class="loading">Loading</div>
</div>
<script src="vendor.js"></script>
</body>
21 changes: 12 additions & 9 deletions js/src/redux/middleware.js
Original file line number Diff line number Diff line change
@@ -25,24 +25,27 @@ import CertificationsMiddleware from './providers/certifications/middleware';
import ChainMiddleware from './providers/chainMiddleware';
import RegistryMiddleware from './providers/registry/middleware';

export default function (api, browserHistory) {
export default function (api, browserHistory, forEmbed = false) {
const errors = new ErrorsMiddleware();
const signer = new SignerMiddleware(api);
const settings = new SettingsMiddleware();
const status = statusMiddleware();
const certifications = new CertificationsMiddleware();
const routeMiddleware = routerMiddleware(browserHistory);
const chain = new ChainMiddleware();
const registry = new RegistryMiddleware(api);

const middleware = [
settings.toMiddleware(),
signer.toMiddleware(),
errors.toMiddleware(),
certifications.toMiddleware(),
chain.toMiddleware(),
registry
chain.toMiddleware()
];

if (!forEmbed) {
const certifications = new CertificationsMiddleware().toMiddleware();
const registry = new RegistryMiddleware(api);

middleware.push(certifications, registry);
}

const status = statusMiddleware();
const routeMiddleware = browserHistory ? routerMiddleware(browserHistory) : [];

return middleware.concat(status, routeMiddleware, thunk);
}
4 changes: 2 additions & 2 deletions js/src/redux/store.js
Original file line number Diff line number Diff line change
@@ -33,9 +33,9 @@ const storeCreation = window.devToolsExtension
? window.devToolsExtension()(createStore)
: createStore;

export default function (api, browserHistory) {
export default function (api, browserHistory, forEmbed = false) {
const reducers = initReducers();
const middleware = initMiddleware(api, browserHistory);
const middleware = initMiddleware(api, browserHistory, forEmbed);
const store = applyMiddleware(...middleware)(storeCreation)(reducers);

BalancesProvider.instantiate(store, api);
17 changes: 11 additions & 6 deletions js/src/secureApi.js
Original file line number Diff line number Diff line change
@@ -15,12 +15,12 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import { uniq } from 'lodash';
import store from 'store';

import Api from './api';
import { LOG_KEYS, getLogger } from '~/config';

const log = getLogger(LOG_KEYS.Signer);
const sysuiToken = window.localStorage.getItem('sysuiToken');

export default class SecureApi extends Api {
_isConnecting = false;
@@ -31,13 +31,18 @@ export default class SecureApi extends Api {
_dappsPort = 8080;
_signerPort = 8180;

constructor (url, nextToken) {
const transport = new Api.Transport.Ws(url, sysuiToken, false);
static getTransport (url, sysuiToken) {
return new Api.Transport.Ws(url, sysuiToken, false);
}

constructor (url, nextToken, getTransport = SecureApi.getTransport) {
const sysuiToken = store.get('sysuiToken');
const transport = getTransport(url, sysuiToken);

super(transport);

this._url = url;

// Try tokens from localstorage, from hash and 'initial'
// Try tokens from localStorage, from hash and 'initial'
this._tokens = uniq([sysuiToken, nextToken, 'initial'])
.filter((token) => token)
.map((token) => ({ value: token, tried: false }));
@@ -308,7 +313,7 @@ export default class SecureApi extends Api {
}

_saveToken (token) {
window.localStorage.setItem('sysuiToken', token);
store.set('sysuiToken', token);
}

/**
6 changes: 4 additions & 2 deletions js/src/ui/Tooltips/reducers.js
Original file line number Diff line number Diff line change
@@ -14,13 +14,15 @@
// You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import store from 'store';

const LS_KEY = 'tooltips';

let currentId = -1;
let maxId = 0;

function closeTooltips (state, action) {
window.localStorage.setItem(LS_KEY, '{"state":"off"}');
store.set(LS_KEY, '{"state":"off"}');

currentId = -1;

@@ -41,7 +43,7 @@ function newTooltip (state, action) {
}

function nextTooltip (state, action) {
const hideTips = window.localStorage.getItem(LS_KEY);
const hideTips = store.get(LS_KEY);

currentId = hideTips
? -1
9 changes: 3 additions & 6 deletions js/src/views/Application/store.js
Original file line number Diff line number Diff line change
@@ -15,17 +15,14 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>.

import { action, observable } from 'mobx';
import store from 'store';

export default class Store {
@observable firstrunVisible = false;

constructor (api) {
this._api = api;

const value = window.localStorage.getItem('showFirstRun');
if (value) {
this.firstrunVisible = JSON.parse(value);
}
this.firstrunVisible = store.get('showFirstRun');

this._checkAccounts();
}
@@ -36,7 +33,7 @@ export default class Store {

@action toggleFirstrun = (visible = false) => {
this.firstrunVisible = visible;
window.localStorage.setItem('showFirstRun', JSON.stringify(!!visible));
store.set('showFirstRun', !!visible);
}

_checkAccounts () {
Loading