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

Token Registry dApp #2178

Merged
merged 24 commits into from
Sep 19, 2016
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c351ed7
Fixes case-sensitive bugs in imports
ngotchac Sep 12, 2016
56a7011
Redux introduction in tokenreg dapp
ngotchac Sep 13, 2016
52ecf51
Merge branch 'js' into ng-parity-js
ngotchac Sep 13, 2016
49ec2eb
Listing Tokens and querying meta
ngotchac Sep 14, 2016
d713d48
Added Token Owner in ABI and Token UI
ngotchac Sep 14, 2016
8a25dd2
Webpack Improvements
ngotchac Sep 14, 2016
a67aeb6
Webpack performance fixes
ngotchac Sep 15, 2016
2244c58
TokenReg dapp : register new token WIP
ngotchac Sep 15, 2016
5e7c382
Token Registration WIP: fixed ABI, registering token works
ngotchac Sep 15, 2016
0a7a8cb
Merge branch 'js' into ng-parity-js
ngotchac Sep 15, 2016
5931fc3
Registring Token
ngotchac Sep 16, 2016
711e3e6
Make sure TLA and Address aren't already used
ngotchac Sep 16, 2016
99a338c
Merge branch 'js' into ng-parity-js
ngotchac Sep 16, 2016
7641d62
Merge branch 'jg-abi-indexd-string-fix' into ng-parity-js
ngotchac Sep 16, 2016
d0a9894
Unregistering of a Token
ngotchac Sep 16, 2016
0f70a76
Registering and Unregistering with pending events
ngotchac Sep 16, 2016
356c2c5
fixes eslint errors
ngotchac Sep 19, 2016
d172470
re-usable bytesToHex
jacogr Sep 19, 2016
b2cd6c7
Merge branch 'js' into jg-api-util
jacogr Sep 19, 2016
ab09528
typo
jacogr Sep 19, 2016
0a7d1a4
Adding meta-data to Token Reg
ngotchac Sep 19, 2016
33c79c6
Merge branch 'jg-api-util' into ng-parity-js
ngotchac Sep 19, 2016
b908d3d
add meta-data feedbacks for pending/mining
ngotchac Sep 19, 2016
e290042
Merge branch 'js' into ng-parity-js
ngotchac Sep 19, 2016
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
Prev Previous commit
Next Next commit
Webpack Improvements
ngotchac committed Sep 14, 2016
commit 8a25dd2158a6a1d7378f1313e670f6174b4b7347
4 changes: 2 additions & 2 deletions js/package.json
Original file line number Diff line number Diff line change
@@ -96,8 +96,8 @@
"style-loader": "^0.13.0",
"url-loader": "^0.5.7",
"web3": "^0.17.0-alpha",
"webpack": "^1.12.14",
"webpack-dev-server": "^1.14.1",
"webpack": "^1.13.2",
"webpack-dev-server": "^1.15.2",
"webpack-error-notification": "0.1.6",
"webpack-hot-middleware": "^2.7.1",
"websocket": "^1.0.23"
5 changes: 4 additions & 1 deletion js/src/dapps/gavcoin.html
Original file line number Diff line number Diff line change
@@ -7,10 +7,13 @@
<title>GAVcoin</title>
<link href="//fonts.googleapis.com/css?family=Roboto:300" rel="stylesheet">
<link href="//fonts.googleapis.com/css?family=Roboto+Mono:300" rel="stylesheet">
<link rel="stylesheet" href="/parity.css">
<link rel="stylesheet" href="/gavcoin.css">
</head>
<body>
<div id="container"></div>
<script src="/commons.js"></script>
<script src="/parity.js"></script>
<script src="gavcoin.js"></script>
<script src="/gavcoin.js"></script>
</body>
</html>
5 changes: 4 additions & 1 deletion js/src/dapps/registry.html
Original file line number Diff line number Diff line change
@@ -7,10 +7,13 @@
<title>Token Registry</title>
<link href="//fonts.googleapis.com/css?family=Roboto:300" rel="stylesheet">
<link href="//fonts.googleapis.com/css?family=Roboto+Mono:300" rel="stylesheet">
<link rel="stylesheet" href="/parity.css">
<link rel="stylesheet" href="/registry.css">
</head>
<body>
<div id="container"></div>
<script src="/commons.js"></script>
<script src="/parity.js"></script>
<script src="registry.js"></script>
<script src="/registry.js"></script>
</body>
</html>
5 changes: 4 additions & 1 deletion js/src/dapps/tokenreg.html
Original file line number Diff line number Diff line change
@@ -7,10 +7,13 @@
<title>Token Registry</title>
<link href="//fonts.googleapis.com/css?family=Roboto:300" rel="stylesheet">
<link href="//fonts.googleapis.com/css?family=Roboto+Mono:300" rel="stylesheet">
<link rel="stylesheet" href="/parity.css">
<link rel="stylesheet" href="/tokenreg.css">
</head>
<body>
<div id="container"></div>
<script src="/commons.js"></script>
<script src="/parity.js"></script>
<script src="tokenreg.js"></script>
<script src="/tokenreg.js"></script>
</body>
</html>
3 changes: 3 additions & 0 deletions js/src/index.html
Original file line number Diff line number Diff line change
@@ -12,9 +12,12 @@
height: 100%;
}
</style>

<link rel="stylesheet" href="/index.css">
</head>
<body>
<div id="container"></div>
<script src="commons.js"></script>
<script src="index.js"></script>
</body>
</html>
20 changes: 11 additions & 9 deletions js/webpack.config.js
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ var WebpackErrorNotificationPlugin = require('webpack-error-notification');
var ENV = process.env.NODE_ENV || 'development';
var isProd = ENV === 'production';

var extractCSS = new ExtractTextPlugin('[name].css', { allChunks: true });

module.exports = {
debug: !isProd,
cache: !isProd,
@@ -57,24 +59,22 @@ module.exports = {
{
test: /\.css$/,
include: [/src/],
loaders: [
'style',
loader: extractCSS.extract('style', [
'css?modules&sourceMap&importLoaders=1&localIdentName=[name]__[local]___[hash:base64:5]',
'postcss'
]
])
},
{
test: /\.css$/,
exclude: [/src/],
loader: 'style!css'
loader: extractCSS.extract('style', 'css')
},
{
test: /\.less$/,
loaders: [
'style',
loader: extractCSS.extract('style', [
'css',
'less'
]
])
},
{
test: /\.(png|jpg|)$/,
@@ -110,7 +110,8 @@ module.exports = {
],
plugins: (function () {
var plugins = [
new ExtractTextPlugin('[name].css'),
extractCSS,

new WebpackErrorNotificationPlugin(),
// TODO [todr] paths in dapp-styles is hardcoded for meteor, we need to rewrite it here
// TODO [jacogr] this shit needs to go, e.g. dapp-styles
@@ -128,7 +129,8 @@ module.exports = {
RPC_ADDRESS: JSON.stringify(process.env.RPC_ADDRESS),
LOGGING: JSON.stringify(!isProd)
}
})
}),
new webpack.optimize.CommonsChunkPlugin('commons', 'commons.js')
];

if (isProd) {