mirror of https://github.com/BTCPrivate/copay.git
Merge pull request #365 from colkito/feature/settings-page
Feature/settings page
This commit is contained in:
commit
b7bde5d749
|
@ -1,6 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var config = {
|
var localConfig = JSON.parse(localStorage.getItem('config'));
|
||||||
|
var defaultConfig = {
|
||||||
networkName: 'testnet',
|
networkName: 'testnet',
|
||||||
network: {
|
network: {
|
||||||
// key: 'lwjd5qra8257b9', //Copay API key for public PeerJS server
|
// key: 'lwjd5qra8257b9', //Copay API key for public PeerJS server
|
||||||
|
@ -11,7 +12,7 @@ var config = {
|
||||||
//path: '/',
|
//path: '/',
|
||||||
//
|
//
|
||||||
key: 'g23ihfh82h35rf', // api key for the peerjs server
|
key: 'g23ihfh82h35rf', // api key for the peerjs server
|
||||||
host: '162.242.219.26', // peerjs server
|
host: '162.242.245.33', // peerjs server
|
||||||
port: 10009,
|
port: 10009,
|
||||||
path: '/',
|
path: '/',
|
||||||
maxPeers: 15,
|
maxPeers: 15,
|
||||||
|
@ -105,6 +106,18 @@ var config = {
|
||||||
verbose: 1,
|
verbose: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
var config = defaultConfig;
|
||||||
|
|
||||||
|
// Merge localConfig
|
||||||
|
if (localConfig) {
|
||||||
|
var count = 0;
|
||||||
|
for (name in localConfig) {
|
||||||
|
if (localConfig.hasOwnProperty(name)) {
|
||||||
|
config[name] = localConfig[name];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var log = function() {
|
var log = function() {
|
||||||
if (config.verbose) console.log(arguments);
|
if (config.verbose) console.log(arguments);
|
||||||
}
|
}
|
||||||
|
|
49
index.html
49
index.html
|
@ -25,6 +25,8 @@
|
||||||
<a class="button radius small-icon" title="Manual Refresh"
|
<a class="button radius small-icon" title="Manual Refresh"
|
||||||
ng-disabled="$root.loading"
|
ng-disabled="$root.loading"
|
||||||
ng-click="refresh()"><i class="fi-refresh"></i></a>
|
ng-click="refresh()"><i class="fi-refresh"></i></a>
|
||||||
|
<a class="button radius small-icon" title="Settings"
|
||||||
|
ng-disabled="$root.loading" href="#settings"><i class="fi-widget"></i></a>
|
||||||
<a class="button radius small-icon" title="Signout"
|
<a class="button radius small-icon" title="Signout"
|
||||||
ng-click="signout()"><i class="fi-power"></i></a>
|
ng-click="signout()"><i class="fi-power"></i></a>
|
||||||
</div>
|
</div>
|
||||||
|
@ -199,6 +201,7 @@
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns text-center line-dashed">
|
<div class="large-12 columns text-center line-dashed">
|
||||||
|
<a href="#settings">Settings</a> ·
|
||||||
<span ng-show="wallets.length">
|
<span ng-show="wallets.length">
|
||||||
<a href="#/setup">Create a new wallet</a> ·
|
<a href="#/setup">Create a new wallet</a> ·
|
||||||
</span>
|
</span>
|
||||||
|
@ -562,7 +565,7 @@
|
||||||
|
|
||||||
<!-- BACKUP -->
|
<!-- BACKUP -->
|
||||||
<script type="text/ng-template" id="backup.html">
|
<script type="text/ng-template" id="backup.html">
|
||||||
<div class="backup" data-ng-controller="BackupController">
|
<div class="backup" ng-controller="BackupController">
|
||||||
<h3>{{title}}</h3>
|
<h3>{{title}}</h3>
|
||||||
<div class="row text-center">
|
<div class="row text-center">
|
||||||
<div class="large-6 medium-6 columns">
|
<div class="large-6 medium-6 columns">
|
||||||
|
@ -581,6 +584,49 @@
|
||||||
</div>
|
</div>
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<!-- CONFIG -->
|
||||||
|
<script type="text/ng-template" id="settings.html">
|
||||||
|
<div class="settings" ng-controller="SettingsController">
|
||||||
|
<h3>{{title}}</h3>
|
||||||
|
<div class="small-12 medium-6 medium-centered large-6 large-centered columns">
|
||||||
|
<fieldset>
|
||||||
|
<legend>Network Name</legend>
|
||||||
|
<input id="network-name" type="checkbox" ng-model="networkName" ng-true-value="livenet" ng-false-value="testnet">
|
||||||
|
<label for="network-name">Livenet</label>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset>
|
||||||
|
<legend>Blockchain</legend>
|
||||||
|
<div class="row">
|
||||||
|
<label for="blockchain-host">Host</label>
|
||||||
|
<input type="text" ng-model="blockchainHost">
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<label for="blockchain-port">Port</label>
|
||||||
|
<input type="number" ng-model="blockchainPort">
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
<fieldset>
|
||||||
|
<legend>Socket</legend>
|
||||||
|
<div class="row">
|
||||||
|
<label for="socket-host">Host</label>
|
||||||
|
<input type="text" ng-model="socketHost">
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<label for="socket-port">Port</label>
|
||||||
|
<input type="number" ng-model="socketPort">
|
||||||
|
</div>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="large-12 columns line-dashed">
|
||||||
|
<button type="submit" class="button primary radius right ng-binding" ng-disabled="setupForm.$invalid || loading" disabled="disabled" ng-click="save()">
|
||||||
|
Save
|
||||||
|
</button>
|
||||||
|
<a class="button secondary radius" href="#signin" ng-hide="$root.wallet">Signin</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</script>
|
||||||
|
|
||||||
<!-- UNSUPPORTED -->
|
<!-- UNSUPPORTED -->
|
||||||
<script type="text/ng-template" id="unsupported.html">
|
<script type="text/ng-template" id="unsupported.html">
|
||||||
|
@ -644,6 +690,7 @@ on supported browsers please check <a href="http://www.webrtc.org/">http://www.w
|
||||||
<script src="js/controllers/signin.js"></script>
|
<script src="js/controllers/signin.js"></script>
|
||||||
<script src="js/controllers/setup.js"></script>
|
<script src="js/controllers/setup.js"></script>
|
||||||
<script src="js/controllers/import.js"></script>
|
<script src="js/controllers/import.js"></script>
|
||||||
|
<script src="js/controllers/settings.js"></script>
|
||||||
|
|
||||||
<script src="js/init.js"></script>
|
<script src="js/init.js"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|
|
@ -21,7 +21,8 @@ var copayApp = window.copayApp = angular.module('copay',[
|
||||||
'copay.directives',
|
'copay.directives',
|
||||||
'copay.video',
|
'copay.video',
|
||||||
'copay.import',
|
'copay.import',
|
||||||
'copay.passphrase'
|
'copay.passphrase',
|
||||||
|
'copay.settings'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
angular.module('copay.header', []);
|
angular.module('copay.header', []);
|
||||||
|
@ -39,4 +40,5 @@ angular.module('copay.directives', []);
|
||||||
angular.module('copay.video', []);
|
angular.module('copay.video', []);
|
||||||
angular.module('copay.import', []);
|
angular.module('copay.import', []);
|
||||||
angular.module('copay.passphrase', []);
|
angular.module('copay.passphrase', []);
|
||||||
|
angular.module('copay.settings', []);
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
angular.module('copay.settings').controller('SettingsController',
|
||||||
|
function($scope, $rootScope, $window) {
|
||||||
|
$scope.title = 'Settings';
|
||||||
|
|
||||||
|
$scope.networkName = config.networkName;
|
||||||
|
$scope.blockchainHost = config.blockchain.host;
|
||||||
|
$scope.blockchainPort = config.blockchain.port;
|
||||||
|
$scope.socketHost = config.socket.host;
|
||||||
|
$scope.socketPort = config.socket.port;
|
||||||
|
|
||||||
|
$scope.save = function() {
|
||||||
|
localStorage.setItem('config', JSON.stringify({
|
||||||
|
networkName: $scope.networkName,
|
||||||
|
blockchain: {
|
||||||
|
host: $scope.blockchainHost,
|
||||||
|
port: $scope.blockchainPort
|
||||||
|
},
|
||||||
|
socket: {
|
||||||
|
host: $scope.socketHost,
|
||||||
|
port: $scope.socketPort
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
$window.location.reload();
|
||||||
|
};
|
||||||
|
});
|
|
@ -42,6 +42,10 @@ angular
|
||||||
templateUrl: 'backup.html',
|
templateUrl: 'backup.html',
|
||||||
validate: true
|
validate: true
|
||||||
})
|
})
|
||||||
|
.when('/settings', {
|
||||||
|
templateUrl: 'settings.html',
|
||||||
|
validate: false
|
||||||
|
})
|
||||||
.when('/unsupported', {
|
.when('/unsupported', {
|
||||||
templateUrl: 'unsupported.html'
|
templateUrl: 'unsupported.html'
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue