rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

account menu sections

Browse Source
This commit is contained in:
Mo Bitar
2017-01-26 15:11:41 -06:00
parent ee6ec5bfbc
commit a255b8487e
14 changed files with 156 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/app/services/directives/accountDataMenu.js
View File

@@ -7,11 +7,10 @@ class AccountDataMenu {
};
}
controller($scope, apiController, modelManager, keyManager, syncManager) {
controller($scope, apiController, modelManager, keyManager) {
'ngInject';
$scope.keys = keyManager.keys;
$scope.syncProviders = syncManager.syncProviders;
$scope.destroyLocalData = function() {
if(!confirm("Are you sure you want to end your session? This will delete all local items, sync providers, keys, and extensions.")) {

6
app/assets/javascripts/app/services/directives/importExportMenu.js → app/assets/javascripts/app/services/directives/accountExportSection.js
View File

@@ -1,8 +1,8 @@
class ImportExportMenu {
class AccountExportSection {
constructor() {
this.restrict = "E";
this.templateUrl = "frontend/directives/import-export-menu.html";
this.templateUrl = "frontend/directives/account-menu/account-export-section.html";
this.scope = {
};
}
@@ -76,4 +76,4 @@ class ImportExportMenu {
}
angular.module('app.frontend').directive('importExportMenu', () => new ImportExportMenu);
angular.module('app.frontend').directive('accountExportSection', () => new AccountExportSection);

4
app/assets/javascripts/app/services/directives/accountKeysSection.js
View File

@@ -2,7 +2,7 @@ class AccountKeysSection {
constructor() {
this.restrict = "E";
this.templateUrl = "frontend/directives/account-keys-section.html";
this.templateUrl = "frontend/directives/account-menu/account-keys-section.html";
this.scope = {
};
}
@@ -19,7 +19,7 @@ class AccountKeysSection {
alert("This key name is already in use. Please use a different name.");
return;
}
$scope.newKeyData.showForm = false;
}
}

35
app/assets/javascripts/app/services/directives/accountVendorAccountSection.js → app/assets/javascripts/app/services/directives/accountNewAccountSection.js
View File

@@ -1,8 +1,8 @@
class AccountVendorAccountSection {
class AccountNewAccountSection {
constructor() {
this.restrict = "E";
this.templateUrl = "frontend/directives/account-vendor-account-section.html";
this.templateUrl = "frontend/directives/account-menu/account-new-account-section.html";
this.scope = {
};
}
@@ -10,13 +10,20 @@ class AccountVendorAccountSection {
controller($scope, apiController, modelManager, $timeout, dbManager, syncManager) {
'ngInject';
$scope.loginData = {mergeLocal: true, url: syncManager.serverURL()};
$scope.formData = {mergeLocal: true, url: syncManager.serverURL()};
$scope.user = apiController.user;
$scope.showForm = syncManager.syncProviders.length == 0;
$scope.changePasswordPressed = function() {
$scope.showNewPasswordForm = !$scope.showNewPasswordForm;
}
$scope.submitExternalSyncURL = function() {
syncManager.addSyncProviderFromURL($scope.newSyncData.url);
$scope.newSyncData.showAddSyncForm = false;
}
$scope.signOutPressed = function() {
$scope.showAccountMenu = false;
apiController.signoutOfStandardFile(false, function(){
@@ -45,21 +52,21 @@ class AccountVendorAccountSection {
}
$scope.mergeLocalChanged = function() {
if(!$scope.loginData.mergeLocal) {
if(!$scope.formData.mergeLocal) {
if(!confirm("Unchecking this option means any of the notes you have written while you were signed out will be deleted. Are you sure you want to discard these notes?")) {
$scope.loginData.mergeLocal = true;
$scope.formData.mergeLocal = true;
}
}
}
$scope.loginSubmitPressed = function() {
$scope.loginData.status = "Generating Login Keys...";
console.log("logging in with url", $scope.loginData.url);
$scope.formData.status = "Generating Login Keys...";
console.log("logging in with url", $scope.formData.url);
$timeout(function(){
apiController.login($scope.loginData.url, $scope.loginData.email, $scope.loginData.user_password, function(response){
apiController.login($scope.formData.url, $scope.formData.email, $scope.formData.user_password, function(response){
if(!response || response.error) {
var error = response ? response.error : {message: "An unknown error occured."}
$scope.loginData.status = null;
$scope.formData.status = null;
if(!response || (response && !response.didDisplayAlert)) {
alert(error.message);
}
@@ -71,13 +78,13 @@ class AccountVendorAccountSection {
}
$scope.submitRegistrationForm = function() {
$scope.loginData.status = "Generating Account Keys...";
$scope.formData.status = "Generating Account Keys...";
$timeout(function(){
apiController.register($scope.loginData.url, $scope.loginData.email, $scope.loginData.user_password, function(response){
apiController.register($scope.formData.url, $scope.formData.email, $scope.formData.user_password, function(response){
if(!response || response.error) {
var error = response ? response.error : {message: "An unknown error occured."}
$scope.loginData.status = null;
$scope.formData.status = null;
alert(error.message);
} else {
$scope.onAuthSuccess(response.user);
@@ -98,7 +105,7 @@ class AccountVendorAccountSection {
$scope.showRegistration = false;
};
if(!$scope.loginData.mergeLocal) {
if(!$scope.formData.mergeLocal) {
dbManager.clearAllItems(function(){
block();
});
@@ -110,4 +117,4 @@ class AccountVendorAccountSection {
}
}
angular.module('app.frontend').directive('accountVendorAccountSection', () => new AccountVendorAccountSection);
angular.module('app.frontend').directive('accountNewAccountSection', () => new AccountNewAccountSection);

9
app/assets/javascripts/app/services/directives/accountSyncSection.js
View File

@@ -2,7 +2,7 @@ class AccountSyncSection {
constructor() {
this.restrict = "E";
this.templateUrl = "frontend/directives/account-sync-section.html";
this.templateUrl = "frontend/directives/account-menu/account-sync-section.html";
this.scope = {
};
}
@@ -11,13 +11,8 @@ class AccountSyncSection {
'ngInject';
$scope.syncProviders = syncManager.syncProviders;
$scope.newSyncData = {showAddSyncForm: false}
$scope.keys = keyManager.keys;
$scope.submitExternalSyncURL = function() {
syncManager.addSyncProviderFromURL($scope.newSyncData.url);
$scope.newSyncData.showAddSyncForm = false;
}
$scope.showSection = $scope.syncProviders.length > 0;
$scope.enableSyncProvider = function(provider, primary) {
if(!provider.keyName) {