Refactored last viewed notification code. Appears to work now.

CHANGELOG.md

@@ -9,57 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 
-## [0.1.8] - 2023.12.27
-### Added
-- DB logging for service-worker events
-- Help page for notifications
-- Test notification & web-push triggers inside app
-- Check that the app is installed
-### Fixed
-- Project issuer display name
-
-
-## [0.1.7] - 2023.12.19 - 91c6c7c11c71f96006cc876fc946f1f98a274ba2
-### Changed
-- Icons
-### Fixed
-- Notification switch now shows message
-- Prod/test server warning message at top of page
-
-
-## [0.1.6] - 2023.12.17 - b445b1234fbfcf6b37d695373f259aab0eda1118
-### Added
-- Infinite scroll on home page
-### Changed
-- UI improvements
-- Show web-push subscription info
-- Icon
-
-
-## [0.1.5] - 2023.12.09 - 9c36bb509a9bae9bb3306d3bd9eeb144b67aa8ad
-### Added
-- Web push notifications (though not finalized)
-- Credentials details page
-- See more data without an ID
-- Change units of a give
-
-
-## [0.1.4] - 2023.11.20 - 7311d36726f3667ec4c68f241f91d404273ad4db
-### Added
-- Offer on a project
-### Changed
-- Automatically set as visible when importing a contact
-
-
-## [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
+## [0.1.2] - 2023.11.01
 ### Added
 - Basics: create ID, record a give, declare a project, search, and get notifications.

README.md

@@ -1,4 +1,4 @@
-# TimeSafari.app - Crowd-Funder for Time - PWA
+# kickstart-for-time-pwa
 
 ## Project setup
 
@@ -13,46 +13,49 @@ npm install
 npm run serve
 ```
 
+### Compiles and minifies for production
+
+If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
+
+```
+npm run build
+```
+
 ### Lints and fixes files
 ```
 npm run lint
 ```
 
-### Compiles and minifies for production
-
-If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
-
-* Update the CHANGELOG.md & the version in package.json, run `npm install`, and commit.
-
-* [Tag wth the new version.](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases)
-
-* If production, change src/constants/app.ts DEFAULT_*_SERVER to be "PROD" and package.json to remove "_Test".
-
-* `npm run build`
-
-* `npx prettier --write ./sw_scripts/`
-
-...to make sure the service worker scripts are in proper form. It's only important if you changed something in that directory.
-
-* `cp sw_scripts/[ns]* dist/`
-
-... to copy the contents of the `sw_scripts` folder to the `dist` folder - except additional_scripts.js.
-
-* `rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntu@endorser.ch:time-safari`
-
-* Revert src/constants/app.ts and/or package.json, edit package.json to increment version & add "-beta", `npm install`, and commit.
-
-
-
 ## Tests
 
+###
+
+For your own web-push tests, change the 'vapid' URL in App.vue, and install apps on the same domain.
+
+### Test key contents
+
+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:
@@ -63,39 +66,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 push server URL in Advanced settings on the account page, and install Time Safari & push server 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
@@ -103,22 +81,17 @@ 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 cache for site. (In Chrome, go to `chrome://settings/cookies` and "all site data and permissions"; in Firefox, go to `about:preferences` and search for "cache" then "Manage Data", and also manually remove the IndexedDB data if the DBs still show.)
-* Clear notification permission. (in Chrome, go to `chrome://settings/content/notifications`; in Firefox, go to `about:preferences` and search for "notifications".)
-* Unregister service worker. (in Chrome, go to `chrome://serviceworker-internals/`; in Firefox, go to `about:serviceworkers`.)
-* Clear Cache Storage. (in Chrome, in dev tools under Application; in Firefox, in dev tools under Storage.)
-
-(If you find more, add them to the HelpNotificationsView.vue file.)
+### Clear data & restart
 
+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).
 
 
 
@@ -129,10 +102,110 @@ To add an icon, add to main.ts and reference with `fa` element and `icon` attrib
 * 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.
 
