This commit is contained in:
Mo Bitar
2017-01-26 01:00:47 -06:00
parent 5141b963bc
commit ac5569429d
10 changed files with 66 additions and 50 deletions

View File

@@ -1,19 +1,19 @@
.panel.panel-default.account-panel.panel-right.account-data-menu
.panel-body
.account-items
%section.account-item
%section.account-item.gray-bg{"ng-init" => "showSN = true"}
%h3{"ng-click" => "showSN = !showSN"} Standard Notes Account
%account-vendor-account-section{"ng-if" => "showSN"}
%section.account-item
%h3{"ng-click" => "showSync = !showSync"} Sync Providers
%section.account-item.gray-bg
%h3{"ng-click" => "showSync = !showSync"} Sync Locations ({{syncProviders.length}})
%account-sync-section{"ng-if" => "showSync"}
%section.account-item
%h3{"ng-click" => "showKeys = !showKeys"} Encryption Keys ({{keys.length}})
%section.account-item.gray-bg
%h3{"ng-click" => "showKeys = !showKeys"} Encryption Keys ({{keys.length}})
%account-keys-section{"ng-if" => "showKeys"}
%section.account-item
%section.account-item.gray-bg
%h3{"ng-click" => "showIO = !showIO"} Import/Export
%import-export-menu{"ng-if" => "showIO"}

View File

@@ -1,6 +1,6 @@
.account-keys-section
.account-keys-section.account-section-content
.keys
.key{"ng-repeat" => "key in keys"}
.key.white-bg{"ng-repeat" => "key in keys"}
.name {{key.name}}
.value {{key.key}}

View File

@@ -1,5 +1,5 @@
.providers
.provider{"ng-repeat" => "provider in syncProviders"}
.providers.account-section-content
.provider.white-bg{"ng-repeat" => "provider in syncProviders"}
.type {{!provider.enabled ? 'Not enabled' : (provider.primary ? 'Primary' : 'Secondary')}}
.key{"ng-if" => "provider.keyName"} Using key: {{provider.keyName}}
.url {{provider.url}}

View File

@@ -1,4 +1,4 @@
.registration-login
.registration-login.account-section-content
%div{"ng-if" => "user"}
.email {{user.email}}
.server {{serverURL}}
@@ -15,7 +15,7 @@
%div{"ng-if" => "!user"}
.meta-container
.title Sign in or Register (optional)
.desc Enter your <a href="https://standardfile.org" target="_blank">Standard File</a> account information.
.desc Enter your <a href="https://standardnotes.org" target="_blank">Standard Notes</a> account information.
.action-container
%form.account-form{'name' => "loginForm"}
.form-tag.has-feedback

View File

@@ -1,26 +1,27 @@
.options{"style" => "font-size: 12px; margin-top: 4px;"}
%label.enc-option{"ng-if" => "user"}
%input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'mk'", "ng-change" => "archiveFormData.encryption_type = 'mk'"}
Encrypted with Standard File key
%label.enc-option
%input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'ek'", "ng-change" => "archiveFormData.encryption_type = 'ek'"}
{{user ? 'Encrypted with custom key' : 'Encrypted' }}
%div{"ng-if" => "!user || (user && archiveFormData.encryption_type == 'ek')"}
%input{"ng-model" => "archiveFormData.ek", "placeholder" => "Encryption key"}
%label.enc-option
%input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'none'", "ng-change" => "archiveFormData.encryption_type = 'none'"}
Decrypted
.action-container
%a{"ng-click" => "downloadDataArchive()"} Download Data Archive
.account-section-content
.options{"style" => "font-size: 12px; margin-top: 4px;"}
%label.enc-option{"ng-if" => "user"}
%input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'mk'", "ng-change" => "archiveFormData.encryption_type = 'mk'"}
Encrypted with Standard File key
%label.enc-option
%input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'ek'", "ng-change" => "archiveFormData.encryption_type = 'ek'"}
{{user ? 'Encrypted with custom key' : 'Encrypted' }}
%div{"ng-if" => "!user || (user && archiveFormData.encryption_type == 'ek')"}
%input{"ng-model" => "archiveFormData.ek", "placeholder" => "Encryption key"}
%label.enc-option
%input{"type" => "radio", "ng-model" => "archiveFormData.encryption_type", "ng-value" => "'none'", "ng-change" => "archiveFormData.encryption_type = 'none'"}
Decrypted
.action-container
%a{"ng-click" => "downloadDataArchive()"} Download Data Archive
%div{"ng-if" => "!importData.loading"}
%label#import-archive
%input{"type" => "file", "style" => "display: none;", "file-change" => "->", "handler" => "importFileSelected(files)"}
%a.disabled
%span
Import Data from Archive
.import-password{"ng-if" => "importData.requestPassword"}
Enter the account password associated with the import file.
%input.field{"type" => "text", "ng-model" => "importData.password"}
%button{"ng-click" => "submitImportPassword()"} Decrypt & Import
.spinner{"ng-if" => "importData.loading"}
%div{"ng-if" => "!importData.loading"}
%label#import-archive
%input{"type" => "file", "style" => "display: none;", "file-change" => "->", "handler" => "importFileSelected(files)"}
%a.disabled
%span
Import Data from Archive
.import-password{"ng-if" => "importData.requestPassword"}
Enter the account password associated with the import file.
%input.field{"type" => "text", "ng-model" => "importData.password"}
%button{"ng-click" => "submitImportPassword()"} Decrypt & Import
.spinner{"ng-if" => "importData.loading"}

View File

@@ -4,7 +4,7 @@
.items
.item.account
%a{"ng-click" => "ctrl.accountMenuPressed()"} Data
%a{"ng-click" => "ctrl.accountMenuPressed()"} Account
%account-data-menu{"ng-if" => "ctrl.showAccountMenu"}
.item