fix the result count when the search filters change

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

README.md

@@ -1,4 +1,4 @@
-# kickstart-for-time-pwa
+# TimeSafari.app - Crowd-Funder for Time - PWA
 
 ## Project setup
 
@@ -26,31 +26,13 @@ npm run build
 npm run lint
 ```
 
+
+
+
 ## Tests
 
-### Web-push
-
-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:
 
@@ -66,14 +48,35 @@ 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.
+
+### 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
@@ -90,8 +93,8 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
 
 ### Clear data & restart
 
-Clear cache for localhost, then go to http://localhost:8080/start
-(because it'll generate a new one automatically if you start on the `/account` page).
+Clear the browser cache for localhost.
+
 
 
 
@@ -102,110 +105,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.sh

@@ -7,16 +7,14 @@
 # Usage: source ./openssl_signing_console.sh
 #
 # For a more complete explanation, see ./openssl_signing_console.rst
-#
-# It's crazy that raw execution only works about 20% of the time!
-# See https://stackoverflow.com/questions/77505582/why-would-openssl-verify-succeed-every-time-with-source-but-fail-80-of-the
 
 
+# Generate a key and extract the public part
 openssl ecparam -name secp256k1 -genkey -noout -out private.pem
 openssl ec -in private.pem -pubout -out public.pem
 
+# Use test data
 header='{"alg":"ES256K", "issuer": "", "typ":"JWT"}'
-
 payload='{"@context": "http://schema.org", "@type": "PlanAction", "identifier": "did:ethr:0xb86913f83A867b5Ef04902419614A6FF67466c12", "name": "Test", "description": "Me"}'
 
 header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
@@ -24,13 +22,11 @@ payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n' | base64 | tr -d '='
 
 signing_input="$header_b64.$payload_b64"
 
-signature=$(echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem)
+signature=$(echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem | openssl base64 -e)
+
+echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature" | openssl base64 -d)
 
-echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature")
 
-# Also tested this, to no avail.
-#echo -n "$signature" > sig.out
-#echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature sig.out
 
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
-  "name": "kickstart-for-time-pwa",
-  "version": "0.1.3",
+  "name": "crowd-funder-for-time-pwa",
+  "version": "0.1.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "kickstart-for-time-pwa",
-      "version": "0.1.3",
+      "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",

project.task.yaml

@@ -1,48 +1,41 @@
 
 tasks:
 
+- don't show "Give" & "Offer" on project screen if they don't have an identifier
+- allow some gives even if they aren't registered
+
 - 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
 
+- .5 allow to manage their notifications even without an identity
 - 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
-
 - .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
-- .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)
+
 - .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
+- .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164 assignee:trent
 - .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
+- fix cert generation (since it didn't happen automatically for Nov 30)
 
 - Discuss whether the remaining tasks are worthwhile before MVP release.
 
+- .1 Make give description text box into something that expands as they type?
 - 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
+- .5 make a VC details page, or link to endorser.ch
 - .1 Add units or different icon to the coins (to distinguish $, BTC, hours, etc)
-- .5 include the hash of the latest commit on help page next to version
+- .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
+- make identicons for contacts into more-memorable faces (and maybe change project identicons, too)
+- allow download of each VC (to show that they can actually own their data)
 
 - contacts v+ :
   - 01 Import all the non-sensitive data (ie. contacts & settings).
@@ -51,13 +44,14 @@ tasks:
 
 - stats v1 :
   - 01 show numeric stats
-  - 04 show different graphic for projects vs people on world
+  - 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)
 
 - Release Minimum Viable Product :
+  - .5 deploy endorser.ch server above Dec 1 (to get plan searches by names as well as descriptions)
   - 08 thorough testing for errors & edge cases
   - 01 ensure ability to recover server remotely, and add redundant access
   - Turn off stats-world or ensure it's usable (eg. cannot zoom out too far and lose world, cannot screenshot).
@@ -69,7 +63,9 @@ tasks:
   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
+- .5 on DiscoverView, switch to a filter UI (eg. just from friend
 
+- 24 Move to Vite
 - 32 accept images for projects
 - 32 accept images for contacts
 
@@ -99,11 +95,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?
 
@@ -111,6 +106,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/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/libs/endorserServer.ts

@@ -59,17 +59,40 @@ export interface GiveServerRecord {
   unit: string;
 }
 
+export interface OfferServerRecord {
+  amount: number;
+  amountGiven: number;
+  offeredByDid: string;
+  recipientDid: string;
+  requirementsMet: boolean;
+  unit: string;
+  validThrough: string;
+}
+
 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 };
 }
 
+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;
+}
+
 export interface PlanVerifiableCredential {
   "@context": "https://schema.org";
   "@type": "PlanAction";
@@ -152,7 +175,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 +195,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 +310,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/views/AccountViewView.vue

@@ -186,8 +186,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>

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,36 @@
   <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()">
+      <!--
+        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>
 
     <h1 class="text-4xl text-center font-light pt-4">Scan Contact Info</h1>
     <qrcode-stream @detect="onScanDetect" @error="onScanError" />
@@ -27,6 +42,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";
@@ -137,7 +153,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 +182,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

@@ -113,7 +113,7 @@
             <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)"
+              @click="setVisibility(contact, false, true)"
               title="They can see you"
             >
               <fa icon="eye" class="fa-fw" />
@@ -121,7 +121,7 @@
             <button
               v-else
               class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-              @click="setVisibility(contact, true)"
+              @click="setVisibility(contact, true, true)"
               title="They cannot see you"
             >
               <fa icon="eye-slash" class="fa-fw" />
@@ -137,7 +137,7 @@
 
             <button
               @click="register(contact)"
-              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+              class="text-sm uppercase bg-slate-500 text-white ml-6 px-2 py-1.5 rounded-md"
             >
               <fa
                 v-if="contact.registered"
@@ -155,7 +155,7 @@
 
             <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" />
@@ -531,6 +531,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,12 +540,28 @@ export default class ContactsView extends Vue {
           (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
           allContacts,
         );
+        this.setVisibility(newContact, true, false);
         this.$notify(
           {
             group: "alert",
             type: "success",
-            title: "Contact added",
-            text: newContact.name + " was added.",
+            title: "Contact Added",
+            text:
+              newContact.name +
+              " was added, and your activity is visible to them.",
+          },
+          -1,
+        );
+        // 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,
         );
@@ -556,7 +573,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 +583,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 +711,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 +727,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 +794,7 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "info",
-            title: "Refreshed",
+            title: "Visibility Refreshed",
             text:
               this.nameForContact(contact, true) +
               " can " +

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,8 +61,10 @@
             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>
@@ -86,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"
@@ -156,13 +160,12 @@ export default class DiscoverView extends Vue {
   apiServer = "";
   searchTerms = "";
   projects: ProjectData[] = [];
-  isChoosingSearchBox = false;
+  isLoading = false;
   isLocalActive = true;
   isRemoteActive = false;
-  localCount = 0;
-  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;
@@ -180,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> {
@@ -208,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) {
@@ -270,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,
@@ -371,7 +408,7 @@ 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);
   }

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,10 @@
         <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">What is your privacy policy?</h2>
@@ -165,17 +189,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 +219,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>

src/views/NewEditProjectView.vue

@@ -45,7 +45,7 @@
         type="checkbox"
         class="mr-2"
         v-model="includeLocation"
-        @change="includeLocation = true"
+        @click="includeLocation = !includeLocation"
       />
       <label for="includeLocation">Include Location</label>
     </div>

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

@@ -80,10 +80,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 +104,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 +119,7 @@
         <li
           v-for="contact in allContacts"
           :key="contact.did"
-          @click="openDialog(contact)"
+          @click="openGiftDialog(contact)"
         >
           <EntityIcon
             :entityId="contact.did"
@@ -134,7 +145,40 @@
     </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">
+          Offered To This Project
+        </h3>
+
+        <div v-if="offersToThis.length === 0">
+          (None yet. Record one above.)
+        </div>
+
+        <ul v-else class="text-sm border-t border-slate-300">
+          <li
+            v-for="offer in offersToThis"
+            :key="offer.id"
+            class="py-1.5 border-b border-slate-300"
+          >
+            <div class="flex justify-between gap-4">
+              <span>
+                <fa icon="user" class="fa-fw text-slate-400"></fa>
+                {{ didInfo(offer.agentDid, activeDid, allMyDids, allContacts) }}
+              </span>
+              <span v-if="offer.amount">
+                <fa icon="coins" class="fa-fw text-slate-400"></fa>
+                {{ 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 Project
@@ -166,44 +210,48 @@
         </ul>
       </div>
 
-      <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
-        <h3 class="text-sm uppercase font-semibold mb-3">
-          Contributions By This Project
-        </h3>
-        <button
-          @click="onClickLoadProject(fulfilledByThis.handleId)"
-          class="text-blue-500"
+      <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"
         >
-          {{ fulfilledByThis.name }}
-        </button>
-      </div>
+          <h3 class="text-sm uppercase font-semibold mb-3">
+            Contributions To This Project
+          </h3>
+          <ul>
+            <li v-for="plan in fulfillersToThis" :key="plan.handleId">
+              <button
+                @click="onClickLoadProject(plan.handleId)"
+                class="text-blue-500"
+              >
+                {{ plan.name }}
+              </button>
+            </li>
+          </ul>
+        </div>
 
-      <div
-        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 Project
-        </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 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 Project
+          </h3>
+          <button
+            @click="onClickLoadProject(fulfilledByThis.handleId)"
+            class="text-blue-500"
+          >
+            {{ 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>
 
@@ -214,6 +262,7 @@ 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";
@@ -222,6 +271,7 @@ import {
   didInfo,
   GiverInputInfo,
   GiveServerRecord,
+  OfferServerRecord,
   PlanServerRecord,
 } from "@/libs/endorserServer";
 import QuickNav from "@/components/QuickNav.vue";
@@ -236,7 +286,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;
@@ -250,10 +300,11 @@ export default class ProjectViewView extends Vue {
   fulfilledByThis: PlanServerRecord | null = null;
   fulfillersToThis: Array<PlanServerRecord> = [];
   givesToThis: Array<GiveServerRecord> = [];
+  issuer = "";
   latitude = 0;
   longitude = 0;
   name = "";
-  issuer = "";
+  offersToThis: Array<OfferServerRecord> = [];
   projectId = localStorage.getItem("projectId") || ""; // handle ID
   timeSince = "";
   truncatedDesc = "";
@@ -433,6 +484,42 @@ export default class ProjectViewView extends Vue {
       );
     }
 
+    const offersToUrl =
+      this.apiServer +
+      "/api/v2/report/offersToPlans?planIds=" +
+      encodeURIComponent(JSON.stringify([projectId]));
+    try {
+      const resp = await this.axios.get(offersToUrl, { headers });
+      if (resp.status === 200 && resp.data.data) {
+        this.offersToThis = resp.data.data;
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Failed to retrieve offers 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 offers to this project.",
+        },
+        -1,
+      );
+      console.error(
+        "Error retrieving offers to this project:",
+        serverError.message,
+      );
+    }
+
     const fulfilledByUrl =
       this.apiServer +
       "/api/v2/report/planFulfilledByPlan?planHandleId=" +
@@ -533,8 +620,12 @@ 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();
   }
 }
 </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

@@ -1,4 +1,6 @@
 <template>
+  <QuickNav />
+
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
@@ -105,6 +107,7 @@ import {
 
 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;
@@ -119,6 +122,7 @@ interface Notification {
 
 @Component({
   components: {
+    QuickNav,
     LRectangle,
     LMap,
     LMarker,
@@ -214,6 +218,7 @@ export default class DiscoverView extends Vue {
           },
           -1,
         );
+        this.$router.back();
       } catch (err) {
         this.$notify(
           {

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>