From afc175e3e7642b7b8b0abb777b3e5490acee59c0 Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Sat, 18 Mar 2023 19:56:57 -0600
Subject: [PATCH] add settings table to store names (and other things soon)

---
 src/db/index.ts                         | 23 +++++++++--
 src/db/tables/{accounts.ts => index.ts} | 15 ++++++-
 src/views/AccountViewView.vue           | 53 +++++++++++++------------
 src/views/NewEditAccountView.vue        | 21 ++++++++--
 4 files changed, 77 insertions(+), 35 deletions(-)
 rename src/db/tables/{accounts.ts => index.ts} (66%)

diff --git a/src/db/index.ts b/src/db/index.ts
index 26dcee09..e6d469e5 100644
--- a/src/db/index.ts
+++ b/src/db/index.ts
@@ -1,6 +1,12 @@
 import BaseDexie, { Table } from "dexie";
 import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
-import { Account, accountsSchema } from "./tables/accounts";
+import {
+  Account,
+  AccountsSchema,
+  MASTER_SETTINGS,
+  Settings,
+  SettingsSchema,
+} from "./tables";
 
 /**
  * In order to make the next line be acceptable, the program needs to have its linter suppress a rule:
@@ -12,10 +18,13 @@ import { Account, accountsSchema } from "./tables/accounts";
  */
 type DexieTables = {
   accounts: Table<Account>;
+  settings: Table<Settings>;
 };
+
 export type Dexie<T extends unknown = DexieTables> = BaseDexie & T;
 export const db = new BaseDexie("KickStart") as Dexie;
-const schema = Object.assign({}, accountsSchema);
+
+const AllSchemas = Object.assign({}, AccountsSchema, SettingsSchema);
 
 /**
  * Needed to enable a special webpack setting to allow *await* below:
@@ -29,6 +38,12 @@ const secret =
 if (localStorage.getItem("secret") == null) {
   localStorage.setItem("secret", secret);
 }
-console.log(secret);
+console.log("Secret:", secret);
 encrypted(db, { secretKey: secret });
-db.version(1).stores(schema);
+db.version(1).stores(AllSchemas);
+
+// initialize, a la https://dexie.org/docs/Tutorial/Design#the-populate-event
+db.on("populate", function () {
+  // ensure there's an initial entry for settings
+  db.settings.add({ id: MASTER_SETTINGS });
+});
diff --git a/src/db/tables/accounts.ts b/src/db/tables/index.ts
similarity index 66%
rename from src/db/tables/accounts.ts
rename to src/db/tables/index.ts
index d4a4e612..1c485942 100644
--- a/src/db/tables/accounts.ts
+++ b/src/db/tables/index.ts
@@ -9,7 +9,20 @@ export type Account = {
 
 // mark encrypted field by starting with a $ character
 // see https://github.com/PVermeer/dexie-addon-suite-monorepo/tree/master/packages/dexie-encrypted-addon
-export const accountsSchema = {
+export const AccountsSchema = {
   accounts:
     "++id, dateCreated, derivationPath, $identity, $mnemonic, publicKeyHex",
 };
+
+// a singleton
+export type Settings = {
+  id: number;
+  firstName?: string;
+  lastName?: string;
+};
+
+export const SettingsSchema = {
+  settings: "id",
+};
+
+export const MASTER_SETTINGS = 1;
diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index a202dfa5..e97cabe0 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -185,46 +185,47 @@
 <script lang="ts">
 import { Options, Vue } from "vue-class-component";
 import { useClipboard } from "@vueuse/core";
-import { deriveAddress, generateSeed, newIdentifier } from "../libs/crypto";
-import { db } from "../db";
+import { db } from "@/db";
+import { MASTER_SETTINGS } from "@/db/tables";
+import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
 //import { testServerRegisterUser } from "../test";
 
 @Options({
   components: {},
 })
 export default class AccountViewView extends Vue {
-  firstName =
-    localStorage.getItem("firstName") === null
-      ? "--"
-      : localStorage.getItem("firstName");
-  lastName =
-    localStorage.getItem("lastName") === null
-      ? "--"
-      : localStorage.getItem("lastName");
-  mnemonic = "";
+  // This registers current user in vue plugin with: $vm.ctx.testRegisterUser()
+  //testRegisterUser = testServerRegisterUser;
+
   address = "";
-  privateHex = "";
+  firstName = "";
+  lastName = "";
+  mnemonic = "";
   publicHex = "";
   derivationPath = "";
   copy = useClipboard().copy;
 
-  // This registers current user in vue plugin with: $vm.ctx.testRegisterUser()
-  //testRegisterUser = testServerRegisterUser;
-
   // 'created' hook runs when the Vue instance is first created
   async created() {
     await db.open();
-    const num_accounts = await db.accounts.count();
-    if (num_accounts === 0) {
-      try {
+    try {
+      const settings = await db.settings.get(MASTER_SETTINGS);
+      if (settings) {
+        this.firstName = settings.firstName || "";
+        this.lastName = settings.lastName || "";
+      }
+
+      const numAccounts = await db.accounts.count();
+      if (numAccounts === 0) {
+        let privateHex = "";
         this.mnemonic = generateSeed();
-        [this.address, this.privateHex, this.publicHex, this.derivationPath] =
+        [this.address, privateHex, this.publicHex, this.derivationPath] =
           deriveAddress(this.mnemonic);
 
         const newId = newIdentifier(
           this.address,
           this.publicHex,
-          this.privateHex,
+          privateHex,
           this.derivationPath
         );
         await db.accounts.add({
@@ -234,13 +235,13 @@ export default class AccountViewView extends Vue {
           mnemonic: this.mnemonic,
           publicKeyHex: newId.keys[0].publicKeyHex,
         });
-      } catch (err) {
-        this.alertMessage =
-          "Clear your cache and start over. Root Cause: " + err;
-        this.alertTitle = "Error Creating Account";
-        this.isAlertVisible = true;
-        console.log(err);
       }
+    } catch (err) {
+      this.alertMessage =
+        "Clear your cache and start over (after data backup). See console log for more info.";
+      console.log("Telling user to clear cache because:", err);
+      this.alertTitle = "Error Creating Account";
+      this.isAlertVisible = true;
     }
 
     const accounts = await db.accounts.toArray();
diff --git a/src/views/NewEditAccountView.vue b/src/views/NewEditAccountView.vue
index 55545b3e..d63d401c 100644
--- a/src/views/NewEditAccountView.vue
+++ b/src/views/NewEditAccountView.vue
@@ -50,6 +50,8 @@
 
 <script lang="ts">
 import { Options, Vue } from "vue-class-component";
+import { db } from "@/db";
+import { MASTER_SETTINGS } from "@/db/tables";
 
 @Options({
   components: {},
@@ -64,13 +66,24 @@ export default class NewEditAccountView extends Vue {
       ? "--"
       : localStorage.getItem("lastName");
 
+  // 'created' hook runs when the Vue instance is first created
+  async created() {
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS);
+    if (settings) {
+      this.firstName = settings.firstName || "";
+      this.lastName = settings.lastName || "";
+    }
+  }
+
   onClickSaveChanges() {
+    db.settings.update(MASTER_SETTINGS, {
+      firstName: this.firstName,
+      lastName: this.lastName,
+    });
     localStorage.setItem("firstName", this.firstName as string);
     localStorage.setItem("lastName", this.lastName as string);
-    const route = {
-      name: "account",
-    };
-    this.$router.push(route);
+    this.$router.push({ name: "account" });
   }
 
   onClickCancel() {