make the home screen elements load more quickly

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

.env.development

@@ -0,0 +1,3 @@
+
+# I tried and failed to set things here with vue-cli-service but
+# things may be more reliable with vite so let's try again.

.env.production

@@ -0,0 +1,4 @@
+# Only the variables that start with VITE_ are seen in the application process.env in Vue.
+VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01GXYPFF7FA03NXKPYY142PY4H
+VITE_DEFAULT_ENDORSER_API_SERVER=https://api.endorser.ch
+VITE_DEFAULT_IMAGE_API_SERVER=https://image-api.timesafari.app

.eslintrc.js

@@ -2,6 +2,7 @@ module.exports = {
   root: true,
   env: {
     node: true,
+    es2022: true,
   },
   extends: [
     "plugin:vue/vue3-essential",
@@ -9,9 +10,9 @@ module.exports = {
     "@vue/typescript/recommended",
     "plugin:prettier/recommended",
   ],
-  parserOptions: {
-    ecmaVersion: 2020,
-  },
+  // parserOptions: {
+  //   ecmaVersion: 2020,
+  // },
   rules: {
     "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
     "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",

CHANGELOG.md

@@ -6,13 +6,55 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-### Changed in DB
-- ?
+### Changed in DB or environment
+- Nothing
 
 
-## [0.2.14] - 2024.02.14
+## [0.3.7] - 2024.04-10 - cf18f1543a700d62a5f9e764905a4aafe1fb229b
+### Added
+- Filter on home page feed
+- Ability to set time of daily notification
+- Jump to app on click of notification
 ### Changed
-- Combine all service worker scripts into a single file
+- Built with vite
+- Descriptions on home page to include projects
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.6] - 2024.03.24 - 3a07e31d6313ab95711265562d9023c42916e141
+### Added
+- Button to mirror photo during video
+- More detailed onboarding help screen
+- Public-data blurb
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.5] - 2024.03.23 - 28754bdfb1e11aa221dd49a5dce4219b69cf6a9d
+### Added
+- Photo on gift records
+### Fixed
+- Environment variable for BVC meetings project
+- Environment variables and build enhancements for test vs prod
+### Changed in DB or environment
+- New environment variable for image API server
+- Test that a new browser session will get the right default APIs.
+- Test that a new browser session will send the right BVC meetings project.
+
+
+## [0.2.17] - 2024.03.01 - 3612ea42240c5e1b7d7eff29a39ff18f1b869b36
+### Added
+- Shortcut page for Bountiful Voluntaryist Community
+### Changed
+- More readable, targeted summaries in home-page feed items
+### Changed in DB
+- Nothing
+
+
+## [0.2.14] - 2024.02.14 - 5f9edea1167dbfb64e16648764eed8c09b24eaeb
+### Changed
+- Combine all service worker scripts into a single file.
 ### Changed in DB
 - Nothing
 

README.md

@@ -18,6 +18,11 @@ npm install
 
 ### Compiles and hot-reloads for development
 ```
+npm run dev
+```
+
+### Builds the production app
+```
 npm run serve
 ```
 
@@ -32,21 +37,33 @@ npm run lint
 
 * `npx prettier --write ./sw_scripts/`
 
-* Update the project.task.yaml & CHANGELOG.md & the version in package.json, run `npm install`, and commit.
+* Update the project.task.yaml & CHANGELOG.md & the version in package.json, run `npm install`.
 
-* [Tag wth the new version.](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases)
+* Record what version is currently on production.
 
-... though maybe you do that after testing and release, since that isn't used in the build (and you often increment a lot during testing).
+* Run the correct build
 
-* If production: change src/constants/app.ts DEFAULT_*_SERVER to be "PROD" and package.json to remove "_Test". Also record what version is on production.
+  * Test
+```
+# (Let's replace this with a .env.development or .env.staging file.)
+# The test BVC_MEETUPS_PROJECT_CLAIM_ID does not resolve as a URL because it's only in the test DB and the prod redirect won't redirect there.
+TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app npm run build
+```
 
-* `npm run build`
+  * Production
+```
+# This picks up values from .env.production
+npm run build
+```
 
-* Get on the server and back up the time-safari folder.
+* Get on the server and back up 3 DBs and the time-safari folder.
 
 * `rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari`
 
-* Revert src/constants/app.ts and package.json (if that was prod), edit package.json to increment version & add "-beta", `npm install`, and commit. Tag if you didn't before. Also record what version is on production.
+* Commit changes. Record the new hash in the changelog. Edit package.json to increment version & add "-beta", `npm install`, and commit. Also record what version is on production.
+
+* [Tag with the new version.](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases)
+
 
 
 
@@ -82,7 +99,7 @@ To add an icon, add to main.ts and reference with `fa` element and `icon` attrib
 - Use a mobile user as well as a desktop user.
 - Backup seed & data & get a CSV dump from Endorser Mobile.
 - Check that the version is updated.
-- Clear the browser data & add identity & import Time Safari contacts and then CSV contacts.
+  - Clear the browser data & add identity & import Time Safari contacts and then CSV contacts.
 - Make sure that it's using the test API (under Identity in 'Advanced').
 - Clear the browser data again. (See "Reset" below.)
   - Go to the account page before visiting the home page to see that there is no ID.
@@ -114,7 +131,7 @@ To add an icon, add to main.ts and reference with `fa` element and `icon` attrib
 
 * Clear cache for site. (In Chrome, go to `chrome://settings/cookies` and "all site data and permissions"; in Firefox, go to `about:preferences` and search for "cache" then "Manage Data", and also manually remove the IndexedDB data if the DBs still show.)
 * Clear notification permission. (In Chrome, go to `chrome://settings/content/notifications`; in Firefox, go to `about:preferences` and search for "notifications".)
-* Unregister service worker. (In Chrome, go to `chrome://serviceworker-internals/`; in Firefox, go to `about:serviceworkers`.)
+* Unregister service worker. (In Chrome, go to `chrome://serviceworker-internals`; in Firefox, go to `about:serviceworkers`.)
 * Clear Cache Storage manually, possibly deleting the DB. (In Chrome, in dev tools under Application; in Firefox, in dev tools under Storage.)
 
 (If you find more, add them to the HelpNotificationsView.vue file.)

babel.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  presets: ["@vue/cli-plugin-babel/preset"],
-};

index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="/favicon.ico">
+    <title>TimeSafari</title>
+  </head>
+  <body>
+    <noscript>
+      <strong>We're sorry but TimeSafari doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>

package.json

@@ -1,93 +1,93 @@
 {
-  "name": "TimeSafari_Test",
-  "version": "0.2.15-beta",
+  "name": "TimeSafari",
+  "version": "0.3.8-beta",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
+    "dev": "vite",
+    "serve": "vite preview",
+    "build": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build",
+    "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
+    "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
+    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js"
   },
   "dependencies": {
-    "@dicebear/collection": "^5.3.5",
-    "@dicebear/core": "^5.3.5",
+    "@dicebear/collection": "^5.4.1",
+    "@dicebear/core": "^5.4.1",
     "@ethersproject/hdnode": "^5.7.0",
-    "@fortawesome/fontawesome-svg-core": "^6.4.2",
-    "@fortawesome/free-solid-svg-icons": "^6.4.2",
-    "@fortawesome/vue-fontawesome": "^3.0.3",
+    "@fortawesome/fontawesome-svg-core": "^6.5.1",
+    "@fortawesome/free-solid-svg-icons": "^6.5.1",
+    "@fortawesome/vue-fontawesome": "^3.0.6",
     "@pvermeer/dexie-encrypted-addon": "^3.0.0",
-    "@tweenjs/tween.js": "^21.0.0",
+    "@tweenjs/tween.js": "^21.1.1",
     "@types/js-yaml": "^4.0.9",
-    "@veramo/core": "^5.4.1",
-    "@veramo/credential-w3c": "^5.4.1",
-    "@veramo/data-store": "^5.4.1",
-    "@veramo/did-manager": "^5.4.1",
-    "@veramo/did-provider-ethr": "^5.4.1",
-    "@veramo/did-resolver": "^5.4.1",
-    "@veramo/key-manager": "^5.4.1",
-    "@vueuse/core": "^10.4.1",
+    "@types/luxon": "^3.4.2",
+    "@veramo/core": "^5.6.0",
+    "@veramo/credential-w3c": "^5.6.0",
+    "@veramo/data-store": "^5.6.0",
+    "@veramo/did-manager": "^5.6.0",
+    "@veramo/did-provider-ethr": "^5.6.0",
+    "@veramo/did-resolver": "^5.6.0",
+    "@veramo/key-manager": "^5.6.0",
+    "@vueuse/core": "^10.9.0",
     "@zxing/text-encoding": "^0.9.0",
-    "axios": "^1.5.0",
-    "buffer": "^6.0.3",
+    "axios": "^1.6.8",
     "class-transformer": "^0.5.1",
-    "core-js": "^3.32.1",
-    "dexie": "^3.2.4",
-    "dexie-export-import": "^4.0.7",
-    "did-jwt": "^7.2.7",
-    "ethereum-cryptography": "^2.1.2",
+    "dexie": "^3.2.7",
+    "dexie-export-import": "^4.1.1",
+    "did-jwt": "^7.4.7",
+    "ethereum-cryptography": "^2.1.3",
     "ethereumjs-util": "^7.1.5",
     "ethr-did-resolver": "^8.1.2",
-    "git-describe": "^4.1.1",
     "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
     "js-yaml": "^4.1.0",
-    "localstorage-slim": "^2.5.0",
-    "luxon": "^3.4.3",
+    "localstorage-slim": "^2.7.0",
+    "lru-cache": "^10.2.0",
+    "luxon": "^3.4.4",
     "merkletreejs": "^0.3.11",
-    "moment": "^2.29.4",
+    "moment": "^2.30.1",
     "notiwind": "^2.0.2",
     "papaparse": "^5.4.1",
     "pina": "^0.20.2204228",
-    "pinia-plugin-persistedstate": "^3.2.0",
+    "pinia-plugin-persistedstate": "^3.2.1",
     "qr-code-generator-vue3": "^1.4.21",
-    "ramda": "^0.29.0",
-    "readable-stream": "^4.4.2",
-    "reflect-metadata": "^0.1.13",
+    "ramda": "^0.29.1",
+    "readable-stream": "^4.5.2",
+    "reflect-metadata": "^0.1.14",
     "register-service-worker": "^1.7.2",
+    "simple-vue-camera": "^1.1.3",
     "three": "^0.156.1",
     "ua-parser-js": "^1.0.37",
     "util": "^0.12.5",
-    "vue": "^3.3.4",
+    "vue": "^3.4.21",
     "vue-axios": "^3.5.2",
-    "vue-facing-decorator": "^3.0.2",
-    "vue-qrcode-reader": "^5.4.1",
-    "vue-router": "^4.2.4",
+    "vue-facing-decorator": "^3.0.4",
+    "vue-picture-cropper": "^0.7.0",
+    "vue-qrcode-reader": "^5.5.3",
+    "vue-router": "^4.3.0",
     "web-did-resolver": "^2.0.27"
   },
   "devDependencies": {
-    "@types/leaflet": "^1.9.4",
-    "@types/ramda": "^0.29.3",
+    "@types/leaflet": "^1.9.8",
+    "@types/ramda": "^0.29.11",
     "@types/three": "^0.155.1",
     "@types/ua-parser-js": "^0.7.39",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "@vitejs/plugin-vue": "^5.0.4",
     "@vue-leaflet/vue-leaflet": "^0.10.1",
-    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-eslint": "~5.0.8",
-    "@vue/cli-plugin-pwa": "~5.0.8",
-    "@vue/cli-plugin-router": "~5.0.8",
-    "@vue/cli-plugin-typescript": "~5.0.8",
-    "@vue/cli-plugin-vuex": "~5.0.8",
-    "@vue/cli-service": "~5.0.8",
     "@vue/eslint-config-typescript": "^11.0.3",
-    "autoprefixer": "^10.4.15",
-    "eslint": "^8.53.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-vue": "^9.17.0",
+    "autoprefixer": "^10.4.19",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-vue": "^9.23.0",
     "leaflet": "^1.9.4",
-    "postcss": "^8.4.29",
-    "prettier": "^3.1.0",
-    "tailwindcss": "^3.3.3",
-    "typescript": "~5.2.2"
+    "postcss": "^8.4.38",
+    "prettier": "^3.2.5",
+    "tailwindcss": "^3.4.1",
+    "typescript": "~5.2.2",
+    "vite": "^5.2.0",
+    "vite-plugin-pwa": "^0.19.8"
   }
 }

project.task.yaml

@@ -1,165 +1,4 @@
 
 tasks :
 
-- 01 release server & client for fix to project-editing
-
-- .5 fix timeSafari.org cert renewals
-- .2 anchor hash into BTC
-- .1 add step 1 to onboarding hints to "install"
-
-- 01 bookmarks for BVC
-
-- 24 compelling UI for credential presentations
-  - discover who in my network has activity on a project
-- 24 compelling UI for statistics (eg. World?)
-
-- .5 stop from seeing an error on the first page when browser doesn't support service workers (which I've seen on iPhone; visible in Firefox private window)
-- .2 add links between projects
-- 32 image on give :
-  - Show a camera to take a picture
-  - Scale the image to a reasonable size
-  - Upload to a public readable place
-  - check the rate limits
-  - use CID
-  - put the image URL in the claim
-  - Rates - images erased?
-  - image not associated with JWT ULID since that's assigned later
-
-- 24 make the contact browsing on the front page something that invites more action
-
-- .2 list the "show more" contacts alphabetically
-- .5 change server plan & project endpoints to use jwtId as identifier rather than rowid
-- 16 edit offers & gives, or revoke allowing re-creation
-- .1 When available in the server, give message for 'nonAmountGiven' on offers on ProjectsView page.
-- .1 Add help instructions for "Encryption key has changed" error. (It is a problem if localStorage is cleared, but the contacts & settings remain and they have to restore their seeds.)
-- .5 add more detail on TimeSafari.org
-- .1 show better error when user with no ID goes to the "My Project" page
-- 08 add button to front page to prompt for ideas for gratitude :
-  - show previous on "Your" screen
-  - checkboxes - randomize vs show in order, show non-person-oriented messages, show only contacts, show only projects
-
-- 08 allow user to add a time when they want their daily notification
-
-- .5 prompt for the name directly when they visit the QR scan page
-- 01 mark a project as inactive
-- 01 add share button for sending a message to confirmers when we can't see the claim (like the "visible" links)
-- .5 add TimeSafari as a shareable app https://developer.mozilla.org/en-US/docs/Web/Manifest/share_target
-- .5 choose a project's alternative agent ("authorized representative") via a contact chooser (not just copy-paste a DID)
-- .5 find out why clicking quickly back-and-forth onto the "my project" page often shows error "You need an identifier to load your projects." (easier to reproduce on desktop?)
-- .5 bug - it didn't show the "fulfills offer" on the claim detail page for a give that had one - https://test.timesafari.app/claim/01HMFWRPA3PD6Q9EYFKX3MC41J
-- 01 replace all "confirm" prompts with nicer modal
-- .1 hide project-create button on project page if not registered
-- .1 hide offer & give buttons on project list page if not registered
-- .1 add cursor-pointer on the icons for giving on the project page, and on the list of projects on the discover page
-- .2 record when InfiniteScroll hits the end of the list and don't trigger any more loads
-
-- bug - turning notifications on from the help screen did not stay, though account screen toggle did stay (From Jason on iPhone.)
-- refactor - supply the projectId to the OfferDialog just like we do with the GiftedDialog offerId (in the "open" method, maybe as well as an attribute)
-- the confirm button on each give on the ProjectViewView page doesn't have all the context of the ClaimView page, so it can show sometimes inappropriately; consider consolidation
-- make the "give" on contact screen work like other give (allowing donation vs current blank)
-- .2 on ClaimView, the "ask someone" should refer to "visible" IDs, or to confirmations only if confirmations are visible
-- message "send them to this page" on ClaimView should be a link (for installed app)
-- When we update a version, desktop browser users have seen nothing happen after clicking on the contact page QR and on the account page "Help"; errors show in the console. Reload fixed it. If this happens on mobile, ask the user to reload.
-
-- 01 show my VCs - most interesting, or via search
-- 04 allow user to download & prove chains of VCs, mine + ones I can see about me from others
-
-- show feed of offers, new projects, etc -- maybe limited to my search area
-
-- revenue to support server operation
-
-- copy button for seed
-- .5 If notifications are not enabled, add message to front page with link/button to enable
-- make server endpoint for full English description of limits
-- create a help-desk document & add screenshots
-
-- .1 update "offer" units to have same functionality as "give" units
-- 01 on home page, prompt for install check in addition to "supports notifications" check (since they won't get notified if Chrome is closed)
-- 01 on Mac (& Windows?) desktop, add a help blurb so that they can find it again (since it doesn't show in Application list)
-- bug (that is hard to reproduce) - got error adding on Firefox user #0 as contact for themselves
-- bug (that is hard to reproduce) - in Chrome, install app then delete app and try from Chrome browser and see log errors "Uncaught TypeError: self.appendDailyLog is not a function"
-- bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent
-- 04 remove 'rowid' references (that are sqlite-specific); may involve server
-- 04 look at other examples for better onboarding UI, eg friend.tech
-- .5 Add inactive flag / end date, 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?
-- .2 Show a warning if both giver and recipient are the same (but still allow?)
-- 01 Would it look better to shrink the buttons on many pages so they don't expand to the width of the screen? assignee-group:ui
-- .5 Display a more appealing confirmation on the map when erasing the marker
-- .5 remove references to localStorage for projectId (now that it's pulling from the path)
-- switch some checks for activeDid to check for isRegistered
-- .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
-- .5 fix cert generation on server (since it didn't happen automatically for Nov 30)
-- warn if they're using the web (android only?)
-  https://developer.mozilla.org/en-US/docs/Web/API/Navigator/getInstalledRelatedApps
-  https://web.dev/articles/get-installed-related-apps
-- .5 fix the "onboarding help" list of instructions so that it always formats right (currently doesn't show numbers aligned on Google Pixel 6a, iPhone 11 Pro, iPhone 12 mini)
-- .5 make the "onboarding help" it so that it doesn't cover the QR icon on the contacts page
-- .5 fix masked icon (because some of the top-right of the binoculars is cut off)
-
-- contacts v+ :
-  - 01 Import all the non-sensitive data (ie. contacts & settings).
-  - .2 show error to user when adding a duplicate contact
-  - 01 parse input more robustly (with CSV lib and not commas)
-
-- stats v1 :
-  - 01 show numeric stats
-  - 04 show different graphic for projects vs people (gnome?) on world
-  - 01 link to world for specific stats
-  - .5 don't load another instance of a bush if it already exists
-  - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
-  - 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie)
-
-- .5 show seed phrase in a QR code for transfer to another device
-- .5 on DiscoverView, switch to a filter UI (eg. just from friend
-- .5 don't show "Offer" on project screen if they aren't registered
-
-- 24 Move to Vite
-- 32 accept images for projects
-- 32 accept images for contacts
-- import project interactions from GitHub/GitLab and manage signing
-
-- show total time offered to & fulfilled to a project
-- show total time offered by & fulfilled by a contact
-
-- linking between projects or plans :
-  - show total time given to & from a project
-  - terminology:
-    - for subtasks: fulfills (is it really the same?), feeds, contributes to, supplies, boosts, advances
-    - for blocking: blocks, precedes, comes before, is sought by -- vs follows, seeks, builds on ("contributes to" isn't specific enough, "succeeds" has different, possibly confusing meaning)
-
-- .5 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
-  - 04 show gives spreading to other places
-  - badge for most gives/receives/confirms per day/week/month
-  - badge for amount given/offered to your project
-  - set a goal of given/offers
-
-- automated tests, eg. pup-test or cypress
-
-- Notifications (wake on the phone, push notifications)
-  - 02 change push server so that the web-push/subscribe call sets up a thread for the 10-seconds-later push notification, but returns immediately to the callee
-  - pull instead of push, maybe via scheduled runs
-  - have a notification pop-up on Mac screen
-
-- 16 Connect with phone contacts - this may be a whole different app, because we want a quick link A) to the same phone contact and B) from the phone contact app
-
-- Support KERI AIDs
-- Support Peer DIDs
-- Support messaging through DIDComm
-- Write to or read from a different ledger (eg. private ACDC, EAS & attest.sh)
-
-- 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.
-
-- allow some gives even if they aren't registered - maybe someday as a gift to the world, but we really want this to be built via personal connections -- and that allows spam
-- .1 When Chrome shows compatibility https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
-  then change the canShare check in this app to check the real canShare() method.
-
-log :
-- videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29
-- project lists, contact totals & actions, multiple identifiers, stats-world, activity feed, rename of this project file (use "--follow --") milestone:2 done:2023-06-27
+- This list has moved - see https://sharing.clickup.com/9014278710/l/h/6-901402735154-1/685f1be3f9b150d

public/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>

src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <router-view />
 
-  <!-- https://github.com/emmanuelsw/notiwind -->
+  <!-- Messages in the upper-right - https://github.com/emmanuelsw/notiwind -->
   <NotificationGroup group="alert">
     <div
       class="fixed top-4 right-4 w-full max-w-sm flex flex-col items-start justify-end"
@@ -129,6 +129,7 @@
     </div>
   </NotificationGroup>
 
+  <!-- These are general-purpose messages - except there are some for turning app notifications on and off. -->
   <NotificationGroup group="modal">
     <div class="fixed z-[100] top-0 inset-x-0 w-full">
       <Notification
@@ -148,6 +149,39 @@
           class="w-full"
           role="alert"
         >
+          <!-- type "confirm" will post a message and, with onYes function, show a "Yes" button to call that function -->
+          <div
+            v-if="notification.type === 'confirm'"
+            class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
+          >
+            <div
+              class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
+            >
+              <div class="w-full px-6 py-6 text-slate-900 text-center">
+                <p class="text-lg mb-4">
+                  {{ notification.title }}
+                </p>
+
+                <button
+                  v-if="notification.onYes"
+                  @click="
+                    notification.onYes();
+                    close(notification.id);
+                  "
+                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
+                >
+                  Yes
+                </button>
+
+                <button
+                  @click="close(notification.id)"
+                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
+                >
+                  {{ notification.onYes ? "Cancel" : "Close" }}
+                </button>
+              </div>
+            </div>
+          </div>
           <div
             v-if="notification.type === 'notification-permission'"
             class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
@@ -157,7 +191,7 @@
             >
               <div class="w-full px-6 py-6 text-slate-900 text-center">
                 <p v-if="serviceWorkerReady" class="text-lg mb-4">
-                  Would you like to <b>turn on</b> notifications for this app?
+                  Would you like to be notified of new activity once a day?
                 </p>
                 <p v-else class="text-lg mb-4">
                   Waiting for system initialization, which may take up to 10
@@ -165,22 +199,42 @@
                   <fa icon="spinner" spin />
                 </p>
 
-                <button
-                  v-if="serviceWorkerReady"
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                  @click="
-                    close(notification.id);
-                    turnOnNotifications();
-                  "
-                >
-                  Turn on Notifications
-                </button>
+                <div v-if="serviceWorkerReady">
+                  <span class="flex flex-row justify-center">
+                    <span class="mt-2">Yes, tell me at: </span>
+                    <input
+                      type="number"
+                      class="rounded-l border border-r-0 border-slate-400 ml-2 mt-2 px-2 py-2 text-center w-20"
+                      v-model="hourInput"
+                    />
+                    <span
+                      class="rounded-r border border-slate-400 bg-slate-200 text-center text-blue-500 mt-2 px-2 py-2 w-20"
+                      @click="hourAm = !hourAm"
+                    >
+                      <span v-if="hourAm"> AM <fa icon="chevron-down" /> </span>
+                      <span v-else> PM <fa icon="chevron-up" /> </span>
+                    </span>
+                  </span>
+                  <button
+                    class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white mt-2 px-2 py-2 rounded-md"
+                    @click="
+                      () => {
+                        if (checkHour()) {
+                          close(notification.id);
+                          turnOnNotifications();
+                        }
+                      }
+                    "
+                  >
+                    Turn on Daily Message
+                  </button>
+                </div>
 
                 <button
                   @click="close(notification.id)"
-                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
+                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white mt-4 px-2 py-2 rounded-md"
                 >
-                  Maybe Later
+                  No, Not Now
                 </button>
               </div>
             </div>
@@ -263,8 +317,11 @@
 <style></style>
 
 <script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
 import axios from "axios";
+import { Vue, Component } from "vue-facing-decorator";
+
+import * as libsUtil from "@/libs/util";
+
 interface ServiceWorkerMessage {
   type: string;
   data: string;
@@ -288,24 +345,23 @@ interface VapidResponse {
   };
 }
 
-import { DEFAULT_PUSH_SERVER } from "@/constants/app";
+interface PushSubscriptionWithTime extends PushSubscriptionJSON {
+  notifyTime: { utcHour: number };
+}
+
+import { DEFAULT_PUSH_SERVER, NotificationIface } from "@/constants/app";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { sendTestThroughPushServer } from "@/libs/util";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component
 export default class App extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   b64 = "";
-  serviceWorkerReady = false;
+  hourAm = true;
+  hourInput = "8";
+  serviceWorkerReady = true;
 
   async mounted() {
     try {
@@ -316,25 +372,29 @@ export default class App extends Vue {
         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 (pushUrl.startsWith("http://localhost")) {
+        console.log("Not checking for VAPID in this local environment.");
+      } else {
+        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,
-        );
+        if (!this.b64) {
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error Setting Notifications",
+              text: "Could not set notifications.",
+            },
+            -1,
+          );
+        }
       }
     } catch (error) {
       if (window.location.host.startsWith("localhost")) {
@@ -434,6 +494,48 @@ export default class App extends Vue {
     });
   }
 
+  // this allows us to show an error without closing the dialog
+  checkHour() {
+    if (!libsUtil.isNumeric(this.hourInput)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Not a Number",
+          text: "The time must be an hour number.",
+        },
+        5000,
+      );
+      return false;
+    }
+    const hourNum = libsUtil.numberOrZero(this.hourInput);
+    if (!Number.isInteger(hourNum)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Not a Whole Number",
+          text: "The time must be a whole hour number.",
+        },
+        5000,
+      );
+      return false;
+    }
+    if (hourNum < 1 || 12 < hourNum) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Not a Whole Number",
+          text: "The time must be an hour between 1 and 12.",
+        },
+        5000,
+      );
+      return false;
+    }
+    return true;
+  }
+
   public async turnOnNotifications() {
     return this.askPermission()
       .then((permission) => {
@@ -459,13 +561,25 @@ export default class App extends Vue {
                 },
                 -1,
               );
-              this.sendSubscriptionToServer(subscription);
-              return subscription;
+              // we already checked that this is a valid hour number
+              const rawHourNum = libsUtil.numberOrZero(this.hourInput);
+              const adjHourNum = rawHourNum + (this.hourAm ? 0 : 12);
+              const hourNum = adjHourNum % 24;
+              const utcHour =
+                hourNum + Math.round(new Date().getTimezoneOffset() / 60);
+              const finalUtcHour = (utcHour + (utcHour < 0 ? 24 : 0)) % 24;
+
+              const subscriptionWithTime: PushSubscriptionWithTime = {
+                notifyTime: { utcHour: finalUtcHour },
+                ...subscription.toJSON(),
+              };
+              await this.sendSubscriptionToServer(subscriptionWithTime);
+              return subscriptionWithTime;
             } else {
               throw new Error("Subscription object is not available.");
             }
           })
