Merge branch 'master' into sw-cleanup

Reviewed-on: trent_larson/crowd-funder-for-time-pwa#89

CHANGELOG.md

@@ -8,7 +8,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Web push notifications
 
-## [0.1.2] - 2023.11.01
+## [0.1.3] - 2023.11.08 - 910f57ec7d2e50803ae3d04f4b927e0f5219fbde
+### Added
+- Contact name editing
+### Changed
+- Don't show actions on front page if not registered.
+### Removed
+- Home page Notiwind test buttons
+
+
+## [0.1.2] - 2023.11.01 - 7f6c93802911a030a89fe3706e18b5c17151e5bb
 ### Added
 - Basics: create ID, record a give, declare a project, search, and get notifications.

README.md

@@ -1,4 +1,4 @@
-# kickstart-for-time-pwa
+# TimeSafari.app - Crowd-Funder for Time - PWA
 
 ## Project setup
 
@@ -13,6 +13,11 @@ npm install
 npm run serve
 ```
 
+### 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/",`
@@ -21,41 +26,24 @@ If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js,
 npm run build
 ```
 
-### Lints and fixes files
 ```
-npm run lint
+npx prettier --write ./sw_scripts/
 ```
+to make sure the service worker scripts are in proper form
+
+... then copy the contents of the `sw_scripts` folder to the `dist` folder - except additional_scripts.js.
+
+
 
 ## Tests
 
-###
-
-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: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`
+- 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`
   (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:
@@ -66,14 +54,39 @@ playing one of two ways:
 
 ### Create multiple identifiers
 
-Go to /start and create or import a new one. Then switch identifiers on the bottom of the Your Identity page.
+Under the "Your Identity" screen, click "Advanced", click "Switch Identity / No Identity", then "Add Another Identity...".
 
 ### Create keys with alternate tools
 
-See [this page](openssl_signing_console.rst)
+[This page](openssl_signing_console.rst) is a tool to create a JWT from a locally-generated keypair.
+
+### Web-push
+
+For your own web-push tests, change the 'vapid' URL in App.vue, and install apps on the same domain.
+
+### Icons
+
+To add an icon, add to main.ts and reference with `fa` element and `icon` attribute with the hyphenated name.
+
+### Manual walk-through
+
+- Clear the browser cache for localhost for a new user.
+  - See that it's using the test API.
+  - On each page, verify the messaging.
+  - On the home page, see the feed without names, and see a message prompting to generate an ID.
+  - On the discovery page, check that they can see projects, and set a search area to see projects nearby.
+- As User #0 in another browser on the test API, add a give & a project. (See User #0 details above.)
+  - With the new user on the home page, see the feed that shows User #0 in network but without the name.
+- As the new user on the contacts page, add User #0 as a contact.
+  - On the home page, see the feed that shows User #0 with a name.
+- Generate an ID.
+  - On the home page, check that it now prompts them to get registered.
+  - On the account page, check that they see messages on limits.
+- Register the ID from User #0.
+  - As the new user on the home page, check that they can now record a gift.
+  - On the contacts page, check that they cannot register someone else yet.
+- Walk through the functions on each page.
 
-### Customize Vue configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
 
 
 ## Scenarios
@@ -81,17 +94,19 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 - 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:
-  `seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control`
+  `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
   (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 data & restart
+### Clear/Reset data & restart
+
+* Clear cache for localhost.
+* Unregister service worker (in Chrome, go to `chrome://serviceworker-internals/`; in Firefox, go to `about:serviceworkers` or `about:debugging`).
+* Clear notification permission (in Chrome, go to `chrome://settings/content/notifications`; in Firefox, go to `about:preferences` and search).
 
-Clear cache for localhost, then go to http://localhost:8080/start
-(because it'll generate a new one automatically if you start on the `/account` page).
 
 
 
@@ -102,110 +117,10 @@ Clear cache for localhost, then go to http://localhost:8080/start
 * Notifications can be type of `toast` (self-dismiss), `info`, `success`, `warning`, and `danger`.
   They are done via [notiwind](https://www.npmjs.com/package/notiwind) and set up in App.vue.
 
-```
-// reference material from https://github.com/trentlarson/endorser-mobile/blob/8dc8e0353e0cc80ffa7ed89ded15c8b0da92726b/src/utility/idUtility.ts#L83
+* [Customize Vue configuration](https://cli.vuejs.org/config/).
 
-// Import an existing ID
-export const importAndStoreIdentifier = async (mnemonic: string, mnemonicPassword: string, toLowercase: boolean, previousIdentifiers: Array<IIdentifier>) => {
 
-  // just to get rid of variability that might cause an error
-  mnemonic = mnemonic.trim().toLowerCase()
-
-  /**
-  // 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
+### Kudos
 
 Gifts make the world go 'round!
 

openssl_signing_console.rst

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

package-lock.json

@@ -1,12 +1,12 @@
 {
-  "name": "kickstart-for-time-pwa",
-  "version": "0.1.0",
+  "name": "crowd-funder-for-time-pwa",
+  "version": "0.1.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "kickstart-for-time-pwa",
-      "version": "0.1.0",
+      "name": "crowd-funder-for-time-pwa",
+      "version": "0.1.4",
       "dependencies": {
         "@ethersproject/hdnode": "^5.7.0",
         "@fortawesome/fontawesome-svg-core": "^6.4.2",

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "kickstart-for-time-pwa",
-  "version": "0.1.3",
+  "name": "crowd-funder-for-time-pwa",
+  "version": "0.1.4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -72,13 +72,13 @@
     "@vue/cli-service": "~5.0.8",
     "@vue/eslint-config-typescript": "^11.0.3",
     "autoprefixer": "^10.4.15",
-    "eslint": "^8.48.0",
+    "eslint": "^8.53.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-vue": "^9.17.0",
     "leaflet": "^1.9.4",
     "postcss": "^8.4.29",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.0",
     "tailwindcss": "^3.3.3",
     "typescript": "~5.2.2"
   }

project.task.yaml

@@ -1,70 +1,32 @@
 
 tasks:
 
-- 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
+  - extract private_key_hex in py-push-server webpush.py
+  - lock down regenerate_vapid endpoint (so only we admins can do it on demand)
+  - remove sleep in py-push-server app.py
+  - revisit "maybe" and "never" buttons on accont screen
+  - see if we can detect OS-level notifications if turned off
+  - write troubleshooting docs for notifications
 
-- 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:matthew
+- .3 fix the Project-location-selection map display to not show on top of bottom icons (and any other UI tweaks on the map flow) assignee-group:ui
 
-- 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
-
-- 01 Show pop-up or some message confirming that settings & contacts download has been initiated/finished
-
-- 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s)
-
-- 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.
+- .5 If notifications are not enabled, add message to front page with link/button to enable
 
-- 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)
+- show VC details... somehow:
+  - .5 make a VC details page, or link to endorser.ch (including confirmations)
+  - 01 allow download of each VC (& confirmations, to show that they actually own their data)
+  - 04 allow user to download VCs, mine + ones I can see about me from others
+  - add VC confirmation?
 
 - Release Minimum Viable Product :
+  - generate new webpush.db entry, webpush.py private_key_hex & subscription_info & vapid_claims email
+  - .5 deploy endorser.ch server above Dec 1 (to get plan searches by names as well as descriptions)
   - 08 thorough testing for errors & edge cases
+  - 01 ensure ability to recover server remotely, and add redundant access
   - Turn off stats-world or ensure it's usable (eg. cannot zoom out too far and lose world, cannot screenshot).
   - Add disclaimers.
   - Switch default server to the public server.
@@ -73,8 +35,38 @@ tasks:
   - Test PWA features on Android and iOS.
   blocks: ref:https://raw.githubusercontent.com/trentlarson/lives-of-gifts/master/project.yaml#kickstarter%20for%20time
 
-- .5 show seed phrase in a QR code for transfer to another device
+- make identicons for contacts into more-memorable faces (and maybe change project identicons, too)
+- allow some gives even if they aren't registered
+- .5 Add start date to project
+- .3 check that Android shows "back" buttons on screens without bottom tray
+- .1 Make give description text box into something that expands as they type?
+- .5 customize favicon assignee-group:ui
+- .2 Show a warning if both giver and recipient are the same (but still allow?)
+- 01 Would it look better to shrink the buttons on many pages so they don't expand to the width of the screen? assignee-group:ui
+- .5 Display a more appealing confirmation on the map when erasing the marker
+- .5 include the hash of the latest commit on help page next to version (maybe Trent's git-hash branch)
+- .5 remove references to localStorage for projectId (now that it's pulling from the path)
+- bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent
+- switch some checks for activeDid to check for isRegistered
+- .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
+- .5 fix cert generation on server (since it didn't happen automatically for Nov 30)
+- contacts v+ :
+  - 01 Import all the non-sensitive data (ie. contacts & settings).
+  - .2 show error to user when adding a duplicate contact
+  - 01 parse input more robustly (with CSV lib and not commas)
+- stats v1 :
+  - 01 show numeric stats
+  - 04 show different graphic for projects vs people (gnome?) on world
+  - 01 link to world for specific stats
+  - .5 don't load another instance of a bush if it already exists
+  - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
+  - 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie)
 
+- .5 show seed phrase in a QR code for transfer to another device
+- .5 on DiscoverView, switch to a filter UI (eg. just from friend
+- .5 don't show "Offer" on project screen if they aren't registered
+
+- 24 Move to Vite
 - 32 accept images for projects
 - 32 accept images for contacts
 
@@ -84,6 +76,10 @@ 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
@@ -100,11 +96,10 @@ tasks:
 
 - Multiple identities
 
-- Peer DID
-
-- DIDComm
-
-- Write to or read from a different ledger (eg. private ACDC, attest.sh)
+- Support KERI AIDs
+- Support Peer DIDs
+- Support messaging through DIDComm
+- Write to or read from a different ledger (eg. private ACDC, EAS & attest.sh)
 
 - Do we want split first name & last name?
 
@@ -112,6 +107,7 @@ tasks:
   - pull, w/ scheduled runs
 
 - 01 On nearby search, if user starts changing their box but cancels and goes back to the map it is zoomed far out. Fix to fit the box better.
+- 16 From the home screen, make the quick action even easier.
 
 log:
 - videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29

sample.txt

@@ -1,177 +0,0 @@
-
-> 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

@@ -262,52 +262,158 @@
 <script lang="ts">
 import { Vue, Component } from "vue-facing-decorator";
 import axios from "axios";
+interface ServiceWorkerMessage {
+  type: string;
+  data: string;
+}
+
+interface ServiceWorkerResponse {
+  // Define the properties and their types
+  success: boolean;
+  message?: string;
+}
+
+// Example interface for error
+interface ErrorResponse {
+  message: string;
+  // Other properties as needed
+}
+
+interface VapidResponse {
+  data: {
+    vapidKey: string;
+  };
+}
+
+import { AppString } from "@/constants/app";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
 
 @Component
 export default class App extends Vue {
+  $notify!: (notification: Notification, timeout?: number) => void;
+
   b64 = "";
-  mounted() {
-    axios
-      .get("https://timesafari-pwa.anomalistlabs.com/web-push/vapid")
-      .then((response) => {
-        this.b64 = response.data.vapidKey;
-        console.log(this.b64);
-      })
-      .catch((error) => {
-        console.error("API error", error);
-      });
+
+  async mounted() {
+    try {
+      await db.open();
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+      let pushUrl: string = AppString.DEFAULT_PUSH_SERVER;
+      if (settings?.webPushServer) {
+        pushUrl = settings.webPushServer;
+      }
+
+      await axios
+        .get(pushUrl + "/web-push/vapid")
+        .then((response: VapidResponse) => {
+          this.b64 = response.data?.vapidKey || "";
+          console.log("Got vapid key:", this.b64);
+          navigator.serviceWorker.addEventListener("controllerchange", () => {
+            console.log("New service worker is now controlling the page");
+          });
+        });
+      if (!this.b64) {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error Setting Notifications",
+            text: "Could not set notifications.",
+          },
+          -1,
+        );
+      }
+    } catch (error) {
+      console.error("Got an error initializing notifications:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Setting Notifications",
+          text: "Got an error setting notifications.",
+        },
+        -1,
+      );
+    }
+  }
+
+  private sendMessageToServiceWorker(
+    message: ServiceWorkerMessage,
+  ): Promise<unknown> {
+    return new Promise((resolve, reject) => {
+      if (navigator.serviceWorker.controller) {
+        const messageChannel = new MessageChannel();
+
+        messageChannel.port1.onmessage = (event: MessageEvent) => {
+          if (event.data.error) {
+            reject(event.data.error as ErrorResponse);
+          } else {
+            resolve(event.data as ServiceWorkerResponse);
+          }
+        };
+
+        navigator.serviceWorker.controller.postMessage(message, [
+          messageChannel.port2,
+        ]);
+      } else {
+        reject("Service worker controller not available");
+      }
+    });
   }
 
   private askPermission(): Promise<NotificationPermission> {
-    // Check if Notifications are supported
+    if (!("serviceWorker" in navigator && navigator.serviceWorker.controller)) {
+      return Promise.reject("Service worker not available.");
+    }
+
+    const secret = localStorage.getItem("secret");
+    if (!secret) {
+      return Promise.reject("No secret found.");
+    }
+
+    return this.sendSecretToServiceWorker(secret)
+      .then(() => this.checkNotificationSupport())
+      .then(() => this.requestNotificationPermission())
+      .catch((error) => Promise.reject(error));
+  }
+
+  private sendSecretToServiceWorker(secret: string): Promise<void> {
+    const message: ServiceWorkerMessage = {
+      type: "SEND_LOCAL_DATA",
+      data: secret,
+    };
+
+    return this.sendMessageToServiceWorker(message).then((response) => {
+      console.log("Response from service worker:", response);
+    });
+  }
+
+  private checkNotificationSupport(): Promise<void> {
     if (!("Notification" in window)) {
       alert("This browser does not support notifications.");
       return Promise.reject("This browser does not support notifications.");
     }
-
-    // Check existing permissions
     if (Notification.permission === "granted") {
-      return Promise.resolve("granted");
+      return Promise.resolve();
     }
+    return Promise.resolve();
+  }
 
-    // Request permission
-    return new Promise((resolve, reject) => {
-      const permissionResult = Notification.requestPermission((result) => {
-        resolve(result);
-      });
-
-      if (permissionResult) {
-        permissionResult.then(resolve, reject);
-      }
-    }).then((permissionResult) => {
-      console.log("Permission result:", permissionResult);
-
-      if (permissionResult !== "granted") {
+  private requestNotificationPermission(): Promise<NotificationPermission> {
+    return Notification.requestPermission().then((permission) => {
+      if (permission !== "granted") {
         alert("We need notification permission to provide certain features.");
-        return Promise.reject("We weren't granted permission.");
+        throw new Error("We weren't granted permission.");
       }
-
-      return permissionResult;
+      return permission;
     });
   }
 
@@ -320,16 +426,13 @@ 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.");
@@ -343,15 +446,16 @@ export default class App extends Vue {
               "Subscription or server communication failed:",
               error,
             );
+            alert( "Subscription or server communication failed. Try again in a while." );
           });
       })
       .catch((error) => {
         console.error("An error occurred:", error);
-        // Handle error appropriately here
+        alert( "Some error occurred." + error );	
       });
   }
 
-  // Function to convert URL base64 to Uint8Array
+
   private urlBase64ToUint8Array(base64String: string): Uint8Array {
     const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
     const base64 = (base64String + padding)
@@ -366,34 +470,49 @@ export default class App extends Vue {
     return outputArray;
   }
 
-  // The subscribeToPush method
   private subscribeToPush(): Promise<void> {
     return new Promise<void>((resolve, reject) => {
-      if ("serviceWorker" in navigator && "PushManager" in window) {
-        const applicationServerKey = this.urlBase64ToUint8Array(this.b64);
-        const options: PushSubscriptionOptions = {
-          userVisibleOnly: true,
-          applicationServerKey: applicationServerKey,
-        };
-        console.log(options);
-
-        navigator.serviceWorker.ready
-          .then((registration) => {
-            return registration.pushManager.subscribe(options);
-          })
-          .then((subscription) => {
-            console.log("Push subscription successful:", subscription);
-            resolve();
-          })
-          .catch((error) => {
-            console.error("Push subscription failed:", error, options);
-            reject(error);
-          });
-      } else {
+      if (!("serviceWorker" in navigator && "PushManager" in window)) {
         const errorMsg = "Push messaging is not supported";
         console.warn(errorMsg);
-        reject(new Error(errorMsg));
+        return reject(new Error(errorMsg));
       }
+
+      if (Notification.permission !== "granted") {
+        const errorMsg = "Notification permission not granted";
+        console.warn(errorMsg);
+        return reject(new Error(errorMsg));
+      }
+
+      const applicationServerKey = this.urlBase64ToUint8Array(this.b64);
+      const options: PushSubscriptionOptions = {
+        userVisibleOnly: true,
+        applicationServerKey: applicationServerKey,
+      };
+
+      navigator.serviceWorker.ready
+        .then((registration) => {
+          return registration.pushManager.subscribe(options);
+        })
+        .then((subscription) => {
+          console.log("Push subscription successful:", subscription);
+          resolve();
+        })
+        .catch((error) => {
+          console.error(
+            "Subscription or server communication failed:",
+            error,
+            options,
+          );
+
+          // Inform the user about the issue
+          alert(
+            "We encountered an issue setting up push notifications. " +
+              "If you wish to revoke notification permissions, please do so in your browser settings.",
+          );
+
+          reject(error);
+        });
     });
   }
 

src/components/GiftedDialog.vue

@@ -10,7 +10,7 @@
         placeholder="What was received"
         v-model="description"
       />
-      <div class="flex flex-row mb-6">
+      <div class="flex flex-row">
         <span
           class="rounded-l border border-r-0 border-slate-400 bg-slate-200 w-1/3 text-center px-2 py-2"
           >Hours</span
@@ -33,7 +33,13 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <p class="text-center mb-2 italic">Sign & Send to publish to the world</p>
+      <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>
       <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"
@@ -70,12 +76,14 @@ export default class GiftedDialog extends Vue {
 
   @Prop message = "";
   @Prop projectId = "";
+  @Prop showGivenToUser = false;
 
   activeDid = "";
   apiServer = "";
 
-  giver?: GiverInputInfo;
+  giver?: GiverInputInfo; // undefined means no identified giver agent
   description = "";
+  givenToUser = false;
   hours = "0";
   visible = false;
 
@@ -103,11 +111,17 @@ 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.hours = "0";
+
     this.visible = true;
   }
 
   close() {
+    // close the dialog but don't change values (since it might be submitting info)
     this.visible = false;
   }
 
@@ -121,8 +135,13 @@ export default class GiftedDialog extends Vue {
 
   cancel() {
     this.close();
+    this.eraseValues();
+  }
+
+  eraseValues() {
     this.description = "";
     this.giver = undefined;
+    this.givenToUser = this.showGivenToUser;
     this.hours = "0";
   }
 
@@ -138,14 +157,12 @@ export default class GiftedDialog extends Vue {
       1000,
     );
     // this is asynchronous, but we don't need to wait for it to complete
-    this.recordGive(
+    await this.recordGive(
       this.giver?.did as string | undefined,
       this.description,
       parseFloat(this.hours),
     ).then(() => {
-      this.description = "";
-      this.giver = undefined;
-      this.hours = "0";
+      this.eraseValues();
     });
   }
 
@@ -209,7 +226,7 @@ export default class GiftedDialog extends Vue {
         this.apiServer,
         identity,
         giverDid,
-        this.activeDid,
+        this.givenToUser ? this.activeDid : undefined,
         description,
         hours,
         this.projectId,
@@ -238,7 +255,7 @@ export default class GiftedDialog extends Vue {
             title: "Success",
             text: "That gift was recorded.",
           },
-          10000,
+          7000,
         );
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/components/OfferDialog.vue

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

src/constants/app.ts

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

src/db/index.ts

@@ -45,5 +45,8 @@ db.on("populate", () => {
   db.settings.add({
     id: MASTER_SETTINGS_KEY,
     apiServer: AppString.DEFAULT_ENDORSER_API_SERVER,
+
+    // remember that things you add from now on aren't automatically in the DB for old users
+    webPushServer: AppString.DEFAULT_PUSH_SERVER,
   });
 });

src/db/tables/settings.ts

@@ -20,9 +20,9 @@ export type Settings = {
   lastViewedClaimId?: string; // Last viewed claim ID
   lastNotifiedClaimId?: string; // Last notified claim ID
   isRegistered?: boolean;
+  webPushServer?: string; // Web Push server URL
 
   // Array of named search boxes defined by bounding boxes
-
   searchBoxes?: Array<{
     name: string;
     bbox: BoundingBox;

src/libs/endorserServer.ts

@@ -59,17 +59,46 @@ 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": string;
+  "@type": "GiveAction";
   agent?: { identifier: string };
   description?: string;
-  fulfills?: { "@type": string; identifier: string };
+  fulfills?: { "@type": string; identifier?: string; lastClaimId?: 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";
@@ -134,8 +163,8 @@ export function didInfo(
   return contact
     ? contact.name || "Contact With No Name"
     : isHiddenDid(did)
-    ? "Someone Not In Network"
-    : "Someone Not In Contacts";
+      ? "Someone Not In Network"
+      : "Someone Not In Contacts";
 }
 
 export interface ResultWithType {
@@ -152,7 +181,7 @@ export interface ErrorResult {
   error: InternalError;
 }
 
-export type CreateAndSubmitGiveResult = SuccessResult | ErrorResult;
+export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
 
 /**
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
@@ -172,20 +201,81 @@ export async function createAndSubmitGive(
   description?: string,
   hours?: number,
   fulfillsProjectHandleId?: string,
-): 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,
-    };
+): 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: "HUR" } : undefined,
+    fulfills: fulfillsProjectHandleId
+      ? { "@type": "PlanAction", identifier: fulfillsProjectHandleId }
+      : undefined,
+  };
+  return createAndSubmitClaim(
+    vcClaim as GenericClaim,
+    identity,
+    apiServer,
+    axios,
+  );
+}
 
+/**
+ * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
+ *
+ * @param identity
+ * @param description may be null; should have this or hours
+ * @param hours may be null; should have this or description
+ * @param expirationDate ISO 8601 date string YYYY-MM-DD (may be null)
+ * @param fulfillsProjectHandleId ID of project to which this contributes (may be null)
+ */
+export async function createAndSubmitOffer(
+  axios: Axios,
+  apiServer: string,
+  identity: IIdentifier,
+  description?: string,
+  hours?: number,
+  expirationDate?: string,
+  fulfillsProjectHandleId?: string,
+): Promise<CreateAndSubmitClaimResult> {
+  const vcClaim: OfferVerifiableCredential = {
+    "@context": "https://schema.org",
+    "@type": "Offer",
+    offeredBy: { identifier: identity.did },
+    validThrough: expirationDate || undefined,
+  };
+  if (hours) {
+    vcClaim.includesObject = {
+      amountOfThisGood: hours,
+      unitCode: "HUR",
+    };
+  }
+  if (description) {
+    vcClaim.itemOffered = { description };
+  }
+  if (fulfillsProjectHandleId) {
+    vcClaim.itemOffered = vcClaim.itemOffered || {};
+    vcClaim.itemOffered.isPartOf = {
+      "@type": "PlanAction",
+      identifier: fulfillsProjectHandleId,
+    };
+  }
+  return createAndSubmitClaim(
+    vcClaim as GenericClaim,
+    identity,
+    apiServer,
+    axios,
+  );
+}
+
+export async function createAndSubmitClaim(
+  vcClaim: GenericClaim,
+  identity: IIdentifier,
+  apiServer: string,
+  axios: Axios,
+): Promise<CreateAndSubmitClaimResult> {
+  try {
     const vcPayload = {
       vc: {
         "@context": ["https://www.w3.org/2018/credentials/v1"],
@@ -226,15 +316,11 @@ export async function createAndSubmitGive(
     });
 
     return { type: "success", response };
-  } catch (error: unknown) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  } catch (error: any) {
+    console.log("Error creating claim:", error);
     const errorMessage: string =
-      error === null
-        ? "Null error"
-        : error instanceof Error
-        ? error.message
-        : typeof error === "object" && error !== null && "message" in error
-        ? (error as { message: string }).message
-        : "Unknown error";
+      error.response?.data?.error?.message || error.message || "Unknown error";
 
     return {
       type: "error",

src/libs/util.ts

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

src/main.ts

@@ -14,6 +14,7 @@ import {
   faArrowLeft,
   faArrowRight,
   faBan,
+  faBitcoinSign,
   faBurst,
   faCalendar,
   faChevronLeft,
@@ -27,6 +28,7 @@ import {
   faCoins,
   faComment,
   faCopy,
+  faDollar,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
@@ -34,6 +36,7 @@ import {
   faFloppyDisk,
   faFolderOpen,
   faGift,
+  faGlobe,
   faHand,
   faHouseChimney,
   faLocationDot,
@@ -44,6 +47,7 @@ import {
   faPersonCircleCheck,
   faPersonCircleQuestion,
   faPlus,
+  faQuestion,
   faQrcode,
   faRotate,
   faShareNodes,
@@ -61,6 +65,7 @@ library.add(
   faArrowLeft,
   faArrowRight,
   faBan,
+  faBitcoinSign,
   faBurst,
   faCalendar,
   faChevronLeft,
@@ -74,6 +79,7 @@ library.add(
   faCoins,
   faComment,
   faCopy,
+  faDollar,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
@@ -81,6 +87,7 @@ library.add(
   faFloppyDisk,
   faFolderOpen,
   faGift,
+  faGlobe,
   faHand,
   faHouseChimney,
   faLocationDot,
@@ -92,6 +99,7 @@ library.add(
   faPersonCircleQuestion,
   faPlus,
   faQrcode,
+  faQuestion,
   faRotate,
   faShareNodes,
   faSpinner,

src/registerServiceWorker.ts

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

src/router/index.ts

@@ -91,6 +91,14 @@ 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",
@@ -148,7 +156,7 @@ const routes: Array<RouteRecordRaw> = [
       ),
   },
   {
-    path: "/project",
+    path: "/project/:id?",
     name: "project",
     component: () =>
       import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
@@ -168,6 +176,14 @@ 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

@@ -105,7 +105,12 @@
         <!-- toggle -->
         <div class="relative ml-2">
           <!-- input -->
-          <input type="checkbox" name="toggleNotifications" class="sr-only" />
+          <input
+            type="checkbox"
+            v-model="toggleNotifications"
+            name="toggleNotifications"
+            class="sr-only"
+          />
           <!-- line -->
           <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
           <!-- dot -->
@@ -136,6 +141,7 @@
             type="checkbox"
             name="toggleMuteNotifications"
             class="sr-only"
+            disabled
           />
           <!-- line -->
           <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
@@ -186,8 +192,9 @@
         </p>
         <p>
           You have done {{ limits.doneRegistrationsThisMonth }} registrations
-          out of {{ limits.maxRegistrationsPerMonth }} for this month. Your
-          registrations counter resets at
+          out of {{ limits.maxRegistrationsPerMonth }} for this month. (You can
+          register nobody on your first day, and after that only one a day in
+          your first month.) Your registration counter resets at
           {{ readableTime(limits.nextMonthBeginDateTime) }}
         </p>
       </div>
@@ -287,6 +294,14 @@
         </div>
       </label>
 
+      <div class="flex py-2">
+        <button class="text-blue-500">
+          <router-link :to="{ name: 'statistics' }" class="block text-center">
+            See Global Animated History of Giving
+          </router-link>
+        </button>
+      </div>
+
       <div class="flex py-2">
         <button class="text-blue-500">
           <!-- id used by puppeteer test script -->
@@ -300,14 +315,6 @@
         </button>
       </div>
 
-      <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>
         <input
@@ -323,30 +330,71 @@
           <fa icon="floppy-disk" class="fa-fw" color="white"></fa>
         </button>
         <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
-          @click="setApiServerInput(Constants.PROD_ENDORSER_API_SERVER)"
+          class="px-3 rounded bg-slate-200 border border-slate-400"
+          @click="apiServerInput = AppConstants.PROD_ENDORSER_API_SERVER"
         >
           Use Prod
         </button>
         <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
-          @click="setApiServerInput(Constants.TEST_ENDORSER_API_SERVER)"
+          class="px-3 rounded bg-slate-200 border border-slate-400"
+          @click="apiServerInput = AppConstants.TEST_ENDORSER_API_SERVER"
         >
           Use Test
         </button>
         <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
-          @click="setApiServerInput(Constants.LOCAL_ENDORSER_API_SERVER)"
+          class="px-3 rounded bg-slate-200 border border-slate-400"
+          @click="apiServerInput = AppConstants.LOCAL_ENDORSER_API_SERVER"
         >
           Use Local
         </button>
       </div>
+
+      <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 } from "axios";
+import { AxiosError, AxiosRequestConfig } from "axios";
 import "dexie-export-import";
 import { Component, Vue } from "vue-facing-decorator";
 import { useClipboard } from "@vueuse/core";
@@ -380,7 +428,7 @@ interface IAccount {
 export default class AccountViewView extends Vue {
   $notify!: (notification: Notification, timeout?: number) => void;
 
-  Constants = AppString;
+  AppConstants = AppString;
 
   activeDid = "";
   apiServer = "";
@@ -391,6 +439,8 @@ export default class AccountViewView extends Vue {
   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
@@ -403,6 +453,16 @@ export default class AccountViewView extends Vue {
 
   showAdvanced = false;
 
+  private isSubscribed = false;
+
+  get toggleNotifications() {
+    return this.isSubscribed;
+  }
+
+  set toggleNotifications(value) {
+    this.isSubscribed = value;
+  }
+
   public async getIdentity(activeDid: string): Promise<IIdentifier | null> {
     try {
       // Open the accounts database
@@ -485,6 +545,7 @@ export default class AccountViewView extends Vue {
    * @throws Will display specific messages to the user based on different errors.
    */
   async created() {
+    console.error("created");
     try {
       await db.open();
 
@@ -503,6 +564,18 @@ export default class AccountViewView extends Vue {
     }
   }
 
+  async mounted() {
+    console.error("mounted()");
+    try {
+      const registration = await navigator.serviceWorker.ready;
+      const subscription = await registration.pushManager.getSubscription();
+      this.toggleNotifications = !!subscription;
+    } catch (error) {
+      console.error(error);
+      this.toggleNotifications = false;
+    }
+  }
+
   /**
    * Initializes component state with values from the database or defaults.
    * @param {SettingsType} settings - Object containing settings from the database.
@@ -515,6 +588,8 @@ export default class AccountViewView extends Vue {
       (settings?.firstName || "") +
       (settings?.lastName ? ` ${settings.lastName}` : ""); // pre v 0.1.3
     this.isRegistered = !!settings?.isRegistered;
+    this.webPushServer = (settings?.webPushServer as string) || "";
+    this.webPushServerInput = (settings?.webPushServer as string) || "";
     this.showContactGives = !!settings?.showContactGivesInline;
   }
 
@@ -655,11 +730,11 @@ export default class AccountViewView extends Vue {
     this.$notify(
       {
         group: "alert",
-        type: "toast",
+        type: "success",
         title: "Download Started",
         text: "See your downloads directory for the backup.",
       },
-      5000,
+      -1,
     );
   }
 
@@ -710,7 +785,7 @@ export default class AccountViewView extends Vue {
             });
             this.isRegistered = true;
           } catch (err) {
-            console.log("Got an error updating settings:", err);
+            console.error("Got an error updating settings:", err);
             this.$notify(
               {
                 group: "alert",
@@ -739,7 +814,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 });
+    return await this.axios.get(url, { headers } as AxiosRequestConfig);
   }
 
   /**
@@ -752,10 +827,9 @@ export default class AccountViewView extends Vue {
       const data = error.response?.data as ErrorResponse;
       this.limitsMessage =
         (data?.error?.message as string) || "Bad server response.";
-      console.log(
+      console.error(
         "Got bad response retrieving limits, which usually means user isn't registered. Server says:",
         this.limitsMessage,
-        //error,
       );
     } else if (
       error instanceof Error &&
@@ -843,8 +917,12 @@ export default class AccountViewView extends Vue {
     this.apiServer = this.apiServerInput;
   }
 
-  setApiServerInput(value: string) {
-    this.apiServerInput = value;
+  async onClickSavePushServer() {
+    await db.open();
+    db.settings.update(MASTER_SETTINGS_KEY, {
+      webPushServer: this.webPushServerInput,
+    });
+    this.webPushServer = this.webPushServerInput;
   }
 }
 </script>

src/views/ContactAmountsView.vue

@@ -2,8 +2,11 @@
   <QuickNav selected="Contacts"></QuickNav>
   <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">
+    <div class="mb-8">
+      <h1
+        id="ViewBreadcrumb"
+        class="text-lg text-center font-light relative px-7"
+      >
         <!-- Back -->
         <router-link
           :to="{ name: 'contacts' }"
@@ -11,11 +14,12 @@
           ><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>
@@ -358,7 +362,10 @@ export default class ContactsView extends Vue {
 </script>
 
 <style>
-/* Tooltip from https://www.w3schools.com/css/css_tooltip.asp */
+/*
+  Tooltip, generated on "title" attributes on "fa" icons
+  Kudos to https://www.w3schools.com/css/css_tooltip.asp
+*/
 /* Tooltip container */
 .tooltip {
   position: relative;

src/views/ContactGiftingView.vue

@@ -66,7 +66,11 @@
       </li>
     </ul>
 
-    <GiftedDialog ref="customDialog" message="Received from"> </GiftedDialog>
+    <GiftedDialog
+      ref="customDialog"
+      message="Received from"
+      showGivenToUser="true"
+    />
   </section>
 </template>
 

src/views/ContactQRScanShowView.vue

@@ -2,21 +2,45 @@
   <QuickNav selected="Profile"></QuickNav>
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
-      Your Contact Info
-    </h1>
+    <!-- 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>
 
-    <!--
-      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"
-    />
+      <!-- Heading -->
+      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
+        Your Contact Info
+      </h1>
+    </div>
+
+    <div @click="onCopyToClipboard()" v-if="activeDid">
+      <!--
+        Play with display options: https://qr-code-styling.com/
+        See docs: https://www.npmjs.com/package/qr-code-generator-vue3
+      -->
+      <QRCodeVue3
+        :value="this.qrValue"
+        :cornersSquareOptions="{ type: 'extra-rounded' }"
+        :dotsOptions="{ type: 'square' }"
+        class="flex justify-center"
+      />
+    </div>
+    <div class="text-center" v-else>
+      You have no identitifiers yet, so
+      <router-link :to="{ name: 'start' }" class="text-blue-500">
+        create your identifier.
+      </router-link>
+      <br />
+      We recommend you do that first; otherwise, these contacts won't see your
+      activity.
+    </div>
 
     <h1 class="text-4xl text-center font-light pt-4">Scan Contact Info</h1>
     <qrcode-stream @detect="onScanDetect" @error="onScanError" />
@@ -27,6 +51,7 @@
 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";
@@ -75,7 +100,7 @@ export default class ContactQRScanShow extends Vue {
 
     if (!identity) {
       throw new Error(
-        "Attempted to load Give records with no identity available.",
+        "Attempted to show contact info with no identity available.",
       );
     }
     return identity;
@@ -90,17 +115,7 @@ export default class ContactQRScanShow extends Vue {
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === this.activeDid, accounts);
-    if (!account) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "",
-          text: "You have no identity yet.",
-        },
-        -1,
-      );
-    } else {
+    if (account) {
       const identity = await this.getIdentity(this.activeDid);
       const publicKeyHex = identity.keys[0].publicKeyHex;
       const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
@@ -137,7 +152,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 {
@@ -166,5 +181,22 @@ 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

@@ -27,7 +27,7 @@
       </span>
       <input
         type="text"
-        placeholder="DID, Name, Public Key"
+        placeholder="DID, Name, Public Key (base 16 or 64)"
         class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
         v-model="contactInput"
       />
@@ -67,8 +67,8 @@
             showGiveTotals
               ? "Total"
               : showGiveConfirmed
-              ? "Confirmed"
-              : "Unconfirmed"
+                ? "Confirmed"
+                : "Unconfirmed"
           }}
         </button>
         <br />
@@ -110,52 +110,54 @@
           </div>
 
           <div id="ContactActions" class="flex gap-1.5 mt-2">
-            <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
+            <div v-if="activeDid">
+              <button
+                v-if="contact.seesMe"
+                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+                @click="setVisibility(contact, false, true)"
+                title="They can see you"
+              >
+                <fa icon="eye" class="fa-fw" />
+              </button>
+              <button
                 v-else
-                icon="person-circle-question"
-                class="fa-fw"
-                title="Registration Unknown"
-              />
-            </button>
+                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+                @click="setVisibility(contact, true, true)"
+                title="They cannot see you"
+              >
+                <fa icon="eye-slash" class="fa-fw" />
+              </button>
+              <button
+                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+                @click="checkVisibility(contact)"
+                title="Check Visibility"
+                v-if="activeDid"
+              >
+                <fa icon="rotate" class="fa-fw" />
+              </button>
+              <button
+                @click="register(contact)"
+                class="text-sm uppercase bg-slate-500 text-white ml-6 px-2 py-1.5 rounded-md"
+                v-if="activeDid"
+              >
+                <fa
+                  v-if="contact.registered"
+                  icon="person-circle-check"
+                  class="fa-fw"
+                  title="Registered"
+                />
+                <fa
+                  v-else
+                  icon="person-circle-question"
+                  class="fa-fw"
+                  title="Registration Unknown"
+                />
+              </button>
+            </div>
 
             <button
               @click="deleteContact(contact)"
-              class="text-sm uppercase bg-red-600 text-white px-2 py-1.5 rounded-md"
+              class="text-sm uppercase bg-red-600 text-white ml-24 px-2 py-1.5 rounded-md"
               title="Delete"
             >
               <fa icon="trash-can" class="fa-fw" />
@@ -218,7 +220,7 @@
         </div>
       </li>
     </ul>
-    <p v-else>This identity has no contacts.</p>
+    <p v-else>There are no contacts.</p>
 
     <div v-if="contactEdit !== null" class="dialog-overlay">
       <div class="dialog">
@@ -263,6 +265,7 @@ import {
   SimpleSigner,
 } from "@/libs/crypto";
 import {
+  CONTACT_URL_PREFIX,
   GiveServerRecord,
   GiveVerifiableCredential,
   RegisterVerifiableCredential,
@@ -303,6 +306,7 @@ export default class ContactsView extends Vue {
   givenToMeUnconfirmed: Record<string, number> = {};
   hourDescriptionInput = "";
   hourInput = "0";
+  isRegistered = false;
   showGiveNumbers = false;
   showGiveTotals = true;
   showGiveConfirmed = true;
@@ -312,6 +316,7 @@ 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) {
@@ -475,6 +480,12 @@ 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(",");
@@ -493,7 +504,7 @@ export default class ContactsView extends Vue {
       publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
     }
     const newContact = { did, name, publicKeyBase64 };
-    return this.addContact(newContact);
+    await this.addContact(newContact);
   }
 
   async newContactFromScan(url: string): Promise<void> {
@@ -531,6 +542,7 @@ 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(() => {
@@ -539,15 +551,39 @@ 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: newContact.name + " was added.",
+            title: "Contact Added",
+            text: addedMessage,
           },
-          -1,
+          5000,
         );
+        if (this.isRegistered) {
+          // putting this last so that it shows on the top
+          this.$notify(
+            {
+              group: "alert",
+              type: "info",
+              title: "New User?",
+              text:
+                "If " +
+                newContact.name +
+                " is a new user, be sure to register them.",
+            },
+            -1,
+          );
+        }
       })
       .catch((err) => {
         console.error("Error when adding contact to storage:", err);
@@ -556,7 +592,7 @@ export default class ContactsView extends Vue {
             group: "alert",
             type: "danger",
             title: "Contact Not Added",
-            text: "An error prevented importing.",
+            text: "An error prevented this import.",
           },
           -1,
         );
@@ -566,11 +602,13 @@ export default class ContactsView extends Vue {
   async deleteContact(contact: Contact) {
     if (
       confirm(
-        "Are you sure you want to delete " +
+        "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 " +
           this.nameForDid(this.contacts, contact.did) +
           " with DID " +
           contact.did +
-          " ?",
+          " from your contact list?",
       )
     ) {
       await db.open();
@@ -692,7 +730,11 @@ export default class ContactsView extends Vue {
     }
   }
 
-  async setVisibility(contact: Contact, visibility: boolean) {
+  async setVisibility(
+    contact: Contact,
+    visibility: boolean,
+    showSuccessAlert: boolean,
+  ) {
     const url =
       this.apiServer +
       "/api/report/" +
@@ -704,6 +746,21 @@ 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 {
@@ -756,7 +813,7 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "info",
-            title: "Refreshed",
+            title: "Visibility Refreshed",
             text:
               this.nameForContact(contact, true) +
               " can " +
@@ -900,6 +957,7 @@ export default class ContactsView extends Vue {
     }
   }
 
+  // similar function is in endorserServer.ts
   private async createAndSubmitGive(
     identity: IIdentifier,
     fromDid: string,
@@ -1050,7 +1108,10 @@ export default class ContactsView extends Vue {
   max-width: 500px;
 }
 
-/* Tooltip from https://www.w3schools.com/css/css_tooltip.asp */
+/*
+  Tooltip, generated on "title" attributes on "fa" icons
+  Kudos to https://www.w3schools.com/css/css_tooltip.asp
+*/
 /* Tooltip container */
 .tooltip {
   position: relative;

src/views/DiscoverView.vue

@@ -9,7 +9,7 @@
     </h1>
 
     <!-- Quick Search -->
-    <div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="searchAll()">
+    <div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="searchSelected()">
       <input
         type="text"
         v-model="searchTerms"
@@ -17,7 +17,7 @@
         class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
       />
       <button
-        @click="searchAll()"
+        @click="searchSelected()"
         class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
       >
         <fa icon="magnifying-glass" class="fa-fw"></fa>
@@ -41,8 +41,10 @@
             Nearby
             <span
               class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
-              >{{ localCount }}</span
+              v-if="isLocalActive"
             >
+              {{ localCount > -1 ? localCount : "?" }}
+            </span>
           </a>
         </li>
         <li>
@@ -59,54 +61,24 @@
             Anywhere
             <span
               class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
-              >{{ remoteCount }}</span
+              v-if="isRemoteActive"
             >
+              {{ remoteCount > -1 ? remoteCount : "?" }}
+            </span>
           </a>
         </li>
       </ul>
     </div>
 
     <div v-if="isLocalActive">
-      <div v-if="!isChoosingSearchBox">
+      <div>
         <button
           class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-          @click="isChoosingSearchBox = true"
+          @click="$router.push({ name: 'search-area' })"
         >
           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 -->
@@ -118,7 +90,7 @@
     </div>
 
     <!-- Results List -->
-    <InfiniteScroll @reached-bottom="loadMoreData" v-if="!isChoosingSearchBox">
+    <InfiniteScroll @reached-bottom="loadMoreData">
       <ul>
         <li
           class="border-b border-slate-300"
@@ -150,50 +122,11 @@
         </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";
@@ -204,10 +137,6 @@ import QuickNav from "@/components/QuickNav.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 
-const DEFAULT_LAT_LONG_DIFF = 0.01;
-const WORLD_ZOOM = 2;
-const DEFAULT_ZOOM = 2;
-
 interface Notification {
   group: string;
   type: string;
@@ -217,13 +146,9 @@ interface Notification {
 
 @Component({
   components: {
-    LRectangle,
     QuickNav,
     InfiniteScroll,
     EntityIcon,
-    LMap,
-    LMarker,
-    LTileLayer,
   },
 })
 export default class DiscoverView extends Vue {
@@ -235,19 +160,12 @@ export default class DiscoverView extends Vue {
   apiServer = "";
   searchTerms = "";
   projects: ProjectData[] = [];
-  isChoosingSearchBox = false;
+  isLoading = false;
   isLocalActive = true;
   isRemoteActive = false;
-  isNewMarkerSet = false;
-  localCenterLat = 0;
-  localCenterLong = 0;
-  localLatDiff = DEFAULT_LAT_LONG_DIFF;
-  localLongDiff = DEFAULT_LAT_LONG_DIFF;
-  localCount = 0;
-  localZoom = DEFAULT_ZOOM;
-  remoteCount = 0;
+  localCount = -1;
+  remoteCount = -1;
   searchBox: { name: string; bbox: BoundingBox } | null = null;
-  isLoading = false;
 
   // make this function available to the Vue template
   didInfo = didInfo;
@@ -258,7 +176,6 @@ 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();
 
@@ -266,7 +183,26 @@ export default class DiscoverView extends Vue {
     const allAccounts = await accountsDB.accounts.toArray();
     this.allMyDids = allAccounts.map((acc) => acc.did);
 
-    this.searchLocal();
+    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();
+    }
   }
 
   public async buildHeaders(): Promise<HeadersInit> {
@@ -294,6 +230,13 @@ 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) {
@@ -356,13 +299,21 @@ 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,
@@ -407,9 +358,7 @@ export default class DiscoverView extends Vue {
           const plans: ProjectData[] = results.data;
           for (const plan of plans) {
             const { name, description, handleId = plan.handleId, rowid } = plan;
-            if (beforeId !== plan["rowid"]) {
-              this.projects.push({ name, description, handleId, rowid });
-            }
+            this.projects.push({ name, description, handleId, rowid });
           }
         } else {
           this.projects = results.data;
@@ -457,133 +406,11 @@ export default class DiscoverView extends Vue {
   onClickLoadProject(id: string) {
     localStorage.setItem("projectId", id);
     const route = {
-      name: "project",
+      path: "/project/" + encodeURIComponent(id),
     };
     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

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

src/views/HelpView.vue

@@ -1,11 +1,25 @@
 <template>
-  <QuickNav selected="Profile"></QuickNav>
+  <QuickNav />
+
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Help
-    </h1>
+    <!-- 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>
 
     <div>
       <p>
@@ -15,7 +29,7 @@
 
       <h2 class="text-xl font-semibold">What is the philosophy here?</h2>
       <p>
-        We are building networks of people who want to grow a gifting society.
+        We are building networks of people who want to grow a giving 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
@@ -36,22 +50,39 @@
         the control; this app gives you the control.
       </p>
 
-      <h2 class="text-xl font-semibold">How do I take my first action?</h2>
+      <h2 class="text-xl font-semibold">How do I get started?</h2>
       <p>
         You need someone to register you -- usually the person who told you
         about this app, on the Contacts
-        <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.
+        <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.
       </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
@@ -113,27 +144,20 @@
           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.</li>
+          <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>
         </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 if you think that may cause confusion. You can
+        so beware. You can
         <router-link to="start" class="text-blue-500">
           create another identity here.
         </router-link>
@@ -151,10 +175,25 @@
         <fa icon="eye-slash" class="fa-fw" />.
       </p>
       <p>
-        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.
+        Sometimes the reason you don't see something is because the search
+        results are limited. Go to the bottom and make sure to load all the data
+        on a list. If you still don't see it, try a search or view on a
+        different page.
+      </p>
+
+      <h2 class="text-xl font-semibold">
+        How do I access even more functionality?
+      </h2>
+      <p>
+        There is an "Advanced" section at the bottom of the Account
+        <fa icon="circle-user" /> page.
+      </p>
+      <p>
+        There is a even more functionality in a mobile app (and more
+        documentation) at
+        <a href="https://endorser.ch" class="text-blue-500">
+          EndorserSearch.com
+        </a>
       </p>
 
       <h2 class="text-xl font-semibold">What is your privacy policy?</h2>
@@ -165,17 +204,26 @@
         </a>
       </p>
 
+      <h2 class="text-xl font-semibold">Where can I read more?</h2>
+      <p>
+        This is part of the
+        <a href="https://livesofgiving.org" class="text-blue-500">
+          Lives of Giving
+        </a>
+        initiative.
+      </p>
+
       <h2 class="text-xl font-semibold">What app version is this?</h2>
       <p>
         {{ package.version }}
       </p>
 
       <h2 class="text-xl font-semibold">
-        For any other questions, including remove your data:
+        For any other questions, including removing your data:
       </h2>
       <p>
-        Contact us through
-        <a href="https://communitycred.org">CommunityCred.org</a>.
+        Contact us at
+        <a mailto="info@TimeSafari.app">info@TimeSafari.app</a>
       </p>
     </div>
   </section>
@@ -186,8 +234,30 @@ 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;
+
+  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

@@ -29,7 +29,7 @@
 
       <div v-else>
         <!-- activeDid && isRegistered -->
-        <h2 class="text-xl font-bold">Record a Gift</h2>
+        <h2 class="text-xl font-bold">Record Something Given</h2>
 
         <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
           <li @click="openDialog()">
@@ -81,7 +81,11 @@
       </div>
     </div>
 
-    <GiftedDialog ref="customDialog" message="Received from"> </GiftedDialog>
+    <GiftedDialog
+      ref="customDialog"
+      message="Received from"
+      showGivenToUser="true"
+    />
 
     <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>
@@ -100,7 +104,7 @@
             class="border-b border-dashed border-slate-400 text-orange-400 pb-2 mb-2 font-bold uppercase text-sm"
             v-if="record.jwtId == feedLastViewedId"
           >
-            You've seen all claims below:
+            You've seen all the following
           </div>
           <div class="flex">
             <fa icon="gift" class="pt-1 pr-2 text-slate-500"></fa>
@@ -167,13 +171,7 @@ export default class HomeView extends Vue {
       .equals(activeDid)
       .first()) as Account;
     const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load Give records with no identity available.",
-      );
-    }
-    return identity;
+    return identity; // may be null
   }
 
   public async getHeaders(identity: IIdentifier) {

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'";
+  UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'"; // for legacy imports, likely never used
 
   mnemonic = "";
   address = "";

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>
-        [New/Edit] Plan
+        Edit Idea
       </h1>
     </div>
 
@@ -24,32 +24,43 @@
 
     <input
       type="text"
-      placeholder="Project Name"
+      placeholder="Idea Name"
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-      v-model="projectName"
+      v-model="fullClaim.name"
     />
 
     <textarea
       placeholder="Description"
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
       rows="5"
-      v-model="description"
-      maxlength="500"
+      v-model="fullClaim.description"
+      maxlength="5000"
     ></textarea>
     <div class="text-xs text-slate-500 italic -mt-3 mb-4">
-      {{ description.length }}/500 max. characters
+      {{ fullClaim.description.length }}/5000 max. characters
     </div>
 
+    <input
+      v-model="fullClaim.url"
+      placeholder="Website"
+      class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
+    />
+
     <div class="flex items-center mb-4">
       <input
         type="checkbox"
         class="mr-2"
         v-model="includeLocation"
-        @change="includeLocation = true"
+        @click="includeLocation = !includeLocation"
       />
       <label for="includeLocation">Include Location</label>
     </div>
     <div v-if="includeLocation" style="height: 600px; width: 800px">
+      <div class="px-2 py-2">
+        For your security, we recommend you choose a location nearby but not
+        exactly at the place.
+      </div>
+
       <l-map
         ref="map"
         v-model:zoom="zoom"
@@ -67,7 +78,7 @@
           name="OpenStreetMap"
         />
         <l-marker
-          v-if="latitude || longitude"
+          v-if="latitude && longitude"
           :lat-lng="[latitude, longitude]"
           @click="maybeEraseLatLong()"
         />
@@ -131,13 +142,17 @@ 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() {
@@ -209,9 +224,12 @@ export default class NewEditProjectView extends Vue {
     try {
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
-        const claim = resp.data.claim;
-        this.projectName = claim.name;
-        this.description = claim.description;
+        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;
+        }
       }
     } catch (error) {
       console.error("Got error retrieving that project", error);
@@ -220,13 +238,7 @@ export default class NewEditProjectView extends Vue {
 
   private async SaveProject(identity: IIdentifier) {
     // Make a claim
-    const vcClaim: PlanVerifiableCredential = {
-      "@context": "https://schema.org",
-      "@type": "PlanAction",
-      name: this.projectName,
-      description: this.description,
-      identifier: this.projectId || undefined,
-    };
+    const vcClaim: PlanVerifiableCredential = this.fullClaim;
     if (this.projectId) {
       vcClaim.identifier = this.projectId;
     }
@@ -288,6 +300,20 @@ 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.";
@@ -295,8 +321,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,11 +1,25 @@
 <template>
-  <QuickNav selected="Profile"></QuickNav>
+  <QuickNav />
+
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Your Identity
-    </h1>
+    <!-- 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>
 
     <div class="flex justify-center py-12">
       <span />

src/views/ProjectViewView.vue

@@ -12,7 +12,7 @@
         >
           <fa icon="chevron-left" class="fa-fw"></fa>
         </button>
-        View Plan
+        Idea
       </h1>
     </div>
 
@@ -35,7 +35,7 @@
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
                 {{ issuer }}
               </div>
-              <div>
+              <div v-if="timeSince">
                 <fa icon="calendar" class="fa-fw text-slate-400"></fa>
                 {{ timeSince }}
               </div>
@@ -45,8 +45,13 @@
                   :href="getOpenStreetMapUrl()"
                   target="_blank"
                   class="underline"
-                >
-                  Map View
+                  >Map View
+                </a>
+              </div>
+              <div v-if="url">
+                <fa icon="globe" class="fa-fw text-slate-400"></fa>
+                <a :href="addScheme(url)" target="_blank" class="underline"
+                  >{{ domainForWebsite(this.url) }}
                 </a>
               </div>
             </div>
@@ -56,8 +61,11 @@
         <div class="text-sm text-slate-500">
           <div v-if="!expanded">
             {{ truncatedDesc }}
-            <a v-if="description.length >= truncateLength" @click="expandText"
-              >Read More</a
+            <a
+              v-if="description.length >= truncateLength"
+              @click="expandText"
+              class="uppercase text-xs font-semibold text-slate-700"
+              >... Read More</a
             >
           </div>
           <div v-else>
@@ -65,7 +73,7 @@
             <a
               @click="collapseText"
               class="uppercase text-xs font-semibold text-slate-700"
-              >Read Less</a
+              >- Read Less</a
             >
           </div>
         </div>
@@ -80,10 +88,21 @@
       </button>
     </div>
 
+    <div class="mb-4">
+      <div v-if="activeDid" class="text-center">
+        <button
+          @click="openOfferDialog({ name: 'you', did: activeDid })"
+          class="block w-full text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
+        >
+          I offer&hellip;
+        </button>
+      </div>
+    </div>
+
     <div>
       <div v-if="activeDid" class="text-center">
         <button
-          @click="openDialog({ name: 'you', did: activeDid })"
+          @click="openGiftDialog({ name: 'you', did: activeDid })"
           class="block w-full text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
         >
           I gave&hellip;
@@ -93,7 +112,7 @@
       <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="openDialog()">
+        <li @click="openGiftDialog()">
           <EntityIcon
             :entityId="null"
             :iconSize="64"
@@ -108,7 +127,7 @@
         <li
           v-for="contact in allContacts"
           :key="contact.did"
-          @click="openDialog(contact)"
+          @click="openGiftDialog(contact)"
         >
           <EntityIcon
             :entityId="contact.did"
@@ -134,13 +153,48 @@
     </div>
 
     <!-- Gifts to & from this -->
-    <div class="grid items-start grid-cols-1 sm:grid-cols-2 gap-4">
+    <div class="grid items-start grid-cols-1 sm:grid-cols-3 gap-4">
       <div class="bg-slate-100 px-4 py-3 rounded-md">
         <h3 class="text-sm uppercase font-semibold mb-3">
-          Given to this Project
+          Offered To This Idea
         </h3>
 
-        <ul class="text-sm border-t border-slate-300">
+        <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>
+              <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">
           <li
             v-for="give in givesToThis"
             :key="give.id"
@@ -151,9 +205,11 @@
                 ><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 v-if="give.amount">
+                <fa
+                  :icon="iconForUnitCode(give.unit)"
+                  class="fa-fw text-slate-400"
+                />{{ give.amount }}
               </span>
             </div>
             <div v-if="give.description" class="text-slate-500">
@@ -164,42 +220,48 @@
         </ul>
       </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 class="grid items-start grid-cols-1 gap-4">
+        <div
+          v-if="fulfillersToThis.length > 0"
+          class="bg-slate-100 px-4 py-3 rounded-md"
+        >
+          <h3 class="text-sm uppercase font-semibold mb-3">
+            Contributions To This Idea
+          </h3>
+          <ul>
+            <li v-for="plan in fulfillersToThis" :key="plan.handleId">
+              <button
+                @click="onClickLoadProject(plan.handleId)"
+                class="text-blue-500"
+              >
+                {{ plan.name }}
+              </button>
+            </li>
+          </ul>
+        </div>
 
-        <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 v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
+          <h3 class="text-sm uppercase font-semibold mb-3">
+            Contributions By This Idea
+          </h3>
+          <button
+            @click="onClickLoadProject(fulfilledByThis.handleId)"
+            class="text-blue-500"
           >
-            <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>
+            {{ fulfilledByThis.name }}
+          </button>
+        </div>
       </div>
     </div>
 
     <GiftedDialog
-      ref="customDialog"
+      ref="customGiveDialog"
       message="Received from"
       :projectId="this.projectId"
     >
     </GiftedDialog>
+    <OfferDialog ref="customOfferDialog" :projectId="this.projectId">
+    </OfferDialog>
   </section>
 </template>
 
@@ -210,14 +272,18 @@ import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
+import OfferDialog from "@/components/OfferDialog.vue";
 import { accountsDB, db } from "@/db/index";
 import { 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";
@@ -231,7 +297,7 @@ interface Notification {
 }
 
 @Component({
-  components: { GiftedDialog, QuickNav, EntityIcon },
+  components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav },
 })
 export default class ProjectViewView extends Vue {
   $notify!: (notification: Notification, timeout?: number) => void;
@@ -242,16 +308,19 @@ export default class ProjectViewView extends Vue {
   apiServer = "";
   description = "";
   expanded = false;
+  fulfilledByThis: PlanServerRecord | null = null;
+  fulfillersToThis: Array<PlanServerRecord> = [];
   givesToThis: Array<GiveServerRecord> = [];
-  givesByThis: Array<GiveServerRecord> = [];
+  issuer = "";
   latitude = 0;
   longitude = 0;
   name = "";
-  issuer = "";
+  offersToThis: Array<OfferServerRecord> = [];
   projectId = localStorage.getItem("projectId") || ""; // handle ID
   timeSince = "";
   truncatedDesc = "";
   truncateLength = 40;
+  url = "";
 
   async created() {
     await db.open();
@@ -266,7 +335,12 @@ 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");
-    this.LoadProject(identity);
+
+    const pathParam = window.location.pathname.substring("/project/".length);
+    if (pathParam) {
+      this.projectId = decodeURIComponent(pathParam);
+    }
+    this.LoadProject(this.projectId, identity);
   }
 
   public async getIdentity(activeDid: string) {
@@ -320,11 +394,11 @@ export default class ProjectViewView extends Vue {
     this.expanded = false;
   }
 
-  async LoadProject(identity: IIdentifier) {
+  async LoadProject(projectId: string, identity: IIdentifier) {
+    this.projectId = projectId;
+
     const url =
-      this.apiServer +
-      "/api/claim/byHandle/" +
-      encodeURIComponent(this.projectId);
+      this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
     const headers: RawAxiosRequestHeaders = {
       "Content-Type": "application/json",
     };
@@ -348,6 +422,7 @@ 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 if (resp.status === 404) {
         // actually, axios throws an error so we never get here
         this.$notify(
@@ -389,7 +464,7 @@ export default class ProjectViewView extends Vue {
     const givesInUrl =
       this.apiServer +
       "/api/v2/report/givesForPlans?planIds=" +
-      encodeURIComponent(JSON.stringify([this.projectId]));
+      encodeURIComponent(JSON.stringify([projectId]));
     try {
       const resp = await this.axios.get(givesInUrl, { headers });
       if (resp.status === 200 && resp.data.data) {
@@ -422,21 +497,21 @@ export default class ProjectViewView extends Vue {
       );
     }
 
-    const givesOutUrl =
+    const offersToUrl =
       this.apiServer +
-      "/api/v2/report/givesProvidedBy?providerId=" +
-      encodeURIComponent(this.projectId);
+      "/api/v2/report/offersToPlans?planIds=" +
+      encodeURIComponent(JSON.stringify([projectId]));
     try {
-      const resp = await this.axios.get(givesOutUrl, { headers });
+      const resp = await this.axios.get(offersToUrl, { headers });
       if (resp.status === 200 && resp.data.data) {
-        this.givesByThis = resp.data.data;
+        this.offersToThis = resp.data.data;
       } else {
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Error",
-            text: "Failed to retrieve gives by this project.",
+            text: "Failed to retrieve offers to this project.",
           },
           -1,
         );
@@ -448,15 +523,100 @@ export default class ProjectViewView extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "Something went wrong retrieving gives by project.",
+          text: "Something went wrong retrieving offers to this project.",
         },
         -1,
       );
       console.error(
-        "Error retrieving gives by this project:",
+        "Error retrieving offers to 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() {
@@ -473,8 +633,59 @@ export default class ProjectViewView extends Vue {
     );
   }
 
-  openDialog(contact: GiverInputInfo) {
-    (this.$refs.customDialog as GiftedDialog).open(contact);
+  openGiftDialog(contact: GiverInputInfo) {
+    (this.$refs.customGiveDialog as GiftedDialog).open(contact);
+  }
+
+  openOfferDialog() {
+    (this.$refs.customOfferDialog as OfferDialog).open();
+  }
+
+  UNIT_CODES: Record<string, Record<string, string>> = {
+    BTC: {
+      name: "Bitcoin",
+      faIcon: "bitcoin-sign",
+    },
+    HUR: {
+      name: "hours",
+      faIcon: "clock",
+    },
+    USD: {
+      name: "US Dollars",
+      faIcon: "dollar",
+    },
+  };
+
+  iconForUnitCode(unitCode: string) {
+    return this.UNIT_CODES[unitCode]?.faIcon || "question";
+  }
+
+  // return an HTTPS URL if it's not a global URL
+  addScheme(url: string) {
+    if (!isGlobalUri(url)) {
+      return "https://" + url;
+    }
+    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;
+    }
   }
 }
 </script>

src/views/ProjectsView.vue

@@ -174,7 +174,7 @@ export default class ProjectsView extends Vue {
   onClickLoadProject(id: string) {
     localStorage.setItem("projectId", id);
     const route = {
-      name: "project",
+      path: "/project/" + encodeURIComponent(id),
     };
     this.$router.push(route);
   }

src/views/SearchAreaView.vue

@@ -0,0 +1,286 @@
+<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,10 +3,23 @@
     id="Content"
     class="p-6 pb-24 min-h-screen flex flex-col justify-center"
   >
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Start Here
-    </h1>
+    <!-- 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>
 
     <!-- id used by puppeteer test script -->
     <div id="start-question" class="mt-8">

src/views/StatisticsView.vue

@@ -1,11 +1,25 @@
 <template>
-  <QuickNav selected="Profile"></QuickNav>
+  <QuickNav />
+
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Achievements & Statistics
-    </h1>
+    <!-- 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>
 
     <div>
       Here is a view of the activity you can see.
@@ -32,7 +46,7 @@
         {{ worldProperties.animationDurationSeconds }} seconds
       </div>
     </div>
-    <button class="float-right" @click="captureGraphics()">Screenshot</button>
+    <button class="float-right text-blue-600" @click="captureGraphics()">Screenshot</button>
     <div id="scene-container" class="h-screen"></div>
   </section>
 </template>

src/views/TestView.vue

@@ -1,11 +1,25 @@
 <template>
-  <QuickNav selected="Profile"></QuickNav>
+  <QuickNav />
+
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Test
-    </h1>
+    <!-- Breadcrumb -->
+    <div class="mb-8">
+      <!-- Back -->
+      <div class="text-lg text-center font-light relative px-7">
+        <h1
+          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
+          @click="$router.back()"
+        >
+          <fa icon="chevron-left" class="fa-fw"></fa>
+        </h1>
+      </div>
+
+      <!-- Heading -->
+      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+        Test
+      </h1>
+    </div>
 
     <div class="mb-8">
       <h2 class="text-xl font-bold mb-4">Notiwind Alert Test Suite</h2>
@@ -16,14 +30,14 @@
             {
               group: 'alert',
               type: 'toast',
-              text: 'I\'m a toast. Don\'t mind me.',
+              text: 'I\'m a toast. Without a timeout, I\'m stuck.',
             },
             5000,
           )
         "
-        class="font-bold uppercase bg-slate-400 text-white px-3 py-2 rounded-md mr-2"
+        class="font-bold uppercase bg-slate-900 text-white px-3 py-2 rounded-md mr-2"
       >
-        Toast (self-dismiss)
+        Toast
       </button>
 
       <button

sw_scripts/additional-scripts.js

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

vue.config.js

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

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 explict permission a two-step opt-in process
-where the user is first presented with a pre-permission dialog box that explains
+In order to provide this context and explicit permission, a two-step opt-in process
+first presents the user with a pre-permission dialog box that explains
 what the notifications are for and why they are useful. This may help reduce the
 possibility of users clicking "don't allow".
 
@@ -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 can specify what network requests it may
+Note that there is a scope that can specify what network requests it may
 intercept.
 
 The Vue project already has its own service worker but it is possible to
@@ -389,4 +389,14 @@ 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.
+- "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.)