-* [Customize Vue configuration](https://cli.vuejs.org/config/).
+```
+// reference material from https://github.com/trentlarson/endorser-mobile/blob/8dc8e0353e0cc80ffa7ed89ded15c8b0da92726b/src/utility/idUtility.ts#L83
 
+// Import an existing ID
+export const importAndStoreIdentifier = async (mnemonic: string, mnemonicPassword: string, toLowercase: boolean, previousIdentifiers: Array<IIdentifier>) => {
 
-### Kudos
+  // just to get rid of variability that might cause an error
+  mnemonic = mnemonic.trim().toLowerCase()
+
+  /**
+  // 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!
 
@@ -140,4 +213,3 @@ Gifts make the world go 'round!
 * [Many tools & libraries]() such as Nodejs.org, IntelliJ Idea, Veramo.io, Vuejs.org, threejs.org
 * [Bush 3D model](https://sketchfab.com/3d-models/lupine-plant-bf30f1110c174d4baedda0ed63778439)
 * [Forest floor image](https://www.goodfreephotos.com/albums/textures/leafy-autumn-forest-floor.jpg)
-* Time Safari logo assisted by [DALL-E in ChatGPT](https://chat.openai.com/g/g-2fkFE8rbu-dall-e)

openssl_signing_console.rst

@@ -1,11 +1,8 @@
-JWT Creation & Verification
+Prerequisites:
 
-To run this in a script, see ./openssl_signing_console.sh
+jq 
 
-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 +15,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 +43,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 +1,25 @@
 #!/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 '/' '_')
+header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n')
+payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n')
 
 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 -sign private.pem -out signature.bin
 
-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 '/' '_')
+# Read binary signature from file and encode it to Base64 URL-Safe format
+signature_b64=$(base64 -w 0 < signature.bin | tr -d '=' | tr '+' '-' | tr '/' '_')
 
 # Construct the JWT
 jwt="$signing_input.$signature_b64"
 
-echo Resulting JWT: $jwt
+openssl dgst -sha256 -verify public.pem -signature signature.bin -out verified.txt <(echo -n "$signing_input")
+
+

package-lock.json

@@ -1,17 +1,18 @@
 {
-  "name": "TimeSafari_Test",
-  "version": "0.1.8",
+  "name": "kickstart-for-time-pwa",
+  "version": "0.1.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "TimeSafari_Test",
-      "version": "0.1.8",
+      "name": "kickstart-for-time-pwa",
+      "version": "0.1.3",
       "dependencies": {
         "@ethersproject/hdnode": "^5.7.0",
         "@fortawesome/fontawesome-svg-core": "^6.4.2",
         "@fortawesome/free-solid-svg-icons": "^6.4.2",
         "@fortawesome/vue-fontawesome": "^3.0.3",
+        "@lionello/secp256k1-js": "^1.1.0",
         "@pvermeer/dexie-encrypted-addon": "^3.0.0",
         "@tweenjs/tween.js": "^21.0.0",
         "@veramo/core": "^5.4.1",
@@ -30,12 +31,13 @@
         "dexie": "^3.2.4",
         "dexie-export-import": "^4.0.7",
         "did-jwt": "^7.2.7",
+        "elliptic": "^6.5.4",
         "ethereum-cryptography": "^2.1.2",
         "ethereumjs-util": "^7.1.5",
         "ethr-did-resolver": "^8.1.2",
-        "git-describe": "^4.1.1",
         "jdenticon": "^3.2.0",
         "js-generate-password": "^0.1.9",
+        "jssha": "^3.3.1",
         "localstorage-slim": "^2.5.0",
         "luxon": "^3.4.3",
         "merkletreejs": "^0.3.10",
@@ -50,7 +52,6 @@
         "reflect-metadata": "^0.1.13",
         "register-service-worker": "^1.7.2",
         "three": "^0.156.1",
-        "util": "^0.12.5",
         "vue": "^3.3.4",
         "vue-axios": "^3.5.2",
         "vue-facing-decorator": "^3.0.2",
@@ -2823,9 +2824,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.3.tgz",
+      "integrity": "sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -2873,9 +2874,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
-      "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.53.0.tgz",
+      "integrity": "sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -6060,6 +6061,22 @@
       "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
       "dev": true
     },
+    "node_modules/@lionello/secp256k1-js": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@lionello/secp256k1-js/-/secp256k1-js-1.1.0.tgz",
+      "integrity": "sha512-frvrdwwgWm0gq43rYcGwwZee+k5sX9HfWnB80740h1dvRT0FO0Z6Wt5C5I7bS0dXKy1pt6IomkR1VcXirP+g4Q==",
+      "dependencies": {
+        "bn.js": "^4.11.8"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@lionello/secp256k1-js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+      "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="
+    },
     "node_modules/@noble/ciphers": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-0.3.0.tgz",
@@ -8821,11 +8838,11 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.10.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz",
-      "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==",
+      "version": "20.8.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.6.tgz",
+      "integrity": "sha512-eWO4K2Ji70QzKUqRy6oyJWUeB7+g2cRagT3T/nxYibYcT4y2BDL8lqolRXjTHmkZCdJfIPaY73KbJAZmcryxTQ==",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~5.25.1"
       }
     },
     "node_modules/@types/normalize-package-data": {
@@ -8895,7 +8912,8 @@
     "node_modules/@types/semver": {
       "version": "7.5.3",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw=="
+      "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==",
+      "dev": true
     },
     "node_modules/@types/send": {
       "version": "0.17.2",
@@ -11252,6 +11270,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -12069,6 +12088,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "devOptional": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
@@ -14225,15 +14245,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
-      "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
+      "version": "8.53.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.53.0.tgz",
+      "integrity": "sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.55.0",
+        "@eslint/eslintrc": "^2.1.3",
+        "@eslint/js": "8.53.0",
         "@humanwhocodes/config-array": "^0.11.13",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
@@ -15897,6 +15917,7 @@
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
       "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
       "dependencies": {
         "is-callable": "^1.1.3"
       }
@@ -16156,6 +16177,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "devOptional": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -16208,6 +16230,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
       "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "devOptional": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -16272,30 +16295,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/git-describe": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/git-describe/-/git-describe-4.1.1.tgz",
-      "integrity": "sha512-JC8ganO5kO80G8+XE98TDDjnMXQN3Estk3qdJuG2EGRF/l6zuMTMcN+8OSfQZ5FWpqIRLB015anWX4aSRgnxAQ==",
-      "dependencies": {
-        "@types/semver": "^7.3.8",
-        "lodash": "^4.17.21"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      },
-      "optionalDependencies": {
-        "semver": "^5.6.0"
-      }
-    },
-    "node_modules/git-describe/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -16382,6 +16381,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
       "dependencies": {
         "get-intrinsic": "^1.1.3"
       },
@@ -16452,6 +16452,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
       "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
+      "devOptional": true,
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -16490,6 +16491,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "devOptional": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -16501,6 +16503,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "devOptional": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -16512,6 +16515,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
       "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
       "dependencies": {
         "has-symbols": "^1.0.2"
       },
@@ -17103,21 +17107,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-array-buffer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
@@ -17189,6 +17178,7 @@
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -17293,20 +17283,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -17580,6 +17556,7 @@
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
       "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "dev": true,
       "dependencies": {
         "which-typed-array": "^1.1.11"
       },
@@ -18908,6 +18885,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/jssha": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jssha/-/jssha-3.3.1.tgz",
+      "integrity": "sha512-VCMZj12FCFMQYcFLPRm/0lOBbLi8uM2BhXPTqw3U4YAfs4AZfiApOoBLoN8cQE60Z50m1MYMTQVCfgF/KaCVhQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/keccak": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/keccak/-/keccak-3.0.4.tgz",
@@ -19362,7 +19347,8 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "devOptional": true
     },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
@@ -26918,9 +26904,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      "version": "5.25.3",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
+      "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
@@ -27103,18 +27089,6 @@
       "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
       "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="
     },
-    "node_modules/util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
-      }
-    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -28026,6 +28000,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
       "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "TimeSafari_Test",
-  "version": "0.1.8",
+  "name": "kickstart-for-time-pwa",
+  "version": "0.1.3",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,6 +12,7 @@
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/vue-fontawesome": "^3.0.3",
+    "@lionello/secp256k1-js": "^1.1.0",
     "@pvermeer/dexie-encrypted-addon": "^3.0.0",
     "@tweenjs/tween.js": "^21.0.0",
     "@veramo/core": "^5.4.1",
@@ -30,12 +31,13 @@
     "dexie": "^3.2.4",
     "dexie-export-import": "^4.0.7",
     "did-jwt": "^7.2.7",
+    "elliptic": "^6.5.4",
     "ethereum-cryptography": "^2.1.2",
     "ethereumjs-util": "^7.1.5",
     "ethr-did-resolver": "^8.1.2",
-    "git-describe": "^4.1.1",
     "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
+    "jssha": "^3.3.1",
     "localstorage-slim": "^2.5.0",
     "luxon": "^3.4.3",
     "merkletreejs": "^0.3.10",
@@ -50,7 +52,6 @@
     "reflect-metadata": "^0.1.13",
     "register-service-worker": "^1.7.2",
     "three": "^0.156.1",
-    "util": "^0.12.5",
     "vue": "^3.3.4",
     "vue-axios": "^3.5.2",
     "vue-facing-decorator": "^3.0.2",

project.task.yaml

@@ -1,87 +1,82 @@
 
 tasks:
 
-- 08 notifications :
-  - .2 after turning on notification, don't wait in push server but wait in client for message test
-  - insert tooling (exportable logs?) so that we can see problems and troubleshoot as we onboard
-    - if navigator.serviceWorker is null, then tell the user to wait
-    - Local install works after cleared out cache in Chrome
+- in endorser-push-server - mount folder for persistent sqlite DB outside of container
+- 40 notifications :
+  - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
 
-- fix maskable icon
+- 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:matthew
 
-- give users next public key hash
+- 01 fix the Discovery map display to not show on top of bottom icons (and any other UI tweaks on the map flow) assignee-group:ui
+- .1 add instructions for map location selection
 
-- .3 bug - make or edit a project, choose "Include location", and see the map display shows on top of the bottom icons assignee-group:ui
+- 01 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
+- 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s)
 
-- show VC details... somehow:
-  - 01 show my VCs - most interesting, or via search
-  - 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 
+    - SEE: https://github.com/konvajs/vue-konva
+
+- 24 Move to Vite assignee:matthew
+
+- .5 switch so DiscoverView shows anywhere by default, and no number unless search is done (and maybe a better filter UI, including "mine" to consolidate with ProjectsView)
+- .2 fit as many icons as possible on home & project view screens but only going halfway down the page assignee-group:ui
+- .5 Add infinite scroll to gifts on the home page
+- .5 bug - search for "Safari" does not find the project, but if already on the "Anywhere" tab it shows all
+- .2 figure out why endorser-mobile search doesn't find recently created PlanAction
+- .1 when creating a plan, select location and then make sure you can deselect on Android
+- .5 add link to further project / people when a project pays ahead
+- .5 add project ID to the URL of the project-view, to make a project publicly-accessible
+- .5 fix where user 0 sees no txns from user 1 on contacts page but sees them on list page
+- .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist
+- .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
+- .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164
+- .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
+- .1 Make give description text box into something that expands as they type
+- .1 Make contact info specific to Time Safari - rather pointing at CommunityCred.org
+
+- Discuss whether the remaining tasks are worthwhile before MVP release.
+
+- 04 allow user to download claims, mine + ones I can see about me from others
+- 02 allow user to create new DIDs from the same seed phrase (ie. increment derivation path)
+- .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 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 make a VC details page
+- .1 Add units or different icon to the coins (to distinguish $, BTC, hours, etc)
+- .1 remove firstName (& lastName) from localStorage
+
+- 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 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)
 
 - Release Minimum Viable Product :
-  - .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.
   - 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.
-  - Other features - donation vs give, show offers, show give & outstanding totals, show network view, restrict registration, connect to contacts
   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)
-- 02 watch for the service worker activation before showing the button to turn on notifications
-- 01 server - show all claim details when issued by the issuer
-- bug - got error adding on Firefox user #0 as contact for themselves
-- bug (that is hard to reproduce) - back-and-forth on discovery & project pages led to "You need an identity to load your projects." error on product page when I had an identity
-- bug (that is hard to reproduce) - in Chrome, install app then delete app and try from Chrome browser and see log errors "Uncaught TypeError: self.appendDailyLog is not a function"
-- bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent
-- 01 send visibility signal as a VC and store it
-- 04 remove 'rowid' references (that are sqlite-specific); may involve server
-- 04 look at other examples for better UI friend.tech
-- 01 make the prod build copy the sw_scripts
-- .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 remove references to localStorage for projectId (now that it's pulling from the path)
-- 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)
-- warn if they're using the web (android only?)
-  https://developer.mozilla.org/en-US/docs/Web/API/Navigator/getInstalledRelatedApps
-  https://web.dev/articles/get-installed-related-apps
-
-- 04 fix lack of initial notification in Firefox (on MacOS, maybe others)
-
-- 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
-- import project interactions from GitHub/GitLab and manage signing
 
 - linking between projects or plans :
   - show total time given to & from a project
@@ -89,10 +84,6 @@ tasks:
     - 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
@@ -104,24 +95,23 @@ tasks:
 - automated tests, eg. cypress
 
 - Notifications (wake on the phone, push notifications)
-  - pull instead of push, maybe via scheduled runs
-  - have a notification pop-up on Mac screen
 
 - Connect with phone contacts
 
 - 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?
 
-- 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.
+- 40 notifications v+ :
+  - pull, w/ scheduled runs
 
-- allow some gives even if they aren't registered - maybe someday as a gift to the world, but we really want this to be built via personal connections
+- 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.
 
 log:
 - videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29

sample.txt

@@ -0,0 +1,177 @@
+
+> kickstart-for-time-pwa@0.1.0 build
+> vue-cli-service build
+
+All browser targets in the browserslist configuration have supported ES module.
+Therefore we don't build two separate bundles for differential loading.
+
+
+ WARNING  Compiled with 5 warnings6:06:43 PM
+
+[eslint] 
+/home/matthew/projects/kick-starter-for-time-pwa/src/components/World/components/objects/landmarks.js
+   98:11  warning  Unexpected console statement  no-console
+  133:7   warning  Unexpected console statement  no-console
+  144:5   warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/router/index.ts
+  210:3  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/AccountViewView.vue
+  362:7  warning  Unexpected console statement  no-console
+  375:7  warning  Unexpected console statement  no-console
+  404:7  warning  Unexpected console statement  no-console
+  516:7  warning  Unexpected console statement  no-console
+  536:7  warning  Unexpected console statement  no-console
+  630:5  warning  Unexpected console statement  no-console
+  682:7  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/ContactAmountsView.vue
+  206:9  warning  Unexpected console statement  no-console
+  233:9  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/ContactGiftingView.vue
+  244:9  warning  Unexpected console statement  no-console
+  267:7  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/ContactsView.vue
+  340:9  warning  Unexpected console statement  no-console
+  577:9  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/DiscoverView.vue
+  315:9  warning  Unexpected console statement  no-console
+  343:7  warning  Unexpected console statement  no-console
+  390:9  warning  Unexpected console statement  no-console
+  423:7  warning  Unexpected console statement  no-console
+  532:9  warning  Unexpected console statement  no-console
+  575:7  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/HomeView.vue
+  349:9  warning  Unexpected console statement  no-console
+  498:9  warning  Unexpected console statement  no-console
+  521:7  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/IdentitySwitcherView.vue
+  142:7  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/ImportAccountView.vue
+  123:9  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/ImportDerivedAccountView.vue
+  159:7  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/NewEditProjectView.vue
+  183:9   warning  Unexpected console statement  no-console
+  215:7   warning  Unexpected console statement  no-console
+  297:13  warning  Unexpected console statement  no-console
+  320:11  warning  Unexpected console statement  no-console
+  345:7   warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/ProjectViewView.vue
+  387:9   warning  Unexpected console statement  no-console
+  421:7   warning  Unexpected console statement  no-console
+  457:7   warning  Unexpected console statement  no-console
+  552:9   warning  Unexpected console statement  no-console
+  554:11  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/ProjectsView.vue
+  131:9  warning  Unexpected console statement  no-console
+  144:7  warning  Unexpected console statement  no-console
+  221:9  warning  Unexpected console statement  no-console
+  237:7  warning  Unexpected console statement  no-console
+
+/home/matthew/projects/kick-starter-for-time-pwa/src/views/SeedBackupView.vue
+  94:7  warning  Unexpected console statement  no-console
+
+✖ 44 problems (0 errors, 44 warnings)
+
+
+You may use special comments to disable some warnings.
+Use // eslint-disable-next-line to ignore the next line.
+Use /* eslint-disable */ to ignore all warnings in a file.
+ warning  
+
+/models/lupine_plant/textures/lambert2SG_baseColor.png is 3.75 MB, and won't be precached. Configure maximumFileSizeToCacheInBytes to change this limit.
+
+ warning  
+
+/models/lupine_plant/textures/lambert2SG_normal.png is 4.91 MB, and won't be precached. Configure maximumFileSizeToCacheInBytes to change this limit.
+
+ warning  
+
+asset size limit: The following asset(s) exceed the recommended size limit (244 KiB).
+This can impact web performance.
+Assets: 
+  js/project.44f30c9f.js (318 KiB)
+  js/statistics.8a97010a.js (586 KiB)
+  js/chunk-vendors.a4845bfb.js (411 KiB)
+  js/705.f6a6ce2a.js (252 KiB)
+  img/textures/leafy-autumn-forest-floor.jpg (705 KiB)
+  models/lupine_plant/textures/lambert2SG_baseColor.png (3.58 MiB)
+  models/lupine_plant/textures/lambert2SG_normal.png (4.69 MiB)
+
+ warning  
+
+entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (244 KiB). This can impact web performance.
+Entrypoints:
+  app (447 KiB)
+      js/chunk-vendors.a4845bfb.js
+      css/app.8f21529c.css
+      js/app.8833cebc.js
+
+
+  File                                      Size             Gzipped
+
+  dist/js/statistics.8a97010a.js            585.72 KiB       148.80 KiB
+  dist/js/chunk-vendors.a4845bfb.js         411.44 KiB       137.82 KiB
+  dist/js/project.44f30c9f.js               317.61 KiB       78.67 KiB
+  dist/js/705.f6a6ce2a.js                   251.66 KiB       87.12 KiB
+  dist/js/891.33615e4f.js                   147.32 KiB       42.09 KiB
+  dist/js/153.e2c8e249.js                   146.26 KiB       42.21 KiB
+  dist/js/820.13565d16.js                   66.10 KiB        18.33 KiB
+  dist/js/contact-qr.e170ec33.js            54.85 KiB        15.63 KiB
+  dist/js/772.7b4c53a7.js                   30.29 KiB        7.21 KiB
+  dist/js/361.898a4525.js                   27.40 KiB        8.19 KiB
+  dist/js/account.77d86130.js               17.51 KiB        5.93 KiB
+  dist/js/app.8833cebc.js                   17.31 KiB        5.84 KiB
+  dist/js/contacts.3fc90ff8.js              16.94 KiB        5.52 KiB
+  dist/js/discover.24106939.js              15.30 KiB        5.22 KiB
+  dist/js/536.3bb13201.js                   15.23 KiB        4.84 KiB
+  dist/workbox-5b385ed2.js                  14.11 KiB        4.93 KiB
+  dist/js/home.218b99dd.js                  13.89 KiB        4.97 KiB
+  dist/js/help.50d3117b.js                  12.49 KiB        4.38 KiB
+  dist/js/projects.417a6cb7.js              8.71 KiB         3.00 KiB
+  dist/js/contact-amounts.a32b0ccd.js       8.44 KiB         3.25 KiB
+  dist/js/229.120e09bf.js                   7.99 KiB         2.72 KiB
+  dist/js/identity-switcher.c7937333.js     7.44 KiB         2.52 KiB
+  dist/js/new-edit-project.0552181b.js      7.36 KiB         3.11 KiB
+  dist/js/300.dcaeb2a3.js                   6.56 KiB         3.24 KiB
+  dist/js/seed-backup.76a0f7b3.js           3.99 KiB         1.97 KiB
+  dist/js/import-derive.c688d4b8.js         3.81 KiB         1.82 KiB
+  dist/js/import-account.c3fa35fd.js        3.54 KiB         1.66 KiB
+  dist/js/new-edit-account.bb763be2.js      3.39 KiB         1.51 KiB
+  dist/js/431.5a6d64e0.js                   3.38 KiB         2.56 KiB
+  dist/service-worker.js                    3.37 KiB         1.38 KiB
+  dist/js/scan-contact.46be989a.js          2.79 KiB         1.18 KiB
+  dist/js/start.091a7740.js                 2.70 KiB         1.30 KiB
+  dist/js/new-identifier.bb379420.js        2.12 KiB         1.18 KiB
+  dist/js/93.b873dbbf.js                    2.08 KiB         1.61 KiB
+  dist/js/new-edit-commitment.9248d367.j    1.96 KiB         1.05 KiB
+  s
+  dist/js/confirm-contact.02004d1d.js       1.89 KiB         1.04 KiB
+  dist/js/858.ae4c08ec.js                   0.97 KiB         0.78 KiB
+  dist/css/app.8f21529c.css                 18.41 KiB        4.39 KiB
+  dist/css/discover.73ee9bd3.css            14.77 KiB        6.25 KiB
+  dist/css/new-edit-project.73ee9bd3.css    14.77 KiB        6.25 KiB
+  dist/css/contacts.abb5e493.css            0.40 KiB         0.23 KiB
+  dist/css/contact-amounts.5b26ccd4.css     0.31 KiB         0.20 KiB
+  dist/css/home.828bc66e.css                0.25 KiB         0.19 KiB
+  dist/css/project.828bc66e.css             0.25 KiB         0.19 KiB
+  dist/css/statistics.828bc66e.css          0.25 KiB         0.19 KiB
+
+  Images and other types of assets omitted.
+  Build at: 2023-09-07T10:06:43.972Z - Hash: 2b39fcd4d0e78263 - Time: 32016ms
+
+ DONE  Build complete. The dist directory is ready to be deployed.
+ INFO  Check out deployment instructions at https://cli.vuejs.org/guide/deployment.html
+       

src/App.vue

@@ -169,12 +169,20 @@
                 >
                   Turn on 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"
-                >
-                  Maybe Later
-                </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>
@@ -230,10 +238,6 @@
                 </p>
 
                 <button
-                  @click="
-                    close(notification.id);
-                    turnOffNotifications();
-                  "
                   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
@@ -257,7 +261,8 @@
 
 <script lang="ts">
 import { Vue, Component } from "vue-facing-decorator";
-import axios from "axios";
+import axios, { AxiosError } from "axios";
+
 interface ServiceWorkerMessage {
   type: string;
   data: string;
@@ -281,68 +286,22 @@ interface VapidResponse {
   };
 }
 
-import { DEFAULT_PUSH_SERVER } 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 = 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");
-          });
+  mounted() {
+    axios
+      .get("https://timesafari-pwa.anomalistlabs.com/web-push/vapid")
+      .then((response: VapidResponse) => {
+        this.b64 = response.data.vapidKey;
+        console.log(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) {
-      if (window.location.host.startsWith("localhost")) {
-        console.log("Ignoring the error getting VAPID for local development.");
-      } else {
-        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,
-        );
-      }
-    }
+      })
+      .catch((error: AxiosError) => {
+        console.error("API error", error);
+      });
   }
 
   private sendMessageToServiceWorker(
@@ -370,7 +329,6 @@ export default class App extends Vue {
   }
 
   private askPermission(): Promise<NotificationPermission> {
-    console.log("Requesting permission for notifications:", navigator);
     if (!("serviceWorker" in navigator && navigator.serviceWorker.controller)) {
       return Promise.reject("Service worker not available.");
     }
@@ -411,17 +369,14 @@ export default class App extends Vue {
   private requestNotificationPermission(): Promise<NotificationPermission> {
     return Notification.requestPermission().then((permission) => {
       if (permission !== "granted") {
-        alert(
-          "Allow this app permission to make notifications for personal reminders." +
-            " You can adjust them at any time in your settings.",
-        );
+        alert("We need notification permission to provide certain features.");
         throw new Error("We weren't granted permission.");
       }
       return permission;
     });
   }
 
-  public async turnOnNotifications() {
+  async turnOnNotifications() {
     return this.askPermission()
       .then((permission) => {
         console.log("Permission granted:", permission);
@@ -430,51 +385,38 @@ export default class App extends Vue {
         this.subscribeToPush()
           .then(() => {
             console.log("Subscribed successfully.");
+            // Assuming the subscription object is available
             return navigator.serviceWorker.ready;
           })
           .then((registration) => {
+            // Fetch the existing subscription object from the registration
             return registration.pushManager.getSubscription();
           })
           .then((subscription) => {
             if (subscription) {
+              console.log(subscription);
               return this.sendSubscriptionToServer(subscription);
             } else {
               throw new Error("Subscription object is not available.");
             }
           })
           .then(() => {
-            console.log(
-              "Subscription data sent to server and all finished successfully.",
-            );
-            this.$notify(
-              {
-                group: "alert",
-                type: "success",
-                title: "Notifications Turned On",
-                text: "Notifications are on. You should see one on your device; if not, see the 'Troubleshoot' page.",
-              },
-              -1,
-            );
+            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 setting notification permissions:",
-          error,
-        );
-        alert("Some error occurred setting notification permissions.");
+        console.error("An error occurred:", error);
+        // Handle error appropriately here
       });
   }
 
+  // Function to convert URL base64 to Uint8Array
   private urlBase64ToUint8Array(base64String: string): Uint8Array {
     const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
     const base64 = (base64String + padding)
@@ -518,7 +460,11 @@ export default class App extends Vue {
           resolve();
         })
         .catch((error) => {
-          console.error("Push subscription failed:", error, options);
+          console.error(
+            "Subscription or server communication failed:",
+            error,
+            options,
+          );
 
           // Inform the user about the issue
           alert(
@@ -534,7 +480,7 @@ export default class App extends Vue {
   private sendSubscriptionToServer(
     subscription: PushSubscription,
   ): Promise<void> {
-    console.log("About to send subscription...", subscription);
+    console.log(subscription);
     return fetch("/web-push/subscribe", {
       method: "POST",
       headers: {
@@ -549,49 +495,12 @@ export default class App extends Vue {
     });
   }
 
-  async turnOffNotifications() {
-    let subscription;
-    const pushProviderSuccess = await navigator.serviceWorker.ready
-      .then((registration) => {
-        return registration.pushManager.getSubscription();
-      })
-      .then((subscript) => {
-        subscription = subscript;
-        if (subscription) {
-          return subscription.unsubscribe();
-        } else {
-          console.log("Subscription object is not available.");
-          return false;
-        }
-      })
-      .catch((error) => {
-        console.log("Push provider server communication failed:", error);
-        return false;
-      });
+  never(ID: string) {
+    alert(ID);
+  }
 
-    const pushServerSuccess = await fetch("/web-push/unsubscribe", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(subscription),
-    })
-      .then((response) => {
-        return response.ok;
-      })
-      .catch((error) => {
-        console.log("Push server communication failed:", error);
-        return false;
-      });
-
-    alert(
-      "Notifications are off. Push provider unsubscribe " +
-        (pushProviderSuccess ? "succeeded" : "failed") +
-        (pushProviderSuccess === pushServerSuccess ? " and" : " but") +
-        " push server unsubscribe " +
-        (pushServerSuccess ? "succeeded" : "failed") +
-        ".",
-    );
+  maybeLater(ID: string) {
+    alert(ID);
   }
 }
 </script>

src/components/GiftedDialog.vue

@@ -10,24 +10,21 @@
         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"
-          @click="changeUnitCode()"
+          >Hours</span
         >
-          {{ UNIT_SHORT[unitCode] }}
-        </span>
         <div
           class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
           @click="decrement()"
-          v-if="amountInput !== '0'"
         >
           <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="amountInput"
+          v-model="hours"
         />
         <div
           class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
@@ -36,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"
@@ -79,36 +70,15 @@ export default class GiftedDialog extends Vue {
 
   @Prop message = "";
   @Prop projectId = "";
-  @Prop showGivenToUser = false;
 
   activeDid = "";
   apiServer = "";
 
-  amountInput = "0";
-  giver?: GiverInputInfo; // undefined means no identified giver agent
+  giver?: GiverInputInfo;
   description = "";
-  givenToUser = false;
-  unitCode = "HUR";
+  hours = "0";
   visible = false;
 
-  /* eslint-disable prettier/prettier */
-  UNIT_SHORT: Record<string, string> = {
-    "BTC": "BTC",
-    "ETH": "ETH",
-    "HUR": "Hours",
-    "USD": "US $",
-  };
-  /* eslint-enable prettier/prettier */
-
-  /* eslint-disable prettier/prettier */
-  UNIT_LONG: Record<string, string> = {
-    "BTC": "BTC",
-    "ETH": "ETH",
-    "HUR": "hours",
-    "USD": "dollars",
-  };
-  /* eslint-enable prettier/prettier */
-
   async created() {
     try {
       await db.open();
@@ -123,7 +93,9 @@ export default class GiftedDialog extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: err.message || "There was an error retrieving your settings.",
+          text:
+            err.message ||
+            "There was an error retrieving the latest sweet, sweet action.",
         },
         -1,
       );
@@ -131,47 +103,27 @@ export default class GiftedDialog extends Vue {
   }
 
   open(giver: GiverInputInfo) {
-    this.description = "";
     this.giver = giver;
-    // if we show "given to user" selection, default checkbox to true
-    this.givenToUser = this.showGivenToUser;
-    this.amountInput = "0";
-
     this.visible = true;
   }
 
   close() {
-    // close the dialog but don't change values (since it might be submitting info)
     this.visible = false;
   }
 
-  changeUnitCode() {
-    const units = Object.keys(this.UNIT_SHORT);
-    const index = units.indexOf(this.unitCode);
-    this.unitCode = units[(index + 1) % units.length];
-  }
-
   increment() {
-    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
+    this.hours = `${(parseFloat(this.hours) || 0) + 1}`;
   }
 
   decrement() {
-    this.amountInput = `${Math.max(
-      0,
-      (parseFloat(this.amountInput) || 1) - 1,
-    )}`;
+    this.hours = `${Math.max(0, (parseFloat(this.hours) || 1) - 1)}`;
   }
 
   cancel() {
     this.close();
-    this.eraseValues();
-  }
-
-  eraseValues() {
     this.description = "";
     this.giver = undefined;
-    this.givenToUser = this.showGivenToUser;
-    this.amountInput = "0";
+    this.hours = "0";
   }
 
   async confirm() {
@@ -186,13 +138,14 @@ export default class GiftedDialog extends Vue {
       1000,
     );
     // this is asynchronous, but we don't need to wait for it to complete
-    await this.recordGive(
+    this.recordGive(
       this.giver?.did as string | undefined,
       this.description,
-      parseFloat(this.amountInput),
-      this.unitCode,
+      parseFloat(this.hours),
     ).then(() => {
-      this.eraseValues();
+      this.description = "";
+      this.giver = undefined;
+      this.hours = "0";
     });
   }
 
@@ -216,13 +169,12 @@ export default class GiftedDialog extends Vue {
    *
    * @param giverDid may be null
    * @param description may be an empty string
-   * @param amountInput may be 0
+   * @param hours may be 0
    */
   public async recordGive(
     giverDid?: string,
     description?: string,
-    amountInput?: number,
-    unitCode?: string,
+    hours?: number,
   ) {
     if (!this.activeDid) {
       this.$notify(
@@ -237,15 +189,13 @@ export default class GiftedDialog extends Vue {
       return;
     }
 
-    if (!description && !amountInput) {
+    if (!description && !hours) {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: `You must enter a description or some number of ${
-            this.UNIT_LONG[this.unitCode]
-          }.`,
+          text: "You must enter a description or some number of hours.",
         },
         -1,
       );
@@ -259,10 +209,9 @@ export default class GiftedDialog extends Vue {
         this.apiServer,
         identity,
         giverDid,
-        this.givenToUser ? this.activeDid : undefined,
+        this.activeDid,
         description,
-        amountInput,
-        unitCode,
+        hours,
         this.projectId,
       );
 
@@ -289,7 +238,7 @@ export default class GiftedDialog extends Vue {
             title: "Success",
             text: "That gift was recorded.",
           },
-          7000,
+          10000,
         );
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/components/OfferDialog.vue

@@ -1,315 +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 your settings.",
-        },
-        -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/components/TopMessage.vue

@@ -1,58 +0,0 @@
-<template>
-  <div class="text-center text-red-500">{{ message }}</div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop } from "vue-facing-decorator";
-import { db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { AppString } from "@/constants/app";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component
-export default class TopMessage extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
-  @Prop selected = "";
-
-  message = "";
-
-  async mounted() {
-    try {
-      await db.open();
-
-      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      if (
-        settings?.warnIfTestServer &&
-        settings.apiServer !== AppString.PROD_ENDORSER_API_SERVER
-      ) {
-        const didPrefix = settings.activeDid?.slice(11, 15);
-        this.message = "You're linked to a non-prod server, user " + didPrefix;
-      } else if (
-        settings?.warnIfProdServer &&
-        settings.apiServer === AppString.PROD_ENDORSER_API_SERVER
-      ) {
-        const didPrefix = settings.activeDid?.slice(11, 15);
-        this.message =
-          "You're linked to the production server, user " + didPrefix;
-      }
-    } catch (err: unknown) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Detecting Server",
-          text: JSON.stringify(err),
-        },
-        -1,
-      );
-    }
-  }
-}
-</script>

src/constants/app.ts

@@ -4,26 +4,20 @@
  * See also ../libs/veramo/setup.ts
  */
 export enum AppString {
+  APP_NAME = "TimeSafari",
+
   PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
   TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
   LOCAL_ENDORSER_API_SERVER = "http://localhost:3000",
 
-  PROD_PUSH_SERVER = "https://timesafari.app",
-  TEST1_PUSH_SERVER = "https://test.timesafari.app",
-  TEST2_PUSH_SERVER = "https://timesafari-pwa.anomalistlabs.com",
+  DEFAULT_ENDORSER_API_SERVER = TEST_ENDORSER_API_SERVER,
 }
 
-export const DEFAULT_ENDORSER_API_SERVER = AppString.TEST_ENDORSER_API_SERVER;
-
-export const DEFAULT_PUSH_SERVER =
-  window.location.protocol + "//" + window.location.host;
-
 /**
- * The possible values for "group" and "type" are in App.vue.
- * From the notiwind package
+ * See notiwind package
  */
 export interface NotificationIface {
-  group: string; // "alert" | "modal"
+  group: string;
   type: string; // "toast" | "info" | "success" | "warning" | "danger"
   title: string;
   text: string;

src/db/index.ts

@@ -1,20 +1,18 @@
 import BaseDexie, { Table } from "dexie";
 import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
 import { Account, AccountsSchema } from "./tables/accounts";
-import { Contact, ContactSchema } from "./tables/contacts";
-import { Log, LogSchema } from "./tables/logs";
+import { Contact, ContactsSchema } from "./tables/contacts";
 import {
   MASTER_SETTINGS_KEY,
   Settings,
   SettingsSchema,
 } from "./tables/settings";
-import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
+import { AppString } from "@/constants/app";
 
 // Define types for tables that hold sensitive and non-sensitive data
 type SensitiveTables = { accounts: Table<Account> };
 type NonsensitiveTables = {
   contacts: Table<Contact>;
-  logs: Table<Log>;
   settings: Table<Settings>;
 };
 
@@ -28,11 +26,7 @@ export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
 const SensitiveSchemas = { ...AccountsSchema };
 
 export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
-const NonsensitiveSchemas = {
-  ...ContactSchema,
-  ...LogSchema,
-  ...SettingsSchema,
-};
+const NonsensitiveSchemas = { ...ContactsSchema, ...SettingsSchema };
 
 // Manage the encryption key. If not present in localStorage, create and store it.
 const secret =
@@ -44,14 +38,12 @@ encrypted(accountsDB, { secretKey: secret });
 
 // Define the schema for our databases
 accountsDB.version(1).stores(SensitiveSchemas);
-// v1 was contacts & settings
-// v2 added logs
-db.version(2).stores(NonsensitiveSchemas);
+db.version(1).stores(NonsensitiveSchemas);
 
 // Event handler to initialize the non-sensitive database with default settings
 db.on("populate", () => {
   db.settings.add({
     id: MASTER_SETTINGS_KEY,
-    apiServer: DEFAULT_ENDORSER_API_SERVER,
+    apiServer: AppString.DEFAULT_ENDORSER_API_SERVER,
   });
 });

src/db/tables/contacts.ts

@@ -6,6 +6,6 @@ export interface Contact {
   registered?: boolean;
 }
 
-export const ContactSchema = {
+export const ContactsSchema = {
   contacts: "&did, name, publicKeyBase64, registered, seesMe",
 };

src/db/tables/logs.ts

@@ -1,10 +0,0 @@
-export interface Log {
-  message: string;
-}
-
-export const LogSchema = {
-  // Currently keyed by "date" because A) today's log data is what we need so we append, and
-  // B) we don't want it to grow so we remove everything if this is the first entry today.
-  // See safari-notifications.js logMessage for the associated logic.
-  logs: "date, message",
-};

src/db/tables/settings.ts

@@ -12,19 +12,17 @@ export type BoundingBox = {
  * Settings type encompasses user-specific configuration details.
  */
 export type Settings = {
-  id: number; // Only one entry, keyed with MASTER_SETTINGS_KEY
-
+  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
-  isRegistered?: boolean;
-  lastName?: string; // deprecated - put all names in firstName
-  lastNotifiedClaimId?: string; // Last notified claim ID
+  lastName?: string; // User's last name
   lastViewedClaimId?: string; // Last viewed claim ID
-  reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
-  reminderOn?: boolean; // Toggle to enable or disable reminders
+  lastNotifiedClaimId?: string; // Last notified claim ID
+  isRegistered?: boolean;
 
   // Array of named search boxes defined by bounding boxes
+
   searchBoxes?: Array<{
     name: string;
     bbox: BoundingBox;
@@ -32,9 +30,8 @@ export type Settings = {
 
   showContactGivesInline?: boolean; // Display contact inline or not
   vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
-  warnIfProdServer?: boolean; // Warn if using a production server
-  warnIfTestServer?: boolean; // Warn if using a testing server
-  webPushServer?: string; // Web Push server URL
+  reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
+  reminderOn?: boolean; // Toggle to enable or disable reminders
 };
 
 /**

src/libs/endorserServer.ts

@@ -12,8 +12,6 @@ export const SERVICE_ID = "endorser.ch";
 export const CONTACT_URL_PREFIX = "https://endorser.ch";
 // the suffix for the contact URL
 export const ENDORSER_JWT_URL_LOCATION = "/contact?jwt=";
-// the prefix for handle IDs, the permanent ID for claims on Endorser
-export const ENDORSER_CH_HANDLE_PREFIX = "https://endorser.ch/entity/";
 
 export interface AgreeVerifiableCredential {
   "@context": string;
@@ -40,24 +38,14 @@ export interface ClaimResult {
   error: { code: string; message: string };
 }
 
-export interface GenericVerifiableCredential {
+export interface GenericClaim {
   "@context": string;
   "@type": string;
-}
-
-export interface GenericServerRecord extends GenericVerifiableCredential {
-  handleId?: string;
-  id?: string;
-  issuedAt?: string;
-  issuer?: string;
+  issuedAt: string;
+  // "any" because arbitrary objects can be subject of agreement
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   claim: Record<any, any>;
 }
-export const BLANK_GENERIC_SERVER_RECORD: GenericServerRecord = {
-  "@context": SCHEMA_ORG_CONTEXT,
-  "@type": "",
-  claim: {},
-};
 
 export interface GiveServerRecord {
   agentDid: string;
@@ -71,46 +59,17 @@ 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";
@@ -155,104 +114,6 @@ export function isHiddenDid(did: string) {
   return did === HIDDEN_DID;
 }
 
-/**
- * @return true for any nested string where func(input) === true
- *
- * Similar logic is found in endorser-mobile.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function testRecursivelyOnString(func: (arg0: any) => boolean, input: any) {
-  if (Object.prototype.toString.call(input) === "[object String]") {
-    return func(input);
-  } else if (input instanceof Object) {
-    if (!Array.isArray(input)) {
-      // it's an object
-      for (const key in input) {
-        if (testRecursivelyOnString(func, input[key])) {
-          return true;
-        }
-      }
-    } else {
-      // it's an array
-      for (const value of input) {
-        if (testRecursivelyOnString(func, value)) {
-          return true;
-        }
-      }
-    }
-    return false;
-  } else {
-    return false;
-  }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function containsHiddenDid(obj: any) {
-  return testRecursivelyOnString(isHiddenDid, obj);
-}
-
-export function stripEndorserPrefix(claimId: string) {
-  if (claimId && claimId.startsWith(ENDORSER_CH_HANDLE_PREFIX)) {
-    return claimId.substring(ENDORSER_CH_HANDLE_PREFIX.length);
-  } else {
-    return claimId;
-  }
-}
-
-// similar logic is found in endorser-mobile
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function removeSchemaContext(obj: any) {
-  return obj["@context"] === SCHEMA_ORG_CONTEXT
-    ? R.omit(["@context"], obj)
-    : obj;
-}
-
-// similar logic is found in endorser-mobile
-export function addLastClaimOrHandleAsIdIfMissing(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  obj: any,
-  lastClaimId?: string,
-  handleId?: string,
-) {
-  if (!obj.identifier && lastClaimId) {
-    const result = R.clone(obj);
-    result.lastClaimId = lastClaimId;
-    return result;
-  } else if (!obj.identifier && handleId) {
-    const result = R.clone(obj);
-    result.identifier = handleId;
-    return result;
-  } else {
-    return obj;
-  }
-}
-
-// return clone of object without any nested *VisibleToDids keys
-// similar logic is found in endorser-mobile
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function removeVisibleToDids(input: any): any {
-  if (input instanceof Object) {
-    if (!Array.isArray(input)) {
-      // it's an object
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result: Record<string, any> = {};
-      for (const key in input) {
-        if (!key.endsWith("VisibleToDids")) {
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          result[key] = removeVisibleToDids(R.clone(input[key]));
-        }
-      }
-      return result;
-    } else {
-      // it's an array
-      return R.map(removeVisibleToDids, input);
-    }
-    return false;
-  } else {
-    return input;
-  }
-}
-
 /**
  always returns text, maybe UNNAMED_VISIBLE or UNKNOWN_ENTITY
 
@@ -291,7 +152,7 @@ export interface ErrorResult {
   error: InternalError;
 }
 
-export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
+export type CreateAndSubmitGiveResult = SuccessResult | ErrorResult;
 
 /**
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
@@ -310,85 +171,21 @@ export async function createAndSubmitGive(
   toDid?: string,
   description?: string,
   hours?: number,
-  unitCode?: string,
   fulfillsProjectHandleId?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  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: unitCode || "HUR" }
-      : undefined,
-    fulfills: fulfillsProjectHandleId
-      ? { "@type": "PlanAction", identifier: fulfillsProjectHandleId }
-      : undefined,
-  };
-  return createAndSubmitClaim(
-    vcClaim as GenericServerRecord,
-    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 (description) {
-    vcClaim.itemOffered = { description };
-  }
-  if (fulfillsProjectHandleId) {
-    vcClaim.itemOffered = vcClaim.itemOffered || {};
-    vcClaim.itemOffered.isPartOf = {
-      "@type": "PlanAction",
-      identifier: fulfillsProjectHandleId,
-    };
-  }
-  return createAndSubmitClaim(
-    vcClaim as GenericServerRecord,
-    identity,
-    apiServer,
-    axios,
-  );
-}
-
-export async function createAndSubmitClaim(
-  vcClaim: GenericVerifiableCredential,
-  identity: IIdentifier,
-  apiServer: string,
-  axios: Axios,
-): Promise<CreateAndSubmitClaimResult> {
+): Promise<CreateAndSubmitGiveResult> {
   try {
+    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,
+    };
+
     const vcPayload = {
       vc: {
         "@context": ["https://www.w3.org/2018/credentials/v1"],
@@ -429,11 +226,15 @@ export async function createAndSubmitClaim(
     });
 
     return { type: "success", response };
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  } catch (error: any) {
-    console.log("Error creating claim:", error);
+  } catch (error: unknown) {
     const errorMessage: string =
-      error.response?.data?.error?.message || error.message || "Unknown error";
+      error === null
+        ? "Null error"
+        : error instanceof Error
+          ? error.message
+          : typeof error === "object" && error !== null && "message" in error
+            ? (error as { message: string }).message
+            : "Unknown error";
 
     return {
       type: "error",
@@ -486,10 +287,6 @@ export interface ProjectData {
    * URL referencing information about the project
    **/
   handleId: string;
-  /**
-   * The DID of the issuer
-   */
-  issuerDid: string;
   /**
    * The Identier of the project
    **/

src/libs/util.ts

@@ -1,5 +0,0 @@
-// many of these are also found in endorser-mobile utility.ts
-
-export const isGlobalUri = (uri: string) => {
-  return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/));
-};

src/main.ts

@@ -13,9 +13,7 @@ import { library } from "@fortawesome/fontawesome-svg-core";
 import {
   faArrowLeft,
   faArrowRight,
-  faArrowUpRightFromSquare,
   faBan,
-  faBitcoinSign,
   faBurst,
   faCalendar,
   faChevronLeft,
@@ -29,7 +27,6 @@ import {
   faCoins,
   faComment,
   faCopy,
-  faDollar,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
@@ -37,19 +34,16 @@ import {
   faFloppyDisk,
   faFolderOpen,
   faGift,
-  faGlobe,
   faHand,
   faHouseChimney,
   faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
-  faMessage,
   faPen,
   faPersonCircleCheck,
   faPersonCircleQuestion,
   faPlus,
-  faQuestion,
   faQrcode,
   faRotate,
   faShareNodes,
@@ -66,9 +60,7 @@ import {
 library.add(
   faArrowLeft,
   faArrowRight,
-  faArrowUpRightFromSquare,
   faBan,
-  faBitcoinSign,
   faBurst,
   faCalendar,
   faChevronLeft,
@@ -82,7 +74,6 @@ library.add(
   faCoins,
   faComment,
   faCopy,
-  faDollar,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
@@ -90,20 +81,17 @@ library.add(
   faFloppyDisk,
   faFolderOpen,
   faGift,
-  faGlobe,
   faHand,
   faHouseChimney,
   faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
-  faMessage,
   faPen,
   faPersonCircleCheck,
   faPersonCircleQuestion,
   faPlus,
   faQrcode,
-  faQuestion,
   faRotate,
   faShareNodes,
   faSpinner,

src/router/index.ts

@@ -39,12 +39,7 @@ const routes: Array<RouteRecordRaw> = [
     name: "account",
     component: () =>
       import(/* webpackChunkName: "account" */ "../views/AccountViewView.vue"),
-  },
-  {
-    path: "/claim/:id?",
-    name: "claim",
-    component: () =>
-      import(/* webpackChunkName: "claim" */ "../views/ClaimView.vue"),
+    beforeEnter: enterOrStart,
   },
   {
     path: "/confirm-contact",
@@ -96,14 +91,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",
@@ -161,7 +148,7 @@ const routes: Array<RouteRecordRaw> = [
       ),
   },
   {
-    path: "/project/:id?",
+    path: "/project",
     name: "project",
     component: () =>
       import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
@@ -181,14 +168,6 @@ const routes: Array<RouteRecordRaw> = [
         /* 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",

src/views/AccountViewView.vue

@@ -1,7 +1,5 @@
 <template>
   <QuickNav selected="Profile"></QuickNav>
-  <TopMessage />
-
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
     <!-- Heading -->
@@ -34,24 +32,8 @@
       </span>
     </div>
 
-    <!-- ID notice -->
-    <div
-      v-if="!activeDid"
-      class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3 mb-4"
-    >
-      <p class="mb-4">
-        <b>Note:</b> Before you can take any action, you need an ID.
-      </p>
-      <router-link
-        :to="{ name: 'start' }"
-        class="inline-block text-md uppercase bg-amber-600 text-white px-4 py-2 rounded-md"
-      >
-        Generate Identity
-      </router-link>
-    </div>
-
     <!-- Registration notice -->
-    <!-- We won't show any loading indicator because it usually doesn't change anything. We'll just pop the message in only if we discover that they need it. -->
+    <!-- We won't show any loading indicator; we'll just pop the message in once we know they need it. -->
     <div
       v-if="!loadingLimits && !limits?.nextWeekBeginDateTime"
       class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3 mb-4"
@@ -76,9 +58,9 @@
       <span v-else>
         <router-link
           :to="{ name: 'new-edit-account' }"
-          class="block w-full text-center text-md text-slate-500 uppercase border border-dashed border-slate-400 px-1.5 py-2 rounded-md mb-2"
+          class="text-xs bg-blue-500 text-white px-1.5 py-1 rounded-md"
         >
-          (Set Your Name)
+          (set name)
         </router-link>
       </span>
 
@@ -105,20 +87,54 @@
     </router-link>
 
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
-      <div
-        v-if="!notificationMaybeChanged"
-        class="flex items-center justify-between cursor-pointer"
-        @click="showNotificationChoice()"
+      <label
+        for="toggleNotifications"
+        class="flex items-center cursor-pointer"
+        @click="
+          this.$notify(
+            {
+              group: 'modal',
+              type: 'notification-permission',
+            },
+            -1,
+          )
+        "
       >
         <!-- label -->
         <div>App Notifications</div>
         <!-- toggle -->
+        <div class="relative ml-2">
+          <!-- input -->
+          <input type="checkbox" name="toggleNotifications" class="sr-only" />
+          <!-- line -->
+          <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+          <!-- dot -->
+          <div
+            class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
+          ></div>
+        </div>
+      </label>
+      <label
+        for="toggleMuteNotifications"
+        class="flex items-center cursor-pointer mt-4"
+        @click="
+          this.$notify(
+            {
+              group: 'modal',
+              type: 'notification-mute',
+            },
+            -1,
+          )
+        "
+      >
+        <!-- label -->
+        <div>Mute Notifications</div>
+        <!-- toggle -->
         <div class="relative ml-2">
           <!-- input -->
           <input
             type="checkbox"
-            v-model="isSubscribed"
-            name="toggleNotificationsInput"
+            name="toggleMuteNotifications"
             class="sr-only"
           />
           <!-- line -->
@@ -128,21 +144,14 @@
             class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
           ></div>
         </div>
-      </div>
-      <div v-else>
-        Notification status may have changed. Revisit this page to see the
-        latest setting.
-      </div>
-      <router-link class="px-4 text-sm text-blue-500" to="/help-notifications">
-        Test your notification setup.
-      </router-link>
+      </label>
     </div>
 
     <h3 class="text-sm uppercase font-semibold mb-3">Data</h3>
 
     <router-link
       :to="{ name: 'seed-backup' }"
-      v-if="activeDid"
+      href=""
       class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
     >
       Backup Identifier Seed
@@ -157,42 +166,29 @@
     </a>
     <a ref="downloadLink" />
 
-    <div v-if="activeDid" class="my-8">
-      <h3 class="text-sm uppercase font-semibold mb-3">Rate Limits</h3>
-      <button
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-        @click="checkLimits()"
-      >
+    <div v-if="activeDid" class="flex py-2">
+      <button class="text-center text-md text-blue-500" @click="checkLimits()">
         Check Limits
       </button>
       <!-- show spinner if loading limits -->
-      <div v-if="loadingLimits" class="text-center mb-4">
-        Checking&hellip; <fa icon="spinner" class="fa-spin"></fa>
+      <div v-if="loadingLimits" class="ml-2">
+        Checking... <fa icon="spinner" class="fa-spin"></fa>
       </div>
-      <div class="mb-4">
+      <div class="ml-2">
         {{ limitsMessage }}
       </div>
-      <div v-if="!!limits?.nextWeekBeginDateTime">
-        <p class="mb-3 text-sm">
-          You have done <b>{{ limits.doneClaimsThisWeek }}</b> claims out of
-          <b>{{ limits.maxClaimsPerWeek }}</b> for this week. Your claims
-          counter resets at
-          <b class="whitespace-nowrap">{{
-            readableTime(limits.nextWeekBeginDateTime)
-          }}</b>
+      <div v-if="!!limits?.nextWeekBeginDateTime" class="px-9">
+        <span class="font-bold">Rate Limits</span>
+        <p>
+          You have done {{ limits.doneClaimsThisWeek }} claims out of
+          {{ limits.maxClaimsPerWeek }} for this week. Your claims counter
+          resets at {{ readableTime(limits.nextWeekBeginDateTime) }}
         </p>
-        <p class="text-sm">
-          You have done
-          <b>{{ limits.doneRegistrationsThisMonth }}</b> registrations out of
-          <b>{{ limits.maxRegistrationsPerMonth }}</b> for this month.
-          <i
-            >(You can register nobody on your first day, and after that only one
-            a day in your first month.)</i
-          >
-          Your registration counter resets at
-          <b class="whitespace-nowrap">
-            {{ readableTime(limits.nextMonthBeginDateTime) }}
-          </b>
+        <p>
+          You have done {{ limits.doneRegistrationsThisMonth }} registrations
+          out of {{ limits.maxRegistrationsPerMonth }} for this month. Your
+          registrations counter resets at
+          {{ readableTime(limits.nextMonthBeginDateTime) }}
         </p>
       </div>
     </div>
@@ -205,14 +201,10 @@
     >
       Advanced
     </h3>
-    <div v-if="showAdvanced">
-      <p class="text-rose-600 mb-8">
-        Beware: the features here can be confusing and even change data in ways
-        you do not expect. But we support your freedom!
-      </p>
 
+    <div v-if="showAdvanced">
       <!-- Deep Identity Details -->
-      <h2 class="text-sm uppercase font-semibold mb-3">
+      <h2 class="text-slate-500 text-sm font-bold mb-2 py-2">
         Deep Identity Details
       </h2>
       <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
@@ -270,11 +262,13 @@
 
       <label
         for="toggleShowAmounts"
-        class="flex items-center justify-between cursor-pointer my-4"
+        class="flex items-center cursor-pointer py-2"
         @click="handleChange"
       >
         <!-- label -->
-        <h2>Show amounts given with contacts</h2>
+        <h2 class="text-slate-500 text-sm font-bold mb-2">
+          Show amounts given with contacts
+        </h2>
         <!-- toggle -->
         <div class="relative ml-2">
           <!-- input -->
@@ -293,21 +287,26 @@
         </div>
       </label>
 
-      <router-link
-        :to="{ name: 'statistics' }"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-      >
-        See Animated Global History of Giving
-      </router-link>
+      <div class="flex py-2">
+        <button class="text-blue-500">
+          <!-- id used by puppeteer test script -->
+          <router-link
+            id="switch-identity-link"
+            :to="{ name: 'identity-switcher' }"
+            class="block text-center"
+          >
+            Switch Identity / No Identity
+          </router-link>
+        </button>
+      </div>
 
-      <!-- id used by puppeteer test script -->
-      <router-link
-        id="switch-identity-link"
-        :to="{ name: 'identity-switcher' }"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-      >
-        Switch Identity
-      </router-link>
+      <div class="flex py-2">
+        <button class="text-blue-500">
+          <router-link :to="{ name: 'statistics' }" class="block text-center">
+            See Achievements & Statistics
+          </router-link>
+        </button>
+      </div>
 
       <div class="flex py-4">
         <h2 class="text-slate-500 text-sm font-bold mb-2">Claim Server</h2>
@@ -324,117 +323,35 @@
           <fa icon="floppy-disk" class="fa-fw" color="white"></fa>
         </button>
         <button
-          class="px-3 rounded bg-slate-200 border border-slate-400"
-          @click="apiServerInput = AppConstants.PROD_ENDORSER_API_SERVER"
+          class="px-4 rounded bg-slate-200 border border-slate-400"
+          @click="setApiServerInput(Constants.PROD_ENDORSER_API_SERVER)"
         >
           Use Prod
         </button>
         <button
-          class="px-3 rounded bg-slate-200 border border-slate-400"
-          @click="apiServerInput = AppConstants.TEST_ENDORSER_API_SERVER"
+          class="px-4 rounded bg-slate-200 border border-slate-400"
+          @click="setApiServerInput(Constants.TEST_ENDORSER_API_SERVER)"
         >
           Use Test
         </button>
         <button
-          class="px-3 rounded bg-slate-200 border border-slate-400"
-          @click="apiServerInput = AppConstants.LOCAL_ENDORSER_API_SERVER"
+          class="px-4 rounded bg-slate-200 border border-slate-400"
+          @click="setApiServerInput(Constants.LOCAL_ENDORSER_API_SERVER)"
         >
           Use Local
         </button>
       </div>
-
-      <label
-        for="toggleProdWarningMessage"
-        class="flex items-center justify-between cursor-pointer my-4"
-        @click="toggleProdWarning"
-      >
-        <!-- label -->
-        <h2>Show warning if on prod server</h2>
-        <!-- toggle -->
-        <div class="relative ml-2">
-          <!-- input -->
-          <input type="checkbox" v-model="warnIfProdServer" class="sr-only" />
-          <!-- line -->
-          <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
-          <!-- dot -->
-          <div
-            class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
-          ></div>
-        </div>
-      </label>
-
-      <label
-        for="toggleTestWarningMessage"
-        class="flex items-center justify-between cursor-pointer my-4"
-        @click="toggleTestWarning"
-      >
-        <!-- label -->
-        <h2>Show warning if on non-prod server</h2>
-        <!-- toggle -->
-        <div class="relative ml-2">
-          <!-- input -->
-          <input type="checkbox" v-model="warnIfTestServer" class="sr-only" />
-          <!-- line -->
-          <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
-          <!-- dot -->
-          <div
-            class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
-          ></div>
-        </div>
-      </label>
-
-      <div class="flex py-4">
-        <h2 class="text-slate-500 text-sm font-bold mb-2">
-          Notification Push Server
-        </h2>
-        <input
-          type="text"
-          class="block w-full rounded border border-slate-400 px-3 py-2"
-          v-model="webPushServerInput"
-        />
-        <button
-          v-if="webPushServerInput != webPushServer"
-          class="px-4 rounded bg-red-500 border border-slate-400"
-          @click="onClickSavePushServer()"
-        >
-          <fa icon="floppy-disk" class="fa-fw" color="white"></fa>
-        </button>
-        <button
-          class="px-3 rounded bg-slate-200 border border-slate-400"
-          @click="webPushServerInput = AppConstants.PROD_PUSH_SERVER"
-        >
-          Use Prod
-        </button>
-        <button
-          class="px-3 rounded bg-slate-200 border border-slate-400"
-          @click="webPushServerInput = AppConstants.TEST1_PUSH_SERVER"
-        >
-          Use Test 1
-        </button>
-        <button
-          class="px-3 rounded bg-slate-200 border border-slate-400"
-          @click="webPushServerInput = AppConstants.TEST2_PUSH_SERVER"
-        >
-          Use Test 2
-        </button>
-      </div>
-      <span class="px-4 text-sm" v-if="!webPushServerInput">
-        When that setting is blank, this app will use the default web push
-        server URL:
-        {{ AppConstants.DEFAULT_PUSH_SERVER }}
-      </span>
     </div>
   </section>
 </template>
 
 <script lang="ts">
-import { AxiosError, AxiosRequestConfig } from "axios";
+import { AxiosError } from "axios";
 import "dexie-export-import";
 import { Component, Vue } from "vue-facing-decorator";
 import { useClipboard } from "@vueuse/core";
 
 import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.vue";
 import { AppString } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
@@ -459,11 +376,11 @@ interface IAccount {
   derivationPath: string;
 }
 
-@Component({ components: { QuickNav, TopMessage } })
+@Component({ components: { QuickNav } })
 export default class AccountViewView extends Vue {
   $notify!: (notification: Notification, timeout?: number) => void;
 
-  AppConstants = AppString;
+  Constants = AppString;
 
   activeDid = "";
   apiServer = "";
@@ -471,13 +388,9 @@ export default class AccountViewView extends Vue {
   derivationPath = "";
   givenName = "";
   isRegistered = false;
-  isSubscribed = false;
-  notificationMaybeChanged = false;
   numAccounts = 0;
   publicHex = "";
   publicBase64 = "";
-  webPushServer = "";
-  webPushServerInput = "";
   limits: RateLimits | null = null;
   limitsMessage = "";
   loadingLimits = true; // might as well now that we do it on mount, to avoid flashing the registration message
@@ -490,65 +403,6 @@ export default class AccountViewView extends Vue {
 
   showAdvanced = false;
 
-  subscription: PushSubscription | null = null;
-  warnIfProdServer = false;
-  warnIfTestServer = false;
-
-  /**
-   * Async function executed when the component is created.
-   * Initializes the component's state with values from the database,
-   * handles identity-related tasks, and checks limitations.
-   *
-   * @throws Will display specific messages to the user based on different errors.
-   */
-  async created() {
-    try {
-      await db.open();
-
-      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-
-      // Initialize component state with values from the database or defaults
-      this.initializeState(settings);
-
-      // Get and process the identity
-      const identity = await this.getIdentity(this.activeDid);
-      if (identity) {
-        this.processIdentity(identity);
-      }
-    } catch (err: unknown) {
-      this.handleError(err);
-    }
-  }
-
-  async mounted() {
-    try {
-      const registration = await navigator.serviceWorker.ready;
-      this.subscription = await registration.pushManager.getSubscription();
-      this.isSubscribed = !!this.subscription;
-    } catch (error) {
-      console.error("Mount error:", error);
-    }
-  }
-
-  /**
-   * Initializes component state with values from the database or defaults.
-   * @param {SettingsType} settings - Object containing settings from the database.
-   */
-  initializeState(settings: Settings | undefined) {
-    this.activeDid = (settings?.activeDid as string) || "";
-    this.apiServer = (settings?.apiServer as string) || "";
-    this.apiServerInput = (settings?.apiServer as string) || "";
-    this.givenName =
-      (settings?.firstName || "") +
-      (settings?.lastName ? ` ${settings.lastName}` : ""); // pre v 0.1.3
-    this.isRegistered = !!settings?.isRegistered;
-    this.showContactGives = !!settings?.showContactGivesInline;
-    this.warnIfProdServer = !!settings?.warnIfProdServer;
-    this.warnIfTestServer = !!settings?.warnIfTestServer;
-    this.webPushServer = (settings?.webPushServer as string) || "";
-    this.webPushServerInput = (settings?.webPushServer as string) || "";
-  }
-
   public async getIdentity(activeDid: string): Promise<IIdentifier | null> {
     try {
       // Open the accounts database
@@ -614,16 +468,6 @@ export default class AccountViewView extends Vue {
     this.updateShowContactAmounts();
   }
 
-  toggleProdWarning() {
-    this.warnIfProdServer = !this.warnIfProdServer;
-    this.updateWarnIfProdServer(this.warnIfProdServer);
-  }
-
-  toggleTestWarning() {
-    this.warnIfTestServer = !this.warnIfTestServer;
-    this.updateWarnIfTestServer(this.warnIfTestServer);
-  }
-
   readableTime(timeStr: string) {
     return timeStr.substring(0, timeStr.indexOf("T"));
   }
@@ -633,6 +477,47 @@ export default class AccountViewView extends Vue {
     this.numAccounts = await accountsDB.accounts.count();
   }
 
+  /**
+   * Async function executed when the component is created.
+   * Initializes the component's state with values from the database,
+   * handles identity-related tasks, and checks limitations.
+   *
+   * @throws Will display specific messages to the user based on different errors.
+   */
+  async created() {
+    try {
+      await db.open();
+
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+
+      // Initialize component state with values from the database or defaults
+      this.initializeState(settings);
+
+      // Get and process the identity
+      const identity = await this.getIdentity(this.activeDid);
+      if (identity) {
+        this.processIdentity(identity);
+      }
+    } catch (err: unknown) {
+      this.handleError(err);
+    }
+  }
+
+  /**
+   * Initializes component state with values from the database or defaults.
+   * @param {SettingsType} settings - Object containing settings from the database.
+   */
+  initializeState(settings: Settings | undefined) {
+    this.activeDid = (settings?.activeDid as string) || "";
+    this.apiServer = (settings?.apiServer as string) || "";
+    this.apiServerInput = (settings?.apiServer as string) || "";
+    this.givenName =
+      (settings?.firstName || "") +
+      (settings?.lastName ? ` ${settings.lastName}` : ""); // pre v 0.1.3
+    this.isRegistered = !!settings?.isRegistered;
+    this.showContactGives = !!settings?.showContactGivesInline;
+  }
+
   /**
    * Processes the identity and updates the component's state.
    * @param {IdentityType} identity - Object containing identity information.
@@ -657,31 +542,6 @@ export default class AccountViewView extends Vue {
     }
   }
 
-  async showNotificationChoice() {
-    if (!this.subscription) {
-      this.$notify(
-        {
-          group: "modal",
-          type: "notification-permission",
-          title: "", // unused, only here to satisfy type check
-          text: "", // unused, only here to satisfy type check
-        },
-        -1,
-      );
-    } else {
-      this.$notify(
-        {
-          group: "modal",
-          type: "notification-off",
-          title: "", // unused, only here to satisfy type check
-          text: "", // unused, only here to satisfy type check
-        },
-        -1,
-      );
-    }
-    this.notificationMaybeChanged = true;
-  }
-
   /**
    * Handles errors and updates the component's state accordingly.
    * @param {Error} err - The error object.
@@ -720,58 +580,12 @@ export default class AccountViewView extends Vue {
           group: "alert",
           type: "danger",
           title: "Error Updating Contact Setting",
-          text: "The setting may not have saved. Try again, maybe after restarting the app.",
+          text: "Clear your cache and start over (after data backup).",
         },
         -1,
       );
       console.error(
-        "Telling user to try again after contact setting update because:",
-        err,
-      );
-    }
-  }
-
-  public async updateWarnIfProdServer(newSetting: boolean) {
-    try {
-      await db.open();
-      db.settings.update(MASTER_SETTINGS_KEY, {
-        warnIfProdServer: newSetting,
-      });
-    } catch (err) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Updating Prod Warning",
-          text: "The setting may not have saved. Try again, maybe after restarting the app.",
-        },
-        -1,
-      );
-      console.error(
-        "Telling user to try again after setting update because:",
-        err,
-      );
-    }
-  }
-
-  public async updateWarnIfTestServer(newSetting: boolean) {
-    try {
-      await db.open();
-      db.settings.update(MASTER_SETTINGS_KEY, {
-        warnIfTestServer: newSetting,
-      });
-    } catch (err) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Updating Test Warning",
-          text: "The setting may not have saved. Try again, maybe after restarting the app.",
-        },
-        -1,
-      );
-      console.error(
-        "Telling user to try again after setting update because:",
+        "Telling user to clear cache after contact setting update because:",
         err,
       );
     }
@@ -841,11 +655,11 @@ export default class AccountViewView extends Vue {
     this.$notify(
       {
         group: "alert",
-        type: "success",
+        type: "toast",
         title: "Download Started",
         text: "See your downloads directory for the backup.",
       },
-      -1,
+      5000,
     );
   }
 
@@ -896,7 +710,7 @@ export default class AccountViewView extends Vue {
             });
             this.isRegistered = true;
           } catch (err) {
-            console.error("Got an error updating settings:", err);
+            console.log("Got an error updating settings:", err);
             this.$notify(
               {
                 group: "alert",
@@ -925,7 +739,7 @@ export default class AccountViewView extends Vue {
   private async fetchRateLimits(identity: IIdentifier) {
     const url = `${this.apiServer}/api/report/rateLimits`;
     const headers = await this.getHeaders(identity);
-    return await this.axios.get(url, { headers } as AxiosRequestConfig);
+    return await this.axios.get(url, { headers });
   }
 
   /**
@@ -938,9 +752,10 @@ export default class AccountViewView extends Vue {
       const data = error.response?.data as ErrorResponse;
       this.limitsMessage =
         (data?.error?.message as string) || "Bad server response.";
-      console.error(
+      console.log(
         "Got bad response retrieving limits, which usually means user isn't registered. Server says:",
         this.limitsMessage,
+        //error,
       );
     } else if (
       error instanceof Error &&
@@ -1028,21 +843,8 @@ export default class AccountViewView extends Vue {
     this.apiServer = this.apiServerInput;
   }
 
-  async onClickSavePushServer() {
-    await db.open();
-    db.settings.update(MASTER_SETTINGS_KEY, {
-      webPushServer: this.webPushServerInput,
-    });
-    this.webPushServer = this.webPushServerInput;
-    this.$notify(
-      {
-        group: "alert",
-        type: "warning",
-        title: "Reload",
-        text: "Now reload the app to get a new VAPID to use with this push server.",
-      },
-      -1,
-    );
+  setApiServerInput(value: string) {
+    this.apiServerInput = value;
   }
 }
 </script>

src/views/ClaimView.vue

@@ -1,476 +0,0 @@
-<template>
-  <QuickNav />
-  <!-- CONTENT -->
-  <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">
-        <!-- Back -->
-        <button
-          @click="$router.go(-1)"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </button>
-        Verifiable Claim Details
-      </h1>
-    </div>
-
-    <!-- Details -->
-    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-      <div>
-        <div class="block flex gap-4 overflow-hidden">
-          <div class="overflow-hidden">
-            <h2 class="text-md font-bold">{{ veriClaim.id }}</h2>
-            <div class="text-sm">
-              <div>
-                {{ veriClaim.claimType }}
-              </div>
-              <div>
-                <fa icon="message" class="fa-fw text-slate-400"></fa>
-                {{ veriClaim.claim?.description }}
-              </div>
-              <div>
-                <fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{ veriClaim.issuer }}
-              </div>
-              <div>
-                <fa icon="calendar" class="fa-fw text-slate-400"></fa>
-                {{ veriClaim.issuedAt?.replace(/T/, " ").replace(/Z/, " UTC") }}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div>
-      <h2 class="font-bold uppercase text-xl mt-8 mb-2">Confirmations</h2>
-
-      <span v-if="totalConfirmers() === 0">Nobody has confirmed this.</span>
-      <span v-else-if="totalConfirmers() === 1">
-        One person has confirmed this.
-      </span>
-      <span v-else> {{ totalConfirmers() }} people have confirmed this. </span>
-
-      <div v-if="totalConfirmers() > 0">
-        <div
-          v-if="
-            confirmerIdList.length === 0 && confsVisibleToIdList.length === 0
-          "
-        >
-          Nobody that you know confirmed this claim, nor do they have any
-          confirmers in their network.
-        </div>
-
-        <div
-          v-if="confirmerIdList.length === 0 && confsVisibleToIdList.length > 0"
-        >
-          <!-- Only show if this person has links to confirmers (below). -->
-          Nobody that you know has issued or confirmed this claim.
-        </div>
-        <div v-if="confirmerIdList.length > 0">
-          The following people have issued or confirmed this claim.
-          <ul>
-            <li
-              v-for="confirmerId in confirmerIdList"
-              :key="confirmerId"
-              class="list-disc"
-            >
-              <div class="flex gap-4">
-                <div class="grow overflow-hidden">
-                  <div class="text-sm">
-                    {{ confirmerId }}
-                  </div>
-                </div>
-              </div>
-            </li>
-          </ul>
-        </div>
-
-        <!--
-         Never need to show the following message.
-         If there is nobody in the confirmerIdList then we'll show the combined "nobody" message.
-         If there is somebody in the confirmerIdList then that's all they need to show.
-         -->
-        <!-- Nobody that you know can see someone who has confirmed this claim. -->
-
-        <div v-if="confsVisibleToIdList.length > 0">
-          The following people can connect you with people who have issued or
-          confirmed this claim.
-          <ul>
-            <li
-              v-for="confsVisibleTo in confsVisibleToIdList"
-              :key="confsVisibleTo"
-              class="list-disc"
-            >
-              <div class="flex gap-4">
-                <div class="grow overflow-hidden">
-                  <div class="text-sm">
-                    {{ confsVisibleTo }}
-                  </div>
-                </div>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
-
-      <div class="mt-4">
-        <div v-if="confirmerIdList.includes(activeDid)">
-          You have confirmed this claim.
-        </div>
-        <div v-else-if="containsHiddenDid(veriClaim.claim)">
-          You cannot confirm this claim because it contains data that is hidden
-          from you.
-        </div>
-        <div v-else>
-          <button
-            class="bg-blue-600 text-white mt-4 px-4 py-2 rounded-md mb-4"
-            @click="confirmClaim(veriClaim.id)"
-          >
-            Confirm Claim
-          </button>
-        </div>
-      </div>
-    </div>
-
-    <div>
-      <h2 class="font-bold uppercase text-xl mt-8 mb-2">Claim</h2>
-      <pre class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md">
-        {{ util.inspect(veriClaim, false, null) }}
-      </pre>
-    </div>
-
-    <h2 class="font-bold uppercase text-xl mt-8 mb-2">Full Claim</h2>
-    <p class="mb-4">
-      The full claim includes the claim as it was originally issued, including
-      the signature (ie. the proof of issuance by that person).
-    </p>
-    <div v-if="!fullClaim">
-      <p v-if="fullClaimMessage" class="mb-4">
-        {{ fullClaimMessage }}
-      </p>
-      <button
-        v-else
-        class="block w-full text-center text-md uppercase bg-blue-600 text-white px-1.5 py-2 rounded-md mb-2"
-        @click="showFullClaim(veriClaim.id)"
-      >
-        Load Full Claim Details
-      </button>
-    </div>
-    <div v-else>
-      <pre>{{ util.inspect(fullClaim, false, null) }}</pre>
-    </div>
-
-    <a
-      :href="apiServer + '/api/claim/' + veriClaim.id"
-      target="_blank"
-      class="block w-full text-center text-md uppercase bg-blue-600 text-white px-1.5 py-2 rounded-md mb-2"
-    >
-      View on the Public Server
-    </a>
-  </section>
-</template>
-
-<script lang="ts">
-import { AxiosError, RawAxiosRequestHeaders } from "axios";
-import * as R from "ramda";
-import { IIdentifier } from "@veramo/core";
-import * as util from "util";
-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 { Contact } from "@/db/tables/contacts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { accessToken } from "@/libs/crypto";
-import * as serverUtil 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;
-}
-
-@Component({
-  components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav },
-})
-export default class ClaimView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
-  activeDid = "";
-  allMyDids: Array<string> = [];
-  allContacts: Array<Contact> = [];
-  apiServer = "";
-  confirmerIdList = []; // list of DIDs that have confirmed this claim excluding the issuer
-  confsVisibleErrorMessage = "";
-  confsVisibleToIdList = []; // list of DIDs that can see any confirmer
-  fullClaim = null;
-  fullClaimMessage = "";
-  numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
-  veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
-
-  util = util;
-  containsHiddenDid = serverUtil.containsHiddenDid;
-
-  async created() {
-    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-    this.activeDid = settings?.activeDid || "";
-    this.apiServer = settings?.apiServer || "";
-    this.allContacts = await db.contacts.toArray();
-
-    await accountsDB.open();
-    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 identity = JSON.parse(account?.identity || "null");
-
-    const pathParam = window.location.pathname.substring("/claim/".length);
-    let claimId;
-    if (pathParam) {
-      claimId = decodeURIComponent(pathParam);
-      this.loadClaim(claimId, identity);
-    } else {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "No claim ID was provided.",
-        },
-        -1,
-      );
-    }
-  }
-
-  totalConfirmers() {
-    return (
-      this.numConfsNotVisible +
-      this.confirmerIdList.length +
-      this.confsVisibleToIdList.length
-    );
-  }
-
-  public async getIdentity(activeDid: string): Promise<IIdentifier> {
-    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 project records with no identity available.",
-      );
-    }
-    return identity;
-  }
-
-  public async getHeaders(identity: IIdentifier) {
-    const headers: RawAxiosRequestHeaders = {
-      "Content-Type": "application/json",
-    };
-    if (identity) {
-      const token = await accessToken(identity);
-      headers["Authorization"] = "Bearer " + token;
-    }
-    return headers;
-  }
-
-  // Isn't there a better way to make this available to the template?
-  didInfo(
-    did: string,
-    activeDid: string,
-    dids: Array<string>,
-    contacts: Array<Contact>,
-  ) {
-    return serverUtil.didInfo(did, activeDid, dids, contacts);
-  }
-
-  async loadClaim(claimId: string, identity: IIdentifier) {
-    const url =
-      this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(claimId);
-    const headers = await this.getHeaders(identity);
-
-    try {
-      const resp = await this.axios.get(url, { headers });
-      if (resp.status === 200) {
-        this.veriClaim = resp.data;
-      } else {
-        // actually, axios typically throws an error so we never get here
-        console.log("Error getting claim:", resp);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was a problem getting that claim. See logs for more info.",
-          },
-          -1,
-        );
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      console.error("Error retrieving claim:", serverError);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving that claim. See logs for more info.",
-        },
-        -1,
-      );
-    }
-
-    const confirmUrl =
-      this.apiServer +
-      "/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
-      encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
-    const confirmHeaders = await this.getHeaders(identity);
-    try {
-      const response = await this.axios.get(confirmUrl, {
-        headers: confirmHeaders,
-      });
-      if (response.status === 200) {
-        const resultList1 = response.data.result || [];
-        const resultList2 = R.reject(serverUtil.isHiddenDid, resultList1);
-        const resultList3 = R.reject(
-          (did: string) => did === this.veriClaim.issuer,
-          resultList2,
-        );
-        this.confirmerIdList = resultList3;
-        this.numConfsNotVisible = resultList1.length - resultList2.length;
-        if (resultList3.length === resultList2.length) {
-          // the issuer was not in the "visible" list so they must be hidden
-          // so subtract them from the non-visible confirmers count
-          this.numConfsNotVisible = this.numConfsNotVisible - 1;
-        }
-        this.confsVisibleToIdList =
-          response.data.result.resultVisibleToDids || [];
-      } else {
-        this.confsVisibleErrorMessage =
-          "Had problems retrieving confirmations.";
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      console.error("Error retrieving confirmations:", serverError);
-      this.confsVisibleErrorMessage =
-        "Had problems retrieving confirmations. See logs for more info.";
-    }
-  }
-
-  async showFullClaim(claimId: string) {
-    await accountsDB.open();
-    const accounts = accountsDB.accounts;
-    const accountsArr = await accounts?.toArray();
-    const account = accountsArr.find((acc) => acc.did === this.activeDid);
-    const identity = JSON.parse(account?.identity || "null");
-
-    const url =
-      this.apiServer + "/api/claim/full/" + encodeURIComponent(claimId);
-    const headers = await this.getHeaders(identity);
-
-    try {
-      const resp = await this.axios.get(url, { headers });
-      if (resp.status === 200) {
-        this.fullClaim = resp.data;
-      } else {
-        // actually, axios typically throws an error so we never get here
-        console.log("Error getting full claim:", resp);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was a problem getting that claim. See logs for more info.",
-          },
-          -1,
-        );
-      }
-    } catch (error: unknown) {
-      console.error("Error retrieving full claim:", error);
-      const serverError = error as AxiosError;
-      if (serverError.response?.status === 403) {
-        this.fullClaimMessage =
-          "You are not authorized to view the full contents of this claim." +
-          " To see all the details, ask the issuer to allow you to see their claims." +
-          " If you cannot see the issuer's DID, ask someone in the Confirmations section above." +
-          " If there are no connections, you will have to ask people in your" +
-          " network for their help, some other way; send them to this page and" +
-          " see if they can make a connection for you.";
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Something went wrong retrieving that claim. See logs for more info.",
-          },
-          -1,
-        );
-      }
-    }
-  }
-
-  async confirmClaim() {
-    if (confirm("Do you personally confirm that this is true?")) {
-      // similar logic is found in endorser-mobile
-      const goodClaim = serverUtil.removeSchemaContext(
-        serverUtil.removeVisibleToDids(
-          serverUtil.addLastClaimOrHandleAsIdIfMissing(
-            this.veriClaim.claim,
-            this.veriClaim.id,
-            this.veriClaim.handleId,
-          ),
-        ),
-      );
-      const confirmationClaim: serverUtil.GenericVerifiableCredential & {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        object: any;
-      } = {
-        "@context": "https://schema.org",
-        "@type": "AgreeAction",
-        object: goodClaim,
-      };
-      const result = await serverUtil.createAndSubmitClaim(
-        confirmationClaim,
-        await this.getIdentity(this.activeDid),
-        this.apiServer,
-        this.axios,
-      );
-      if (result.type === "success") {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "Confirmation submitted.",
-          },
-          5000,
-        );
-      } else {
-        console.log("Got error submitting the confirmation:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was a problem submitting the confirmation. See logs for more info.",
-          },
-          -1,
-        );
-      }
-    }
-  }
-}
-</script>

src/views/ContactAmountsView.vue

@@ -2,11 +2,8 @@
   <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"
-      >
+    <div id="ViewBreadcrumb" class="mb-8">
+      <h1 class="text-lg text-center font-light relative px-7">
         <!-- Back -->
         <router-link
           :to="{ name: 'contacts' }"
@@ -14,24 +11,16 @@
           ><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>
       <span />
     </div>
-    <div class="flex justify-around">
-      <span />
-      <span class="justify-around">
-        (This does not include claims by them if they're not visible to you.)
-      </span>
-      <span />
-    </div>
 
     <!-- Results List -->
     <table
@@ -131,7 +120,7 @@ interface Notification {
 }
 
 @Component({ components: { QuickNav } })
-export default class ContactAmountssView extends Vue {
+export default class ContactsView extends Vue {
   $notify!: (notification: Notification, timeout?: number) => void;
 
   activeDid = "";
@@ -185,7 +174,6 @@ export default class ContactAmountssView extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.log("Error retrieving settings or gives.", err);
       this.$notify(
         {
           group: "alert",
@@ -193,7 +181,7 @@ export default class ContactAmountssView extends Vue {
           title: "Error",
           text:
             err.userMessage ||
-            "There was an error retrieving your settings and/or contacts and/or gives.",
+            "There was an error retrieving the latest sweet, sweet action.",
         },
         -1,
       );
@@ -370,10 +358,7 @@ export default class ContactAmountssView 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

@@ -66,11 +66,7 @@
       </li>
     </ul>
 
-    <GiftedDialog
-      ref="customDialog"
-      message="Received from"
-      showGivenToUser="true"
-    />
+    <GiftedDialog ref="customDialog" message="Received from"> </GiftedDialog>
   </section>
 </template>
 
@@ -145,7 +141,6 @@ export default class ContactGiftingView extends Vue {
       this.allContacts = await db.contacts.toArray();
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.log("Error retrieving settings & contacts:", err);
       this.$notify(
         {
           group: "alert",
@@ -153,7 +148,7 @@ export default class ContactGiftingView extends Vue {
           title: "Error",
           text:
             err.message ||
-            "There was an error retrieving your settings and/or contacts.",
+            "There was an error retrieving the latest sweet, sweet action.",
         },
         -1,
       );

src/views/ContactQRScanShowView.vue

@@ -2,55 +2,21 @@
   <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">
+      Your Contact Info
+    </h1>
 
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
-        Your Contact Info
-      </h1>
-      <p v-if="!givenName" class="text-center mt-2">
-        <span class="text-red">Beware!</span>
-        You aren't sharing your name, so hurry and
-        <router-link
-          :to="{ name: 'new-edit-account' }"
-          class="bg-blue-500 text-white px-1.5 py-1 rounded-md"
-        >
-          go here to set it for them.
-        </router-link>
-      </p>
-    </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>
+    <!--
+      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"
+    />
 
     <h1 class="text-4xl text-center font-light pt-4">Scan Contact Info</h1>
     <qrcode-stream @detect="onScanDetect" @error="onScanError" />
@@ -61,7 +27,6 @@
 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 { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
@@ -97,7 +62,6 @@ export default class ContactQRScanShow extends Vue {
 
   activeDid = "";
   apiServer = "";
-  givenName = "";
   qrValue = "";
 
   public async getIdentity(activeDid: string) {
@@ -111,7 +75,7 @@ export default class ContactQRScanShow extends Vue {
 
     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;
@@ -122,12 +86,21 @@ export default class ContactQRScanShow extends Vue {
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
-    this.givenName = settings?.firstName || "";
 
     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");
@@ -164,7 +137,7 @@ export default class ContactQRScanShow extends Vue {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   onScanDetect(content: any) {
     if (content[0]?.rawValue) {
-      //console.log("onDetect", content[0].rawValue);
+      console.log("onDetect", content[0].rawValue);
       localStorage.setItem("contactEndorserUrl", content[0].rawValue);
       this.$router.push({ name: "contacts" });
     } else {
@@ -193,22 +166,5 @@ export default class ContactQRScanShow extends Vue {
       -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

@@ -19,16 +19,15 @@
     </div>
 
     <!-- New Contact -->
-    <div class="mb-4 flex items-stretch">
-      <router-link
-        :to="{ name: 'contact-qr' }"
-        class="flex items-center bg-slate-500 text-white px-1.5 py-1 mr-1 rounded-md"
-      >
-        <fa icon="qrcode" class="fa-fw text-2xl" />
-      </router-link>
+    <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"
       />
@@ -111,54 +110,52 @@
           </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
+            <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
+              @click="register(contact)"
+              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+            >
+              <fa
+                v-if="contact.registered"
+                icon="person-circle-check"
+                class="fa-fw"
+                title="Registered"
+              />
+              <fa
                 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>
+                icon="person-circle-question"
+                class="fa-fw"
+                title="Registration Unknown"
+              />
+            </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" />
@@ -171,7 +168,7 @@
               <button
                 class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded-l-md"
                 @click="onClickAddGive(activeDid, contact.did)"
-                :title="givenByMeDescriptions[contact.did] || ''"
+                title="givenByMeDescriptions[contact.did]"
               >
                 To:
                 {{
@@ -190,7 +187,7 @@
               <button
                 class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded-r-md -ml-1.5 border-l border-blue-400"
                 @click="onClickAddGive(contact.did, activeDid)"
-                :title="givenToMeDescriptions[contact.did] || ''"
+                title="givenToMeDescriptions[contact.did]"
               >
                 From:
                 {{
@@ -221,7 +218,7 @@
         </div>
       </li>
     </ul>
-    <p v-else>There are no contacts.</p>
+    <p v-else>This identity has no contacts.</p>
 
     <div v-if="contactEdit !== null" class="dialog-overlay">
       <div class="dialog">
@@ -266,7 +263,6 @@ import {
   SimpleSigner,
 } from "@/libs/crypto";
 import {
-  CONTACT_URL_PREFIX,
   GiveServerRecord,
   GiveVerifiableCredential,
   RegisterVerifiableCredential,
@@ -307,7 +303,6 @@ export default class ContactsView extends Vue {
   givenToMeUnconfirmed: Record<string, number> = {};
   hourDescriptionInput = "";
   hourInput = "0";
-  isRegistered = false;
   showGiveNumbers = false;
   showGiveTotals = true;
   showGiveConfirmed = true;
@@ -317,7 +312,6 @@ export default class ContactsView extends Vue {
     const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
-    this.isRegistered = !!settings?.isRegistered;
 
     this.showGiveNumbers = !!settings?.showContactGivesInline;
     if (this.showGiveNumbers) {
@@ -336,7 +330,7 @@ export default class ContactsView extends Vue {
     }
   }
 
-  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+  public async getIdentity(activeDid: string) {
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === activeDid, accounts) as Account;
@@ -367,10 +361,6 @@ export default class ContactsView extends Vue {
   }
 
   async loadGives() {
-    if (!this.activeDid) {
-      return;
-    }
-
     const handleResponse = (
       resp: { status: number; data: { data: GiveServerRecord[] } },
       descriptions: Record<string, string>,
@@ -405,11 +395,11 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "danger",
-            title: "Retrieval Error",
+            title: "Server Error",
             text:
               "Got an error retrieving your " +
               (useRecipient ? "given" : "received") +
-              " data from the server.",
+              " time from the server.",
           },
           -1,
         );
@@ -460,13 +450,12 @@ export default class ContactsView extends Vue {
       this.givenToMeConfirmed = givenToMeConfirmed;
       this.givenToMeUnconfirmed = givenToMeUnconfirmed;
     } catch (error) {
-      console.log("Error loading gives", error);
       this.$notify(
         {
           group: "alert",
           type: "danger",
-          title: "Load Error",
-          text: "Got an error loading your gives.",
+          title: "Server Error",
+          text: error as string,
         },
         -1,
       );
@@ -486,12 +475,6 @@ export default class ContactsView extends Vue {
       );
       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(",");
@@ -510,7 +493,7 @@ export default class ContactsView extends Vue {
       publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
     }
     const newContact = { did, name, publicKeyBase64 };
-    await this.addContact(newContact);
+    return this.addContact(newContact);
   }
 
   async newContactFromScan(url: string): Promise<void> {
@@ -548,7 +531,6 @@ export default class ContactsView extends Vue {
       );
       return;
     }
-    newContact.seesMe = true; // since we will immediately set that on the server
     return db.contacts
       .add(newContact)
       .then(() => {
@@ -557,39 +539,15 @@ export default class ContactsView extends Vue {
           (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,
+            title: "Contact added",
+            text: newContact.name + " was added.",
           },
-          5000,
+          -1,
         );
-        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);
@@ -598,7 +556,7 @@ export default class ContactsView extends Vue {
             group: "alert",
             type: "danger",
             title: "Contact Not Added",
-            text: "An error prevented this import.",
+            text: "An error prevented importing.",
           },
           -1,
         );
@@ -608,13 +566,11 @@ export default class ContactsView extends Vue {
   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();
@@ -710,7 +666,6 @@ export default class ContactsView extends Vue {
             );
           }
         } catch (error) {
-          console.error("Error when registering:", error);
           let userMessage = "There was an error. See logs for more info.";
           const serverError = error as AxiosError;
           if (serverError) {
@@ -727,7 +682,7 @@ export default class ContactsView extends Vue {
             {
               group: "alert",
               type: "danger",
-              title: "Registration Error",
+              title: "Server Error",
               text: userMessage,
             },
             -1,
@@ -737,11 +692,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/" +
@@ -753,48 +704,32 @@ export default class ContactsView extends Vue {
     try {
       const resp = await this.axios.post(url, payload, { headers });
       if (resp.status === 200) {
-        if (showSuccessAlert) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "success",
-              title: "Visibility Set",
-              text:
-                this.nameForDid(this.contacts, contact.did) +
-                " can " +
-                (visibility ? "" : "not ") +
-                "see your activity.",
-            },
-            -1,
-          );
-        }
         contact.seesMe = visibility;
         db.contacts.update(contact.did, { seesMe: visibility });
       } else {
         console.error(
           "Got some bad server response when setting visibility: ",
-          resp.status,
           resp,
         );
         const message =
-          resp.data.error?.message || "Got some error setting visibility.";
+          resp.data.error?.message || "Bad server response of " + resp.status;
         this.$notify(
           {
             group: "alert",
             type: "danger",
-            title: "Error Setting Visibility",
+            title: "Server Error",
             text: message,
           },
           -1,
         );
       }
     } catch (err) {
-      console.error("Got some error when setting visibility:", err);
+      console.error("Got some server error when setting visibility:", err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
-          title: "Error Setting Visibility",
+          title: "Server Error",
           text: "Check connectivity and try again.",
         },
         -1,
@@ -821,7 +756,7 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "info",
-            title: "Visibility Refreshed",
+            title: "Refreshed",
             text:
               this.nameForContact(contact, true) +
               " can " +
@@ -837,19 +772,19 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "danger",
-            title: "Error Checking Visibility",
+            title: "Server Error",
             text: message,
           },
           -1,
         );
       }
     } catch (err) {
-      console.log("Caught error from request to check visibility:", err);
+      console.log("Caught error from server request to check visibility:", err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
-          title: "Error Checking Visibility",
+          title: "Server Error",
           text: "Check connectivity and try again.",
         },
         -1,
@@ -908,13 +843,13 @@ export default class ContactsView extends Vue {
         },
         -1,
       );
-    } else if (parseFloat(this.hourInput) == 0 && !this.hourDescriptionInput) {
+    } else if (!parseFloat(this.hourInput)) {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Input Error",
-          text: "Giving no hours or descrption does nothing.",
+          text: "Giving 0 hours does nothing.",
         },
         -1,
       );
@@ -965,7 +900,6 @@ export default class ContactsView extends Vue {
     }
   }
 
-  // similar function is in endorserServer.ts
   private async createAndSubmitGive(
     identity: IIdentifier,
     fromDid: string,
@@ -1035,7 +969,6 @@ export default class ContactsView extends Vue {
           }
         }
       } catch (error) {
-        console.log("Error in createAndSubmitGive: ", error);
         let userMessage = "There was an error. See logs for more info.";
         const serverError = error as AxiosError;
         if (serverError) {
@@ -1052,7 +985,7 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "danger",
-            title: "Error Sending Give",
+            title: "Server Error",
             text: userMessage,
           },
           -1,
@@ -1117,10 +1050,7 @@ export default class ContactsView extends Vue {
   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;

src/views/DiscoverView.vue

@@ -1,6 +1,5 @@
 <template>
   <QuickNav selected="Discover"></QuickNav>
-  <TopMessage />
 
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
@@ -10,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="searchAll()">
       <input
         type="text"
         v-model="searchTerms"
@@ -18,7 +17,7 @@
         class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
       />
       <button
-        @click="searchSelected()"
+        @click="searchAll()"
         class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
       >
         <fa icon="magnifying-glass" class="fa-fw"></fa>
@@ -42,10 +41,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>
@@ -62,24 +59,54 @@
             Anywhere
             <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>
+      <div v-if="!isChoosingSearchBox">
         <button
           class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-          @click="$router.push({ name: 'search-area' })"
+          @click="isChoosingSearchBox = true"
         >
           Select a {{ searchBox ? "Different" : "" }} Location for Nearby Search
         </button>
       </div>
+      <div v-else>
+        <button v-if="!searchBox && !isNewMarkerSet" class="m-4 px-4 py-2">
+          Choose Location Below 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="isNewMarkerSet"
+          class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
+          @click="resetLatLong"
+        >
+          Reset Marker
+        </button>
+        <button
+          class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
+          @click="cancelSearchBoxSelect"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
 
     <!-- Loading Animation -->
@@ -91,7 +118,7 @@
     </div>
 
     <!-- Results List -->
-    <InfiniteScroll @reached-bottom="loadMoreData">
+    <InfiniteScroll @reached-bottom="loadMoreData" v-if="!isChoosingSearchBox">
       <ul>
         <li
           class="border-b border-slate-300"
@@ -123,11 +150,50 @@
         </li>
       </ul>
     </InfiniteScroll>
+
+    <div
+      v-if="isLocalActive && isChoosingSearchBox"
+      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 { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
@@ -137,7 +203,10 @@ import { didInfo, ProjectData } from "@/libs/endorserServer";
 import QuickNav from "@/components/QuickNav.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
-import TopMessage from "@/components/TopMessage.vue";
+
+const DEFAULT_LAT_LONG_DIFF = 0.01;
+const WORLD_ZOOM = 2;
+const DEFAULT_ZOOM = 2;
 
 interface Notification {
   group: string;
@@ -148,10 +217,13 @@ interface Notification {
 
 @Component({
   components: {
+    LRectangle,
     QuickNav,
     InfiniteScroll,
     EntityIcon,
-    TopMessage,
+    LMap,
+    LMarker,
+    LTileLayer,
   },
 })
 export default class DiscoverView extends Vue {
@@ -163,12 +235,19 @@ export default class DiscoverView extends Vue {
   apiServer = "";
   searchTerms = "";
   projects: ProjectData[] = [];
-  isLoading = false;
+  isChoosingSearchBox = false;
   isLocalActive = true;
   isRemoteActive = false;
-  localCount = -1;
-  remoteCount = -1;
+  isNewMarkerSet = false;
+  localCenterLat = 0;
+  localCenterLong = 0;
+  localLatDiff = DEFAULT_LAT_LONG_DIFF;
+  localLongDiff = DEFAULT_LAT_LONG_DIFF;
+  localCount = 0;
+  localZoom = DEFAULT_ZOOM;
+  remoteCount = 0;
   searchBox: { name: string; bbox: BoundingBox } | null = null;
+  isLoading = false;
 
   // make this function available to the Vue template
   didInfo = didInfo;
@@ -179,6 +258,7 @@ export default class DiscoverView extends Vue {
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.searchBox = settings?.searchBoxes?.[0] || null;
+    this.resetLatLong();
 
     this.allContacts = await db.contacts.toArray();
 
@@ -186,26 +266,7 @@ export default class DiscoverView extends Vue {
     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();
-    }
-  }
-
-  public resetCounts() {
-    this.localCount = -1;
-    this.remoteCount = -1;
-  }
-
-  public async searchSelected() {
-    if (this.isLocalActive) {
-      await this.searchLocal();
-    } else {
-      await this.searchAll();
-    }
+    this.searchLocal();
   }
 
   public async buildHeaders(): Promise<HeadersInit> {
@@ -233,13 +294,6 @@ export default class DiscoverView extends Vue {
   }
 
   public async searchAll(beforeId?: string) {
-    this.resetCounts();
-
-    if (!beforeId) {
-      // this was an initial search so clear any previous results
-      this.projects = [];
-    }
-
     let queryParams = "claimContents=" + encodeURIComponent(this.searchTerms);
 
     if (beforeId) {
@@ -277,8 +331,8 @@ export default class DiscoverView extends Vue {
       const plans: ProjectData[] = results.data;
       if (plans) {
         for (const plan of plans) {
-          const { name, description, handleId, issuerDid, rowid } = plan;
-          this.projects.push({ name, description, handleId, issuerDid, rowid });
+          const { name, description, handleId, rowid } = plan;
+          this.projects.push({ name, description, handleId, rowid });
         }
         this.remoteCount = this.projects.length;
       } else {
@@ -302,21 +356,13 @@ 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,
@@ -360,14 +406,10 @@ export default class DiscoverView extends Vue {
         if (beforeId) {
           const plans: ProjectData[] = results.data;
           for (const plan of plans) {
-            const { name, description, handleId, issuerDid, rowid } = plan;
-            this.projects.push({
-              name,
-              description,
-              handleId,
-              issuerDid,
-              rowid,
-            });
+            const { name, description, handleId = plan.handleId, rowid } = plan;
+            if (beforeId !== plan["rowid"]) {
+              this.projects.push({ name, description, handleId, rowid });
+            }
           }
         } else {
           this.projects = results.data;
@@ -415,11 +457,133 @@ 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);
   }
 
+  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.searchLocal();
+      } 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;
+      this.searchLocal();
+    } 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;
+  }
+
   public computedLocalTabClassNames() {
     return {
       "inline-block": true,

src/views/HelpNotificationsView.vue

@@ -1,401 +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 ways to test notifications and get them working.</p>
-
-      <h2 class="text-xl font-semibold">Full Test</h2>
-      <div>
-        <p>
-          If this works then you're all set.
-          <button
-            @click="sendTestWebPushMessage(true)"
-            class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-          >
-            Send Yourself a Test Web Push Message (Through Push Server but
-            Skipping Client Filter)
-          </button>
-        </p>
-      </div>
-
-      <h2 class="text-xl font-semibold">If this app is not installed...</h2>
-      <div>
-        <p>
-          For best results on mobile, install this app on your device (as
-          opposed to using it inside the broser app). In Chrome, it may prompt
-          you, and you can also look for the "Install" command in the browser
-          settings; on the the deskop, look for this icon in the address bar:
-          <img
-            src="../assets/help/chrome-install-pwa.png"
-            alt="Chrome 'install' icon"
-            class="ml-4"
-          />
-        </p>
-      </div>
-
-      <h2 class="text-xl font-semibold">
-        If "you must enable notifications"...
-      </h2>
-      <div>
-        <p>
-          Wait for about 10 seconds (for the service worker to activate), then
-          <button class="text-blue-500" @click="showNotificationChoice()">
-            click here.
-          </button>
-        </p>
-      </div>
-
-      <h2 class="text-xl font-semibold">Check App Permissions</h2>
-      <div>
-        <p>
-          In Apple iOS, check "Settings" -> "Notifications", look for the Time
-          Safari app (or the browser you're using), and make sure notifications
-          are enabled.
-        </p>
-        <p>
-          In Android, hold on to the app icon, then select "App Info", then
-          "Notifications" and make sure they're enabled. If it's still a problem
-          then go further:
-        </p>
-        <p>
-          If you installed the app with Chrome, make sure there are no other
-          tabs with it open. Here are some ways to clear caches that can mess
-          things up (and note that this clears out data from the installed app
-          -- which is good to do while the app is installed):
-        </p>
-        <ul>
-          <li class="list-disc ml-4">
-            Go to Chrome "App Info", then "Storage & Cache" and "Clear Storage".
-          </li>
-          <li class="list-disc ml-4">
-            Go to Chrome "Settings", then "Privacy and Security" and "Clear
-            "Clear browsing data", then "Cookies and site data". Also make sure
-            the "Time Range" at the top shows "All time".
-          </li>
-        </ul>
-        <p>
-          On a Mac, go to "Settings" and check "Notifications".
-          <img
-            src="../assets/help/mac-installed-app-settings.png"
-            alt="Mac app settings"
-            class="ml-4"
-          />
-        </p>
-      </div>
-
-      <h2 class="text-xl font-semibold">Check Browser Permissions</h2>
-      <div>
-        <p>In Apple iOS, check Settings -> Notifications.</p>
-        <p>In Android, check Settings -> Notifications.</p>
-
-        You can find more details about compatibility
-        <a
-          href="https://developer.mozilla.org/en-US/docs/Web/API/Push_API#browser_compatibility"
-          class="text-blue-500"
-          target="_blank"
-        >
-          here <fa icon="arrow-up-right-from-square" class="fa-fw" />
-        </a>
-      </div>
-
-      <h2 class="text-xl font-semibold">Check OS Permissions</h2>
-      <div class="px-2">
-        <div>
-          <h3 class="text-lg font-semibold">Mobile Phone - Apple iOS</h3>
-          <div>
-            Notifications require iOS 16.4 or higher. To check your iOS version,
-            go to Settings > General > About > Software Version.
-          </div>
-
-          <h3 class="text-lg font-semibold">Mobile Phone - Google Android</h3>
-          <div>
-            We recommend Chrome. It must be version 42 or higher. Check your
-            version under Settings -> About Chrome.
-          </div>
-
-          <h3 class="text-lg font-semibold">Desktop - Mac</h3>
-          <div>
-            <span>
-              Requires Mac OS 13; see your macOS version under Apple -> About
-              This Mac.
-            </span>
-          </div>
-
-          <h3 class="text-lg font-semibold">Windows desktop</h3>
-          In Windows, check Settings -> Notifications.
-          <img
-            src="../assets/help/windows-system-enable-notifications.png"
-            alt="Windows system settings"
-            class="ml-4"
-          />
-        </div>
-        <div>
-          You can find more details about compatibility
-          <a
-            href="https://developer.mozilla.org/en-US/docs/Web/API/Push_API#browser_compatibility"
-            class="text-blue-500"
-            target="_blank"
-          >
-            here <fa icon="arrow-up-right-from-square" class="fa-fw" />
-          </a>
-        </div>
-      </div>
-
-      <h2 class="text-xl font-semibold">Reinstall</h2>
-      <div>
-        <p>
-          If all else fails, uninstall the app, ensure all the browser tabs with
-          it are closed, and clear out caches and storage.
-        </p>
-        <ul class="ml-4 list-disc">
-          <li>
-            Clear cache for site. (In Chrome, go to `chrome://settings/cookies`
-            and "all site data and permissions"; in Firefox, go to
-            `about:preferences` and search for "cache" then "Manage Data", and
-            also manually remove the IndexedDB data if the DBs still show.)
-          </li>
-          <li>
-            Clear notification permission. (in Chrome, go to
-            `chrome://settings/content/notifications`; in Firefox, go to
-            `about:preferences` and search for "notifications".)
-          </li>
-          <li>
-            Unregister service worker. (in Chrome, go to
-            `chrome://serviceworker-internals/`; in Firefox, go to
-            `about:serviceworkers`.)
-          </li>
-          <li>
-            Clear Cache Storage. (in Chrome, in dev tools under Application; in
-            Firefox, in dev tools under Storage.)
-          </li>
-        </ul>
-        <p>Then reinstall the app.</p>
-      </div>
-
-      <button
-        @click="showTestNotification()"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-      >
-        Send Test Notification Directly to Device (Not Through Push Server)
-      </button>
-
-      <button
-        @click="alertWebPushSubscription()"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-      >
-        Show Web Push Subscription Info
-      </button>
-
-      <button
-        @click="sendTestWebPushMessage(true)"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-      >
-        Send Yourself a Test Web Push Message (Through Push Server but Skipping
-        Client Filter)
-      </button>
-
-      <button
-        @click="sendTestWebPushMessage()"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-      >
-        Send Yourself a Test Web Push Message (Through Push Server and Client
-        Filter)
-      </button>
-    </div>
-  </section>
-</template>
-<script lang="ts">
-import axios from "axios";
-import { Component, Vue } from "vue-facing-decorator";
-
-import QuickNav from "@/components/QuickNav.vue";
-import { db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { DEFAULT_PUSH_SERVER } from "@/constants/app";
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Buffer = require("buffer/").Buffer;
-
-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;
-
-  subscription: PushSubscription | null = null;
-
-  async mounted() {
-    try {
-      const registration = await navigator.serviceWorker.ready;
-      this.subscription = await registration.pushManager.getSubscription();
-    } catch (error) {
-      console.error("Mount error:", error);
-    }
-  }
-
-  alertWebPushSubscription() {
-    console.log(
-      "Web push subscription:",
-      JSON.parse(JSON.stringify(this.subscription)), // gives more info than plain console logging
-    );
-    alert(JSON.stringify(this.subscription));
-  }
-
-  async sendTestWebPushMessage(skipFilter: boolean = false) {
-    if (!this.subscription) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Not Subscribed",
-          text: "You must enable notifications before testing the web push.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    try {
-      await db.open();
-      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      let pushUrl: string = DEFAULT_PUSH_SERVER as string;
-      if (settings?.webPushServer) {
-        pushUrl = settings.webPushServer;
-      }
-
-      // This is a special value that tells the service worker to send a direct notification to the device, skipping filters.
-      // This is shared with the service worker and should be a constant. Look for the same name in additional-scripts.js
-      // Use something other than "Daily Update" https://gitea.anomalistdesign.com/trent_larson/py-push-server/src/commit/3c0e196c11bc98060ec5934e99e7dbd591b5da4d/app.py#L213
-      const DIRECT_PUSH_TITLE = "DIRECT_NOTIFICATION";
-
-      const auth = Buffer.from(this.subscription.getKey("auth"));
-      const authB64 = auth
-        .toString("base64")
-        .replace(/\+/g, "-")
-        .replace(/\//g, "_")
-        .replace(/=+$/, "");
-      const p256dh = Buffer.from(this.subscription.getKey("p256dh"));
-      const p256dhB64 = p256dh
-        .toString("base64")
-        .replace(/\+/g, "-")
-        .replace(/\//g, "_")
-        .replace(/=+$/, "");
-      const newPayload = {
-        endpoint: this.subscription.endpoint,
-        keys: {
-          auth: authB64,
-          p256dh: p256dhB64,
-        },
-        message: `Test, where you will see this message ${
-          skipFilter ? "un" : ""
-        }filtered.`,
-        title: skipFilter ? DIRECT_PUSH_TITLE : "Your Web Push",
-      };
-      console.log("Sending a test web push message:", newPayload);
-      const payloadStr = JSON.stringify(newPayload);
-      const response = await axios.post(
-        pushUrl + "/web-push/send-test",
-        payloadStr,
-        {
-          headers: {
-            "Content-Type": "application/json",
-          },
-        },
-      );
-
-      console.log("Got response from web push server:", response);
-
-      this.$notify(
-        {
-          group: "alert",
-          type: "success",
-          title: "Test Web Push Sent",
-          text: "Check your device for the test web push message, depending on the filtering you chose.",
-        },
-        -1,
-      );
-    } catch (error) {
-      console.error("Got an error sending test notification:", error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Sending Test",
-          text: "Got an error sending the test web push notification.",
-        },
-        -1,
-      );
-    }
-  }
-
-  showTestNotification() {
-    const TEST_NOTIFICATION_TITLE = "It Worked";
-    navigator.serviceWorker.ready
-      .then((registration) => {
-        return registration.showNotification(TEST_NOTIFICATION_TITLE, {
-          body: "This is your test notification.",
-        });
-      })
-      .then(() => {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Sent",
-            text: `A notification was triggered, so one should show on your device entitled '${TEST_NOTIFICATION_TITLE}'.`,
-          },
-          5000,
-        );
-      })
-      .catch((error) => {
-        console.error("Got a notification error:", error);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Failed",
-            text: "Got an error sending a notification.",
-          },
-          -1,
-        );
-      });
-  }
-
-  showNotificationChoice() {
-    this.$notify(
-      {
-        group: "modal",
-        type: "notification-permission",
-        title: "", // unused, only here to satisfy type check
-        text: "", // unused, only here to satisfy type check
-      },
-      -1,
-    );
-  }
-}
-</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,18 +15,17 @@
 
       <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.
