diff --git a/API.js b/API.js index 32bcbd8b9..76f30a29e 100644 --- a/API.js +++ b/API.js @@ -10,23 +10,13 @@ API.prototype._init = function(opts) { opts = opts || {}; self.opts = opts; - var Wallet = require('soop').load('./js/models/core/Wallet', { - Storage: opts.Storage || require('./test/FakeStorage'), - Network: opts.Network || require('./js/models/network/WebRTC'), + var WalletFactory = require('soop').load('./js/models/core/WalletFactory', { + Storage: opts.Storage || require('./test/mocks/FakeStorage'), + Network: opts.Network || require('./js/models/network/Base'), Blockchain: opts.Blockchain || require('./js/models/blockchain/Insight') }); - - var config = { - wallet: { - requiredCopayers: opts.requiredCopayers || 3, - totalCopayers: opts.totalCopayers || 5, - } - }; - var walletConfig = opts.walletConfig || config; - var walletOpts = opts.walletOpts || {}; - - self.wallet = self.opts.wallet || Wallet.factory.create(walletConfig, walletOpts); + this.walletFactory = new WalletFactory(opts); }; API._coerceArgTypes = function(args, argTypes) { @@ -179,13 +169,13 @@ API.prototype.getCommands = decorate('getCommands', [ ['callback', 'function'] ]); -API.prototype._cmd_getPublicKeyRingId = function(callback) { +API.prototype._cmd_getWalletIds = function(callback) { var self = this; - return callback(null, self.wallet.publicKeyRing.walletId); + return callback(null, self.walletFactory.getWalletIds()); }; -API.prototype.getPublicKeyRingId = decorate('getPublicKeyRingId', [ +API.prototype.getWalletIds = decorate('getWalletIds', [ ['callback', 'function'] ]); diff --git a/bin/copay b/bin/copay index 2721da0e2..9890f66cd 100755 --- a/bin/copay +++ b/bin/copay @@ -18,11 +18,10 @@ var main = function() { var api = new API(commander); var args = commander.args; + var command = args[0]; + var commandArgs = args.slice(1); try { - var command = args[0]; - var commandArgs = args.slice(1); - if (command[0] == '_' || typeof api[command] != 'function') throw new Error('invalid command'); diff --git a/copay.js b/copay.js index c8504ac36..d68d1cfb1 100644 --- a/copay.js +++ b/copay.js @@ -7,12 +7,15 @@ module.exports.PrivateKey = require('./js/models/core/PrivateKey'); // components var WebRTC = module.exports.WebRTC = require('./js/models/network/WebRTC'); var Insight = module.exports.Insight = require('./js/models/blockchain/Insight'); -var StoragePlain = module.exports.StoragePlain = require('./js/models/storage/Plain'); -var StorageEncrypted = module.exports.StorageEncrypted = require('./js/models/storage/Encrypted'); +var StorageLocalPlain = module.exports.StorageLocalPlain = require('./js/models/storage/LocalPlain'); +var StorageLocalEncrypted = module.exports.StorageLocalEncrypted = require('./js/models/storage/LocalEncrypted'); -module.exports.Wallet = require('soop').load('./js/models/core/Wallet',{ +var WalletFactory = require('soop').load('./js/models/core/WalletFactory',{ Network: WebRTC, Blockchain: Insight, - Storage: StoragePlain, + Storage: StorageLocalPlain, }); +module.exports.WalletFactory = WalletFactory; + +module.exports.API = require('./API'); diff --git a/css/main.css b/css/main.css index 3be265826..c42153d1b 100644 --- a/css/main.css +++ b/css/main.css @@ -72,11 +72,21 @@ body { } .panel { + color: #333; background: #FFFFFF; padding: 0.7rem 1rem; border:0; } +.panel:hover { + background: #efefef; + color: #111; +} + +.home .panel { + font-size: 0.9rem; +} + .transactions .panel { background: #ECECEC; } @@ -125,7 +135,6 @@ h3 { span.panel-res { float: right; - width: 3%; padding: 0.4rem 0.55rem; margin: 0 1rem; border-radius: 1rem; @@ -150,6 +159,11 @@ span.panel-res { margin: 0.5rem 0 1rem; } +.share-wallet.panel { + background-color: #111; + color: #FBE500; +} + button.primary { background-color: #111; } button.secondary { background-color: #FAE448 !important; } @@ -169,4 +183,9 @@ button.secondary:hover { background-color: #FFDF00 !important;} .size-48 { font-size: 48px; } .size-60 { font-size: 60px; } .size-72 { font-size: 72px; } - +.m10t {margin-top: 10px;} +.p0r {padding-right: 0;} +.p70r {padding-right: 70px;} +.p70l {padding-left: 70px;} +.p5h {padding: 0 5px;} +.br100 {border-radius: 100%;} \ No newline at end of file diff --git a/index.html b/index.html index ff04db9e9..8a0a5fe4d 100644 --- a/index.html +++ b/index.html @@ -96,12 +96,53 @@ + + @@ -152,17 +200,20 @@
Address 1
Address 2
-