Update 2015-12-30T03:03:36.133Z

app/settings/views/settingsDelete.html

@@ -0,0 +1,30 @@
+<div class="modal-header">
+    <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4 class="modal-title" id="deleteAccountModelLabel"><i class="fa fa-ban"></i> Delete Account</h4>
+</div>
+<form name="deleteAccountForm" ng-submit="deleteAccountForm.$valid && submit(model)" api-form="submitPromise">
+    <div class="modal-body">
+        <p>Continue below to delete your account and all associated data.</p>
+        <div class="callout callout-warning">
+            <h4><i class="fa fa-warning"></i> Warning</h4>
+            Deleting your account is permanent. It cannot be undone.
+        </div>
+        <div class="callout callout-danger validation-errors" ng-show="deleteAccountForm.$errors">
+            <h4>Errors have occured</h4>
+            <ul>
+                <li ng-repeat="e in deleteAccountForm.$errors">{{e}}</li>
+            </ul>
+        </div>
+        <div class="form-group" show-errors>
+            <label for="masterPassword">Master Password</label>
+            <input type="password" id="masterPassword" name="MasterPasswordHash" ng-model="model.masterPassword" class="form-control"
+                   required api-field />
+        </div>
+    </div>
+    <div class="modal-footer">
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="deleteAccountForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="deleteAccountForm.$loading"></i>Delete
+        </button>
+        <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
+    </div>
+</form>

app/tools/views/tools.html

@@ -5,5 +5,5 @@
     </h1>
 </section>
 <section class="content">
-    Content
+    Several tools are available in the menu to the left. More tools coming soon...
 </section>

app/tools/views/toolsImport.html

@@ -2,20 +2,28 @@
     <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <h4 class="modal-title" id="importModelLabel"><i class="fa fa-cloud-upload"></i> Import</h4>
 </div>
-<form name="importForm" ng-submit="importForm.$valid && import(model)" api-form="importPromise">
+<form name="importForm" ng-submit="importForm.$valid && import(model)" ng-show="!processing">
     <div class="modal-body">
-        <div class="callout callout-danger validation-errors" ng-show="importForm.$errors">
-            <h4>Errors have occured</h4>
-            <ul>
-                <li ng-repeat="e in importForm.$errors">{{e}}</li>
-            </ul>
+        <div class="form-group">
+            <label for="source">Source</label>
+            <select id="source" name="source" class="form-control" ng-model="model.source">
+                <option value="local">bitwarden</option>
+                <option value="lastpass">LastPass</option>
+            </select>
+        </div>
+        <div class="form-group">
+            <label for="file">File</label>
+            <input type="file" id="file" name="file" />
         </div>
-        Coming soon...
     </div>
     <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="importForm.$loading">
-            <i class="fa fa-refresh fa-spin loading-icon" ng-show="importForm.$loading"></i> Import
+        <button type="submit" class="btn btn-primary btn-flat">
+            Import
         </button>
         <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
     </div>
 </form>
+<div ng-show="processing" class="modal-body text-center">
+    <p><i class="fa fa-cog fa-spin fa-3x"></i></p>
+    <p>Please wait. We are now importing all of your data. Do not close this window. You will be redirected to your vault when the import has completed.</p>
+</div>

app/vault/views/vault.html

@@ -5,7 +5,10 @@
     </h1>
 </section>
 <section class="content">
-    <div class="box" ng-repeat="folder in folders | orderBy: 'name'">
+    <div ng-show="loadingFolders && !folders.length">
+        <p>Loading...</p>
+    </div>
+    <div class="box" ng-repeat="folder in folders | orderBy: 'name'" ng-show="folders.length">
         <div class="box-header with-border">
             <h3 class="box-title"><i class="fa fa-folder-open"></i> {{folder.name}}</h3>
             <div class="box-tools pull-right">
@@ -21,12 +24,15 @@
             </div>
         </div>
         <div class="box-body" ng-class="{'no-padding': folderSites.length}">
-            <div ng-show="!folderSites.length">
+            <div ng-show="loadingSites && !folderSites.length">
+                <p>Loading sites...</p>
+            </div>
+            <div ng-show="!loadingSites && !folderSites.length">
                 <p>No sites in this folder.</p>
                 <button type="button" ng-click="addSite(folder)" class="btn btn-default btn-flat">Add a Site</button>
             </div>
-            <div class="table-responsive">
-                <table class="table table-striped table-hover" ng-show="folderSites.length">
+            <div class="table-responsive" ng-show="folderSites.length">
+                <table class="table table-striped table-hover">
                     <thead>
                         <tr>
                             <th style="max-width: 200px;">Site</th>

app/vault/views/vaultAddSite.html

@@ -44,7 +44,7 @@
                 <div class="form-group" show-errors>
                     <label for="username">Username</label>
                     <div class="input-group">
-                        <input type="text" id="username" name="Username" ng-model="site.username" class="form-control" required api-field />
+                        <input type="text" id="username" name="Username" ng-model="site.username" class="form-control" api-field />
                         <span class="input-group-btn" uib-tooltip="Copy Username" tooltip-placement="left">
                             <button tabindex="-1" class="btn btn-default btn-flat" type="button" ngclipboard
                                     ngclipboard-error="clipboardError(e)"

app/vault/views/vaultEditSite.html

@@ -47,7 +47,7 @@
                 <div class="form-group" show-errors>
                     <label for="username">Username</label>
                     <div class="input-group">
-                        <input type="text" id="username" name="Username" ng-model="site.username" class="form-control" required api-field />
+                        <input type="text" id="username" name="Username" ng-model="site.username" class="form-control" api-field />
                         <span class="input-group-btn" uib-tooltip="Copy Username" tooltip-placement="left">
                             <button tabindex="-1" class="btn btn-default btn-flat" type="button" ngclipboard
                                     ngclipboard-error="clipboardError(e)"

app/views/backendLayout.html

@@ -52,6 +52,7 @@
                         <li><a href="javascript:void(0)" ng-click="changeEmail()"><i class="fa fa-circle-o"></i> Change Email</a></li>
                         <li><a href="javascript:void(0)" ng-click="sessions()"><i class="fa fa-circle-o"></i> Deauthorize Sessions</a></li>
                         <li><a href="javascript:void(0)" ng-click="twoFactor()"><i class="fa fa-circle-o"></i> Two-step Login</a></li>
+                        <li><a href="javascript:void(0)" ng-click="delete()"><i class="fa fa-circle-o"></i> Delete Account</a></li>
                     </ul>
                 </li>
                 <li class="treeview" ng-class="{active: $state.includes('backend.tools')}">