-        First of all, you can see what people have given, and also recognize
-        gifts you've seen, in a way 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 to broader work: volunteers get
-        confirmation of activity, and selectively show off their contributions
-        and network.
+        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
+        to broader work: volunteers can get confirmation of activity and
+        selectively show off their contributions and network.
       </p>
       <p>
-        You can show giving and also offer help to ideas, based on others'
-        willingness to help out, too. You can record your own ideas and invite
-        others to collaborate.
+        You can also record projects and plans and invite others to collaborate.
+        Soon you'll be able to see when others are interested and see how much
+        they're willing to contribute, even if there are conditions.
       </p>
       <p>
         This app uses the power of cryptography to build a reputation, recording
@@ -51,39 +36,22 @@
         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
-        register others; later, you can create projects, too.
+        <fa icon="circle-user" 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 gifting economies. Each claim is recorded
+        on a custom ledger. The day after being registered, you'll be able to
+        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.
-      </p>
-
       <h2 class="text-xl font-semibold">How do I backup all my data?</h2>
       <p>
         There are two sets of data to backup: the identifier secrets and the
@@ -145,20 +113,27 @@
           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
+        so beware if you think that may cause confusion. You can
         <router-link to="start" class="text-blue-500">
           create another identity here.
         </router-link>
@@ -176,34 +151,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">
-        Where do I get help with notifications?
-      </h2>
-      <p>
-        <router-link class="text-blue-500" to="/help-notifications"
-          >Here.</router-link
-        >
-      </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>
@@ -214,24 +165,17 @@
         </a>
       </p>
 
