First Alpha

src/components/routes/vaults/Vaults.tsx

@@ -24,7 +24,9 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
       this.updateVaults = this.updateVaults.bind(this);
    }
 
-   updateVaults() {
+   updateVaults(s?: boolean) {
+      if (s)
+         return;
       return new Promise(yes => {
          Notes.getVaults().then(vaults => this.setState({ vaults }, yes))
       })
@@ -43,9 +45,11 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
       let inp_mod = new InputModal("Enter password for " + vault.name, "Password", "password");
       let key = undefined;
       while (true) {
-         let value = await inp_mod.getResult();
+         // inp_mod.show();
+         let value = await inp_mod.getResult(false);
          if (value === null) {
-            inp_mod.close();
+            console.log("Value is null")
+            inp_mod.close()
             return false;
          } else {
             key = Notes.passwordToKey(value);
@@ -57,13 +61,12 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
             }
          }
       }
-      inp_mod.close();
+      inp_mod.close()
 
       let perm = false;
       if (permanent) {
          let save_modal = new YesNoModal("Save permanent?");
          let res = await save_modal.getResult();
-         save_modal.close();
          if (res === undefined) {
             res = false;
          }
@@ -101,19 +104,16 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
    async addButtonClick() {
       let name_modal = new InputModal("Enter new name", "Name", "text");
       let name = await name_modal.getResult();
-      name_modal.close();
       if (name === null) return;
 
       let encrypted_modal = new YesNoModal("Encrypt?");
       let encrypted = encrypted_modal.getResult();
-      encrypted_modal.close();
       if (encrypted === null) return;
 
       let password;
       if (encrypted) {
          let password_modal = new InputModal("Enter new password", "Password", "password");
          password = await password_modal.getResult();
-         password_modal.close();
          if (password === null) return;
       }
 
@@ -127,11 +127,6 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
 
    onContext(evt: MouseEvent, vault: { name: string, encrypted: boolean, id: string }) {
       evt.preventDefault();
-      console.log("Context", evt);
-
-      // let context = <div style={{ position: "fixed", left: evt.pageX, top: evt.pageY, zIndex: 10 }}>
-      //    <button>Action 1</button>
-      // </div>
 
       const close = () => {
          window.removeEventListener("click", close);
@@ -142,7 +137,6 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
       let deleteb = <button onClick={async () => {
          let delete_modal = new YesNoModal("Delete Vault? Cannot be undone!");
          let result = await delete_modal.getResult();
-         delete_modal.close();
          if (result) {
             Notes.deleteVault(vault.id).then(() => {
                this.updateVaults();
@@ -157,7 +151,10 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
 
       let delete_key;
       if (Notes.getVaultKey(vault.id)) {
-         delete_key = <button onClick={() => { Notes.forgetVaultKey(vault.id); }}>
+         delete_key = <button onClick={() => {
+            Notes.forgetVaultKey(vault.id);
+            Notifications.sendSuccess("Forgot key!")
+         }}>
             forget password
          </button>;
       }
@@ -219,14 +216,16 @@ export default class VaultsPage extends Page<VaultsProps, { vaults: VaultList, m
       return <div style={{ marginTop: "-12px", paddingTop: "12px" }} >
          {this.state.modal}
          {this.state.context}
+         <header>
+            <span></span>
+            <h1 style="display:inline" class="button header_title" onClick={() => Navigation.setPage("/")}>Your vaults:</h1>
+            <span></span>
+         </header>
          <AddButton onClick={() => this.addButtonClick()} />
          <div class="container">
             <div class="row">
                <div class="col-sm-12 col-md-8 col-lg-6 col-md-offset-2 col-lg-offset-3">
                   <div class="card fluid">
-
-                     <h1 class="section double-padded">Your vaults:</h1>
-
                      <div class="section">
                         {elms}
                      </div>