Home as dapp

This commit is contained in:
Jaco Greeff 2017-04-21 13:14:07 +02:00
parent 23469a99e8
commit 2459501f4e
34 changed files with 175 additions and 74 deletions

View File

@ -0,0 +1,13 @@
[
{
"id": "viewHome",
"url": "viewHome",
"src": "Home",
"name": "Home",
"description": "Display a status of the node, recently accessed applications, accounts and news",
"author": "Parity Team <admin@ethcore.io>",
"version": "2.0.0",
"visible": true,
"secure": true
}
]

View File

@ -69,15 +69,11 @@ export default class Contracts {
return verification; return verification;
} }
static create (api) { static get (api) {
if (instance) { if (!instance) {
return instance; instance = new Contracts(api);
} }
return new Contracts(api);
}
static get () {
return instance; return instance;
} }
} }

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtinsJson from '~/views/Dapps/builtin.json'; import builtinsJson from '~/config/dappsBuiltin.json';
const REGISTER_URLS = { const REGISTER_URLS = {
console: 'https://raw.githubusercontent.com/paritytech/console/3ea0dbfefded359ccdbea37bc4cf350c0aa16948/console.jpeg', console: 'https://raw.githubusercontent.com/paritytech/console/3ea0dbfefded359ccdbea37bc4cf350c0aa16948/console.jpeg',

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtins from '~/views/Dapps/builtin.json'; import builtins from '~/config/dappsBuiltin.json';
const id = 'console'; const id = 'console';
const app = builtins.find((app) => app.url === id); const app = builtins.find((app) => app.url === id);

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtins from '~/views/Dapps/builtin.json'; import builtins from '~/config/dappsBuiltin.json';
const id = 'dappreg'; const id = 'dappreg';
const app = builtins.find((app) => app.url === id); const app = builtins.find((app) => app.url === id);

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtins from '~/views/Dapps/builtin.json'; import builtins from '~/config/dappsBuiltin.json';
const id = 'githubhint'; const id = 'githubhint';
const app = builtins.find((app) => app.url === id); const app = builtins.find((app) => app.url === id);

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtins from '~/views/Dapps/builtin.json'; import builtins from '~/config/dappsBuiltin.json';
const id = 'localtx'; const id = 'localtx';
const app = builtins.find((app) => app.url === id); const app = builtins.find((app) => app.url === id);

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtins from '~/views/Dapps/builtin.json'; import builtins from '~/config/dappsBuiltin.json';
const id = 'registry'; const id = 'registry';
const app = builtins.find((app) => app.url === id); const app = builtins.find((app) => app.url === id);

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtins from '~/views/Dapps/builtin.json'; import builtins from '~/config/dappsBuiltin.json';
const id = 'signaturereg'; const id = 'signaturereg';
const app = builtins.find((app) => app.url === id); const app = builtins.find((app) => app.url === id);

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtins from '~/views/Dapps/builtin.json'; import builtins from '~/config/dappsBuiltin.json';
const id = 'tokendeploy'; const id = 'tokendeploy';
const app = builtins.find((app) => app.url === id); const app = builtins.find((app) => app.url === id);

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtins from '~/views/Dapps/builtin.json'; import builtins from '~/config/dappsBuiltin.json';
const id = 'tokenreg'; const id = 'tokenreg';
const app = builtins.find((app) => app.url === id); const app = builtins.find((app) => app.url === id);

View File

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
import builtins from '~/views/Dapps/builtin.json'; import builtins from '~/config/dappsBuiltin.json';
const id = 'web'; const id = 'web';
const app = builtins.find((app) => app.url === id); const app = builtins.find((app) => app.url === id);

View File

@ -20,7 +20,7 @@ import { flatten } from 'lodash';
import * as abis from '~/contracts/abi'; import * as abis from '~/contracts/abi';
import Contracts from '~/contracts'; import Contracts from '~/contracts';
import builtinJson from '~/views/Dapps/builtin.json'; import builtinJson from '~/config/dappsBuiltin.json';
import Dapp from './dappStore.js'; import Dapp from './dappStore.js';
import { deleteDapp, registerDapp, updateDapp } from './utils'; import { deleteDapp, registerDapp, updateDapp } from './utils';
@ -489,7 +489,7 @@ export default class DappsStore {
} }
_loadRegistry () { _loadRegistry () {
return Contracts.create(api).registry return Contracts.get(api).registry
.fetchContract() .fetchContract()
.then((contract) => { .then((contract) => {
this._registry = contract.instance; this._registry = contract.instance;

View File

@ -44,7 +44,7 @@ export const fetchIsTestnet = () => (dispatch) =>
export const setContract = (contract) => ({ type: 'set contract', contract }); export const setContract = (contract) => ({ type: 'set contract', contract });
export const fetchContract = () => (dispatch) => { export const fetchContract = () => (dispatch) => {
return Contracts.create(api).registry return Contracts.get(api).registry
.fetchContract() .fetchContract()
.then((contract) => { .then((contract) => {
dispatch(setContract(contract)); dispatch(setContract(contract));

View File

@ -92,7 +92,7 @@ class FrameSecureApi extends SecureApi {
const api = new FrameSecureApi(window.secureTransport || new FakeTransport()); const api = new FrameSecureApi(window.secureTransport || new FakeTransport());
patchApi(api); patchApi(api);
ContractInstances.create(api); ContractInstances.get(api);
const store = initStore(api, null, true); const store = initStore(api, null, true);

View File

@ -66,7 +66,7 @@ if (window.location.hash && window.location.hash.indexOf(AUTH_HASH) === 0) {
const api = new SecureApi(`${urlScheme}${parityUrl}`, token); const api = new SecureApi(`${urlScheme}${parityUrl}`, token);
patchApi(api); patchApi(api);
ContractInstances.create(api); ContractInstances.get(api);
const store = initStore(api, hashHistory); const store = initStore(api, hashHistory);

View File

@ -51,12 +51,12 @@ export default class VerificationStore {
@observable confirmationTx = null; @observable confirmationTx = null;
constructor (api, abi, certifierName, account, isTestnet) { constructor (api, abi, certifierName, account, isTestnet) {
this.api = api; this._api = api;
this.account = account; this.account = account;
this.isTestnet = isTestnet; this.isTestnet = isTestnet;
this.step = LOADING; this.step = LOADING;
Contracts.get().badgeReg.fetchCertifierByName(certifierName) Contracts.get(this._api).badgeReg.fetchCertifierByName(certifierName)
.then(({ address }) => { .then(({ address }) => {
this.contract = new Contract(api, abi).at(address); this.contract = new Contract(api, abi).at(address);
this.load(); this.load();

View File

@ -37,7 +37,7 @@ export default function (api, browserHistory, forEmbed = false) {
]; ];
if (!forEmbed) { if (!forEmbed) {
const certifications = new CertificationsMiddleware().toMiddleware(); const certifications = new CertificationsMiddleware().toMiddleware(api);
const registry = new RegistryMiddleware(api); const registry = new RegistryMiddleware(api);
middleware.push(certifications, registry); middleware.push(certifications, registry);

View File

@ -270,7 +270,7 @@ export default class Balances {
} }
getTokenRegistry () { getTokenRegistry () {
return Contracts.get().tokenReg.getContract(); return Contracts.get(this._api).tokenReg.getContract();
} }
_loadTokens (options = {}) { _loadTokens (options = {}) {

View File

@ -59,9 +59,8 @@ const updatableFilter = (api, onFilter) => {
}; };
export default class CertificationsMiddleware { export default class CertificationsMiddleware {
toMiddleware () { toMiddleware (api) {
const api = Contracts.get()._api; const badgeReg = Contracts.get(api).badgeReg;
const badgeReg = Contracts.get().badgeReg;
const contract = new Contract(api, CertifierABI); const contract = new Contract(api, CertifierABI);
const Confirmed = contract.events.find((e) => e.name === 'Confirmed'); const Confirmed = contract.events.find((e) => e.name === 'Confirmed');

View File

@ -28,7 +28,7 @@ let clock;
const api = createWsApi(); const api = createWsApi();
Contracts.create(api); Contracts.get(api);
function stubGlobals () { function stubGlobals () {
clock = sinon.useFakeTimers(); clock = sinon.useFakeTimers();

View File

@ -90,7 +90,7 @@ export default (api) => (store) => {
break; break;
case 'startCachingReverses': case 'startCachingReverses':
const { registry } = Contracts.get(); const { registry } = Contracts.get(api);
const cached = read(store.getState().nodeStatus.netChain); const cached = read(store.getState().nodeStatus.netChain);
if (cached) { if (cached) {

View File

@ -17,12 +17,15 @@
import HistoryStore from '~/mobx/historyStore'; import HistoryStore from '~/mobx/historyStore';
import { import {
Accounts, Account, Addresses, Address, Application, Accounts, Account, Addresses, Address, Application,
Contract, Contracts, Dapp, Dapps, Home, Contract, Contracts, Dapp, Dapps,
Settings, SettingsBackground, SettingsParity, SettingsProxy, Settings, SettingsBackground, SettingsParity, SettingsProxy,
SettingsViews, Signer, Status, SettingsViews, Signer, Status,
Vaults, Wallet, Web, WriteContract Vaults, Wallet, Web, WriteContract
} from '~/views'; } from '~/views';
import builtinDapps from '~/views/Dapps/builtin.json'; import builtinDapps from '~/config/dappsBuiltin.json';
import viewsDapps from '~/config/dappsViews.json';
const dapps = [].concat(viewsDapps, builtinDapps);
const accountsHistory = HistoryStore.get('accounts'); const accountsHistory = HistoryStore.get('accounts');
const dappsHistory = HistoryStore.get('dapps'); const dappsHistory = HistoryStore.get('dapps');
@ -129,13 +132,12 @@ const childRoutes = [
path: 'app/:id', path: 'app/:id',
component: Dapp, component: Dapp,
onEnter: ({ params }) => { onEnter: ({ params }) => {
if (!builtinDapps[params.id] || !builtinDapps[params.id].skipHistory) { if (!dapps[params.id] || !dapps[params.id].skipHistory) {
dappsHistory.add(params.id); dappsHistory.add(params.id);
} }
} }
}, },
{ path: 'apps', component: Dapps }, { path: 'apps', component: Dapps },
{ path: 'home', component: Home },
{ path: 'web', component: Web }, { path: 'web', component: Web },
{ path: 'web/:url', component: Web }, { path: 'web/:url', component: Web },
{ path: 'signer', component: Signer } { path: 'signer', component: Signer }

View File

@ -78,7 +78,7 @@ export default class AddressSelectStore {
constructor (api) { constructor (api) {
this.api = api; this.api = api;
const { registry } = Contracts.create(api); const { registry } = Contracts.get(api);
registry registry
.getContract('emailverification') .getContract('emailverification')

View File

@ -22,9 +22,10 @@ import { bytesToHex } from '@parity/api/util/format';
import Contracts from '~/contracts'; import Contracts from '~/contracts';
import { hashToImageUrl } from '~/redux/util'; import { hashToImageUrl } from '~/redux/util';
import builtinJson from '~/views/Dapps/builtin.json'; import builtinJson from '~/config/dappsBuiltin.json';
import viewsJson from '~/config/dappsViews.json';
const builtinApps = builtinJson.filter((app) => app.id); const builtinApps = [].concat(viewsJson, builtinJson).filter((app) => app.id);
function getHost (api) { function getHost (api) {
const host = process.env.DAPPS_URL || const host = process.env.DAPPS_URL ||

View File

@ -66,7 +66,7 @@ export default class DappsStore extends EventEmitter {
* apps, else fetch from the node * apps, else fetch from the node
*/ */
loadApp (id) { loadApp (id) {
const { dappReg } = Contracts.get(); const { dappReg } = Contracts.get(this._api);
return this return this
.loadLocalApps() .loadLocalApps()
@ -94,7 +94,7 @@ export default class DappsStore extends EventEmitter {
} }
loadAllApps () { loadAllApps () {
const { dappReg } = Contracts.get(); const { dappReg } = Contracts.get(this._api);
return Promise return Promise
.all([ .all([
@ -105,7 +105,7 @@ export default class DappsStore extends EventEmitter {
} }
subscribeToChanges () { subscribeToChanges () {
const { dappReg } = Contracts.get(); const { dappReg } = Contracts.get(this._api);
// Unsubscribe from previous subscriptions, if any // Unsubscribe from previous subscriptions, if any
if (this._subscriptions.block) { if (this._subscriptions.block) {

View File

@ -14,4 +14,35 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
export default from './home'; import ReactDOM from 'react-dom';
import React from 'react';
import { hashHistory } from 'react-router';
import injectTapEventPlugin from 'react-tap-event-plugin';
injectTapEventPlugin();
import { api } from './parity';
import { initStore } from '~/redux';
import { setApi } from '~/redux/providers/apiActions';
import ContextProvider from '~/ui/ContextProvider';
import muiTheme from '~/ui/Theme';
import Home from './home';
import '~/../assets/fonts/Roboto/font.css';
import '~/../assets/fonts/RobotoMono/font.css';
import './home.css';
const store = initStore(api, hashHistory);
store.dispatch({ type: 'initAll', api });
store.dispatch(setApi(api));
ReactDOM.render(
<ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
<Home />
</ContextProvider>,
document.querySelector('#container')
);

View File

@ -0,0 +1,21 @@
// Copyright 2015-2017 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/>.
const api = window.parent.secureApi;
export {
api
};

View File

@ -16,25 +16,9 @@
import React from 'react'; import React from 'react';
import imagesEthcoreBlock from '~/../assets/images/parity-logo-white-no-text.svg';
import { AccountsIcon, AddressesIcon, AppsIcon, ContactsIcon, FingerprintIcon, SettingsIcon, StatusIcon } from '~/ui/Icons'; import { AccountsIcon, AddressesIcon, AppsIcon, ContactsIcon, FingerprintIcon, SettingsIcon, StatusIcon } from '~/ui/Icons';
import styles from './views.css';
const defaultViews = { const defaultViews = {
home: {
active: true,
fixed: true,
icon: (
<img
className={ styles.logoIcon }
src={ imagesEthcoreBlock }
/>
),
route: '/home',
value: 'home'
},
accounts: { accounts: {
active: true, active: true,
fixed: true, fixed: true,

37
js/src/views/index.ejs Normal file
View File

@ -0,0 +1,37 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title><%= htmlWebpackPlugin.options.title %></title>
<style>
html, body, #container {
width: 100%;
min-height: 100%;
margin: 0;
padding: 0;
background: white;
font-family: 'Roboto', sans-serif;
font-size: 16px;
font-weight: 300;
}
.loading {
text-align: center;
padding-top: 5em;
font-size: 2em;
color: #999;
}
</style>
</head>
<body>
<div id="container">
<div class="loading">Loading</div>
</div>
<script src="vendor.js"></script>
<% if (!htmlWebpackPlugin.options.secure) { %>
<script src="/parity-utils/parity.js"></script>
<% } %>
</body>
</html>

View File

@ -23,7 +23,6 @@ export Contract from './Contract';
export Contracts from './Contracts'; export Contracts from './Contracts';
export Dapp from './Dapp'; export Dapp from './Dapp';
export Dapps from './Dapps'; export Dapps from './Dapps';
export Home from './Home';
export ParityBar from './ParityBar'; export ParityBar from './ParityBar';
export Settings, { SettingsBackground, SettingsParity, SettingsProxy, SettingsViews } from './Settings'; export Settings, { SettingsBackground, SettingsParity, SettingsProxy, SettingsViews } from './Settings';
export Signer from './Signer'; export Signer from './Signer';

View File

@ -28,7 +28,15 @@ const ScriptExtHtmlWebpackPlugin = require('script-ext-html-webpack-plugin');
const rulesEs6 = require('./rules/es6'); const rulesEs6 = require('./rules/es6');
const rulesParity = require('./rules/parity'); const rulesParity = require('./rules/parity');
const Shared = require('./shared'); const Shared = require('./shared');
const DAPPS = require('../src/views/Dapps/builtin.json');
const DAPPS_BUILTIN = require('../src/config/dappsBuiltin.json').map((dapp) => {
dapp.srcPath = './dapps';
return dapp;
});
const DAPPS_VIEWS = require('../src/config/dappsViews.json').map((dapp) => {
dapp.srcPath = './views';
return dapp;
});
const FAVICON = path.resolve(__dirname, '../assets/images/parity-logo-black-no-text.png'); const FAVICON = path.resolve(__dirname, '../assets/images/parity-logo-black-no-text.png');
@ -149,11 +157,14 @@ module.exports = {
}, },
plugins: (function () { plugins: (function () {
const DappsHTMLInjection = DAPPS.filter((dapp) => !dapp.skipBuild).map((dapp) => { const DappsHTMLInjection = []
.concat(DAPPS_BUILTIN, DAPPS_VIEWS)
.filter((dapp) => !dapp.skipBuild)
.map((dapp) => {
return new HtmlWebpackPlugin({ return new HtmlWebpackPlugin({
title: dapp.name, title: dapp.name,
filename: dapp.url + '.html', filename: dapp.url + '.html',
template: './dapps/index.ejs', template: dapp.srcPath + '/index.ejs',
favicon: FAVICON, favicon: FAVICON,
secure: dapp.secure, secure: dapp.secure,
chunks: [ isProd ? null : 'commons', dapp.url ] chunks: [ isProd ? null : 'commons', dapp.url ]

View File

@ -151,12 +151,19 @@ function getPlugins (_isProd = isProd) {
} }
function getDappsEntry () { function getDappsEntry () {
const DAPPS = require('../src/views/Dapps/builtin.json'); const builtins = require('../src/config/dappsBuiltin.json');
const views = require('../src/config/dappsViews.json');
return DAPPS.filter((dapp) => !dapp.skipBuild).reduce((_entry, dapp) => { return Object.assign(
builtins.filter((dapp) => !dapp.skipBuild).reduce((_entry, dapp) => {
_entry[dapp.url] = './dapps/' + dapp.url + '.js'; _entry[dapp.url] = './dapps/' + dapp.url + '.js';
return _entry; return _entry;
}, {}); }, {}),
views.reduce((_entry, dapp) => {
_entry[dapp.url] = './views/' + dapp.src + '/index.js';
return _entry;
}, {})
);
} }
function addProxies (app) { function addProxies (app) {