-      <h2 class="text-xl font-semibold">Where can I read more?</h2>
+      <h2 class="text-xl font-semibold">What app version is this?</h2>
       <p>
-        This is part of the
-        <a href="https://livesofgiving.org" class="text-blue-500">
-          Lives of Giving
-        </a>
-        initiative.
+        {{ package.version }}
       </p>
 
-      <h2 class="text-xl font-semibold">What app version is this?</h2>
-      <p>{{ package.version }} ({{ commitHash }})</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>
@@ -242,31 +186,8 @@ 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;
-}
-
 @Component({ components: { QuickNav } })
 export default class Help extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
   package = Package;
-  commitHash = process.env.VUE_APP_GIT_HASH;
-
-  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

@@ -1,7 +1,5 @@
 <template>
   <QuickNav selected="Home"></QuickNav>
-  <TopMessage />
-
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
@@ -10,31 +8,16 @@
 
     <!-- show the actions for recognizing a give -->
     <div class="mb-8">
-      <div
-        v-if="!isInstalled()"
-        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
-      >
-        <p>
-          You should install this as an app.
-          <router-link
-            :to="{ name: 'help-notifications' }"
-            class="text-blue-500"
-          >
-            Go here for instructions.
-          </router-link>
-        </p>
-      </div>
-
       <div
         v-if="!activeDid"
         class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
       >
         <p class="text-lg mb-3">
