Merge branch 'master' into fix-contact-totals

.gitignore

@@ -1,17 +1,13 @@
 .DS_Store
 node_modules
 /dist
-signature.bin
-*.pem
-verified.txt
-myenv
 
 *~
 # local env files
 .env.local
 .env.*.local
 
-# Log filesopenssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature") "$signing_input"
+# Log files
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*

CHANGELOG.md

@@ -1,25 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-
-## [Unreleased]
-
-### Added
-- Web push notifications
-
-## [0.1.3] - 2023.11.08 - 910f57ec7d2e50803ae3d04f4b927e0f5219fbde
-### Added
-- Contact name editing
-### Changed
-- Don't show actions on front page if not registered.
-### Removed
-- Home page Notiwind test buttons
-
-
-## [0.1.2] - 2023.11.01 - 7f6c93802911a030a89fe3706e18b5c17151e5bb
-### Added
-- Basics: create ID, record a give, declare a project, search, and get notifications.

README.md

@@ -1,9 +1,6 @@
-# TimeSafari.app - Crowd-Funder for Time - PWA
+# kickstart-for-time-pwa
 
 ## Project setup
-
-We have pkgx.dev set up in package.json, so you can use `dev` to set up the dev environment.
-
 ```
 npm install
 ```
@@ -13,37 +10,40 @@ npm install
 npm run serve
 ```
 
+### Compiles and minifies for production
+```
+npm run build
+```
+
 ### Lints and fixes files
 ```
 npm run lint
 ```
 
-### Compiles and minifies for production
+### Test key contents
 
-If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
-
-```
-npm run build
-```
-
-```
-npx prettier --write ./sw_scripts/
-```
-to make sure the service worker scripts are in proper form
-
-... then copy the contents of the `sw_scripts` folder to the `dist` folder - except additional_scripts.js.
-
-
-
-## Tests
+See [this page](openssl_signing_console.rst)
 
 ### Register new user on test server
 
+New users require registration. This can be done with a claim payload like this
+by an existing user:
+
+```
+  const vcClaim = {
+    "@context": "https://schema.org",
+    "@type": "RegisterAction",
+    agent: { identifier: identity0.did },
+    object: SERVICE_ID,
+    participant: { identifier: newIdentity.did },
+  };
+```
+
 On the test server, User #0 has rights to register others, so you can start
 playing one of two ways:
 
-- Import the keys for the test User `did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F` by importing this seed phrase:
-  `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
+- Import the keys for the test User `did:ethr:0x000Ee5654b9742f6Fe18ea970e32b97ee2247B51` by importing this seed phrase:
+  `seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control`
   (Other test users are found [here](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js).)
 
 - Alternatively, register someone else under User #0 automatically:
@@ -54,39 +54,14 @@ playing one of two ways:
 
 ### Create multiple identifiers
 
-Under the "Your Identity" screen, click "Advanced", click "Switch Identity / No Identity", then "Add Another Identity...".
+Go to /start and create or import a new one. Then switch identifiers on the bottom of the Your Identity page.
 
 ### Create keys with alternate tools
 
-[This page](openssl_signing_console.rst) is a tool to create a JWT from a locally-generated keypair.
-
-### Web-push
-
-For your own web-push tests, change the 'vapid' URL in App.vue, and install apps on the same domain.
-
-### Icons
-
-To add an icon, add to main.ts and reference with `fa` element and `icon` attribute with the hyphenated name.
-
-### Manual walk-through
-
-- Clear the browser cache for localhost for a new user.
-  - See that it's using the test API.
-  - On each page, verify the messaging.
-  - On the home page, see the feed without names, and see a message prompting to generate an ID.
-  - On the discovery page, check that they can see projects, and set a search area to see projects nearby.
-- As User #0 in another browser on the test API, add a give & a project. (See User #0 details above.)
-  - With the new user on the home page, see the feed that shows User #0 in network but without the name.
-- As the new user on the contacts page, add User #0 as a contact.
-  - On the home page, see the feed that shows User #0 with a name.
-- Generate an ID.
-  - On the home page, check that it now prompts them to get registered.
-  - On the account page, check that they see messages on limits.
-- Register the ID from User #0.
-  - As the new user on the home page, check that they can now record a gift.
-  - On the contacts page, check that they cannot register someone else yet.
-- Walk through the functions on each page.
+See [this page](openssl_signing_console.rst)
 
+### Customize Vue configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).
 
 
 ## Scenarios
@@ -94,33 +69,137 @@ To add an icon, add to main.ts and reference with `fa` element and `icon` attrib
 - Create a new identity as prompted. Go to "Your Identity" screen and copy the ID to the clipboard.
 
 - Go back to /start and import test User `did:ethr:0x000Ee5654b9742f6Fe18ea970e32b97ee2247B51` with this this seed phrase:
-  `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
+  `seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control`
   (Other test users are found [here](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js).)
 
 - Go to "Your Contacts" screen and add the ID you copied to the clipboard, and hit "+" to add them.
 
 - Click on the "Registration Unknown" button and register that person to be able to make claims as them.
 
-### Clear/Reset data & restart
+### Clear data & restart
 
-* Clear cache for localhost.
-* Unregister service worker (in Chrome, go to `chrome://serviceworker-internals/`; in Firefox, go to `about:serviceworkers` or `about:debugging`).
-* Clear notification permission (in Chrome, go to `chrome://settings/content/notifications`; in Firefox, go to `about:preferences` and search).
+Clear cache for localhost, then go to http://localhost:8080/start
+(because it'll generate a new one automatically if you start on the `/account` page).
 
 
 
+## Dependencies
+
+See https://tea.xyz
+
+| Project    | Version   |
+| ---------- | --------- |
+| nodejs.org | ^16.0.0   |
+| npmjs.com  | ^8.0.0    |
 
 ## Other
 
 ### Reference Material
 
-* Notifications can be type of `toast` (self-dismiss), `info`, `success`, `warning`, and `danger`.
-  They are done via [notiwind](https://www.npmjs.com/package/notiwind) and set up in App.vue.
+```
+// reference material from https://github.com/trentlarson/endorser-mobile/blob/8dc8e0353e0cc80ffa7ed89ded15c8b0da92726b/src/utility/idUtility.ts#L83
 
-* [Customize Vue configuration](https://cli.vuejs.org/config/).
+// Import an existing ID
+export const importAndStoreIdentifier = async (mnemonic: string, mnemonicPassword: string, toLowercase: boolean, previousIdentifiers: Array<IIdentifier>) => {
 
+  // just to get rid of variability that might cause an error
+  mnemonic = mnemonic.trim().toLowerCase()
 
-### Kudos
+  /**
+  // an approach I pieced together
+  // requires: yarn add elliptic
+  // ... plus:
+  // const EC = require('elliptic').ec
+  // const secp256k1 = new EC('secp256k1')
+  //
+  const keyHex: string = bip39.mnemonicToEntropy(mnemonic)
+  // returns a KeyPair from the elliptic.ec library
+  const keyPair = secp256k1.keyFromPrivate(keyHex, 'hex')
+  // this code is from did-provider-eth createIdentifier
+  const privateHex = keyPair.getPrivate('hex')
+  const publicHex = keyPair.getPublic('hex')
+  const address = didJwt.toEthereumAddress(publicHex)
+  **/
+
+  /**
+  // from https://github.com/uport-project/veramo/discussions/346#discussioncomment-302234
+  // ... which almost works but the didJwt.toEthereumAddress is wrong
+  // requires: yarn add bip32
+  // ... plus: import * as bip32 from 'bip32'
+  //
+  const seed: Buffer = await bip39.mnemonicToSeed(mnemonic)
+  const root = bip32.fromSeed(seed)
+  const node = root.derivePath(UPORT_ROOT_DERIVATION_PATH)
+  const privateHex = node.privateKey.toString("hex")
+  const publicHex = node.publicKey.toString("hex")
+  const address = didJwt.toEthereumAddress('0x' + publicHex)
+  **/
+
+  /**
+  // from https://github.com/uport-project/veramo/discussions/346#discussioncomment-302234
+  // requires: yarn add @ethersproject/hdnode
+  // ... plus: import { HDNode } from '@ethersproject/hdnode'
+  **/
+  const hdnode: HDNode = HDNode.fromMnemonic(mnemonic)
+  const rootNode: HDNode = hdnode.derivePath(UPORT_ROOT_DERIVATION_PATH)
+  const privateHex = rootNode.privateKey.substring(2) // original starts with '0x'
+  const publicHex = rootNode.publicKey.substring(2) // original starts with '0x'
+  let address = rootNode.address
+
+  const prevIds = previousIdentifiers || [];
+
+  if (toLowercase) {
+    const foundEqual = R.find(
+      (id) => utility.rawAddressOfDid(id.did) === address,
+      prevIds
+    )
+    if (foundEqual) {
+      // They're trying to create a lowercase version of one that exists in normal case.
+      // (We really should notify the user.)
+      appStore.dispatch(appSlice.actions.addLog({log: true, msg: "Will create a normal-case version of the DID since a regular version exists."}))
+    } else {
+      address = address.toLowerCase()
+    }
+  } else {
+    // They're not trying to convert to lowercase.
+    const foundLower = R.find((id) =>
+      utility.rawAddressOfDid(id.did) === address.toLowerCase(),
+      prevIds
+    )
+    if (foundLower) {
+      // They're trying to create a normal case version of one that exists in lowercase.
+      // (We really should notify the user.)
+      appStore.dispatch(appSlice.actions.addLog({log: true, msg: "Will create a lowercase version of the DID since a lowercase version exists."}))
+      address = address.toLowerCase()
+    }
+  }
+
+  appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... derived keys and address..."}))
+
+  const newId = newIdentifier(address, publicHex, privateHex, UPORT_ROOT_DERIVATION_PATH)
+  appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... created new ID..."}))
+
+  // awaiting because otherwise the UI may not see that a mnemonic was created
+  const savedId = await storeIdentifier(newId, mnemonic, mnemonicPassword)
+  appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... stored new ID..."}))
+  return savedId
+}
+
+// Create a totally new ID
+export const createAndStoreIdentifier = async (mnemonicPassword) => {
+
+  // This doesn't give us the entropy/seed.
+  //const id = await agent.didManagerCreate()
+
+  const entropy = crypto.randomBytes(32)
+  const mnemonic = bip39.entropyToMnemonic(entropy)
+  appStore.dispatch(appSlice.actions.addLog({log: false, msg: "... generated mnemonic..."}))
+
+  return importAndStoreIdentifier(mnemonic, mnemonicPassword, false, [])
+}
+```
+
+## Kudos
 
 Gifts make the world go 'round!
 

openssl_signing_console.rst

@@ -1,11 +1,4 @@
-JWT Creation & Verification
-
-To run this in a script, see ./openssl_signing_console.sh
-
-Prerequisites: openssl, jq
-
-You can create a JWT using a library or by encoding the header and payload base64Url and signing it with a secret using
-a ES256K algorithm. Here is an example of how you can create a JWT using the jq and openssl command line utilities:
+You can create a JWT using a library or by encoding the header and payload base64Url and signing it with a secret using a ES256K algorithm. Here is an example of how you can create a JWT using the jq and openssl command line utilities:
 
 Here is an example of how you can use openssl to sign a JWT with the ES256K algorithm:
 
@@ -18,22 +11,20 @@ openssl ec -in private.pem -pubout -out public.pem
 
 header='{"alg":"ES256K", "issuer": "", "typ":"JWT"}'
 
-    Next, create a payload object as a JSON object containing the claims you want to include in the JWT.
-    For example schema.org :
+    Next, create a payload object as a JSON object containing the claims you want to include in the JWT. For example schema.org :
 
 payload='{"@context": "http://schema.org", "@type": "PlanAction", "identifier": "did:ethr:0xb86913f83A867b5Ef04902419614A6FF67466c12", "name": "Test", "description": "Me"}'
 
     Encode the header and payload objects as base64Url strings. You can use the jq command line utility to do this:
 
-header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
-payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
+header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n')
+payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n')
 
     Concatenate the encoded header, payload, and a secret to create the signing input:
 
 signing_input="$header_b64.$payload_b64"
 
-    Create the signature by signing the signing input with a ES256K algorithm and your secret.
-    You can use the openssl command line utility to do this:
+    Create the signature by signing the signing input with a ES256K algorithm and your secret. You can use the openssl command line utility to do this:
 
 signature=$(echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem)
 
@@ -48,7 +39,7 @@ Authorization: Bearer $jwt
 
     To verify the JWT, you can use the openssl utility with the public key:
 
-echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature")
+openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature") "$signing_input"
+
+    This will verify the signature and output Verified OK if the signature is valid. If the signature is not valid, it will output an error.
 
-    This will verify the signature and output "Verified OK" if the signature is valid.
-    If the signature is not valid, it will give an error response and output "Verification failure".

openssl_signing_console.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# Generate a JWT, with signature verified using OpenSSL
-#
-# Prerequisites: openssl, jq
-#
-# Usage: source ./openssl_signing_console.sh
-#
-# For a more complete explanation, see ./openssl_signing_console.rst
-
-
-# Generate a key and extract the public part
-openssl ecparam -name secp256k1 -genkey -noout -out private.pem
-openssl ec -in private.pem -pubout -out public.pem
-
-# Use test data
-header='{"alg":"ES256K", "issuer": "", "typ":"JWT"}'
-payload='{"@context": "http://schema.org", "@type": "PlanAction", "identifier": "did:ethr:0xb86913f83A867b5Ef04902419614A6FF67466c12", "name": "Test", "description": "Me"}'
-
-header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
-payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
-
-signing_input="$header_b64.$payload_b64"
-
-signature=$(echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem | openssl base64 -e)
-
-echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature" | openssl base64 -d)
-
-
-
-
-
-# Read binary signature and encode it to Base64 URL-Safe format
-signature_b64=$(echo -n "$signature" | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
-
-# Construct the JWT
-jwt="$signing_input.$signature_b64"
-
-echo Resulting JWT: $jwt

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "crowd-funder-for-time-pwa",
-  "version": "0.1.4",
+  "name": "kickstart-for-time-pwa",
+  "version": "0.1.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -9,60 +9,58 @@
   },
   "dependencies": {
     "@ethersproject/hdnode": "^5.7.0",
-    "@fortawesome/fontawesome-svg-core": "^6.4.2",
-    "@fortawesome/free-solid-svg-icons": "^6.4.2",
+    "@fortawesome/fontawesome-svg-core": "^6.4.0",
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
     "@fortawesome/vue-fontawesome": "^3.0.3",
     "@pvermeer/dexie-encrypted-addon": "^3.0.0",
     "@tweenjs/tween.js": "^21.0.0",
-    "@veramo/core": "^5.4.1",
-    "@veramo/credential-w3c": "^5.4.1",
-    "@veramo/data-store": "^5.4.1",
-    "@veramo/did-manager": "^5.4.1",
-    "@veramo/did-provider-ethr": "^5.4.1",
-    "@veramo/did-resolver": "^5.4.1",
-    "@veramo/key-manager": "^5.4.1",
-    "@vueuse/core": "^10.4.1",
+    "@veramo/core": "^5.2.0",
+    "@veramo/credential-w3c": "^5.2.0",
+    "@veramo/data-store": "^5.2.0",
+    "@veramo/did-manager": "^5.1.2",
+    "@veramo/did-provider-ethr": "^5.1.2",
+    "@veramo/did-resolver": "^5.2.0",
+    "@veramo/key-manager": "^5.1.2",
+    "@vueuse/core": "^10.2.1",
     "@zxing/text-encoding": "^0.9.0",
-    "axios": "^1.5.0",
+    "axios": "^1.4.0",
     "buffer": "^6.0.3",
     "class-transformer": "^0.5.1",
-    "core-js": "^3.32.1",
+    "core-js": "^3.31.1",
     "dexie": "^3.2.4",
     "dexie-export-import": "^4.0.7",
-    "did-jwt": "^7.2.7",
-    "ethereum-cryptography": "^2.1.2",
+    "did-jwt": "^7.2.4",
+    "ethereum-cryptography": "^2.0.0",
     "ethereumjs-util": "^7.1.5",
-    "ethr-did-resolver": "^8.1.2",
+    "ethr-did-resolver": "^8.0.0",
     "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
-    "localstorage-slim": "^2.5.0",
-    "luxon": "^3.4.3",
+    "localstorage-slim": "^2.4.0",
+    "luxon": "^3.3.0",
     "merkletreejs": "^0.3.10",
     "moment": "^2.29.4",
     "notiwind": "^2.0.2",
     "papaparse": "^5.4.1",
     "pina": "^0.20.2204228",
-    "pinia-plugin-persistedstate": "^3.2.0",
+    "pinia-plugin-persistedstate": "^3.1.0",
     "qr-code-generator-vue3": "^1.4.21",
     "ramda": "^0.29.0",
     "readable-stream": "^4.4.2",
     "reflect-metadata": "^0.1.13",
     "register-service-worker": "^1.7.2",
-    "three": "^0.156.1",
+    "three": "^0.154.0",
     "vue": "^3.3.4",
     "vue-axios": "^3.5.2",
-    "vue-facing-decorator": "^3.0.2",
-    "vue-qrcode-reader": "^5.4.1",
-    "vue-router": "^4.2.4",
+    "vue-facing-decorator": "^2.1.20",
+    "vue-property-decorator": "^9.1.2",
+    "vue-router": "^4.2.3",
     "web-did-resolver": "^2.0.27"
   },
   "devDependencies": {
-    "@types/leaflet": "^1.9.4",
     "@types/ramda": "^0.29.3",
-    "@types/three": "^0.155.1",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
-    "@vue-leaflet/vue-leaflet": "^0.10.1",
+    "@types/three": "^0.152.1",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.0",
     "@vue/cli-plugin-babel": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
     "@vue/cli-plugin-pwa": "~5.0.8",
@@ -71,15 +69,14 @@
     "@vue/cli-plugin-vuex": "~5.0.8",
     "@vue/cli-service": "~5.0.8",
     "@vue/eslint-config-typescript": "^11.0.3",
-    "autoprefixer": "^10.4.15",
-    "eslint": "^8.53.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-vue": "^9.17.0",
-    "leaflet": "^1.9.4",
-    "postcss": "^8.4.29",
-    "prettier": "^3.1.0",
-    "tailwindcss": "^3.3.3",
-    "typescript": "~5.2.2"
+    "autoprefixer": "^10.4.14",
+    "eslint": "^8.44.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-prettier": "^5.0.0-alpha.1",
+    "eslint-plugin-vue": "^9.15.1",
+    "postcss": "^8.4.24",
+    "prettier": "^3.0.0",
+    "tailwindcss": "^3.3.2",
+    "typescript": "~5.1.6"
   }
 }

project.task.yaml

@@ -1,85 +1,80 @@
 
 tasks:
+- .2 bug - on contacts view, click on "to" & "from" and nothing happens
+- 01 add a location for a project via map pin :
+  - add with a "location" field containing this: { "geo":{ "@type":"GeoCoordinates", "latitude":40.883944, "longitude":-111.884787 } }
+- 04 search by a bounding box for local projects (see API by clicking on "Nearby")
+- 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:jose
+- 02 Fix images on projectview - allow choice of image from a pallete of images or a url image.
+
+- 08 Scan QR code to import into contacts.
 
 - 40 notifications :
-  - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
-  - extract private_key_hex in py-push-server webpush.py
-  - lock down regenerate_vapid endpoint (so only we admins can do it on demand)
-  - remove sleep in py-push-server app.py
-  - revisit "maybe" and "never" buttons on accont screen
-  - see if we can detect OS-level notifications if turned off
-  - write troubleshooting docs for notifications
+    - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data
 
-- .3 fix the Project-location-selection map display to not show on top of bottom icons (and any other UI tweaks on the map flow) assignee-group:ui
+- refactor UI :
+  - .5 Alerts show at the top and can be missed if you've scrolled down on the page, eg. account data download
+  - .2 Make alerts at the top more visible (because they're currently a similar color and sometimes aren't seen)
 
-- .5 Add infinite scroll to gifts on the home page
+- Show pop-up or some message confirming that settings & contacts download has been initiated/finished
 
-- .5 If notifications are not enabled, add message to front page with link/button to enable
+- Ensure each action sent to the server has a confirmation - eg registration
 
-- show VC details... somehow:
-  - .5 make a VC details page, or link to endorser.ch (including confirmations)
-  - 01 allow download of each VC (& confirmations, to show that they actually own their data)
-  - 04 allow user to download VCs, mine + ones I can see about me from others
-  - add VC confirmation?
+- Home Feed & Quick Give screen :
+  - 01 save the feed-viewed status in settings storage ("afterQuery")
+  - 01 quick action - send action, maybe choose via canvas tool https://github.com/konvajs/vue-konva
+
+- 24 Move to Vite
+
+- .5 add link to further project / people when a project pays ahead
+- .5 add project ID to the URL, to make a project publicly-accessible
+- .5 remove edit from project page for projects owned by others
+- .5 fix where user 0 sees no txns from user 1 on contacts page but sees them on list page
+- .2 there are three dots at the top of ProjectViewView that refreshes the page but doesn't do anything else
+- 01 fix images on project page, on discovery page
+- .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist
+- .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?)
+- .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
+- .2 move 'switch identity' to the advanced section
+- .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164
+
+- Discuss whether the remaining tasks are worthwhile before MVP release.
+
+- contacts v+ :
+  - 01 Import all the non-sensitive data (ie. contacts & settings).
+  - .2 show error to user when adding a duplicate contact
+  - 01 parse input more robustly (with CSV lib and not commas)
+
+- stats v1 :
+  - 01 show numeric stats
+  - 01 link to world for specific stats
+  - .5 don't load another instance of a bush if it already exists
+  - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
+  - 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie)
+
+- .5 on ProjectView page, show immediate feedback when a gift is given (on list?) -- and consider the same for Home & Contacts pages
+- .5 customize favicon
+- 04 allow user to download claims, mine + ones I can see about me from others
+- Do we want to combine first name & last name?
+- Show a warning if both giver and recipient are the same (but still allow?)
 
 - Release Minimum Viable Product :
-  - generate new webpush.db entry, webpush.py private_key_hex & subscription_info & vapid_claims email
-  - .5 deploy endorser.ch server above Dec 1 (to get plan searches by names as well as descriptions)
   - 08 thorough testing for errors & edge cases
-  - 01 ensure ability to recover server remotely, and add redundant access
   - Turn off stats-world or ensure it's usable (eg. cannot zoom out too far and lose world, cannot screenshot).
   - Add disclaimers.
+  - Rename DB to TimeSafari.
   - Switch default server to the public server.
   - Deploy to a server.
   - Ensure public server has limits that work for group adoption.
   - Test PWA features on Android and iOS.
   blocks: ref:https://raw.githubusercontent.com/trentlarson/lives-of-gifts/master/project.yaml#kickstarter%20for%20time
 
-- make identicons for contacts into more-memorable faces (and maybe change project identicons, too)
-- allow some gives even if they aren't registered
-- .5 Add start date to project
-- .3 check that Android shows "back" buttons on screens without bottom tray
-- .1 Make give description text box into something that expands as they type?
-- .5 customize favicon assignee-group:ui
-- .2 Show a warning if both giver and recipient are the same (but still allow?)
-- 01 Would it look better to shrink the buttons on many pages so they don't expand to the width of the screen? assignee-group:ui
-- .5 Display a more appealing confirmation on the map when erasing the marker
-- .5 include the hash of the latest commit on help page next to version (maybe Trent's git-hash branch)
-- .5 remove references to localStorage for projectId (now that it's pulling from the path)
-- bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent
-- switch some checks for activeDid to check for isRegistered
-- .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
-- .5 fix cert generation on server (since it didn't happen automatically for Nov 30)
-- contacts v+ :
-  - 01 Import all the non-sensitive data (ie. contacts & settings).
-  - .2 show error to user when adding a duplicate contact
-  - 01 parse input more robustly (with CSV lib and not commas)
-- stats v1 :
-  - 01 show numeric stats
-  - 04 show different graphic for projects vs people (gnome?) on world
-  - 01 link to world for specific stats
-  - .5 don't load another instance of a bush if it already exists
-  - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
-  - 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie)
-
-- .5 show seed phrase in a QR code for transfer to another device
-- .5 on DiscoverView, switch to a filter UI (eg. just from friend
-- .5 don't show "Offer" on project screen if they aren't registered
-
-- 24 Move to Vite
-- 32 accept images for projects
-- 32 accept images for contacts
-
 - linking between projects or plans :
   - show total time given to & from a project
   - terminology:
     - for subtasks: fulfills (is it really the same?), feeds, contributes to, supplies, boosts, advances
     - for blocking: blocks, precedes, comes before, is sought by -- vs follows, seeks, builds on ("contributes to" isn't specific enough, "succeeds" has different, possibly confusing meaning)
 
-- .5 add "back" button to all screens that aren't part of the bottom tray
-- .5 fit as many icons as possible on home & project view screens but only going halfway down the page assignee-group:ui
-- .5 Replace Gifted/Give in ContactsView with GiftedDialog
-
 - Stats :
   - 01 point out user's location on the world
   - 01 present a credential selected from the stats
@@ -96,19 +91,17 @@ tasks:
 
 - Multiple identities
 
-- Support KERI AIDs
-- Support Peer DIDs
-- Support messaging through DIDComm
-- Write to or read from a different ledger (eg. private ACDC, EAS & attest.sh)
+- Peer DID
+
+- DIDComm
+
+- Write to or read from a different ledger (eg. private ACDC, attest.sh)
 
 - Do we want split first name & last name?
 
 - 40 notifications v+ :
   - pull, w/ scheduled runs
 
-- 01 On nearby search, if user starts changing their box but cancels and goes back to the map it is zoomed far out. Fix to fit the box better.
-- 16 From the home screen, make the quick action even easier.
-
 log:
 - videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29
 - project lists, contact totals & actions, multiple identifiers, stats-world, activity feed, rename of this project file (use "--follow --") milestone:2 done:2023-06-27

src/App.vue

@@ -1,7 +1,6 @@
 <template>
   <router-view />
 
-  <!-- https://github.com/emmanuelsw/notiwind -->
   <NotificationGroup group="alert">
     <div
       class="fixed top-4 right-4 w-full max-w-sm flex flex-col items-start justify-end"
@@ -128,418 +127,8 @@
       </Notification>
     </div>
   </NotificationGroup>
-
-  <NotificationGroup group="modal">
-    <div class="fixed z-[100] top-0 inset-x-0 w-full">
-      <Notification
-        v-slot="{ notifications, close }"
-        enter="transform ease-out duration-300 transition"
-        enter-from="translate-y-2 opacity-0 sm:translate-y-4"
-        enter-to="translate-y-0 opacity-100 sm:translate-y-0"
-        leave="transition ease-in duration-500"
-        leave-from="opacity-100"
-        leave-to="opacity-0"
-        move="transition duration-500"
-        move-delay="delay-300"
-      >
-        <div
-          v-for="notification in notifications"
-          :key="notification.id"
-          class="w-full"
-          role="alert"
-        >
-          <div
-            v-if="notification.type === 'notification-permission'"
-            class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
-          >
-            <div
-              class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
-            >
-              <div class="w-full px-6 py-6 text-slate-900 text-center">
-                <p class="text-lg mb-4">
-                  Would you like to <b>turn on</b> notifications for this app?
-                </p>
-
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                  @click="
-                    close(notification.id);
-                    turnOnNotifications();
-                  "
-                >
-                  Turn on Notifications
-                </button>
-                <div class="grid grid-cols-2 gap-2">
-                  <button
-                    @click="maybeLater(notification.id)"
-                    class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
-                  >
-                    Maybe Later
-                  </button>
-                  <button
-                    @click="never(notification.id)"
-                    class="block w-full text-center text-md font-bold uppercase bg-rose-600 text-white px-2 py-2 rounded-md"
-                  >
-                    Never
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            v-if="notification.type === 'notification-mute'"
-            class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
-          >
-            <div
-              class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
-            >
-              <div class="w-full px-6 py-6 text-slate-900 text-center">
-                <p class="text-lg mb-4">Mute app notifications:</p>
-
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  For 1 Hour
-                </button>
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  For 8 Hours
-                </button>
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  For 24 Hours
-                </button>
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  Until I turn it back on
-                </button>
-                <button
-                  @click="close(notification.id)"
-                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
-                >
-                  Cancel
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            v-if="notification.type === 'notification-off'"
-            class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
-          >
-            <div
-              class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
-            >
-              <div class="w-full px-6 py-6 text-slate-900 text-center">
-                <p class="text-lg mb-4">
-                  Would you like to <b>turn off</b> notifications for this app?
-                </p>
-
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-rose-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  Turn Off Notifications
-                </button>
-                <button
-                  @click="close(notification.id)"
-                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
-                >
-                  Leave it On
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </Notification>
-    </div>
-  </NotificationGroup>
 </template>
 
 <style></style>
 
-<script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
-import axios from "axios";
-interface ServiceWorkerMessage {
-  type: string;
-  data: string;
-}
-
-interface ServiceWorkerResponse {
-  // Define the properties and their types
-  success: boolean;
-  message?: string;
-}
-
-// Example interface for error
-interface ErrorResponse {
-  message: string;
-  // Other properties as needed
-}
-
-interface VapidResponse {
-  data: {
-    vapidKey: string;
-  };
-}
-
-import { AppString } from "@/constants/app";
-import { db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component
-export default class App extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
-  b64 = "";
-
-  async mounted() {
-    try {
-      await db.open();
-      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      let pushUrl: string = AppString.DEFAULT_PUSH_SERVER;
-      if (settings?.webPushServer) {
-        pushUrl = settings.webPushServer;
-      }
-
-      await axios
-        .get(pushUrl + "/web-push/vapid")
-        .then((response: VapidResponse) => {
-          this.b64 = response.data?.vapidKey || "";
-          console.log("Got vapid key:", this.b64);
-          navigator.serviceWorker.addEventListener("controllerchange", () => {
-            console.log("New service worker is now controlling the page");
-          });
-        });
-      if (!this.b64) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Setting Notifications",
-            text: "Could not set notifications.",
-          },
-          -1,
-        );
-      }
-    } catch (error) {
-      console.error("Got an error initializing notifications:", error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Setting Notifications",
-          text: "Got an error setting notifications.",
-        },
-        -1,
-      );
-    }
-  }
-
-  private sendMessageToServiceWorker(
-    message: ServiceWorkerMessage,
-  ): Promise<unknown> {
-    return new Promise((resolve, reject) => {
-      if (navigator.serviceWorker.controller) {
-        const messageChannel = new MessageChannel();
-
-        messageChannel.port1.onmessage = (event: MessageEvent) => {
-          if (event.data.error) {
-            reject(event.data.error as ErrorResponse);
-          } else {
-            resolve(event.data as ServiceWorkerResponse);
-          }
-        };
-
-        navigator.serviceWorker.controller.postMessage(message, [
-          messageChannel.port2,
-        ]);
-      } else {
-        reject("Service worker controller not available");
-      }
-    });
-  }
-
-  private askPermission(): Promise<NotificationPermission> {
-    if (!("serviceWorker" in navigator && navigator.serviceWorker.controller)) {
-      return Promise.reject("Service worker not available.");
-    }
-
-    const secret = localStorage.getItem("secret");
-    if (!secret) {
-      return Promise.reject("No secret found.");
-    }
-
-    return this.sendSecretToServiceWorker(secret)
-      .then(() => this.checkNotificationSupport())
-      .then(() => this.requestNotificationPermission())
-      .catch((error) => Promise.reject(error));
-  }
-
-  private sendSecretToServiceWorker(secret: string): Promise<void> {
-    const message: ServiceWorkerMessage = {
-      type: "SEND_LOCAL_DATA",
-      data: secret,
-    };
-
-    return this.sendMessageToServiceWorker(message).then((response) => {
-      console.log("Response from service worker:", response);
-    });
-  }
-
-  private checkNotificationSupport(): Promise<void> {
-    if (!("Notification" in window)) {
-      alert("This browser does not support notifications.");
-      return Promise.reject("This browser does not support notifications.");
-    }
-    if (Notification.permission === "granted") {
-      return Promise.resolve();
-    }
-    return Promise.resolve();
-  }
-
-  private requestNotificationPermission(): Promise<NotificationPermission> {
-    return Notification.requestPermission().then((permission) => {
-      if (permission !== "granted") {
-        alert("We need notification permission to provide certain features.");
-        throw new Error("We weren't granted permission.");
-      }
-      return permission;
-    });
-  }
-
-  async turnOnNotifications() {
-    return this.askPermission()
-      .then((permission) => {
-        console.log("Permission granted:", permission);
-
-        // Call the function and handle promises
-        this.subscribeToPush()
-          .then(() => {
-            console.log("Subscribed successfully.");
-            return navigator.serviceWorker.ready;
-          })
-          .then((registration) => {
-            return registration.pushManager.getSubscription();
-          })
-          .then((subscription) => {
-            if (subscription) {
-              return this.sendSubscriptionToServer(subscription);
-            } else {
-              throw new Error("Subscription object is not available.");
-            }
-          })
-          .then(() => {
-            console.log("Subscription data sent to server.");
-          })
-          .catch((error) => {
-            console.error(
-              "Subscription or server communication failed:",
-              error,
-            );
-            alert( "Subscription or server communication failed. Try again in a while." );
-          });
-      })
-      .catch((error) => {
-        console.error("An error occurred:", error);
-        alert( "Some error occurred." + error );	
-      });
-  }
-
-
-  private urlBase64ToUint8Array(base64String: string): Uint8Array {
-    const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
-    const base64 = (base64String + padding)
-      .replace(/-/g, "+")
-      .replace(/_/g, "/");
-    const rawData = window.atob(base64);
-    const outputArray = new Uint8Array(rawData.length);
-
-    for (let i = 0; i < rawData.length; ++i) {
-      outputArray[i] = rawData.charCodeAt(i);
-    }
-    return outputArray;
-  }
-
-  private subscribeToPush(): Promise<void> {
-    return new Promise<void>((resolve, reject) => {
-      if (!("serviceWorker" in navigator && "PushManager" in window)) {
-        const errorMsg = "Push messaging is not supported";
-        console.warn(errorMsg);
-        return reject(new Error(errorMsg));
-      }
-
-      if (Notification.permission !== "granted") {
-        const errorMsg = "Notification permission not granted";
-        console.warn(errorMsg);
-        return reject(new Error(errorMsg));
-      }
-
-      const applicationServerKey = this.urlBase64ToUint8Array(this.b64);
-      const options: PushSubscriptionOptions = {
-        userVisibleOnly: true,
-        applicationServerKey: applicationServerKey,
-      };
-
-      navigator.serviceWorker.ready
-        .then((registration) => {
-          return registration.pushManager.subscribe(options);
-        })
-        .then((subscription) => {
-          console.log("Push subscription successful:", subscription);
-          resolve();
-        })
-        .catch((error) => {
-          console.error(
-            "Subscription or server communication failed:",
-            error,
-            options,
-          );
-
-          // Inform the user about the issue
-          alert(
-            "We encountered an issue setting up push notifications. " +
-              "If you wish to revoke notification permissions, please do so in your browser settings.",
-          );
-
-          reject(error);
-        });
-    });
-  }
-
-  private sendSubscriptionToServer(
-    subscription: PushSubscription,
-  ): Promise<void> {
-    console.log(subscription);
-    return fetch("/web-push/subscribe", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(subscription),
-    }).then((response) => {
-      if (!response.ok) {
-        throw new Error("Failed to send subscription to server");
-      }
-      console.log("Subscription sent to server successfully.");
-    });
-  }
-
-  never(ID: string) {
-    alert(ID);
-  }
-
-  maybeLater(ID: string) {
-    alert(ID);
-  }
-}
-</script>
+<script lang="ts"></script>

