Browse Source

add settings table to store names (and other things soon)

tweaks
Trent Larson 2 years ago
parent
commit
afc175e3e7
  1. 23
      src/db/index.ts
  2. 15
      src/db/tables/index.ts
  3. 45
      src/views/AccountViewView.vue
  4. 21
      src/views/NewEditAccountView.vue

23
src/db/index.ts

@ -1,6 +1,12 @@
import BaseDexie, { Table } from "dexie"; import BaseDexie, { Table } from "dexie";
import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon"; 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: * 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 = { type DexieTables = {
accounts: Table<Account>; accounts: Table<Account>;
settings: Table<Settings>;
}; };
export type Dexie<T extends unknown = DexieTables> = BaseDexie & T; export type Dexie<T extends unknown = DexieTables> = BaseDexie & T;
export const db = new BaseDexie("KickStart") as Dexie; 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: * Needed to enable a special webpack setting to allow *await* below:
@ -29,6 +38,12 @@ const secret =
if (localStorage.getItem("secret") == null) { if (localStorage.getItem("secret") == null) {
localStorage.setItem("secret", secret); localStorage.setItem("secret", secret);
} }
console.log(secret); console.log("Secret:", secret);
encrypted(db, { secretKey: 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 });
});

15
src/db/tables/accounts.ts → src/db/tables/index.ts

@ -9,7 +9,20 @@ export type Account = {
// mark encrypted field by starting with a $ character // mark encrypted field by starting with a $ character
// see https://github.com/PVermeer/dexie-addon-suite-monorepo/tree/master/packages/dexie-encrypted-addon // see https://github.com/PVermeer/dexie-addon-suite-monorepo/tree/master/packages/dexie-encrypted-addon
export const accountsSchema = { export const AccountsSchema = {
accounts: accounts:
"++id, dateCreated, derivationPath, $identity, $mnemonic, publicKeyHex", "++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;

45
src/views/AccountViewView.vue

@ -185,46 +185,47 @@
<script lang="ts"> <script lang="ts">
import { Options, Vue } from "vue-class-component"; import { Options, Vue } from "vue-class-component";
import { useClipboard } from "@vueuse/core"; 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"; //import { testServerRegisterUser } from "../test";
@Options({ @Options({
components: {}, components: {},
}) })
export default class AccountViewView extends Vue { export default class AccountViewView extends Vue {
firstName = // This registers current user in vue plugin with: $vm.ctx.testRegisterUser()
localStorage.getItem("firstName") === null //testRegisterUser = testServerRegisterUser;
? "--"
: localStorage.getItem("firstName");
lastName =
localStorage.getItem("lastName") === null
? "--"
: localStorage.getItem("lastName");
mnemonic = "";
address = ""; address = "";
privateHex = ""; firstName = "";
lastName = "";
mnemonic = "";
publicHex = ""; publicHex = "";
derivationPath = ""; derivationPath = "";
copy = useClipboard().copy; 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 // 'created' hook runs when the Vue instance is first created
async created() { async created() {
await db.open(); 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.mnemonic = generateSeed();
[this.address, this.privateHex, this.publicHex, this.derivationPath] = [this.address, privateHex, this.publicHex, this.derivationPath] =
deriveAddress(this.mnemonic); deriveAddress(this.mnemonic);
const newId = newIdentifier( const newId = newIdentifier(
this.address, this.address,
this.publicHex, this.publicHex,
this.privateHex, privateHex,
this.derivationPath this.derivationPath
); );
await db.accounts.add({ await db.accounts.add({
@ -234,13 +235,13 @@ export default class AccountViewView extends Vue {
mnemonic: this.mnemonic, mnemonic: this.mnemonic,
publicKeyHex: newId.keys[0].publicKeyHex, publicKeyHex: newId.keys[0].publicKeyHex,
}); });
}
} catch (err) { } catch (err) {
this.alertMessage = this.alertMessage =
"Clear your cache and start over. Root Cause: " + err; "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.alertTitle = "Error Creating Account";
this.isAlertVisible = true; this.isAlertVisible = true;
console.log(err);
}
} }
const accounts = await db.accounts.toArray(); const accounts = await db.accounts.toArray();

21
src/views/NewEditAccountView.vue

@ -50,6 +50,8 @@
<script lang="ts"> <script lang="ts">
import { Options, Vue } from "vue-class-component"; import { Options, Vue } from "vue-class-component";
import { db } from "@/db";
import { MASTER_SETTINGS } from "@/db/tables";
@Options({ @Options({
components: {}, components: {},
@ -64,13 +66,24 @@ export default class NewEditAccountView extends Vue {
? "--" ? "--"
: localStorage.getItem("lastName"); : 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() { onClickSaveChanges() {
db.settings.update(MASTER_SETTINGS, {
firstName: this.firstName,
lastName: this.lastName,
});
localStorage.setItem("firstName", this.firstName as string); localStorage.setItem("firstName", this.firstName as string);
localStorage.setItem("lastName", this.lastName as string); localStorage.setItem("lastName", this.lastName as string);
const route = { this.$router.push({ name: "account" });
name: "account",
};
this.$router.push(route);
} }
onClickCancel() { onClickCancel() {

Loading…
Cancel
Save