-          You need an <b>identifier</b> before you can record anyone's gives.
+          You need an <b>identifier</b> before you can record others' giving.
         </p>
         <router-link
           :to="{ name: 'start' }"
-          class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
+          class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
         >
           Create Your Identifier</router-link
         >
@@ -44,17 +27,17 @@
         v-else-if="!isRegistered"
         class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
       >
-        Someone must register your account before you can record anyone's gives.
+        Someone must register your account before you can record others' giving.
         To do this:
         <router-link
           :to="{ name: 'contact-qr' }"
-          class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
+          class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
         >
           1. Show Them Your Identity Info</router-link
         >
         <router-link
           :to="{ name: 'account' }"
-          class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
+          class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
         >
           2. Check Your Limits</router-link
         >
@@ -62,7 +45,7 @@
 
       <div v-else>
         <!-- activeDid && isRegistered -->
-        <h2 class="text-xl font-bold mb-4">Record Something Given</h2>
+        <h2 class="text-xl font-bold">Record a Gift</h2>
 
         <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
           <li @click="openDialog()">
@@ -114,59 +97,42 @@
       </div>
     </div>
 
-    <GiftedDialog
-      ref="customDialog"
-      message="Received from"
-      showGivenToUser="true"
-    />
+    <GiftedDialog ref="customDialog" message="Received from"> </GiftedDialog>
 