src/components/AlertMessage.vue

@@ -0,0 +1,47 @@
+<template>
+  <div v-bind:class="computedAlertClassNames()">
+    <button
+      class="close-button bg-amber-400 w-8 leading-loose rounded-full absolute top-2 right-2"
+      @click="onClickClose()"
+    >
+      <fa icon="xmark"></fa>
+    </button>
+    <h4 class="font-bold pr-5">{{ alertTitle }}</h4>
+    <p>{{ alertMessage }}</p>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-facing-decorator";
+
+@Component
+export default class AlertMessage extends Vue {
+  @Prop alertTitle = "";
+  @Prop alertMessage = "";
+  isAlertVisible = this.alertMessage;
+
+  public onClickClose() {
+    this.isAlertVisible = false;
+  }
+
+  public computedAlertClassNames() {
+    return {
+      hidden: !this.isAlertVisible,
+      "dismissable-alert": true,
+      "bg-amber-200": true,
+      "p-5": true,
+      rounded: true,
+      "drop-shadow-lg": true,
+      fixed: true,
+      "top-3": true,
+      "inset-x-3": true,
+      "transition-transform": true,
+      "ease-in": true,
+      "duration-300": true,
+    };
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped></style>

src/components/EntityIcon.vue

@@ -5,26 +5,13 @@
 import { Vue, Component, Prop } from "vue-facing-decorator";
 import { toSvg } from "jdenticon";
 
-const BLANK_CONFIG = {
-  lightness: {
-    color: [1.0, 1.0],
-    grayscale: [1.0, 1.0],
-  },
-  saturation: {
-    color: 0.0,
-    grayscale: 0.0,
-  },
-  backColor: "#0000",
-};
-
 @Component
 export default class EntityIcon extends Vue {
   @Prop entityId = "";
-  @Prop iconSize = 0;
+  @Prop iconSize = "";
 
   generateIdenticon() {
-    const config = this.entityId ? undefined : BLANK_CONFIG;
-    const svgString = toSvg(this.entityId, this.iconSize, config);
+    const svgString = toSvg(this.entityId, this.iconSize);
     return svgString;
   }
 }

src/components/GiftedDialog.vue

@@ -2,7 +2,7 @@
   <div v-if="visible" class="dialog-overlay">
     <div class="dialog">
       <h1 class="text-xl font-bold text-center mb-4">
-        {{ message }} {{ giver?.name || "somebody not named" }}
+        {{ message }} {{ giver?.name || "somebody not specified" }}
       </h1>
       <input
         type="text"
@@ -10,7 +10,7 @@
         placeholder="What was received"
         v-model="description"
       />
-      <div class="flex flex-row">
+      <div class="flex flex-row mb-6">
         <span
           class="rounded-l border border-r-0 border-slate-400 bg-slate-200 w-1/3 text-center px-2 py-2"
           >Hours</span
@@ -33,13 +33,7 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div v-if="showGivenToUser" class="mt-2 text-right">
-        <input type="checkbox" class="mr-2" v-model="givenToUser" />
-        <label class="text-sm">Given to you</label>
-      </div>
-      <p class="text-center mb-2 mt-6 italic">
-        Sign & Send to publish to the world
-      </p>
+      <p class="text-center mb-2 italic">Sign & Send to publish to the world</p>
       <button
         class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
         @click="confirm"
@@ -57,71 +51,24 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component, Prop } from "vue-facing-decorator";
-import { createAndSubmitGive, GiverInputInfo } from "@/libs/endorserServer";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { Account } from "@/db/tables/accounts";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { Vue, Component, Prop, Emit } from "vue-facing-decorator";
 
 @Component
 export default class GiftedDialog extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   @Prop message = "";
-  @Prop projectId = "";
-  @Prop showGivenToUser = false;
 
-  activeDid = "";
-  apiServer = "";
-
-  giver?: GiverInputInfo; // undefined means no identified giver agent
+  giver = null;
   description = "";
-  givenToUser = false;
   hours = "0";
   visible = false;
 
-  async created() {
-    try {
-      await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-      this.apiServer = settings?.apiServer || "";
-      this.activeDid = settings?.activeDid || "";
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      console.log("Error retrieving settings from database:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text:
-            err.message ||
-            "There was an error retrieving the latest sweet, sweet action.",
-        },
-        -1,
-      );
-    }
-  }
-
-  open(giver: GiverInputInfo) {
-    this.description = "";
+  open(giver) {
+    // giver: GiverInputInfo
     this.giver = giver;
-    // if we show "given to user" selection, default checkbox to true
-    this.givenToUser = this.showGivenToUser;
-    this.hours = "0";
-
     this.visible = true;
   }
 
   close() {
-    // close the dialog but don't change values (since it might be submitting info)
     this.visible = false;
   }
 
@@ -133,172 +80,27 @@ export default class GiftedDialog extends Vue {
     this.hours = `${Math.max(0, (parseFloat(this.hours) || 1) - 1)}`;
   }
 
-  cancel() {
+  @Emit("dialog-result")
+  confirm() {
+    const result = {
+      action: "confirm",
+      giver: this.giver,
+      hours: parseFloat(this.hours),
+      description: this.description,
+    };
     this.close();
-    this.eraseValues();
-  }
-
-  eraseValues() {
     this.description = "";
-    this.giver = undefined;
-    this.givenToUser = this.showGivenToUser;
+    this.giver = null;
     this.hours = "0";
+
+    return result;
   }
 
-  async confirm() {
+  @Emit("dialog-result")
+  cancel() {
+    const result = { action: "cancel" };
     this.close();
-    this.$notify(
-      {
-        group: "alert",
-        type: "toast",
-        text: "Recording the give...",
-        title: "",
-      },
-      1000,
-    );
-    // this is asynchronous, but we don't need to wait for it to complete
-    await this.recordGive(
-      this.giver?.did as string | undefined,
-      this.description,
-      parseFloat(this.hours),
-    ).then(() => {
-      this.eraseValues();
-    });
-  }
-
-  public async getIdentity(activeDid: string) {
-    await accountsDB.open();
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load Give records for DID ${activeDid} but no identity was found",
-      );
-    }
-    return identity;
-  }
-
-  /**
-   *
-   * @param giverDid may be null
-   * @param description may be an empty string
-   * @param hours may be 0
-   */
-  public async recordGive(
-    giverDid?: string,
-    description?: string,
-    hours?: number,
-  ) {
-    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identity before you can record a give.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    if (!description && !hours) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must enter a description or some number of hours.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    try {
-      const identity = await this.getIdentity(this.activeDid);
-      const result = await createAndSubmitGive(
-        this.axios,
-        this.apiServer,
-        identity,
-        giverDid,
-        this.givenToUser ? this.activeDid : undefined,
-        description,
-        hours,
-        this.projectId,
-      );
-
-      if (
-        result.type === "error" ||
-        this.isGiveCreationError(result.response)
-      ) {
-        const errorMessage = this.getGiveCreationErrorMessage(result);
-        console.log("Error with give creation result:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error creating the give.",
-          },
-          -1,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "That gift was recorded.",
-          },
-          7000,
-        );
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.log("Error with give recordation caught:", error);
-      const message =
-        error.userMessage ||
-        error.response?.data?.error?.message ||
-        "There was an error recording the give.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: message,
-        },
-        -1,
-      );
-    }
-  }
-
-  // Helper functions for readability
-
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isGiveCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
-  /**
-   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
-   * @returns best guess at an error message
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getGiveCreationErrorMessage(result: any) {
-    return (
-      result.error?.userMessage ||
-      result.error?.error ||
-      result.response?.data?.error?.message
-    );
+    return result;
   }
 }
 </script>

src/components/OfferDialog.vue

@@ -1,317 +0,0 @@
-<template>
-  <div v-if="visible" class="dialog-overlay">
-    <div class="dialog">
-      <h1 class="text-xl font-bold text-center mb-4">Offer Help</h1>
-      <input
-        type="text"
-        class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-        placeholder="Description, prerequisites, terms, etc."
-        v-model="description"
-      />
-      <div class="flex flex-row mb-6">
-        <span
-          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-        >
-          Hours
-        </span>
-        <div
-          class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
-          @click="decrement()"
-        >
-          <fa icon="chevron-left" />
-        </div>
-        <input
-          type="text"
-          class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
-          v-model="hours"
-        />
-        <div
-          class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
-          @click="increment()"
-        >
-          <fa icon="chevron-right" />
-        </div>
-      </div>
-      <div class="flex flex-row mb-6">
-        <span
-          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-        >
-          Expiration
-        </span>
-        <input
-          type="text"
-          class="w-full border border-slate-400 px-2 py-2 rounded-r"
-          :placeholder="'Date, eg. ' + new Date().toISOString().slice(0, 10)"
-          v-model="expirationDateInput"
-        />
-      </div>
-      <p class="text-center mb-2 italic">Sign & Send to publish to the world</p>
-      <button
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-        @click="confirm"
-      >
-        Sign &amp; Send
-      </button>
-      <button
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-        @click="cancel"
-      >
-        Cancel
-      </button>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { Vue, Component, Prop } from "vue-facing-decorator";
-import { createAndSubmitOffer } from "@/libs/endorserServer";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { Account } from "@/db/tables/accounts";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component
-export default class OfferDialog extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
-  @Prop message = "";
-  @Prop projectId = "";
-
-  activeDid = "";
-  apiServer = "";
-
-  description = "";
-  expirationDateInput = "";
-  hours = "0";
-  visible = false;
-
-  async created() {
-    try {
-      await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-      this.apiServer = settings?.apiServer || "";
-      this.activeDid = settings?.activeDid || "";
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      console.log("Error retrieving settings from database:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text:
-            err.message ||
-            "There was an error retrieving the latest sweet, sweet action.",
-        },
-        -1,
-      );
-    }
-  }
-
-  open() {
-    this.visible = true;
-  }
-
-  close() {
-    this.visible = false;
-  }
-
-  increment() {
-    this.hours = `${(parseFloat(this.hours) || 0) + 1}`;
-  }
-
-  decrement() {
-    this.hours = `${Math.max(0, (parseFloat(this.hours) || 1) - 1)}`;
-  }
-
-  cancel() {
-    this.close();
-    this.description = "";
-    this.hours = "0";
-  }
-
-  async confirm() {
-    this.close();
-    this.$notify(
-      {
-        group: "alert",
-        type: "toast",
-        text: "Recording the offer...",
-        title: "",
-      },
-      1000,
-    );
-    // this is asynchronous, but we don't need to wait for it to complete
-    this.recordOffer(
-      this.description,
-      parseFloat(this.hours),
-      this.expirationDateInput,
-    ).then(() => {
-      this.description = "";
-      this.hours = "0";
-    });
-  }
-
-  public async getIdentity(activeDid: string) {
-    await accountsDB.open();
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load Offer records for DID ${activeDid} but no identity was found",
-      );
-    }
-    return identity;
-  }
-
-  /**
-   *
-   * @param description may be an empty string
-   * @param hours may be 0
-   */
-  public async recordOffer(
-    description?: string,
-    hours?: number,
-    expirationDateInput?: string,
-  ) {
-    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identity before you can record an offer.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    if (!description && !hours) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must enter a description or some number of hours.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    try {
-      const identity = await this.getIdentity(this.activeDid);
-      const result = await createAndSubmitOffer(
-        this.axios,
-        this.apiServer,
-        identity,
-        description,
-        hours,
-        expirationDateInput,
-        this.projectId,
-      );
-
-      if (
-        result.type === "error" ||
-        this.isOfferCreationError(result.response)
-      ) {
-        const errorMessage = this.getOfferCreationErrorMessage(result);
-        console.log("Error with offer creation result:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error creating the offer.",
-          },
-          -1,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "That offer was recorded.",
-          },
-          10000,
-        );
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.log("Error with offer recordation caught:", error);
-      const message =
-        error.userMessage ||
-        error.response?.data?.error?.message ||
-        "There was an error recording the offer.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: message,
-        },
-        -1,
-      );
-    }
-  }
-
-  // Helper functions for readability
-
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isOfferCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
-  /**
-   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
-   * @returns best guess at an error message
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getOfferCreationErrorMessage(result: any) {
-    return (
-      result.error?.userMessage ||
-      result.error?.error ||
-      result.response?.data?.error?.message
-    );
-  }
-}
-</script>
-
-<style>
-.dialog-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 1.5rem;
-}
-
-.dialog {
-  background-color: white;
-  padding: 1rem;
-  border-radius: 0.5rem;
-  width: 100%;
-  max-width: 500px;
-}
-</style>

src/constants/app.ts

@@ -1,31 +1,12 @@
 /**
  * Generic strings that could be used throughout the app.
- *
- * See also ../libs/veramo/setup.ts
  */
 export enum AppString {
-  APP_NAME = "Time Safari",
+  APP_NAME = "Kick-Start with Time",
 
-  PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
-  TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
+  PROD_ENDORSER_API_SERVER = "https://endorser.ch:3000",
+  TEST_ENDORSER_API_SERVER = "https://test.endorser.ch:8000",
   LOCAL_ENDORSER_API_SERVER = "http://localhost:3000",
 
   DEFAULT_ENDORSER_API_SERVER = TEST_ENDORSER_API_SERVER,
-
-  PROD_PUSH_SERVER = "https://timesafari.app",
-  TEST1_PUSH_SERVER = "https://test.timesafari.app",
-  TEST2_PUSH_SERVER = "https://timesafari-pwa.anomalistlabs.com",
-
-  DEFAULT_PUSH_SERVER = TEST1_PUSH_SERVER,
-}
-
-/**
- * The possible values for "group" and "type" are in App.vue.
- * From the notiwind package
- */
-export interface NotificationIface {
-  group: string; // "alert" | "modal"
-  type: string; // "toast" | "info" | "success" | "warning" | "danger"
-  title: string;
-  text: string;
 }

src/db/index.ts

@@ -9,44 +9,61 @@ import {
 } from "./tables/settings";
 import { AppString } from "@/constants/app";
 
-// Define types for tables that hold sensitive and non-sensitive data
-type SensitiveTables = { accounts: Table<Account> };
+// a separate DB because the seed is super-sensitive data
+type SensitiveTables = {
+  accounts: Table<Account>;
+};
+
 type NonsensitiveTables = {
   contacts: Table<Contact>;
   settings: Table<Settings>;
 };
 
-// Using 'unknown' instead of 'any' for stricter typing and to avoid TypeScript warnings
+/**
+ * In order to make the next line be acceptable, the program needs to have its linter suppress a rule:
+ *   https://typescript-eslint.io/rules/no-unnecessary-type-constraint/
+ *
+ * and change *any* to *unknown*
+ *
+ *   https://9to5answer.com/how-to-bypass-warning-unexpected-any-specify-a-different-type-typescript-eslint-no-explicit-any
+ */
 export type SensitiveDexie<T extends unknown = SensitiveTables> = BaseDexie & T;
+export const accountsDB = new BaseDexie("KickStartAccounts") as SensitiveDexie;
+const SensitiveSchemas = Object.assign({}, AccountsSchema);
+
 export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
   BaseDexie & T;
+export const db = new BaseDexie("KickStart") as NonsensitiveDexie;
+const NonsensitiveSchemas = Object.assign({}, ContactsSchema, SettingsSchema);
 
-// Initialize Dexie databases for sensitive and non-sensitive data
-export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
-const SensitiveSchemas = { ...AccountsSchema };
+/**
+ * Needed to enable a special webpack setting to allow *await* below:
+ *   https://stackoverflow.com/questions/72474803/error-the-top-level-await-experiment-is-not-enabled-set-experiments-toplevelaw
+ */
 
-export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
-const NonsensitiveSchemas = { ...ContactsSchema, ...SettingsSchema };
-
-// Manage the encryption key. If not present in localStorage, create and store it.
+/**
+ * Create password and place password in localStorage.
+ *
+ * It's good practice to keep the data encrypted at rest, so we'll do that even
+ * if the secret is stored right next to the app.
+ */
 const secret =
   localStorage.getItem("secret") || Encryption.createRandomEncryptionKey();
-if (!localStorage.getItem("secret")) localStorage.setItem("secret", secret);
 
-// Apply encryption to the sensitive database using the secret key
+if (localStorage.getItem("secret") == null) {
+  localStorage.setItem("secret", secret);
+}
+
 encrypted(accountsDB, { secretKey: secret });
-
-// Define the schema for our databases
 accountsDB.version(1).stores(SensitiveSchemas);
+
 db.version(1).stores(NonsensitiveSchemas);
 
-// Event handler to initialize the non-sensitive database with default settings
-db.on("populate", () => {
+// 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_KEY,
     apiServer: AppString.DEFAULT_ENDORSER_API_SERVER,
-
-    // remember that things you add from now on aren't automatically in the DB for old users
-    webPushServer: AppString.DEFAULT_PUSH_SERVER,
   });
 });

src/db/tables/accounts.ts

@@ -1,50 +1,17 @@
-/**
- * Represents an account stored in the database.
- */
 export type Account = {
-  /**
-   * Auto-generated ID by Dexie.
-   */
-  id?: number;
-
-  /**
-   * The date the account was created.
-   */
+  id?: number; // auto-generated by Dexie
   dateCreated: string;
-
-  /**
-   * The derivation path for the account.
-   */
   derivationPath: string;
-
-  /**
-   * Decentralized Identifier (DID) for the account.
-   */
   did: string;
-
-  /**
-   * Stringified JSON containing underlying key material.
-   * Based on the IIdentifier type from Veramo.
-   * @see {@link https://github.com/uport-project/veramo/blob/next/packages/core-types/src/types/IIdentifier.ts}
-   */
+  // stringified JSON containing underlying key material of type IIdentifier
+  // https://github.com/uport-project/veramo/blob/next/packages/core-types/src/types/IIdentifier.ts
   identity: string;
-
-  /**
-   * The public key in hexadecimal format.
-   */
   publicKeyHex: string;
-
-  /**
-   * The mnemonic passphrase for the account.
-   */
   mnemonic: string;
 };
 
-/**
- * Schema for the accounts table in the database.
- * Fields starting with a $ character are encrypted.
- * @see {@link https://github.com/PVermeer/dexie-addon-suite-monorepo/tree/master/packages/dexie-encrypted-addon}
- */
+// 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 = {
   accounts:
     "++id, dateCreated, derivationPath, did, $identity, $mnemonic, publicKeyHex",

src/db/tables/contacts.ts

@@ -7,5 +7,5 @@ export interface Contact {
 }
 
 export const ContactsSchema = {
-  contacts: "&did, name, publicKeyBase64, registered, seesMe",
+  contacts: "++did, name, publicKeyBase64, registered, seesMe",
 };

src/db/tables/settings.ts

@@ -1,47 +1,17 @@
-/**
- * BoundingBox type describes the geographical bounding box coordinates.
- */
-export type BoundingBox = {
-  eastLong: number; // Eastern longitude
-  maxLat: number; // Maximum (Northernmost) latitude
-  minLat: number; // Minimum (Southernmost) latitude
-  westLong: number; // Western longitude
-};
-
-/**
- * Settings type encompasses user-specific configuration details.
- */
+// a singleton
 export type Settings = {
-  id: number; // Only one entry using MASTER_SETTINGS_KEY
-  activeDid?: string; // Active Decentralized ID
-  apiServer?: string; // API server URL
-  firstName?: string; // User's first name
-  lastName?: string; // User's last name
-  lastViewedClaimId?: string; // Last viewed claim ID
-  lastNotifiedClaimId?: string; // Last notified claim ID
-  isRegistered?: boolean;
-  webPushServer?: string; // Web Push server URL
+  id: number; // there's only one entry: MASTER_SETTINGS_KEY
 
-  // Array of named search boxes defined by bounding boxes
-  searchBoxes?: Array<{
-    name: string;
-    bbox: BoundingBox;
-  }>;
-
-  showContactGivesInline?: boolean; // Display contact inline or not
-  vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
-  reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
-  reminderOn?: boolean; // Toggle to enable or disable reminders
+  activeDid?: string;
+  apiServer?: string;
+  firstName?: string;
+  lastName?: string;
+  lastViewedClaimId?: string;
+  showContactGivesInline?: boolean;
 };
 
-/**
- * Schema for the Settings table in the database.
- */
 export const SettingsSchema = {
   settings: "id",
 };
 
-/**
- * Constants.
- */
 export const MASTER_SETTINGS_KEY = 1;

src/libs/crypto/index.ts

@@ -1,4 +1,5 @@
 import { IIdentifier } from "@veramo/core";
+import { DEFAULT_DID_PROVIDER_NAME } from "../veramo/setup";
 import { getRandomBytesSync } from "ethereum-cryptography/random";
 import { entropyToMnemonic } from "ethereum-cryptography/bip39";
 import { wordlist } from "ethereum-cryptography/bip39/wordlists/english";
@@ -6,11 +7,6 @@ import { HDNode } from "@ethersproject/hdnode";
 import * as didJwt from "did-jwt";
 import * as u8a from "uint8arrays";
 
-import { ENDORSER_JWT_URL_LOCATION } from "@/libs/endorserServer";
-import { DEFAULT_DID_PROVIDER_NAME } from "../veramo/setup";
-
-export const DEFAULT_ROOT_DERIVATION_PATH = "m/84737769'/0'/0'/0'";
-
 /**
  *
  *
@@ -51,17 +47,17 @@ export const newIdentifier = (
  */
 export const deriveAddress = (
   mnemonic: string,
-  derivationPath: string = DEFAULT_ROOT_DERIVATION_PATH,
 ): [string, string, string, string] => {
+  const UPORT_ROOT_DERIVATION_PATH = "m/7696500'/0'/0'/0'";
   mnemonic = mnemonic.trim().toLowerCase();
 
   const hdnode: HDNode = HDNode.fromMnemonic(mnemonic);
-  const rootNode: HDNode = hdnode.derivePath(derivationPath);
+  const rootNode: HDNode = hdnode.derivePath(UPORT_ROOT_DERIVATION_PATH);
   const privateHex = rootNode.privateKey.substring(2); // original starts with '0x'
   const publicHex = rootNode.publicKey.substring(2); // original starts with '0x'
   const address = rootNode.address;
 
-  return [address, privateHex, publicHex, derivationPath];
+  return [address, privateHex, publicHex, UPORT_ROOT_DERIVATION_PATH];
 };
 
 /**
@@ -152,24 +148,3 @@ export function fromJose(signature: string): {
 export function bytesToHex(b: Uint8Array): string {
   return u8a.toString(b, "base16");
 }
-
-/**
- @return results of uportJwtPayload:
- { iat: number, iss: string (DID), own: { name, publicEncKey (base64-encoded key) } }
-
- Note that similar code is also contained in time-safari
- */
-export const getContactPayloadFromJwtUrl = (jwtUrlText: string) => {
-  let jwtText = jwtUrlText;
-  const endorserContextLoc = jwtText.indexOf(ENDORSER_JWT_URL_LOCATION);
-  if (endorserContextLoc > -1) {
-    jwtText = jwtText.substring(
-      endorserContextLoc + ENDORSER_JWT_URL_LOCATION.length,
-    );
-  }
-
-  // JWT format: { header, payload, signature, data }
-  const jwt = didJwt.decodeJWT(jwtText);
-
-  return jwt.payload;
-};

src/libs/endorserServer.ts

@@ -6,12 +6,7 @@ import { Axios, AxiosResponse } from "axios";
 import { Contact } from "@/db/tables/contacts";
 
 export const SCHEMA_ORG_CONTEXT = "https://schema.org";
-// the object in RegisterAction claims
 export const SERVICE_ID = "endorser.ch";
