BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

view logs in UX

This commit is contained in:
Matias Alejo Garcia 2015-04-25 12:37:04 -03:00
parent 6723cba56a
commit f47d6b0564
16 changed files with 188 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/views/includes/version.html
View File

@ -1,5 +1,4 @@
<span ng-controller="versionController as v">
<small>v{{v.version}}</small>
<small>#{{v.commitHash}}</small>
</span>

6
public/views/preferences.html
View File

@ -2,6 +2,7 @@
<ul class="no-bullet m0 size-14">
<h4 class="title m0" translate>{{index.walletName}} settings</h4>
<li class="line-b p20" ng-click="$root.go('preferencesColor')">
<span translate>Color</span>
<span class="right text-gray">
@ -58,6 +59,11 @@
{{preferences.bwsurl}}
</span>
</li>
<li class="line-b p20" ng-click="$root.go('about')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<span translate>About Copay</span>
</li>
</ul>
</div>

34
public/views/preferencesAbout.html Normal file
View File

@ -0,0 +1,34 @@
<div class="content p20v" ng-controller="preferencesAbout as about">
<ul class="no-bullet m0 size-14">
<div class="m20t m20b text-center">
<img src="img/logo.svg" alt="Copay" width="120">
</div>
<h4 class="title m0" translate>Release Information</h4>
<div ng-controller="versionController as v">
<li class="line-b p20" ng-conf>
<span translate>Version</span>
<span class="right text-gray">
v{{v.version}}
</span>
</li>
<li class="line-b p20" ng-conf ng-click="$root.openExternalLink('https://github.com/bitpay/copay/tree/'+v.commitHash)">
<span translate>Commit hash</span>
<span class="right text-gray">
#{{v.commitHash}}
<i class="icon-arrow-right3 size-24 right text-gray"></i>
</span>
</li>
</div>
<h4 class="title m0" translate>&nbsp;</h4>
<li class="line-b p20" ng-conf ng-click="$root.go('logs')">
<span translate>View session logs</span>
<span class="right text-gray">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
</span>
</li>
</ul>
</div>

10
public/views/preferencesLogs.html Normal file
View File

@ -0,0 +1,10 @@
<div class="content p20v" ng-controller="preferencesLogs as logs">
<ul class="no-bullet m0 size-14">
<li class="line-b" ng-repeat="l in logs.logs">
<span ng-class="{'text-warning': l.level=='warn', 'text-secondary': l.level=='debug', 'text-primary': l.level=='info', 'text-alert': l.level=='error' }">
{{l.msg}}
</span>
</li>
</ul>
</div>

1
src/css/main.css
View File