-    <!-- Results List -->
     <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>
-      <InfiniteScroll @reached-bottom="loadMoreGives">
-        <ul class="border-t border-slate-300">
-          <li
-            class="border-b border-slate-300 py-2"
-            v-for="record in feedData"
-            :key="record.jwtId"
-          >
-            <div
-              class="border-b border-dashed border-slate-400 text-orange-400 pb-2 mb-2 font-bold uppercase text-sm"
-              v-if="record.jwtId == feedLastViewedClaimId"
-            >
-              You've seen all the following
-            </div>
-
-            <div class="flex">
-              <fa icon="gift" class="pt-1 pr-2 text-slate-500"></fa>
-              <span class="">{{ this.giveDescription(record) }}</span>
-              <a @click="onClickLoadClaim(record.jwtId)">
-                <fa icon="circle-info" class="pl-2 pt-1 text-slate-500"></fa>
-              </a>
-            </div>
-          </li>
-        </ul>
-      </InfiniteScroll>
       <div :class="{ hidden: isHiddenSpinner }">
         <p class="text-slate-500 text-center italic mt-4 mb-4">
           <fa icon="spinner" class="fa-spin-pulse"></fa> Loading&hellip;
         </p>
       </div>
+      <ul class="border-t border-slate-300">
+        <li
+          class="border-b border-slate-300 py-2"
+          v-for="record in feedData"
+          :key="record.jwtId"
+        >
+          <div
+            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 claims below:
+          </div>
+          <div class="flex">
+            <fa icon="gift" class="pt-1 pr-2 text-slate-500"></fa>
+            <!-- icon values: "coins" = money; "clock" = time; "gift" = others -->
+            <span class="">{{ this.giveDescription(record) }}</span>
+          </div>
+        </li>
+      </ul>
     </div>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-
