From d9cd2e95d435805b8b0b2245e3a6b95ad30f164d Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Sat, 11 Oct 2014 17:26:10 -0300 Subject: [PATCH] add manage page to create/join/import/delete wallets --- js/controllers/manage.js | 3 +++ js/models/Storage.js | 4 +++- js/routes.js | 4 ++++ views/includes/sidebar.html | 10 ++-------- views/manage.html | 24 ++++++++++++++++++++++++ 5 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 js/controllers/manage.js create mode 100644 views/manage.html diff --git a/js/controllers/manage.js b/js/controllers/manage.js new file mode 100644 index 000000000..821804c90 --- /dev/null +++ b/js/controllers/manage.js @@ -0,0 +1,3 @@ +'use strict'; +angular.module('copayApp.controllers').controller('ManageController', function($scope, $rootScope, $location, controllerUtils) { +}); diff --git a/js/models/Storage.js b/js/models/Storage.js index 3275a1ff7..949fc904f 100644 --- a/js/models/Storage.js +++ b/js/models/Storage.js @@ -202,7 +202,9 @@ Storage.prototype.clearAll = function(cb) { this.db.clear(cb); }; -Storage.prototype.decrypt = function(base64) { +Storage.prototype.decrypt = function(base64, password) { + // password + var decryptedStr = this._decrypt(base64); return JSON.parse(decryptedStr); }; diff --git a/js/routes.js b/js/routes.js index 140626356..21dd6e548 100644 --- a/js/routes.js +++ b/js/routes.js @@ -60,6 +60,10 @@ angular templateUrl: 'views/warning.html', validate: true }) + .when('/manage', { + templateUrl: 'views/manage.html', + validate: true + }) .otherwise({ templateUrl: 'views/errors/404.html', title: 'Error' diff --git a/views/includes/sidebar.html b/views/includes/sidebar.html index 5507316b5..83e20b5ec 100644 --- a/views/includes/sidebar.html +++ b/views/includes/sidebar.html @@ -58,16 +58,10 @@ + - - -
  • {{'Close'|translate}} diff --git a/views/manage.html b/views/manage.html new file mode 100644 index 000000000..a110f1080 --- /dev/null +++ b/views/manage.html @@ -0,0 +1,24 @@ +
    +

    Manage Wallets

    +
    +

    Backup

    +

    It's important to backup your profile so that you can recover it in case of disaster. The backup will include all your profile's wallets

    + +
    +
    + +