@ -881,6 +881,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.text-secondary {color: #3498DB;}
.text-white {color: #fff;}
.text-warning {color: #ED4A43;}
.text-alert {color: red;}
.text-success {color: #1ABC9C;}
.panel {

7
src/js/controllers/index.js
View File

@ -534,11 +534,16 @@ angular.module('copayApp.controllers').controller('indexController', function($r
self.updateColor();
});
$rootScope.$on('Local/ConfigurationUpdated', function(event) {
$rootScope.$on('Local/UnitSettingUpdated', function(event) {
self.updateAll();
self.updateTxHistory();
});
$rootScope.$on('Local/BWSUpdated', function(event) {
profileService.applyConfig();
});
$rootScope.$on('Local/WalletCompleted', function(event) {
self.setFocusedWallet();
go.walletHome();

4
src/js/controllers/preferencesAbout.js Normal file
View File

@ -0,0 +1,4 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesAbout',
function() {});

2
src/js/controllers/preferencesAltCurrency.js
View File

@ -49,7 +49,7 @@ angular.module('copayApp.controllers').controller('preferencesAltCurrencyControl
configService.set(opts, function(err) {
if (err) console.log(err);
$scope.$emit('Local/ConfigurationUpdated');
$scope.$emit('Local/UnitSettingUpdated');
});
};

2
src/js/controllers/preferencesBwsUrl.js
View File

@ -23,9 +23,9 @@ angular.module('copayApp.controllers').controller('preferencesBwsUrlController',
configService.set(opts, function(err) {
if (err) console.log(err);
$scope.$emit('Local/BWSUpdated');
applicationService.restart(true);
go.walletHome();
$scope.$emit('Local/ConfigurationUpdated');
});
};

7
src/js/controllers/preferencesLogs.js Normal file
View File

@ -0,0 +1,7 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesLogs',
function(historicLog) {
this.logs = historicLog.get();
console.log('[preferencesLogs.js.5:historicLog:]',this.logs); //TODO
});

2
src/js/controllers/preferencesUnit.js
View File

@ -52,7 +52,7 @@ angular.module('copayApp.controllers').controller('preferencesUnitController',
configService.set(opts, function(err) {
if (err) console.log(err);
$scope.$emit('Local/ConfigurationUpdated');
$scope.$emit('Local/UnitSettingUpdated');
});
};

79
src/js/routes.js
View File

@ -16,9 +16,30 @@ if (window && window.navigator) {
//Setting up route
angular
.module('copayApp')
.config(function(bwcServiceProvider, $stateProvider, $urlRouterProvider) {
.config(function(historicLogProvider, $provide, $logProvider, $stateProvider, $urlRouterProvider) {
$urlRouterProvider.otherwise('/');
$logProvider.debugEnabled(true);
$provide.decorator('$log', ['$delegate',
function($delegate) {
var historicLog = historicLogProvider.$get();
['debug', 'info', 'warn', 'error', 'log'].forEach(function(level) {
var orig = $delegate[level];
$delegate[level] = function() {
var args = [].slice.call(arguments).map(function(v){
if (typeof v == 'undefined') return 'undefined';
if (typeof v == 'object') return JSON.stringify(v).substr(0,200)+'...';
return v;
});
historicLog.add(level, args.join(' '));
orig.apply(null, args)
};
});
return $delegate;
}
]);
$stateProvider
.state('splash', {
url: '/splash',
@ -305,6 +326,42 @@ angular
}
}
})
.state('about', {
url: '/about',
templateUrl: 'views/preferencesAbout.html',
walletShouldBeComplete: true,
needProfile: true,
views: {
'main': {
templateUrl: 'views/preferencesAbout.html'
},
'topbar': {
templateUrl: 'views/includes/topbar.html',
controller: function($scope) {
$scope.titleSection = 'About';
$scope.goBackToState = 'preferences';
}
}
}
})
.state('logs', {
url: '/logs',
templateUrl: 'views/preferencesLogs.html',
walletShouldBeComplete: true,
needProfile: true,
views: {
'main': {
templateUrl: 'views/preferencesLogs.html'
},
'topbar': {
templateUrl: 'views/includes/topbar.html',
controller: function($scope) {
$scope.titleSection = 'Logs';
$scope.goBackToState = 'about';
}
}
}
})
.state('backup', {
url: '/backup',
templateUrl: 'views/backup.html',
@ -361,9 +418,9 @@ angular
case 'resume':
$scope.$emit('Local/Resume');
break;
// case 'online':
// // $scope.$emit('Local/Online');
// break;
// case 'online':
// // $scope.$emit('Local/Online');
// break;
case 'offline':
$scope.$emit('Local/Offline');
break;
@ -376,10 +433,10 @@ angular
});
})
.run(function($rootScope, $state, $log, gettextCatalog, uriHandler, isCordova, amMoment, profileService) {
console.log('Attaching FastClick');
$log.debug('Attaching FastClick');
FastClick.attach(document.body);
// Auto-detect browser language
var userLang, androidLang;
@ -413,6 +470,8 @@ angular
preferencesUnit: 12,
preferencesAltCurrency: 12,
preferencesBwsUrl: 12,
about: 12,
logs: 13,
add: 0,
create: 12,
join: 12,
@ -435,7 +494,7 @@ angular
if (!profileService.profile && toState.needProfile) {
// Give us time to open / create the profile
event.preventDefault();
event.preventDefault();
// Try to open local profile
profileService.loadAndBindProfile(function(err) {
@ -447,8 +506,8 @@ angular
throw new Error(err); // TODO
}
} else {
console.log('Profile loaded ... resuming transition');
$state.transitionTo('walletHome');
$log.debug('Profile loaded ... Starting UX.');
$state.transitionTo(toState, toParams);
}
});
}

38
src/js/services/configService.js
View File

@ -1,10 +1,8 @@
'use strict';
angular.module('copayApp.services').factory('configService', function(localStorageService, fileStorageService, isCordova, lodash, bwcService) {
angular.module('copayApp.services').factory('configService', function(storageService, lodash) {
var root = {};
var storage = isCordova ? fileStorageService : localStorageService;
var defaultConfig = {
// wallet limits
limits: {
@ -17,18 +15,6 @@ angular.module('copayApp.services').factory('configService', function(localStora
url: 'https://bws.bitpay.com/bws/api',
},
// insight
insight: {
testnet: {
url: 'https://test-insight.bitpay.com:443',
transports: ['polling'],
},
livenet: {
url: 'https://insight.bitpay.com:443',
transports: ['polling'],
},
},
// wallet default config
wallet: {
requiredCopayers: 2,
@ -46,12 +32,6 @@ angular.module('copayApp.services').factory('configService', function(localStora
}
},
// local encryption/security config
passphraseConfig: {
iterations: 5000,
storageSalt: 'mjuBtGybi/4=',
},
rates: {
url: 'https://insight.bitpay.com:443/api/rates',
},
@ -68,7 +48,7 @@ angular.module('copayApp.services').factory('configService', function(localStora
};
root.get = function(cb) {
storage.get('config', function(err, localConfig) {
storageService.getConfig(function(err, localConfig) {
if (localConfig) {
configCache = JSON.parse(localConfig);
@ -90,7 +70,7 @@ angular.module('copayApp.services').factory('configService', function(localStora
root.set = function(newOpts, cb) {
var config = defaultConfig;
storage.get('config', function(err, oldOpts) {
storageService.getConfig(function(err, oldOpts) {
if (lodash.isString(oldOpts)) {
oldOpts = JSON.parse(oldOpts);
}
@ -103,23 +83,19 @@ angular.module('copayApp.services').factory('configService', function(localStora
lodash.merge(config, oldOpts, newOpts);
configCache = config;
storage.set('config', JSON.stringify(config), cb);
storageService.setConfig(JSON.stringify(config), cb);
});
};
root.reset = function(cb) {
storage.remove('config', cb);
configCache = lodash.clone(defaultConfig);
storageService.removeConfig(cb);
};
root.getDefaults = function() {
return defaultConfig;
return lodash.clone(defaultConfig);
};
root.get(function(err, c) {
if (err) throw Error(err);
bwcService.setBaseUrl(c.bws.url);
bwcService.setTransports(['polling']);
});
return root;
});

19
src/js/services/historicLog.js Normal file
View File

@ -0,0 +1,19 @@
'use strict';
var logs = [];
angular.module('copayApp.services')
.factory('historicLog', function historicLog() {
var root = {};
root.add = function(level, msg) {
logs.push({
level: level,
msg: msg,
});
};
root.get = function() {
return logs;
};
return root;
});

11
src/js/services/profileService.js
View File

@ -110,11 +110,20 @@ angular.module('copayApp.services')
};
root.applyConfig = function() {
var config = configService.getSync();
$log.debug('Applying preferences');
bwcService.setBaseUrl(config.bws.url);
bwcService.setTransports(['polling']);
};
root.bindProfile = function(profile, cb) {
root.profile = profile;
configService.get(function(err) {
$log.debug('Preferences read');
if (err) return cb(err);
root.applyConfig();
$rootScope.$emit('Local/DefaultLanguage');
root.setWalletClients();
storageService.getFocusedWalletId(function(err, focusedWalletId) {
@ -124,7 +133,6 @@ angular.module('copayApp.services')
});
};
root.loadAndBindProfile = function(cb) {
storageService.getProfile(function(err, profile) {
if (err) {
@ -132,6 +140,7 @@ angular.module('copayApp.services')
return cb(err);
}
if (!profile) return cb(new Error('NOPROFILE: No profile'));
$log.debug('Profile read');
return root.bindProfile(profile, cb);
});

12
src/js/services/storageService.js
View File

@ -111,5 +111,17 @@ angular.module('copayApp.services')
storage.get('backup-' + walletId, cb);
};
root.getConfig = function(cb) {
storage.get('config', cb);
};
root.storeConfig = function(val, cb) {
storage.set('config', val, cb);
};
root.clearConfig = function(cb) {
storage.remove('config', cb);
};
return root;
});