-          .then(async (subscription) => {
+          .then(async (subscription: PushSubscriptionWithTime) => {
             console.log(
               "Subscription data sent to server and all finished successfully.",
             );
@@ -556,7 +670,7 @@ export default class App extends Vue {
   }
 
   private sendSubscriptionToServer(
-    subscription: PushSubscription,
+    subscription: PushSubscriptionWithTime,
   ): Promise<void> {
     console.log("About to send subscription...", subscription);
     return fetch("/web-push/subscribe", {
@@ -589,7 +703,7 @@ export default class App extends Vue {
         }
       })
       .catch((error) => {
-        console.log("Push provider server communication failed:", error);
+        console.error("Push provider server communication failed:", error);
         return false;
       });
 
@@ -604,7 +718,7 @@ export default class App extends Vue {
         return response.ok;
       })
       .catch((error) => {
-        console.log("Push server communication failed:", error);
+        console.error("Push server communication failed:", error);
         return false;
       });
 

src/assets/styles/tailwind.css

@@ -1,9 +1,8 @@
+@import url('https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&display=swap');
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
-@import url('https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&display=swap');
-
 @layer base {
     html {
         font-family: 'Work Sans', ui-sans-serif, system-ui, sans-serif !important;

src/components/EntityIcon.vue

@@ -5,20 +5,29 @@
 import { createAvatar, StyleOptions } from "@dicebear/core";
 import { avataaars } from "@dicebear/collection";
 import { Vue, Component, Prop } from "vue-facing-decorator";
+import { Contact } from "@/db/tables/contacts";
 
 @Component
 export default class EntityIcon extends Vue {
-  @Prop entityId = "";
+  @Prop contact: Contact;
+  @Prop entityId = ""; // overridden by contact.did or profileImageUrl
   @Prop iconSize = 0;
+  @Prop profileImageUrl = ""; // overridden by contact.profileImageUrl
 
   generateIcon() {
-    const options: StyleOptions<object> = {
-      seed: this.entityId || "",
-      size: this.iconSize,
-    };
-    const avatar = createAvatar(avataaars, options);
-    const svgString = avatar.toString();
-    return svgString;
+    const imageUrl = this.contact?.profileImageUrl || this.profileImageUrl;
+    if (imageUrl) {
+      return `<img src="${imageUrl}" alt="avatar" width="${this.iconSize}" height="${this.iconSize}" />`;
+    } else {
+      const identifier = this.contact?.did || this.entityId;
+      const options: StyleOptions<object> = {
+        seed: (identifier as string) || "",
+        size: this.iconSize,
+      };
+      const avatar = createAvatar(avataaars, options);
+      const svgString = avatar.toString();
+      return svgString;
+    }
   }
 }
 </script>

src/components/FeedFilters.vue

@@ -0,0 +1,219 @@
+<template>
+  <div v-if="visible" id="dialogFeedFilters" class="dialog-overlay">
+    <div class="dialog">
+      <h1 class="text-xl font-bold text-center mb-4">Feed Filters</h1>
+
+      <p class="mb-4 font-bold">Show only activities that…</p>
+
+      <div class="grid grid-cols-1 gap-2">
+        <div
+          class="flex items-center justify-between cursor-pointer"
+          @click="toggleHasVisibleDid()"
+        >
+          <!-- label -->
+          <div>Include someone visible to me</div>
+          <!-- toggle -->
+          <div class="relative ml-2">
+            <!-- input -->
+            <input
+              type="checkbox"
+              v-model="hasVisibleDid"
+              name="toggleFilterFromMyContacts"
+              class="sr-only"
+            />
+            <!-- line -->
+            <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+            <!-- dot -->
+            <div
+              class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
+            ></div>
+          </div>
+        </div>
+
+        <em>or</em>
+
+        <div
+          class="flex items-center justify-between cursor-pointer"
+          @click="
+            hasSearchBox
+              ? toggleNearby()
+              : $router.push({ name: 'search-area' })
+          "
+        >
+          <!-- label -->
+          <div>Are nearby</div>
+          <!-- toggle -->
+          <div v-if="hasSearchBox" class="relative ml-2">
+            <!-- input -->
+            <input
+              type="checkbox"
+              v-model="isNearby"
+              name="toggleFilterNearby"
+              class="sr-only"
+            />
+            <!-- line -->
+            <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+            <!-- dot -->
+            <div
+              class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
+            ></div>
+          </div>
+          <div v-else class="relative ml-2">
+            <button class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500">
+              Select Location
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <div class="grid grid-cols-1 sm:grid-cols-3 gap-2 mt-4">
+        <button
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+          @click="setAll()"
+        >
+          Set All
+        </button>
+        <button
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+          @click="clearAll()"
+        >
+          Clear All
+        </button>
+        <button
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+          @click="done()"
+        >
+          Done
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Vue, Component } from "vue-facing-decorator";
+import {
+  LMap,
+  LMarker,
+  LRectangle,
+  LTileLayer,
+} from "@vue-leaflet/vue-leaflet";
+
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { db } from "@/db/index";
+
+@Component({
+  components: {
+    LRectangle,
+    LMap,
+    LMarker,
+    LTileLayer,
+  },
+})
+export default class FeedFilters extends Vue {
+  onCloseIfChanged = () => {};
+  hasSearchBox = false;
+  hasVisibleDid = false;
+  isNearby = false;
+  settingChanged = false;
+  visible = false;
+
+  async open(onCloseIfChanged: () => void) {
+    this.onCloseIfChanged = onCloseIfChanged;
+
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.hasVisibleDid = !!settings?.filterFeedByVisible;
+    this.isNearby = !!settings?.filterFeedByNearby;
+    if (settings?.searchBoxes && settings.searchBoxes.length > 0) {
+      this.hasSearchBox = true;
+    }
+
+    this.settingChanged = false;
+    this.visible = true;
+  }
+
+  toggleHasVisibleDid() {
+    this.settingChanged = true;
+    this.hasVisibleDid = !this.hasVisibleDid;
+    db.settings.update(MASTER_SETTINGS_KEY, {
+      filterFeedByVisible: this.hasVisibleDid,
+    });
+  }
+
+  toggleNearby() {
+    this.settingChanged = true;
+    this.isNearby = !this.isNearby;
+    db.settings.update(MASTER_SETTINGS_KEY, {
+      filterFeedByNearby: this.isNearby,
+    });
+  }
+
+  async clearAll() {
+    if (this.hasVisibleDid || this.isNearby) {
+      this.settingChanged = true;
+    }
+
+    db.settings.update(MASTER_SETTINGS_KEY, {
+      filterFeedByNearby: false,
+      filterFeedByVisible: false,
+    });
+
+    this.hasVisibleDid = false;
+    this.isNearby = false;
+  }
+
+  async setAll() {
+    if (!this.hasVisibleDid || !this.isNearby) {
+      this.settingChanged = true;
+    }
+
+    db.settings.update(MASTER_SETTINGS_KEY, {
+      filterFeedByNearby: true,
+      filterFeedByVisible: true,
+    });
+
+    this.hasVisibleDid = true;
+    this.isNearby = true;
+  }
+
+  close() {
+    if (this.settingChanged) {
+      this.onCloseIfChanged();
+    }
+    this.visible = false;
+  }
+
+  done() {
+    this.close();
+  }
+}
+</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;
+}
+
+#dialogFeedFilters.dialog-overlay {
+  z-index: 99999;
+  overflow: scroll;
+}
+
+.dialog {
+  background-color: white;
+  padding: 1rem;
+  border-radius: 0.5rem;
+  width: 100%;
+  max-width: 500px;
+}
+</style>

src/components/GiftedDialog.vue

@@ -10,23 +10,22 @@
         placeholder="What was received"
         v-model="description"
       />
-      <div class="flex flex-row">
+      <div class="flex flex-row justify-center">
         <span
-          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 w-1/3 text-center text-blue-500 px-2 py-2"
+          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
           @click="changeUnitCode()"
         >
           {{ libsUtil.UNIT_SHORT[unitCode] }}
         </span>
         <div
           class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
-          @click="decrement()"
-          v-if="amountInput !== '0'"
+          @click="amountInput === '0' ? null : decrement()"
         >
           <fa icon="chevron-left" />
         </div>
         <input
           type="number"
-          class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
+          class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
           v-model="amountInput"
         />
         <div
@@ -36,37 +35,58 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div class="mt-2 text-right">
-        <span v-if="showGivenToUser" class="mr-16">
-          <input type="checkbox" class="mr-2" v-model="givenToUser" />
-          <label class="text-sm">Given to you</label>
-        </span>
+      <div class="mt-4 flex justify-center">
         <span>
-          <input type="checkbox" class="mr-2" v-model="isTrade" />
-          <label class="text-sm">Trade (not a gift)</label>
+          <router-link
+            :to="{
+              name: 'gifted-details',
+              query: {
+                amountInput,
+                description,
+                giverDid: giver?.did,
+                giverName: giver?.name,
+                message,
+                offerId,
+                projectId,
+                unitCode,
+              },
+            }"
+            class="text-blue-500"
+          >
+            Photo, ...
+          </router-link>
         </span>
       </div>
       <p class="text-center mb-2 mt-6 italic">
         Sign & Send to publish to the world
+        <fa
+          icon="circle-info"
+          class="pl-2 text-blue-500 cursor-pointer"
+          @click="explainData()"
+        />
       </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 class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <button
+          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+          @click="confirm"
+        >
+          Sign &amp; Send
+        </button>
+        <button
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+          @click="cancel"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
   </div>
 </template>
 
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
+
+import { NotificationIface } from "@/constants/app";
 import {
   createAndSubmitGive,
   didInfo,
@@ -75,19 +95,11 @@ import {
 import * as libsUtil from "@/libs/util";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component
 export default class GiftedDialog extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   @Prop message = "";
   @Prop projectId = "";
@@ -99,9 +111,9 @@ export default class GiftedDialog extends Vue {
   apiServer = "";
 
   amountInput = "0";
-  giver?: GiverInputInfo; // undefined means no identified giver agent
   description = "";
   givenToUser = false;
+  giver?: GiverInputInfo; // undefined means no identified giver agent
   isTrade = false;
   offerId = "";
   unitCode = "HUR";
@@ -190,6 +202,45 @@ export default class GiftedDialog extends Vue {
   }
 
   async confirm() {
+    if (!this.activeDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identifier before you can record a give.",
+        },
+        3000,
+      );
+      return;
+    }
+    if (parseFloat(this.amountInput) < 0) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          text: "You may not send a negative number.",
+          title: "",
+        },
+        2000,
+      );
+      return;
+    }
+    if (!this.description && !parseFloat(this.amountInput)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: `You must enter a description or some number of ${
+            this.libsUtil.UNIT_LONG[this.unitCode]
+          }.`,
+        },
+        2000,
+      );
+      return;
+    }
+
     this.close();
     this.$notify(
       {
@@ -211,22 +262,6 @@ export default class GiftedDialog extends Vue {
     });
   }
 
-  public async getIdentity(activeDid: string) {
-    await accountsDB.open();
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load Give records for DID ${activeDid} but no identifier was found",
-      );
-    }
-    return identity;
-  }
-
   /**
    *
    * @param giverDid may be null
@@ -240,34 +275,8 @@ export default class GiftedDialog extends Vue {
     amountInput: number,
     unitCode: string = "HUR",
   ) {
-    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identifier before you can record a give.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    if (!description && !amountInput) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: `You must enter a description or some number of ${this.libsUtil.UNIT_LONG[unitCode]}.`,
-        },
-        -1,
-      );
-      return;
-    }
-
     try {
-      const identity = await this.getIdentity(this.activeDid);
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const result = await createAndSubmitGive(
         this.axios,
         this.apiServer,
@@ -350,6 +359,18 @@ export default class GiftedDialog extends Vue {
       result.response?.data?.error?.message
     );
   }
+
+  explainData() {
+    this.$notify(
+      {
+        group: "alert",
+        type: "success",
+        title: "Data Sharing",
+        text: libsUtil.PRIVACY_MESSAGE,
+      },
+      -1,
+    );
+  }
 }
 </script>
 

src/components/GiftedPhotoDialog.vue

@@ -0,0 +1,404 @@
+<template>
+  <div v-if="visible" class="dialog-overlay z-[60]">
+    <div class="dialog relative">
+      <div class="text-lg text-center font-light relative z-50">
+        <div
+          id="ViewHeading"
+          class="text-center font-bold absolute top-0 left-0 right-0 px-4 py-2 bg-black/50 text-white leading-none"
+        >
+          <span v-if="uploading"> Uploading... </span>
+          <span v-else-if="blob"> Look Good? </span>
+          <span v-else> Say "Cheese"! </span>
+        </div>
+
+        <div
+          class="text-lg text-center p-2 leading-none absolute right-0 top-0 text-white"
+          @click="close()"
+        >
+          <fa icon="xmark" class="w-[1em]"></fa>
+        </div>
+      </div>
+
+      <div v-if="uploading" class="flex justify-center">
+        <fa
+          icon="spinner"
+          class="fa-spin fa-3x text-center block px-12 py-12"
+        />
+      </div>
+      <div v-else-if="blob">
+        <div v-if="crop">
+          <VuePictureCropper
+            :boxStyle="{
+              width: '100%',
+              height: '100%',
+              backgroundColor: '#f8f8f8',
+              margin: 'auto',
+            }"
+            :img="URL.createObjectURL(blob)"
+            :options="{
+              viewMode: 1,
+              dragMode: 'crop',
+              aspectRatio: 9 / 9,
+            }"
+          />
+          <!-- This gives a round cropper.
+            :presetMode="{
+              mode: 'round',
+            }"
+          -->
+        </div>
+        <div v-else>
+          <div class="flex justify-center">
+            <img :src="URL.createObjectURL(blob)" class="mt-2 rounded" />
+          </div>
+        </div>
+        <div class="absolute bottom-[1rem] left-[1rem] px-2 py-1">
+          <button
+            @click="uploadImage"
+            class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-1 px-2 rounded-md"
+          >
+            <span>Upload</span>
+          </button>
+        </div>
+        <div class="absolute bottom-[1rem] right-[1rem] px-2 py-1">
+          <button
+            @click="retryImage"
+            class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-1 px-2 rounded-md"
+          >
+            <span>Retry</span>
+          </button>
+        </div>
+      </div>
+      <div v-else ref="cameraContainer">
+        <!--
+          Camera "resolution" doesn't change how it shows on screen but rather stretches the result, eg the following which just stretches it vertically:
+          :resolution="{ width: 375, height: 812 }"
+        -->
+        <camera
+          facingMode="environment"
+          autoplay
+          ref="camera"
+          @started="cameraStarted()"
+        >
+          <div
+            class="absolute portrait:bottom-0 portrait:left-0 portrait:right-0 portrait:pb-2 landscape:right-0 landscape:top-0 landscape:bottom-0 landscape:pr-4 flex landscape:flex-row justify-center items-center"
+          >
+            <button
+              @click="takeImage()"
+              class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
+            >
+              <fa icon="camera" class="w-[1em]"></fa>
+            </button>
+          </div>
+          <div
+            class="absolute portrait:bottom-2 portrait:right-16 landscape:right-0 landscape:bottom-16 landscape:pr-4 flex justify-center items-center"
+          >
+            <button
+              @click="swapMirrorClass()"
+              class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
+            >
+              <fa icon="left-right" class="w-[1em]"></fa>
+            </button>
+          </div>
+          <div v-if="numDevices > 1" class="absolute bottom-2 right-4">
+            <button
+              @click="switchCamera()"
+              class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
+            >
+              <fa icon="rotate" class="w-[1em]"></fa>
+            </button>
+          </div>
+        </camera>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import axios from "axios";
+import Camera from "simple-vue-camera";
+import { Component, Vue } from "vue-facing-decorator";
+import VuePictureCropper, { cropper } from "vue-picture-cropper";
+
+import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
+import { getIdentity } from "@/libs/util";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
+
+@Component({ components: { Camera, VuePictureCropper } })
+export default class GiftedPhotoDialog extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  activeDeviceNumber = 0;
+  activeDid = "";
+  blob: Blob | null = null;
+  claimType = "GiveAction";
+  crop = false;
+  mirror = false;
+  numDevices = 0;
+  setImage: (arg: string) => void = () => {};
+  uploading = false;
+  visible = false;
+
+  URL = window.URL || window.webkitURL;
+
+  async mounted() {
+    try {
+      await db.open();
+      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      this.activeDid = settings?.activeDid || "";
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (err: any) {
+      console.error("Error retrieving settings from database:", err);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: err.message || "There was an error retrieving your settings.",
+        },
+        -1,
+      );
+    }
+  }
+
+  open(setImageFn: (arg: string) => void, crop?: boolean, claimType?: string) {
+    this.visible = true;
+    this.crop = !!crop;
+    this.claimType = claimType || "GiveAction";
+    const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
+    if (bottomNav) {
+      bottomNav.style.display = "none";
+    }
+    this.setImage = setImageFn;
+  }
+
+  close() {
+    this.visible = false;
+    const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
+    if (bottomNav) {
+      bottomNav.style.display = "";
+    }
+    this.blob = null;
+  }
+
+  async cameraStarted() {
+    const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
+    if (cameraComponent) {
+      this.numDevices = (await cameraComponent.devices(["videoinput"])).length;
+      this.mirror = cameraComponent.facingMode === "user";
+    }
+  }
+
+  async switchCamera() {
+    const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
+    this.activeDeviceNumber = (this.activeDeviceNumber + 1) % this.numDevices;
+    const devices = await cameraComponent?.devices(["videoinput"]);
+    cameraComponent?.changeCamera(devices[this.activeDeviceNumber].deviceId);
+  }
+
+  async takeImage(/* payload: MouseEvent */) {
+    const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
+
+    /**
+     * This logic to set the image height & width correctly.
+     * Without it, the portrait orientation ends up with an image that is stretched horizontally.
+     * Note that it's the same with raw browser Javascript; see the "drawImage" example below.
+     * Now that I've done it, I can't explain why it works.
+     */
+    let imageHeight = cameraComponent?.resolution?.height;
+    let imageWidth = cameraComponent?.resolution?.width;
+    const initialImageRatio = imageWidth / imageHeight;
+    const windowRatio = window.innerWidth / window.innerHeight;
+    if (initialImageRatio > 1 && windowRatio < 1) {
+      // the image is wider than it is tall, and the window is taller than it is wide
+      // For some reason, mobile in portrait orientation renders a horizontally-stretched image.
+      // We're gonna force it opposite.
+      imageHeight = cameraComponent?.resolution?.width;
+      imageWidth = cameraComponent?.resolution?.height;
+    } else if (initialImageRatio < 1 && windowRatio > 1) {
+      // the image is taller than it is wide, and the window is wider than it is tall
+      // Haven't seen this happen, but we'll do it just in case.
+      imageHeight = cameraComponent?.resolution?.width;
+      imageWidth = cameraComponent?.resolution?.height;
+    }
+    const newImageRatio = imageWidth / imageHeight;
+    if (newImageRatio < windowRatio) {
+      // the image is a taller ratio than the window, so fit the height first
+      imageHeight = window.innerHeight / 2;
+      imageWidth = imageHeight * newImageRatio;
+    } else {
+      // the image is a wider ratio than the window, so fit the width first
+      imageWidth = window.innerWidth / 2;
+      imageHeight = imageWidth / newImageRatio;
+    }
+
+    // The resolution is only necessary because of that mobile portrait-orientation case.
+    // The mobile emulation in a browser shows something stretched vertically, but real devices work fine.
+    this.blob = await cameraComponent?.snapshot({
+      height: imageHeight,
+      width: imageWidth,
+    }); // png is default; if that changes, change extension in formData.append
+    if (!this.blob) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "There was an error taking the picture. Please try again.",
+        },
+        5000,
+      );
+      return;
+    }
+  }
+
+  async retryImage() {
+    this.blob = null;
+  }
+
+  /****
+
+   Here's an approach to photo capture without a library. It has similar quirks.
+   Now that we've fixed styling for simple-vue-camera, it's not critical to refactor. Maybe someday.
+
+   <button id="start-camera" @click="cameraClicked">Start Camera</button>
+   <video id="video" width="320" height="240" autoplay></video>
+   <button id="snap-photo" @click="photoSnapped">Snap Photo</button>
+   <canvas id="canvas" width="320" height="240"></canvas>
+
+  async cameraClicked() {
+    const video = document.querySelector("#video");
+    const stream = await navigator.mediaDevices.getUserMedia({
+      video: true,
+      audio: false,
+    });
+    if (video instanceof HTMLVideoElement) {
+      video.srcObject = stream;
+    }
+  }
+  photoSnapped() {
+    const video = document.querySelector("#video");
+    const canvas = document.querySelector("#canvas");
+    if (
+      canvas instanceof HTMLCanvasElement &&
+      video instanceof HTMLVideoElement
+    ) {
+      canvas
+        ?.getContext("2d")
+        ?.drawImage(video, 0, 0, canvas.width, canvas.height);
+      // ... or set the blob:
+      // canvas?.toBlob(
+      //   (blob) => {
+      //     this.blob = blob;
+      //   },
+      //   "image/jpeg",
+      //   1,
+      // );
+
+      // data url of the image
+      const image_data_url = canvas?.toDataURL("image/jpeg");
+    }
+  }
+  ****/
+
+  async uploadImage() {
+    this.uploading = true;
+
+    if (this.crop) {
+      this.blob = await cropper?.getBlob();
+    }
+
+    const identifier = await getIdentity(this.activeDid);
+    const token = await accessToken(identifier);
+    const headers = {
+      Authorization: "Bearer " + token,
+    };
+    const formData = new FormData();
+    if (!this.blob) {
+      // yeah, this should never happen, but it helps with subsequent type checking
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "There was an error finding the picture. Please try again.",
+        },
+        5000,
+      );
+      this.uploading = false;
+      return;
+    }
+    formData.append("image", this.blob, "snapshot.png"); // png is set in snapshot()
+    formData.append("claimType", this.claimType);
+    try {
+      const response = await axios.post(
+        DEFAULT_IMAGE_API_SERVER + "/image",
+        formData,
+        { headers },
+      );
+      this.uploading = false;
+
+      this.visible = false;
+      this.blob = null;
+      this.setImage(response.data.url as string);
+    } catch (error) {
+      console.error("Error uploading the image", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "There was an error saving the picture. Please try again.",
+        },
+        5000,
+      );
+      this.uploading = false;
+      this.blob = null;
+    }
+  }
+
+  swapMirrorClass() {
+    this.mirror = !this.mirror;
+    if (this.mirror) {
+      (this.$refs.cameraContainer as HTMLElement).classList.add("mirror-video");
+    } else {
+      (this.$refs.cameraContainer as HTMLElement).classList.remove(
+        "mirror-video",
+      );
+    }
+  }
+}
+</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: 700px;
+}
+
+.mirror-video {
+  transform: scaleX(-1);
+  -webkit-transform: scaleX(-1); /* For Safari */
+  -moz-transform: scaleX(-1); /* For Firefox */
+  -ms-transform: scaleX(-1); /* For IE */
+  -o-transform: scaleX(-1); /* For Opera */
+}
+</style>

src/components/GiftedPrompts.vue

@@ -1,7 +1,15 @@
 <template>
   <div v-if="visible" class="dialog-overlay">
     <div class="dialog">
-      <h1 class="text-xl font-bold text-center mb-4">Here's one:</h1>
+      <h1 class="text-xl font-bold text-center mb-4 relative">
+        Here's one:
+        <div
+          class="text-lg text-center p-2 leading-none absolute right-0 -top-1"
+          @click="cancel"
+        >
+          <fa icon="xmark" class="w-[1em]"></fa>
+        </div>
+      </h1>
       <span class="flex justify-between">
         <span
           class="rounded-l border border-slate-400 bg-slate-200 px-4 py-2 flex"
@@ -33,7 +41,7 @@
                 <span class="flex justify-between">
                   <span />
                   <button
-                    class="text-center bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4"
+                    class="text-center bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mt-4"
                     @click="nextIdeaPastContacts()"
                   >
                     Skip Contacts <fa icon="forward" />
@@ -52,7 +60,7 @@
         </span>
       </span>
       <button
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4"
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mt-4"
         @click="cancel"
       >
         That's it!
@@ -64,20 +72,13 @@
 <script lang="ts">
 import { Vue, Component } from "vue-facing-decorator";
 