-import EntityIcon from "@/components/EntityIcon.vue";
 import GiftedDialog from "@/components/GiftedDialog.vue";
-import InfiniteScroll from "@/components/InfiniteScroll.vue";
-import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.vue";
 import { db, accountsDB } from "@/db/index";
-import { Account } from "@/db/tables/accounts";
-import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import {
@@ -174,7 +140,11 @@ import {
   GiverInputInfo,
   GiveServerRecord,
 } 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;
@@ -184,13 +154,7 @@ interface Notification {
 }
 
 @Component({
-  components: {
-    GiftedDialog,
-    QuickNav,
-    EntityIcon,
-    InfiniteScroll,
-    TopMessage,
-  },
+  components: { GiftedDialog, QuickNav, EntityIcon },
 })
 export default class HomeView extends Vue {
   $notify!: (notification: Notification, timeout?: number) => void;
@@ -199,9 +163,10 @@ export default class HomeView extends Vue {
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
   apiServer = "";
+  feedAllLoaded = false;
   feedData = [];
   feedPreviousOldestId?: string;
-  feedLastViewedClaimId?: string;
+  feedLastViewedId?: string;
   isHiddenSpinner = true;
   isRegistered = false;
   numAccounts = 0;
@@ -218,7 +183,13 @@ export default class HomeView extends Vue {
       .equals(activeDid)
       .first()) as Account;
     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) {
@@ -241,15 +212,11 @@ export default class HomeView extends Vue {
       this.apiServer = settings?.apiServer || "";
       this.activeDid = settings?.activeDid || "";
       this.allContacts = await db.contacts.toArray();
-      this.feedLastViewedClaimId = settings?.lastViewedClaimId;
+      this.feedLastViewedId = settings?.lastViewedClaimId;
       this.isRegistered = !!settings?.isRegistered;
-
-      // this returns a Promise but we don't need to wait for it
       this.updateAllFeed();
-
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.log("Error retrieving settings and/or feed.", err);
       this.$notify(
         {
           group: "alert",
@@ -257,25 +224,13 @@ export default class HomeView extends Vue {
           title: "Error",
           text:
             err.userMessage ||
-            "There was an error retrieving your settings and/or the latest activity.",
+            "There was an error retrieving the latest sweet, sweet action.",
         },
         -1,
       );
     }
   }
 
-  // from https://benborgers.com/posts/pwa-detect-installed
-  isInstalled() {
-    // For iOS
-    if ("standalone" in window.navigator) return true;
-
-    // For Android
-    if (window.matchMedia("(display-mode: standalone)").matches) return true;
-
-    // If neither is true, it's not installed
-    return false;
-  }
-
   public async buildHeaders() {
     const headers: HeadersInit = {
       "Content-Type": "application/json",
@@ -302,33 +257,24 @@ export default class HomeView extends Vue {
     return headers;
   }
 
-  /**
-   * Data loader used by infinite scroller
-   * @param payload is the flag from the InfiniteScroll indicating if it should load
-   **/
-  public async loadMoreGives(payload: boolean) {
-    if (payload) {
-      this.updateAllFeed();
-    }
-  }
-
   public async updateAllFeed() {
     this.isHiddenSpinner = false;
-    await this.retrieveGives(this.apiServer, this.feedPreviousOldestId)
+    await this.retrieveClaims(this.apiServer, this.feedPreviousOldestId)
       .then(async (results) => {
         if (results.data.length > 0) {
           this.feedData = this.feedData.concat(results.data);
+          this.feedAllLoaded = results.hitLimit;
           this.feedPreviousOldestId =
             results.data[results.data.length - 1].jwtId;
-          // The following update is only done on the first load.
           if (
-            this.feedLastViewedClaimId == null ||
-            this.feedLastViewedClaimId < results.data[0].jwtId
+            this.feedLastViewedId == null ||
+            this.feedLastViewedId < results.data[0].jwtId
           ) {
             await db.open();
             db.settings.update(MASTER_SETTINGS_KEY, {
               lastViewedClaimId: results.data[0].jwtId,
             });
+            // but not for this page because we need to remember what it was before
           }
         }
       })
@@ -338,22 +284,17 @@ export default class HomeView extends Vue {
           {
             group: "alert",
             type: "danger",
-            title: "Feed Error",
+            title: "Export Error",
             text: e.userMessage || "There was an error retrieving feed data.",
           },
           -1,
         );
       });
+
     this.isHiddenSpinner = true;
   }
 
-  /**
-   * Retrieve claims in reverse chronological order
-   *
-   * @param beforeId the earliest ID (of previous searches) to search earlier
-   * @return claims in reverse chronological order
-   */
-  public async retrieveGives(endorserApiServer: string, beforeId?: string) {
+  public async retrieveClaims(endorserApiServer: string, beforeId?: string) {
     const beforeQuery = beforeId == null ? "" : "&beforeId=" + beforeId;
     const response = await fetch(
       endorserApiServer + "/api/v2/report/gives?" + beforeQuery,
@@ -418,13 +359,6 @@ export default class HomeView extends Vue {
     return giverInfo + " gave" + gaveRecipientInfo + ": " + gaveAmount;
   }
 
-  onClickLoadClaim(jwtId: string) {
-    const route = {
-      path: "/claim/" + encodeURIComponent(jwtId),
-    };
-    this.$router.push(route);
-  }
-
   displayAmount(code: string, amt: number) {
     return "" + amt + " " + this.currencyShortWordForCode(code, amt === 1);
   }

src/views/ImportAccountView.vue

@@ -76,7 +76,7 @@ import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
   components: {},
 })
 export default class ImportAccountView extends Vue {
-  UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'"; // for legacy imports, likely never used
+  UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'";
 
   mnemonic = "";
   address = "";

src/views/NewEditAccountView.vue

@@ -68,7 +68,7 @@ export default class NewEditAccountView extends Vue {
     });
     localStorage.setItem("firstName", this.givenName as string);
     localStorage.setItem("lastName", ""); // deprecated, pre v 0.1.3
-    this.$router.back();
+    this.$router.push({ name: "account" });
   }
 
   onClickCancel() {

src/views/NewEditProjectView.vue

@@ -11,7 +11,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,43 +24,32 @@
 
     <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
+      {{ description.length }}/500 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"
+        @change="includeLocation = true"
       />
       <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"
@@ -78,7 +67,7 @@
           name="OpenStreetMap"
         />
         <l-marker
-          v-if="latitude && longitude"
+          v-if="latitude || longitude"
           :lat-lng="[latitude, longitude]"
           @click="maybeEraseLatLong()"
         />
@@ -142,17 +131,13 @@ export default class NewEditProjectView extends Vue {
 
   activeDid = "";
   apiServer = "";
+  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;
+  projectName = "";
   zoom = 2;
 
   async beforeCreate() {
@@ -224,12 +209,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,7 +220,13 @@ export default class NewEditProjectView extends Vue {
 
   private async SaveProject(identity: IIdentifier) {
     // Make a claim
-    const vcClaim: PlanVerifiableCredential = this.fullClaim;
+    const vcClaim: PlanVerifiableCredential = {
+      "@context": "https://schema.org",
+      "@type": "PlanAction",
+      name: this.projectName,
+      description: this.description,
+      identifier: this.projectId || undefined,
+    };
     if (this.projectId) {
       vcClaim.identifier = this.projectId;
     }
@@ -300,20 +288,6 @@ export default class NewEditProjectView extends Vue {
             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.";
@@ -321,8 +295,8 @@ export default class NewEditProjectView extends Vue {
           error?: { message?: string };
         }>;
         if (serverError) {
-          console.log("Got error from server", serverError);
           if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
+            console.log(serverError);
             userMessage = serverError.response?.data?.error?.message || ""; // This is info for the user.
             this.$notify(
               {

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 />
@@ -88,7 +74,7 @@ export default class NewIdentifierView extends Vue {
 
     this.loading = false;
     setTimeout(() => {
-      this.$router.push({ name: "home" });
+      this.$router.push({ name: "account" });
     }, 1000);
   }
 }

src/views/ProjectViewView.vue

@@ -1,7 +1,5 @@
 <template>
-  <QuickNav />
-  <TopMessage />
-
+  <QuickNav selected="Projects"></QuickNav>
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
@@ -14,7 +12,7 @@
         >
           <fa icon="chevron-left" class="fa-fw"></fa>
         </button>
-        Idea
+        View Plan
       </h1>
     </div>
 
@@ -37,7 +35,7 @@
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
                 {{ issuer }}
               </div>
-              <div v-if="timeSince">
+              <div>
                 <fa icon="calendar" class="fa-fw text-slate-400"></fa>
                 {{ timeSince }}
               </div>
@@ -47,14 +45,8 @@
                   :href="getOpenStreetMapUrl()"
                   target="_blank"
                   class="underline"
-                  >Map View
-                  <fa icon="arrow-up-right-from-square" class="fa-fw" />
-                </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) }}
+                >
+                  Map View
                 </a>
               </div>
             </div>
@@ -64,11 +56,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>
@@ -76,7 +65,7 @@
             <a
               @click="collapseText"
               class="uppercase text-xs font-semibold text-slate-700"
-              >- Read Less</a
+              >Read Less</a
             >
           </div>
         </div>
@@ -91,30 +80,20 @@
       </button>
     </div>
 
-    <div v-if="activeDid" class="mb-4">
-      <div class="text-center">
+    <div>
+      <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 v-if="activeDid">
-      <div class="text-center">
-        <button
-          @click="openGiftDialog({ name: 'you', did: activeDid })"
+          @click="openDialog({ 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 gave&hellip;
         </button>
-        <p class="mt-2 mb-4 text-center">Or, record a contribution from:</p>
+        <p class="mt-2 mb-4 text-center">Or, record a gift from:</p>
       </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()">
+        <li @click="openDialog()">
           <EntityIcon
             :entityId="null"
             :iconSize="64"
@@ -129,7 +108,7 @@
         <li
           v-for="contact in allContacts"
           :key="contact.did"
-          @click="openGiftDialog(contact)"
+          @click="openDialog(contact)"
         >
           <EntityIcon
             :entityId="contact.did"
@@ -155,51 +134,13 @@
     </div>
 
     <!-- Gifts to & from this -->
-    <div class="grid items-start grid-cols-1 sm:grid-cols-3 gap-4">
+    <div class="grid items-start grid-cols-1 sm:grid-cols-2 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
+          Given to this Project
         </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>
-                <fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{ didInfo(offer.agentDid, activeDid, allMyDids, allContacts) }}
-              </span>
-              <a @click="onClickLoadClaim(offer.jwtId)">
-                <fa icon="circle-info" class="pl-2 pt-1 text-slate-500"></fa>
-              </a>
-              <span v-if="offer.amount">
-                <fa
-                  :icon="iconForUnitCode(offer.unit)"
-                  class="fa-fw text-slate-400"
-                />{{ offer.amount }}
-              </span>
-            </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">
+        <ul class="text-sm border-t border-slate-300">
           <li
             v-for="give in givesToThis"
             :key="give.id"
@@ -210,14 +151,9 @@
                 ><fa icon="user" class="fa-fw text-slate-400"></fa>
                 {{ didInfo(give.agentDid, activeDid, allMyDids, allContacts) }}
               </span>
-              <a @click="onClickLoadClaim(give.jwtId)">
-                <fa icon="circle-info" class="pl-2 pt-1 text-slate-500"></fa>
-              </a>
-              <span v-if="give.amount">
-                <fa
-                  :icon="iconForUnitCode(give.unit)"
-                  class="fa-fw text-slate-400"
-                />{{ give.amount }}
+              <span v-if="give.amount"
+                ><fa icon="coins" class="fa-fw text-slate-400"></fa>
+                {{ give.amount }}
               </span>
             </div>
             <div v-if="give.description" class="text-slate-500">
@@ -228,52 +164,42 @@
         </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>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-          <div class="text-center">
-            <div v-for="plan in fulfillersToThis" :key="plan.handleId">
-              <button
-                @click="onClickLoadProject(plan.handleId)"
-                class="text-blue-500"
-              >
-                {{ plan.name }}
-              </button>
-            </div>
-          </div>
-        </div>
+      <div class="bg-slate-100 px-4 py-3 rounded-md">
+        <h3 class="text-sm uppercase font-semibold mb-3">
+          &hellip;and from this Project
+        </h3>
 
-        <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>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-          <div class="text-center">
-            <button
-              @click="onClickLoadProject(fulfilledByThis.handleId)"
-              class="text-blue-500"
-            >
-              {{ fulfilledByThis.name }}
-            </button>
-          </div>
-        </div>
+        <ul class="text-sm border-t border-slate-300">
+          <li
+            v-for="give in givesByThis"
+            :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="coins" class="fa-fw text-slate-400"></fa>
+                {{ 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>
 
     <GiftedDialog
-      ref="customGiveDialog"
+      ref="customDialog"
       message="Received from"
       :projectId="this.projectId"
     >
     </GiftedDialog>
-    <OfferDialog ref="customOfferDialog" :projectId="this.projectId">
-    </OfferDialog>
   </section>
 </template>
 
@@ -284,19 +210,14 @@ 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 TopMessage from "@/components/TopMessage.vue";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import { isGlobalUri } from "@/libs/util";
 import {
   didInfo,
   GiverInputInfo,
   GiveServerRecord,
-  OfferServerRecord,
-  PlanServerRecord,
 } from "@/libs/endorserServer";
 import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
@@ -310,7 +231,7 @@ interface Notification {
 }
 
 @Component({
-  components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav, TopMessage },
+  components: { GiftedDialog, QuickNav, EntityIcon },
 })
 export default class ProjectViewView extends Vue {
   $notify!: (notification: Notification, timeout?: number) => void;
@@ -321,19 +242,16 @@ export default class ProjectViewView extends Vue {
   apiServer = "";
   description = "";
   expanded = false;
-  fulfilledByThis: PlanServerRecord | null = null;
-  fulfillersToThis: Array<PlanServerRecord> = [];
   givesToThis: Array<GiveServerRecord> = [];
-  issuer = "";
+  givesByThis: Array<GiveServerRecord> = [];
   latitude = 0;
   longitude = 0;
   name = "";
-  offersToThis: Array<OfferServerRecord> = [];
+  issuer = "";
   projectId = localStorage.getItem("projectId") || ""; // handle ID
   timeSince = "";
   truncatedDesc = "";
   truncateLength = 40;
-  url = "";
 
   async created() {
     await db.open();
@@ -348,12 +266,7 @@ export default class ProjectViewView extends Vue {
     this.allMyDids = accountsArr.map((acc) => acc.did);
     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) {
@@ -363,6 +276,12 @@ export default class ProjectViewView extends Vue {
       .equals(activeDid)
       .first()) as Account;
     const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identity available.",
+      );
+    }
     return identity;
   }
 
@@ -401,11 +320,11 @@ 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);
+      this.apiServer +
+      "/api/claim/byHandle/" +
+      encodeURIComponent(this.projectId);
     const headers: RawAxiosRequestHeaders = {
       "Content-Type": "application/json",
     };
@@ -429,22 +348,19 @@ export default class ProjectViewView extends Vue {
         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 {
-        // actually, axios throws an error on 404 so we probably never get here
-        console.log("Error getting project:", resp);
+      } else if (resp.status === 404) {
+        // actually, axios throws an error so we never get here
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Error",
-            text: "There was a problem getting that project. See logs for more info.",
+            text: "That project does not exist.",
           },
           -1,
         );
       }
     } catch (error: unknown) {
-      console.error("Error retrieving project:", error);
       const serverError = error as AxiosError;
       if (serverError.response?.status === 404) {
         this.$notify(
@@ -466,13 +382,14 @@ export default class ProjectViewView extends Vue {
           },
           -1,
         );
+        console.error("Error retrieving project:", serverError.message);
       }
     }
 
     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) {
@@ -505,21 +422,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,
         );
@@ -531,100 +448,15 @@ 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,
-      );
-    }
-
-    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,
-      );
-    }
-  }
-
-  /**
-   * 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() {
@@ -641,66 +473,8 @@ export default class ProjectViewView extends Vue {
     );
   }
 
-  openGiftDialog(contact: GiverInputInfo) {
-    (this.$refs.customGiveDialog as GiftedDialog).open(contact);
-  }
-
-  openOfferDialog() {
-    (this.$refs.customOfferDialog as OfferDialog).open();
-  }
-
-  onClickLoadClaim(jwtId: string) {
-    const route = {
-      path: "/claim/" + encodeURIComponent(jwtId),
-    };
-    this.$router.push(route);
-  }
-
-  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;
-    }
-    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;
-      } else {
-        // there's more, but don't bother displaying the whole thing
-        return hostname + "...";
-      }
-    } catch (error: unknown) {
-      // must not be a valid URL
-      return url;
-    }
+  openDialog(contact: GiverInputInfo) {
+    (this.$refs.customDialog as GiftedDialog).open(contact);
   }
 }
 </script>

src/views/ProjectsView.vue

@@ -1,11 +1,9 @@
 <template>
   <QuickNav selected="Projects"></QuickNav>
-  <TopMessage />
-
   <section id="Content" class="p-6 pb-24">
     <!-- Heading -->
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Your Ideas
+      Your Plans
     </h1>
 
     <!-- Quick Search -->
@@ -81,7 +79,6 @@ import { IIdentifier } from "@veramo/core";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
-import TopMessage from "@/components/TopMessage.vue";
 import { ProjectData } from "@/libs/endorserServer";
 
 interface Notification {
@@ -92,7 +89,7 @@ interface Notification {
 }
 
 @Component({
-  components: { InfiniteScroll, QuickNav, EntityIcon, TopMessage },
+  components: { InfiniteScroll, QuickNav, EntityIcon },
 })
 export default class ProjectsView extends Vue {
   $notify!: (notification: Notification, timeout?: number) => void;
@@ -125,8 +122,8 @@ 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, issuerDid, rowid } = plan;
-          this.projects.push({ name, description, handleId, issuerDid, rowid });
+          const { name, description, handleId, rowid } = plan;
+          this.projects.push({ name, description, handleId, rowid });
         }
       } else {
         console.log("Bad server response & data:", resp.status, resp.data);
@@ -177,7 +174,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);
   }

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/StartView.vue

@@ -3,23 +3,10 @@
     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>
-    </div>
+    <!-- Heading -->
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Start Here
+    </h1>
 
     <!-- id used by puppeteer test script -->
     <div id="start-question" class="mt-8">

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,7 +32,7 @@
         {{ 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>
   </section>
 </template>

src/views/TestView.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">
-        Test
-      </h1>
-    </div>
+    <!-- Heading -->
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Test
+    </h1>
 
     <div class="mb-8">
       <h2 class="text-xl font-bold mb-4">Notiwind Alert Test Suite</h2>
@@ -30,14 +16,14 @@
             {
               group: 'alert',
               type: 'toast',
-              text: 'I\'m a toast. Without a timeout, I\'m stuck.',
+              text: 'I\'m a toast. Don\'t mind me.',
             },
             5000,
           )
         "
-        class="font-bold uppercase bg-slate-900 text-white px-3 py-2 rounded-md mr-2"
+        class="font-bold uppercase bg-slate-400 text-white px-3 py-2 rounded-md mr-2"
       >
-        Toast
+        Toast (self-dismiss)
       </button>
 
       <button

sw_scripts/additional-scripts.js

@@ -4,121 +4,56 @@ importScripts(
   "https://storage.googleapis.com/workbox-cdn/releases/6.4.1/workbox-sw.js",
 );
 
-function logConsoleAndDb(message, arg1, arg2) {
-  // in chrome://serviceworker-internals note that the arg1 and arg2 here will show as "[object Object]" in that page but will show as expandable objects in the console
-  console.log(`${new Date().toISOString()} ${message}`, arg1, arg2);
-  if (self.appendDailyLog) {
-    let fullMessage = `${new Date().toISOString()} ${message}`;
-    if (arg1) {
-      fullMessage += `\n${JSON.stringify(arg1)}`;
-    }
-    if (arg2) {
-      fullMessage += `\n${JSON.stringify(arg2)}`;
-    }
-    self.appendDailyLog(fullMessage);
-  } else {
-    // sometimes we get the error: "Uncaught TypeError: self.appendDailyLog is not a function"
-    console.log("Not logging to DB because self.appendDailyLog doesn't exist.");
-  }
-}
-
-self.addEventListener("install", async (event) => {
-  console.log("Service worker got install event. Importing scripts...", event);
-  await importScripts(
+self.addEventListener("install", (event) => {
+  importScripts(
     "safari-notifications.js",
     "nacl.js",
     "noble-curves.js",
     "noble-hashes.js",
   );
-  // this should now be available
-  logConsoleAndDb("Service worker imported all scripts.");
-});
-
-self.addEventListener("activate", (event) => {
-  logConsoleAndDb("Service worker is activating...", event);
-  // see https://developer.mozilla.org/en-US/docs/Web/API/Clients/claim
-  // and https://web.dev/articles/service-worker-lifecycle#clientsclaim
-  event.waitUntil(clients.claim());
-  logConsoleAndDb("Service worker is activated.");
 });
 
 self.addEventListener("push", function (event) {
-  let text = null;
-  if (event.data) {
-    text = event.data.text();
-  }
-  logConsoleAndDb("Service worker received a push event.", text, event);
   event.waitUntil(
     (async () => {
       try {
         let payload;
-        if (text) {
-          try {
-            payload = JSON.parse(text);
-          } catch (e) {
-            // don't use payload since it is not JSON
-          }
-        }
-
-        // This is a special value that tells the service worker to trigger its daily check.
-        // See https://gitea.anomalistdesign.com/trent_larson/py-push-server/src/commit/c1ed026662e754348a5f91542680bd4f57e5b81e/app.py#L217
-        const DAILY_UPDATE_TITLE = "DAILY_CHECK";
-
-        // This is a special value that tells the service worker to send a direct notification to the device, skipping filters.
-        // This is shared with the notification-test code and should be a constant. Look for the same name in HelpNotificationsView.vue
-        // Make sure it is something other than the DAILY_UPDATE_TITLE.
-        const DIRECT_PUSH_TITLE = "DIRECT_NOTIFICATION";
-
-        let title;
-        let message = "Got some empty message.";
-        if (payload && payload.title == DIRECT_PUSH_TITLE) {
-          // skip any search logic and show the message directly
-          title = "Direct Notification";
-          message = payload.message || "No details were provided.";
-        } else {
-          // any other title will run through regular filtering logic
-          if (payload && payload.title === DAILY_UPDATE_TITLE) {
-            title = "Daily Update";
-          } else {
-            title = payload.title || "Update";
-          }
-          message = await self.getNotificationCount();
-        }
-        if (message) {
-          const options = {
-            body: message,
-            icon: payload ? payload.icon : "icon.png",
-            badge: payload ? payload.badge : "badge.png",
-          };
-          await self.registration.showNotification(title, options);
-          logConsoleAndDb("Notified user:", options);
-        } else {
-          logConsoleAndDb("No notification message.");
+        if (event.data) {
+          payload = JSON.parse(event.data.text());
         }
+        const message = await self.getNotificationCount();
+        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);
       } catch (error) {
-        logConsoleAndDb("Error with push event", event, error);
+        console.error("Error in processing the push event:", error);
       }
     })(),
   );
 });
 
 self.addEventListener("message", (event) => {
-  logConsoleAndDb("Service worker got a message...", event);
   if (event.data && event.data.type === "SEND_LOCAL_DATA") {
     self.secret = event.data.data;
     event.ports[0].postMessage({ success: true });
   }
-  logConsoleAndDb("Service worker posted a message.");
+});
+
+self.addEventListener("activate", (event) => {
+  event.waitUntil(clients.claim());
+  console.log("Service worker activated", event);
 });
 
 self.addEventListener("fetch", (event) => {
-  logConsoleAndDb("Service worker got fetch event.", event);
+  console.log(event.request);
 });
 
 self.addEventListener("error", (event) => {
-  logConsoleAndDb("Service worker error", event);
-  console.error("Full Error:", event);
-  console.error("Message:", event.message);
+  console.error("Error in Service Worker:", event.message);
   console.error("File:", event.filename);
   console.error("Line:", event.lineno);
   console.error("Column:", event.colno);

sw_scripts/safari-notifications.js

@@ -384,100 +384,77 @@ async function getSettingById(id) {
   });
 }
 
+
 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);
+    try {
+        const db = await openIndexedDB("TimeSafari");
+        const transaction = db.transaction("settings", "readwrite");
+        const store = transaction.objectStore("settings");
 
-    if (data) {
-      data["lastNotifiedClaimId"] = id;
-      await updateRecord(store, data);
-    } else {
-      console.error(
-        "safari-notifications setMostRecentNotified IndexedDB settings record not found",
-      );
+        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);
     }
-
-    transaction.oncomplete = () => db.close();
-  } catch (error) {
-    console.error(
-      "safari-notifications setMostRecentNotified IndexedDB error",
-      error,
-    );
-  }
 }
 
-async function appendDailyLog(message) {
-  try {
-    const db = await openIndexedDB("TimeSafari");
-    const transaction = db.transaction("logs", "readwrite");
-    const store = transaction.objectStore("logs");
-    // will only keep one day's worth of logs
-    const todayKey = new Date().toDateString();
-    const previous = await getRecord(store, todayKey);
-    if (!previous) {
-      await store.clear(); // clear out anything older than today
-    }
-    let fullMessage = (previous && previous.message) || "";
-    if (fullMessage) {
-      fullMessage += "\n";
-    }
-    fullMessage += message;
-    await updateRecord(store, { date: todayKey, message: fullMessage });
-    transaction.oncomplete = () => db.close();
-    return true;
-  } catch (error) {
-    console.error("safari-notifications logMessage IndexedDB error", error);
-    return false;
-  }
-}
 
 function openIndexedDB(dbName) {
-  return new Promise((resolve, reject) => {
-    const request = indexedDB.open(dbName);
-    request.onerror = () => reject(request.error);
-    request.onsuccess = () => resolve(request.result);
-  });
+    return new Promise((resolve, reject) => {
+        const request = indexedDB.open(dbName);
+        request.onerror = () => reject(request.error);
+        request.onsuccess = () => resolve(request.result);
+        request.onupgradeneeded = (event) => {
+            const db = event.target.result;
+            if (!db.objectStoreNames.contains("settings")) {
+                db.createObjectStore("settings");
+            }
+        };
+    });
 }
 
+
 function getRecord(store, key) {
-  return new Promise((resolve, reject) => {
-    const request = store.get(key);
-    request.onsuccess = () => resolve(request.result);
-    request.onerror = () => reject(request.error);
-  });
+    return new Promise((resolve, reject) => {
+        const request = store.get(key);
+        request.onsuccess = () => resolve(request.result);
+        request.onerror = () => reject(request.error);
+    });
 }
 
-// Note that this assumes there is only one record in the store.
+
 function updateRecord(store, data) {
-  return new Promise((resolve, reject) => {
-    const request = store.put(data);
-    request.onsuccess = () => resolve(request.result);
-    request.onerror = () => reject(request.error);
-  });
+    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) => {
-    const openRequest = indexedDB.open("TimeSafariAccounts");
+    let openRequest = indexedDB.open("TimeSafariAccounts");
 
     openRequest.onupgradeneeded = function (event) {
-      const db = event.target.result;
+      let db = event.target.result;
       if (!db.objectStoreNames.contains("accounts")) {
         db.createObjectStore("accounts", { keyPath: "id" });
       }
-      if (!db.objectStoreNames.contains("worker_log")) {
-        db.createObjectStore("worker_log");
-      }
     };
 
     openRequest.onsuccess = function (event) {
-      const db = event.target.result;
-      const transaction = db.transaction("accounts", "readonly");
-      const objectStore = transaction.objectStore("accounts");
-      const getAllRequest = objectStore.getAll();
+      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);
@@ -494,77 +471,75 @@ async function fetchAllAccounts() {
 }
 
 async function getNotificationCount() {
+  let secret = null;
   let accounts = [];
   let result = null;
-  // 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 activeAccount = null;
-  for (let i = 0; i < accounts.length; i++) {
-    if (accounts[i]["did"] == activeDid) {
-      activeAccount = accounts[i];
-      break;
-    }
-  }
-
-  const headers = {
-    "Content-Type": "application/json",
-  };
-
-  const identity = activeAccount && activeAccount["identity"];
-  if (identity && "secret" in self) {
-    const secret = self.secret;
+  if ("secret" in self) {
+    secret = self.secret;
     const secretUint8Array = self.decodeBase64(secret);
-    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 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);
 
-    headers["Authorization"] = "Bearer " + (await accessToken(identifier));
-  }
+        const msg = decoder.decode(decrypted);
+        const identifier = JSON.parse(JSON.parse(msg));
 
-  const response = await fetch(
-    settings["apiServer"] + "/api/v2/report/claims",
-    {
-      method: "GET",
-      headers: headers,
-    },
-  );
-  if (response.status == 200) {
-    const json = await response.json();
-    const claims = json["data"];
-    let newClaims = 0;
-    for (let i = 0; i < claims.length; i++) {
-      const claim = claims[i];
-      if (claim["id"] === lastNotifiedClaimId) {
-        break;
+        const headers = {
+          "Content-Type": "application/json",
+        };
+
+        headers["Authorization"] = "Bearer " + (await accessToken(identifier));
+
+        let response = await fetch(
+          "https://test-api.endorser.ch/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 = "You have no new claims today.";
+          } else {
+            result = `${newClaims} have been shared with you`;
+          }
+          const most_recent_notified = claims[0]["id"];
+          await setMostRecentNotified(most_recent_notified);
+	    return "TEST";
+        } else {
+          console.error(response.status);
+        }
       }
-      newClaims++;
     }
-    if (newClaims > 0) {
-      result = `There are ${newClaims} new activities on Time Safari`;
-    }
-    const most_recent_notified = claims[0]["id"];
-    await setMostRecentNotified(most_recent_notified);
-  } else {
-    console.error(
-      "safari-notifications getNotificationsCount got a bad response status when fetching claims",
-      response.status,
-      response,
-    );
   }
-
   return result;
 }
 
-self.appendDailyLog = appendDailyLog;
 self.getNotificationCount = getNotificationCount;
 self.decodeBase64 = decodeBase64;

vue.config.js

@@ -1,8 +1,4 @@
 const { defineConfig } = require("@vue/cli-service");
-const { gitDescribeSync } = require("git-describe");
-
-process.env.VUE_APP_GIT_HASH = gitDescribeSync().hash;
-
 module.exports = defineConfig({
   transpileDependencies: true,
   configureWebpack: {

web-push.md

@@ -29,8 +29,8 @@ 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
+In order to provide this context and explict permission a two-step opt-in process
+where the user is first presented 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".
 
@@ -91,7 +91,7 @@ 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
+Note that there is a scope can specify what network requests it may
 intercept.
 
 The Vue project already has its own service worker but it is possible to
@@ -389,33 +389,4 @@ Simply tap on the Mute Notifications toggle switch in `AccountViewView` to immed
 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.)
-
-
-# TROUBLESHOOTING
-
-## Desktop
-
-#### Firefox
-
-Go to `about:debugging` and click on `Inspect` for the service worker.
-
-#### Chrome
-
-Go to `chrome://inspect/#service-workers` and click on `Inspect` for the service worker.
-
-## Mobile
-
-#### Android
-
-#### iOS
+- "Leave it On" to make no changes and dismiss the dialog.