-// the prefix for the contact URL
-export const CONTACT_URL_PREFIX = "https://endorser.ch";
-// the suffix for the contact URL
-export const ENDORSER_JWT_URL_LOCATION = "/contact?jwt=";
 
 export interface AgreeVerifiableCredential {
   "@context": string;
@@ -26,13 +21,6 @@ export interface GiverInputInfo {
   name?: string;
 }
 
-export interface GiverOutputInfo {
-  action: string;
-  giver?: GiverInputInfo;
-  description?: string;
-  hours?: number;
-}
-
 export interface ClaimResult {
   success: { claimId: string; handleId: string };
   error: { code: string; message: string };
@@ -59,67 +47,15 @@ export interface GiveServerRecord {
   unit: string;
 }
 
-export interface OfferServerRecord {
-  amount: number;
-  amountGiven: number;
-  offeredByDid: string;
-  recipientDid: string;
-  requirementsMet: boolean;
-  unit: string;
-  validThrough: string;
-}
-
-// Note that previous VCs may have additional fields.
-// https://endorser.ch/doc/html/transactions.html#id4
 export interface GiveVerifiableCredential {
   "@context"?: string; // optional when embedded, eg. in an Agree
-  "@type": "GiveAction";
+  "@type": string;
   agent?: { identifier: string };
   description?: string;
-  fulfills?: { "@type": string; identifier?: string; lastClaimId?: string };
+  fulfills?: { "@type": string; identifier: string };
   identifier?: string;
   object?: { amountOfThisGood: number; unitCode: string };
-  recipient?: { identifier: string };
-}
-
-// Note that previous VCs may have additional fields.
-// https://endorser.ch/doc/html/transactions.html#id8
-export interface OfferVerifiableCredential {
-  "@context"?: string; // optional when embedded, eg. in an Agree
-  "@type": "Offer";
-  description?: string;
-  includesObject?: { amountOfThisGood: number; unitCode: string };
-  itemOffered?: {
-    description?: string;
-    isPartOf?: { identifier?: string; lastClaimId?: string; "@type"?: string };
-  };
-  offeredBy?: { identifier: string };
-  validThrough?: string;
-}
-
-// Note that previous VCs may have additional fields.
-// https://endorser.ch/doc/html/transactions.html#id7
-export interface PlanVerifiableCredential {
-  "@context": "https://schema.org";
-  "@type": "PlanAction";
-  name: string;
-  description: string;
-  identifier?: string;
-  location?: {
-    geo: { "@type": "GeoCoordinates"; latitude: number; longitude: number };
-  };
-}
-
-export interface PlanServerRecord {
-  agentDid?: string; // optional, if the issuer wants someone else to manage as well
-  description: string;
-  endTime?: string;
-  issuerDid: string;
-  handleId: string;
-  locLat?: number;
-  locLon?: number;
-  startTime?: string;
-  url?: string;
+  recipient: { identifier: string };
 }
 
 export interface RegisterVerifiableCredential {
@@ -127,7 +63,7 @@ export interface RegisterVerifiableCredential {
   "@type": string;
   agent: { identifier: string };
   object: string;
-  participant: { identifier: string };
+  recipient: { identifier: string };
 }
 
 export interface InternalError {
@@ -139,52 +75,38 @@ export interface InternalError {
 // See https://github.com/trentlarson/endorser-ch/blob/0cb626f803028e7d9c67f095858a9fc8542e3dbd/server/api/services/util.js#L6
 const HIDDEN_DID = "did:none:HIDDEN";
 
-export function isHiddenDid(did: string) {
+export function isHiddenDid(did) {
   return did === HIDDEN_DID;
 }
 
 /**
  always returns text, maybe UNNAMED_VISIBLE or UNKNOWN_ENTITY
-
- Similar logic is found in endorser-mobile.
  **/
 export function didInfo(
   did: string,
   activeDid: string,
-  allMyDids: string[],
-  contacts: Contact[],
+  allMyDids: Array<string>,
+  contacts: Array<Contact>,
 ): string {
-  if (!did) return "Someone Anonymous";
-
-  const myId = R.find(R.equals(did), allMyDids);
-  if (myId) return `You${myId !== activeDid ? " (Alt ID)" : ""}`;
-
-  const contact = R.find((c) => c.did === did, contacts);
-  return contact
-    ? contact.name || "Contact With No Name"
-    : isHiddenDid(did)
-      ? "Someone Not In Network"
-      : "Someone Not In Contacts";
+  const myId: string | undefined = R.find(R.equals(did), allMyDids, did);
+  if (myId) {
+    return "You" + (myId !== activeDid ? " (Alt ID)" : "");
+  } else {
+    const contact: Contact | undefined = R.find((c) => c.did === did, contacts);
+    if (contact) {
+      return contact.name || "Someone Unnamed in Contacts";
+    } else if (!did) {
+      return "Unspecified Person";
+    } else if (isHiddenDid(did)) {
+      return "Someone Not In Network";
+    } else {
+      return "Someone Not In Contacts";
+    }
+  }
 }
 
-export interface ResultWithType {
-  type: string;
-}
-
-export interface SuccessResult extends ResultWithType {
-  type: "success";
-  response: AxiosResponse<ClaimResult>;
-}
-
-export interface ErrorResult {
-  type: "error";
-  error: InternalError;
-}
-
-export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
-
 /**
- * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
+ * For result, see https://endorser.ch:3000/api-docs/#/claims/post_api_v2_claim
  *
  * @param identity
  * @param fromDid may be null
@@ -196,140 +118,76 @@ export async function createAndSubmitGive(
   axios: Axios,
   apiServer: string,
   identity: IIdentifier,
-  fromDid?: string,
-  toDid?: string,
-  description?: string,
-  hours?: number,
+  fromDid: string,
+  toDid: string,
+  description: string,
+  hours: number,
   fulfillsProjectHandleId?: string,
-): Promise<CreateAndSubmitClaimResult> {
+): Promise<AxiosResponse<ClaimResult> | InternalError> {
+  // Make a claim
   const vcClaim: GiveVerifiableCredential = {
     "@context": "https://schema.org",
     "@type": "GiveAction",
-    recipient: toDid ? { identifier: toDid } : undefined,
-    agent: fromDid ? { identifier: fromDid } : undefined,
-    description: description || undefined,
-    object: hours ? { amountOfThisGood: hours, unitCode: "HUR" } : undefined,
-    fulfills: fulfillsProjectHandleId
-      ? { "@type": "PlanAction", identifier: fulfillsProjectHandleId }
-      : undefined,
+    recipient: { identifier: toDid },
   };
-  return createAndSubmitClaim(
-    vcClaim as GenericClaim,
-    identity,
-    apiServer,
-    axios,
-  );
-}
-
-/**
- * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
- *
- * @param identity
- * @param description may be null; should have this or hours
- * @param hours may be null; should have this or description
- * @param expirationDate ISO 8601 date string YYYY-MM-DD (may be null)
- * @param fulfillsProjectHandleId ID of project to which this contributes (may be null)
- */
-export async function createAndSubmitOffer(
-  axios: Axios,
-  apiServer: string,
-  identity: IIdentifier,
-  description?: string,
-  hours?: number,
-  expirationDate?: string,
-  fulfillsProjectHandleId?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim: OfferVerifiableCredential = {
-    "@context": "https://schema.org",
-    "@type": "Offer",
-    offeredBy: { identifier: identity.did },
-    validThrough: expirationDate || undefined,
-  };
-  if (hours) {
-    vcClaim.includesObject = {
-      amountOfThisGood: hours,
-      unitCode: "HUR",
-    };
+  if (fromDid) {
+    vcClaim.agent = { identifier: fromDid };
   }
   if (description) {
-    vcClaim.itemOffered = { description };
+    vcClaim.description = description;
+  }
+  if (hours) {
+    vcClaim.object = { amountOfThisGood: hours, unitCode: "HUR" };
   }
   if (fulfillsProjectHandleId) {
-    vcClaim.itemOffered = vcClaim.itemOffered || {};
-    vcClaim.itemOffered.isPartOf = {
+    vcClaim.fulfills = {
       "@type": "PlanAction",
       identifier: fulfillsProjectHandleId,
     };
   }
-  return createAndSubmitClaim(
-    vcClaim as GenericClaim,
-    identity,
-    apiServer,
-    axios,
-  );
-}
-
-export async function createAndSubmitClaim(
-  vcClaim: GenericClaim,
-  identity: IIdentifier,
-  apiServer: string,
-  axios: Axios,
-): Promise<CreateAndSubmitClaimResult> {
-  try {
-    const vcPayload = {
-      vc: {
-        "@context": ["https://www.w3.org/2018/credentials/v1"],
-        type: ["VerifiableCredential"],
-        credentialSubject: vcClaim,
-      },
-    };
-
-    // Create a signature using private key of identity
-    const firstKey = identity.keys[0];
-    const privateKeyHex = firstKey?.privateKeyHex;
-
-    if (!privateKeyHex) {
-      throw {
+  // Make a payload for the claim
+  const vcPayload = {
+    vc: {
+      "@context": ["https://www.w3.org/2018/credentials/v1"],
+      type: ["VerifiableCredential"],
+      credentialSubject: vcClaim,
+    },
+  };
+  // Create a signature using private key of identity
+  if (identity.keys[0].privateKeyHex == null) {
+    return new Promise<InternalError>((resolve, reject) => {
+      reject({
         error: "No private key",
-        message: `Your identifier ${identity.did} is not configured correctly. Use a different identifier.`,
-      };
-    }
-
-    const signer = await SimpleSigner(privateKeyHex);
-
-    // Create a JWT for the request
-    const vcJwt: string = await didJwt.createJWT(vcPayload, {
-      issuer: identity.did,
-      signer,
+        message:
+          "Your identifier " +
+          identity.did +
+          " is not configured correctly. Use a different identifier.",
+      });
     });
-
-    // Make the xhr request payload
-    const payload = JSON.stringify({ jwtEncoded: vcJwt });
-    const url = `${apiServer}/api/v2/claim`;
-    const token = await accessToken(identity);
-
-    const response = await axios.post(url, payload, {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${token}`,
-      },
-    });
-
-    return { type: "success", response };
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } catch (error: any) {
-    console.log("Error creating claim:", error);
-    const errorMessage: string =
-      error.response?.data?.error?.message || error.message || "Unknown error";
-
-    return {
-      type: "error",
-      error: {
-        error: errorMessage,
-        userMessage: "Failed to create and submit the claim.",
-      },
-    };
   }
+
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  const privateKeyHex: string = identity.keys[0].privateKeyHex!;
+  const signer = await SimpleSigner(privateKeyHex);
+  const alg = undefined;
+  // Create a JWT for the request
+  const vcJwt: string = await didJwt.createJWT(vcPayload, {
+    alg: alg,
+    issuer: identity.did,
+    signer: signer,
+  });
+
+  // Make the xhr request payload
+
+  const payload = JSON.stringify({ jwtEncoded: vcJwt });
+  const url = apiServer + "/api/v2/claim";
+  const token = await accessToken(identity);
+  const headers = {
+    "Content-Type": "application/json",
+    Authorization: "Bearer " + token,
+  };
+
+  return axios.post(url, payload, { headers });
 }
 
 // from https://stackoverflow.com/a/175787/845494

src/libs/util.ts

@@ -1,3 +0,0 @@
-export const isGlobalUri = (uri: string) => {
-  return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/));
-};

src/libs/veramo/setup.ts

@@ -1,7 +1,151 @@
-// see also ../constants/app.ts and
+// Created from the setup in https://veramo.io/docs/guides/react_native
 
+// Core interfaces
+/* import {
+  createAgent,
+  IDIDManager,
+  IResolver,
+  IDataStore,
+  IKeyManager,
+} from "@veramo/core";
+ */
+// Core identity manager plugin
+//import { DIDManager } from "@veramo/did-manager";
+
+// Ethr did identity provider
+//import { EthrDIDProvider } from "@veramo/did-provider-ethr";
+
+// Core key manager plugin
+//import { KeyManager } from "@veramo/key-manager";
+
+// Custom key management system for RN
+//import { KeyManagementSystem } from '@veramo/kms-local-react-native'
+
+// Custom resolver
+// Custom resolvers
+//import { DIDResolverPlugin } from "@veramo/did-resolver";
+/* import { Resolver } from "did-resolver";
+import { getResolver as ethrDidResolver } from "ethr-did-resolver";
+import { getResolver as webDidResolver } from "web-did-resolver";
+ */
+// for VCs and VPs https://veramo.io/docs/api/credential-w3c
+//import { CredentialIssuer } from '@veramo/credential-w3c'
+
+// Storage plugin using TypeOrm
+/* import {
+  Entities,
+  KeyStore,
+  DIDStore,
+  IDataStoreORM,
+} from "@veramo/data-store";
+ */
+// TypeORM is installed with @veramo/typeorm
+//import { createConnection } from 'typeorm'
+
+//import * as R from "ramda";
+
+/*
+import { Contact } from '../entity/contact'
+import { Settings } from '../entity/settings'
+import { PrivateData } from '../entity/privateData'
+
+import { Initial1616938713828 }          from '../migration/1616938713828-initial'
+import { SettingsContacts1616967972293 } from '../migration/1616967972293-settings-contacts'
+import { EncryptedSeed1637856484788 }    from '../migration/1637856484788-EncryptedSeed'
+import { HomeScreenConfig1639947962124 } from '../migration/1639947962124-HomeScreenConfig'
+import { HandlePublicKeys1652142819353 } from '../migration/1652142819353-HandlePublicKeys'
+import { LastClaimsSeen1656811846836 }   from '../migration/1656811846836-LastClaimsSeen'
+import { ContactRegistered1662256903367 }from '../migration/1662256903367-ContactRegistered'
+import { PrivateData1663080623479 }      from '../migration/1663080623479-PrivateData'
+
+const ALL_ENTITIES = Entities.concat([Contact, Settings, PrivateData])
+
+// Create react native DB connection configured by ormconfig.js
+
+export const dbConnection = createConnection({
+  database: 'endorser-mobile.sqlite',
+  entities: ALL_ENTITIES,
+  location: 'default',
+  logging: ['error', 'info', 'warn'],
+  migrations: [ Initial1616938713828, SettingsContacts1616967972293, EncryptedSeed1637856484788, HomeScreenConfig1639947962124, HandlePublicKeys1652142819353, LastClaimsSeen1656811846836, ContactRegistered1662256903367, PrivateData1663080623479 ],
+  migrationsRun: true,
+  type: 'react-native',
+})
+*/
 function didProviderName(netName: string) {
   return "did:ethr" + (netName === "mainnet" ? "" : ":" + netName);
 }
 
-export const DEFAULT_DID_PROVIDER_NAME = didProviderName("mainnet");
+//const NETWORK_NAMES = ["mainnet", "rinkeby"];
+
+const DEFAULT_DID_PROVIDER_NETWORK_NAME = "mainnet";
+
+export const DEFAULT_DID_PROVIDER_NAME = didProviderName(
+  DEFAULT_DID_PROVIDER_NETWORK_NAME,
+);
+
+export const HANDY_APP = false;
+
+// this is used as the object in RegisterAction claims
+export const SERVICE_ID = "endorser.ch";
+
+//const INFURA_PROJECT_ID = "INFURA_PROJECT_ID";
+/*
+const providers = {}
+NETWORK_NAMES.forEach((networkName) => {
+  providers[didProviderName(networkName)] = new EthrDIDProvider({
+    defaultKms: 'local',
+    network: networkName,
+    rpcUrl: 'https://' + networkName + '.infura.io/v3/' + INFURA_PROJECT_ID,
+    gas: 1000001,
+    ttl: 60 * 60 * 24 * 30 * 12 + 1,
+  })
+})
+
+
+const didManager = new DIDManager({
+  store: new DIDStore(dbConnection),
+  defaultProvider: DEFAULT_DID_PROVIDER_NAME,
+  providers: providers,
+})
+*/
+
+/* const basicDidResolvers = NETWORK_NAMES.map((networkName) => [
+  networkName,
+  new Resolver({
+    ethr: ethrDidResolver({
+      networks: [
+        {
+          name: networkName,
+          rpcUrl:
+            "https://" + networkName + ".infura.io/v3/" + INFURA_PROJECT_ID,
+        },
+      ],
+    }).ethr,
+    web: webDidResolver().web,
+  }),
+]);
+
+const basicResolverMap = R.fromPairs(basicDidResolvers)
+
+export const DEFAULT_BASIC_RESOLVER = basicResolverMap[DEFAULT_DID_PROVIDER_NETWORK_NAME]
+
+const agentDidResolvers = NETWORK_NAMES.map((networkName) => {
+  return new DIDResolverPlugin({
+    resolver: basicResolverMap[networkName],
+  })
+})
+
+let allPlugins = [
+  new CredentialIssuer(),
+  new KeyManager({
+    store: new KeyStore(dbConnection),
+    kms: {
+      local: new KeyManagementSystem(),
+    },
+  }),
+  didManager,
+].concat(agentDidResolvers)
+*/
+
+//export const agent = createAgent<IDIDManager & IKeyManager & IDataStore & IDataStoreORM & IResolver>({ plugins: allPlugins })

src/main.ts

@@ -11,10 +11,6 @@ import "./assets/styles/tailwind.css";
 
 import { library } from "@fortawesome/fontawesome-svg-core";
 import {
-  faArrowLeft,
-  faArrowRight,
-  faBan,
-  faBitcoinSign,
   faBurst,
   faCalendar,
   faChevronLeft,
@@ -28,7 +24,6 @@ import {
   faCoins,
   faComment,
   faCopy,
-  faDollar,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
@@ -36,10 +31,8 @@ import {
   faFloppyDisk,
   faFolderOpen,
   faGift,
-  faGlobe,
   faHand,
   faHouseChimney,
-  faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
@@ -47,7 +40,6 @@ import {
   faPersonCircleCheck,
   faPersonCircleQuestion,
   faPlus,
-  faQuestion,
   faQrcode,
   faRotate,
   faShareNodes,
@@ -62,10 +54,6 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
-  faArrowLeft,
-  faArrowRight,
-  faBan,
-  faBitcoinSign,
   faBurst,
   faCalendar,
   faChevronLeft,
@@ -79,7 +67,6 @@ library.add(
   faCoins,
   faComment,
   faCopy,
-  faDollar,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
@@ -87,10 +74,8 @@ library.add(
   faFloppyDisk,
   faFolderOpen,
   faGift,
-  faGlobe,
   faHand,
   faHouseChimney,
-  faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
@@ -99,7 +84,6 @@ library.add(
   faPersonCircleQuestion,
   faPlus,
   faQrcode,
-  faQuestion,
   faRotate,
   faShareNodes,
   faSpinner,

src/registerServiceWorker.ts

@@ -3,7 +3,7 @@
 import { register } from "register-service-worker";
 
 if (process.env.NODE_ENV === "production") {
-  register("/additional-scripts.js", {
+  register(`${process.env.BASE_URL}service-worker.js`, {
     ready() {
       console.log(
         "App is being served from cache by a service worker.\n" +

src/router/index.ts

@@ -1,11 +1,5 @@
-import {
-  createRouter,
-  createWebHistory,
-  NavigationGuardNext,
-  RouteLocationNormalized,
-  RouteRecordRaw,
-} from "vue-router";
-import { accountsDB } from "@/db/index";
+import { createRouter, createWebHistory, RouteRecordRaw } from "vue-router";
+import { accountsDB } from "@/db";
 
 /**
  *
@@ -13,11 +7,7 @@ import { accountsDB } from "@/db/index";
  * @param from :RouteLocationNormalized
  * @param next :NavigationGuardNext
  */
-const enterOrStart = async (
-  to: RouteLocationNormalized,
-  from: RouteLocationNormalized,
-  next: NavigationGuardNext,
-) => {
+const enterOrStart = async (to, from, next) => {
   await accountsDB.open();
   const num_accounts = await accountsDB.accounts.count();
   if (num_accounts > 0) {
@@ -33,6 +23,7 @@ const routes: Array<RouteRecordRaw> = [
     name: "home",
     component: () =>
       import(/* webpackChunkName: "home" */ "../views/HomeView.vue"),
+    beforeEnter: enterOrStart,
   },
   {
     path: "/account",
@@ -57,14 +48,6 @@ const routes: Array<RouteRecordRaw> = [
         /* webpackChunkName: "contact-amounts" */ "../views/ContactAmountsView.vue"
       ),
   },
-  {
-    path: "/contact-gives",
-    name: "contact-gives",
-    component: () =>
-      import(
-        /* webpackChunkName: "contact-gives" */ "../views/ContactGiftingView.vue"
-      ),
-  },
   {
     path: "/contact-qr",
     name: "contact-qr",
@@ -78,6 +61,15 @@ const routes: Array<RouteRecordRaw> = [
     name: "contacts",
     component: () =>
       import(/* webpackChunkName: "contacts" */ "../views/ContactsView.vue"),
+    beforeEnter: enterOrStart,
+  },
+  {
+    path: "/scan-contact",
+    name: "scan-contact",
+    component: () =>
+      import(
+        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
+      ),
   },
   {
     path: "/discover",
@@ -91,22 +83,6 @@ const routes: Array<RouteRecordRaw> = [
     component: () =>
       import(/* webpackChunkName: "help" */ "../views/HelpView.vue"),
   },
-  {
-    path: "/help-notifications",
-    name: "help-notifications",
-    component: () =>
-      import(
-        /* webpackChunkName: "help-notifications" */ "../views/HelpNotificationsView.vue"
-      ),
-  },
-  {
-    path: "/identity-switcher",
-    name: "identity-switcher",
-    component: () =>
-      import(
-        /* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
-      ),
-  },
   {
     path: "/import-account",
     name: "import-account",
@@ -115,14 +91,6 @@ const routes: Array<RouteRecordRaw> = [
         /* webpackChunkName: "import-account" */ "../views/ImportAccountView.vue"
       ),
   },
-  {
-    path: "/import-derive",
-    name: "import-derive",
-    component: () =>
-      import(
-        /* webpackChunkName: "import-derive" */ "../views/ImportDerivedAccountView.vue"
-      ),
-  },
   {
     path: "/new-edit-account",
     name: "new-edit-account",
@@ -156,7 +124,15 @@ const routes: Array<RouteRecordRaw> = [
       ),
   },
   {
-    path: "/project/:id?",
+    path: "/identity-switcher",
+    name: "identity-switcher",
+    component: () =>
+      import(
+        /* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
+      ),
+  },
+  {
+    path: "/project",
     name: "project",
     component: () =>
       import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
@@ -168,22 +144,6 @@ const routes: Array<RouteRecordRaw> = [
       import(/* webpackChunkName: "projects" */ "../views/ProjectsView.vue"),
     beforeEnter: enterOrStart,
   },
-  {
-    path: "/scan-contact",
-    name: "scan-contact",
-    component: () =>
-      import(
-        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
-      ),
-  },
-  {
-    path: "/search-area",
-    name: "search-area",
-    component: () =>
-      import(
-        /* webpackChunkName: "search-area" */ "../views/SearchAreaView.vue"
-      ),
-  },
   {
     path: "/seed-backup",
     name: "seed-backup",
@@ -207,10 +167,12 @@ const routes: Array<RouteRecordRaw> = [
       ),
   },
   {
-    path: "/test",
-    name: "test",
+    path: "/contact-gives",
+    name: "contact-gives",
     component: () =>
-      import(/* webpackChunkName: "test" */ "../views/TestView.vue"),
+      import(
+        /* webpackChunkName: "statistics" */ "../views/ContactGiftingView.vue"
+      ),
   },
 ];
 
@@ -220,14 +182,10 @@ const router = createRouter({
   routes,
 });
 
-const errorHandler = (
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  error: any,
-  to: RouteLocationNormalized,
-  from: RouteLocationNormalized,
-) => {
+const errorHandler = (error, to, from) => {
   // Handle the error here
-  console.error("Caught in top level error handler:", error, to, from);
+  console.error(error, to, from);
+  console.log("XXXXX");
 
   // You can also perform additional actions, such as displaying an error message or redirecting the user to a specific page
 };

src/test/index.ts

@@ -2,7 +2,7 @@ import axios from "axios";
 import * as didJwt from "did-jwt";
 import { AppString } from "@/constants/app";
 import { db } from "../db";
-import { SERVICE_ID } from "../libs/endorserServer";
+import { SERVICE_ID } from "../libs/veramo/setup";
 import { deriveAddress, newIdentifier } from "../libs/crypto";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 

src/views/ContactAmountsView.vue

@@ -1,25 +1,9 @@
 <template>
   <QuickNav selected="Contacts"></QuickNav>
   <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <h1
-        id="ViewBreadcrumb"
-        class="text-lg text-center font-light relative px-7"
-      >
-        <!-- Back -->
-        <router-link
-          :to="{ name: 'contacts' }"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          ><fa icon="chevron-left" class="fa-fw"></fa
-        ></router-link>
-      </h1>
-
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
-        Given with {{ contact?.name }}
-      </h1>
-    </div>
-
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Given with {{ contact?.name }}
+    </h1>
     <div class="flex justify-around">
       <span />
       <span class="justify-around">(Only 50 most recent)</span>
@@ -27,73 +11,70 @@
     </div>
 
     <!-- Results List -->
-    <table
-      class="table-auto w-full border-t border-slate-300 text-sm sm:text-base text-center"
-    >
-      <thead class="bg-slate-100">
-        <tr class="border-b border-slate-300">
-          <th></th>
-          <th class="px-1 py-2">From Them</th>
-          <th></th>
-          <th class="px-1 py-2">To Them</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr
-          v-for="record in giveRecords"
-          :key="record.id"
-          class="border-b border-slate-300"
-        >
-          <td class="p-1 text-xs sm:text-sm text-left text-slate-500">
-            {{ new Date(record.issuedAt).toLocaleString() }}
-          </td>
-          <td class="p-1">
-            <span v-if="record.agentDid == contact.did">
-              <div class="font-bold">
-                {{ record.amount }} {{ record.unit }}
-                <span v-if="record.amountConfirmed" title="Confirmed">
-                  <fa icon="circle-check" class="text-green-600 fa-fw" />
-                </span>
-                <button v-else @click="confirm(record)" title="Unconfirmed">
-                  <fa icon="circle" class="text-blue-600 fa-fw" />
-                </button>
-              </div>
-              <div class="italic text-xs sm:text-sm text-slate-500">
-                {{ record.description }}
-              </div>
-            </span>
-          </td>
-          <td class="p-1">
-            <span v-if="record.agentDid == contact.did">
-              <fa icon="arrow-left" class="text-slate-400 fa-fw" />
-            </span>
-            <span v-else>
-              <fa icon="arrow-right" class="text-slate-400 fa-fw" />
-            </span>
-          </td>
-          <td class="p-1">
-            <span v-if="record.agentDid != contact.did">
-              <div class="font-bold">
-                {{ record.amount }} {{ record.unit }}
-                <span v-if="record.amountConfirmed" title="Confirmed">
-                  <fa icon="circle-check" class="text-green-600 fa-fw" />
-                </span>
-                <button
-                  v-else
-                  @click="cannotConfirmMessage()"
-                  title="Unconfirmed"
-                >
-                  <fa icon="circle" class="text-slate-600 fa-fw" />
-                </button>
-              </div>
-              <div class="italic text-xs sm:text-sm text-slate-500">
-                {{ record.description }}
-              </div>
-            </span>
-          </td>
-        </tr>
-      </tbody>
-    </table>
+    <div>
+      <div class="border-b border-slate-300 flex">
+        <div class="w-1/4"></div>
+        <div class="w-1/4">from them</div>
+        <div class="w-1/4"></div>
+        <div class="w-1/4">to them</div>
+      </div>
+      <div
+        class="border-b border-slate-300 flex"
+        v-for="record in giveRecords"
+        :key="record.id"
+      >
+        <div class="w-1/4">
+          {{ new Date(record.issuedAt).toLocaleString() }}
+        </div>
+        <div class="w-1/4">
+          <span v-if="record.agentDid == contact.did">
+            <div class="font-bold">
+              {{ record.amount }} {{ record.unit }}
+              <span v-if="record.amountConfirmed" class="tooltip">
+                <fa icon="circle-check" class="text-green-600 fa-fw ml-1" />
+                <span class="tooltiptext">Confirmed</span>
+              </span>
+              <button v-else class="tooltip" @click="confirm(record)">
+                <fa icon="circle" class="text-blue-600 fa-fw ml-1" />
+                <span class="tooltiptext">Unconfirmed</span>
+              </button>
+            </div>
+            <br />
+            {{ record.description }}
+          </span>
+        </div>
+        <div class="w-1/8">
+          <span v-if="record.agentDid == contact.did">
+            <fa icon="long-arrow-alt-left" class="text-slate-900 fa-fw ml-1" />
+          </span>
+          <span v-else>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <fa icon="long-arrow-alt-right" class="text-slate-900 fa-fw ml-1" />
+          </span>
+        </div>
+        <div class="w-1/4">
+          <span v-if="record.agentDid != contact.did">
+            <div class="font-bold">
+              {{ record.amount }} {{ record.unit }}
+              <span v-if="record.amountConfirmed" class="tooltip">
+                <fa icon="circle-check" class="text-green-600 fa-fw ml-1" />
+                <span class="tooltiptext">Confirmed</span>
+              </span>
+              <button v-else class="tooltip" @click="cannotConfirmMessage()">
+                <fa icon="circle" class="text-slate-600 fa-fw ml-1" />
+                <span class="tooltiptext">Unconfirmed</span>
+              </button>
+            </div>
+            <br />
+            {{ record.description }}
+          </span>
+        </div>
+      </div>
+    </div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
@@ -101,7 +82,7 @@
 import * as R from "ramda";
 
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
@@ -113,24 +94,17 @@ import {
 } from "@/libs/endorserServer";
 import * as didJwt from "did-jwt";
 import { AxiosError } from "axios";
-import QuickNav from "@/components/QuickNav.vue";
-import { IIdentifier } from "@veramo/core";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({ components: { QuickNav } })
+@Component({ components: { AlertMessage, QuickNav } })
 export default class ContactsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   activeDid = "";
   apiServer = "";
   contact: Contact | null = null;
   giveRecords: Array<GiveServerRecord> = [];
+  alertTitle = "";
+  alertMessage = "";
   numAccounts = 0;
 
   async beforeCreate() {
@@ -138,7 +112,7 @@ export default class ContactsView extends Vue {
     this.numAccounts = await accountsDB.accounts.count();
   }
 
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
     await accountsDB.open();
     const account = await accountsDB.accounts
       .where("did")
@@ -154,7 +128,7 @@ export default class ContactsView extends Vue {
     return identity;
   }
 
-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
     const token = await accessToken(identity);
     const headers = {
       "Content-Type": "application/json",
@@ -176,8 +150,7 @@ export default class ContactsView extends Vue {
       if (this.activeDid && this.contact) {
         this.loadGives(this.activeDid, this.contact);
       }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
+    } catch (err) {
       this.$notify(
         {
           group: "alert",
@@ -195,7 +168,7 @@ export default class ContactsView extends Vue {
   async loadGives(activeDid: string, contact: Contact) {
     try {
       const identity = await this.getIdentity(this.activeDid);
-      let result: Array<GiveServerRecord> = [];
+      let result = [];
       const url =
         this.apiServer +
         "/api/v2/report/gives?agentDid=" +
@@ -362,10 +335,7 @@ export default class ContactsView extends Vue {
 </script>
 
 <style>
-/*
-  Tooltip, generated on "title" attributes on "fa" icons
-  Kudos to https://www.w3schools.com/css/css_tooltip.asp
-*/
+/* Tooltip from https://www.w3schools.com/css/css_tooltip.asp */
 /* Tooltip container */
 .tooltip {
   position: relative;

src/views/ContactGiftingView.vue

@@ -16,15 +16,19 @@
       </h1>
     </div>
 
+    <!-- Quick Search -->
+
+    <!-- Initial Loading Animation -->
+
     <!-- Results List -->
     <ul class="border-t border-slate-300">
       <li class="border-b border-slate-300 py-3">
         <h2 class="text-base flex gap-4 items-center">
           <span class="grow italic text-slate-500"
             ><EntityIcon
-              :entityId="null"
+              entityId="Anonymous"
               :iconSize="32"
-              class="inline-block align-middle border border-slate-300 rounded-md mr-1"
+              class="opacity-50 inline-block align-middle border border-dashed border-slate-400 bg-slate-200 rounded-md mr-1"
             ></EntityIcon>
             Anonymous
           </span>
@@ -68,55 +72,57 @@
 
     <GiftedDialog
       ref="customDialog"
+      @dialog-result="handleDialogResult"
       message="Received from"
-      showGivenToUser="true"
-    />
+    >
+    </GiftedDialog>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 import GiftedDialog from "@/components/GiftedDialog.vue";
-import { db, accountsDB } from "@/db/index";
-import { Account, AccountsSchema } from "@/db/tables/accounts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { db, accountsDB } from "@/db";
+import { AccountsSchema } from "@/db/tables/accounts";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import { GiverInputInfo } from "@/libs/endorserServer";
+import { createAndSubmitGive } from "@/libs/endorserServer";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { IIdentifier } from "@veramo/core";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: { GiftedDialog, QuickNav, EntityIcon },
+  components: { GiftedDialog, AlertMessage, QuickNav, EntityIcon },
 })
-export default class ContactGiftingView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
+export default class HomeView extends Vue {
   activeDid = "";
+  allAccounts: Array<Account> = [];
   allContacts: Array<Contact> = [];
   apiServer = "";
-  accounts: typeof AccountsSchema;
+  isHiddenSpinner = true;
+  alertTitle = "";
+  alertMessage = "";
+  accounts: AccountsSchema;
   numAccounts = 0;
 
   async beforeCreate() {
     accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
+    this.accounts = accountsDB.accounts;
+    this.numAccounts = await this.accounts.count();
   }
 
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
     await accountsDB.open();
-    const account = (await accountsDB.accounts
+    const account = await accountsDB.accounts
       .where("did")
       .equals(activeDid)
-      .first()) as Account;
+      .first();
     const identity = JSON.parse(account?.identity || "null");
 
     if (!identity) {
@@ -127,7 +133,7 @@ export default class ContactGiftingView extends Vue {
     return identity;
   }
 
-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
     const token = await accessToken(identity);
     const headers = {
       "Content-Type": "application/json",
@@ -138,20 +144,23 @@ export default class ContactGiftingView extends Vue {
 
   async created() {
     try {
+      await accountsDB.open();
+      this.allAccounts = await accountsDB.accounts.toArray();
       await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
       this.apiServer = settings?.apiServer || "";
       this.activeDid = settings?.activeDid || "";
       this.allContacts = await db.contacts.toArray();
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
+      this.feedLastViewedId = settings?.lastViewedClaimId;
+      this.updateAllFeed();
+    } catch (err) {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
           text:
-            err.message ||
+            err.userMessage ||
             "There was an error retrieving the latest sweet, sweet action.",
         },
         -1,
@@ -159,8 +168,144 @@ export default class ContactGiftingView extends Vue {
     }
   }
 
-  openDialog(giver: GiverInputInfo) {
-    (this.$refs.customDialog as GiftedDialog).open(giver);
+  public async buildHeaders() {
+    const headers = { "Content-Type": "application/json" };
+
+    if (this.activeDid) {
+      await accountsDB.open();
+      const allAccounts = await accountsDB.accounts.toArray();
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
+      const identity = JSON.parse(account?.identity || "null");
+
+      if (!identity) {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service.",
+        );
+      }
+
+      headers["Authorization"] = "Bearer " + (await accessToken(identity));
+    } else {
+      // it's OK without auth... we just won't get any identifiers
+    }
+    return headers;
+  }
+
+  openDialog(giver) {
+    this.$refs.customDialog.open(giver);
+  }
+
+  handleDialogResult(result) {
+    if (result.action === "confirm") {
+      return new Promise((resolve) => {
+        this.recordGive(result.contact?.did, result.description, result.hours);
+        resolve();
+      });
+    } else {
+      // action was "cancel" so do nothing
+    }
+  }
+
+  /**
+   *
+   * @param giverDid may be null
+   * @param description may be an empty string
+   * @param hours may be 0
+   */
+  public async recordGive(giverDid, description, hours) {
+    if (!this.activeDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identity before you can record a give.",
+        },
+        -1,
+      );
+      return;
+    }
+
+    if (!description && !hours) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must enter a description or some number of hours.",
+        },
+        -1,
+      );
+      return;
+    }
+
+    try {
+      const identity = await this.getIdentity(this.activeDid);
+      const result = await createAndSubmitGive(
+        this.axios,
+        this.apiServer,
+        identity,
+        giverDid,
+        this.activeDid,
+        description,
+        hours,
+      );
+
+      if (isGiveCreationError(result)) {
+        const errorMessage = getGiveCreationErrorMessage(result);
+        console.log("Error with give result:", result);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: errorMessage || "There was an error recording the give.",
+          },
+          -1,
+        );
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: "That gift was recorded.",
+          },
+          -1,
+        );
+      }
+    } catch (error) {
+      console.log("Error with give caught:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
+            getGiveErrorMessage(error) ||
+            "There was an error recording the give.",
+        },
+        -1,
+      );
+    }
+  }
+
+  private setAlert(title, message) {
+    this.alertTitle = title;
+    this.alertMessage = message;
+  }
+
+  // Helper functions for readability
+
+  isGiveCreationError(result) {
+    return result.status !== 201 || result.data?.error;
+  }
+
+  getGiveCreationErrorMessage(result) {
+    return result.data?.error?.message;
+  }
+
+  getGiveErrorMessage(error) {
+    return error.userMessage || error.response?.data?.error?.message;
   }
 }
 </script>

src/views/ContactQRScanShowView.vue

@@ -2,110 +2,79 @@
   <QuickNav selected="Profile"></QuickNav>
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <!-- Back -->
-      <div class="text-lg text-center font-light relative px-7">
-        <h1
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          @click="$router.back()"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </h1>
-      </div>
+    <!-- Heading -->
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Your Contact Info
+    </h1>
 
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
-        Your Contact Info
-      </h1>
-    </div>
-
-    <div @click="onCopyToClipboard()" v-if="activeDid">
-      <!--
-        Play with display options: https://qr-code-styling.com/
-        See docs: https://www.npmjs.com/package/qr-code-generator-vue3
-      -->
-      <QRCodeVue3
-        :value="this.qrValue"
-        :cornersSquareOptions="{ type: 'extra-rounded' }"
-        :dotsOptions="{ type: 'square' }"
-        class="flex justify-center"
-      />
-    </div>
-    <div class="text-center" v-else>
-      You have no identitifiers yet, so
-      <router-link :to="{ name: 'start' }" class="text-blue-500">
-        create your identifier.
-      </router-link>
-      <br />
-      We recommend you do that first; otherwise, these contacts won't see your
-      activity.
-    </div>
-
-    <h1 class="text-4xl text-center font-light pt-4">Scan Contact Info</h1>
-    <qrcode-stream @detect="onScanDetect" @error="onScanError" />
+    <!--
+      Play with display options: https://qr-code-styling.com/
+      See docs: https://www.npmjs.com/package/qr-code-generator-vue3
+    -->
+    <QRCodeVue3
+      :value="this.qrValue"
+      :cornersSquareOptions="{ type: 'extra-rounded' }"
+      :dotsOptions="{ type: 'square' }"
+      class="flex justify-center"
+    />
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
 <script lang="ts">
 import QRCodeVue3 from "qr-code-generator-vue3";
 import { Component, Vue } from "vue-facing-decorator";
-import { QrcodeStream } from "vue-qrcode-reader";
-import { useClipboard } from "@vueuse/core";
-
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import * as R from "ramda";
 import { SimpleSigner } from "@/libs/crypto";
 import * as didJwt from "did-jwt";
-import QuickNav from "@/components/QuickNav.vue";
-import { Account } from "@/db/tables/accounts";
-import {
-  CONTACT_URL_PREFIX,
-  ENDORSER_JWT_URL_LOCATION,
-} from "@/libs/endorserServer";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+alertTitle = "";
+alertMessage = "";
 
 @Component({
   components: {
-    QrcodeStream,
     QRCodeVue3,
+    AlertMessage,
     QuickNav,
   },
 })
 export default class ContactQRScanShow extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   activeDid = "";
   apiServer = "";
   qrValue = "";
 
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
-    const account: Account | undefined = R.find(
-      (acc) => acc.did === activeDid,
-      accounts,
-    );
+    const account = R.find((acc) => acc.did === activeDid, accounts);
     const identity = JSON.parse(account?.identity || "null");
 
     if (!identity) {
       throw new Error(
-        "Attempted to show contact info with no identity available.",
+        "Attempted to load Give records with no identity available.",
       );
     }
     return identity;
   }
 
+  public async getHeaders(identity) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
   async created() {
     await db.open();
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
@@ -115,7 +84,17 @@ export default class ContactQRScanShow extends Vue {
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === this.activeDid, accounts);
-    if (account) {
+    if (!account) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "warning",
+          title: "",
+          text: "You have no identity yet.",
+        },
+        -1,
+      );
+    } else {
       const identity = await this.getIdentity(this.activeDid);
       const publicKeyHex = identity.keys[0].publicKeyHex;
       const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
@@ -123,9 +102,7 @@ export default class ContactQRScanShow extends Vue {
         iat: Date.now(),
         iss: this.activeDid,
         own: {
-          name:
-            (settings?.firstName || "") +
-            (settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
+          name: (settings?.firstName || "") + " " + (settings?.lastName || ""),
           publicEncKey,
         },
       };
@@ -139,64 +116,9 @@ export default class ContactQRScanShow extends Vue {
         issuer: identity.did,
         signer: signer,
       });
-      const viewPrefix = CONTACT_URL_PREFIX + ENDORSER_JWT_URL_LOCATION;
+      const viewPrefix = "https://endorser.ch/contact?jwt=";
       this.qrValue = viewPrefix + vcJwt;
     }
   }
-
-  /**
-   *
-   * @param content is the result of a QR scan, an array with one item with a rawValue property
-   */
-  // Unfortunately, there are not typescript definitions for the qrcode-stream component yet.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  onScanDetect(content: any) {
-    if (content[0]?.rawValue) {
-      //console.log("onDetect", content[0].rawValue);
-      localStorage.setItem("contactEndorserUrl", content[0].rawValue);
-      this.$router.push({ name: "contacts" });
-    } else {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Invalid Contact QR Code",
-          text: "No QR code detected with contact information.",
-        },
-        -1,
-      );
-    }
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  onScanError(error: any) {
-    console.log("Scan was invalid:", error);
-    this.$notify(
-      {
-        group: "alert",
-        type: "warning",
-        title: "Invalid Scan",
-        text: "The scan was invalid.",
-      },
-      -1,
-    );
-  }
-
-  onCopyToClipboard() {
-    useClipboard()
-      .copy(this.qrValue)
-      .then(() => {
-        console.log("Contact URL:", this.qrValue);
-        this.$notify(
-          {
-            group: "alert",
-            type: "toast",
-            title: "Copied",
-            text: "Contact URL was copied to clipboard.",
-          },
-          2000,
-        );
-      });
-  }
 }
 </script>

src/views/ContactsView.vue

@@ -20,14 +20,9 @@
 
     <!-- New Contact -->
     <div class="mb-4 flex">
-      <span class="self-center bg-slate-500 text-white px-1.5 py-1 rounded-md">
-        <router-link :to="{ name: 'contact-qr' }">
-          <fa icon="qrcode" class="fa-fw" />
-        </router-link>
-      </span>
       <input
         type="text"
-        placeholder="DID, Name, Public Key (base 16 or 64)"
+        placeholder="DID, Name, Public Key"
         class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
         v-model="contactInput"
       />
@@ -67,8 +62,8 @@
             showGiveTotals
               ? "Total"
               : showGiveConfirmed
-                ? "Confirmed"
-                : "Unconfirmed"
+              ? "Confirmed"
+              : "Unconfirmed"
           }}
         </button>
         <br />
@@ -93,16 +88,6 @@
               class="inline-block align-text-bottom border border-slate-300 rounded"
             ></EntityIcon>
             {{ contact.name || "(no name)" }}
-            <button
-              class="text-sm uppercase bg-slate-500 text-white px-1 rounded-md"
-              @click="
-                contactEdit = contact;
-                contactNewName = contact.name;
-              "
-              title="Edit"
-            >
-              <fa icon="pen" class="fa-fw" />
-            </button>
           </h2>
           <div class="text-sm truncate">{{ contact.did }}</div>
           <div class="text-sm truncate" v-if="contact.publicKeyBase64">
@@ -110,54 +95,50 @@
           </div>
 
           <div id="ContactActions" class="flex gap-1.5 mt-2">
-            <div v-if="activeDid">
-              <button
-                v-if="contact.seesMe"
-                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-                @click="setVisibility(contact, false, true)"
-                title="They can see you"
-              >
-                <fa icon="eye" class="fa-fw" />
-              </button>
-              <button
-                v-else
-                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-                @click="setVisibility(contact, true, true)"
-                title="They cannot see you"
-              >
-                <fa icon="eye-slash" class="fa-fw" />
-              </button>
-              <button
-                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-                @click="checkVisibility(contact)"
-                title="Check Visibility"
-                v-if="activeDid"
-              >
-                <fa icon="rotate" class="fa-fw" />
-              </button>
-              <button
-                @click="register(contact)"
-                class="text-sm uppercase bg-slate-500 text-white ml-6 px-2 py-1.5 rounded-md"
-                v-if="activeDid"
-              >
-                <fa
-                  v-if="contact.registered"
-                  icon="person-circle-check"
-                  class="fa-fw"
-                  title="Registered"
-                />
-                <fa
-                  v-else
-                  icon="person-circle-question"
-                  class="fa-fw"
-                  title="Registration Unknown"
-                />
-              </button>
-            </div>
+            <button
+              v-if="contact.seesMe"
+              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+              @click="setVisibility(contact, false)"
+              title="They can see you"
+            >
+              <fa icon="eye" class="fa-fw" />
+            </button>
+            <button
+              v-else
+              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+              @click="setVisibility(contact, true)"
+              title="They cannot see you"
+            >
+              <fa icon="eye-slash" class="fa-fw" />
+            </button>
+
+            <button
+              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+              @click="checkVisibility(contact)"
+              title="Check Visibility"
+            >
+              <fa icon="rotate" class="fa-fw" />
+            </button>
+
+            <button
+              v-if="contact.registered"
+              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+              title="Registered"
+            >
+              <fa icon="person-circle-check" class="fa-fw" />
+            </button>
+            <button
+              v-else
+              @click="register(contact)"
+              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+              title="Registration unknown"
+            >
+              <fa icon="person-circle-question" class="fa-fw" />
+            </button>
 
             <button
               @click="deleteContact(contact)"
-              class="text-sm uppercase bg-red-600 text-white ml-24 px-2 py-1.5 rounded-md"
+              class="text-sm uppercase bg-red-600 text-white px-2 py-1.5 rounded-md"
               title="Delete"
             >
               <fa icon="trash-can" class="fa-fw" />
@@ -220,32 +201,11 @@
         </div>
       </li>
     </ul>
-    <p v-else>There are no contacts.</p>
-
-    <div v-if="contactEdit !== null" class="dialog-overlay">
-      <div class="dialog">
-        <h1 class="text-xl font-bold text-center mb-4">Edit Name</h1>
-        <input
-          type="text"
-          class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-          placeholder="Name"
-          v-model="contactNewName"
-        />
-        <button
-          class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
-          @click="onClickSaveName(contactEdit, contactNewName)"
-        >
-          <fa icon="save" />
-        </button>
-        <span class="inline-block w-2" />
-        <button
-          class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
-          @click="onClickCancelName()"
-        >
-          <fa icon="ban" />
-        </button>
-      </div>
-    </div>
+    <p v-else>This identity has no contacts.</p>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
@@ -253,45 +213,32 @@
 import { AxiosError } from "axios";
 import * as didJwt from "did-jwt";
 import * as R from "ramda";
-
-import { NotificationIface } from "@/constants/app";
 import { IIdentifier } from "@veramo/core";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { Contact } from "@/db/tables/contacts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 import {
-  accessToken,
-  getContactPayloadFromJwtUrl,
-  SimpleSigner,
-} from "@/libs/crypto";
-import {
-  CONTACT_URL_PREFIX,
-  GiveServerRecord,
   GiveVerifiableCredential,
   RegisterVerifiableCredential,
   SERVICE_ID,
 } from "@/libs/endorserServer";
 import { Component, Vue } from "vue-facing-decorator";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { Account } from "@/db/tables/accounts";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
 
 @Component({
-  components: { QuickNav, EntityIcon },
+  components: { AlertMessage, QuickNav, EntityIcon },
 })
 export default class ContactsView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
   activeDid = "";
   apiServer = "";
   contacts: Array<Contact> = [];
-  contactEndorserUrl = localStorage.getItem("contactEndorserUrl") || "";
   contactInput = "";
-  contactEdit: Contact | null = null;
-  contactNewName = "";
   // { "did:...": concatenated-descriptions } entry for each contact
   givenByMeDescriptions: Record<string, string> = {};
   // { "did:...": amount } entry for each contact
@@ -306,17 +253,17 @@ export default class ContactsView extends Vue {
   givenToMeUnconfirmed: Record<string, number> = {};
   hourDescriptionInput = "";
   hourInput = "0";
-  isRegistered = false;
   showGiveNumbers = false;
   showGiveTotals = true;
   showGiveConfirmed = true;
+  alertTitle = "";
+  alertMessage = "";
 
   async created() {
     await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
-    this.isRegistered = !!settings?.isRegistered;
 
     this.showGiveNumbers = !!settings?.showContactGivesInline;
     if (this.showGiveNumbers) {
@@ -327,18 +274,12 @@ export default class ContactsView extends Vue {
       (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
       allContacts,
     );
-
-    if (this.contactEndorserUrl) {
-      await this.newContactFromScan(this.contactEndorserUrl);
-      localStorage.removeItem("contactEndorserUrl");
-      this.contactEndorserUrl = "";
-    }
   }
 
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
-    const account = R.find((acc) => acc.did === activeDid, accounts) as Account;
+    const account = R.find((acc) => acc.did === activeDid, accounts);
     const identity = JSON.parse(account?.identity || "null");
 
     if (!identity) {
@@ -349,7 +290,7 @@ export default class ContactsView extends Vue {
     return identity;
   }
 
-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
     const token = await accessToken(identity);
     const headers = {
       "Content-Type": "application/json",
@@ -358,7 +299,7 @@ export default class ContactsView extends Vue {
     return headers;
   }
 
-  public async getHeadersAndIdentity(activeDid: string) {
+  public async getHeadersAndIdentity(activeDid) {
     const identity = await this.getIdentity(activeDid);
     const headers = await this.getHeaders(identity);
 
@@ -367,11 +308,11 @@ export default class ContactsView extends Vue {
 
   async loadGives() {
     const handleResponse = (
-      resp: { status: number; data: { data: GiveServerRecord[] } },
-      descriptions: Record<string, string>,
-      confirmed: Record<string, number>,
-      unconfirmed: Record<string, number>,
-      useRecipient: boolean,
+      resp,
+      descriptions,
+      confirmed,
+      unconfirmed,
+      useRecipient,
     ) => {
       if (resp.status === 200) {
         const allData = resp.data.data;
@@ -400,11 +341,12 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "danger",
-            title: "Server Error",
+            title: "Error With Server",
             text:
               "Got an error retrieving your " +
-              (useRecipient ? "given" : "received") +
-              " time from the server.",
+              resp.config.url.includes("recipientDid")
+                ? "received"
+                : "given" + " time from the server.",
           },
           -1,
         );
@@ -459,7 +401,7 @@ export default class ContactsView extends Vue {
         {
           group: "alert",
           type: "danger",
-          title: "Server Error",
+          title: "Error With Server",
           text: error as string,
         },
         -1,
@@ -468,24 +410,6 @@ export default class ContactsView extends Vue {
   }
 
   async onClickNewContact(): Promise<void> {
-    if (!this.contactInput) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "No Contact",
-          text: "There was no contact info to add.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    if (this.contactInput.startsWith(CONTACT_URL_PREFIX)) {
-      await this.newContactFromScan(this.contactInput);
-      return;
-    }
-
     let did = this.contactInput;
     let name, publicKeyBase64;
     const commaPos1 = this.contactInput.indexOf(",");
@@ -504,111 +428,22 @@ export default class ContactsView extends Vue {
       publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
     }
     const newContact = { did, name, publicKeyBase64 };
-    await this.addContact(newContact);
-  }
-
-  async newContactFromScan(url: string): Promise<void> {
-    const payload = getContactPayloadFromJwtUrl(url);
-    if (!payload) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "No Contact Info",
-          text: "The contact info could not be parsed.",
-        },
-        -1,
-      );
-      return;
-    } else {
-      return this.addContact({
-        did: payload.iss,
-        name: payload.own.name,
-        publicKeyBase64: payload.own.publicEncKey,
-      } as Contact);
-    }
-  }
-
-  async addContact(newContact: Contact) {
-    if (!newContact.did) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Incomplete Contact",
-          text: "Cannot add a contact without a DID.",
-        },
-        -1,
-      );
-      return;
-    }
-    newContact.seesMe = true; // since we will immediately set that on the server
-    return db.contacts
-      .add(newContact)
-      .then(() => {
-        const allContacts = this.contacts.concat([newContact]);
-        this.contacts = R.sort(
-          (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
-          allContacts,
-        );
-        let addedMessage;
-        if (this.activeDid) {
-          this.setVisibility(newContact, true, false);
-          addedMessage =
-            newContact.name +
-            " was added, and your activity is visible to them.";
-        } else {
-          addedMessage = newContact.name + " was added.";
-        }
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Contact Added",
-            text: addedMessage,
-          },
-          5000,
-        );
-        if (this.isRegistered) {
-          // putting this last so that it shows on the top
-          this.$notify(
-            {
-              group: "alert",
-              type: "info",
-              title: "New User?",
-              text:
-                "If " +
-                newContact.name +
-                " is a new user, be sure to register them.",
-            },
-            -1,
-          );
-        }
-      })
-      .catch((err) => {
-        console.error("Error when adding contact to storage:", err);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Contact Not Added",
-            text: "An error prevented this import.",
-          },
-          -1,
-        );
-      });
+    await db.contacts.add(newContact);
+    const allContacts = this.contacts.concat([newContact]);
+    this.contacts = R.sort(
+      (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
+      allContacts,
+    );
   }
 
   async deleteContact(contact: Contact) {
     if (
       confirm(
-        "You should first make sure that your activity is no longer visible to them." +
-          " Note that this only deletes them from your contacts on this device." +
-          " \n\nAre you sure you want to remove " +
+        "Are you sure you want to delete " +
           this.nameForDid(this.contacts, contact.did) +
           " with DID " +
           contact.did +
-          " from your contact list?",
+          " ?",
       )
     ) {
       await db.open();
@@ -622,22 +457,9 @@ export default class ContactsView extends Vue {
       confirm(
         "Are you sure you want to use one of your registrations for " +
           this.nameForDid(this.contacts, contact.did) +
-          (contact.registered
-            ? " -- especially since they are already marked as registered"
-            : "") +
           "?",
       )
     ) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "toast",
-          text: "",
-          title: "Registration submitted...",
-        },
-        1000,
-      );
-
       const identity = await this.getIdentity(this.activeDid);
 
       const vcClaim: RegisterVerifiableCredential = {
@@ -720,7 +542,7 @@ export default class ContactsView extends Vue {
             {
               group: "alert",
               type: "danger",
-              title: "Server Error",
+              title: "Error With Server",
               text: userMessage,
             },
             -1,
@@ -730,11 +552,7 @@ export default class ContactsView extends Vue {
     }
   }
 
-  async setVisibility(
-    contact: Contact,
-    visibility: boolean,
-    showSuccessAlert: boolean,
-  ) {
+  async setVisibility(contact: Contact, visibility: boolean) {
     const url =
       this.apiServer +
       "/api/report/" +
@@ -746,48 +564,39 @@ export default class ContactsView extends Vue {
     try {
       const resp = await this.axios.post(url, payload, { headers });
       if (resp.status === 200) {
-        if (showSuccessAlert) {
+        contact.seesMe = visibility;
+        db.contacts.update(contact.did, { seesMe: visibility });
+      } else {
+        console.error("Bad response setting visibility: ", resp.data);
+        if (resp.data.error?.message) {
           this.$notify(
             {
               group: "alert",
-              type: "success",
-              title: "Visibility Set",
-              text:
-                this.nameForDid(this.contacts, contact.did) +
-                " can " +
-                (visibility ? "" : "not ") +
-                "see your activity.",
+              type: "danger",
+              title: "Error With Server",
+              text: resp.data.error?.message,
+            },
+            -1,
+          );
+        } else {
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error With Server",
+              text: "Bad server response of " + resp.status,
             },
             -1,
           );
         }
-        contact.seesMe = visibility;
-        db.contacts.update(contact.did, { seesMe: visibility });
-      } else {
-        console.error(
-          "Got some bad server response when setting visibility: ",
-          resp,
-        );
-        const message =
-          resp.data.error?.message || "Bad server response of " + resp.status;
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Server Error",
-            text: message,
-          },
-          -1,
-        );
       }
     } catch (err) {
-      console.error("Got some server error when setting visibility:", err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
-          title: "Server Error",
-          text: "Check connectivity and try again.",
+          title: "Error With Server",
+          text: err as string,
         },
         -1,
       );
@@ -799,8 +608,6 @@ export default class ContactsView extends Vue {
       this.apiServer +
       "/api/report/canDidExplicitlySeeMe?did=" +
       encodeURIComponent(contact.did);
-    const identity = await this.getIdentity(this.activeDid);
-    const headers = await this.getHeaders(identity);
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -812,37 +619,46 @@ export default class ContactsView extends Vue {
         this.$notify(
           {
             group: "alert",
-            type: "info",
-            title: "Visibility Refreshed",
+            type: "toast",
+            title: "Refreshed",
             text:
               this.nameForContact(contact, true) +
               " can " +
               (visibility ? "" : "not ") +
               "see your activity.",
           },
-          -1,
+          5000,
         );
       } else {
-        console.log("Got bad server response when checking visibility: ", resp);
-        const message = resp.data.error?.message || "Got bad server response.";
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Server Error",
-            text: message,
-          },
-          -1,
-        );
+        if (resp.data.error?.message) {
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error With Server",
+              text: resp.data.error?.message,
+            },
+            -1,
+          );
+        } else {
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error With Server",
+              text: "Bad server response of " + resp.status,
+            },
+            -1,
+          );
+        }
       }
     } catch (err) {
-      console.log("Caught error from server request to check visibility:", err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
-          title: "Server Error",
-          text: "Check connectivity and try again.",
+          title: "Error With Server",
+          text: err as string,
         },
         -1,
       );
@@ -869,17 +685,11 @@ export default class ContactsView extends Vue {
 
     // if they have unconfirmed amounts, ask to confirm those first
     if (toDid == identity?.did && this.givenToMeUnconfirmed[fromDid] > 0) {
-      const isare = this.givenToMeUnconfirmed[fromDid] == 1 ? "is" : "are";
-      const hours = this.givenToMeUnconfirmed[fromDid] == 1 ? "hour" : "hours";
       if (
         confirm(
-          "There " +
-            isare +
-            " " +
+          "There are " +
             this.givenToMeUnconfirmed[fromDid] +
-            " unconfirmed " +
-            hours +
-            " from them." +
+            " unconfirmed hours from them." +
             " Would you like to confirm some of those hours?",
         )
       ) {
@@ -887,7 +697,6 @@ export default class ContactsView extends Vue {
           name: "contact-amounts",
           query: { contactDid: fromDid },
         });
-        return;
       }
     }
     if (!this.isNumeric(this.hourInput)) {
@@ -938,9 +747,7 @@ export default class ContactsView extends Vue {
         confirm(
           "Are you sure you want to record " +
             this.hourInput +
-            " hour" +
-            (this.hourInput == "1" ? "" : "s") +
-            " " +
+            " hours " +
             toFrom +
             description +
             "?",
@@ -957,7 +764,6 @@ export default class ContactsView extends Vue {
     }
   }
 
-  // similar function is in endorserServer.ts
   private async createAndSubmitGive(
     identity: IIdentifier,
     fromDid: string,
@@ -1043,7 +849,7 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "danger",
-            title: "Server Error",
+            title: "Error With Server",
             text: userMessage,
           },
           -1,
@@ -1052,18 +858,6 @@ export default class ContactsView extends Vue {
     }
   }
 
-  private async onClickCancelName() {
-    this.contactEdit = null;
-    this.contactNewName = "";
-  }
-
-  private async onClickSaveName(contact: Contact, newName: string) {
-    contact.name = newName;
-    return db.contacts
-      .update(contact.did, { name: newName })
-      .then(() => (this.contactEdit = null));
-  }
-
   public toggleShowGiveTotals() {
     if (this.showGiveTotals) {
       this.showGiveTotals = false;
@@ -1088,36 +882,14 @@ export default class ContactsView extends Vue {
 </script>
 
 <style>
-.dialog-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 1.5rem;
-}
-.dialog {
-  background-color: white;
-  padding: 1rem;
-  border-radius: 0.5rem;
-  width: 100%;
-  max-width: 500px;
-}
-
-/*
-  Tooltip, generated on "title" attributes on "fa" icons
-  Kudos to https://www.w3schools.com/css/css_tooltip.asp
-*/
+/* Tooltip from https://www.w3schools.com/css/css_tooltip.asp */
 /* Tooltip container */
 .tooltip {
   position: relative;
   display: inline-block;
   border-bottom: 1px dotted black; /* If you want dots under the hoverable text */
 }
+
 /* Tooltip text */
 .tooltip .tooltiptext {
   visibility: hidden;

src/views/DiscoverView.vue

@@ -9,7 +9,7 @@
     </h1>
 
     <!-- Quick Search -->
-    <div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="searchSelected()">
+    <div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="search()">
       <input
         type="text"
         v-model="searchTerms"
@@ -17,7 +17,7 @@
         class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
       />
       <button
-        @click="searchSelected()"
+        @click="search()"
         class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
       >
         <fa icon="magnifying-glass" class="fa-fw"></fa>
@@ -32,8 +32,6 @@
             href="#"
             @click="
               projects = [];
-              isLocalActive = true;
-              isRemoteActive = false;
               searchLocal();
             "
             v-bind:class="computedLocalTabClassNames()"
@@ -41,10 +39,8 @@
             Nearby
             <span
               class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
-              v-if="isLocalActive"
+              >{{ localCount }}</span
             >
-              {{ localCount > -1 ? localCount : "?" }}
-            </span>
           </a>
         </li>
         <li>
@@ -53,34 +49,19 @@
             v-bind:class="computedRemoteTabClassNames()"
             @click="
               projects = [];
-              isRemoteActive = true;
-              isLocalActive = false;
-              searchAll();
+              search();
             "
           >
-            Anywhere
+            Remote
             <span
               class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
-              v-if="isRemoteActive"
+              >{{ remoteCount }}</span
             >
-              {{ remoteCount > -1 ? remoteCount : "?" }}
-            </span>
           </a>
         </li>
       </ul>
     </div>
 
-    <div v-if="isLocalActive">
-      <div>
-        <button
-          class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-          @click="$router.push({ name: 'search-area' })"
-        >
-          Select a {{ searchBox ? "Different" : "" }} Location for Nearby Search
-        </button>
-      </div>
-    </div>
-
     <!-- Loading Animation -->
     <div
       class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
@@ -110,6 +91,7 @@
             </div>
 
             <div class="grow">
+              <h2 class="text-base font-semibold">{{ project.name }}</h2>
               <h2 class="text-base font-semibold">{{ project.name }}</h2>
               <div class="text-sm">
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
@@ -122,50 +104,43 @@
         </li>
       </ul>
     </InfiniteScroll>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { Contact } from "@/db/tables/contacts";
-import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import { didInfo, ProjectData } from "@/libs/endorserServer";
-import QuickNav from "@/components/QuickNav.vue";
-import InfiniteScroll from "@/components/InfiniteScroll.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { didInfo } from "@/libs/endorserServer";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
+import InfiniteScroll from "@/components/InfiniteScroll";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: {
-    QuickNav,
-    InfiniteScroll,
-    EntityIcon,
-  },
+  components: { AlertMessage, QuickNav, InfiniteScroll, EntityIcon },
 })
 export default class DiscoverView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   activeDid = "";
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
   apiServer = "";
   searchTerms = "";
+  alertMessage = "";
+  alertTitle = "";
   projects: ProjectData[] = [];
-  isLoading = false;
   isLocalActive = true;
   isRemoteActive = false;
-  localCount = -1;
-  remoteCount = -1;
-  searchBox: { name: string; bbox: BoundingBox } | null = null;
+  localCount = 0;
+  remoteCount = 0;
+  isLoading = false;
 
   // make this function available to the Vue template
   didInfo = didInfo;
@@ -175,40 +150,17 @@ export default class DiscoverView extends Vue {
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
-    this.searchBox = settings?.searchBoxes?.[0] || null;
-
     this.allContacts = await db.contacts.toArray();
 
     await accountsDB.open();
     const allAccounts = await accountsDB.accounts.toArray();
     this.allMyDids = allAccounts.map((acc) => acc.did);
 
-    if (this.searchBox) {
-      await this.searchLocal();
-    } else {
-      this.isLocalActive = false;
-      this.isRemoteActive = true;
-      await this.searchAll();
-    }
+    this.searchLocal();
   }
 
-  public resetCounts() {
-    this.localCount = -1;
-    this.remoteCount = -1;
-  }
-
-  public async searchSelected() {
-    if (this.isLocalActive) {
-      await this.searchLocal();
-    } else {
-      await this.searchAll();
-    }
-  }
-
-  public async buildHeaders(): Promise<HeadersInit> {
-    const headers: HeadersInit = {
-      "Content-Type": "application/json",
-    };
+  public async buildHeaders() {
+    const headers = { "Content-Type": "application/json" };
 
     if (this.activeDid) {
       await accountsDB.open();
@@ -229,20 +181,16 @@ export default class DiscoverView extends Vue {
     return headers;
   }
 
-  public async searchAll(beforeId?: string) {
-    this.resetCounts();
-
-    if (!beforeId) {
-      // this was an initial search so clear any previous results
-      this.projects = [];
-    }
-
+  public async search(beforeId?: string) {
     let queryParams = "claimContents=" + encodeURIComponent(this.searchTerms);
 
     if (beforeId) {
       queryParams = queryParams + `&beforeId=${beforeId}`;
     }
 
+    this.isRemoteActive = true;
+    this.isLocalActive = false;
+
     try {
       this.isLoading = true;
       const response = await fetch(
@@ -255,13 +203,12 @@ export default class DiscoverView extends Vue {
 
       if (response.status !== 200) {
         const details = await response.text();
-        console.log("Problem with full search:", details);
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Error",
-            text: `There was a problem accessing the server. Try again later.`,
+            text: `There was a problem accessing the server. Please try again later. (${details})`,
           },
           -1,
         );
@@ -274,15 +221,14 @@ export default class DiscoverView extends Vue {
       const plans: ProjectData[] = results.data;
       if (plans) {
         for (const plan of plans) {
-          const { name, description, handleId, rowid } = plan;
-          this.projects.push({ name, description, handleId, rowid });
+          const { name, description, handleId, rowid, issuerDid } = plan;
+          this.projects.push({ name, description, handleId, rowid, issuerDid });
         }
         this.remoteCount = this.projects.length;
       } else {
         throw JSON.stringify(results);
       }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (e: any) {
+    } catch (e) {
       console.log("Error with feed load:", e);
       this.$notify(
         {
@@ -299,27 +245,14 @@ export default class DiscoverView extends Vue {
   }
 
   public async searchLocal(beforeId?: string) {
-    this.resetCounts();
-
-    if (!this.searchBox) {
-      this.projects = [];
-      return;
-    }
-
-    if (!beforeId) {
-      // this was an initial search so clear any previous results
-      this.projects = [];
-    }
-
     const claimContents =
       "claimContents=" + encodeURIComponent(this.searchTerms);
-
     let queryParams = [
       claimContents,
-      "minLocLat=" + this.searchBox.bbox.minLat,
-      "maxLocLat=" + this.searchBox.bbox.maxLat,
-      "westLocLon=" + this.searchBox.bbox.westLong,
-      "eastLocLon=" + this.searchBox.bbox.eastLong,
+      "minLocLat=40.901000",
+      "maxLocLat=40.904000",
+      "westLocLon=-111.914000",
+      "eastLocLon=-111.909000",
     ].join("&");
 
     if (beforeId) {
@@ -328,6 +261,8 @@ export default class DiscoverView extends Vue {
 
     try {
       this.isLoading = true;
+      this.isLocalActive = true;
+      this.isRemoteActive = false;
       const response = await fetch(
         this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
         {
@@ -338,13 +273,12 @@ export default class DiscoverView extends Vue {
 
       if (response.status !== 200) {
         const details = await response.text();
-        console.log("Problem with nearby search:", details);
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Error",
-            text: "There was a problem accessing the server. Try again later.",
+            text: `There was a problem accessing the server. Please try again later. (${details})`,
           },
           -1,
         );
@@ -358,7 +292,9 @@ export default class DiscoverView extends Vue {
           const plans: ProjectData[] = results.data;
           for (const plan of plans) {
             const { name, description, handleId = plan.handleId, rowid } = plan;
-            this.projects.push({ name, description, handleId, rowid });
+            if (beforeId !== plan["rowid"]) {
+              this.projects.push({ name, description, handleId, rowid });
+            }
           }
         } else {
           this.projects = results.data;
@@ -367,8 +303,7 @@ export default class DiscoverView extends Vue {
       } else {
         throw JSON.stringify(results);
       }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (e: any) {
+    } catch (e) {
       console.log("Error with feed load:", e);
       this.$notify(
         {
@@ -394,7 +329,7 @@ export default class DiscoverView extends Vue {
       if (this.isLocalActive) {
         this.searchLocal(latestProject["rowid"]);
       } else if (this.isRemoteActive) {
-        this.searchAll(latestProject["rowid"]);
+        this.search(latestProject["rowid"]);
       }
     }
   }
@@ -406,7 +341,7 @@ export default class DiscoverView extends Vue {
   onClickLoadProject(id: string) {
     localStorage.setItem("projectId", id);
     const route = {
-      path: "/project/" + encodeURIComponent(id),
+      name: "project",
     };
     this.$router.push(route);
   }

src/views/HelpNotificationsView.vue

@@ -1,65 +0,0 @@
-<template>
-  <QuickNav />
-
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <!-- Back -->
-      <div class="text-lg text-center font-light relative px-7">
-        <h1
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          @click="$router.back()"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </h1>
-      </div>
-
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Notification Help
-      </h1>
-    </div>
-
-    <div>
-      <p>Here are things to try to get notifications working.</p>
-
-      <h2 class="text-xl font-semibold">Test</h2>
-      <p>Somehow call the service-worker self.showNotification</p>
-
-      <h2 class="text-xl font-semibold">Check OS-level permissions</h2>
-      <p>
-        Walk-throughs & screenshots, maybe for all combinations of OS &
-        browsers.
-      </p>
-
-      <h2 class="text-xl font-semibold">Check browser-level permissions</h2>
-      <p>Walk-throughs & screenshots for browser settings</p>
-
-      <h2 class="text-xl font-semibold">Explain full reset to start again</h2>
-      <p>
-        Walk-throughs for clearing everything & subscribing anew to get a
-        message
-      </p>
-
-      <h2 class="text-xl font-semibold">Auto-detection</h2>
-      <p>Show results of auto-detection whether they're turned on</p>
-    </div>
-  </section>
-</template>
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import QuickNav from "@/components/QuickNav.vue";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({ components: { QuickNav } })
-export default class HelpNotificationsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-}
-</script>

src/views/HelpView.vue

@@ -1,25 +1,11 @@
 <template>
-  <QuickNav />
-
+  <QuickNav selected="Profile"></QuickNav>
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <!-- Back -->
-      <div class="text-lg text-center font-light relative px-7">
-        <h1
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          @click="$router.back()"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </h1>
-      </div>
-
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Help
-      </h1>
-    </div>
+    <!-- Heading -->
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Help
+    </h1>
 
     <div>
       <p>
@@ -29,7 +15,7 @@
 
       <h2 class="text-xl font-semibold">What is the philosophy here?</h2>
       <p>
-        We are building networks of people who want to grow a giving society.
+        We are building networks of people who want to grow a gifting society.
         First of all, you can record ways you've seen people give, and that
         leaves a permanent record -- one that came from you, and the recipient
         can prove it was for them. This is personally gratifying, but it extends
@@ -50,37 +36,19 @@
         the control; this app gives you the control.
       </p>
 
-      <h2 class="text-xl font-semibold">How do I get started?</h2>
+      <h2 class="text-xl font-semibold">How do I take my first action?</h2>
       <p>
         You need someone to register you -- usually the person who told you
         about this app, on the Contacts
-        <fa icon="users" class="fa-fw" /> page. After they register you, you can
-        select any contact on the home page (or "anonymous") and record your
-        appreciation for... whatever. The main goal is to record what people
-        have given you, to grow giving economies. Each claim is recorded on a
-        custom ledger. The day after being registered, you'll be able to able to
+        <fa icon="circle-user" class="fa-fw" /> page. After they register you,
+        and after you have contacts, you can select any contact on the home page
+        and record your appreciation for... whatever. That is a claim recorded
+        on a custom ledger. The day after being registered, you'll be able to
         register others; later, you can create projects, too.
       </p>
       <p>
-        Note that there are limits to how many others each person can register,
-        so you may have to wait.
-      </p>
-
-      <h2 class="text-xl font-semibold">How do I add someone else?</h2>
-      <p>
-        <button class="text-blue-500" @click="showOnboardInfo">
-          Click here to show an alert with the steps.
-        </button>
-        To start scanning, go
-        <router-link class="text-blue-500" to="/contact-qr">here.</router-link>
-      </p>
-      <p>
-        If they are not nearby to scan QR codes, tell them to copy their ID from
-        their Identity <fa icon="circle-user" class="fa-fw" /> page, which
-        typically starts with "did:ethr:...", and send it to you. Go to the
-        Contacts <fa icon="users" class="fa-fw" /> page and enter that into the
-        top form. To add a name, put a comma and then their name; to add their
-        public key, put another comma followed by the key.
+        Note that there are limits to how many each person can register, so you
+        may have to wait.
       </p>
 
       <h2 class="text-xl font-semibold">How do I backup all my data?</h2>
@@ -144,20 +112,25 @@
           How do I restore my other (non-identifier-secret) data?
         </h2>
         <ul class="list-disc list-inside">
-          <li>
-            Make sure you have your backup file (above), then contact us with
-            your interest. This is functionality that has to be written, and
-            your interest will help us prioritize it, but there are also manual
-            ways to restore your data.
-          </li>
+          <li>Make sure you have your backup file (above), then contact us.</li>
         </ul>
       </div>
 
+      <h2 class="text-xl font-semibold">
+        How do I add someone to my contacts?
+      </h2>
+      <p>
+        Tell them to copy their ID, which typically starts with "did:ethr:...",
+        and send it to you. Go to the Contacts
+        <fa icon="circle-user" class="fa-fw" /> page and enter that into the top
+        form. You may add a name by adding a comma followed by their name; you
+        may also add their public key by adding another comma followed by the
+        key.
+      </p>
+
       <h2 class="text-xl font-semibold">How do I create another identity?</h2>
       <p>
-        Before doing this, note that it is an advanced feature that affects
-        functionality (eg. the words "Alt ID" next to results, backup features)
-        so beware. You can
+        Go
         <router-link to="start" class="text-blue-500">
           create another identity here.
         </router-link>
@@ -175,25 +148,10 @@
         <fa icon="eye-slash" class="fa-fw" />.
       </p>
       <p>
-        Sometimes the reason you don't see something is because the search
-        results are limited. Go to the bottom and make sure to load all the data
-        on a list. If you still don't see it, try a search or view on a
-        different page.
-      </p>
-
-      <h2 class="text-xl font-semibold">
-        How do I access even more functionality?
-      </h2>
-      <p>
-        There is an "Advanced" section at the bottom of the Account
-        <fa icon="circle-user" /> page.
-      </p>
-      <p>
-        There is a even more functionality in a mobile app (and more
-        documentation) at
-        <a href="https://endorser.ch" class="text-blue-500">
-          EndorserSearch.com
-        </a>
+        Sometimes the reason you don't see something is because the search time
+        is limited. Go to the bottom and make sure to load all the data on a
+        list. If you still don't see it, try a search or view on a different
+        page.
       </p>
 
       <h2 class="text-xl font-semibold">What is your privacy policy?</h2>
@@ -204,26 +162,17 @@
         </a>
       </p>
 
-      <h2 class="text-xl font-semibold">Where can I read more?</h2>
-      <p>
-        This is part of the
-        <a href="https://livesofgiving.org" class="text-blue-500">
-          Lives of Giving
-        </a>
-        initiative.
-      </p>
-
       <h2 class="text-xl font-semibold">What app version is this?</h2>
       <p>
         {{ package.version }}
       </p>
 
       <h2 class="text-xl font-semibold">
-        For any other questions, including removing your data:
+        For any other questions, including remove your data:
       </h2>
       <p>
-        Contact us at
-        <a mailto="info@TimeSafari.app">info@TimeSafari.app</a>
+        Contact us through
+        <a href="https://communitycred.org">CommunityCred.org</a>.
       </p>
     </div>
   </section>
@@ -232,32 +181,10 @@
 <script lang="ts">
 import * as Package from "../../package.json";
 import { Component, Vue } from "vue-facing-decorator";
-import QuickNav from "@/components/QuickNav.vue";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import QuickNav from "@/components/QuickNav";
 
 @Component({ components: { QuickNav } })
 export default class Help extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   package = Package;
-
-  showOnboardInfo() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "info",
-        title: "Onboard Someone",
-        // If you edit this, check that the numbers still line up on the side in the alert (on mobile, preferably).
-        text: "1) Check that they've entered their name. 2) Go to the scanning page via the Identity page and then the through the QR icon at the top, and then scan and register them. 3) Have them go to that page and scan you.",
-      },
-      -1,
-    );
-  }
 }
 </script>

src/views/HomeView.vue

@@ -6,86 +6,140 @@
       Time Safari
     </h1>
 
-    <!-- show the actions for recognizing a give -->
     <div class="mb-8">
-      <div v-if="!activeDid">
-        To record others' giving,
-        <router-link :to="{ name: 'start' }" class="text-blue-500">
-          create your identifier.</router-link
-        >
-      </div>
+      <h2 class="text-xl font-bold mb-4">Notiwind Alert Test Suite</h2>
 
-      <div v-else-if="!isRegistered">
-        To record others' giving, someone must register your account, so show
-        them
-        <router-link :to="{ name: 'contact-qr' }" class="text-blue-500">
-          your identity info</router-link
-        >
-        and then
-        <router-link :to="{ name: 'account' }" class="text-blue-500">
-          check your limits.</router-link
-        >
-      </div>
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'toast',
+              text: 'I\'m a toast. Don\'t mind me.',
+            },
+            5000,
+          )
+        "
+        class="font-bold uppercase bg-slate-400 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Toast (self-dismiss)
+      </button>
 
-      <div v-else>
-        <!-- activeDid && isRegistered -->
-        <h2 class="text-xl font-bold">Record Something Given</h2>
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'info',
+              title: 'Information Alert',
+              text: 'Just wanted you to know.',
+            },
+            -1,
+          )
+        "
+        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Info
+      </button>
 
-        <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
-          <li @click="openDialog()">
-            <EntityIcon
-              :entityId="null"
-              :iconSize="64"
-              class="mx-auto border border-slate-300 rounded-md mb-1"
-            ></EntityIcon>
-            <h3
-              class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-            >
-              Anonymous/Unnamed
-            </h3>
-          </li>
-          <li
-            v-for="contact in allContacts"
-            :key="contact.did"
-            @click="openDialog(contact)"
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'success',
+              title: 'Success Alert',
+              text: 'Congratulations!',
+            },
+            -1,
+          )
+        "
+        class="font-bold uppercase bg-emerald-600 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Success
+      </button>
+
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'warning',
+              title: 'Warning Alert',
+              text: 'You might wanna look at this.',
+            },
+            -1,
+          )
+        "
+        class="font-bold uppercase bg-amber-600 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Warning
+      </button>
+
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'danger',
+              title: 'Danger Alert',
+              text: 'Something terrible has happened!',
+            },
+            -1,
+          )
+        "
+        class="font-bold uppercase bg-rose-600 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Danger
+      </button>
+    </div>
+
+    <div class="mb-8">
+      <h2 class="text-xl font-bold">Quick Action</h2>
+      <p class="mb-4">Show appreciation to a contact:</p>
+
+      <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
+        <li
+          v-for="contact in allContacts"
+          :key="contact.did"
+          @click="openDialog(contact)"
+        >
+          <EntityIcon
+            :entityId="contact.did"
+            :iconSize="64"
+            class="mx-auto border border-slate-300 rounded-md mb-1"
+          ></EntityIcon>
+          <h3
+            class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
           >
-            <EntityIcon
-              :entityId="contact.did"
-              :iconSize="64"
-              class="mx-auto border border-slate-300 rounded-md mb-1"
-            ></EntityIcon>
-            <h3
-              class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-            >
-              {{ contact.name || contact.did }}
-            </h3>
-          </li>
-        </ul>
+            {{ contact.name || "(no name)" }}
+          </h3>
+        </li>
+      </ul>
 
-        <!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
-        <router-link
-          v-if="allContacts.length >= 7"
-          :to="{ name: 'contact-gives' }"
-          class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
-        >
-          Show More Contacts&hellip;
-        </router-link>
+      <!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
+      <router-link
+        v-if="allContacts.length > 7"
+        :to="{ name: 'contact-gives' }"
+        class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
+      >
+        Show More Contacts&hellip;
+      </router-link>
 
-        <!-- If there are no contacts, show this instead: -->
-        <div
-          class="rounded border border-dashed border-slate-300 bg-slate-100 px-4 py-3 text-center italic text-slate-500"
-          v-if="allContacts.length === 0"
-        >
-          (No contacts to show.)
-        </div>
+      <!-- If there are no contacts, show this instead: -->
+      <div
+        class="rounded border border-dashed border-slate-300 bg-slate-100 px-4 py-3 text-center italic text-slate-500"
+      >
+        (No contacts to show.)
       </div>
     </div>
 
     <GiftedDialog
       ref="customDialog"
+      @dialog-result="handleDialogResult"
       message="Received from"
-      showGivenToUser="true"
-    />
+    >
+    </GiftedDialog>
 
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
       <h2 class="text-xl font-bold mb-4">Latest Activity</h2>
@@ -104,7 +158,7 @@
             class="border-b border-dashed border-slate-400 text-orange-400 pb-2 mb-2 font-bold uppercase text-sm"
             v-if="record.jwtId == feedLastViewedId"
           >
-            You've seen all the following
+            You've seen all claims below:
           </div>
           <div class="flex">
             <fa icon="gift" class="pt-1 pr-2 text-slate-500"></fa>
@@ -114,49 +168,40 @@
         </li>
       </ul>
     </div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 import GiftedDialog from "@/components/GiftedDialog.vue";
-import { db, accountsDB } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { db, accountsDB } from "@/db";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import {
-  didInfo,
-  GiverInputInfo,
-  GiveServerRecord,
-} from "@/libs/endorserServer";
+import { createAndSubmitGive, didInfo } from "@/libs/endorserServer";
 import { Contact } from "@/db/tables/contacts";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { IIdentifier } from "@veramo/core";
-import { Account } from "@/db/tables/accounts";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: { GiftedDialog, QuickNav, EntityIcon },
+  components: { GiftedDialog, AlertMessage, QuickNav, EntityIcon },
 })
 export default class HomeView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   activeDid = "";
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
   apiServer = "";
   feedAllLoaded = false;
   feedData = [];
-  feedPreviousOldestId?: string;
-  feedLastViewedId?: string;
+  feedPreviousOldestId = null;
+  feedLastViewedId = null;
   isHiddenSpinner = true;
-  isRegistered = false;
+  alertTitle = "";
+  alertMessage = "";
   numAccounts = 0;
 
   async beforeCreate() {
@@ -164,17 +209,23 @@ export default class HomeView extends Vue {
     this.numAccounts = await accountsDB.accounts.count();
   }
 
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
     await accountsDB.open();
-    const account = (await accountsDB.accounts
+    const account = await accountsDB.accounts
       .where("did")
       .equals(activeDid)
-      .first()) as Account;
+      .first();
     const identity = JSON.parse(account?.identity || "null");
-    return identity; // may be null
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load Give records with no identity available.",
+      );
+    }
+    return identity;
   }
 
-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
     const token = await accessToken(identity);
     const headers = {
       "Content-Type": "application/json",
@@ -190,15 +241,13 @@ export default class HomeView extends Vue {
       this.allMyDids = allAccounts.map((acc) => acc.did);
 
       await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
       this.apiServer = settings?.apiServer || "";
       this.activeDid = settings?.activeDid || "";
       this.allContacts = await db.contacts.toArray();
       this.feedLastViewedId = settings?.lastViewedClaimId;
-      this.isRegistered = !!settings?.isRegistered;
       this.updateAllFeed();
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
+    } catch (err) {
       this.$notify(
         {
           group: "alert",
@@ -214,16 +263,12 @@ export default class HomeView extends Vue {
   }
 
   public async buildHeaders() {
-    const headers: HeadersInit = {
-      "Content-Type": "application/json",
-    };
+    const headers = { "Content-Type": "application/json" };
 
     if (this.activeDid) {
       await accountsDB.open();
       const allAccounts = await accountsDB.accounts.toArray();
-      const account = allAccounts.find(
-        (acc) => acc.did === this.activeDid,
-      ) as Account;
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
       const identity = JSON.parse(account?.identity || "null");
 
       if (!identity) {
@@ -241,7 +286,7 @@ export default class HomeView extends Vue {
 
   public async updateAllFeed() {
     this.isHiddenSpinner = false;
-    await this.retrieveClaims(this.apiServer, this.feedPreviousOldestId)
+    await this.retrieveClaims(this.apiServer, null, this.feedPreviousOldestId)
       .then(async (results) => {
         if (results.data.length > 0) {
           this.feedData = this.feedData.concat(results.data);
@@ -276,7 +321,7 @@ export default class HomeView extends Vue {
     this.isHiddenSpinner = true;
   }
 
-  public async retrieveClaims(endorserApiServer: string, beforeId?: string) {
+  public async retrieveClaims(endorserApiServer, identifier, beforeId) {
     const beforeQuery = beforeId == null ? "" : "&beforeId=" + beforeId;
     const response = await fetch(
       endorserApiServer + "/api/v2/report/gives?" + beforeQuery,
@@ -299,36 +344,25 @@ export default class HomeView extends Vue {
     }
   }
 
-  giveDescription(giveRecord: GiveServerRecord) {
-    // similar code is in endorser-mobile utility.ts
-    // claim.claim happen for some claims wrapped in a Verifiable Credential
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const claim = (giveRecord.fullClaim as any).claim || giveRecord.fullClaim;
+  giveDescription(giveRecord) {
+    let claim = giveRecord.fullClaim;
+    if (claim.claim) {
+      claim = claim.claim;
+    }
     // agent.did is for legacy data, before March 2023
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const giverDid = claim.agent?.identifier || (claim.agent as any)?.did;
+    const giverDid =
+      claim.agent?.identifier || claim.agent?.did;
     const giverInfo = didInfo(
       giverDid,
       this.activeDid,
       this.allMyDids,
       this.allContacts,
     );
-    let gaveAmount = claim.object?.amountOfThisGood
+    const gaveAmount = claim.object?.amountOfThisGood
       ? this.displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
-      : "";
-    if (claim.description) {
-      if (gaveAmount) {
-        gaveAmount = gaveAmount + ", and also: ";
-      }
-      gaveAmount = gaveAmount + claim.description;
-    }
-    if (!gaveAmount) {
-      gaveAmount = "something not described";
-    }
+      : claim.description || "something unknown";
     // recipient.did is for legacy data, before March 2023
-    const gaveRecipientId =
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      claim.recipient?.identifier || (claim.recipient as any)?.did;
+    const gaveRecipientId = claim.recipient?.identifier || claim.recipient?.did;
     const gaveRecipientInfo = gaveRecipientId
       ? " to " +
         didInfo(
@@ -338,19 +372,133 @@ export default class HomeView extends Vue {
           this.allContacts,
         )
       : "";
-    return giverInfo + " gave" + gaveRecipientInfo + ": " + gaveAmount;
+    return giverInfo + " gave " + gaveAmount + gaveRecipientInfo;
   }
 
-  displayAmount(code: string, amt: number) {
+  displayAmount(code, amt) {
     return "" + amt + " " + this.currencyShortWordForCode(code, amt === 1);
   }
 
-  currencyShortWordForCode(unitCode: string, single: boolean) {
+  currencyShortWordForCode(unitCode, single) {
     return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
   }
 
-  openDialog(giver: GiverInputInfo) {
-    (this.$refs.customDialog as GiftedDialog).open(giver);
+  openDialog(giver) {
+    this.$refs.customDialog.open(giver);
+  }
+
+  handleDialogResult(result) {
+    if (result.action === "confirm") {
+      return new Promise((resolve) => {
+        this.recordGive(result.contact?.did, result.description, result.hours);
+        resolve();
+      });
+    } else {
+      // action was "cancel" so do nothing
+    }
+  }
+
+  /**
+   *
+   * @param giverDid may be null
+   * @param description may be an empty string
+   * @param hours may be 0
+   */
+  public async recordGive(giverDid, description, hours) {
+    if (!this.activeDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identity before you can record a give.",
+        },
+        -1,
+      );
+      return;
+    }
+
+    if (!description && !hours) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must enter a description or some number of hours.",
+        },
+        -1,
+      );
+      return;
+    }
+
+    try {
+      const identity = await this.getIdentity(this.activeDid);
+      const result = await createAndSubmitGive(
+        this.axios,
+        this.apiServer,
+        identity,
+        giverDid,
+        this.activeDid,
+        description,
+        hours,
+      );
+
+      if (this.isGiveCreationError(result)) {
+        const errorMessage = this.getGiveCreationErrorMessage(result);
+        console.log("Error with give result:", result);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: errorMessage || "There was an error recording the give.",
+          },
+          -1,
+        );
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: "That gift was recorded.",
+          },
+          -1,
+        );
+      }
+    } catch (error) {
+      console.log("Error with give caught:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
+            this.getGiveErrorMessage(error) ||
+            "There was an error recording the give.",
+        },
+        -1,
+      );
+    }
+  }
+
+  private setAlert(title, message) {
+    this.alertTitle = title;
+    this.alertMessage = message;
+  }
+
+  // Helper functions for readability
+
+  isGiveCreationError(result) {
+    return result.status !== 201 || result.data?.error;
+  }
+
+  getGiveCreationErrorMessage(result) {
+    return result.data?.error?.message;
+  }
+
+  getGiveErrorMessage(error) {
+    return error.userMessage || error.response?.data?.error?.message;
   }
 }
 </script>

src/views/IdentitySwitcherView.vue

@@ -22,7 +22,7 @@
       <fa icon="circle-check" class="fa-fw text-blue-600 text-xl mr-3"></fa>
       <span class="overflow-hidden">
         <h2 class="text-xl font-semibold mb-0">
-          {{ givenName }}
+          {{ firstName }} {{ lastName }}
         </h2>
         <div class="text-sm text-slate-500 truncate">
           <b>ID:</b> <code>{{ activeDid }}</code>
@@ -49,9 +49,7 @@
     </ul>
 
     <!-- Actions -->
-    <!-- id used by puppeteer test script -->
     <router-link
-      id="start-link"
       :to="{ name: 'start' }"
       class="block text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
     >
@@ -64,56 +62,52 @@
     >
       No Identity
     </a>
+
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 import { AppString } from "@/constants/app";
-import { db, accountsDB } from "@/db/index";
+import { db, accountsDB } from "@/db";
 import { AccountsSchema } from "@/db/tables/accounts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import QuickNav from "@/components/QuickNav.vue";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({ components: { QuickNav } })
+@Component({ components: { AlertMessage, QuickNav } })
 export default class IdentitySwitcherView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   Constants = AppString;
-  public accounts: typeof AccountsSchema;
-  public activeDid = "";
-  public apiServer = "";
-  public apiServerInput = "";
-  public givenName = "";
-  public otherIdentities: Array<{ did: string }> = [];
-  public showContactGives = false;
+  public accounts: AccountsSchema;
+  public activeDid;
+  public firstName;
+  public lastName;
+  public alertTitle;
+  public alertMessage;
+  public otherIdentities = [];
 
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
     await accountsDB.open();
     const account = await accountsDB.accounts
       .where("did")
       .equals(activeDid)
       .first();
-    const identity = JSON.parse((account?.identity as string) || "null");
+    const identity = JSON.parse(account?.identity || "null");
     return identity;
   }
 
   async created() {
     try {
       await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
       this.activeDid = settings?.activeDid || "";
       this.apiServer = settings?.apiServer || "";
       this.apiServerInput = settings?.apiServer || "";
-      this.givenName =
-        (settings?.firstName || "") +
-        (settings?.lastName ? ` ${settings.lastName}` : ""); // deprecated, pre v 0.1.3
+      this.firstName = settings?.firstName || "No";
+      this.lastName = settings?.lastName || "Name";
       this.showContactGives = !!settings?.showContactGivesInline;
 
       const identity = await this.getIdentity(this.activeDid);
@@ -132,29 +126,40 @@ export default class IdentitySwitcherView extends Vue {
         }
       }
     } catch (err) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Loading Accounts",
-          text: "Clear your cache and start over (after data backup).",
-        },
-        -1,
-      );
-      console.error("Telling user to clear cache at page create because:", err);
+      if (
+        err.message ===
+        "Attempted to load account records with no identity available."
+      ) {
+        this.limitsMessage = "No identity.";
+        this.loadingLimits = false;
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error Creating Account",
+            text: "Clear your cache and start over (after data backup).",
+          },
+          -1,
+        );
+        console.error(
+          "Telling user to clear cache at page create because:",
+          err,
+        );
+      }
     }
   }
 
-  async switchAccount(did?: string) {
+  async switchAccount(did: string) {
     // 0 means none
     if (did === "0") {
       did = undefined;
     }
     await db.open();
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       activeDid: did,
     });
-    this.activeDid = did || "";
+    this.activeDid = did;
     this.otherIdentities = [];
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();

src/views/ImportAccountView.vue

@@ -17,33 +17,13 @@
     <p class="text-center text-xl mb-4 font-light">
       Enter your seed phrase below to import your identity on this device.
     </p>
-    <!-- id used by puppeteer test script -->
     <input
-      id="seed-input"
       type="text"
       placeholder="Seed Phrase"
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
       v-model="mnemonic"
     />
     {{ mnemonic }}
-    <h3
-      class="text-sm uppercase font-semibold mb-3"
-      @click="showAdvanced = !showAdvanced"
-    >
-      Advanced
-    </h3>
-    <div v-if="showAdvanced">
-      Enter a custom derivation path
-      <input
-        type="text"
-        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-        v-model="derivationPath"
-      />
-      For previous uPort or Endorser users,
-      <a @click="derivationPath = UPORT_DERIVATION_PATH" class="text-blue-500">
-        click here to use that value.
-      </a>
-    </div>
     <div class="mt-8">
       <button
         @click="from_mnemonic()"
@@ -64,26 +44,19 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import {
-  DEFAULT_ROOT_DERIVATION_PATH,
-  deriveAddress,
-  newIdentifier,
-} from "../libs/crypto";
-import { accountsDB, db } from "@/db/index";
+import { deriveAddress, newIdentifier } from "../libs/crypto";
+import { accountsDB, db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
 @Component({
   components: {},
 })
 export default class ImportAccountView extends Vue {
-  UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'"; // for legacy imports, likely never used
-
   mnemonic = "";
   address = "";
   privateHex = "";
   publicHex = "";
-  derivationPath = DEFAULT_ROOT_DERIVATION_PATH;
-  showAdvanced = false;
+  derivationPath = "";
 
   public onCancelClick() {
     this.$router.back();
@@ -92,10 +65,8 @@ export default class ImportAccountView extends Vue {
   public async from_mnemonic() {
     const mne: string = this.mnemonic.trim().toLowerCase();
     if (this.mnemonic.trim().length > 0) {
-      [this.address, this.privateHex, this.publicHex] = deriveAddress(
-        mne,
-        this.derivationPath,
-      );
+      [this.address, this.privateHex, this.publicHex, this.derivationPath] =
+        deriveAddress(mne);
 
       const newId = newIdentifier(
         this.address,

src/views/ImportDerivedAccountView.vue

@@ -1,163 +0,0 @@
-<template>
-  <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div id="ViewBreadcrumb" class="mb-8">
-      <h1 class="text-lg text-center font-light relative px-7">
-        <!-- Cancel -->
-        <button
-          @click="$router.go(-1)"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        >
-          <fa icon="chevron-left"></fa>
-        </button>
-        Derive from Existing Identity
-      </h1>
-    </div>
-    <!-- Import Account Form -->
-
-    <div>
-      <p class="text-center text-xl mb-4 font-light">
-        Will increment the maximum derivation path from the existing seed.
-      </p>
-
-      <p v-if="didArrays.length > 1">
-        Choose existing DIDs from same seed phrase to compute derivation.
-      </p>
-      <ul class="mb-4">
-        <li
-          class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-2"
-          v-for="dids in didArrays"
-          :key="dids[0]"
-          @click="switchAccount(dids[0])"
-        >
-          <fa
-            v-if="dids[0] == selectedArrayFirstDid"
-            icon="circle"
-            class="fa-fw text-blue-400 text-xl mr-3"
-          ></fa>
-          <fa
-            v-else
-            icon="circle"
-            class="fa-fw text-slate-400 text-xl mr-3"
-          ></fa>
-          <span class="overflow-hidden">
-            <div class="text-sm text-slate-500 truncate">
-              <code>{{ dids.join(",") }}</code>
-            </div>
-          </span>
-        </li>
-      </ul>
-    </div>
-    <div class="mt-8">
-      <button
-        @click="incrementDerivation()"
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-      >
-        Increment and Import
-      </button>
-      <button
-        @click="onCancelClick()"
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Cancel
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import {
-  DEFAULT_ROOT_DERIVATION_PATH,
-  deriveAddress,
-  newIdentifier,
-} from "../libs/crypto";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-
-@Component({
-  components: {},
-})
-export default class ImportAccountView extends Vue {
-  derivationPath = DEFAULT_ROOT_DERIVATION_PATH;
-  didArrays: Array<Array<string>> = [];
-  selectedArrayFirstDid = "";
-
-  async mounted() {
-    await accountsDB.open();
-    const accounts = await accountsDB.accounts.toArray();
-    const seedDids: Record<string, Array<string>> = {};
-    accounts.forEach((account) => {
-      const prevDids: Array<string> = seedDids[account.mnemonic] || [];
-      seedDids[account.mnemonic] = prevDids.concat([account.did]);
-    });
-    this.didArrays = Object.values(seedDids);
-    this.selectedArrayFirstDid = this.didArrays[0][0];
-  }
-
-  public onCancelClick() {
-    this.$router.back();
-  }
-
-  public switchAccount(did: string) {
-    this.selectedArrayFirstDid = did;
-  }
-
-  public async incrementDerivation() {
-    await accountsDB.open();
-    // find the maximum derivation path for the selected DIDs
-    const selectedArray: Array<string> =
-      this.didArrays.find((dids) => dids[0] === this.selectedArrayFirstDid) ||
-      [];
-    const allMatchingAccounts = await accountsDB.accounts
-      .where("did")
-      .anyOf(...selectedArray)
-      .toArray();
-    const accountWithMaxDeriv = allMatchingAccounts[0];
-    allMatchingAccounts.slice(1).forEach((account) => {
-      if (account.derivationPath > accountWithMaxDeriv.derivationPath) {
-        accountWithMaxDeriv.derivationPath = account.derivationPath;
-      }
-    });
-    // increment the last number in that max derivation path
-    let lastStr = accountWithMaxDeriv.derivationPath.split("/").slice(-1)[0];
-    if (lastStr.endsWith("'")) {
-      lastStr = lastStr.slice(0, -1);
-    }
-    const lastNum = parseInt(lastStr, 10);
-    const newLastNum = lastNum + 1;
-    const newDerivPath = accountWithMaxDeriv.derivationPath
-      .split("/")
-      .slice(0, -1)
-      .concat([newLastNum.toString() + "'"])
-      .join("/");
-
-    const mne: string = accountWithMaxDeriv.mnemonic;
-
-    const [address, privateHex, publicHex] = deriveAddress(mne, newDerivPath);
-
-    const newId = newIdentifier(address, publicHex, privateHex, newDerivPath);
-
-    try {
-      await accountsDB.accounts.add({
-        dateCreated: new Date().toISOString(),
-        derivationPath: newDerivPath,
-        did: newId.did,
-        identity: JSON.stringify(newId),
-        mnemonic: mne,
-        publicKeyHex: newId.keys[0].publicKeyHex,
-      });
-
-      // record that as the active DID
-      await db.open();
-      db.settings.update(MASTER_SETTINGS_KEY, {
-        activeDid: newId.did,
-      });
-      this.$router.push({ name: "account" });
-    } catch (err) {
-      console.error("Error saving mnemonic & updating settings:", err);
-    }
-  }
-}
-</script>

src/views/NewEditAccountView.vue

@@ -10,15 +10,21 @@
         >
           <fa icon="chevron-left" class="fa-fw"></fa>
         </button>
-        Edit Identity
+        [New/Edit] Identity
       </h1>
     </div>
 
     <input
       type="text"
-      placeholder="Name"
+      placeholder="First Name"
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-      v-model="givenName"
+      v-model="firstName"
+    />
+    <input
+      type="text"
+      placeholder="Last Name"
+      class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
+      v-model="lastName"
     />
 
     <div class="mt-8">
@@ -43,31 +49,37 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { db } from "@/db";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
 @Component({
   components: {},
 })
 export default class NewEditAccountView extends Vue {
-  givenName = "";
+  firstName =
+    localStorage.getItem("firstName") === null
+      ? "--"
+      : localStorage.getItem("firstName");
+  lastName =
+    localStorage.getItem("lastName") === null
+      ? "--"
+      : 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_KEY)) as Settings;
-    this.givenName =
-      (settings?.firstName || "") +
-      (settings?.lastName ? ` ${settings.lastName}` : ""); // deprecated, pre v 0.1.3
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.firstName = settings?.firstName || "";
+    this.lastName = settings?.lastName || "";
   }
 
   onClickSaveChanges() {
     db.settings.update(MASTER_SETTINGS_KEY, {
-      firstName: this.givenName,
-      lastName: "", // deprecated, pre v 0.1.3
+      firstName: this.firstName,
+      lastName: this.lastName,
     });
-    localStorage.setItem("firstName", this.givenName as string);
-    localStorage.setItem("lastName", ""); // deprecated, pre v 0.1.3
+    localStorage.setItem("firstName", this.firstName as string);
+    localStorage.setItem("lastName", this.lastName as string);
     this.$router.push({ name: "account" });
   }
 

src/views/NewEditProjectView.vue

@@ -1,5 +1,4 @@
 <template>
-  <QuickNav selected="Projects"></QuickNav>
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
@@ -11,7 +10,7 @@
           class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
           ><fa icon="chevron-left" class="fa-fw"></fa
         ></router-link>
-        Edit Idea
+        [New/Edit] Plan
       </h1>
     </div>
 
@@ -24,65 +23,20 @@
 
     <input
       type="text"
-      placeholder="Idea Name"
+      placeholder="Project Name"
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-      v-model="fullClaim.name"
+      v-model="projectName"
     />
 
     <textarea
       placeholder="Description"
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
       rows="5"
-      v-model="fullClaim.description"
-      maxlength="5000"
+      v-model="description"
+      maxlength="500"
     ></textarea>
     <div class="text-xs text-slate-500 italic -mt-3 mb-4">
-      {{ fullClaim.description.length }}/5000 max. characters
-    </div>
-
-    <input
-      v-model="fullClaim.url"
-      placeholder="Website"
-      class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-    />
-
-    <div class="flex items-center mb-4">
-      <input
-        type="checkbox"
-        class="mr-2"
-        v-model="includeLocation"
-        @click="includeLocation = !includeLocation"
-      />
-      <label for="includeLocation">Include Location</label>
-    </div>
-    <div v-if="includeLocation" style="height: 600px; width: 800px">
-      <div class="px-2 py-2">
-        For your security, we recommend you choose a location nearby but not
-        exactly at the place.
-      </div>
-
-      <l-map
-        ref="map"
-        v-model:zoom="zoom"
-        :center="[0, 0]"
-        @click="
-          (event) => {
-            latitude = event.latlng.lat;
-            longitude = event.latlng.lng;
-          }
-        "
-      >
-        <l-tile-layer
-          url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-          layer-type="base"
-          name="OpenStreetMap"
-        />
-        <l-marker
-          v-if="latitude && longitude"
-          :lat-lng="[latitude, longitude]"
-          @click="maybeEraseLatLong()"
-        />
-      </l-map>
+      {{ description.length }}/500 max. characters
     </div>
 
     <div class="mt-8">
@@ -109,58 +63,44 @@
         Cancel
       </button>
     </div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
 <script lang="ts">
-import "leaflet/dist/leaflet.css";
 import { AxiosError } from "axios";
 import * as didJwt from "did-jwt";
 import { Component, Vue } from "vue-facing-decorator";
-import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
 
-import QuickNav from "@/components/QuickNav.vue";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
 import { useAppStore } from "@/store/app";
 import { IIdentifier } from "@veramo/core";
-import { PlanVerifiableCredential } from "@/libs/endorserServer";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import AlertMessage from "@/components/AlertMessage";
 
 @Component({
-  components: { LMap, LMarker, LTileLayer, QuickNav },
+  components: { AlertMessage },
 })
 export default class NewEditProjectView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   activeDid = "";
   apiServer = "";
+  projectName = "";
+  description = "";
   errorMessage = "";
-  fullClaim: PlanVerifiableCredential = {
-    "@context": "https://schema.org",
-    "@type": "PlanAction",
-    name: "",
-    description: "",
-  }; // this default is only to avoid errors before plan is loaded
-  includeLocation = false;
-  latitude = 0;
-  longitude = 0;
   numAccounts = 0;
-  zoom = 2;
+  alertTitle = "";
+  alertMessage = "";
 
   async beforeCreate() {
     await accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
   }
 
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
     await accountsDB.open();
     const account = await accountsDB.accounts
       .where("did")
@@ -176,7 +116,7 @@ export default class NewEditProjectView extends Vue {
     return identity;
   }
 
-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
     const token = await accessToken(identity);
     const headers = {
       "Content-Type": "application/json",
@@ -224,12 +164,9 @@ export default class NewEditProjectView extends Vue {
     try {
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
-        this.fullClaim = resp.data.claim;
-        if (this.fullClaim?.location) {
-          this.includeLocation = true;
-          this.latitude = this.fullClaim.location.geo.latitude;
-          this.longitude = this.fullClaim.location.geo.longitude;
-        }
+        const claim = resp.data.claim;
+        this.projectName = claim.name;
+        this.description = claim.description;
       }
     } catch (error) {
       console.error("Got error retrieving that project", error);
@@ -238,19 +175,16 @@ export default class NewEditProjectView extends Vue {
 
   private async SaveProject(identity: IIdentifier) {
     // Make a claim
-    const vcClaim: PlanVerifiableCredential = this.fullClaim;
+    const vcClaim: VerifiableCredential = {
+      "@context": "https://schema.org",
+      "@type": "PlanAction",
+      name: this.projectName,
+      description: this.description,
+      identifier: this.projectId || undefined,
+    };
     if (this.projectId) {
       vcClaim.identifier = this.projectId;
     }
-    if (this.includeLocation) {
-      vcClaim.location = {
-        geo: {
-          "@type": "GeoCoordinates",
-          latitude: this.latitude,
-          longitude: this.longitude,
-        },
-      };
-    }
     // Make a payload for the claim
     const vcPayload = {
       vc: {
@@ -284,46 +218,34 @@ export default class NewEditProjectView extends Vue {
       try {
         const resp = await this.axios.post(url, payload, { headers });
         // handleId is new in server v release-1.6.0; remove fullIri when that
-        // version shows up here: https://api.endorser.ch/api-docs/
+        // version shows up here: https://endorser.ch:3000/api-docs/
         if (resp.data?.success?.handleId || resp.data?.success?.fullIri) {
           this.errorMessage = "";
-
+          this.alertTitle = "";
+          this.alertMessage = "";
           // handleId is new in server v release-1.6.0; remove fullIri when that
-          // version shows up here: https://api.endorser.ch/api-docs/
+          // version shows up here: https://endorser.ch:3000/api-docs/
           useAppStore().setProjectId(
             resp.data.success.handleId || resp.data.success.fullIri,
           );
           setTimeout(
-            function (that: NewEditProjectView) {
-              that.$router.push({ name: "project" });
+            function (that: Vue) {
+              const route = {
+                name: "project",
+              };
+              that.$router.push(route);
             },
             2000,
             this,
           );
-        } else {
-          console.log(
-            "Got unexpected 'data' inside response from server",
-            resp,
-          );
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Error Saving Idea",
-              text: "Server did not save the idea. Try again.",
-            },
-            -1,
-          );
         }
       } catch (error) {
         let userMessage = "There was an error saving the project.";
-        const serverError = error as AxiosError<{
-          error?: { message?: string };
-        }>;
+        const serverError = error as AxiosError;
         if (serverError) {
-          console.log("Got error from server", serverError);
           if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
-            userMessage = serverError.response?.data?.error?.message || ""; // This is info for the user.
+            console.log(serverError);
+            userMessage = serverError.response.data.error.message; // This is info for the user.
             this.$notify(
               {
                 group: "alert",
@@ -377,14 +299,6 @@ export default class NewEditProjectView extends Vue {
     }
   }
 
-  public maybeEraseLatLong() {
-    if (window.confirm("Are you sure you don't want to mark a location?")) {
-      this.latitude = 0;
-      this.longitude = 0;
-      this.includeLocation = false;
-    }
-  }
-
   public onCancelClick() {
     this.$router.back();
   }

src/views/NewIdentifierView.vue

@@ -1,25 +1,11 @@
 <template>
-  <QuickNav />
-
+  <QuickNav selected="Profile"></QuickNav>
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <!-- Back -->
-      <div class="text-lg text-center font-light relative px-7">
-        <h1
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          @click="$router.back()"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </h1>
-      </div>
-
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Your Identity
-      </h1>
-    </div>
+    <!-- Heading -->
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Your Identity
+    </h1>
 
     <div class="flex justify-center py-12">
       <span />
@@ -54,13 +40,13 @@
 <script lang="ts">
 import "dexie-export-import";
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import QuickNav from "@/components/QuickNav.vue";
+import QuickNav from "@/components/QuickNav";
 
 @Component({ components: { QuickNav } })
-export default class NewIdentifierView extends Vue {
+export default class AccountViewView extends Vue {
   loading = true;
 
   async mounted() {

src/views/ProjectViewView.vue

@@ -12,7 +12,14 @@
         >
           <fa icon="chevron-left" class="fa-fw"></fa>
         </button>
-        Idea
+        <!-- Context Menu -->
+        <a
+          href=""
+          class="text-lg text-center px-2 py-1 absolute -right-2 -top-1"
+          ><fa icon="ellipsis-vertical" class="fa-fw"></fa
+        ></a>
+
+        View Plan
       </h1>
     </div>
 
@@ -31,28 +38,13 @@
           <div class="overflow-hidden">
             <h2 class="text-xl font-semibold">{{ name }}</h2>
             <div class="text-sm mb-3">
-              <div class="truncate">
-                <fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{ issuer }}
-              </div>
-              <div v-if="timeSince">
-                <fa icon="calendar" class="fa-fw text-slate-400"></fa>
-                {{ timeSince }}
-              </div>
-              <div v-if="latitude || longitude">
-                <fa icon="location-dot" class="fa-fw text-slate-400"></fa>
-                <a
-                  :href="getOpenStreetMapUrl()"
-                  target="_blank"
-                  class="underline"
-                  >Map View
-                </a>
-              </div>
-              <div v-if="url">
-                <fa icon="globe" class="fa-fw text-slate-400"></fa>
-                <a :href="addScheme(url)" target="_blank" class="underline"
-                  >{{ domainForWebsite(this.url) }}
-                </a>
+              <div class="truncate"
+                ><fa icon="user" class="fa-fw text-slate-400"></fa>
+                {{ issuer }}</div
+              >
+              <div
+                ><fa icon="calendar" class="fa-fw text-slate-400"></fa
+                >{{ timeSince }}
               </div>
             </div>
           </div>
@@ -61,11 +53,8 @@
         <div class="text-sm text-slate-500">
           <div v-if="!expanded">
             {{ truncatedDesc }}
-            <a
-              v-if="description.length >= truncateLength"
-              @click="expandText"
-              class="uppercase text-xs font-semibold text-slate-700"
-              >... Read More</a
+            <a v-if="description.length >= truncateLength" @click="expandText"
+              >Read More</a
             >
           </div>
           <div v-else>
@@ -73,13 +62,12 @@
             <a
               @click="collapseText"
               class="uppercase text-xs font-semibold text-slate-700"
-              >- Read Less</a
+              >Read Less</a
             >
           </div>
         </div>
       </div>
       <button
-        v-if="issuer == activeDid"
         type="button"
         class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
         @click="onEditClick()"
@@ -88,243 +76,151 @@
       </button>
     </div>
 
-    <div class="mb-4">
-      <div v-if="activeDid" class="text-center">
-        <button
-          @click="openOfferDialog({ name: 'you', did: activeDid })"
-          class="block w-full text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
-        >
-          I offer&hellip;
-        </button>
-      </div>
-    </div>
-
     <div>
-      <div v-if="activeDid" class="text-center">
+      <div v-if="activeDid">
         <button
-          @click="openGiftDialog({ name: 'you', did: activeDid })"
-          class="block w-full text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
+          @click="openDialog({ name: 'you', did: activeDid })"
+          class="text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
         >
-          I gave&hellip;
+          I gave...
         </button>
-        <p class="mt-2 mb-4 text-center">Or, record a gift from:</p>
+        &horbar; or:
       </div>
-      <p v-if="!activeDid" class="mt-2 mb-4">Record a gift from:</p>
-
-      <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
-        <li @click="openGiftDialog()">
-          <EntityIcon
-            :entityId="null"
-            :iconSize="64"
-            class="mx-auto border border-slate-300 rounded-md mb-1"
-          ></EntityIcon>
-          <h3
-            class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-          >
-            Anonymous/Unnamed
-          </h3>
-        </li>
-        <li
-          v-for="contact in allContacts"
-          :key="contact.did"
-          @click="openGiftDialog(contact)"
-        >
-          <EntityIcon
-            :entityId="contact.did"
-            :iconSize="64"
-            class="mx-auto border border-slate-300 rounded-md mb-1"
-          ></EntityIcon>
-          <h3
-            class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-          >
-            {{ contact.name || "(no name)" }}
-          </h3>
-        </li>
-      </ul>
-
-      <!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
-      <router-link
-        v-if="allContacts.length >= 7"
-        :to="{ name: 'contact-gives' }"
-        class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
-      >
-        Show More Contacts&hellip;
-      </router-link>
+      <!-- similar contact selection code is in multiple places -->
+      Record a gift from
+      <span v-for="contact in allContacts" :key="contact.did">
+        <button @click="openDialog(contact)" class="text-blue-500">
+          &nbsp;{{ contact.name }}</button
+        >,
+      </span>
+      <span v-if="allContacts.length > 0">&nbsp;or&nbsp;</span>
+      <button @click="openDialog()" class="text-blue-500">
+        someone not specified
+      </button>
     </div>
 
     <!-- Gifts to & from this -->
-    <div class="grid items-start grid-cols-1 sm:grid-cols-3 gap-4">
-      <div class="bg-slate-100 px-4 py-3 rounded-md">
-        <h3 class="text-sm uppercase font-semibold mb-3">
-          Offered To This Idea
-        </h3>
-
-        <div v-if="offersToThis.length === 0">
-          (None yet. Record one above.)
-        </div>
-
-        <ul v-else class="text-sm border-t border-slate-300">
-          <li
-            v-for="offer in offersToThis"
-            :key="offer.id"
-            class="py-1.5 border-b border-slate-300"
-          >
-            <div class="flex justify-between gap-4">
-              <span>
+    <div class="mt-8 flex justify-around">
+      <div>
+        <h1 class="text-xl">Given to this Project</h1>
+      </div>
+      <div>
+        <h1 class="text-xl">... and paid forward from this Project</h1>
+      </div>
+    </div>
+    <div class="flex justify-around">
+      <div class="w-1/2">
+        <div v-for="give in givesToThis" :key="give.id">
+          <div class="flex justify-between">
+            <div class="flex gap-3">
+              <div class="flex gap-2">
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{ didInfo(offer.agentDid, activeDid, allMyDids, allContacts) }}
-              </span>
-              <span v-if="offer.amount">
+                <span>{{
+                  didInfo(give.agentDid, activeDid, allMyDids, allContacts)
+                }}</span>
+              </div>
+              <div class="flex gap-2" v-if="give.amount">
                 <fa
-                  :icon="iconForUnitCode(offer.unit)"
+                  icon="clock"
+                  v-if="give.unit === 'HUR'"
                   class="fa-fw text-slate-400"
-                />{{ offer.amount }}
-              </span>
+                ></fa>
+                <fa icon="coins" v-else class="fa-fw text-slate-400"></fa>
+                <span>{{ give.amount }}</span>
+              </div>
+              <div class="flex gap-2" v-if="give.description">
+                <fa icon="comment" class="fa-fw text-slate-400"></fa>
+                <span>{{ give.description }}</span>
+              </div>
             </div>
-            <div v-if="offer.objectDescription" class="text-slate-500">
-              <fa icon="comment" class="fa-fw text-slate-400"></fa>
-              {{ offer.objectDescription }}
-            </div>
-          </li>
-        </ul>
-      </div>
-
-      <div class="bg-slate-100 px-4 py-3 rounded-md">
-        <h3 class="text-sm uppercase font-semibold mb-3">Given To This Idea</h3>
-
-        <div v-if="givesToThis.length === 0">(None yet. Record one above.)</div>
-
-        <ul v-else class="text-sm border-t border-slate-300">
-          <li
-            v-for="give in givesToThis"
-            :key="give.id"
-            class="py-1.5 border-b border-slate-300"
-          >
-            <div class="flex justify-between gap-4">
-              <span
-                ><fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{ didInfo(give.agentDid, activeDid, allMyDids, allContacts) }}
-              </span>
-              <span v-if="give.amount">
-                <fa
-                  :icon="iconForUnitCode(give.unit)"
-                  class="fa-fw text-slate-400"
-                />{{ give.amount }}
-              </span>
-            </div>
-            <div v-if="give.description" class="text-slate-500">
-              <fa icon="comment" class="fa-fw text-slate-400"></fa>
-              {{ give.description }}
-            </div>
-          </li>
-        </ul>
-      </div>
-
-      <div class="grid items-start grid-cols-1 gap-4">
-        <div
-          v-if="fulfillersToThis.length > 0"
-          class="bg-slate-100 px-4 py-3 rounded-md"
-        >
-          <h3 class="text-sm uppercase font-semibold mb-3">
-            Contributions To This Idea
-          </h3>
-          <ul>
-            <li v-for="plan in fulfillersToThis" :key="plan.handleId">
-              <button
-                @click="onClickLoadProject(plan.handleId)"
-                class="text-blue-500"
-              >
-                {{ plan.name }}
-              </button>
-            </li>
-          </ul>
+          </div>
         </div>
-
-        <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
-          <h3 class="text-sm uppercase font-semibold mb-3">
-            Contributions By This Idea
-          </h3>
-          <button
-            @click="onClickLoadProject(fulfilledByThis.handleId)"
-            class="text-blue-500"
-          >
-            {{ fulfilledByThis.name }}
-          </button>
+      </div>
+      <div class="w-1/2">
+        <div v-for="give in givesByThis" :key="give.id">
+          <div class="flex justify-between">
+            <div class="flex gap-3">
+              <div class="flex gap-2">
+                <fa icon="user" class="fa-fw text-slate-400"></fa>
+                <span>{{
+                  didInfo(give.agentDid, activeDid, allMyDids, allContacts)
+                }}</span>
+              </div>
+              <div class="flex gap-2" v-if="give.amount">
+                <fa
+                  icon="clock"
+                  v-if="give.unit === 'HUR'"
+                  class="fa-fw text-slate-400"
+                ></fa>
+                <fa icon="coins" v-else class="fa-fw text-slate-400"></fa>
+                <span>{{ give.amount }}</span>
+              </div>
+              <div class="flex gap-2">
+                <fa icon="comment" class="fa-fw text-slate-400"></fa>
+                <span>{{ give.description }}</span>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
     </div>
-
     <GiftedDialog
-      ref="customGiveDialog"
+      ref="customDialog"
+      @dialog-result="handleDialogResult"
       message="Received from"
-      :projectId="this.projectId"
     >
     </GiftedDialog>
-    <OfferDialog ref="customOfferDialog" :projectId="this.projectId">
-    </OfferDialog>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
 <script lang="ts">
-import { AxiosError, RawAxiosRequestHeaders } from "axios";
+import { AxiosError } from "axios";
 import * as moment from "moment";
 import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
-import OfferDialog from "@/components/OfferDialog.vue";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { Contact } from "@/db/tables/contacts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import { isGlobalUri } from "@/libs/util";
 import {
+  createAndSubmitGive,
   didInfo,
-  GiverInputInfo,
   GiveServerRecord,
-  OfferServerRecord,
-  PlanServerRecord,
 } from "@/libs/endorserServer";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { Account } from "@/db/tables/accounts";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav },
+  components: { GiftedDialog, AlertMessage, QuickNav, EntityIcon },
 })
 export default class ProjectViewView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   activeDid = "";
+  alertMessage = "";
+  alertTitle = "";
   allMyDids: Array<string> = [];
   allContacts: Array<Contact> = [];
   apiServer = "";
   description = "";
   expanded = false;
-  fulfilledByThis: PlanServerRecord | null = null;
-  fulfillersToThis: Array<PlanServerRecord> = [];
   givesToThis: Array<GiveServerRecord> = [];
-  issuer = "";
-  latitude = 0;
-  longitude = 0;
+  givesByThis: Array<GiveServerRecord> = [];
   name = "";
-  offersToThis: Array<OfferServerRecord> = [];
+  issuer = "";
   projectId = localStorage.getItem("projectId") || ""; // handle ID
   timeSince = "";
   truncatedDesc = "";
   truncateLength = 40;
-  url = "";
 
   async created() {
     await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
@@ -333,22 +229,17 @@ export default class ProjectViewView extends Vue {
     const accounts = accountsDB.accounts;
     const accountsArr = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
-    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    const account = accountsArr?.find((acc) => acc.did === this.activeDid);
     const identity = JSON.parse(account?.identity || "null");
-
-    const pathParam = window.location.pathname.substring("/project/".length);
-    if (pathParam) {
-      this.projectId = decodeURIComponent(pathParam);
-    }
-    this.LoadProject(this.projectId, identity);
+    this.LoadProject(identity);
   }
 
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
     await accountsDB.open();
-    const account = (await accountsDB.accounts
+    const account = await accountsDB.accounts
       .where("did")
       .equals(activeDid)
-      .first()) as Account;
+      .first();
     const identity = JSON.parse(account?.identity || "null");
 
     if (!identity) {
@@ -359,7 +250,7 @@ export default class ProjectViewView extends Vue {
     return identity;
   }
 
-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
     const token = await accessToken(identity);
     const headers = {
       "Content-Type": "application/json",
@@ -377,12 +268,7 @@ export default class ProjectViewView extends Vue {
   }
 
   // Isn't there a better way to make this available to the template?
-  didInfo(
-    did: string,
-    activeDid: string,
-    dids: Array<string>,
-    contacts: Array<Contact>,
-  ) {
+  didInfo(did, activeDid, dids, contacts) {
     return didInfo(did, activeDid, dids, contacts);
   }
 
@@ -394,12 +280,12 @@ export default class ProjectViewView extends Vue {
     this.expanded = false;
   }
 
-  async LoadProject(projectId: string, identity: IIdentifier) {
-    this.projectId = projectId;
-
+  async LoadProject(identity: IIdentifier) {
     const url =
-      this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
-    const headers: RawAxiosRequestHeaders = {
+      this.apiServer +
+      "/api/claim/byHandle/" +
+      encodeURIComponent(this.projectId);
+    const headers = {
       "Content-Type": "application/json",
     };
     if (identity) {
@@ -420,9 +306,6 @@ export default class ProjectViewView extends Vue {
         this.name = resp.data.claim?.name || "(no name)";
         this.description = resp.data.claim?.description || "(no description)";
         this.truncatedDesc = this.description.slice(0, this.truncateLength);
-        this.latitude = resp.data.claim?.location?.geo?.latitude || 0;
-        this.longitude = resp.data.claim?.location?.geo?.longitude || 0;
-        this.url = resp.data.claim?.url || "";
       } else if (resp.status === 404) {
         // actually, axios throws an error so we never get here
         this.$notify(
@@ -464,7 +347,7 @@ export default class ProjectViewView extends Vue {
     const givesInUrl =
       this.apiServer +
       "/api/v2/report/givesForPlans?planIds=" +
-      encodeURIComponent(JSON.stringify([projectId]));
+      encodeURIComponent(JSON.stringify([this.projectId]));
     try {
       const resp = await this.axios.get(givesInUrl, { headers });
       if (resp.status === 200 && resp.data.data) {
@@ -497,21 +380,21 @@ export default class ProjectViewView extends Vue {
       );
     }
 
-    const offersToUrl =
+    const givesOutUrl =
       this.apiServer +
-      "/api/v2/report/offersToPlans?planIds=" +
-      encodeURIComponent(JSON.stringify([projectId]));
+      "/api/v2/report/givesProvidedBy?providerId=" +
+      encodeURIComponent(this.projectId);
     try {
-      const resp = await this.axios.get(offersToUrl, { headers });
+      const resp = await this.axios.get(givesOutUrl, { headers });
       if (resp.status === 200 && resp.data.data) {
-        this.offersToThis = resp.data.data;
+        this.givesByThis = resp.data.data;
       } else {
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Error",
-            text: "Failed to retrieve offers to this project.",
+            text: "Failed to retrieve gives by this project.",
           },
           -1,
         );
@@ -523,168 +406,116 @@ export default class ProjectViewView extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "Something went wrong retrieving offers to this project.",
+          text: "Something went wrong retrieving gives by project.",
         },
         -1,
       );
       console.error(
-        "Error retrieving offers to this project:",
+        "Error retrieving gives by this project:",
         serverError.message,
       );
     }
+  }
 
-    const fulfilledByUrl =
-      this.apiServer +
-      "/api/v2/report/planFulfilledByPlan?planHandleId=" +
-      encodeURIComponent(projectId);
-    try {
-      const resp = await this.axios.get(fulfilledByUrl, { headers });
-      if (resp.status === 200) {
-        this.fulfilledByThis = resp.data.data;
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve plans fulfilled by this project.",
-          },
-          -1,
-        );
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving plans fulfilled by this project.",
-        },
-        -1,
-      );
-      console.error(
-        "Error retrieving plans fulfilled by this project:",
-        serverError.message,
-      );
-    }
+  openDialog(contact) {
+    this.$refs.customDialog.open(contact);
+  }
 
-    const fulfillersToUrl =
-      this.apiServer +
-      "/api/v2/report/planFulfillersToPlan?planHandleId=" +
-      encodeURIComponent(projectId);
-    try {
-      const resp = await this.axios.get(fulfillersToUrl, { headers });
-      if (resp.status === 200) {
-        this.fulfillersToThis = resp.data.data;
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve plan fulfillers to this project.",
-          },
-          -1,
-        );
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving plan fulfillers to this project.",
-        },
-        -1,
-      );
-      console.error(
-        "Error retrieving plan fulfillers to this project:",
-        serverError.message,
-      );
+  handleDialogResult(result) {
+    if (result.action === "confirm") {
+      return new Promise((resolve) => {
+        this.recordGive(result.contact?.did, result.description, result.hours);
+        resolve();
+      });
+    } else {
+      // action was not "confirm" so do nothing
     }
   }
 
   /**
-   * Handle clicking on a project entry found in the list
-   * @param id of the project
-   **/
-  async onClickLoadProject(projectId: string) {
-    localStorage.setItem("projectId", projectId);
-    const route = {
-      path: "/project/" + encodeURIComponent(projectId),
-    };
-    this.$router.push(route);
-    this.LoadProject(projectId, await this.getIdentity(this.activeDid));
-  }
-
-  getOpenStreetMapUrl() {
-    // Google URL is https://maps.google.com/?q=LAT,LONG
-    return (
-      "https://www.openstreetmap.org/?mlat=" +
-      this.latitude +
-      "&mlon=" +
-      this.longitude +
-      "#map=15/" +
-      this.latitude +
-      "/" +
-      this.longitude
-    );
-  }
-
-  openGiftDialog(contact: GiverInputInfo) {
-    (this.$refs.customGiveDialog as GiftedDialog).open(contact);
-  }
-
-  openOfferDialog() {
-    (this.$refs.customOfferDialog as OfferDialog).open();
-  }
-
-  UNIT_CODES: Record<string, Record<string, string>> = {
-    BTC: {
-      name: "Bitcoin",
-      faIcon: "bitcoin-sign",
-    },
-    HUR: {
-      name: "hours",
-      faIcon: "clock",
-    },
-    USD: {
-      name: "US Dollars",
-      faIcon: "dollar",
-    },
-  };
-
-  iconForUnitCode(unitCode: string) {
-    return this.UNIT_CODES[unitCode]?.faIcon || "question";
-  }
-
-  // return an HTTPS URL if it's not a global URL
-  addScheme(url: string) {
-    if (!isGlobalUri(url)) {
-      return "https://" + url;
+   *
+   * @param giverDid may be null
+   * @param description may be an empty string
+   * @param hours may be 0
+   */
+  async recordGive(giverDid, description, hours) {
+    if (!this.activeDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identity before you can record a give.",
+        },
+        -1,
+      );
+      return;
+    }
+
+    if (!description && !hours) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must enter a description or some number of hours.",
+        },
+        -1,
+      );
+      return;
     }
-    return url;
-  }
 
-  // return just the domain for display, if possible
-  domainForWebsite(url: string) {
     try {
-      const hostname = new URL(url).hostname;
-      if (!hostname) {
-        // happens for non-http URLs
-        return url;
-      } else if (url.endsWith(hostname)) {
-        // it's just the domain
-        return hostname;
+      const identity = await this.getIdentity(this.activeDid);
+      const result = await createAndSubmitGive(
+        this.axios,
+        this.apiServer,
+        identity,
+        giverDid,
+        this.activeDid,
+        description,
+        hours,
+        this.projectId,
+      );
+
+      if (result.status !== 201 || result.data?.error) {
+        console.log("Error with give result:", result);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text:
+              result.data?.error?.message ||
+              "There was an error recording the give.",
+          },
+          -1,
+        );
       } else {
-        // there's more, but don't bother displaying the whole thing
-        return hostname + "...";
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: "That gift was recorded.",
+          },
+          -1,
+        );
       }
-    } catch (error: unknown) {
-      // must not be a valid URL
-      return url;
+    } catch (e) {
+      console.log("Error with give caught:", e);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
+            e.userMessage ||
+            e.response?.data?.error?.message ||
+            "There was an error recording the give.",
+        },
+        -1,
+      );
     }
   }
 }

src/views/ProjectsView.vue

@@ -67,37 +67,34 @@
         </li>
       </ul>
     </InfiniteScroll>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { IIdentifier } from "@veramo/core";
-import InfiniteScroll from "@/components/InfiniteScroll.vue";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { ProjectData } from "@/libs/endorserServer";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import InfiniteScroll from "@/components/InfiniteScroll";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: { InfiniteScroll, QuickNav, EntityIcon },
+  components: { InfiniteScroll, AlertMessage, QuickNav, EntityIcon },
 })
 export default class ProjectsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   apiServer = "";
   projects: ProjectData[] = [];
   current: IIdentifier;
   isLoading = false;
+  alertTitle = "";
+  alertMessage = "";
   numAccounts = 0;
 
   async beforeCreate() {
@@ -122,30 +119,21 @@ export default class ProjectsView extends Vue {
       if (resp.status === 200 || !resp.data.data) {
         const plans: ProjectData[] = resp.data.data;
         for (const plan of plans) {
-          const { name, description, handleId, rowid } = plan;
+          const { name, description, handleId = plan.fullIri, rowid } = plan;
           this.projects.push({ name, description, handleId, rowid });
         }
       } else {
         console.log("Bad server response & data:", resp.status, resp.data);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to get projects from the server. Try again later.",
-          },
-          -1,
-        );
+        throw Error("Failed to get projects from the server.");
       }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.error("Got error loading projects:", error.message || error);
+    } catch (error) {
+      console.error("Got error loading projects:", error.message);
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "Got an error loading projects.",
+          text: "Got an error loading projects: " + error.message,
         },
         -1,
       );
@@ -174,7 +162,7 @@ export default class ProjectsView extends Vue {
   onClickLoadProject(id: string) {
     localStorage.setItem("projectId", id);
     const route = {
-      path: "/project/" + encodeURIComponent(id),
+      name: "project",
     };
     this.$router.push(route);
   }
@@ -189,7 +177,7 @@ export default class ProjectsView extends Vue {
     await this.dataLoader(url, token);
   }
 
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
     await accountsDB.open();
     const account = await accountsDB.accounts
       .where("did")

src/views/SearchAreaView.vue

@@ -1,286 +0,0 @@
-<template>
-  <QuickNav />
-
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <!-- Back -->
-      <div class="text-lg text-center font-light relative px-7">
-        <h1
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          @click="$router.back()"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </h1>
-      </div>
-
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Area for Nearby Search
-      </h1>
-    </div>
-
-    <div class="px-2 py-4">
-      This location is only stored on your device. It is used to show you more
-      appropriate projects but is not stored on any servers.
-    </div>
-
-    <div>
-      <button v-if="!searchBox && !isNewMarkerSet" class="m-4 px-4 py-2">
-        Click to Choose a Location for Nearby Search
-      </button>
-      <button
-        v-if="isNewMarkerSet"
-        class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-        @click="storeSearchBox"
-      >
-        Store This Location for Nearby Search
-      </button>
-      <button
-        v-if="searchBox"
-        class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-        @click="forgetSearchBox"
-      >
-        Delete Stored Location
-      </button>
-      <button
-        v-if="searchBox"
-        class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-        @click="resetLatLong"
-      >
-        Reset Marker
-      </button>
-      <button
-        v-if="isNewMarkerSet"
-        class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-        @click="isNewMarkerSet = false"
-      >
-        Erase Marker
-      </button>
-      <div v-if="isNewMarkerSet">
-        Click on the pin to erase it. Click anywhere else to set a different
-        different corner.
-      </div>
-    </div>
-
-    <div style="height: 600px; width: 800px">
-      <l-map
-        ref="map"
-        :center="[localCenterLat, localCenterLong]"
-        v-model:zoom="localZoom"
-        @click="setMapPoint"
-      >
-        <l-tile-layer
-          url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-          layer-type="base"
-          name="OpenStreetMap"
-        />
-        <l-marker
-          v-if="isNewMarkerSet"
-          :lat-lng="[localCenterLat, localCenterLong]"
-          @click="isNewMarkerSet = false"
-        />
-        <l-rectangle
-          v-if="isNewMarkerSet"
-          :bounds="[
-            [localCenterLat - localLatDiff, localCenterLong - localLongDiff],
-            [localCenterLat + localLatDiff, localCenterLong + localLongDiff],
-          ]"
-          :weight="1"
-        />
-      </l-map>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { LeafletMouseEvent } from "leaflet";
-import "leaflet/dist/leaflet.css";
-import { Component, Vue } from "vue-facing-decorator";
-import {
-  LMap,
-  LMarker,
-  LRectangle,
-  LTileLayer,
-} from "@vue-leaflet/vue-leaflet";
-
-import { db } from "@/db/index";
-import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import QuickNav from "@/components/QuickNav.vue";
-
-const DEFAULT_LAT_LONG_DIFF = 0.01;
-const WORLD_ZOOM = 2;
-const DEFAULT_ZOOM = 2;
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({
-  components: {
-    QuickNav,
-    LRectangle,
-    LMap,
-    LMarker,
-    LTileLayer,
-  },
-})
-export default class DiscoverView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
-  isChoosingSearchBox = false;
-  isNewMarkerSet = false;
-
-  // "local" vars are for the currently selected map box
-  localCenterLat = 0;
-  localCenterLong = 0;
-  localLatDiff = DEFAULT_LAT_LONG_DIFF;
-  localLongDiff = DEFAULT_LAT_LONG_DIFF;
-  localZoom = DEFAULT_ZOOM;
-
-  // searchBox reflects what is stored in the database
-  searchBox: { name: string; bbox: BoundingBox } | null = null;
-
-  async mounted() {
-    await db.open();
-    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-    this.searchBox = settings?.searchBoxes?.[0] || null;
-    this.resetLatLong();
-  }
-
-  setMapPoint(event: LeafletMouseEvent) {
-    if (this.isNewMarkerSet) {
-      this.localLatDiff = Math.abs(event.latlng.lat - this.localCenterLat);
-      this.localLongDiff = Math.abs(event.latlng.lng - this.localCenterLong);
-    } else {
-      // marker is not set
-      this.localCenterLat = event.latlng.lat;
-      this.localCenterLong = event.latlng.lng;
-
-      let latDiff = DEFAULT_LAT_LONG_DIFF;
-      let longDiff = DEFAULT_LAT_LONG_DIFF;
-      // Guess at a size for the bounding box.
-      // This doesn't seem like the right approach but it's the only way I can find to get the screen bounds.
-      const bounds = event.target.boxZoom?._map?.getBounds();
-      if (bounds) {
-        latDiff = Math.abs(bounds._northEast.lat - bounds._southWest.lat) / 8;
-        longDiff = Math.abs(bounds._northEast.lng - bounds._southWest.lng) / 8;
-      }
-      this.localLatDiff = latDiff;
-      this.localLongDiff = longDiff;
-      this.isNewMarkerSet = true;
-    }
-  }
-
-  public resetLatLong() {
-    if (this.searchBox?.bbox) {
-      const bbox = this.searchBox.bbox;
-      this.localCenterLat = (bbox.maxLat + bbox.minLat) / 2;
-      this.localCenterLong = (bbox.eastLong + bbox.westLong) / 2;
-      this.localLatDiff = (bbox.maxLat - bbox.minLat) / 2;
-      this.localLongDiff = (bbox.eastLong - bbox.westLong) / 2;
-      this.localZoom = WORLD_ZOOM;
-      this.isNewMarkerSet = true;
-    } else {
-      this.isNewMarkerSet = false;
-    }
-  }
-
-  public async storeSearchBox() {
-    if (this.localCenterLong || this.localCenterLat) {
-      try {
-        const newSearchBox = {
-          name: "Local",
-          bbox: {
-            eastLong: this.localCenterLong + this.localLongDiff,
-            maxLat: this.localCenterLat + this.localLatDiff,
-            minLat: this.localCenterLat - this.localLatDiff,
-            westLong: this.localCenterLong - this.localLongDiff,
-          },
-        };
-        await db.open();
-        db.settings.update(MASTER_SETTINGS_KEY, {
-          searchBoxes: [newSearchBox],
-        });
-        this.searchBox = newSearchBox;
-        this.isChoosingSearchBox = false;
-
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Saved",
-            text: "That has been saved in your preferences.",
-          },
-          -1,
-        );
-        this.$router.back();
-      } catch (err) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Updating Search Settings",
-            text: "Try going to a different page and then coming back.",
-          },
-          -1,
-        );
-        console.error(
-          "Telling user to retry the location search setting because:",
-          err,
-        );
-      }
-    } else {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "No Location Selected",
-          text: "Select a location on the map.",
-        },
-        -1,
-      );
-    }
-  }
-
-  public async forgetSearchBox() {
-    try {
-      await db.open();
-      db.settings.update(MASTER_SETTINGS_KEY, {
-        searchBoxes: [],
-      });
-      this.searchBox = null;
-      this.localCenterLat = 0;
-      this.localCenterLong = 0;
-      this.localLatDiff = DEFAULT_LAT_LONG_DIFF;
-      this.localLongDiff = DEFAULT_LAT_LONG_DIFF;
-      this.localZoom = DEFAULT_ZOOM;
-      this.isChoosingSearchBox = false;
-      this.isNewMarkerSet = false;
-    } catch (err) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Updating Search Settings",
-          text: "Try going to a different page and then coming back.",
-        },
-        -1,
-      );
-      console.error(
-        "Telling user to retry the location search setting because:",
-        err,
-      );
-    }
-  }
-
-  public cancelSearchBoxSelect() {
-    this.isChoosingSearchBox = false;
-    this.localZoom = WORLD_ZOOM;
-  }
-}
-</script>

src/views/SeedBackupView.vue

@@ -20,64 +20,45 @@
     </div>
 
     <div v-if="activeAccount">
-      <p class="text-center mb-4">
-        <b class="text-red-600">BEWARE!</b> Anyone who has this seed phrase will
-        be able impersonate you and take over any digital holdings based on it.
-        Reveal it when you are somewhere only you can see your screen, and
-        record it somewhere only you have access.
-        <i>Don't take a screenshot or send it to any online service.</i>
+      <p>
+        BEWARE: Anyone who gets hold of this mnemonic seed phrase will be able
+        impersonate you and take over any digital holdings based on it. So only
+        reveal it when you are in a private place out of sight of other eyes,
+        and only record it in something private -- don't take a screenshot or
+        send it to any online service.
       </p>
 
-      <p v-if="numAccounts > 1">
-        <b class="text-orange-600">Note:</b> You have more than one identity
-        stored in this browser. If they are all based on the same seed as the
-        current identity, this one backup is sufficient; however, if you have
-        different seeds for other identities, you will have to back them up
-        separately.
-      </p>
+      <button
+        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+        @click="showSeedPhrase"
+      >
+        Click here when you're ready to see it.
+      </button>
 
-      <div class="bg-slate-100 rounded-md overflow-hidden p-4 mb-4">
-        <button
-          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-          @click="showSeedPhrase"
-        >
-          Reveal my Seed Phrase
-        </button>
-
-        <p v-if="showSeed" class="text-center text-slate-700 mt-2">
-          {{ activeAccount.mnemonic }}
-        </p>
-      </div>
+      <p v-if="showSeed">{{ activeAccount.mnemonic }}</p>
     </div>
     <div v-else>You do not have an active identity.</div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import * as R from "ramda";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import QuickNav from "@/components/QuickNav.vue";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
 
-interface Account {
-  mnemonic: string;
-}
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({ components: { QuickNav } })
+@Component({ components: { AlertMessage, QuickNav } })
 export default class SeedBackupView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
-  activeAccount: Account | null | undefined = null;
-  numAccounts = 0;
+  activeAccount = null;
   showSeed = false;
+  alertMessage = "";
+  alertTitle = "";
 
   // 'created' hook runs when the Vue instance is first created
   async created() {
@@ -88,9 +69,8 @@ export default class SeedBackupView extends Vue {
 
       await accountsDB.open();
       const accounts = await accountsDB.accounts.toArray();
-      this.numAccounts = accounts.length;
       this.activeAccount = R.find((acc) => acc.did === activeDid, accounts);
-    } catch (err: unknown) {
+    } catch (err) {
       console.error("Got an error loading an identity:", err);
       this.$notify(
         {

src/views/StartView.vue

@@ -3,67 +3,37 @@
     id="Content"
     class="p-6 pb-24 min-h-screen flex flex-col justify-center"
   >
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <!-- Back -->
-      <div class="text-lg text-center font-light relative px-7">
-        <h1
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          @click="$router.back()"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </h1>
-      </div>
+    <!-- Heading -->
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Start Here
+    </h1>
 
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Start Here
-      </h1>
-    </div>
-
-    <!-- id used by puppeteer test script -->
-    <div id="start-question" class="mt-8">
+    <div class="mt-8">
       <p class="text-center text-xl mb-4 font-light">
-        Do you have an identity to import?
+        Do you already have an identity to import?
       </p>
       <a
         @click="onClickYes()"
-        class="block w-full text-center text-lg uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
+        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
       >
         No
       </a>
       <a
         @click="onClickNo()"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-2"
+        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+        >Yes</a
       >
-        Yes
-      </a>
-      <a
-        v-if="numAccounts > 0"
-        @click="onClickDerive()"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-2"
-      >
-        Derive New Address from Seed Imported Previously
-      </a>
     </div>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB } from "@/db/index";
 
 @Component({
   components: {},
 })
 export default class StartView extends Vue {
-  numAccounts = 0;
-
-  async mounted() {
-    await accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
-  }
-
   public onClickYes() {
     this.$router.push({ name: "new-identifier" });
   }
@@ -71,9 +41,5 @@ export default class StartView extends Vue {
   public onClickNo() {
     this.$router.push({ name: "import-account" });
   }
-
-  public onClickDerive() {
-    this.$router.push({ name: "import-derive" });
-  }
 }
 </script>

src/views/StatisticsView.vue

@@ -1,25 +1,11 @@
 <template>
-  <QuickNav />
-
+  <QuickNav selected="Profile"></QuickNav>
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <!-- Back -->
-      <div class="text-lg text-center font-light relative px-7">
-        <h1
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          @click="$router.back()"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </h1>
-      </div>
-
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Achievements & Statistics
-      </h1>
-    </div>
+    <!-- Heading -->
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Achievements & Statistics
+    </h1>
 
     <div>
       Here is a view of the activity you can see.
@@ -46,37 +32,27 @@
         {{ worldProperties.animationDurationSeconds }} seconds
       </div>
     </div>
-    <button class="float-right text-blue-600" @click="captureGraphics()">Screenshot</button>
+    <button class="float-right" @click="captureGraphics()">Screenshot</button>
     <div id="scene-container" class="h-screen"></div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>   
   </section>
 </template>
 <script lang="ts">
-import { SVGRenderer } from "three/examples/jsm/renderers/SVGRenderer.js";
+import { SVGRenderer } from "three/addons/renderers/SVGRenderer.js";
 import { Component, Vue } from "vue-facing-decorator";
 import { World } from "@/components/World/World.js";
-import QuickNav from "@/components/QuickNav.vue";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
 
-interface RendererSVGType {
-  domElement: Element;
-}
-
-interface Dictionary<T> {
-  [key: string]: T;
-}
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({ components: { World, QuickNav } })
+@Component({ components: { AlertMessage, World, QuickNav } })
 export default class StatisticsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   world: World;
-  worldProperties: Dictionary<number> = {};
+  worldProperties: WorldProperties = {};
+  alertTitle = "";
+  alertMessage = "";
 
   mounted() {
     try {
@@ -84,14 +60,14 @@ export default class StatisticsView extends Vue {
       const newWorld = new World(container, this);
       newWorld.start();
       this.world = newWorld;
-    } catch (err: unknown) {
-      const error = err as Error;
+    } catch (err) {
+      console.log(err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Mounting Error",
-          text: error.message,
+          text: err.message,
         },
         -1,
       );
@@ -109,12 +85,12 @@ export default class StatisticsView extends Vue {
     ExportToSVG(rendererSVG, "test.svg");
   }
 
-  public setWorldProperty(propertyName: string, propertyValue: number) {
+  public setWorldProperty(propertyName, propertyValue) {
     this.worldProperties[propertyName] = propertyValue;
   }
 }
 
-function ExportToSVG(rendererSVG: RendererSVGType, filename: string) {
+function ExportToSVG(rendererSVG, filename) {
   const XMLS = new XMLSerializer();
   const svgfile = XMLS.serializeToString(rendererSVG.domElement);
   const svgData = svgfile;

src/views/TestView.vue

@@ -1,165 +0,0 @@
-<template>
-  <QuickNav />
-
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <!-- Back -->
-      <div class="text-lg text-center font-light relative px-7">
-        <h1
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          @click="$router.back()"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </h1>
-      </div>
-
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Test
-      </h1>
-    </div>
-
-    <div class="mb-8">
-      <h2 class="text-xl font-bold mb-4">Notiwind Alert Test Suite</h2>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'toast',
-              text: 'I\'m a toast. Without a timeout, I\'m stuck.',
-            },
-            5000,
-          )
-        "
-        class="font-bold uppercase bg-slate-900 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Toast
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'info',
-              title: 'Information Alert',
-              text: 'Just wanted you to know.',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Info
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'success',
-              title: 'Success Alert',
-              text: 'Congratulations!',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-emerald-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Success
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'warning',
-              title: 'Warning Alert',
-              text: 'You might wanna look at this.',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-amber-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Warning
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'danger',
-              title: 'Danger Alert',
-              text: 'Something terrible has happened!',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-rose-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Danger
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'modal',
-              type: 'notification-permission',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Notif ON
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'modal',
-              type: 'notification-mute',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Notif MUTE
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'modal',
-              type: 'notification-off',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Notif OFF
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import QuickNav from "@/components/QuickNav.vue";
-
-@Component({ components: { QuickNav } })
-export default class Help extends Vue {}
-</script>

sw_scripts/additional-scripts.js

@@ -1,69 +0,0 @@
-/* eslint-env serviceworker */
-/* global workbox */
-importScripts(
-  "https://storage.googleapis.com/workbox-cdn/releases/6.4.1/workbox-sw.js",
-);
-
-self.addEventListener("install", (event) => {
-  console.error("Adding event listener for:", event);
-  importScripts(
-    "safari-notifications.js",
-    "nacl.js",
-    "noble-curves.js",
-    "noble-hashes.js",
-  );
-});
-
-self.addEventListener("push", function (event) {
-  event.waitUntil(
-    (async () => {
-      try {
-        let payload;
-        if (event.data) {
-          payload = JSON.parse(event.data.text());
-        }
-        const message = await self.getNotificationCount();
-        if (message) {
-          console.log("Will notify user:", message);
-          const title = payload ? payload.title : "Custom Title";
-          const options = {
-            body: message,
-            icon: payload ? payload.icon : "icon.png",
-            badge: payload ? payload.badge : "badge.png",
-          };
-          await self.registration.showNotification(title, options);
-        } else {
-          console.log("No notification message, so will not tell the user.");
-        }
-      } catch (error) {
-        console.error("Error processing the push event:", error);
-      }
-    })(),
-  );
-});
-
-self.addEventListener("message", (event) => {
-  if (event.data && event.data.type === "SEND_LOCAL_DATA") {
-    self.secret = event.data.data;
-    event.ports[0].postMessage({ success: true });
-  }
-});
-
-self.addEventListener("activate", (event) => {
-  event.waitUntil(clients.claim());
-  console.log("Service worker activated", event);
-});
-
-self.addEventListener("fetch", (event) => {
-  console.log("Got fetch event", event.request);
-});
-
-self.addEventListener("error", (event) => {
-  console.error("Error in Service Worker:", event.message);
-  console.error("File:", event.filename);
-  console.error("Line:", event.lineno);
-  console.error("Column:", event.colno);
-  console.error("Error Object:", event.error);
-});
-
-workbox.precaching.precacheAndRoute(self.__WB_MANIFEST);

sw_scripts/safari-notifications.js

@@ -1,533 +0,0 @@
-function bufferFromBase64(base64) {
-  const binaryString = atob(base64);
-  const length = binaryString.length;
-  const bytes = new Uint8Array(length);
-
-  for (let i = 0; i < length; i++) {
-    bytes[i] = binaryString.charCodeAt(i);
-  }
-
-  return bytes;
-}
-
-function fromString(str, encoding = "utf8") {
-  if (encoding === "utf8") {
-    return new TextEncoder().encode(str);
-  } else if (encoding === "base16") {
-    if (str.length % 2 !== 0) {
-      throw new Error("Invalid hex string length.");
-    }
-    let bytes = new Uint8Array(str.length / 2);
-    for (let i = 0; i < str.length; i += 2) {
-      bytes[i / 2] = parseInt(str.substring(i, i + 2), 16);
-    }
-    return bytes;
-  } else if (encoding === "base64url") {
-    str = str.replace(/-/g, "+").replace(/_/g, "/");
-    while (str.length % 4) {
-      str += "=";
-    }
-    return new Uint8Array(bufferFromBase64(str));
-  } else {
-    throw new Error(`Unsupported encoding "${encoding}"`);
-  }
-}
-
-/**
- * Convert a Uint8Array to a string with the given encoding.
- *
- * @param {Uint8Array} byteArray - The Uint8Array to convert.
- * @param {string} [encoding='utf8'] - The desired encoding ('utf8', 'base16', 'base64url').
- * @returns {string} - The encoded string.
- * @throws {Error} - Throws an error if the encoding is unsupported.
- */
-function toString(byteArray, encoding = "utf8") {
-  switch (encoding) {
-    case "utf8":
-      return decodeUTF8(byteArray);
-    case "base16":
-      return toBase16(byteArray);
-    case "base64url":
-      return toBase64Url(byteArray);
-    default:
-      throw new Error(`Unsupported encoding "${encoding}"`);
-  }
-}
-
-/**
- * Decode a Uint8Array as a UTF-8 string.
- *
- * @param {Uint8Array} byteArray
- * @returns {string}
- */
-function decodeUTF8(byteArray) {
-  return new TextDecoder().decode(byteArray);
-}
-
-/**
- * Convert a Uint8Array to a base16 (hex) encoded string.
- *
- * @param {Uint8Array} byteArray
- * @returns {string}
- */
-function toBase16(byteArray) {
-  return Array.from(byteArray)
-    .map((byte) => byte.toString(16).padStart(2, "0"))
-    .join("");
-}
-
-/**
- * Convert a Uint8Array to a base64url encoded string.
- *
- * @param {Uint8Array} byteArray
- * @returns {string}
- */
-function toBase64Url(byteArray) {
-  let uint8Array = new Uint8Array(byteArray);
-  let binaryString = "";
-  for (let i = 0; i < uint8Array.length; i++) {
-    binaryString += String.fromCharCode(uint8Array[i]);
-  }
-
-  // Encode to base64
-  let base64 = btoa(binaryString);
-
-  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-
-const u8a = { toString, fromString };
-
-function sha256(payload) {
-  const data = typeof payload === "string" ? u8a.fromString(payload) : payload;
-  return nobleHashes.sha256(data);
-}
-
-async function accessToken(identifier) {
-  const did = identifier["did"];
-  const privateKeyHex = identifier["keys"][0]["privateKeyHex"];
-
-  const signer = await SimpleSigner(privateKeyHex);
-
-  const nowEpoch = Math.floor(Date.now() / 1000);
-  const endEpoch = nowEpoch + 60; // add one minute
-
-  const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
-  const alg = undefined; // defaults to 'ES256K', more standardized but harder to verify vs ES256K-R
-  const jwt = await createJWT(tokenPayload, {
-    alg,
-    issuer: did,
-    signer,
-  });
-  return jwt;
-}
-
-async function createJWT(payload, options, header = {}) {
-  const { issuer, signer, alg, expiresIn, canonicalize } = options;
-
-  if (!signer)
-    throw new Error(
-      "missing_signer: No Signer functionality has been configured",
-    );
-  if (!issuer)
-    throw new Error("missing_issuer: No issuing DID has been configured");
-  if (!header.typ) header.typ = "JWT";
-  if (!header.alg) header.alg = alg;
-
-  const timestamps = {
-    iat: Math.floor(Date.now() / 1000),
-    exp: undefined,
-  };
-
-  if (expiresIn) {
-    if (typeof expiresIn === "number") {
-      timestamps.exp = (payload.nbf || timestamps.iat) + Math.floor(expiresIn);
-    } else {
-      throw new Error("invalid_argument: JWT expiresIn is not a number");
-    }
-  }
-
-  const fullPayload = { ...timestamps, ...payload, iss: issuer };
-  return createJWS(fullPayload, signer, header, { canonicalize });
-}
-
-const defaultAlg = "ES256K";
-
-async function createJWS(payload, signer, header = {}, options = {}) {
-  if (!header.alg) header.alg = defaultAlg;
-  const encodedPayload =
-    typeof payload === "string"
-      ? payload
-      : encodeSection(payload, options.canonicalize);
-  const signingInput = [
-    encodeSection(header, options.canonicalize),
-    encodedPayload,
-  ].join(".");
-
-  const jwtSigner = ES256KSignerAlg(false);
-  const signature = await jwtSigner(signingInput, signer);
-
-  // JWS Compact Serialization
-  // https://www.rfc-editor.org/rfc/rfc7515#section-7.1
-  return [signingInput, signature].join(".");
-}
-
-function canonicalizeData(object) {
-  if (typeof object === "number" && isNaN(object)) {
-    throw new Error("NaN is not allowed");
-  }
-
-  if (typeof object === "number" && !isFinite(object)) {
-    throw new Error("Infinity is not allowed");
-  }
-
-  if (object === null || typeof object !== "object") {
-    return JSON.stringify(object);
-  }
-
-  if (object.toJSON instanceof Function) {
-    return serialize(object.toJSON());
-  }
-
-  if (Array.isArray(object)) {
-    const values = object.reduce((t, cv, ci) => {
-      const comma = ci === 0 ? "" : ",";
-      const value = cv === undefined || typeof cv === "symbol" ? null : cv;
-      return `${t}${comma}${serialize(value)}`;
-    }, "");
-    return `[${values}]`;
-  }
-
-  const values = Object.keys(object)
-    .sort()
-    .reduce((t, cv) => {
-      if (object[cv] === undefined || typeof object[cv] === "symbol") {
-        return t;
-      }
-      const comma = t.length === 0 ? "" : ",";
-      return `${t}${comma}${serialize(cv)}:${serialize(object[cv])}`;
-    }, "");
-  return `{${values}}`;
-}
-
-function encodeSection(data, shouldCanonicalize = false) {
-  if (shouldCanonicalize) {
-    return encodeBase64url(canonicalizeData(data));
-  } else {
-    return encodeBase64url(JSON.stringify(data));
-  }
-}
-
-function encodeBase64url(s) {
-  return bytesToBase64url(u8a.fromString(s));
-}
-
-function instanceOfEcdsaSignature(object) {
-  return typeof object === "object" && "r" in object && "s" in object;
-}
-
-function ES256KSignerAlg(recoverable) {
-  return async function sign(payload, signer) {
-    const signature = await signer(payload);
-    if (instanceOfEcdsaSignature(signature)) {
-      return toJose(signature, recoverable);
-    } else {
-      if (
-        recoverable &&
-        typeof fromJose(signature).recoveryParam === "undefined"
-      ) {
-        throw new Error(
-          `not_supported: ES256K-R not supported when signer doesn't provide a recovery param`,
-        );
-      }
-      return signature;
-    }
-  };
-}
-
-function leftpad(data, size = 64) {
-  if (data.length === size) return data;
-  return "0".repeat(size - data.length) + data;
-}
-
-async function SimpleSigner(hexPrivateKey) {
-  const signer = await ES256KSigner(hexToBytes(hexPrivateKey), true);
-  return async (data) => {
-    const signature = await signer(data);
-    return fromJose(signature);
-  };
-}
-
-function hexToBytes(s, minLength) {
-  let input = s.startsWith("0x") ? s.substring(2) : s;
-
-  if (input.length % 2 !== 0) {
-    input = `0${input}`;
-  }
-
-  if (minLength) {
-    const paddedLength = Math.max(input.length, minLength * 2);
-    input = input.padStart(paddedLength, "00");
-  }
-
-  return u8a.fromString(input.toLowerCase(), "base16");
-}
-
-function ES256KSigner(privateKey, recoverable = false) {
-  const privateKeyBytes = privateKey;
-  if (privateKeyBytes.length !== 32) {
-    throw new Error(
-      `bad_key: Invalid private key format. Expecting 32 bytes, but got ${privateKeyBytes.length}`,
-    );
-  }
-
-  return async function (data) {
-    const signature = nobleCurves.secp256k1.sign(sha256(data), privateKeyBytes);
-    return toJose(
-      {
-        r: leftpad(signature.r.toString(16)),
-        s: leftpad(signature.s.toString(16)),
-        recoveryParam: signature.recovery,
-      },
-      recoverable,
-    );
-  };
-}
-
-function toJose(signature, recoverable) {
-  const { r, s, recoveryParam } = signature;
-  const jose = new Uint8Array(recoverable ? 65 : 64);
-  jose.set(u8a.fromString(r, "base16"), 0);
-  jose.set(u8a.fromString(s, "base16"), 32);
-
-  if (recoverable) {
-    if (typeof recoveryParam === "undefined") {
-      throw new Error("Signer did not return a recoveryParam");
-    }
-    jose[64] = recoveryParam;
-  }
-  return bytesToBase64url(jose);
-}
-
-function bytesToBase64url(b) {
-  return u8a.toString(b, "base64url");
-}
-
-function base64ToBytes(s) {
-  const inputBase64Url = s
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_")
-    .replace(/=/g, "");
-  return u8a.fromString(inputBase64Url, "base64url");
-}
-
-function bytesToHex(b) {
-  return u8a.toString(b, "base16");
-}
-
-function fromJose(signature) {
-  const signatureBytes = base64ToBytes(signature);
-  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
-    throw new TypeError(
-      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`,
-    );
-  }
-  const r = bytesToHex(signatureBytes.slice(0, 32));
-  const s = bytesToHex(signatureBytes.slice(32, 64));
-  const recoveryParam =
-    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
-
-  return { r, s, recoveryParam };
-}
-
-function validateBase64(s) {
-  if (
-    !/^(?:[A-Za-z0-9+\/]{2}[A-Za-z0-9+\/]{2})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.test(
-      s,
-    )
-  ) {
-    throw new TypeError("invalid encoding");
-  }
-}
-
-function decodeBase64(s) {
-  validateBase64(s);
-  var i,
-    d = atob(s),
-    b = new Uint8Array(d.length);
-  for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
-  return b;
-}
-
-async function getSettingById(id) {
-  return new Promise((resolve, reject) => {
-    let openRequest = indexedDB.open("TimeSafari");
-
-    openRequest.onupgradeneeded = (event) => {
-      // Handle database setup if necessary
-      let db = event.target.result;
-      if (!db.objectStoreNames.contains("settings")) {
-        db.createObjectStore("settings", { keyPath: "id" });
-      }
-    };
-
-    openRequest.onsuccess = (event) => {
-      let db = event.target.result;
-      let transaction = db.transaction("settings", "readonly");
-      let objectStore = transaction.objectStore("settings");
-      let getRequest = objectStore.get(id);
-
-      getRequest.onsuccess = () => resolve(getRequest.result);
-      getRequest.onerror = () => reject(getRequest.error);
-    };
-
-    openRequest.onerror = () => reject(openRequest.error);
-  });
-}
-
-async function setMostRecentNotified(id) {
-  try {
-    const db = await openIndexedDB("TimeSafari");
-    const transaction = db.transaction("settings", "readwrite");
-    const store = transaction.objectStore("settings");
-    const data = await getRecord(store, 1);
-
-    if (data) {
-      data["lastNotifiedClaimId"] = id;
-      await updateRecord(store, data);
-    } else {
-      console.error("Record not found");
-    }
-
-    transaction.oncomplete = () => db.close();
-  } catch (error) {
-    console.error("Database error: " + error.message);
-  }
-}
-
-function openIndexedDB(dbName) {
-  return new Promise((resolve, reject) => {
-    const request = indexedDB.open(dbName);
-    request.onerror = () => reject(request.error);
-    request.onsuccess = () => resolve(request.result);
-  });
-}
-
-function getRecord(store, key) {
-  return new Promise((resolve, reject) => {
-    const request = store.get(key);
-    request.onsuccess = () => resolve(request.result);
-    request.onerror = () => reject(request.error);
-  });
-}
-
-function updateRecord(store, data) {
-  return new Promise((resolve, reject) => {
-    const request = store.put(data);
-    request.onsuccess = () => resolve(request.result);
-    request.onerror = () => reject(request.error);
-  });
-}
-
-async function fetchAllAccounts() {
-  return new Promise((resolve, reject) => {
-    let openRequest = indexedDB.open("TimeSafariAccounts");
-
-    openRequest.onupgradeneeded = function (event) {
-      let db = event.target.result;
-      if (!db.objectStoreNames.contains("accounts")) {
-        db.createObjectStore("accounts", { keyPath: "id" });
-      }
-    };
-
-    openRequest.onsuccess = function (event) {
-      let db = event.target.result;
-      let transaction = db.transaction("accounts", "readonly");
-      let objectStore = transaction.objectStore("accounts");
-      let getAllRequest = objectStore.getAll();
-
-      getAllRequest.onsuccess = function () {
-        resolve(getAllRequest.result);
-      };
-      getAllRequest.onerror = function () {
-        reject(getAllRequest.error);
-      };
-    };
-
-    openRequest.onerror = function () {
-      reject(openRequest.error);
-    };
-  });
-}
-
-async function getNotificationCount() {
-  let secret = null;
-  let accounts = [];
-  let result = null;
-  if ("secret" in self) {
-    secret = self.secret;
-    const secretUint8Array = self.decodeBase64(secret);
-    // 1 is our master settings ID; see MASTER_SETTINGS_KEY
-    const settings = await getSettingById(1);
-    let lastNotifiedClaimId = null;
-    if ("lastNotifiedClaimId" in settings) {
-      lastNotifiedClaimId = settings["lastNotifiedClaimId"];
-    }
-    const activeDid = settings["activeDid"];
-    accounts = await fetchAllAccounts();
-    let did = null;
-    for (var i = 0; i < accounts.length; i++) {
-      let account = accounts[i];
-      let did = account["did"];
-      if (did == activeDid) {
-        let publicKeyHex = account["publicKeyHex"];
-        let identity = account["identity"];
-        const messageWithNonceAsUint8Array = self.decodeBase64(identity);
-        const nonce = messageWithNonceAsUint8Array.slice(0, 24);
-        const message = messageWithNonceAsUint8Array.slice(24, identity.length);
-        const decoder = new TextDecoder("utf-8");
-        const decrypted = self.secretbox.open(message, nonce, secretUint8Array);
-
-        const msg = decoder.decode(decrypted);
-        const identifier = JSON.parse(JSON.parse(msg));
-
-        const headers = {
-          "Content-Type": "application/json",
-        };
-
-        headers["Authorization"] = "Bearer " + (await accessToken(identifier));
-
-        let response = await fetch(
-          settings["apiServer"] + "/api/v2/report/claims",
-          {
-            method: "GET",
-            headers: headers,
-          },
-        );
-        if (response.status == 200) {
-          let json = await response.json();
-          let claims = json["data"];
-          let newClaims = 0;
-          for (var i = 0; i < claims.length; i++) {
-            let claim = claims[i];
-            if (claim["id"] === lastNotifiedClaimId) {
-              break;
-            }
-            newClaims++;
-          }
-          if (newClaims > 0) {
-            result = `There are ${newClaims} new activities on TimeSafari`;
-          }
-          const most_recent_notified = claims[0]["id"];
-          await setMostRecentNotified(most_recent_notified);
-        } else {
-          console.error("The service worker got a bad response status when fetching claims:", response.status, response);
-        }
-        break;
-      }
-    }
-  }
-  return result;
-}
-
-self.getNotificationCount = getNotificationCount;
-self.decodeBase64 = decodeBase64;

tsconfig.json

@@ -1,47 +1,41 @@
 {
-    "compilerOptions": {
-	"allowJs": true,
-	"resolveJsonModule": true,
-	"target": "esnext",
-	"module": "esnext",
-	"strict": true,
-	"strictPropertyInitialization": false,
-	"jsx": "preserve",
-	"moduleResolution": "node",
-	"experimentalDecorators": true,
-	"skipLibCheck": true,
-	"esModuleInterop": true,
-	"allowSyntheticDefaultImports": true,
-	"forceConsistentCasingInFileNames": true,
-	"useDefineForClassFields": true,
-	"sourceMap": true,
-	"baseUrl": "./src",
-	"types": [
-	    "webpack-env"
-	],
-	"paths": {
-	    "@/components/*": ["components/*"],
-	    "@/views/*": ["views/*"],
-	    "@/db/*": ["db/*"],
-	    "@/libs/*": ["libs/*"],
-	    "@/constants/*": ["constants/*"],
-	    "@/store/*": ["store/*"],
-	},
-	"lib": [
-	    "esnext",
-	    "dom",
-	    "dom.iterable",
-	    "scripthost"
-	]
-    },
-    "include": [
-	"src/**/*.ts",
-	"src/**/*.tsx",
-	"src/**/*.vue",
-	"tests/**/*.ts",
-	"tests/**/*.tsx"
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "strict": true,
+    "jsx": "preserve",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "useDefineForClassFields": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "types": [
+      "webpack-env"
     ],
-    "exclude": [
-	"node_modules"
+    "paths": {
+      "@/*": [
+        "src/*"
+      ]
+    },
+    "lib": [
+      "esnext",
+      "dom",
+      "dom.iterable",
+      "scripthost"
     ]
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "tests/**/*.ts",
+    "tests/**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }

vue.config.js

@@ -11,9 +11,5 @@ module.exports = defineConfig({
     iconPaths: {
       faviconSVG: "img/icons/safari-pinned-tab.svg",
     },
-    workboxPluginMode: "InjectManifest",
-    workboxOptions: {
-      swSrc: "./sw_scripts/additional-scripts.js",
-    },
   },
 });

web-push.md

@@ -1,402 +0,0 @@
-
-# Overivew of Web Push
-
-Web Push notifications is a web browser messaging protocol defined by the W3C.
-
-Discussions of this interesting technology are clouded because of a
-terminological morass.
-
-To understand how Web Push operates, we need to observe that are three (and
-potentially four) parties involved. These are:
-
-1) The user's web browser. Let's call that BROWSER
-2) The Web Push Service Provider which is operated by the organization
-controlling the web browser's source code. Here named PROVIDER. An example of a
-PROVIDER is FCM (Firebase Cloud Messaging) which is owned by Google.
-3) The Web Application that a user is visiting from their web browser. Let's
-call this the SERVICE (short for Web Push application service)
-4) A Custom Web Push Intermediary Service, either third party or self-hosted.
-Called INTERMEDIARY here. FCM also may fit in this category if the SERVICE
-has an API key from FCM.]
-
-The workflow works like this:
-
-BROWSER visits a website which hosts a SERVICE.
-
-The SERVICE asks BROWSER for its permission to subscribe to messages coming
-from the SERVICE.
-
-The SERVICE will provide context and obtain explicit permission before prompting
-for notification permission:
-
-In order to provide this context and explicit permission, a two-step opt-in process
-first presents the user with a pre-permission dialog box that explains
-what the notifications are for and why they are useful. This may help reduce the
-possibility of users clicking "don't allow".
-
-Now, to explain what happens in Typescript, we can activate a browser's
-permission dialogue in this manner:
-
-```
-function askPermission(): Promise<NotificationPermission> {
-  return new Promise(function(resolve, reject) {
-    const permissionResult = Notification.requestPermission(function(result) {
-      resolve(result);
-    });
-
-    if (permissionResult) {
-      permissionResult.then(resolve, reject);
-    }
-  }).then(function(permissionResult) {
-    if (permissionResult !== 'granted') {
-      throw new Error("We weren't granted permission.");
-    }
-    return permissionResult;
-  });
-}
-```
-
-The Notification.permission property indicates the permission level for the
-current session and returns one of the following string values:
-
-    'granted': The user has granted permission for notifications.
-    'denied': The user has denied permission for notifications.
-    'default': The user has not made a choice yet.
-
-Once the user has granted permission, the client application registers a service
-worker using the `ServiceWorkerRegistration` API.
-
-The `ServiceWorkerRegistration` API is accessible via the browser's `navigator`
-object and the `navigator.serviceWorker` child object and ultimately directly
-accessible via the navigator.serviceWorker.register method which also creates
-the service worker or the navigator.serviceWorker.getRegistration method.
-
-Once you have a `ServiceWorkerRegistration` object, that object will provide a
-child object named `pushManager` through which subscription and management of
-subscriptions may be done.
-
-Let's go through the `register` method first:
-
-```
-navigator.serviceWorker.register('sw.js', { scope: '/' })
-  .then(function(registration) {
-    console.log('Service worker registered successfully:', registration);
-  })
-  .catch(function(error) {
-    console.log('Service worker registration failed:', error);
-  });
-```
-
-The `sw.js` file contains the logic for what a service worker should do.
-It executes in a separate thread of execution from the web page but provides a
-means of communicating between itself and the web page via messages.
-
-Note that there is a scope that can specify what network requests it may
-intercept.
-
-The Vue project already has its own service worker but it is possible to
-create multiple service worker files by registering them on different scopes.
-
-It is useful architecturally to specify a separate server worker file.
-
-In the case of web push, the path of the scope only has reference to the domain
-of the service worker and no relationship to the pathing for the web push
-server.  In order to specify more than one server workers each needs to be on
-different scope paths!
-
-Here's a version which can be used for testing locally.  Note there can be
-caching issues in your browser!  Incognito is highly recommended.
-
-sw-dev.ts
-```
-self.addEventListener('push', function(event: PushEvent) {
-  console.log('Received a push message', event);
-
-  const title = 'Push message';
-  const body = 'The message body';
-  const icon = '/images/icon-192x192.png';
-  const tag = 'simple-push-demo-notification-tag';
-
-  event.waitUntil(
-    self.registration.showNotification(title, {
-      body: body,
-      icon: icon,
-      tag: tag
-    })
-  );
-});
-```
-
-
-vue.config.js
-```
-module.exports = {
-  pwa: {
-    workboxOptions: {
-      importScripts: ['sw-dev.ts']
-    }
-  }
-}
-```
-
-Once we have the service worker registered and the ServiceWorkerRegistration is
-returned, we then have access to a `pushManager` property object.  This property
-allows us to continue with the web push work flow.
-
-In the next step, BROWSER requests a data structure from SERVICE called a VAPID
-(Voluntary Application Server Identification) which is the public key from a
-key-pair.
-
-The VAPID is a specification used to identify the application server (i.e. the
-SERVICE server) that is sending push messages through a push PROVIDER. It's an
-authentication mechanism that allows the server to demonstrate its identity to
-the push PROVIDER, by use of a public and private key pair. These keys are used
-by the SERVICE in encrypting messages being sent to the BROWSER, as well as
-being used by the BROWSER in decrypting the messages coming from the SERVICE.
-
-The VAPID (Voluntary Application Server Identification) key provides more
-security and authenticity for web push notifications in the following ways:
-
-Identifying the Application Server:
-    
-        The VAPID key is used to identify the application server that is sending
-	the push notifications. This ensures that the push notifications are
-	authentic and not sent by a malicious third party.
-	
-Encrypting the Messages:
-    
-        The VAPID key is used to sign the push notifications sent by the
-	application server, ensuring that they are not tampered with during
-	transmission. This provides an additional layer of security and
-	authenticity for the push notifications.
-
-Adding Contact Information:
-
-    The VAPID key allows a web application to add contact information to
-    the push messages sent to the browser push service. This enables the
-    push service to contact the application server in case of need or
-    provide additional debug information about the push messages.
-
-Improving Delivery Rates:
-
-    Using the VAPID key can help improve the overall performance of web push
-    notifications, specifically improving delivery rates. By streamlining the
-    delivery process, the chance of delivery errors along the way is lessened.
-
-If the BROWSER accepts and grants permission to subscribe to receiving from the
-SERVICE Web Push messages, then the BROWSER makes a subscription request to
-PROVIDER which creates and stores a special URL for that BROWSER.
-
-Here's a bit of code describing the above process:
-
-```
-// b64 is the VAPID
-b64 = 'BEl62iUYgUivxIkv69yViEuiBIa-Ib9-SkvMeAtA3LFgDzkrxZJjSgSnfckjBJuBkr3qBUYIHBQFLXYp5Nksh8U';
-const applicationServerKey = urlBase64ToUint8Array(b64);
-const options: PushSubscriptionOptions = {
-  userVisibleOnly: true,
-  applicationServerKey: applicationServerKey
-};
-
-registration.pushManager.subscribe(options)
-  .then(function(subscription) {
-    console.log('Push subscription successful:', subscription);
-  })
-  .catch(function(error) {
-    console.error('Push subscription failed:', error);
-  });
-```
-
-In this example, the `applicationServerKey` variable contains the VAPID public
-key, which is converted to a `Uint8Array` using a function such as this:
-
-```
-export function toUint8Array(base64String: string, atobFn: typeof atob): Uint8Array {
-	const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
-	const base64 = (base64String + padding).replace(/-/g, "+").replace(/_/g, "/");
-
-	const rawData = atobFn(base64);
-	const outputArray = new Uint8Array(rawData.length);
-
-	for (let i = 0; i < rawData.length; ++i) {
-		outputArray[i] = rawData.charCodeAt(i);
-	}
-	return outputArray;
-}
-```
-
-The options object is of type `PushSubscriptionOptions`, which includes the
-`userVisibleOnly` and `applicationServerKey` (ie VAPID public key) properties.
-
-    options: An object that contains the options used for creating the
-    subscription. This object itself has the following sub-properties:
-    
-      applicationServerKey: A public key your push service uses for application
-      server identification. This is normally a Uint8Array.
-    
-      userVisibleOnly: A boolean value indicating that the push messages that
-      are sent should be made visible to the user through a notification.
-      This is often set to true.
-
-The subscribe() method returns a `Promise` that resolves to a `PushSubscription`
-object containing details of the subscription, such as the endpoint URL and the
-public key.  The returned data would have a form like this:
-
-    {
-      "endpoint": "https://some.pushservice.com/some/unique/identifier",
-      "expirationTime": null,
-      "keys": {
-        "p256dh": "some_base64_encoded_string",
-        "auth": "some_other_base64_encoded_string"
-      }
-    }
-
-    endpoint: A string representing the endpoint URL for the push service. This
-    URL is essentially the push service address to which the push message would
-    be sent for this particular subscription.
-
-    expirationTime: A DOMHighResTimeStamp (which is basically a number or null)
-    representing the subscription's expiration time in milliseconds since
-    01 January, 1970 UTC. This can be null if the subscription never expires.
-
-The BROWSER will, internally, then use that URL to check for incoming messages
-by way of the service worker we described earlier. The BROWSER also sends this
-URL back to SERVICE which will use that URL to send messages to the BROWSER via
-the PROVIDER.
-
-Ultimately, the actual internal process of receiving messages varies from BROWSER
-to BROWSER. Approaches vary from long-polling HTTP connections to WebSockets. A
-lot of handwaving and voodoo magic. The bottom line is that the BROWSER itself
-manages the connection to the PROVIDER whilst the SERVICE must send messages
-via the PROVIDER so that they reach the BROWSER service worker.
-
-Just to remind us that in our service worker our code for receiving messages
-will look something like this:
-
-```
-self.addEventListener('push', function(event: PushEvent) {
-  console.log('Received a push message', event);
-
-  const title = 'Push message';
-  const body = 'The message body';
-  const icon = '/images/icon-192x192.png';
-  const tag = 'simple-push-demo-notification-tag';
-
-  event.waitUntil(
-    self.registration.showNotification(title, {
-      body: body,
-      icon: icon,
-      tag: tag
-    })
-  );
-});
-```
-
-
-Now to address the issue of receiving notification messages on mobile devices.
-It should be noted that Web Push messages are only received when BROWSER is
-open, except in the cases of Chrome and Firefox mobile BROWSERS. In iOS, the
-mobile application (in our case a PWA) must be added to the Home Screen and
-permissions must be explicitly granted that allow the application to receive
-push notifications. Further, with an iOS device the user must enable wake on
-notification to have their device light-up when it receives a notification
-(https://support.apple.com/enus/HT208081).
-
-So what about #4? - The INTERMEDIARY. Well, It is possible under very special
-circumstances to create your own Web Push PROVIDER. The only case I've found so
-far relates to making an Android Custom ROM. (An Android Custom ROM is a
-customized version of the Android Operating System.) There are open source
-IMTERMEDIARY products such as UnifiedPush (https://unifiedpush.org/) which can
-fulfill this role. If you are using iOS you are not permitted to make or use
-your own custom Web Push PROVIDER. Apple will never allow anyone to do that.
-Apple has none of its own.
-
-It is, however, possible to have a sort of proxy working between your SERVICE
-and FCM (or iOS). Services that mash up various Push notification services (like
-OneSignal) can perform in the role of such proxies.
-
-#4 -The INTERMEDIARY- doesn't appear to be anything we should be spending our
-time on.
-
-A BROWSER may also remove a subscription.   In order to remove a subscription,
-the registration record must be retrieved from the serviceWorker using
-`navigator.serviceWorker.ready`.  Within the `ready` property is the
-`pushManager` which has a `getSubscription` method. Once you have the
-subscription object, you may call the `unsubscribe` method.  `unsubscribe` is
-asynchronnous and returns a boolean true if it is successful in removing the
-subscription and false if not.
-
-
-```
-async function unsubscribeFromPush() {
-  // Check if the browser supports service workers
-  if ("serviceWorker" in navigator) {
-    // Get the registration object for the service worker
-    const registration = await navigator.serviceWorker.ready;
-
-    // Get the existing subscription
-    const subscription = await registration.pushManager.getSubscription();
-
-    if (subscription) {
-      // Unsubscribe
-      const successful = await subscription.unsubscribe();
-      if (successful) {
-        console.log("Successfully unsubscribed from push notifications.");
-        // You can also inform your server to remove this subscription
-      } else {
-        console.log("Failed to unsubscribe from push notifications.");
-      }
-    } else {
-      console.log("No subscription was found.");
-    }
-  } else {
-    console.log("Service workers are not supported by this browser.");
-  }
-}
-
-// Unsubscribe from push notifications
-unsubscribeFromPush().catch((err) => {
-  console.error("An error occurred while unsubscribing from push notifications", err);
-});
-```
-
-NOTE: We could offer an option within the app to "mute" these notifications. This wouldn't turn off the notifications at the browser level, but you could make it so that your Service Worker doesn't display them even if it receives them.
-
-
-# NOTIFICATION DIALOG WORKFLOW
-
-## ON APP FIRST-LAUNCH:
-The user is periodically presented with the notification permission dialog that asks them if they want to turn on notifications. User is given 3 choices:
-
-- "Turn on Notifications": triggers the browser's own notification permission prompt.
-- "Maybe Later": dismisses the dialog, to reappear at a later instance. (The next time the user launches the app? After X amount of days? A combination of both?)
-- "Never": dismisses the dialog; app remembers to not automatically present the dialog again.
-
-## IF THE USER CHOOSES "NEVER":
-The dialog can still be accessed via the Notifications toggle switch in `AccountViewView` (which also tells the user if notifications are turned on or off).
-
-## TO TEMPORARILY MUTE NOTIFICATIONS:
-While notifications are turned on, the user can tap on the Mute Notifications toggle switch in `AccountViewView` (visible only when notifications are turned on) to trigger the Mute Notifications Dialog. User is given the following choices:
-
-- Several "Mute for X Hour/s" buttons to temporarily mute notifications.
-- "Mute until I turn it back on" button to indefinitely mute notifications.
-- "Cancel" to make no changes and dismiss the dialog.
-
-## TO UNMUTE NOTIFICATIONS:
-Simply tap on the Mute Notifications toggle switch in `AccountViewView` to immediately unmute notifications. No dialog needed.
-
-## TO TURN OFF NOTIFICATIONS:
-While notifications are turned on, the user can tap on the App Notifications toggle switch in `AccountViewView` to trigger the Turn Off Notifications Dialog. User is given the following choices:
-
-- "Turn off Notifications" to fully turn them off (which means the user will need to go through the dialogs agains to turn them back on).
-- "Leave it On" to make no changes and dismiss the dialog.
-
-# NOTIFICATION STATES
-
-* Unpermissioned. Push server cannot send notifications to the user because it does not have permission.
-  This may be the same as when the user gave permission in the past but has since revoked it at the OS or browser
-  level, outside the app. (User can change to Permissioned when the user gives permission.)
-* Permissioned. (User can change to Unpermissioned via the OS or browser settings.)
-  * Active. (User can change to Muted when the user mutes notifications.)
-  * Muted. (User can change to Active when the user toggles it.)
-    (Turning mute off automatically after some amount of time is not planned in version 1.)