-import { AppString } from "@/constants/app";
+import { AppString, NotificationIface } from "@/constants/app";
 import { db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component
 export default class GivenPrompts extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   IDEAS = [
     "Did anyone fix food for you?",

src/components/OfferDialog.vue

@@ -50,40 +50,36 @@
       <p class="text-center mt-6 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 class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <button
+          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+          @click="confirm"
+        >
+          Sign &amp; Send
+        </button>
+        <button
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+          @click="cancel"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
   </div>
 </template>
 
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
+
+import { NotificationIface } from "@/constants/app";
 import { createAndSubmitOffer } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
-import { accountsDB, db } from "@/db/index";
+import { 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;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   @Prop message = "";
   @Prop projectId = "";
@@ -107,7 +103,7 @@ export default class OfferDialog extends Vue {
       this.activeDid = settings?.activeDid || "";
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.log("Error retrieving settings from database:", err);
+      console.error("Error retrieving settings from database:", err);
       this.$notify(
         {
           group: "alert",
@@ -178,22 +174,6 @@ export default class OfferDialog extends Vue {
     });
   }
 
-  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 identifier was found`,
-      );
-    }
-    return identity;
-  }
-
   /**
    *
    * @param description may be an empty string
@@ -233,7 +213,7 @@ export default class OfferDialog extends Vue {
     }
 
     try {
-      const identity = await this.getIdentity(this.activeDid);
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const result = await createAndSubmitOffer(
         this.axios,
         this.apiServer,
@@ -250,7 +230,7 @@ export default class OfferDialog extends Vue {
         this.isOfferCreationError(result.response)
       ) {
         const errorMessage = this.getOfferCreationErrorMessage(result);
-        console.log("Error with offer creation result:", result);
+        console.error("Error with offer creation result:", result);
         this.$notify(
           {
             group: "alert",
@@ -273,7 +253,7 @@ export default class OfferDialog extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
-      console.log("Error with offer recordation caught:", error);
+      console.error("Error with offer recordation caught:", error);
       const message =
         error.userMessage ||
         error.response?.data?.error?.message ||

src/components/TopMessage.vue

@@ -4,20 +4,14 @@
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-facing-decorator";
+
+import { AppString, NotificationIface } from "@/constants/app";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { AppString } from "@/constants/app";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component
 export default class TopMessage extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   @Prop selected = "";
 

src/constants/app.ts

@@ -12,10 +12,20 @@ export enum AppString {
   TEST1_PUSH_SERVER = "https://test.timesafari.app",
   TEST2_PUSH_SERVER = "https://timesafari-pwa.anomalistlabs.com",
 
+  PROD_IMAGE_API_SERVER = "https://image-api.timesafari.app",
+  TEST_IMAGE_API_SERVER = "https://test-image-api.timesafari.app",
+  LOCAL_IMAGE_API_SERVER = "http://localhost:3001",
+
   NO_CONTACT_NAME = "(no name)",
 }
 
-export const DEFAULT_ENDORSER_API_SERVER = AppString.TEST_ENDORSER_API_SERVER;
+export const DEFAULT_ENDORSER_API_SERVER =
+  import.meta.env.VITE_DEFAULT_ENDORSER_API_SERVER ||
+  AppString.TEST_ENDORSER_API_SERVER;
+
+export const DEFAULT_IMAGE_API_SERVER =
+  import.meta.env.VITE_DEFAULT_IMAGE_API_SERVER ||
+  AppString.TEST_IMAGE_API_SERVER;
 
 export const DEFAULT_PUSH_SERVER =
   window.location.protocol + "//" + window.location.host;
@@ -29,4 +39,5 @@ export interface NotificationIface {
   type: string; // "toast" | "info" | "success" | "warning" | "danger"
   title: string;
   text: string;
+  onYes?: () => Promise<void>;
 }

src/db/tables/contacts.ts

@@ -2,6 +2,7 @@ export interface Contact {
   did: string;
   name?: string;
   nextPubKeyHashB64?: string; // base64-encoded SHA256 hash of next public key
+  profileImageUrl?: string;
   publicKeyBase64?: string;
   seesMe?: boolean;
   registered?: boolean;

src/db/tables/settings.ts

@@ -16,11 +16,16 @@ export type Settings = {
 
   activeDid?: string; // Active Decentralized ID
   apiServer?: string; // API server URL
-  firstName?: string; // User's first name
+
+  filterFeedByNearby?: boolean; // filter by nearby
+  filterFeedByVisible?: boolean; // filter by visible users ie. anyone not hidden
+
+  firstName?: string; // user's full name
   isRegistered?: boolean;
   lastName?: string; // deprecated - put all names in firstName
-  lastNotifiedClaimId?: string; // Last notified claim ID
-  lastViewedClaimId?: string; // Last viewed claim ID
+  lastNotifiedClaimId?: string;
+  lastViewedClaimId?: string;
+  profileImageUrl?: string;
   reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
   reminderOn?: boolean; // Toggle to enable or disable reminders
 
@@ -31,12 +36,17 @@ export type Settings = {
   }>;
 
   showContactGivesInline?: boolean; // Display contact inline or not
+  showShortcutBvc?: boolean; // Show shortcut for BVC actions
   vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
   warnIfProdServer?: boolean; // Warn if using a production server
   warnIfTestServer?: boolean; // Warn if using a testing server
   webPushServer?: string; // Web Push server URL
 };
 
+export function isAnyFeedFilterOn(settings: Settings): boolean {
+  return !!(settings.filterFeedByNearby || settings.filterFeedByVisible);
+}
+
 /**
  * Schema for the Settings table in the database.
  */

src/libs/crypto/index.ts

@@ -113,7 +113,7 @@ export const sign = async (privateKeyHex: string) => {
  *  The SimpleSigner returns a configured function for signing data.
  *
  *  @example
- *  const signer = SimpleSigner(process.env.PRIVATE_KEY)
+ *  const signer = SimpleSigner(import.meta.env.PRIVATE_KEY)
  *  signer(data, (err, signature) => {
  *    ...
  *  })

src/libs/endorserServer.ts

@@ -1,9 +1,11 @@
+import { Axios, AxiosResponse, RawAxiosRequestHeaders } from "axios";
+import * as didJwt from "did-jwt";
+import { LRUCache } from "lru-cache";
 import * as R from "ramda";
 import { IIdentifier } from "@veramo/core";
-import { accessToken, SimpleSigner } from "@/libs/crypto";
-import * as didJwt from "did-jwt";
-import { Axios, AxiosResponse } from "axios";
+
 import { Contact } from "@/db/tables/contacts";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 
 export const SCHEMA_ORG_CONTEXT = "https://schema.org";
 // the object in RegisterAction claims
@@ -22,7 +24,7 @@ export interface AgreeVerifiableCredential {
   "@type": string;
   // "any" because arbitrary objects can be subject of agreement
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  object: Record<any, any>;
+  object: Record<string, any>;
 }
 
 export interface GiverInputInfo {
@@ -46,24 +48,29 @@ export interface ClaimResult {
 export interface GenericVerifiableCredential {
   "@context": string;
   "@type": string;
+  [key: string]: any; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
-export interface GenericServerRecord extends GenericVerifiableCredential {
+export interface GenericCredWrapper extends GenericVerifiableCredential {
   handleId?: string;
-  id?: string;
-  issuedAt?: string;
-  issuer?: string;
+  id: string;
+  issuedAt: string;
+  issuer: string;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  claim: Record<any, any>;
+  claim: Record<string, any>;
   claimType?: string;
 }
-export const BLANK_GENERIC_SERVER_RECORD: GenericServerRecord = {
+export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper = {
   "@context": SCHEMA_ORG_CONTEXT,
   "@type": "",
   claim: {},
+  id: "",
+  issuedAt: "",
+  issuer: "",
 };
 
-export interface GiveServerRecord {
+// a summary record; the VC is found the fullClaim field
+export interface GiveSummaryRecord {
   agentDid: string;
   amount: number;
   amountConfirmed: number;
@@ -77,7 +84,8 @@ export interface GiveServerRecord {
   unit: string;
 }
 
-export interface OfferServerRecord {
+// a summary record; the VC is found the fullClaim field
+export interface OfferSummaryRecord {
   amount: number;
   amountGiven: number;
   amountGivenConfirmed: number;
@@ -94,15 +102,17 @@ export interface OfferServerRecord {
   validThrough: string;
 }
 
-export interface PlanServerRecord {
+// a summary record; the VC is not currently part of this record
+export interface PlanSummaryRecord {
   agentDid?: string; // optional, if the issuer wants someone else to manage as well
   description: string;
   endTime?: string;
   fulfillsPlanHandleId: string;
-  issuerDid: string;
   handleId: string;
+  issuerDid: string;
   locLat?: number;
   locLon?: number;
+  name?: string;
   startTime?: string;
   url?: string;
 }
@@ -116,6 +126,7 @@ export interface GiveVerifiableCredential {
   description?: string;
   fulfills?: { "@type": string; identifier?: string; lastClaimId?: string }[];
   identifier?: string;
+  image?: string;
   object?: { amountOfThisGood: number; unitCode: string };
   recipient?: { identifier: string };
 }
@@ -179,7 +190,7 @@ export interface PlanData {
   rowid?: string;
 }
 
-export interface RateLimits {
+export interface EndorserRateLimits {
   doneClaimsThisWeek: string;
   doneRegistrationsThisMonth: string;
   maxClaimsPerWeek: string;
@@ -188,6 +199,12 @@ export interface RateLimits {
   nextWeekBeginDateTime: string;
 }
 
+export interface ImageRateLimits {
+  doneImagesThisWeek: string;
+  maxImagesPerWeek: string;
+  nextWeekBeginDateTime: string;
+}
+
 export interface VerifiableCredential {
   "@context": string;
   "@type": string;
@@ -226,22 +243,26 @@ export interface ErrorResponse {
   };
 }
 
-export interface ErrorResult {
-  type: "error";
-  error: InternalError;
-}
-
 export interface InternalError {
   error: string; // for system logging
   userMessage?: string; // for user display
 }
 
+export interface ErrorResult extends ResultWithType {
+  type: "error";
+  error: InternalError;
+}
+
 export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
 
 // This is used to check for hidden info.
 // See https://github.com/trentlarson/endorser-ch/blob/0cb626f803028e7d9c67f095858a9fc8542e3dbd/server/api/services/util.js#L6
 const HIDDEN_DID = "did:none:HIDDEN";
 
+const planCache: LRUCache<string, PlanSummaryRecord> = new LRUCache({
+  max: 500,
+});
+
 export function isDid(did: string) {
   return did.startsWith("did:");
 }
@@ -255,7 +276,7 @@ export function isEmptyOrHiddenDid(did?: string) {
 }
 
 /**
- * @return true for any nested string where func(input) === true
+ * @return true for any string within this primitive/object/array where func(input) === true
  *
  * Similar logic is found in endorser-mobile.
  */
@@ -290,6 +311,12 @@ export function containsHiddenDid(obj: any) {
   return testRecursivelyOnStrings(isHiddenDid, obj);
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const containsNonHiddenDid = (obj: any) => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  return testRecursivelyOnStrings((s: any) => isDid(s) && !isHiddenDid(s), obj);
+};
+
 export function stripEndorserPrefix(claimId: string) {
   if (claimId && claimId.startsWith(ENDORSER_CH_HANDLE_PREFIX)) {
     return claimId.substring(ENDORSER_CH_HANDLE_PREFIX.length);
@@ -327,7 +354,7 @@ export function addLastClaimOrHandleAsIdIfMissing(
 }
 
 // return clone of object without any nested *VisibleToDids keys
-// similar logic is found in endorser-mobile
+// similar code is also contained in endorser-mobile
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function removeVisibleToDids(input: any): any {
   if (input instanceof Object) {
@@ -337,7 +364,6 @@ export function removeVisibleToDids(input: any): any {
       const result: Record<string, any> = {};
       for (const key in input) {
         if (!key.endsWith("VisibleToDids")) {
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           result[key] = removeVisibleToDids(R.clone(input[key]));
         }
       }
@@ -346,16 +372,62 @@ export function removeVisibleToDids(input: any): any {
       // it's an array
       return R.map(removeVisibleToDids, input);
     }
-    return false;
   } else {
     return input;
   }
 }
 
-/**
- always returns text, maybe UNNAMED_VISIBLE or UNKNOWN_ENTITY
+export function contactForDid(
+  did: string | undefined,
+  contacts: Contact[],
+): Contact | undefined {
+  return isEmptyOrHiddenDid(did)
+    ? undefined
+    : R.find((c) => c.did === did, contacts);
+}
 
- Similar logic is found in endorser-mobile.
+/**
+ *
+ * Similar logic is found in endorser-mobile.
+ *
+ * @param did
+ * @param activeDid
+ * @param contact
+ * @param allMyDids
+ * @return { known: boolean, displayName: string } where known is true if the display name is some easily-recogizable name, false if it's a generic name like "Someone Anonymous"
+ */
+export function didInfoForContact(
+  did: string | undefined,
+  activeDid: string | undefined,
+  contact?: Contact,
+  allMyDids: string[] = [],
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+): { known: boolean; displayName: string } {
+  if (!did) return { displayName: "Someone Anonymous", known: false };
+  if (contact) {
+    return {
+      displayName: contact.name || "Contact With No Name",
+      known: !!contact.name,
+    };
+  } else if (did === activeDid) {
+    return { displayName: "You", known: true };
+  } else {
+    const myId = R.find(R.equals(did), allMyDids);
+    return myId
+      ? { displayName: "You (Alt ID)", known: true }
+      : isHiddenDid(did)
+        ? { displayName: "Someone Totally Outside Your View", known: false }
+        : {
+            displayName: "Someone Visible But Outside Your Contact List",
+            known: false,
+          };
+  }
+}
+
+/**
+ always returns text, maybe something like "unnamed" or "unknown"
+
+ Now that we're using more informational didInfoForContact under the covers, we might want to consolidate.
  **/
 export function didInfo(
   did: string | undefined,
@@ -363,19 +435,73 @@ export function didInfo(
   allMyDids: string[],
   contacts: Contact[],
 ): string {
-  if (!did) return "Someone Anonymous";
+  const contact = contactForDid(did, contacts);
+  return didInfoForContact(did, activeDid, contact, allMyDids).displayName;
+}
 
-  const contact = R.find((c) => c.did === did, contacts);
-  if (contact) {
-    return contact.name || "Contact With No Name";
-  } else {
-    const myId = R.find(R.equals(did), allMyDids);
-    return myId
-      ? `You${myId !== activeDid ? " (Alt ID)" : ""}`
-      : isHiddenDid(did)
-        ? "Someone Not In Network"
-        : "Someone Not In Contacts";
+async function getHeaders(identity: IIdentifier | null) {
+  const headers: RawAxiosRequestHeaders = {
+    "Content-Type": "application/json",
+  };
+  if (identity) {
+    const token = await accessToken(identity);
+    headers["Authorization"] = "Bearer " + token;
   }
+  return headers;
+}
+
+/**
+ * @param handleId nullable -- which means that "undefined" will be returned
+ * @param identity nullable -- which means no private info will be returned
+ * @param axios
+ * @param apiServer
+ */
+export async function getPlanFromCache(
+  handleId: string | null,
+  identity: IIdentifier | null,
+  axios: Axios,
+  apiServer: string,
+) {
+  if (!handleId) {
+    return undefined;
+  }
+  let cred = planCache.get(handleId);
+  if (!cred) {
+    const url =
+      apiServer +
+      "/api/v2/report/plans?handleId=" +
+      encodeURIComponent(handleId);
+    const headers = await getHeaders(identity);
+    try {
+      const resp = await axios.get(url, { headers });
+      if (resp.status === 200 && resp.data?.data?.length > 0) {
+        cred = resp.data.data[0];
+        planCache.set(handleId, cred);
+      } else {
+        console.log(
+          "Failed to load plan with handle",
+          handleId,
+          " Got data:",
+          resp.data,
+        );
+      }
+    } catch (error) {
+      console.log(
+        "Failed to load plan with handle",
+        handleId,
+        " Got error:",
+        error,
+      );
+    }
+  }
+  return cred;
+}
+
+export async function setPlanInCache(
+  handleId: string,
+  planSummary: PlanSummaryRecord,
+) {
+  planCache.set(handleId, planSummary);
 }
 
 /**
@@ -399,6 +525,7 @@ export async function createAndSubmitGive(
   fulfillsProjectHandleId?: string,
   fulfillsOfferHandleId?: string,
   isTrade: boolean = false,
+  imageUrl?: string,
 ): Promise<CreateAndSubmitClaimResult> {
   const vcClaim: GiveVerifiableCredential = {
     "@context": "https://schema.org",
@@ -425,8 +552,11 @@ export async function createAndSubmitGive(
       identifier: fulfillsOfferHandleId,
     });
   }
+  if (imageUrl) {
+    vcClaim.image = imageUrl;
+  }
   return createAndSubmitClaim(
-    vcClaim as GenericServerRecord,
+    vcClaim as GenericCredWrapper,
     identity,
     apiServer,
     axios,
@@ -475,13 +605,35 @@ export async function createAndSubmitOffer(
     };
   }
   return createAndSubmitClaim(
-    vcClaim as GenericServerRecord,
+    vcClaim as GenericCredWrapper,
     identity,
     apiServer,
     axios,
   );
 }
 
+// similar logic is found in endorser-mobile
+export const createAndSubmitConfirmation = async (
+  identifier: IIdentifier,
+  claim: GenericVerifiableCredential,
+  lastClaimId: string, // used to set the lastClaimId
+  handleId: string | undefined,
+  apiServer: string,
+  axios: Axios,
+) => {
+  const goodClaim = removeSchemaContext(
+    removeVisibleToDids(
+      addLastClaimOrHandleAsIdIfMissing(claim, lastClaimId, handleId),
+    ),
+  );
+  const confirmationClaim: GenericVerifiableCredential = {
+    "@context": "https://schema.org",
+    "@type": "AgreeAction",
+    object: goodClaim,
+  };
+  return createAndSubmitClaim(confirmationClaim, identifier, apiServer, axios);
+};
+
 export async function createAndSubmitClaim(
   vcClaim: GenericVerifiableCredential,
   identity: IIdentifier,
@@ -546,12 +698,199 @@ export async function createAndSubmitClaim(
   }
 }
 
-// from https://stackoverflow.com/a/175787/845494
-//
-export function isNumeric(str: string): boolean {
-  return !isNaN(+str);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const isAccept = (claim: Record<string, any>) => {
+  return (
+    claim &&
+    claim["@context"] === SCHEMA_ORG_CONTEXT &&
+    claim["@type"] === "AcceptAction"
+  );
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const isOffer = (claim: Record<string, any>) => {
+  return (
+    claim &&
+    claim["@context"] === SCHEMA_ORG_CONTEXT &&
+    claim["@type"] === "Offer"
+  );
+};
+
+export function currencyShortWordForCode(unitCode: string, single: boolean) {
+  return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
 }
 
-export function numberOrZero(str: string): number {
-  return isNumeric(str) ? +str : 0;
+export function displayAmount(code: string, amt: number) {
+  return "" + amt + " " + currencyShortWordForCode(code, amt === 1);
 }
+
+// insert a space before any capital letters except the initial letter
+// (and capitalize initial letter, just in case)
+export const capitalizeAndInsertSpacesBeforeCaps = (text: string) => {
+  return !text
+    ? ""
+    : text[0].toUpperCase() + text.substr(1).replace(/([A-Z])/g, " $1");
+};
+
+/**
+ return readable summary of claim, or something generic
+
+ similar code is also contained in endorser-mobile
+ **/
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const claimSummary = (claim: Record<string, any>) => {
+  if (!claim) {
+    // to differentiate from "something" above
+    return "something";
+  }
+  if (claim.claim) {
+    // probably a Verified Credential
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    claim = claim.claim as Record<string, any>;
+  }
+  if (Array.isArray(claim)) {
+    if (claim.length === 1) {
+      claim = claim[0];
+    } else {
+      return "multiple claims";
+    }
+  }
+  const type = claim["@type"];
+  if (!type) {
+    return "a claim";
+  } else {
+    let typeExpl = capitalizeAndInsertSpacesBeforeCaps(type);
+    if (typeExpl === "Person") {
+      typeExpl += " claim";
+    }
+    return "a " + typeExpl;
+  }
+};
+
+/**
+ return readable description of claim if possible, as a past-tense action
+
+ identifiers is a list of objects with a 'did' field, each representing the user
+ contacts is a list of objects with a 'did' field for others and a 'name' field for their name
+
+ similar code is also contained in endorser-mobile
+ **/
+export const claimSpecialDescription = (
+  record: GenericCredWrapper,
+  activeDid: string,
+  identifiers: Array<string>,
+  contacts: Array<Contact>,
+) => {
+  let claim = record.claim;
+  if (claim.claim) {
+    // it's probably a Verified Credential
+    claim = claim.claim;
+  }
+
+  const issuer = didInfo(record.issuer, activeDid, identifiers, contacts);
+  const type = claim["@type"] || "UnknownType";
+
+  if (type === "AgreeAction") {
+    return issuer + " agreed with " + claimSummary(claim.object);
+  } else if (isAccept(claim)) {
+    return issuer + " accepted " + claimSummary(claim.object);
+  } else if (type === "GiveAction") {
+    // agent.did is for legacy data, before March 2023
+    const giver = claim.agent?.identifier || claim.agent?.did;
+    const giverInfo = didInfo(giver, activeDid, identifiers, contacts);
+    let gaveAmount = claim.object?.amountOfThisGood
+      ? displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
+      : "";
+    if (claim.description) {
+      if (gaveAmount) {
+        gaveAmount = gaveAmount + ", and also: ";
+      }
+      gaveAmount = gaveAmount + claim.description;
+    }
+    if (!gaveAmount) {
+      gaveAmount = "something not described";
+    }
+    // recipient.did is for legacy data, before March 2023
+    const gaveRecipientId = claim.recipient?.identifier || claim.recipient?.did;
+    const gaveRecipientInfo = gaveRecipientId
+      ? " to " + didInfo(gaveRecipientId, activeDid, identifiers, contacts)
+      : "";
+    return giverInfo + " gave" + gaveRecipientInfo + ": " + gaveAmount;
+  } else if (type === "JoinAction") {
+    // agent.did is for legacy data, before March 2023
+    const agent = claim.agent?.identifier || claim.agent?.did;
+    const contactInfo = didInfo(agent, activeDid, identifiers, contacts);
+
+    let eventOrganizer =
+      claim.event && claim.event.organizer && claim.event.organizer.name;
+    eventOrganizer = eventOrganizer || "";
+    let eventName = claim.event && claim.event.name;
+    eventName = eventName ? " " + eventName : "";
+    let fullEvent = eventOrganizer + eventName;
+    fullEvent = fullEvent ? " attended the " + fullEvent : "";
+
+    let eventDate = claim.event && claim.event.startTime;
+    eventDate = eventDate ? " at " + eventDate : "";
+    return contactInfo + fullEvent + eventDate;
+  } else if (isOffer(claim)) {
+    const offerer = claim.offeredBy?.identifier;
+    const contactInfo = didInfo(offerer, activeDid, identifiers, contacts);
+    let offering = "";
+    if (claim.includesObject) {
+      offering +=
+        " " +
+        displayAmount(
+          claim.includesObject.unitCode,
+          claim.includesObject.amountOfThisGood,
+        );
+    }
+    if (claim.itemOffered?.description) {
+      offering += ", saying: " + claim.itemOffered?.description;
+    }
+    // recipient.did is for legacy data, before March 2023
+    const offerRecipientId =
+      claim.recipient?.identifier || claim.recipient?.did;
+    const offerRecipientInfo = offerRecipientId
+      ? " to " + didInfo(offerRecipientId, activeDid, identifiers, contacts)
+      : "";
+    return contactInfo + " offered" + offering + offerRecipientInfo;
+  } else if (type === "PlanAction") {
+    const claimer = claim.agent?.identifier || record.issuer;
+    const claimerInfo = didInfo(claimer, activeDid, identifiers, contacts);
+    return claimerInfo + " announced a project: " + claim.name;
+  } else if (type === "Tenure") {
+    // party.did is for legacy data, before March 2023
+    const claimer = claim.party?.identifier || claim.party?.did;
+    const contactInfo = didInfo(claimer, activeDid, identifiers, contacts);
+    const polygon = claim.spatialUnit?.geo?.polygon || "";
+    return (
+      contactInfo +
+      " possesses [" +
+      polygon.substring(0, polygon.indexOf(" ")) +
+      "...]"
+    );
+  } else {
+    return issuer + " declared " + claimSummary(claim as GenericCredWrapper);
+  }
+};
+
+export const BVC_MEETUPS_PROJECT_CLAIM_ID =
+  import.meta.env.VITE_BVC_MEETUPS_PROJECT_CLAIM_ID ||
+  "https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK"; // this won't resolve as a URL on production; it's a URN only found in the test system
+
+export const bvcMeetingJoinClaim = (did: string, startTime: string) => {
+  return {
+    "@context": SCHEMA_ORG_CONTEXT,
+    "@type": "JoinAction",
+    agent: {
+      identifier: did,
+    },
+    event: {
+      organizer: {
+        name: "Bountiful Voluntaryist Community",
+      },
+      name: "Saturday Morning Meeting",
+      startTime: startTime,
+    },
+  };
+};

src/libs/util.ts

@@ -1,22 +1,19 @@
 // many of these are also found in endorser-mobile utility.ts
 
 import axios, { AxiosResponse } from "axios";
+import { IIdentifier } from "@veramo/core";
+import { useClipboard } from "@vueuse/core";
 
 import { DEFAULT_PUSH_SERVER } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
-import { GenericServerRecord, containsHiddenDid } from "@/libs/endorserServer";
+import { GenericCredWrapper, containsHiddenDid } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
-import { useClipboard } from "@vueuse/core";
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Buffer = require("buffer/").Buffer;
-
-// If you edit this, check that the numbers still line up on the side in the alert (on mobile, too),
-// and make sure they can take all actions while the notification shows.
-export const ONBOARD_MESSAGE =
-  "1) Check that they have entered their name on the profile page in their device. 2) Add them to your Contacts by scanning with the QR icon that is by the input box. 3) Click the person icon to register them. 4) Have them go to their Contact page and scan your QR to add you to their list.";
+export const PRIVACY_MESSAGE =
+  "The data you send be visible to the world -- except: your IDs and the IDs of anyone you tag will stay private, only visible to those you allow.";
 
 /* eslint-disable prettier/prettier */
 export const UNIT_SHORT: Record<string, string> = {
@@ -55,11 +52,25 @@ export function iconForUnitCode(unitCode: string) {
   return UNIT_CODES[unitCode]?.faIcon || "question";
 }
 
+// from https://stackoverflow.com/a/175787/845494
+// ... though it appears even this isn't precisely right so keep doing "|| 0" or something in sensitive places
+//
+export function isNumeric(str: string): boolean {
+  // This ignore commentary is because typescript complains when you pass a string to isNaN.
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  return !isNaN(str) && !isNaN(parseFloat(str));
+}
+
+export function numberOrZero(str: string): number {
+  return isNumeric(str) ? +str : 0;
+}
+
 export const isGlobalUri = (uri: string) => {
   return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/));
 };
 
-export const giveIsConfirmable = (veriClaim: GenericServerRecord) => {
+export const giveIsConfirmable = (veriClaim: GenericCredWrapper) => {
   return veriClaim.claimType === "GiveAction";
 };
 
@@ -75,7 +86,7 @@ export const doCopyTwoSecRedo = (text: string, fn: () => void) => {
  * @param veriClaim is expected to have fields: claim, claimType, and issuer
  */
 export const isGiveRecordTheUserCanConfirm = (
-  veriClaim: GenericServerRecord,
+  veriClaim: GenericCredWrapper,
   activeDid: string,
   confirmerIdList: string[] = [],
 ) => {
@@ -91,9 +102,9 @@ export const isGiveRecordTheUserCanConfirm = (
  * @returns the DID of the person who offered, or undefined if hidden
  * @param veriClaim is expected to have fields: claim and issuer
  */
-export const offerGiverDid: (
-  arg0: GenericServerRecord,
-) => string | undefined = (veriClaim) => {
+export const offerGiverDid: (arg0: GenericCredWrapper) => string | undefined = (
+  veriClaim,
+) => {
   let giver;
   if (
     veriClaim.claim.offeredBy?.identifier &&
@@ -110,7 +121,7 @@ export const offerGiverDid: (
  * @returns true if the user can fulfill the offer
  * @param veriClaim is expected to have fields: claim, claimType, and issuer
  */
-export const canFulfillOffer = (veriClaim: GenericServerRecord) => {
+export const canFulfillOffer = (veriClaim: GenericCredWrapper) => {
   return !!(veriClaim.claimType === "Offer" && offerGiverDid(veriClaim));
 };
 
@@ -180,6 +191,22 @@ export function findAllVisibleToDids(
  *
  **/
 
+export const getIdentity = async (activeDid: string): Promise<IIdentifier> => {
+  await accountsDB.open();
+  const account = (await accountsDB.accounts
+    .where("did")
+    .equals(activeDid)
+    .first()) as Account;
+  const identity = JSON.parse(account?.identity || "null");
+
+  if (!identity) {
+    throw new Error(
+      `Attempted to load Offer records for DID ${activeDid} but no identifier was found`,
+    );
+  }
+  return identity;
+};
+
 /**
  * Generates a new identity, saves it to the database, and sets it as the active identity.
  * @return {Promise<string>} with the DID of the new identity
@@ -211,7 +238,7 @@ export const generateSaveAndActivateIdentity = async (): Promise<string> => {
 };
 
 export const sendTestThroughPushServer = async (
-  subscription: PushSubscription,
+  subscriptionJSON: PushSubscriptionJSON,
   skipFilter: boolean,
 ): Promise<AxiosResponse> => {
   await db.open();
@@ -226,28 +253,11 @@ export const sendTestThroughPushServer = async (
   // Use something other than "Daily Update" https://gitea.anomalistdesign.com/trent_larson/py-push-server/src/commit/3c0e196c11bc98060ec5934e99e7dbd591b5da4d/app.py#L213
   const DIRECT_PUSH_TITLE = "DIRECT_NOTIFICATION";
 
-  const auth = Buffer.from(subscription.getKey("auth"));
-  const authB64 = auth
-    .toString("base64")
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_")
-    .replace(/=+$/, "");
-  const p256dh = Buffer.from(subscription.getKey("p256dh"));
-  const p256dhB64 = p256dh
-    .toString("base64")
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_")
-    .replace(/=+$/, "");
   const newPayload = {
-    endpoint: subscription.endpoint,
-    keys: {
-      auth: authB64,
-      p256dh: p256dhB64,
-    },
-    message: `Test, where you will see this message ${
-      skipFilter ? "un" : ""
-    }filtered.`,
+    // eslint-disable-next-line prettier/prettier
+    message: `Test, where you will see this message ${ skipFilter ? "un" : "" }filtered.`,
     title: skipFilter ? DIRECT_PUSH_TITLE : "Your Web Push",
+    ...subscriptionJSON,
   };
   console.log("Sending a test web push message:", newPayload);
   const payloadStr = JSON.stringify(newPayload);

src/main.ts

@@ -18,8 +18,12 @@ import {
   faBitcoinSign,
   faBurst,
   faCalendar,
+  faCamera,
+  faCheck,
+  faChevronDown,
   faChevronLeft,
   faChevronRight,
+  faChevronUp,
   faCircle,
   faCircleCheck,
   faCircleInfo,
@@ -43,6 +47,7 @@ import {
   faHand,
   faHandHoldingHeart,
   faHouseChimney,
+  faLeftRight,
   faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
@@ -76,8 +81,12 @@ library.add(
   faBitcoinSign,
   faBurst,
   faCalendar,
+  faCamera,
+  faCheck,
+  faChevronDown,
   faChevronLeft,
   faChevronRight,
+  faChevronUp,
   faCircle,
   faCircleCheck,
   faCircleInfo,
@@ -101,6 +110,7 @@ library.add(
   faHand,
   faHandHoldingHeart,
   faHouseChimney,
+  faLeftRight,
   faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
@@ -127,9 +137,11 @@ library.add(
 );
 
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import Camera from "simple-vue-camera";
 
 createApp(App)
   .component("fa", FontAwesomeIcon)
+  .component("camera", Camera)
   .use(createPinia())
   .use(VueAxios, axios)
   .use(router)

src/registerServiceWorker.ts

@@ -2,7 +2,7 @@
 
 import { register } from "register-service-worker";
 
-if (process.env.NODE_ENV === "production") {
+if (import.meta.env.NODE_ENV === "production") {
   register("/sw_scripts-combined.js", {
     ready() {
       console.log(

src/router/index.ts

@@ -28,192 +28,162 @@ const enterOrStart = async (
 };
 
 const routes: Array<RouteRecordRaw> = [
-  {
-    path: "/",
-    name: "home",
-    component: () =>
-      import(/* webpackChunkName: "home" */ "../views/HomeView.vue"),
-  },
   {
     path: "/account",
     name: "account",
-    component: () =>
-      import(/* webpackChunkName: "account" */ "../views/AccountViewView.vue"),
+    component: () => import("../views/AccountViewView.vue"),
   },
   {
     path: "/claim/:id?",
     name: "claim",
-    component: () =>
-      import(/* webpackChunkName: "claim" */ "../views/ClaimView.vue"),
+    component: () => import("../views/ClaimView.vue"),
   },
   {
     path: "/confirm-contact",
     name: "confirm-contact",
-    component: () =>
-      import(
-        /* webpackChunkName: "confirm-contact" */ "../views/ConfirmContactView.vue"
-      ),
+    component: () => import("../views/ConfirmContactView.vue"),
   },
   {
     path: "/contact-amounts",
     name: "contact-amounts",
-    component: () =>
-      import(
-        /* webpackChunkName: "contact-amounts" */ "../views/ContactAmountsView.vue"
-      ),
+    component: () => import("../views/ContactAmountsView.vue"),
   },
   {
     path: "/contact-gives",
     name: "contact-gives",
-    component: () =>
-      import(
-        /* webpackChunkName: "contact-gives" */ "../views/ContactGiftingView.vue"
-      ),
+    component: () => import("../views/ContactGiftingView.vue"),
   },
   {
     path: "/contact-qr",
     name: "contact-qr",
-    component: () =>
-      import(
-        /* webpackChunkName: "contact-qr" */ "../views/ContactQRScanShowView.vue"
-      ),
+    component: () => import("../views/ContactQRScanShowView.vue"),
   },
   {
     path: "/contacts",
     name: "contacts",
-    component: () =>
-      import(/* webpackChunkName: "contacts" */ "../views/ContactsView.vue"),
+    component: () => import("../views/ContactsView.vue"),
   },
   {
     path: "/discover",
     name: "discover",
-    component: () =>
-      import(/* webpackChunkName: "discover" */ "../views/DiscoverView.vue"),
+    component: () => import("../views/DiscoverView.vue"),
+  },
+  {
+    path: "/gifted-details",
+    name: "gifted-details",
+    component: () => import("../views/GiftedDetails.vue"),
   },
   {
     path: "/help",
     name: "help",
-    component: () =>
-      import(/* webpackChunkName: "help" */ "../views/HelpView.vue"),
+    component: () => import("../views/HelpView.vue"),
   },
   {
     path: "/help-notifications",
     name: "help-notifications",
-    component: () =>
-      import(
-        /* webpackChunkName: "help-notifications" */ "../views/HelpNotificationsView.vue"
-      ),
+    component: () => import("../views/HelpNotificationsView.vue"),
+  },
+  {
+    path: "/help-onboarding",
+    name: "help-onboarding",
+    component: () => import("../views/HelpOnboardingView.vue"),
+  },
+  {
+    path: "/",
+    name: "home",
+    component: () => import("../views/HomeView.vue"),
   },
   {
     path: "/identity-switcher",
     name: "identity-switcher",
-    component: () =>
-      import(
-        /* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
-      ),
+    component: () => import("../views/IdentitySwitcherView.vue"),
   },
   {
     path: "/import-account",
     name: "import-account",
-    component: () =>
-      import(
-        /* webpackChunkName: "import-account" */ "../views/ImportAccountView.vue"
-      ),
+    component: () => import("../views/ImportAccountView.vue"),
   },
   {
     path: "/import-derive",
     name: "import-derive",
-    component: () =>
-      import(
-        /* webpackChunkName: "import-derive" */ "../views/ImportDerivedAccountView.vue"
-      ),
+    component: () => import("../views/ImportDerivedAccountView.vue"),
   },
   {
     path: "/new-edit-account",
     name: "new-edit-account",
-    component: () =>
-      import(
-        /* webpackChunkName: "new-edit-account" */ "../views/NewEditAccountView.vue"
-      ),
+    component: () => import("../views/NewEditAccountView.vue"),
   },
   {
     path: "/new-edit-project",
     name: "new-edit-project",
-    component: () =>
-      import(
-        /* webpackChunkName: "new-edit-project" */ "../views/NewEditProjectView.vue"
-      ),
+    component: () => import("../views/NewEditProjectView.vue"),
   },
   {
     path: "/new-identifier",
     name: "new-identifier",
-    component: () =>
-      import(
-        /* webpackChunkName: "new-identifier" */ "../views/NewIdentifierView.vue"
-      ),
+    component: () => import("../views/NewIdentifierView.vue"),
   },
   {
     path: "/project/:id?",
     name: "project",
-    component: () =>
-      import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
+    component: () => import("../views/ProjectViewView.vue"),
   },
   {
     path: "/projects",
     name: "projects",
-    component: () =>
-      import(/* webpackChunkName: "projects" */ "../views/ProjectsView.vue"),
+    component: () => import("../views/ProjectsView.vue"),
     beforeEnter: enterOrStart,
   },
+  {
+    path: "/quick-action-bvc",
+    name: "quick-action-bvc",
+    component: () => import("../views/QuickActionBvcView.vue"),
+  },
+  {
+    path: "/quick-action-bvc-begin",
+    name: "quick-action-bvc-begin",
+    component: () => import("../views/QuickActionBvcBeginView.vue"),
+  },
+  {
+    path: "/quick-action-bvc-end",
+    name: "quick-action-bvc-end",
+    component: () => import("../views/QuickActionBvcEndView.vue"),
+  },
   {
     path: "/scan-contact",
     name: "scan-contact",
-    component: () =>
-      import(
-        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
-      ),
+    component: () => import("../views/ContactScanView.vue"),
   },
   {
     path: "/search-area",
     name: "search-area",
-    component: () =>
-      import(
-        /* webpackChunkName: "search-area" */ "../views/SearchAreaView.vue"
-      ),
+    component: () => import("../views/SearchAreaView.vue"),
   },
   {
     path: "/seed-backup",
     name: "seed-backup",
-    component: () =>
-      import(
-        /* webpackChunkName: "seed-backup" */ "../views/SeedBackupView.vue"
-      ),
+    component: () => import("../views/SeedBackupView.vue"),
   },
   {
     path: "/start",
     name: "start",
-    component: () =>
-      import(/* webpackChunkName: "start" */ "../views/StartView.vue"),
+    component: () => import("../views/StartView.vue"),
   },
   {
     path: "/statistics",
     name: "statistics",
-    component: () =>
-      import(
-        /* webpackChunkName: "statistics" */ "../views/StatisticsView.vue"
-      ),
+    component: () => import("../views/StatisticsView.vue"),
   },
   {
     path: "/test",
     name: "test",
-    component: () =>
-      import(/* webpackChunkName: "test" */ "../views/TestView.vue"),
+    component: () => import("../views/TestView.vue"),
   },
 ];
 
 /** @type {*} */
 const router = createRouter({
-  history: createWebHistory(process.env.BASE_URL),
+  history: createWebHistory(import.meta.env.BASE_URL),
   routes,
 });
 

src/util.d.ts

@@ -1,4 +1,5 @@
 // from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/util.d.ts
+/* eslint-disable */
 /**
  * The `node:util` module supports the needs of Node.js internal APIs. Many of the
  * utilities are useful for application and module developers as well. To access

src/views/AccountViewView.vue

@@ -1,5 +1,5 @@
 <template>
-  <QuickNav selected="Profile"></QuickNav>
+  <QuickNav selected="Profile" />
   <TopMessage />
 
   <!-- CONTENT -->
@@ -37,7 +37,7 @@
       <span>
         <router-link
           :to="{ name: 'help' }"
-          class="text-xs uppercase bg-blue-500 text-white px-1.5 py-1 rounded-md ml-1"
+          class="text-xs uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 rounded-md ml-1"
         >
           Help
         </router-link>
@@ -55,7 +55,7 @@
       </p>
       <router-link
         :to="{ name: 'start' }"
-        class="inline-block text-md uppercase bg-amber-600 text-white px-4 py-2 rounded-md"
+        class="inline-block text-md uppercase bg-gradient-to-b from-amber-400 to-amber-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
       >
         Create An Identifier
       </router-link>
@@ -63,12 +63,14 @@
 
     <!-- Identity Details -->
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-      <h2 v-if="givenName" class="text-xl font-semibold mb-2">
-        {{ givenName }}
-        <router-link :to="{ name: 'new-edit-account' }">
-          <fa icon="pen" class="text-xs text-blue-500 mb-1"></fa>
-        </router-link>
-      </h2>
+      <div v-if="givenName">
+        <h2 class="text-xl font-semibold mb-2">
+          {{ givenName }}
+          <router-link :to="{ name: 'new-edit-account' }">
+            <fa icon="pen" class="text-xs text-blue-500 mb-1"></fa>
+          </router-link>
+        </h2>
+      </div>
       <span v-else>
         <router-link
           :to="{ name: 'new-edit-account' }"
@@ -77,6 +79,61 @@
           Set Your Name
         </router-link>
       </span>
+      <div class="flex justify-center mt-4">
+        <span v-if="profileImageUrl" class="flex justify-between">
+          <EntityIcon
+            :icon-size="96"
+            :profileImageUrl="profileImageUrl"
+            class="inline-block align-text-bottom border border-slate-300 rounded"
+            @click="showLargeIdenticonUrl = profileImageUrl"
+          />
+          <fa
+            icon="trash-can"
+            @click="confirmDeleteImage"
+            class="text-red-500 fa-fw ml-8 mt-8 w-12 h-12"
+          />
+        </span>
+        <span v-else>
+          <fa
+            icon="camera"
+            class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md"
+            @click="openPhotoDialog"
+          />
+        </span>
+        <GiftedPhotoDialog ref="photoDialog" />
+      </div>
+      <div class="mt-4">
+        <div class="flex justify-center">
+          ... and those without your image see this:
+        </div>
+        <div class="flex justify-center">
+          <EntityIcon
+            :entityId="activeDid"
+            :iconSize="64"
+            class="inline-block align-middle border border-slate-300 rounded-md mr-1"
+            @click="showLargeIdenticonId = activeDid"
+          />
+        </div>
+      </div>
+      <div
+        v-if="showLargeIdenticonId || showLargeIdenticonUrl"
+        class="fixed z-[100] top-0 inset-x-0 w-full"
+      >
+        <div
+          class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
+        >
+          <EntityIcon
+            :entityId="showLargeIdenticonId"
+            :iconSize="512"
+            :profileImageUrl="showLargeIdenticonUrl"
+            class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
+            @click="
+              showLargeIdenticonId = undefined;
+              showLargeIdenticonUrl = undefined;
+            "
+          />
+        </div>
+      </div>
 
       <div class="text-slate-500 text-sm font-bold">ID</div>
       <div class="text-sm text-slate-500 flex justify-start items-center mb-1">
@@ -96,7 +153,7 @@
     <!-- Registration notice -->
     <!-- We won't show any loading indicator because it usually doesn't change anything. We'll just pop the message in only if we discover that they need it. -->
     <div
-      v-if="!loadingLimits && !limits?.nextWeekBeginDateTime"
+      v-if="!loadingLimits && !endorserLimits?.nextWeekBeginDateTime"
       class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3 mb-4"
     >
       <p class="mb-4">
@@ -105,13 +162,15 @@
       </p>
       <router-link
         :to="{ name: 'contact-qr' }"
-        class="inline-block text-md uppercase bg-amber-600 text-white px-4 py-2 rounded-md"
+        class="inline-block text-md uppercase bg-gradient-to-b from-amber-400 to-amber-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
       >
         Share Your Info
       </router-link>
     </div>
 
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
+      <!-- label -->
+      <div class="mb-2 font-bold">Notifications</div>
       <div
         v-if="!notificationMaybeChanged"
         class="flex items-center justify-between cursor-pointer"
@@ -140,16 +199,29 @@
         Notification status may have changed. Refresh this page to see the
         latest setting.
       </div>
-      <router-link class="px-4 text-sm text-blue-500" to="/help-notifications">
+      <router-link class="pl-4 text-sm text-blue-500" to="/help-notifications">
         Troubleshoot your notification setup.
       </router-link>
     </div>
 
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
+      <!-- label -->
+      <div class="mb-2 font-bold">Location</div>
+      <router-link
+        :to="{ name: 'search-area' }"
+        v-if="activeDid"
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2 mt-6"
+      >
+        Set Search Area…
+        <!-- If already set, change button label to "Change Search Area" -->
+      </router-link>
+    </div>
+
     <div
       v-if="activeDid"
       class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
     >
-      <div class="mb-2">Usage Limits</div>
+      <div class="mb-2 font-bold">Usage Limits</div>
       <!-- show spinner if loading limits -->
       <div v-if="loadingLimits" class="text-center">
         Checking&hellip; <fa icon="spinner" class="fa-spin"></fa>
@@ -157,31 +229,42 @@
       <div>
         {{ limitsMessage }}
       </div>
-      <div v-if="!!limits?.nextWeekBeginDateTime">
-        <p class="mb-3 text-sm">
-          You have done <b>{{ limits.doneClaimsThisWeek }}</b> claims out of
-          <b>{{ limits.maxClaimsPerWeek }}</b> for this week. Your claims
-          counter resets at
-          <b class="whitespace-nowrap">{{
-            readableTime(limits.nextWeekBeginDateTime)
-          }}</b>
-        </p>
+      <div v-if="!!endorserLimits?.nextWeekBeginDateTime">
         <p class="text-sm">
           You have done
-          <b>{{ limits.doneRegistrationsThisMonth }}</b> registrations out of
-          <b>{{ limits.maxRegistrationsPerMonth }}</b> for this month.
+          <b>{{ endorserLimits.doneClaimsThisWeek }} claims</b> out of
+          <b>{{ endorserLimits.maxClaimsPerWeek }}</b> for this week. Your
+          claims counter resets at
+          <b class="whitespace-nowrap">{{
+            readableDate(endorserLimits.nextWeekBeginDateTime)
+          }}</b>
+        </p>
+        <p class="mt-3 text-sm">
+          You have done
+          <b>{{ endorserLimits.doneRegistrationsThisMonth }} registrations</b>
+          out of <b>{{ endorserLimits.maxRegistrationsPerMonth }}</b> for this
+          month.
           <i
             >(You can register nobody on your first day, and after that only one
             a day in your first month.)</i
           >
           Your registration counter resets at
           <b class="whitespace-nowrap">
-            {{ readableTime(limits.nextMonthBeginDateTime) }}
+            {{ readableDate(endorserLimits.nextMonthBeginDateTime) }}
           </b>
         </p>
+        <p class="mt-3 text-sm" v-if="!!imageLimits">
+          You have uploaded
+          <b>{{ imageLimits?.doneImagesThisWeek }} images</b> out of
+          <b>{{ imageLimits?.maxImagesPerWeek }}</b> for this week. Your image
+          counter resets at
+          <b class="whitespace-nowrap">{{
+            readableDate(imageLimits?.nextWeekBeginDateTime)
+          }}</b>
+        </p>
       </div>
       <button
-        class="block float-right w-fit text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-2"
+        class="block float-right w-fit text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md mt-2"
         @click="checkLimits()"
       >
         Recheck Limits
@@ -189,18 +272,18 @@
     </div>
 
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
-      <div>Data Export</div>
+      <div class="mb-2 font-bold">Data Export</div>
       <router-link
         :to="{ name: 'seed-backup' }"
         v-if="activeDid"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2 mt-2"
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2 mt-2"
       >
         Backup Identifier Seed
       </router-link>
 
       <button
         v-bind:class="computedStartDownloadLinkClassNames()"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-6"
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
         @click="exportDatabase()"
       >
         Download Settings & Contacts
@@ -210,7 +293,7 @@
       <a
         ref="downloadLink"
         v-bind:class="computedDownloadLinkClassNames()"
-        class="block w-full text-center text-md uppercase bg-green-600 text-white px-1.5 py-2 rounded-md"
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-green-500 to-green-800 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-6"
       >
         If no download happened yet, click again here to download now.
       </a>
@@ -291,7 +374,7 @@
       <router-link
         id="switch-identity-link"
         :to="{ name: 'identity-switcher' }"
-        class="block w-fit text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
+        class="block w-fit text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md mb-2"
       >
         Switch Identifier
       </router-link>
@@ -299,7 +382,7 @@
       <label
         for="toggleShowAmounts"
         class="flex items-center justify-between cursor-pointer my-4"
-        @click="handleChange"
+        @click="toggleShowContactAmounts"
       >
         <!-- label -->
         <span class="text-slate-500 text-sm font-bold">Contacts Display</span>
@@ -439,6 +522,34 @@
         {{ DEFAULT_PUSH_SERVER }}
       </span>
 
+      <div class="mt-2">
+        <span class="text-slate-500 text-sm font-bold">Image Server URL</span>
+        &nbsp;
+        <span class="text-sm">{{ DEFAULT_IMAGE_API_SERVER }}</span>
+      </div>
+
+      <label
+        for="toggleShowShortcutBvc"
+        class="flex items-center justify-between cursor-pointer mt-4"
+        @click="toggleShowShortcutBvc"
+      >
+        <!-- label -->
+        <span class="text-slate-500 text-sm font-bold"
+          >Show BVC Shortcut on Home Page</span
+        >
+        <!-- toggle -->
+        <div class="relative ml-2">
+          <!-- input -->
+          <input type="checkbox" v-model="showShortcutBvc" class="sr-only" />
+          <!-- line -->
+          <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+          <!-- dot -->
+          <div
+            class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
+          ></div>
+        </div>
+      </label>
+
       <div class="mt-4">
         <h2 class="text-slate-500 text-sm font-bold">
           Contacts & Settings Database
@@ -449,7 +560,7 @@
           <input type="file" @change="uploadFile" class="ml-2" />
           <div v-if="showContactImport()">
             <button
-              class="block text-center text-md uppercase bg-blue-500 text-white px-1.5 py-2 rounded-md mb-6"
+              class="block text-center text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-6"
               @click="submitFile()"
             >
               Import Settings & Contacts
@@ -464,7 +575,7 @@
         <button>
           <router-link
             :to="{ name: 'statistics' }"
-            class="block w-fit text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
+            class="block w-fit text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md mb-2"
           >
             See Global Animated History of Giving
           </router-link>
@@ -483,24 +594,27 @@ import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
 import { useClipboard } from "@vueuse/core";
 
+import GiftedPhotoDialog from "@/components/GiftedPhotoDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
-import { AppString, DEFAULT_PUSH_SERVER } from "@/constants/app";
+import {
+  AppString,
+  DEFAULT_IMAGE_API_SERVER,
+  DEFAULT_PUSH_SERVER,
+  NotificationIface,
+} from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { IIdentifier } from "@veramo/core";
-import { ErrorResponse, RateLimits } from "@/libs/endorserServer";
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Buffer = require("buffer/").Buffer;
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import {
+  ErrorResponse,
+  EndorserRateLimits,
+  ImageRateLimits,
+} from "@/libs/endorserServer";
+import { Buffer } from "buffer/";
+import EntityIcon from "@/components/EntityIcon.vue";
+import {Contact} from "@/db/tables/contacts";
 
 interface IAccount {
   did: string;
@@ -511,27 +625,35 @@ interface IAccount {
 
 const inputFileNameRef = ref<Blob>();
 
-@Component({ components: { QuickNav, TopMessage } })
+@Component({
+  components: {EntityIcon, GiftedPhotoDialog, QuickNav, TopMessage },
+})
 export default class AccountViewView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   AppConstants = AppString;
   DEFAULT_PUSH_SERVER = DEFAULT_PUSH_SERVER;
+  DEFAULT_IMAGE_API_SERVER = DEFAULT_IMAGE_API_SERVER;
 
   activeDid = "";
   apiServer = "";
   apiServerInput = "";
   derivationPath = "";
   downloadUrl = ""; // because DuckDuckGo doesn't download on automated call to "click" on the anchor
+  endorserLimits: EndorserRateLimits | null = null;
   givenName = "";
+  imageLimits: ImageRateLimits | null = null;
   isRegistered = false;
   isSubscribed = false;
   notificationMaybeChanged = false;
+  profileImageUrl?: string;
   publicHex = "";
   publicBase64 = "";
+  showLargeIdenticonId?: string;
+  showLargeIdenticonUrl?: string;
   webPushServer = "";
   webPushServerInput = "";
-  limits: RateLimits | null = null;
+
   limitsMessage = "";
   loadingLimits = false;
   showContactGives = false;
@@ -540,6 +662,7 @@ export default class AccountViewView extends Vue {
   showB64Copy = false;
   showPubCopy = false;
   showAdvanced = false;
+  showShortcutBvc = false;
   subscription: PushSubscription | null = null;
   warnIfProdServer = false;
   warnIfTestServer = false;
@@ -598,7 +721,9 @@ export default class AccountViewView extends Vue {
       (settings?.firstName || "") +
       (settings?.lastName ? ` ${settings.lastName}` : ""); // pre v 0.1.3
     this.isRegistered = !!settings?.isRegistered;
+    this.profileImageUrl = settings?.profileImageUrl as string;
     this.showContactGives = !!settings?.showContactGivesInline;
+    this.showShortcutBvc = !!settings?.showShortcutBvc;
     this.warnIfProdServer = !!settings?.warnIfProdServer;
     this.warnIfTestServer = !!settings?.warnIfTestServer;
     this.webPushServer = (settings?.webPushServer as string) || "";
@@ -656,7 +781,7 @@ export default class AccountViewView extends Vue {
       .then(() => setTimeout(fn, 2000));
   }
 
-  handleChange() {
+  toggleShowContactAmounts() {
     this.showContactGives = !this.showContactGives;
     this.updateShowContactAmounts();
   }
@@ -671,7 +796,12 @@ export default class AccountViewView extends Vue {
     this.updateWarnIfTestServer(this.warnIfTestServer);
   }
 
-  readableTime(timeStr: string) {
+  toggleShowShortcutBvc() {
+    this.showShortcutBvc = !this.showShortcutBvc;
+    this.updateShowShortcutBvc(this.showShortcutBvc);
+  }
+
+  readableDate(timeStr: string) {
     return timeStr.substring(0, timeStr.indexOf("T"));
   }
 
@@ -766,7 +896,7 @@ export default class AccountViewView extends Vue {
         -1,
       );
       console.error(
-        "Telling user to try again after contact setting update because:",
+        "Telling user to try again after contact-amounts setting update because:",
         err,
       );
     }
@@ -789,7 +919,7 @@ export default class AccountViewView extends Vue {
         -1,
       );
       console.error(
-        "Telling user to try again after setting update because:",
+        "Telling user to try again after prod-server-warning setting update because:",
         err,
       );
     }
@@ -812,7 +942,30 @@ export default class AccountViewView extends Vue {
         -1,
       );
       console.error(
-        "Telling user to try again after setting update because:",
+        "Telling user to try again after test-server-warning setting update because:",
+        err,
+      );
+    }
+  }
+
+  public async updateShowShortcutBvc(newSetting: boolean) {
+    try {
+      await db.open();
+      db.settings.update(MASTER_SETTINGS_KEY, {
+        showShortcutBvc: newSetting,
+      });
+    } catch (err) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Updating BVC Shortcut Setting",
+          text: "The setting may not have saved. Try again, maybe after restarting the app.",
+        },
+        -1,
+      );
+      console.error(
+        "Telling user to try again after BVC-shortcut setting update because:",
         err,
       );
     }
@@ -834,11 +987,11 @@ export default class AccountViewView extends Vue {
       // Trigger the download
       this.downloadDatabaseBackup(this.downloadUrl);
 
-      // Revoke the temporary URL -- not yet because of DuckDuckGo download failure
-      //URL.revokeObjectURL(this.downloadUrl);
-
       // Notify the user that the download has started
       this.notifyDownloadStarted();
+
+      // Revoke the temporary URL -- after a pause to avoid DuckDuckGo download failure
+      setTimeout(() => URL.revokeObjectURL(this.downloadUrl), 1000);
     } catch (error) {
       this.handleExportError(error);
     }
@@ -877,13 +1030,13 @@ export default class AccountViewView extends Vue {
 
   public computedStartDownloadLinkClassNames() {
     return {
-      invisible: this.downloadUrl,
+      hidden: this.downloadUrl,
     };
   }
 
   public computedDownloadLinkClassNames() {
     return {
-      invisible: !this.downloadUrl,
+      hidden: !this.downloadUrl,
     };
   }
 
@@ -989,11 +1142,11 @@ export default class AccountViewView extends Vue {
     this.limitsMessage = "";
 
     try {
-      const resp = await this.fetchRateLimits(identity);
+      const resp = await this.fetchEndorserRateLimits(identity);
       if (resp.status === 200) {
-        this.limits = resp.data;
+        this.endorserLimits = resp.data;
         if (!this.isRegistered) {
-          // the user is not known to be registered, but they are so let's record it
+          // the user was not known to be registered, but now they are (because we got no error) so let's record it
           try {
             await db.open();
             db.settings.update(MASTER_SETTINGS_KEY, {
@@ -1013,6 +1166,10 @@ export default class AccountViewView extends Vue {
             );
           }
         }
+        const imageResp = await this.fetchImageRateLimits(identity);
+        if (imageResp.status === 200) {
+          this.imageLimits = imageResp.data;
+        }
       }
     } catch (error) {
       this.handleRateLimitsError(error);
@@ -1033,17 +1190,29 @@ export default class AccountViewView extends Vue {
   }
 
   /**
-   * Fetches rate limits from the server.
+   * Fetches rate limits from the Endorser server.
    *
    * @param {IIdentifier} identity - The identity object to check rate limits for.
    * @returns {Promise<AxiosResponse>} The Axios response object.
    */
-  private async fetchRateLimits(identity: IIdentifier) {
+  private async fetchEndorserRateLimits(identity: IIdentifier) {
     const url = `${this.apiServer}/api/report/rateLimits`;
     const headers = await this.getHeaders(identity);
     return await this.axios.get(url, { headers } as AxiosRequestConfig);
   }
 
+  /**
+   * Fetches rate limits from the image server.
+   *
+   * @param {IIdentifier} identity - The identity object to check rate limits for.
+   * @returns {Promise<AxiosResponse>} The Axios response object.
+   */
+  private async fetchImageRateLimits(identity: IIdentifier) {
+    const url = DEFAULT_IMAGE_API_SERVER + "/image-limits";
+    const headers = await this.getHeaders(identity);
+    return await this.axios.get(url, { headers } as AxiosRequestConfig);
+  }
+
   /**
    * Handles errors that occur while fetching rate limits.
    *
@@ -1055,9 +1224,9 @@ export default class AccountViewView extends Vue {
       this.limitsMessage =
         (data?.error?.message as string) || "Bad server response.";
       console.error(
-        "Got bad response retrieving limits, which usually means user isn't registered:",
-        error,
+        "Got bad response retrieving limits, which usually means user isn't registered.",
       );
+      //console.error(error);
     } else {
       this.limitsMessage = "Got an error retrieving limits.";
       console.error("Got some error retrieving limits:", error);
@@ -1156,5 +1325,95 @@ export default class AccountViewView extends Vue {
       -1,
     );
   }
+
+  openPhotoDialog() {
+    (this.$refs.photoDialog as GiftedPhotoDialog).open(
+      async (imgUrl) => {
+        await db.open();
+        db.settings.update(MASTER_SETTINGS_KEY, {
+          profileImageUrl: imgUrl,
+        });
+        this.profileImageUrl = imgUrl;
+        //console.log("Got image URL:", imgUrl);
+      },
+      true,
+      "profile",
+    );
+  }
+
+  confirmDeleteImage() {
+    this.$notify(
+      {
+        group: "modal",
+        type: "confirm",
+        title: "Are you sure you want to delete your profile picture?",
+        text: "",
+        onYes: this.deleteImage,
+      },
+      -1,
+    );
+  }
+
+  async deleteImage() {
+    if (!this.profileImageUrl) {
+      return;
+    }
+    try {
+      const identity = await this.getIdentity(this.activeDid);
+      if (!identity) {
+        throw Error("No identity found.");
+      }
+      const token = await accessToken(identity);
+      const response = await this.axios.delete(
+        DEFAULT_IMAGE_API_SERVER +
+          "/image/" +
+          encodeURIComponent(this.profileImageUrl),
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        },
+      );
+      if (response.status === 204) {
+        // don't bother with a notification
+        // (either they'll simply continue or they're canceling and going back)
+      } else {
+        console.error("Non-success deleting image:", response);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "There was a problem deleting the image.",
+          },
+          5000,
+        );
+        // keep the imageUrl in localStorage so the user can try again if they want
+        return;
+      }
+
+      this.profileImageUrl = undefined;
+    } catch (error) {
+      console.error("Error deleting image:", error);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      if ((error as any).response.status === 404) {
+        console.log("The image was already deleted:", error);
+
+        this.profileImageUrl = undefined;
+
+        // it already doesn't exist so we won't say anything to the user
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "There was an error deleting the image.",
+          },
+          5000,
+        );
+      }
+    }
+  }
 }
 </script>

src/views/ClaimView.vue

@@ -123,7 +123,7 @@
 
     <div class="columns-3">
       <button
-        class="col-span-1 bg-blue-600 text-white px-4 py-2 rounded-md"
+        class="col-span-1 bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
         v-if="
           libsUtil.isGiveRecordTheUserCanConfirm(
             veriClaim,
@@ -140,7 +140,7 @@
       <button
         v-if="libsUtil.canFulfillOffer(veriClaim)"
         @click="openFulfillGiftDialog()"
-        class="col-span-1 block w-fit text-center text-md bg-blue-600 text-white px-1.5 py-2 rounded-md"
+        class="col-span-1 block w-fit text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
       >
         Affirm Delivery
         <fa icon="hand-holding-heart" class="ml-2 text-white cursor-pointer" />
@@ -377,7 +377,7 @@
       </p>
       <button
         v-else
-        class="block w-full text-center text-md uppercase bg-blue-600 text-white px-1.5 py-2 rounded-md mb-2"
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2"
         @click="showFullClaim(veriClaim.id as string)"
       >
         Load Full Claim Details
@@ -390,7 +390,7 @@
     <a
       :href="apiServer + '/api/claim/' + veriClaim.id"
       target="_blank"
-      class="block w-full text-center text-md uppercase bg-blue-600 text-white px-1.5 py-2 rounded-md mb-2"
+      class="block w-full text-center text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2"
     >
       View on the Public Server
     </a>
@@ -407,6 +407,7 @@ import { useClipboard } from "@vueuse/core";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
@@ -414,22 +415,14 @@ import { accessToken } from "@/libs/crypto";
 import * as serverUtil from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
 import { Account } from "@/db/tables/accounts";
 import { GiverInputInfo } from "@/libs/endorserServer";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({
-  components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav },
+  components: { GiftedDialog, OfferDialog, QuickNav },
 })
 export default class ClaimView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   accountIdentityStr: string = "null";
   activeDid = "";
@@ -736,10 +729,7 @@ export default class ClaimView extends Vue {
           ),
         ),
       );
-      const confirmationClaim: serverUtil.GenericVerifiableCredential & {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        object: any;
-      } = {
+      const confirmationClaim: serverUtil.GenericVerifiableCredential = {
         "@context": "https://schema.org",
         "@type": "AgreeAction",
         object: goodClaim,

src/views/ConfirmContactView.vue

@@ -30,17 +30,19 @@
     </div>
 
     <div class="mt-8">
-      <input
-        type="submit"
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-        value="Add Contact"
-      />
-      <button
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Cancel
-      </button>
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <input
+          type="submit"
+          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+          value="Add Contact"
+        />
+        <button
+          type="button"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
   </section>
 </template>

src/views/ContactAmountsView.vue

@@ -105,39 +105,33 @@
 </template>
 
 <script lang="ts">
+import { AxiosError } from "axios";
+import * as didJwt from "did-jwt";
 import * as R from "ramda";
-
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
+
+import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
 import {
   AgreeVerifiableCredential,
-  GiveServerRecord,
+  GiveSummaryRecord,
   GiveVerifiableCredential,
   SCHEMA_ORG_CONTEXT,
 } from "@/libs/endorserServer";
-import * as didJwt from "did-jwt";
-import { AxiosError } from "axios";
-import QuickNav from "@/components/QuickNav.vue";
-import { IIdentifier } from "@veramo/core";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component({ components: { QuickNav } })
 export default class ContactAmountssView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   apiServer = "";
   contact: Contact | null = null;
-  giveRecords: Array<GiveServerRecord> = [];
+  giveRecords: Array<GiveSummaryRecord> = [];
   numAccounts = 0;
 
   async beforeCreate() {
@@ -185,7 +179,7 @@ export default class ContactAmountssView extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.log("Error retrieving settings or gives.", err);
+      console.error("Error retrieving settings or gives.", err);
       this.$notify(
         {
           group: "alert",
@@ -203,7 +197,7 @@ export default class ContactAmountssView extends Vue {
   async loadGives(activeDid: string, contact: Contact) {
     try {
       const identity = await this.getIdentity(this.activeDid);
-      let result: Array<GiveServerRecord> = [];
+      let result: Array<GiveSummaryRecord> = [];
       const url =
         this.apiServer +
         "/api/v2/report/gives?agentDid=" +
@@ -258,7 +252,7 @@ export default class ContactAmountssView extends Vue {
         );
       }
 
-      const sortedResult: Array<GiveServerRecord> = R.sort(
+      const sortedResult: Array<GiveSummaryRecord> = R.sort(
         (a, b) =>
           new Date(b.issuedAt).getTime() - new Date(a.issuedAt).getTime(),
         result,
@@ -277,7 +271,7 @@ export default class ContactAmountssView extends Vue {
     }
   }
 
-  async confirm(record: GiveServerRecord) {
+  async confirm(record: GiveSummaryRecord) {
     // Make claim
     // I use clone here because otherwise it gets a Proxy object.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/views/ContactGiftingView.vue

@@ -32,7 +32,7 @@
             <button
               type="button"
               @click="openDialog()"
-              class="block w-full text-center text-sm uppercase bg-blue-600 text-white px-3 py-1.5 rounded-md"
+              class="block w-full text-center text-sm uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
             >
               <fa icon="gift" class="fa-fw"></fa>
             </button>
@@ -47,7 +47,7 @@
         <h2 class="text-base flex gap-4 items-center">
           <span class="grow font-semibold">
             <EntityIcon
-              :entityId="contact.did"
+              :contact="contact"
               :iconSize="32"
               class="inline-block align-middle border border-slate-300 rounded-md mr-1"
             />
@@ -57,7 +57,7 @@
             <button
               type="button"
               @click="openDialog(contact)"
-              class="block w-full text-center text-sm uppercase bg-blue-600 text-white px-3 py-1.5 rounded-md"
+              class="block w-full text-center text-sm uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
             >
               <fa icon="gift" class="fa-fw"></fa>
             </button>
@@ -76,40 +76,33 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
+import { IIdentifier } from "@veramo/core";
+
 import GiftedDialog from "@/components/GiftedDialog.vue";
+import QuickNav from "@/components/QuickNav.vue";
+import EntityIcon from "@/components/EntityIcon.vue";
+import { NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { Account, AccountsSchema } from "@/db/tables/accounts";
+import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { GiverInputInfo } from "@/libs/endorserServer";
-import { Contact } from "@/db/tables/contacts";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { IIdentifier } from "@veramo/core";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component({
   components: { GiftedDialog, QuickNav, EntityIcon },
 })
 export default class ContactGiftingView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];
   apiServer = "";
   accounts: typeof AccountsSchema;
-  numAccounts = 0;
   projectId = localStorage.getItem("projectId") || "";
 
   async beforeCreate() {
     accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
   }
 
   async created() {
@@ -118,13 +111,19 @@ export default class ContactGiftingView extends Vue {
       const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
       this.apiServer = settings?.apiServer || "";
       this.activeDid = settings?.activeDid || "";
-      this.allContacts = await db.contacts.toArray();
+
+      // .orderBy("name") wouldn't retrieve any entries with a blank name
+      // .toCollection.sortBy("name") didn't sort in an order I understood
+      const baseContacts = await db.contacts.toArray();
+      this.allContacts = baseContacts.sort((a, b) =>
+        (a.name || "").localeCompare(b.name || ""),
+      );
 
       localStorage.removeItem("projectId");
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.log("Error retrieving settings & contacts:", err);
+      console.error("Error retrieving settings & contacts:", err);
       this.$notify(
         {
           group: "alert",

src/views/ContactQRScanShowView.vue

@@ -18,19 +18,22 @@
       <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
         Your Contact Info
       </h1>
-      <p v-if="!givenName" class="text-center mt-2">
+      <p
+        v-if="!givenName"
+        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
+      >
         <span class="text-red">Beware!</span>
-        You aren't sharing your name, so hurry and
+        You aren't sharing your name, so quickly
         <router-link
           :to="{ name: 'new-edit-account' }"
-          class="bg-blue-500 text-white px-1.5 py-1 rounded-md"
+          class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 rounded-md"
         >
-          go here to set it for them.
+          click here to set it for them.
         </router-link>
       </p>
     </div>
 
-    <div @click="onCopyToClipboard()" v-if="activeDid">
+    <div @click="onCopyToClipboard()" v-if="activeDid" class="text-center">
       <!--
         Play with display options: https://qr-code-styling.com/
         See docs: https://www.npmjs.com/package/qr-code-generator-vue3
@@ -41,9 +44,8 @@
         :dotsOptions="{ type: 'square' }"
         class="flex justify-center"
       />
-      <span class="flex justify-center">
-        Click QR to copy your contact URL to your clipboard.
-      </span>
+      <span> Click that QR to copy your contact URL to your clipboard. </span>
+      <div>Not scanning? Show it in pieces.</div>
     </div>
     <div class="text-center" v-else>
       You have no identitifiers yet, so
@@ -77,25 +79,17 @@ import { Component, Vue } from "vue-facing-decorator";
 import { QrcodeStream } from "vue-qrcode-reader";
 import { useClipboard } from "@vueuse/core";
 
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { deriveAddress, nextDerivationPath, SimpleSigner } from "@/libs/crypto";
+import {deriveAddress, getContactPayloadFromJwtUrl, nextDerivationPath, SimpleSigner} from "@/libs/crypto";
 import QuickNav from "@/components/QuickNav.vue";
 import { Account } from "@/db/tables/accounts";
 import {
   CONTACT_URL_PREFIX,
   ENDORSER_JWT_URL_LOCATION,
 } from "@/libs/endorserServer";
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Buffer = require("buffer/").Buffer;
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { Buffer } from "buffer/";
 
 @Component({
   components: {
@@ -105,7 +99,7 @@ interface Notification {
   },
 })
 export default class ContactQRScanShow extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   apiServer = "";
@@ -160,6 +154,7 @@ export default class ContactQRScanShow extends Vue {
             (settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
           publicEncKey,
           nextPublicEncKeyHash: nextPublicEncKeyHashBase64,
+          profileImageUrl: settings?.profileImageUrl,
         },
       };
 
@@ -184,10 +179,24 @@ export default class ContactQRScanShow extends Vue {
   // Unfortunately, there are not typescript definitions for the qrcode-stream component yet.
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   onScanDetect(content: any) {
-    if (content[0]?.rawValue) {
-      //console.log("onDetect", content[0].rawValue);
-      localStorage.setItem("contactEndorserUrl", content[0].rawValue);
-      this.$router.push({ name: "contacts" });
+    const url = content[0]?.rawValue;
+    if (url) {
+      try {
+        const fullData = getContactPayloadFromJwtUrl(url);
+        console.log("fullData", fullData);
+        localStorage.setItem("contactEndorserUrl", url);
+        this.$router.push({ name: "contacts" });
+      } catch (e) {
+        this.$notify(
+          {
+            group: "alert",
+            type: "warning",
+            title: "Invalid Contact QR Code",
+            text: "The QR code isn't in the right format.",
+          },
+          5000,
+        );
+      }
     } else {
       this.$notify(
         {
@@ -196,14 +205,14 @@ export default class ContactQRScanShow extends Vue {
           title: "Invalid Contact QR Code",
           text: "No QR code detected with contact information.",
         },
-        -1,
+        5000,
       );
     }
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   onScanError(error: any) {
-    console.log("Scan was invalid:", error);
+    console.error("Scan was invalid:", error);
     this.$notify(
       {
         group: "alert",
@@ -211,7 +220,7 @@ export default class ContactQRScanShow extends Vue {
         title: "Invalid Scan",
         text: "The scan was invalid.",
       },
-      -1,
+      5000,
     );
   }
 

src/views/ContactScanView.vue

@@ -65,17 +65,19 @@
     />
 
     <div class="mt-8">
-      <input
-        type="submit"
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-        value="Look Up Contact"
-      />
-      <button
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Cancel
-      </button>
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <input
+          type="submit"
+          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+          value="Look Up Contact"
+        />
+        <button
+          type="button"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
   </section>
 </template>

src/views/ContactsView.vue

@@ -10,8 +10,9 @@
       <span />
       <span>
         <a
-          @click="showHintsForOnboarding()"
-          class="text-xs uppercase bg-blue-500 text-white px-1.5 py-1 rounded-md ml-1"
+          href="/help-onboarding"
+          target="_blank"
+          class="text-xs uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 rounded-md ml-1"
         >
           Onboarding Guide
         </a>
@@ -22,7 +23,7 @@
     <div class="mt-4 mb-4 flex items-stretch">
       <router-link
         :to="{ name: 'contact-qr' }"
-        class="flex items-center bg-slate-500 text-white px-1.5 py-1 mr-1 rounded-md"
+        class="flex items-center bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 mr-1 rounded-md"
       >
         <fa icon="qrcode" class="fa-fw text-2xl" />
       </router-link>
@@ -75,7 +76,7 @@
         <br />
         (Only most recent hours included. To see more, click
         <span
-          class="text-sm uppercase bg-slate-500 text-white px-1 py-1 rounded-md"
+          class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1 py-1 rounded-md"
         >
           <fa icon="file-lines" class="fa-fw" />
         </span>
@@ -93,17 +94,17 @@
         <div class="grow overflow-hidden">
           <h2 class="text-base font-semibold">
             <EntityIcon
-              :entityId="contact.did"
+              :contact="contact"
               :iconSize="24"
               class="inline-block align-text-bottom border border-slate-300 rounded"
-              @click="showLargeIdenticon = contact.did"
-            ></EntityIcon>
+              @click="showLargeIdenticon = contact"
+            />
             {{ contact.name || AppString.NO_CONTACT_NAME }}
             <button
-              class="text-sm uppercase bg-slate-500 text-white px-1 rounded-md"
+              class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1 rounded-md"
               @click="
                 contactEdit = contact;
-                contactNewName = contact.name;
+                contactNewName = contact.name || '';
               "
               title="Edit"
             >
@@ -137,7 +138,7 @@
             <div v-if="activeDid">
               <button
                 v-if="contact.seesMe"
-                class="text-sm uppercase bg-slate-500 text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
                 @click="setVisibility(contact, false, true)"
                 title="They can see you"
               >
@@ -145,14 +146,14 @@
               </button>
               <button
                 v-else
-                class="text-sm uppercase bg-slate-500 text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mx-0.5 my-0.5 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 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
                 @click="checkVisibility(contact)"
                 title="Check Visibility"
                 v-if="activeDid"
@@ -161,7 +162,7 @@
               </button>
               <button
                 @click="register(contact)"
-                class="text-sm uppercase bg-slate-500 text-white ml-6 px-2 py-1.5 rounded-md"
+                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-6 px-2 py-1.5 rounded-md"
                 v-if="activeDid"
                 title="Registration"
               >
@@ -176,7 +177,7 @@
 
             <button
               @click="deleteContact(contact)"
-              class="text-sm uppercase bg-red-600 text-white ml-24 px-2 py-1.5 rounded-md"
+              class="text-sm uppercase bg-gradient-to-b from-rose-500 to-rose-800 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-24 px-2 py-1.5 rounded-md"
               title="Delete"
             >
               <fa icon="trash-can" class="fa-fw" />
@@ -187,7 +188,7 @@
               class="ml-auto flex gap-1.5"
             >
               <button
-                class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded-l-md"
+                class="text-sm bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-l-md"
                 @click="onClickAddGive(activeDid, contact.did)"
                 :title="givenByMeDescriptions[contact.did] || ''"
               >
@@ -229,7 +230,7 @@
                   name: 'contact-amounts',
                   query: { contactDid: contact.did },
                 }"
-                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
+                class="text-sm uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-md"
                 title="See more given activity"
               >
                 <fa icon="file-lines" class="fa-fw" />
@@ -245,10 +246,10 @@
         class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
       >
         <EntityIcon
-          :entityId="showLargeIdenticon"
+          :contact="showLargeIdenticon"
           :iconSize="512"
           class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
-          @click="showLargeIdenticon = ''"
+          @click="showLargeIdenticon = undefined"
         />
       </div>
     </div>
@@ -284,6 +285,7 @@
 
 <script lang="ts">
 import { AxiosError } from "axios";
+import { IndexableType } from "dexie";
 import * as didJwt from "did-jwt";
 import * as R from "ramda";
 import { IIdentifier } from "@veramo/core";
@@ -301,7 +303,7 @@ import {
 import {
   CONTACT_CSV_HEADER,
   CONTACT_URL_PREFIX,
-  GiveServerRecord,
+  GiveSummaryRecord,
   GiveVerifiableCredential,
   isDid,
   RegisterVerifiableCredential,
@@ -311,10 +313,8 @@ import * as libsUtil from "@/libs/util";
 import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import { Account } from "@/db/tables/accounts";
-import { IndexableType } from "dexie";
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Buffer = require("buffer/").Buffer;
+import { Buffer } from "buffer/";
 
 @Component({
   components: { QuickNav, EntityIcon },
@@ -348,7 +348,7 @@ export default class ContactsView extends Vue {
   showGiveNumbers = false;
   showGiveTotals = true;
   showGiveConfirmed = true;
-  showLargeIdenticon = "";
+  showLargeIdenticon?: Contact;
 
   AppString = AppString;
   libsUtil = libsUtil;
@@ -364,10 +364,12 @@ export default class ContactsView extends Vue {
     if (this.showGiveNumbers) {
       this.loadGives();
     }
-    const allContacts = await db.contacts.toArray();
-    this.contacts = R.sort(
-      (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
-      allContacts,
+
+    // .orderBy("name") wouldn't retrieve any entries with a blank name
+    // .toCollection.sortBy("name") didn't sort in an order I understood
+    const baseContacts = await db.contacts.toArray();
+    this.contacts = baseContacts.sort((a, b) =>
+      (a.name || "").localeCompare(b.name || ""),
     );
 
     if (this.contactEndorserUrl) {
@@ -413,7 +415,7 @@ export default class ContactsView extends Vue {
     }
 
     const handleResponse = (
-      resp: { status: number; data: { data: GiveServerRecord[] } },
+      resp: { status: number; data: { data: GiveSummaryRecord[] } },
       descriptions: Record<string, string>,
       confirmed: Record<string, number>,
       unconfirmed: Record<string, number>,
@@ -501,7 +503,7 @@ export default class ContactsView extends Vue {
       this.givenToMeConfirmed = givenToMeConfirmed;
       this.givenToMeUnconfirmed = givenToMeUnconfirmed;
     } catch (error) {
-      console.log("Error loading gives", error);
+      console.error("Error loading gives", error);
       this.$notify(
         {
           group: "alert",
@@ -514,18 +516,6 @@ export default class ContactsView extends Vue {
     }
   }
 
-  showHintsForOnboarding() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "info",
-        title: "Onboard Someone",
-        text: libsUtil.ONBOARD_MESSAGE,
-      },
-      -1,
-    );
-  }
-
   async onClickNewContact(): Promise<void> {
     if (!this.contactInput) {
       this.$notify(
@@ -535,7 +525,7 @@ export default class ContactsView extends Vue {
           title: "No Contact",
           text: "There was no contact info to add.",
         },
-        -1,
+        3000,
       );
       return;
     }
@@ -563,7 +553,7 @@ export default class ContactsView extends Vue {
             title: "Contacts Added",
             text: "Each contact was added. Nothing was sent to the server.",
           },
-          -1, // keeping it up so that the "visibility" message is seen
+          3000, // keeping it up so that the "visibility" message is seen
         );
       } catch (e) {
         this.$notify(
@@ -576,10 +566,12 @@ export default class ContactsView extends Vue {
           -1,
         );
       }
-      const allContacts = await db.contacts.toArray();
-      this.contacts = R.sort(
-        (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
-        allContacts,
+
+      // .orderBy("name") wouldn't retrieve any entries with a blank name
+      // .toCollection.sortBy("name") didn't sort in an order I understood
+      const baseContacts = await db.contacts.toArray();
+      this.contacts = baseContacts.sort((a, b) =>
+        (a.name || "").localeCompare(b.name || ""),
       );
       return;
     }
@@ -672,7 +664,7 @@ export default class ContactsView extends Vue {
           title: "No Contact Info",
           text: "The contact info could not be parsed.",
         },
-        -1,
+        3000,
       );
       return;
     } else {
@@ -680,6 +672,7 @@ export default class ContactsView extends Vue {
         did: payload.iss,
         name: payload.own.name,
         nextPubKeyHashB64: payload.own.nextPublicEncKeyHash,
+        profileImageUrl: payload.own.profileImageUrl,
         publicKeyBase64: payload.own.publicEncKey,
       } as Contact);
     }
@@ -694,7 +687,7 @@ export default class ContactsView extends Vue {
           title: "Incomplete Contact",
           text: "Cannot add a contact without a DID.",
         },
-        -1,
+        5000,
       );
       return;
     }
@@ -706,7 +699,7 @@ export default class ContactsView extends Vue {
           title: "Invalid DID",
           text: "The DID is not valid. It must begin with 'did:'",
         },
-        -1,
+        5000,
       );
       return;
     }
@@ -745,7 +738,7 @@ export default class ContactsView extends Vue {
             title: "Contact Added",
             text: addedMessage,
           },
-          -1, // keeping it up so that the "visibility" message is seen
+          3000,
         );
       })
       .catch((err) => {
@@ -861,7 +854,7 @@ export default class ContactsView extends Vue {
                 title: "Registration Still Unknown",
                 text: message,
               },
-              -1,
+              5000,
             );
           } else if (resp.data?.success?.handleId) {
             contact.registered = true;
@@ -876,7 +869,7 @@ export default class ContactsView extends Vue {
                   (contact.name || "That unnamed person") +
                   " has been registered.",
               },
-              -1,
+              5000,
             );
           }
         } catch (error) {
@@ -884,7 +877,9 @@ export default class ContactsView extends Vue {
           let userMessage = "There was an error. See logs for more info.";
           const serverError = error as AxiosError;
           if (serverError) {
-            if (serverError.message) {
+            if (serverError.response?.data?.error?.message) {
+              userMessage = serverError.response.data.error.message;
+            } else if (serverError.message) {
               userMessage = serverError.message; // Info for the user
             } else {
               userMessage = JSON.stringify(serverError.toJSON());
@@ -900,7 +895,7 @@ export default class ContactsView extends Vue {
               title: "Registration Error",
               text: userMessage,
             },
-            -1,
+            5000,
           );
         }
       }
@@ -941,7 +936,7 @@ export default class ContactsView extends Vue {
                   (visibility ? "" : "not ") +
                   "see your activity.",
               },
-              -1,
+              3000,
             );
           }
           contact.seesMe = visibility;
@@ -961,7 +956,7 @@ export default class ContactsView extends Vue {
               title: "Error Setting Visibility",
               text: message,
             },
-            -1,
+            5000,
           );
         }
       } catch (err) {
@@ -973,7 +968,7 @@ export default class ContactsView extends Vue {
             title: "Error Setting Visibility",
             text: "Check connectivity and try again.",
           },
-          -1,
+          5000,
         );
       }
     }
@@ -1005,10 +1000,10 @@ export default class ContactsView extends Vue {
               (visibility ? "" : "not ") +
               "see your activity.",
           },
-          -1,
+          3000,
         );
       } else {
-        console.log("Got bad server response when checking visibility: ", resp);
+        console.error("Got bad server response checking visibility:", resp);
         const message = resp.data.error?.message || "Got bad server response.";
         this.$notify(
           {
@@ -1017,11 +1012,11 @@ export default class ContactsView extends Vue {
             title: "Error Checking Visibility",
             text: message,
           },
-          -1,
+          5000,
         );
       }
     } catch (err) {
-      console.log("Caught error from request to check visibility:", err);
+      console.error("Caught error from request to check visibility:", err);
       this.$notify(
         {
           group: "alert",
@@ -1029,17 +1024,11 @@ export default class ContactsView extends Vue {
           title: "Error Checking Visibility",
           text: "Check connectivity and try again.",
         },
-        -1,
+        3000,
       );
     }
   }
 
-  // from https://stackoverflow.com/a/175787/845494
-  //
-  private isNumeric(str: string): boolean {
-    return !isNaN(+str);
-  }
-
   private nameForDid(contacts: Array<Contact>, did: string): string {
     const contact = R.find((con) => con.did == did, contacts);
     return this.nameForContact(contact);
@@ -1075,7 +1064,7 @@ export default class ContactsView extends Vue {
         return;
       }
     }
-    if (!this.isNumeric(this.hourInput)) {
+    if (!libsUtil.isNumeric(this.hourInput)) {
       this.$notify(
         {
           group: "alert",
@@ -1083,7 +1072,7 @@ export default class ContactsView extends Vue {
           title: "Input Error",
           text: "This is not a valid number of hours: " + this.hourInput,
         },
-        -1,
+        3000,
       );
     } else if (parseFloat(this.hourInput) == 0 && !this.hourDescriptionInput) {
       this.$notify(
@@ -1093,7 +1082,7 @@ export default class ContactsView extends Vue {
           title: "Input Error",
           text: "Giving no hours or description does nothing.",
         },
-        -1,
+        3000,
       );
     } else if (!identity) {
       this.$notify(
@@ -1103,7 +1092,7 @@ export default class ContactsView extends Vue {
           title: "Status Error",
           text: "No identifier is available.",
         },
-        -1,
+        3000,
       );
     } else {
       // ask to confirm amount
@@ -1198,7 +1187,7 @@ export default class ContactsView extends Vue {
               title: "Done",
               text: "Successfully logged time to the server.",
             },
-            -1,
+            5000,
           );
 
           if (fromDid === identity.did) {
@@ -1212,7 +1201,7 @@ export default class ContactsView extends Vue {
           }
         }
       } catch (error) {
-        console.log("Error in createAndSubmitContactGive: ", error);
+        console.error("Error in createAndSubmitContactGive: ", error);
         let userMessage = "There was an error. See logs for more info.";
         const serverError = error as AxiosError;
         if (serverError) {
@@ -1232,7 +1221,7 @@ export default class ContactsView extends Vue {
             title: "Error Sending Give",
             text: userMessage,
           },
-          -1,
+          5000,
         );
       }
     }

src/views/DiscoverView.vue

@@ -129,27 +129,19 @@
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 
+import QuickNav from "@/components/QuickNav.vue";
+import InfiniteScroll from "@/components/InfiniteScroll.vue";
+import ProjectIcon from "@/components/ProjectIcon.vue";
+import TopMessage from "@/components/TopMessage.vue";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { didInfo, PlanData } from "@/libs/endorserServer";
-import QuickNav from "@/components/QuickNav.vue";
-import InfiniteScroll from "@/components/InfiniteScroll.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import ProjectIcon from "@/components/ProjectIcon.vue";
-import TopMessage from "@/components/TopMessage.vue";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component({
   components: {
-    EntityIcon,
     InfiniteScroll,
     ProjectIcon,
     QuickNav,
@@ -157,7 +149,7 @@ interface Notification {
   },
 })
 export default class DiscoverView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];
@@ -260,7 +252,7 @@ export default class DiscoverView extends Vue {
 
       if (response.status !== 200) {
         const details = await response.text();
-        console.log("Problem with full search:", details);
+        console.error("Problem with full search:", details);
         this.$notify(
           {
             group: "alert",
@@ -288,7 +280,7 @@ export default class DiscoverView extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
-      console.log("Error with feed load:", e);
+      console.error("Error with feed load:", e);
       this.$notify(
         {
           group: "alert",
@@ -343,7 +335,7 @@ export default class DiscoverView extends Vue {
 
       if (response.status !== 200) {
         const details = await response.text();
-        console.log("Problem with nearby search:", details);
+        console.error("Problem with nearby search:", details);
         this.$notify(
           {
             group: "alert",
@@ -380,7 +372,7 @@ export default class DiscoverView extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
-      console.log("Error with feed load:", e);
+      console.error("Error with feed load:", e);
       this.$notify(
         {
           group: "alert",

src/views/GiftedDetails.vue

@@ -0,0 +1,459 @@
+<template>
+  <QuickNav />
+  <TopMessage />
+
+  <!-- CONTENT -->
+  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+    <!-- 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="cancel()"
+      >
+        <fa icon="chevron-left" class="fa-fw"></fa>
+      </h1>
+    </div>
+
+    <!-- Heading -->
+    <h1 class="text-4xl text-center font-light px-4 mb-4">What Was Given</h1>
+
+    <h1 class="text-xl font-bold text-center mb-4">
+      {{ message }} {{ giverName || "somebody not named" }}
+    </h1>
+    <textarea
+      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+      placeholder="What was received"
+      v-model="description"
+    />
+    <div class="flex flex-row justify-center">
+      <span
+        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
+        @click="changeUnitCode()"
+      >
+        {{ libsUtil.UNIT_SHORT[unitCode] }}
+      </span>
+      <div
+        class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
+        @click="amountInput === '0' ? null : decrement()"
+      >
+        <fa icon="chevron-left" />
+      </div>
+      <input
+        type="number"
+        class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
+        v-model="amountInput"
+      />
+      <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 justify-center mt-4">
+      <span v-if="imageUrl" class="flex justify-between">
+        <a :href="imageUrl" target="_blank" class="text-blue-500 ml-4">
+          <img :src="imageUrl" class="h-24 rounded-xl" />
+        </a>
+        <fa
+          icon="trash-can"
+          @click="confirmDeleteImage"
+          class="text-red-500 fa-fw ml-8 mt-10"
+        />
+      </span>
+      <span v-else>
+        <fa
+          icon="camera"
+          class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md"
+          @click="openPhotoDialog"
+        />
+      </span>
+    </div>
+    <GiftedPhotoDialog ref="photoDialog" />
+
+    <div v-if="projectId" class="mt-4">
+      <fa
+        icon="check"
+        class="bg-slate-500 text-white h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
+      />
+      <label class="text-sm">This is given to a project</label>
+    </div>
+
+    <div v-if="!projectId" class="mt-4">
+      <input type="checkbox" class="h-6 w-6 mr-2" v-model="givenToUser" />
+      <label class="text-sm">Given to you</label>
+    </div>
+
+    <div class="mt-4">
+      <input type="checkbox" class="h-6 w-6 mr-2" v-model="isTrade" />
+      <label class="text-sm">Trade (not a gift)</label>
+    </div>
+
+    <p class="text-center mb-2 mt-6 italic">
+      Sign & Send to publish to the world
+      <fa
+        icon="circle-info"
+        class="pl-2 text-blue-500 cursor-pointer"
+        @click="explainData()"
+      />
+    </p>
+    <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+      <button
+        class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+        @click="confirm"
+      >
+        Sign &amp; Send
+      </button>
+      <button
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+        @click="cancel"
+      >
+        Cancel
+      </button>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-facing-decorator";
+
+import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
+import QuickNav from "@/components/QuickNav.vue";
+import TopMessage from "@/components/TopMessage.vue";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { createAndSubmitGive } from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
+import { accessToken } from "@/libs/crypto";
+import GiftedDialog from "@/components/GiftedDialog.vue";
+import GiftedPhotoDialog from "@/components/GiftedPhotoDialog.vue";
+
+@Component({
+  components: {
+    GiftedDialog,
+    GiftedPhotoDialog,
+    QuickNav,
+    TopMessage,
+  },
+})
+export default class GiftedDetails extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  activeDid = "";
+  apiServer = "";
+
+  amountInput = "0";
+  description = "";
+  givenToUser = false;
+  giverDid: string | undefined;
+  giverName = "";
+  imageUrl = "";
+  isTrade = false;
+  message = "";
+  offerId = "";
+  projectId = "";
+  unitCode = "HUR";
+
+  libsUtil = libsUtil;
+
+  async mounted() {
+    this.amountInput = this.$route.query.amountInput as string;
+    this.description = this.$route.query.description as string;
+    this.giverDid = this.$route.query.giverDid as string;
+    this.giverName = this.$route.query.giverName as string;
+    this.message = this.$route.query.message as string;
+    this.offerId = this.$route.query.offerId as string;
+    this.projectId = this.$route.query.projectId as string;
+    this.unitCode = this.$route.query.unitCode as string;
+
+    this.imageUrl = localStorage.getItem("imageUrl") || "";
+
+    this.givenToUser = !this.projectId;
+
+    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.error("Error retrieving settings from database:", err);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: err.message || "There was an error retrieving your settings.",
+        },
+        -1,
+      );
+    }
+  }
+
+  changeUnitCode() {
+    const units = Object.keys(this.libsUtil.UNIT_SHORT);
+    const index = units.indexOf(this.unitCode);
+    this.unitCode = units[(index + 1) % units.length];
+  }
+
+  increment() {
+    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
+  }
+
+  decrement() {
+    this.amountInput = `${Math.max(
+      0,
+      (parseFloat(this.amountInput) || 1) - 1,
+    )}`;
+  }
+
+  cancel() {
+    this.deleteImage(); // not awaiting, so they'll go back immediately
+    this.$router.back();
+  }
+
+  openPhotoDialog() {
+    (this.$refs.photoDialog as GiftedPhotoDialog).open((imgUrl) => {
+      this.imageUrl = imgUrl;
+    });
+  }
+
+  confirmDeleteImage() {
+    this.$notify(
+      {
+        group: "modal",
+        type: "confirm",
+        title: "Are you sure you want to delete the image?",
+        text: "",
+        onYes: this.deleteImage,
+      },
+      -1,
+    );
+  }
+
+  async deleteImage() {
+    if (!this.imageUrl) {
+      return;
+    }
+    try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
+      const token = await accessToken(identity);
+      const response = await this.axios.delete(
+        DEFAULT_IMAGE_API_SERVER +
+          "/image/" +
+          encodeURIComponent(this.imageUrl),
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        },
+      );
+      if (response.status === 204) {
+        // don't bother with a notification
+        // (either they'll simply continue or they're canceling and going back)
+      } else {
+        console.error("Non-success deleting image:", response);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "There was a problem deleting the image.",
+          },
+          5000,
+        );
+        // keep the imageUrl in localStorage so the user can try again if they want
+        return;
+      }
+
+      localStorage.removeItem("imageUrl");
+      this.imageUrl = "";
+    } catch (error) {
+      console.error("Error deleting image:", error);
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      if ((error as any).response.status === 404) {
+        console.log("The image was already deleted:", error);
+
+        localStorage.removeItem("imageUrl");
+        this.imageUrl = "";
+
+        // it already doesn't exist so we won't say anything to the user
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "There was an error deleting the image.",
+          },
+          5000,
+        );
+      }
+    }
+  }
+
+  async confirm() {
+    if (!this.activeDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identifier before you can record a give.",
+        },
+        2000,
+      );
+      return;
+    }
+    if (parseFloat(this.amountInput) < 0) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          text: "You may not send a negative number.",
+          title: "",
+        },
+        2000,
+      );
+      return;
+    }
+    if (!this.description && !parseFloat(this.amountInput)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: `You must enter a description or some number of ${
+            this.libsUtil.UNIT_LONG[this.unitCode]
+          }.`,
+        },
+        2000,
+      );
+      return;
+    }
+
+    this.$notify(
+      {
+        group: "alert",
+        type: "toast",
+        text: "Recording the give...",
+        title: "",
+      },
+      1000,
+    );
+
+    // this is asynchronous, but we don't need to wait for it to complete
+    await this.recordGive();
+  }
+
+  /**
+   *
+   * @param giverDid may be null
+   * @param description may be an empty string
+   * @param amountInput may be 0
+   * @param unitCode may be omitted, defaults to "HUR"
+   */
+  public async recordGive() {
+    try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
+      const result = await createAndSubmitGive(
+        this.axios,
+        this.apiServer,
+        identity,
+        this.giverDid,
+        this.givenToUser ? this.activeDid : undefined,
+        this.description,
+        parseFloat(this.amountInput),
+        this.unitCode,
+        this.projectId,
+        this.offerId,
+        this.isTrade,
+        this.imageUrl,
+      );
+
+      if (
+        result.type === "error" ||
+        this.isGiveCreationError(result.response)
+      ) {
+        const errorMessage = this.getGiveCreationErrorMessage(result);
+        console.error("Error with give creation result:", result);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: errorMessage || "There was an error creating the give.",
+          },
+          -1,
+        );
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
+          },
+          5000,
+        );
+        localStorage.removeItem("imageUrl");
+        this.$router.back();
+      }
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (error: any) {
+      console.error("Error with give recordation caught:", error);
+      const message =
+        error.userMessage ||
+        error.response?.data?.error?.message ||
+        "There was an error recording the give.";
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: message,
+        },
+        -1,
+      );
+    }
+  }
+
+  // Helper functions for readability
+
+  /**
+   * @param result response "data" from the server
+   * @returns true if the result indicates an error
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  isGiveCreationError(result: any) {
+    return result.status !== 201 || result.data?.error;
+  }
+
+  /**
+   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
+   * @returns best guess at an error message
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  getGiveCreationErrorMessage(result: any) {
+    return (
+      result.error?.userMessage ||
+      result.error?.error ||
+      result.response?.data?.error?.message
+    );
+  }
+
+  explainData() {
+    this.$notify(
+      {
+        group: "alert",
+        type: "success",
+        title: "Data Sharing",
+        text: libsUtil.PRIVACY_MESSAGE,
+      },
+      -1,
+    );
+  }
+}
+</script>

src/views/HelpNotificationsView.vue

@@ -31,7 +31,7 @@
           If this works then you're all set.
           <button
             @click="sendTestWebPushMessage(true)"
-            class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
+            class="block w-full text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-2"
           >
             Send Yourself a Test Web Push Message (Through Push Server but
             Skipping Client Filter)
@@ -233,7 +233,7 @@
       <h2 class="text-xl font-semibold mt-4">Tests</h2>
       <button
         @click="showTestNotification()"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4 mb-2"
+        class="block w-full text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mt-4 mb-2"
       >
         Send Test Notification Directly to Device (Not Through Push Server)
       </button>
@@ -246,7 +246,7 @@
 
       <button
         @click="alertWebPushSubscription()"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4 mb-2"
+        class="block w-full text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mt-4 mb-2"
       >
         Show Web Push Subscription Info
       </button>
@@ -259,7 +259,7 @@
 
       <button
         @click="sendTestWebPushMessage(true)"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4 mb-2"
+        class="block w-full text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mt-4 mb-2"
       >
         Send Yourself a Test Web Push Message (Through Push Server but Skipping
         Client Filter)
@@ -272,7 +272,7 @@
 
       <button
         @click="sendTestWebPushMessage()"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4 mb-2"
+        class="block w-full text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mt-4 mb-2"
       >
         Send Yourself a Test Web Push Message (Through Push Server and Client
         Filter)
@@ -294,25 +294,20 @@
 import { Component, Vue } from "vue-facing-decorator";
 
 import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 import { sendTestThroughPushServer } from "@/libs/util";
 
-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;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  subscription: PushSubscription | null = null;
+  subscriptionJSON?: PushSubscriptionJSON;
 
   async mounted() {
     try {
       const registration = await navigator.serviceWorker.ready;
-      this.subscription = await registration.pushManager.getSubscription();
+      const fullSub = await registration.pushManager.getSubscription();
+      this.subscriptionJSON = fullSub?.toJSON();
     } catch (error) {
       console.error("Mount error:", error);
     }
@@ -321,13 +316,13 @@ export default class HelpNotificationsView extends Vue {
   alertWebPushSubscription() {
     console.log(
       "Web push subscription:",
-      JSON.parse(JSON.stringify(this.subscription)), // gives more info than plain console logging
+      JSON.parse(JSON.stringify(this.subscriptionJSON)), // gives more info than plain console logging
     );
-    alert(JSON.stringify(this.subscription));
+    alert(JSON.stringify(this.subscriptionJSON));
   }
 
   async sendTestWebPushMessage(skipFilter: boolean = false) {
-    if (!this.subscription) {
+    if (!this.subscriptionJSON) {
       this.$notify(
         {
           group: "alert",
@@ -342,7 +337,7 @@ export default class HelpNotificationsView extends Vue {
     }
 
     try {
-      await sendTestThroughPushServer(this.subscription, skipFilter);
+      await sendTestThroughPushServer(this.subscriptionJSON, skipFilter);
 
       this.$notify(
         {

src/views/HelpOnboardingView.vue

@@ -0,0 +1,69 @@
+<template>
+  <!-- Don't include nav buttons since this is shown in a different window. -->
+
+  <!-- CONTENT -->
+  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+    <!-- Breadcrumb -->
+    <div class="mb-8">
+      <!-- Don't include 'back' button since this is shown in a different window. -->
+      <!-- Heading -->
+      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+        Time Safari Onboarding Instructions
+      </h1>
+    </div>
+
+    <!-- eslint-disable prettier/prettier -->
+    <div class="ml-4">
+      <h1 class="font-bold text-xl">Install</h1>
+      <div>
+        <p>
+          1) Have them visit TimeSafari.app in a browser, preferably Chrome or Safari.
+        </p>
+        <p>
+          2) Have them "Install" the site to their desktop.
+        </p>
+      </div>
+
+      <h1 class="font-bold text-xl">Add Contact & Register</h1>
+      <div>
+        <p>
+          3) Have them follow their yellow prompts.
+        </p>
+        <p>
+          4) Add them to your contacts <fa icon="users" />
+        </p>
+        <p>
+          5) Register them <fa icon="person-circle-question" />
+        </p>
+        <p>
+          6) Add yourself to their contacts <fa icon="users" />
+        </p>
+      </div>
+
+      <h1 class="font-bold text-xl">Enable Notifications</h1>
+      <div>
+        <p>
+          7) Enable notifications from <fa icon="circle-user" />
+        </p>
+      </div>
+
+      <h1 class="font-bold text-xl">Discuss Backups</h1>
+      <div>
+        <p>
+          8) Exporting backups <fa icon="circle-user" /> are important if they lose their phone --- especially for the Identifier Seed!
+        </p>
+      </div>
+
+    </div>
+    <!-- eslint enable -->
+  </section>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-facing-decorator";
+
+import QuickNav from "@/components/QuickNav.vue";
+
+@Component({ components: { QuickNav } })
+export default class Help extends Vue {}
+</script>

src/views/HelpView.vue

@@ -11,7 +11,7 @@
           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>
+          <fa icon="chevron-left" class="fa-fw" />
         </h1>
       </div>
 
@@ -39,22 +39,22 @@
         and network.
       </p>
       <p>
-        You can show giving and also offer help to ideas, based on others'
-        willingness to help out, too. You can record your own ideas and invite
-        others to collaborate.
+        You highlight giving and also offer help to ideas -- which could be
+        conditional on others' willingness to help, too.
+        You can record your own ideas and invite others to collaborate.
       </p>
       <p>
         This app uses the power of cryptography to build a reputation, recording
         activity that you can share at your discretion. You put some activity
-        public, but your sensitive information is not shared with anyone,
-        including our services. This is in contrast to Meta and Google, who hold
-        your data and allow you use it. Those services are useful, but they have
-        the control; this app gives you the control.
+        public, but these services don't share your ID with others without explicit consent.
+        This is in contrast to Meta and Google, who hold
+        your data and allow you use it while they manage sharing...
+        those services are useful but they have the control, whereas this app gives you the control.
       </p>
 
       <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
+        You need someone to register you, like the person who told you
         about this app, on the Contacts
         <fa icon="users" class="fa-fw" /> page. After they register you, you can
         select any contact on the home page (or "anonymous") and record your
@@ -83,9 +83,9 @@
 
       <h2 class="text-xl font-semibold">How do I add someone else?</h2>
       <p>
-        <button class="text-blue-500" @click="showOnboardInfo">
+        <a href="/help-onboarding" target="_blank" class="text-blue-500">
           Click here to show an alert with the steps.
-        </button>
+        </a>
         To start scanning, go
         <router-link class="text-blue-500" to="/contact-qr">here.</router-link>
       </p>
@@ -198,9 +198,7 @@
           <ul>
             <li class="list-disc list-outside ml-4">
               Chrome:
-              <a href="chrome://settings/content/all" class="text-blue-500"
-                >clear here</a
-              >
+              Clear at chrome://settings/content/all and
               also clear under dev tools Application
             </li>
             <li class="list-disc list-outside ml-4">
@@ -217,6 +215,28 @@
       </ul>
       <p>To erase your data from our servers, contact us (below).</p>
 
+      <h2 class="text-xl font-semibold">
+        How do I get higher limits?
+      </h2>
+      <p>
+        Let's talk. Contact us (below).
+      </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">
         I know there is a record from someone, so why can't I see that info?
       </h2>
@@ -240,35 +260,70 @@
       </h2>
       <p>
         <router-link class="text-blue-500" to="/help-notifications"
-          >Here.</router-link
+        >Here.</router-link
         >
       </p>
 
       <h2 class="text-xl font-semibold">
-        How do I get higher limits?
+        My app is misbehaving, like showing me a blank screen or failing to show a feed.
+        What can I do?
       </h2>
       <p>
-        Let's talk. Contact us (below).
+        First, note that clearing the cache will clear all your identity and contact info,
+        so we recommend doing other things first (unless you know you have your backups ready).
       </p>
-
-      <h2 class="text-xl font-semibold">
-        How do I access even more functionality?
-      </h2>
+      <ul class="list-disc list-outside ml-4">
+        <li>
+          Drag down on the screen to refresh it; do that multiple times, because
+          it sometimes takes multiple tries for the app to refresh to the current version.
+          You can see the version information at the bottom of this page; the best
+          way to determine the current version is to open this page in an incognito
+          browser window and look at the version there.
+        </li>
+        <li>
+          Close all tabs that have Time Safari open; it can be difficult to find them all,
+          and you may have to close all your tabs. In addition, it may be running as an
+          installed app, so look for any Time Safari app that may be running outside a browser.
+        </li>
+        <li>
+          There may be a problem with your identity. Go to the Identity
+          <fa icon="circle-user" class="fa-fw" /> page, then "Advanced", and "Switch Identifier"
+          and you may see helpful info there. If it shows a problem, try adding your identifier again.
+        </li>
+        <li>
+          It can help to reregister the service worker:
+          <ul>
+            <li>
+              In Chrome, open a tab to
+              "chrome://serviceworker-internals",
+              find "timesafari.app", and click "Unregister".</li>
+            <li>
+              In Firefox,
+              open a tab to "about:serviceworkers",
+              find "timesafari.app", and click "Unregister".
+            </li>
+            <li>
+              <a href="https://duckduckgo.com/?q=unregister+service+worker" class="text-blue-500">Search</a>
+              for instructions for other browsers.</li>
+          </ul>
+          Then reload Time Safari.
+        </li>
+        <li>
+          Restart your device.
+        </li>
+      </ul>
       <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>
+        If you still have problems, you can clear the cache (see "erase my data" above)
+        and even uninstall and reinstall the app
+        -- just be sure to have your backups ready or be
+        prepared to restart with a new identity and recreate your network.
+        Nobody else has access to your identity or contact information because
+        this app is designed to give you full control over your data.
       </p>
 
       <h2 class="text-xl font-semibold">What are the terms & conditions and the privacy policy?</h2>
       <p style="display:inline; align-items: center">
-        This work is marked with
+        This work is public domain, governed by
         <a href="http://creativecommons.org/publicdomain/zero/1.0?ref=chooser-v1" target="_blank" rel="license noopener noreferrer">
           <span class="text-blue-500 mr-1">CC0 1.0</span>
           <img
@@ -325,32 +380,13 @@ import { Component, Vue } from "vue-facing-decorator";
 
 import * as Package from "../../package.json";
 import QuickNav from "@/components/QuickNav.vue";
-import { ONBOARD_MESSAGE } from "@/libs/util";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { NotificationIface } from "@/constants/app";
 
 @Component({ components: { QuickNav } })
 export default class Help extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   package = Package;
-  commitHash = process.env.VUE_APP_GIT_HASH;
-
-  showOnboardInfo() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "info",
-        title: "Onboard Someone",
-        text: ONBOARD_MESSAGE,
-      },
-      -1,
-    );
-  }
+  commitHash = import.meta.env.VITE_GIT_HASH;
 }
 </script>

src/views/HomeView.vue

@@ -1,10 +1,10 @@
 <template>
-  <QuickNav selected="Home"></QuickNav>
+  <QuickNav selected="Home" />
   <TopMessage />
 
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+  <section id="Content" class="p-2 pb-24 max-w-3xl mx-auto">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-8">
       Time Safari
     </h1>
 
@@ -30,7 +30,7 @@
             and go click on that new app.
           </span>
           <span
-            v-else-if="userAgentInfo.getBrowser().name.startsWith('Chrome')"
+            v-else-if="userAgentInfo.getBrowser()?.name?.startsWith('Chrome')"
           >
             You should see a prompt to install, or you can click on the
             top-right dots
@@ -59,6 +59,15 @@
       </div>
     </div>
 
+    <div v-if="showShortcutBvc" class="mb-4">
+      <router-link
+        :to="{ name: 'quick-action-bvc' }"
+        class="block text-center text-md font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
+      >
+        Bountiful Voluntaryist Community Actions</router-link
+      >
+    </div>
+
     <!-- show the actions for recognizing a give -->
     <div class="mb-8">
       <div v-if="isCreatingIdentifier">
@@ -76,7 +85,7 @@
         </p>
         <router-link
           :to="{ name: 'start' }"
-          class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
+          class="block text-center text-md font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
         >
           Create An Identifier</router-link
         >
@@ -90,7 +99,7 @@
         giving.
         <router-link
           :to="{ name: 'contact-qr' }"
-          class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
+          class="block text-center text-md font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
         >
           Show Them Your Identifier Info</router-link
         >
@@ -105,17 +114,13 @@
 
       <div v-else>
         <!-- activeDid && isRegistered -->
-        <div class="flex justify-between mb-4">
-          <h2 class="text-xl font-bold">Record Something Given</h2>
-          <button
-            @click="openGiftedPrompts()"
-            class="block text-center text-md font-bold bg-blue-500 text-white px-2 py-3 rounded-md"
-          >
-            Ideas...
-          </button>
+        <div class="mb-4">
+          <h2 class="text-xl font-bold">Record Something Given By:</h2>
         </div>
 
-        <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
+        <ul
+          class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5"
+        >
           <li @click="openDialog()">
             <img
               src="../assets/blank-square.svg"
@@ -133,7 +138,7 @@
             @click="openDialog(contact)"
           >
             <EntityIcon
-              :entityId="contact.did"
+              :contact="contact"
               :iconSize="64"
               class="mx-auto border border-slate-300 rounded-md mb-1"
             />
@@ -145,21 +150,20 @@
           </li>
         </ul>
 
-        <!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
-        <router-link
-          v-if="allContacts.length >= 7"
-          :to="{ name: 'contact-gives' }"
-          class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
-        >
-          Show More Contacts&hellip;
-        </router-link>
-
-        <!-- If there are no contacts, show this instead: -->
-        <div
-          class="rounded border border-dashed border-slate-300 bg-slate-100 px-4 py-3 text-center italic text-slate-500"
-          v-if="allContacts.length === 0"
-        >
-          (No contacts to show.)
+        <div class="flex justify-between">
+          <router-link
+            v-if="allContacts.length >= 7"
+            :to="{ name: 'contact-gives' }"
+            class="block text-center text-md font-bold uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+          >
+            Choose From All Contacts
+          </router-link>
+          <button
+            @click="openGiftedPrompts()"
+            class="block text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
+          >
+            Ideas...
+          </button>
         </div>
       </div>
     </div>
@@ -170,10 +174,29 @@
       showGivenToUser="true"
     />
     <GiftedPrompts ref="giftedPrompts" />
+    <FeedFilters ref="feedFilters" />
 
     <!-- Results List -->
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-      <h2 class="text-xl font-bold mb-4">Latest Activity</h2>
+      <div class="flex items-center mb-4">
+        <h2 class="text-xl font-bold">Latest Activity</h2>
+        <button @click="openFeedFilters()" class="block text-center ml-auto">
+          <span class="text-sm uppercase text-white">
+            <span
+              v-if="resultsAreFiltered()"
+              class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-3 py-1.5 rounded-md"
+            >
+              Filtered
+            </span>
+            <span
+              v-else
+              class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] px-3 py-1.5 rounded-md"
+            >
+              Unfiltered
+            </span>
+          </span>
+        </button>
+      </div>
       <InfiniteScroll @reached-bottom="loadMoreGives">
         <ul class="border-t border-slate-300">
           <li
@@ -185,36 +208,48 @@
               class="border-b border-dashed border-slate-400 text-orange-400 pb-2 mb-2 font-bold uppercase text-sm"
               v-if="record.jwtId == feedLastViewedClaimId"
             >
-              You've seen all the following before
+              You've already seen all the following
             </div>
 
             <div class="grid grid-cols-12">
-              <span class="col-span-11 justify-self-start">
-                <fa
-                  icon="gift"
-                  class="col-span-1 pt-1 pr-2 text-slate-500"
-                ></fa>
-                {{ this.giveDescription(record) }}
+              <span class="col-span-1 justify-self-start">
+                <span>
+                  <fa
+                    v-if="record.giver.known || record.receiver.known"
+                    icon="circle-user"
+                    class="pt-1 text-slate-500"
+                  />
+                  <fa v-else icon="gift" class="pt-1 pl-3 text-slate-500" />
+                </span>
+              </span>
+              <span class="col-span-10 justify-self-stretch">
+                <span class="pl-2">
+                  {{ giveDescription(record) }}
+                </span>
                 <a @click="onClickLoadClaim(record.jwtId)">
                   <fa
-                    icon="circle-info"
+                    icon="file-lines"
                     class="pl-2 text-blue-500 cursor-pointer"
                   ></fa>
                 </a>
               </span>
-              <span class="col-span-1 justify-self-end shrink">
+              <span class="col-span-1 justify-self-end">
                 <router-link
                   v-if="record.fulfillsPlanHandleId"
                   :to="
                     '/project/' +
                     encodeURIComponent(record.fulfillsPlanHandleId)
                   "
-                  class="justify-end"
                 >
-                  <fa icon="hammer" class="ml-4 pl-2 text-blue-500"></fa>
+                  <fa icon="hammer" class="text-blue-500"></fa>
                 </router-link>
               </span>
             </div>
+            <div v-if="record.image" class="flex justify-center">
+              <a :href="record.image" target="_blank">
+                <img :src="record.image" class="h-24 mt-2 rounded-xl" />
+              </a>
+            </div>
           </li>
         </ul>
       </InfiniteScroll>
@@ -223,44 +258,66 @@
           <fa icon="spinner" class="fa-spin-pulse"></fa> Loading&hellip;
         </p>
       </div>
+      <div v-if="!isFeedLoading && feedData.length === 0">
+        <p class="text-slate-500 text-center italic mt-4 mb-4">
+          No claims match your filters.
+        </p>
+      </div>
     </div>
   </section>
 </template>
 
 <script lang="ts">
 import { UAParser } from "ua-parser-js";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 
 import EntityIcon from "@/components/EntityIcon.vue";
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import GiftedPrompts from "@/components/GiftedPrompts.vue";
+import FeedFilters from "@/components/FeedFilters.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
+import { NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import {
+  BoundingBox,
+  isAnyFeedFilterOn,
+  MASTER_SETTINGS_KEY,
+  Settings,
+} from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import {
-  didInfo,
+  contactForDid,
+  containsNonHiddenDid,
+  didInfoForContact,
+  getPlanFromCache,
   GiverInputInfo,
-  GiveServerRecord,
+  GiveSummaryRecord,
 } from "@/libs/endorserServer";
-import { IIdentifier } from "@veramo/core";
 import { generateSaveAndActivateIdentity } from "@/libs/util";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
+interface GiveRecordWithContactInfo extends GiveSummaryRecord {
+  giver: {
+    displayName: string;
+    known: boolean;
+  };
+  image?: string;
+  recipientProjectName?: string;
+  receiver: {
+    displayName: string;
+    known: boolean;
+  };
 }
 
 @Component({
   components: {
     GiftedDialog,
     GiftedPrompts,
+    FeedFilters,
     QuickNav,
     EntityIcon,
     InfiniteScroll,
@@ -268,18 +325,26 @@ interface Notification {
   },
 })
 export default class HomeView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
   apiServer = "";
-  feedData: GiveServerRecord[] = [];
+  feedData: GiveRecordWithContactInfo[] = [];
   feedPreviousOldestId?: string;
   feedLastViewedClaimId?: string;
+  isAnyFeedFilterOn: boolean;
   isCreatingIdentifier = false;
+  isFeedFilteredByVisible = false;
+  isFeedFilteredByNearby = false;
   isFeedLoading = true;
   isRegistered = false;
+  searchBoxes: Array<{
+    name: string;
+    bbox: BoundingBox;
+  }> = [];
+  showShortcutBvc = false;
   userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
 
   public async getIdentity(activeDid: string) {
@@ -301,7 +366,7 @@ export default class HomeView extends Vue {
     return headers;
   }
 
-  async created() {
+  async mounted() {
     try {
       await accountsDB.open();
       const allAccounts = await accountsDB.accounts.toArray();
@@ -313,7 +378,13 @@ export default class HomeView extends Vue {
       this.activeDid = settings?.activeDid || "";
       this.allContacts = await db.contacts.toArray();
       this.feedLastViewedClaimId = settings?.lastViewedClaimId;
+      this.isFeedFilteredByVisible = !!settings?.filterFeedByVisible;
+      this.isFeedFilteredByNearby = !!settings?.filterFeedByNearby;
       this.isRegistered = !!settings?.isRegistered;
+      this.searchBoxes = settings?.searchBoxes || [];
+      this.showShortcutBvc = !!settings?.showShortcutBvc;
+
+      this.isAnyFeedFilterOn = isAnyFeedFilterOn(settings);
 
       if (this.allMyDids.length === 0) {
         this.isCreatingIdentifier = true;
@@ -328,7 +399,7 @@ export default class HomeView extends Vue {
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.log("Error retrieving settings or feed.", err);
+      console.error("Error retrieving settings or feed.", err);
       this.$notify(
         {
           group: "alert",
@@ -343,6 +414,10 @@ export default class HomeView extends Vue {
     }
   }
 
+  resultsAreFiltered() {
+    return this.isFeedFilteredByVisible || this.isFeedFilteredByNearby;
+  }
+
   notificationsSupported() {
     return "Notification" in window;
   }
@@ -352,27 +427,34 @@ export default class HomeView extends Vue {
       "Content-Type": "application/json",
     };
 
+    const identity = await this.getIdentity(this.activeDid);
     if (this.activeDid) {
-      await accountsDB.open();
-      const allAccounts = await accountsDB.accounts.toArray();
-      const account = allAccounts.find(
-        (acc) => acc.did === this.activeDid,
-      ) as Account;
-      const identity = JSON.parse(account?.identity || "null");
-
-      if (!identity) {
+      if (identity) {
+        headers["Authorization"] = "Bearer " + (await accessToken(identity));
+      } else {
         throw new Error(
           "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
         );
       }
-
-      headers["Authorization"] = "Bearer " + (await accessToken(identity));
     } else {
       // it's OK without auth... we just won't get any identifiers
     }
     return headers;
   }
 
+  // only called when a setting was changed
+  async reloadFeedOnChange() {
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    this.isFeedFilteredByVisible = !!settings?.filterFeedByVisible;
+    this.isFeedFilteredByNearby = !!settings?.filterFeedByNearby;
+    this.isAnyFeedFilterOn = isAnyFeedFilterOn(settings);
+
+    this.feedData = [];
+    this.feedPreviousOldestId = undefined;
+    this.updateAllFeed();
+  }
+
   /**
    * Data loader used by infinite scroller
    * @param payload is the flag from the InfiniteScroll indicating if it should load
@@ -383,12 +465,85 @@ export default class HomeView extends Vue {
     }
   }
 
+  latLongInAnySearchBox(lat: number, long: number) {
+    for (const boxInfo of this.searchBoxes) {
+      if (
+        boxInfo.bbox.westLong <= long &&
+        long <= boxInfo.bbox.eastLong &&
+        boxInfo.bbox.minLat <= lat &&
+        lat <= boxInfo.bbox.maxLat
+      ) {
+        return true;
+      }
+    }
+  }
+
   public async updateAllFeed() {
     this.isFeedLoading = true;
+    let endOfResults = true;
     await this.retrieveGives(this.apiServer, this.feedPreviousOldestId)
       .then(async (results) => {
         if (results.data.length > 0) {
-          this.feedData = this.feedData.concat(results.data);
+          endOfResults = false;
+          // include the descriptions of the giver and receiver
+          const identity = await this.getIdentity(this.activeDid);
+          for (const record: GiveSummaryRecord of results.data) {
+            // similar code is in endorser-mobile utility.ts
+            // claim.claim happen for some claims wrapped in a Verifiable Credential
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const claim = (record.fullClaim as any).claim || record.fullClaim;
+            // agent.did is for legacy data, before March 2023
+            const giverDid =
+              claim.agent?.identifier || (claim.agent as any)?.did; // eslint-disable-line @typescript-eslint/no-explicit-any
+            // recipient.did is for legacy data, before March 2023
+            const recipientDid =
+              claim.recipient?.identifier || (claim.recipient as any)?.did; // eslint-disable-line @typescript-eslint/no-explicit-any
+            const plan = await getPlanFromCache(
+              record.fulfillsPlanHandleId,
+              identity,
+              this.axios,
+              this.apiServer,
+            );
+
+            // check if the record should be filtered out
+            let anyMatch = false;
+            if (this.isFeedFilteredByVisible && containsNonHiddenDid(record)) {
+              // has a visible DID so it's a keeper
+              anyMatch = true;
+            }
+            if (!anyMatch && this.isFeedFilteredByNearby) {
+              // check if the associated project has a location inside user's search box
+              if (record.fulfillsPlanHandleId) {
+                if (plan?.locLat && plan?.locLon) {
+                  if (this.latLongInAnySearchBox(plan.locLat, plan.locLon)) {
+                    anyMatch = true;
+                  }
+                }
+              }
+            }
+            if (this.isAnyFeedFilterOn && !anyMatch) {
+              continue;
+            }
+
+            const newRecord: GiveRecordWithContactInfo = {
+              ...record,
+              giver: didInfoForContact(
+                giverDid,
+                this.activeDid,
+                contactForDid(giverDid, this.allContacts),
+                this.allMyDids,
+              ),
+              image: claim.image,
+              recipientProjectName: plan?.name as string,
+              receiver: didInfoForContact(
+                recipientDid,
+                this.activeDid,
+                contactForDid(recipientDid, this.allContacts),
+                this.allMyDids,
+              ),
+            };
+            this.feedData.push(newRecord);
+          }
           this.feedPreviousOldestId =
             results.data[results.data.length - 1].jwtId;
           // The following update is only done on the first load.
@@ -404,7 +559,7 @@ export default class HomeView extends Vue {
         }
       })
       .catch((e) => {
-        console.log("Error with feed load:", e);
+        console.error("Error with feed load:", e);
         this.$notify(
           {
             group: "alert",
@@ -415,6 +570,10 @@ export default class HomeView extends Vue {
           -1,
         );
       });
+    if (this.feedData.length === 0 && !endOfResults) {
+      // repeat until there's at least some data
+      this.updateAllFeed();
+    }
     this.isFeedLoading = false;
   }
 
@@ -436,7 +595,7 @@ export default class HomeView extends Vue {
       },
     );
 
-    if (response.status !== 200) {
+    if (!response.ok) {
       throw await response.text();
     }
 
@@ -449,46 +608,68 @@ export default class HomeView extends Vue {
     }
   }
 
-  giveDescription(giveRecord: GiveServerRecord) {
+  giveDescription(giveRecord: GiveRecordWithContactInfo) {
     // similar code is in endorser-mobile utility.ts
     // claim.claim happen for some claims wrapped in a Verifiable Credential
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const claim = (giveRecord.fullClaim as any).claim || giveRecord.fullClaim;
-    // agent.did is for legacy data, before March 2023
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const giverDid = claim.agent?.identifier || (claim.agent as any)?.did;
-    const giverInfo = didInfo(
-      giverDid,
-      this.activeDid,
-      this.allMyDids,
-      this.allContacts,
-    );
+
     let gaveAmount = claim.object?.amountOfThisGood
       ? this.displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
       : "";
     if (claim.description) {
       if (gaveAmount) {
-        gaveAmount = gaveAmount + ", and also: ";
+        gaveAmount = " (and " + gaveAmount + ")";
       }
-      gaveAmount = gaveAmount + claim.description;
+      gaveAmount = claim.description + gaveAmount;
     }
     if (!gaveAmount) {
       gaveAmount = "something not described";
     }
-    // recipient.did is for legacy data, before March 2023
-    const gaveRecipientId =
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      claim.recipient?.identifier || (claim.recipient as any)?.did;
-    const gaveRecipientInfo = gaveRecipientId
-      ? " to " +
-        didInfo(
-          gaveRecipientId,
-          this.activeDid,
-          this.allMyDids,
-          this.allContacts,
-        )
-      : "";
-    return giverInfo + " gave" + gaveRecipientInfo + ": " + gaveAmount;
+
+    /**
+     * Only show giver and/or receiver info first if they're named.
+     * - If only giver is named, show "... gave"
+     * - If only receiver is named, show "... received"
+     */
+
+    const giverInfo = giveRecord.giver;
+    const recipientInfo = giveRecord.receiver;
+    if (giverInfo.known && recipientInfo.known) {
+      // both giver and recipient are named
+      return `${giverInfo.displayName} gave to ${recipientInfo.displayName}: ${gaveAmount}`;
+    } else if (giverInfo.known) {
+      // giver is named but recipient is not
+
+      // show the project name if to one
+      if (giveRecord.recipientProjectName) {
+        // retrieve the project name
+        return `${giverInfo.displayName} gave: ${gaveAmount} (to the project ${giveRecord.recipientProjectName})`;
+      }
+
+      // it's not to a project
+      return `${giverInfo.displayName} gave: ${gaveAmount} (to ${recipientInfo.displayName})`;
+    } else if (recipientInfo.known) {
+      // recipient is named but giver is not
+      return `${recipientInfo.displayName} received: ${gaveAmount} (from ${giverInfo.displayName})`;
+    } else {
+      // neither giver nor recipient are named
+
+      // show the project name if to one
+      if (giveRecord.recipientProjectName) {
+        // retrieve the project name
+        return `${gaveAmount} (to the project ${giveRecord.recipientProjectName})`;
+      }
+
+      // it's not to a project
+      let peopleInfo;
+      if (giverInfo.displayName === recipientInfo.displayName) {
+        peopleInfo = `between two who are ${giverInfo.displayName}`;
+      } else {
+        peopleInfo = `from ${giverInfo.displayName} to ${recipientInfo.displayName}`;
+      }
+      return gaveAmount + " (" + peopleInfo + ")";
+    }
   }
 
   onClickLoadClaim(jwtId: string) {
@@ -506,12 +687,16 @@ export default class HomeView extends Vue {
     return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
   }
 
-  openDialog(giver: GiverInputInfo) {
+  openDialog(giver?: GiverInputInfo) {
     (this.$refs.customDialog as GiftedDialog).open(giver);
   }
 
   openGiftedPrompts() {
     (this.$refs.giftedPrompts as GiftedPrompts).open();
   }
+
+  openFeedFilters() {
+    (this.$refs.feedFilters as FeedFilters).open(this.reloadFeedOnChange);
+  }
 }
 </script>

src/views/IdentitySwitcherView.vue

@@ -65,13 +65,13 @@
     <router-link
       id="start-link"
       :to="{ name: 'start' }"
-      class="block text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
+      class="block text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md mb-2"
     >
       Add Another Identity&hellip;
     </router-link>
     <a
       href="#"
-      class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-8"
+      class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-8"
       @click="switchAccount('0')"
     >
       No Identity
@@ -80,22 +80,16 @@
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { AppString } from "@/constants/app";
+
+import { AppString, NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import QuickNav from "@/components/QuickNav.vue";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({ components: { QuickNav } })
 export default class IdentitySwitcherView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   Constants = AppString;
   public accounts: typeof AccountsSchema;

src/views/ImportAccountView.vue

@@ -56,39 +56,36 @@
     </div>
 
     <div class="mt-8">
-      <button
-        @click="fromMnemonic()"
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-      >
-        Import
-      </button>
-      <button
-        @click="onCancelClick()"
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Cancel
-      </button>
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <button
+          @click="fromMnemonic()"
+          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+        >
+          Import
+        </button>
+        <button
+          @click="onCancelClick()"
+          type="button"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
+
+import { NotificationIface } from "@/constants/app";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import {
   DEFAULT_ROOT_DERIVATION_PATH,
   deriveAddress,
   newIdentifier,
-} from "../libs/crypto";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+} from "@/libs/crypto";
 
 @Component({
   components: {},
@@ -96,7 +93,7 @@ interface Notification {
 export default class ImportAccountView extends Vue {
   UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'"; // for legacy imports, likely never used
 
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   mnemonic = "";
   address = "";

src/views/ImportDerivedAccountView.vue

@@ -49,19 +49,21 @@
       </ul>
     </div>
     <div class="mt-8">
-      <button
-        @click="incrementDerivation()"
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-      >
-        Increment and Import
-      </button>
-      <button
-        @click="onCancelClick()"
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Cancel
-      </button>
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <button
+          @click="incrementDerivation()"
+          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+        >
+          Increment and Import
+        </button>
+        <button
+          @click="onCancelClick()"
+          type="button"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
   </section>
 </template>

src/views/NewEditAccountView.vue

@@ -22,21 +22,23 @@
     />
 
     <div class="mt-8">
-      <button
-        type="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="onClickSaveChanges()"
-      >
-        Save Changes
-      </button>
-      <!-- SHOW ME instead while processing saving changes -->
-      <button
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-        @click="onClickCancel()"
-      >
-        Cancel
-      </button>
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <button
+          type="button"
+          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md mb-2"
+          @click="onClickSaveChanges()"
+        >
+          Save Changes
+        </button>
+        <!-- SHOW ME instead while processing saving changes -->
+        <button
+          type="button"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md mb-2"
+          @click="onClickCancel()"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
   </section>
 </template>

src/views/NewEditProjectView.vue

@@ -73,16 +73,17 @@
       />
       <label for="includeLocation">Include Location</label>
     </div>
-    <div v-if="includeLocation" style="height: 600px; width: 800px">
-      <div class="px-2 py-2">
+    <div v-if="includeLocation" class="mb-4 aspect-video">
+      <p class="text-sm mb-2 text-slate-500">
         For your security, choose a location nearby but not exactly at the
         place.
-      </div>
+      </p>
 
       <l-map
         ref="map"
         v-model:zoom="zoom"
         :center="[0, 0]"
+        class="!z-40 rounded-md"
         @click="
           (event) => {
             latitude = event.latlng.lat;
@@ -104,28 +105,30 @@
     </div>
 
     <div class="mt-8">
-      <button
-        :disabled="isHiddenSave"
-        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="onSaveProjectClick()"
-      >
-        <!-- SHOW if in idle state -->
-        <span :class="{ hidden: isHiddenSave }">Save Project</span>
-
-        <!-- SHOW if in saving state; DISABLE button while in saving state -->
-        <span :class="{ hidden: isHiddenSpinner }">
-          <!-- icon no worky? -->
-          <i class="fa-solid fa-spinner fa-spin-pulse"></i>
-          Saving...</span
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <button
+          :disabled="isHiddenSave"
+          class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md mb-2"
+          @click="onSaveProjectClick()"
         >
-      </button>
-      <button
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-        @click="onCancelClick()"
-      >
-        Cancel
-      </button>
+          <!-- SHOW if in idle state -->
+          <span :class="{ hidden: isHiddenSave }">Save Project</span>
+
+          <!-- SHOW if in saving state; DISABLE button while in saving state -->
+          <span :class="{ hidden: isHiddenSpinner }">
+            <!-- icon no worky? -->
+            <i class="fa-solid fa-spinner fa-spin-pulse"></i>
+            Saving...</span
+          >
+        </button>
+        <button
+          type="button"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+          @click="onCancelClick()"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
   </section>
 </template>
@@ -138,6 +141,7 @@ import { Component, Vue } from "vue-facing-decorator";
 import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
 
 import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
@@ -145,18 +149,11 @@ import { useAppStore } from "@/store/app";
 import { IIdentifier } from "@veramo/core";
 import { PlanVerifiableCredential } from "@/libs/endorserServer";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({
   components: { LMap, LMarker, LTileLayer, QuickNav },
 })
 export default class NewEditProjectView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   agentDid = "";
@@ -271,6 +268,8 @@ export default class NewEditProjectView extends Vue {
       vcClaim.agent = {
         identifier: this.agentDid,
       };
+    } else {
+      delete vcClaim.agent;
     }
     if (this.includeLocation) {
       vcClaim.location = {
@@ -280,6 +279,8 @@ export default class NewEditProjectView extends Vue {
           longitude: this.longitude,
         },
       };
+    } else {
+      delete vcClaim.location;
     }
     // Make a payload for the claim
     const vcPayload = {

src/views/ProjectViewView.vue

@@ -98,14 +98,14 @@
         </div>
 
         <a @click="onClickLoadClaim(projectId)" class="cursor-pointer">
-          <fa icon="circle-info" class="pl-2 pt-1 text-blue-500" />
+          <fa icon="file-lines" class="pl-2 pt-1 text-blue-500" />
         </a>
       </div>
 
       <button
         v-if="activeDid === issuer || activeDid === agentDid"
         type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+        class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
         @click="onEditClick()"
       >
         Edit
@@ -116,7 +116,7 @@
       <div class="text-center">
         <button
           @click="openOfferDialog()"
-          class="block w-full text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
+          class="block w-full text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
         >
           Offer (maybe with conditions)...
         </button>
@@ -134,7 +134,9 @@
       <div class="text-center">
         <p class="mt-2 mb-4 text-center">Record a contribution from:</p>
       </div>
-      <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
+      <ul
+        class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5"
+      >
         <li @click="openGiftDialog({ name: 'you', did: activeDid })">
           <fa icon="hand" class="fa-fw text-slate-400 text-5xl" />
           <h3
@@ -160,7 +162,7 @@
           @click="openGiftDialog(contact)"
         >
           <EntityIcon
-            :entityId="contact.did"
+            :contact="contact"
             :iconSize="64"
             class="mx-auto border border-slate-300 rounded-md mb-1"
           />
@@ -176,7 +178,7 @@
       <a
         v-if="allContacts.length >= 7"
         @click="onClickAllContactsGifting()"
-        class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
+        class="block text-center text-md font-bold uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
       >
         Show More Contacts&hellip;
       </a>
@@ -230,7 +232,7 @@
                 @click="onClickLoadClaim(offer.jwtId as string)"
                 class="cursor-pointer"
               >
-                <fa icon="circle-info" class="pl-2 pt-1 text-blue-500" />
+                <fa icon="file-lines" class="pl-2 pt-1 text-blue-500" />
               </a>
               <a
                 v-if="checkIsFulfillable(offer)"
@@ -289,7 +291,7 @@
             </div>
             <div class="flex justify-between">
               <a @click="onClickLoadClaim(give.jwtId)">
-                <fa icon="circle-info" class="text-blue-500 cursor-pointer" />
+                <fa icon="file-lines" class="text-blue-500 cursor-pointer" />
               </a>
               <a v-if="checkIsConfirmable(give)" @click="confirmClaim(give)">
                 <fa icon="circle-check" class="text-blue-500 cursor-pointer" />
@@ -348,31 +350,25 @@ import { Component, Vue } from "vue-facing-decorator";
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
 import TopMessage from "@/components/TopMessage.vue";
+import QuickNav from "@/components/QuickNav.vue";
+import EntityIcon from "@/components/EntityIcon.vue";
+import ProjectIcon from "@/components/ProjectIcon.vue";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import * as libsUtil from "@/libs/util";
 import {
   BLANK_GENERIC_SERVER_RECORD,
-  GenericServerRecord,
+  GenericCredWrapper,
   GiverInputInfo,
-  GiveServerRecord,
-  OfferServerRecord,
-  PlanServerRecord,
+  GiveSummaryRecord,
+  OfferSummaryRecord,
+  PlanSummaryRecord,
 } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import ProjectIcon from "@/components/ProjectIcon.vue";
-import { Account } from "@/db/tables/accounts";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component({
   components: {
@@ -385,7 +381,7 @@ interface Notification {
   },
 })
 export default class ProjectViewView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   agentDid = "";
@@ -394,14 +390,14 @@ export default class ProjectViewView extends Vue {
   apiServer = "";
   description = "";
   expanded = false;
-  fulfilledByThis: PlanServerRecord | null = null;
-  fulfillersToThis: Array<PlanServerRecord> = [];
-  givesToThis: Array<GiveServerRecord> = [];
+  fulfilledByThis: PlanSummaryRecord | null = null;
+  fulfillersToThis: Array<PlanSummaryRecord> = [];
+  givesToThis: Array<GiveSummaryRecord> = [];
   issuer = "";
   latitude = 0;
   longitude = 0;
   name = "";
-  offersToThis: Array<OfferServerRecord> = [];
+  offersToThis: Array<OfferSummaryRecord> = [];
   projectId = localStorage.getItem("projectId") || ""; // handle ID
   showDidCopy = false;
   timeSince = "";
@@ -443,15 +439,6 @@ export default class ProjectViewView extends Vue {
     return identity;
   }
 
-  public async getHeaders(identity: IIdentifier) {
-    const token = await accessToken(identity);
-    const headers = {
-      "Content-Type": "application/json",
-      Authorization: "Bearer " + token,
-    };
-    return headers;
-  }
-
   onEditClick() {
     localStorage.setItem("projectId", this.projectId as string);
     const route = {
@@ -733,8 +720,8 @@ export default class ProjectViewView extends Vue {
     this.$router.push(route);
   }
 
-  checkIsFulfillable(offer: OfferServerRecord) {
-    const offerRecord: GenericServerRecord = {
+  checkIsFulfillable(offer: OfferSummaryRecord) {
+    const offerRecord: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: offer.fullClaim,
       claimType: "Offer",
@@ -743,8 +730,8 @@ export default class ProjectViewView extends Vue {
     return libsUtil.canFulfillOffer(offerRecord);
   }
 
-  onClickFulfillGiveToOffer(offer: OfferServerRecord) {
-    const offerRecord: GenericServerRecord = {
+  onClickFulfillGiveToOffer(offer: OfferSummaryRecord) {
+    const offerRecord: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: offer.fullClaim,
       issuer: offer.offeredByDid,
@@ -783,8 +770,8 @@ export default class ProjectViewView extends Vue {
     }
   }
 
-  checkIsConfirmable(give: GiveServerRecord) {
-    const giveDetails: GenericServerRecord = {
+  checkIsConfirmable(give: GiveSummaryRecord) {
+    const giveDetails: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: give.fullClaim,
       claimType: "GiveAction",
@@ -794,7 +781,7 @@ export default class ProjectViewView extends Vue {
   }
 
   // similar code is found in ClaimView
-  async confirmClaim(give: GiveServerRecord) {
+  async confirmClaim(give: GiveSummaryRecord) {
     if (confirm("Do you personally confirm that this is true?")) {
       // similar logic is found in endorser-mobile
       const goodClaim = serverUtil.removeSchemaContext(
@@ -806,10 +793,7 @@ export default class ProjectViewView extends Vue {
           ),
         ),
       );
-      const confirmationClaim: serverUtil.GenericVerifiableCredential & {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        object: any;
-      } = {
+      const confirmationClaim: serverUtil.GenericVerifiableCredential = {
         "@context": "https://schema.org",
         "@type": "AgreeAction",
         object: goodClaim,

src/views/ProjectsView.vue

@@ -98,7 +98,7 @@
                 :entityId="offer.recipientDid"
                 :iconSize="48"
                 class="inline-block align-middle border border-slate-300 rounded-md"
-              ></EntityIcon>
+              />
             </div>
 
             <div>
@@ -167,7 +167,7 @@
 
                 <a @click="onClickLoadClaim(offer.jwtId)">
                   <fa
-                    icon="circle-info"
+                    icon="file-lines"
                     class="pl-2 text-blue-500 cursor-pointer"
                   ></fa>
                 </a>
@@ -213,6 +213,7 @@
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
@@ -222,28 +223,21 @@ import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import ProjectIcon from "@/components/ProjectIcon.vue";
 import TopMessage from "@/components/TopMessage.vue";
-import { OfferServerRecord, PlanData } from "@/libs/endorserServer";
+import { OfferSummaryRecord, PlanData } from "@/libs/endorserServer";
 import EntityIcon from "@/components/EntityIcon.vue";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({
   components: { EntityIcon, InfiniteScroll, QuickNav, ProjectIcon, TopMessage },
 })
 export default class ProjectsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   apiServer = "";
   projects: PlanData[] = [];
   currentIid: IIdentifier;
   isLoading = false;
   numAccounts = 0;
-  offers: OfferServerRecord[] = [];
+  offers: OfferSummaryRecord[] = [];
   showOffers = true;
   showProjects = false;
 

src/views/QuickActionBvcBeginView.vue

@@ -0,0 +1,220 @@
+<template>
+  <QuickNav />
+  <TopMessage />
+
+  <!-- CONTENT -->
+  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+    <!-- 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 px-4 mb-4">
+      Beginning of BVC Saturday Meeting
+    </h1>
+
+    <div>
+      <h2 class="text-2xl m-2">You're Here</h2>
+      <div class="m-2 flex">
+        <input type="checkbox" v-model="attended" class="h-6 w-6" />
+        <span class="pb-2 pl-2 pr-2">Attended</span>
+      </div>
+      <div class="m-2 flex">
+        <input type="checkbox" v-model="gaveTime" class="h-6 w-6" />
+        <span class="pb-2 pl-2 pr-2">Spent Time</span>
+        <span v-if="gaveTime">
+          <input
+            type="text"
+            placeholder="How much time"
+            v-model="hoursStr"
+            size="1"
+            class="border border-slate-400 h-6 px-2"
+          />
+          hour(s)
+        </span>
+        <!-- This is to match input height to avoid shifting when hiding & showing. -->
+        <span v-else class="h-6" />
+      </div>
+    </div>
+
+    <div
+      v-if="attended || (gaveTime && hoursStr && hoursStr != '0')"
+      class="flex justify-center mt-4"
+    >
+      <button
+        @click="record()"
+        class="block text-center text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md w-56"
+      >
+        Sign & Send
+      </button>
+    </div>
+    <div v-else class="flex justify-center mt-4">
+      <button
+        class="block text-center text-md font-bold bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md w-56"
+      >
+        Select Your Actions
+      </button>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import axios from "axios";
+import { DateTime } from "luxon";
+import { Component, Vue } from "vue-facing-decorator";
+
+import QuickNav from "@/components/QuickNav.vue";
+import TopMessage from "@/components/TopMessage.vue";
+import { NotificationIface } from "@/constants/app";
+import { db } from "@/db/index";
+import {
+  BVC_MEETUPS_PROJECT_CLAIM_ID,
+  bvcMeetingJoinClaim,
+  createAndSubmitClaim,
+  createAndSubmitGive,
+} from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+
+@Component({
+  components: {
+    QuickNav,
+    TopMessage,
+  },
+})
+export default class QuickActionBvcBeginView extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  attended = true;
+  gaveTime = true;
+  hoursStr = "1";
+  todayOrPreviousStartDate = "";
+
+  async mounted() {
+    let currentOrPreviousSat = DateTime.now().setZone("America/Denver");
+    if (currentOrPreviousSat.weekday < 6) {
+      // it's not Saturday or Sunday,
+      // so move back one week before setting to the Saturday
+      currentOrPreviousSat = currentOrPreviousSat.minus({ week: 1 });
+    }
+    const eventStartDateObj = currentOrPreviousSat
+      .set({ weekday: 6 })
+      .set({ hour: 9 })
+      .startOf("hour");
+
+    // Hack, but full ISO pushes the length to 340 which crashes verifyJWT!
+    this.todayOrPreviousStartDate =
+      eventStartDateObj.toISO({
+        suppressMilliseconds: true,
+      }) || "";
+  }
+
+  async record() {
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    const activeDid = settings?.activeDid || "";
+    const apiServer = settings?.apiServer || "";
+
+    try {
+      const hoursNum = libsUtil.numberOrZero(this.hoursStr);
+      const identity = await libsUtil.getIdentity(activeDid);
+
+      // first send the claim for time given
+      let timeSuccess = false;
+      if (this.gaveTime && hoursNum > 0) {
+        const timeResult = await createAndSubmitGive(
+          axios,
+          apiServer,
+          identity,
+          activeDid,
+          undefined,
+          undefined,
+          hoursNum,
+          "HUR",
+          BVC_MEETUPS_PROJECT_CLAIM_ID,
+        );
+        if (timeResult.type === "success") {
+          timeSuccess = true;
+        } else {
+          console.error("Error sending time:", timeResult);
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error",
+              text:
+                timeResult?.error?.userMessage ||
+                "There was an error sending the time.",
+            },
+            -1,
+          );
+        }
+      }
+
+      // now send the claim for attendance
+      let attendedSuccess = false;
+      if (this.attended) {
+        const attendResult = await createAndSubmitClaim(
+          bvcMeetingJoinClaim(activeDid, this.todayOrPreviousStartDate),
+          identity,
+          apiServer,
+          axios,
+        );
+        if (attendResult.type === "success") {
+          attendedSuccess = true;
+        } else {
+          console.error("Error sending attendance:", attendResult);
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error",
+              text:
+                attendResult?.error?.userMessage ||
+                "There was an error sending the attendance.",
+            },
+            -1,
+          );
+        }
+      }
+
+      if (timeSuccess || attendedSuccess) {
+        const actions =
+          timeSuccess && attendedSuccess
+            ? "Your attendance and time have been recorded."
+            : timeSuccess
+              ? "Your time has been recorded."
+              : "Your attendance has been recorded.";
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: actions,
+          },
+          -1,
+        );
+      }
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (error: any) {
+      console.error("Error sending claims.", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: error.userMessage || "There was an error sending claims.",
+        },
+        -1,
+      );
+    }
+  }
+}
+</script>

src/views/QuickActionBvcEndView.vue

@@ -0,0 +1,377 @@
+<template>
+  <QuickNav />
+  <TopMessage />
+
+  <!-- CONTENT -->
+  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+    <!-- 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 px-4 mb-4">
+      End of BVC Saturday Meeting
+    </h1>
+
+    <div>
+      <h2 class="text-2xl m-2">Confirm</h2>
+      <div v-if="loadingConfirms" class="flex justify-center">
+        <fa icon="spinner" class="animate-spin" />
+      </div>
+      <div v-else-if="claimsToConfirm.length === 0">
+        There are no claims yet today for you to confirm.
+      </div>
+      <ul class="border-t border-slate-300 m-2">
+        <li
+          class="border-b border-slate-300 py-2"
+          v-for="record in claimsToConfirm"
+          :key="record.id"
+        >
+          <div class="grid grid-cols-12">
+            <span class="col-span-11 justify-self-start">
+              <span>
+                <input
+                  type="checkbox"
+                  :checked="claimsToConfirmSelected.includes(record.id)"
+                  @click="
+                    claimsToConfirmSelected.includes(record.id)
+                      ? claimsToConfirmSelected.splice(
+                          claimsToConfirmSelected.indexOf(record.id),
+                          1,
+                        )
+                      : claimsToConfirmSelected.push(record.id)
+                  "
+                  class="mr-2 h-6 w-6"
+                />
+              </span>
+              {{
+                claimSpecialDescription(
+                  record,
+                  activeDid,
+                  allMyDids,
+                  allContacts,
+                )
+              }}
+              <a @click="onClickLoadClaim(record.id)">
+                <fa
+                  icon="file-lines"
+                  class="pl-2 text-blue-500 cursor-pointer"
+                />
+              </a>
+            </span>
+          </div>
+        </li>
+      </ul>
+    </div>
+    <div v-if="claimCountWithHidden > 0" class="border-b border-slate-300 pb-2">
+      <span>
+        {{
+          claimCountWithHidden === 1
+            ? "There is 1 other claim with hidden details,"
+            : `There are ${claimCountWithHidden} other claims with hidden details,`
+        }}
+        so if you expected but do not see details from someone then ask them to
+        check that their activity is visible to you on their Contacts
+        <fa icon="users" class="text-slate-500" />
+        page.
+      </span>
+    </div>
+
+    <div>
+      <h2 class="text-2xl m-2">Anything else?</h2>
+      <div class="m-2 flex">
+        <input type="checkbox" v-model="someoneGave" class="h-6 w-6" />
+        <span class="pb-2 pl-2 pr-2">Someone else gave</span>
+        <span v-if="someoneGave">
+          <input
+            type="text"
+            v-model="description"
+            size="20"
+            class="border border-slate-400 h-6 px-2"
+          />
+          <br />
+          (Everyone likes personalized messages! 😁)
+        </span>
+        <!-- This is to match input height to avoid shifting when hiding & showing. -->
+        <span v-else class="h-6">...</span>
+      </div>
+    </div>
+
+    <div
+      v-if="claimsToConfirmSelected.length || (someoneGave && description)"
+      class="flex justify-center mt-4"
+    >
+      <button
+        @click="record()"
+        class="block text-center text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md w-56"
+      >
+        Sign & Send
+      </button>
+    </div>
+    <div v-else class="flex justify-center mt-4">
+      <button
+        class="block text-center text-md font-bold bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md w-56"
+      >
+        Choose What To Confirm
+      </button>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import axios from "axios";
+import { DateTime } from "luxon";
+import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
+import { Component, Vue } from "vue-facing-decorator";
+
+import QuickNav from "@/components/QuickNav.vue";
+import TopMessage from "@/components/TopMessage.vue";
+import { NotificationIface } from "@/constants/app";
+import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
+import { Contact } from "@/db/tables/contacts";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
+import {
+  BVC_MEETUPS_PROJECT_CLAIM_ID,
+  claimSpecialDescription,
+  containsHiddenDid,
+  createAndSubmitConfirmation,
+  createAndSubmitGive,
+  ErrorResult,
+  GenericCredWrapper,
+  GenericVerifiableCredential,
+} from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
+
+@Component({
+  methods: { claimSpecialDescription },
+  components: {
+    QuickNav,
+    TopMessage,
+  },
+})
+export default class QuickActionBvcBeginView extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  activeDid = "";
+  allContacts: Array<Contact> = [];
+  allMyDids: Array<string> = [];
+  apiServer = "";
+  claimCountWithHidden = 0;
+  claimsToConfirm: GenericCredWrapper[] = [];
+  claimsToConfirmSelected: string[] = [];
+  description = "breakfast";
+  loadingConfirms = true;
+  someoneGave = false;
+
+  async created() {
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    this.apiServer = settings?.apiServer || "";
+    this.activeDid = settings?.activeDid || "";
+    this.allContacts = await db.contacts.toArray();
+  }
+
+  async mounted() {
+    this.loadingConfirms = true;
+    let currentOrPreviousSat = DateTime.now().setZone("America/Denver");
+    if (currentOrPreviousSat.weekday < 6) {
+      // it's not Saturday or Sunday,
+      // so move back one week before setting to the Saturday
+      currentOrPreviousSat = currentOrPreviousSat.minus({ week: 1 });
+    }
+    const eventStartDateObj = currentOrPreviousSat
+      .set({ weekday: 6 })
+      .set({ hour: 9 })
+      .startOf("hour");
+
+    // Hack, but full ISO pushes the length to 340 which crashes verifyJWT!
+    const todayOrPreviousStartDate =
+      eventStartDateObj.toISO({
+        suppressMilliseconds: true,
+      }) || "";
+
+    await accountsDB.open();
+    const allAccounts = await accountsDB.accounts.toArray();
+    this.allMyDids = allAccounts.map((acc) => acc.did);
+    const account: Account | undefined = await accountsDB.accounts
+      .where("did")
+      .equals(this.activeDid)
+      .first();
+    const identity: IIdentifier = JSON.parse(
+      (account?.identity as string) || "null",
+    );
+    const headers = {
+      Authorization: "Bearer " + (await accessToken(identity)),
+    };
+    try {
+      const response = await fetch(
+        this.apiServer +
+          "/api/claim/?" +
+          "issuedAt_greaterThanOrEqualTo=" +
+          encodeURIComponent(todayOrPreviousStartDate) +
+          "&excludeConfirmations=true",
+        { headers },
+      );
+
+      if (!response.ok) {
+        console.log("Bad response", response);
+        throw new Error("Bad response when retrieving claims.");
+      }
+      await response.json().then((data) => {
+        const dataByOthers = R.reject(
+          (claim: GenericCredWrapper) => claim.issuer === this.activeDid,
+          data,
+        );
+        const dataByOthersWithoutHidden = R.reject(
+          containsHiddenDid,
+          dataByOthers,
+        );
+        this.claimsToConfirm = dataByOthersWithoutHidden;
+        this.claimCountWithHidden =
+          dataByOthers.length - dataByOthersWithoutHidden.length;
+      });
+    } catch (error) {
+      console.error("Error:", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "There was an error retrieving today's claims to confirm.",
+        },
+        -1,
+      );
+    }
+    this.loadingConfirms = false;
+  }
+
+  onClickLoadClaim(jwtId: string) {
+    const route = {
+      path: "/claim/" + encodeURIComponent(jwtId),
+    };
+    this.$router.push(route);
+  }
+
+  async record() {
+    try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
+
+      // in parallel, make a confirmation for each selected claim and send them all to the server
+      const confirmResults = await Promise.allSettled(
+        this.claimsToConfirmSelected.map(async (jwtId) => {
+          const record = this.claimsToConfirm.find(
+            (claim) => claim.id === jwtId,
+          );
+          if (!record) {
+            return { type: "error", error: "Record not found." };
+          }
+          const identity = await libsUtil.getIdentity(this.activeDid);
+          return createAndSubmitConfirmation(
+            identity,
+            record.claim as GenericVerifiableCredential,
+            record.id,
+            record.handleId,
+            this.apiServer,
+            axios,
+          );
+        }),
+      );
+      // check for any rejected confirmations
+      const confirmsSucceeded = confirmResults.filter(
+        (result) =>
+          result.status === "fulfilled" && result.value.type === "success",
+      );
+      if (confirmsSucceeded.length < this.claimsToConfirmSelected.length) {
+        console.error("Error sending confirmations:", confirmResults);
+        const howMany = confirmsSucceeded.length === 0 ? "all" : "some";
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: `There was an error sending ${howMany} of the confirmations.`,
+          },
+          -1,
+        );
+      }
+
+      // now send the give for the description
+      let giveSucceeded = false;
+      if (this.someoneGave) {
+        const giveResult = await createAndSubmitGive(
+          axios,
+          this.apiServer,
+          identity,
+          undefined,
+          this.activeDid,
+          this.description,
+          undefined,
+          undefined,
+          BVC_MEETUPS_PROJECT_CLAIM_ID,
+        );
+        giveSucceeded = giveResult.type === "success";
+        if (!giveSucceeded) {
+          console.error("Error sending give:", giveResult);
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error",
+              text:
+                (giveResult as ErrorResult)?.error?.userMessage ||
+                "There was an error sending that give.",
+            },
+            -1,
+          );
+        }
+      }
+
+      if (confirmsSucceeded.length > 0 || giveSucceeded) {
+        const confirms =
+          confirmsSucceeded.length === 1 ? "confirmation" : "confirmations";
+        const actions =
+          confirmsSucceeded.length > 0 && giveSucceeded
+            ? `Your ${confirms} and that give have been recorded.`
+            : giveSucceeded
+              ? "That give has been recorded."
+              : "Your " +
+                confirms +
+                " " +
+                (confirmsSucceeded.length === 1 ? "has" : "have") +
+                " been recorded.";
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: actions,
+          },
+          -1,
+        );
+      }
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (error: any) {
+      console.error("Error sending claims.", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: error.userMessage || "There was an error sending claims.",
+        },
+        -1,
+      );
+    }
+  }
+}
+</script>

src/views/QuickActionBvcView.vue

@@ -0,0 +1,52 @@
+<template>
+  <QuickNav />
+  <TopMessage />
+
+  <!-- CONTENT -->
+  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+    <!-- 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 px-4 mb-4">
+      Bountiful Voluntaryist Community Actions
+    </h1>
+
+    <div>
+      <router-link
+        :to="{ name: 'quick-action-bvc-begin' }"
+        class="block text-center text-md font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
+      >
+        Beginning of Meeting
+      </router-link>
+      <router-link
+        :to="{ name: 'quick-action-bvc-end' }"
+        class="block text-center text-md font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
+      >
+        End of Meeting
+      </router-link>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-facing-decorator";
+
+import QuickNav from "@/components/QuickNav.vue";
+import TopMessage from "@/components/TopMessage.vue";
+
+@Component({
+  components: {
+    QuickNav,
+    TopMessage,
+  },
+})
+export default class QuickActionBvcView extends Vue {}
+</script>

src/views/SearchAreaView.vue

@@ -22,8 +22,8 @@
     </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.
+      This location is only stored on your device. It is sometimes sent from
+      your device to run searches but it is not stored on our servers.
     </div>
 
     <div>
@@ -64,10 +64,11 @@
       </div>
     </div>
 
-    <div style="height: 600px; width: 800px">
+    <div class="mb-4 aspect-video">
       <l-map
         ref="map"
         :center="[localCenterLat, localCenterLong]"
+        class="!z-40 rounded-md"
         v-model:zoom="localZoom"
         @click="setMapPoint"
       >
@@ -105,21 +106,15 @@ import {
   LTileLayer,
 } from "@vue-leaflet/vue-leaflet";
 
+import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 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,
@@ -130,7 +125,7 @@ interface Notification {
   },
 })
 export default class DiscoverView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   isChoosingSearchBox = false;
   isNewMarkerSet = false;
@@ -214,9 +209,9 @@ export default class DiscoverView extends Vue {
             group: "alert",
             type: "success",
             title: "Saved",
-            text: "That has been saved in your preferences.",
+            text: "That has been saved in your preferences. You can now filter by it on your home screen feed.",
           },
-          -1,
+          7000,
         );
         this.$router.back();
       } catch (err) {
@@ -252,6 +247,7 @@ export default class DiscoverView extends Vue {
       await db.open();
       db.settings.update(MASTER_SETTINGS_KEY, {
         searchBoxes: [],
+        filterFeedByNearby: false,
       });
       this.searchBox = null;
       this.localCenterLat = 0;

src/views/SeedBackupView.vue

@@ -1,5 +1,5 @@
 <template>
-  <QuickNav selected="Profile"></QuickNav>
+  <QuickNav selected="Profile" />
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Back -->
@@ -22,7 +22,7 @@
       <span>
         <router-link
           :to="{ name: 'help' }"
-          class="text-xs uppercase bg-blue-500 text-white px-1.5 py-1 rounded-md ml-1"
+          class="text-xs uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 rounded-md ml-1"
         >
           Help
         </router-link>
@@ -48,7 +48,7 @@
 
       <div class="bg-slate-100 rounded-md overflow-hidden p-4 mb-4">
         <button
-          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+          class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
           @click="showSeedPhrase"
         >
           Reveal my Seed Phrase
@@ -65,25 +65,20 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
 import * as R from "ramda";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+
 import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
 interface Account {
   mnemonic: string;
 }
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({ components: { QuickNav } })
 export default class SeedBackupView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeAccount: Account | null | undefined = null;
   numAccounts = 0;

src/views/StartView.vue

@@ -23,36 +23,40 @@
 
     <!-- id used by puppeteer test script -->
     <div id="start-question" class="mt-8">
-      <p class="text-center text-xl font-light">
-        Do you want a new identifier of your own?
-      </p>
-      <p class="text-center font-light">
-        If you haven't used this before, click "Yes" to generate a new
-        identifier.
-      </p>
-      <p class="text-center mb-4 font-light">
-        Only click "No" if you have a seed of 12 or 24 words generated
-        elsewhere.
-      </p>
-      <a
-        @click="onClickYes()"
-        class="block w-full text-center text-lg uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
-      >
-        Yes, generate one
-      </a>
-      <a
-        @click="onClickNo()"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-2"
-      >
-        No, I have a seed
-      </a>
-      <a
-        v-if="numAccounts > 0"
-        @click="onClickDerive()"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-2"
-      >
-        Derive new address from existing seed
-      </a>
+      <div class="max-w-3xl mx-auto">
+        <p class="text-center text-xl font-light">
+          Do you want a new identifier of your own?
+        </p>
+        <p class="text-center font-light">
+          If you haven't used this before, click "Yes" to generate a new
+          identifier.
+        </p>
+        <p class="text-center mb-4 font-light">
+          Only click "No" if you have a seed of 12 or 24 words generated
+          elsewhere.
+        </p>
+        <a
+          @click="onClickYes()"
+          class="block w-full text-center text-lg uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md mb-2"
+        >
+          Yes, generate one
+        </a>
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+          <a
+            @click="onClickNo()"
+            class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+          >
+            No, I have a seed
+          </a>
+          <a
+            v-if="numAccounts > 0"
+            @click="onClickDerive()"
+            class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
+          >
+            Derive new address from existing seed
+          </a>
+        </div>
+      </div>
     </div>
   </section>
 </template>

src/views/StatisticsView.vue

@@ -53,8 +53,10 @@
 <script lang="ts">
 import { SVGRenderer } from "three/examples/jsm/renderers/SVGRenderer.js";
 import { Component, Vue } from "vue-facing-decorator";
+
 import { World } from "@/components/World/World.js";
 import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 
 interface RendererSVGType {
   domElement: Element;
@@ -64,16 +66,9 @@ interface Dictionary<T> {
   [key: string]: T;
 }
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({ components: { World, QuickNav } })
 export default class StatisticsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   world: World;
   worldProperties: Dictionary<number> = {};

sw_scripts/additional-scripts.js

@@ -112,6 +112,25 @@ self.addEventListener("message", (event) => {
   logConsoleAndDb("Service worker posted a message.");
 });
 
+self.addEventListener("notificationclick", (event) => {
+  logConsoleAndDb("Notification got clicked.", event);
+  event.notification.close();
+  // from https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerGlobalScope/notificationclick_event
+  // ... though I don't see any benefit over just "clients.openWindow"
+  event.waitUntil(
+    clients
+      .matchAll({
+        type: "window",
+      })
+      .then((clientList) => {
+        for (const client of clientList) {
+          if (client.url === "/" && "focus" in client) return client.focus();
+        }
+        if (clients.openWindow) return clients.openWindow("/");
+      }),
+  );
+});
+
 self.addEventListener("fetch", (event) => {
   logConsoleAndDb("Service worker got fetch event.", event);
 });

tsconfig.json

@@ -1,47 +1,35 @@
 {
-    "compilerOptions": {
-	"allowJs": true,
-	"resolveJsonModule": true,
-	"target": "esnext",
-	"module": "esnext",
-	"strict": true,
-	"strictPropertyInitialization": false,
-	"jsx": "preserve",
-	"moduleResolution": "node",
-	"experimentalDecorators": true,
-	"skipLibCheck": true,
-	"esModuleInterop": true,
-	"allowSyntheticDefaultImports": true,
-	"forceConsistentCasingInFileNames": true,
-	"useDefineForClassFields": true,
-	"sourceMap": true,
-	"baseUrl": "./src",
-	"types": [
-	    "webpack-env"
-	],
-	"paths": {
-	    "@/components/*": ["components/*"],
-	    "@/views/*": ["views/*"],
-	    "@/db/*": ["db/*"],
-	    "@/libs/*": ["libs/*"],
-	    "@/constants/*": ["constants/*"],
-	    "@/store/*": ["store/*"],
+	"compilerOptions": {
+		"target": "ES2020", // Latest ECMAScript features that are widely supported by modern browsers
+		"module": "ESNext", // Use ES modules
+		"strict": true, // Enable all strict type checking options
+		"jsx": "preserve", // Preserves JSX to be transformed by Babel or another transpiler
+		"moduleResolution": "node", // Use Node.js style module resolution
+		"experimentalDecorators": true,
+		"esModuleInterop": true, // Enables compatibility with CommonJS modules for default imports
+		"allowSyntheticDefaultImports": true, // Allow default imports from modules with no default export
+		"forceConsistentCasingInFileNames": true, // Disallow inconsistently-cased references to the same file
+		"useDefineForClassFields": true,
+		"sourceMap": true,
+		"baseUrl": "./src", // Base directory to resolve non-relative module names
+		"paths": {
+			"@/components/*": ["components/*"],
+			"@/views/*": ["views/*"],
+			"@/db/*": ["db/*"],
+			"@/libs/*": ["libs/*"],
+			"@/constants/*": ["constants/*"],
+			"@/store/*": ["store/*"]
+		},
+		"lib": ["ES2020", "dom", "dom.iterable"], // Include typings for ES2020 and DOM APIs
 	},
-	"lib": [
-	    "esnext",
-	    "dom",
-	    "dom.iterable",
-	    "scripthost"
+	"include": [
+		"src/**/*.ts",
+		"src/**/*.tsx",
+		"src/**/*.vue",
+		"tests/**/*.ts",
+		"tests/**/*.tsx"
+	],
+	"exclude": [
+		"node_modules"
 	]
-    },
-    "include": [
-	"src/**/*.ts",
-	"src/**/*.tsx",
-	"src/**/*.vue",
-	"tests/**/*.ts",
-	"tests/**/*.tsx"
-    ],
-    "exclude": [
-	"node_modules"
-    ]
 }

vite.config.mjs

@@ -0,0 +1,30 @@
+import * as path from 'path';
+import { defineConfig } from 'vite';
+import { VitePWA } from 'vite-plugin-pwa';
+import vue from '@vitejs/plugin-vue';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  server: {
+    port: 8080
+  },
+  plugins: [
+    vue(),
+    VitePWA({
+      registerType: 'autoUpdate',
+      strategies: 'injectManifest',
+      srcDir: '.',
+      filename: 'sw_scripts-combined.js',
+      manifest: {
+        name: process.env.TIME_SAFARI_APP_TITLE || require('./package.json').name,
+      },
+    }),
+  ],
+  resolve: {
+    alias: {
+      '@': path.resolve(__dirname, './src'),
+      buffer: path.resolve(__dirname, 'node_modules', 'buffer'),
+      'dexie-export-import/dist/import': 'dexie-export-import/dist/import/index.js',
+    },
+  },
+});

vue.config.js

@@ -1,42 +0,0 @@
-const { defineConfig } = require("@vue/cli-service");
-const { gitDescribeSync } = require("git-describe");
-const { exec } = require("child_process");
-
-process.env.VUE_APP_GIT_HASH = gitDescribeSync().hash;
-
-module.exports = defineConfig({
-  transpileDependencies: true,
-  configureWebpack: {
-    devtool: "source-map",
-    experiments: {
-      topLevelAwait: true,
-    },
-    plugins: [
-      {
-        // Still don't know why this runs three times.
-        apply: (compiler) => {
-          compiler.hooks.beforeCompile.tap("BeforeCompile", () => {
-            // Execute combine-sw.js script
-            exec("node sw_combine.js", (error, stdout, stderr) => {
-              if (error || stderr) {
-                console.error("Service worker files error:", error || stderr);
-              } else {
-                console.log("Finished combining service worker files.", stdout);
-              }
-            });
-          });
-        },
-      },
-    ],
-  },
-  pwa: {
-    iconPaths: {
-      faviconSVG: "img/icons/safari-pinned-tab.svg",
-    },
-    workboxPluginMode: "InjectManifest",
-    workboxOptions: {
-      // this script will be checked for linting (sw_scripts/* files generate about 1000 linting errors)
-      swSrc: "./sw_scripts-combined.js",
-    },
-  },
-});