Merge branch 'master' into why-migrate-fail

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

package.json

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

project.task.yaml

@@ -2,7 +2,6 @@
 tasks:
 
 - in endorser-push-server - mount folder for persistent sqlite DB outside of container
-- test alerts on all pages -- or refactor to new "notify" (since AlertMessage refactoring may require a change, et. ContactQRScanShowView)
 - 40 notifications :
   - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
 
@@ -11,10 +10,9 @@ tasks:
 - 01 fix the Discovery map display to not show on top of bottom icons (and any other UI tweaks on the map flow) assignee-group:ui
 - .1 add instructions for map location selection
 
-- 01 Show pop-up or some message confirming that settings & contacts download has been initiated/finished assignee:matthew assignee-group:ui
+- 01 Show pop-up or some message confirming that settings & contacts download has been initiated/finished
 
-- 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s) assignee-group:ui
-  - SEE: https://github.com/emmanuelsw/notiwind assignee:jose assignee-group:ui
+- 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s)
 
 - Home Feed & Quick Give screen :
   - 01 save the feed-viewed status in settings storage ("afterQuery")
@@ -23,18 +21,16 @@ tasks:
 
 - 24 Move to Vite assignee:matthew
 
-- .2 fit as many icons as possible on home & project view screens but only going halfway down the page
-- .1 Remove notification alert visuals on home page
+- .5 switch so DiscoverView shows anywhere by default, and no number unless search is done (and maybe a better filter UI, including "mine" to consolidate with ProjectsView)
+- .2 fit as many icons as possible on home & project view screens but only going halfway down the page assignee-group:ui
 - .5 Add infinite scroll to gifts on the home page
 - .5 bug - search for "Safari" does not find the project, but if already on the "Anywhere" tab it shows all
 - .2 figure out why endorser-mobile search doesn't find recently created PlanAction
 - .1 when creating a plan, select location and then make sure you can deselect on Android
-- .5 include a version, maybe the hash of the latest commit -- figuring out how it works on prod now
 - .5 add link to further project / people when a project pays ahead
-- .5 add project ID to the URL, to make a project publicly-accessible
+- .5 add project ID to the URL of the project-view, to make a project publicly-accessible
 - .5 fix where user 0 sees no txns from user 1 on contacts page but sees them on list page
-- .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist assignee-group:ui
-- .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?) assignee:jose assignee-group:ui
+- .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist
 - .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
 - .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164
 - .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
@@ -44,14 +40,12 @@ tasks:
 - Discuss whether the remaining tasks are worthwhile before MVP release.
 
 - 04 allow user to download claims, mine + ones I can see about me from others
-- .5 change the derivation path, and regenerate test IDs
 - 02 allow user to create new DIDs from the same seed phrase (ie. increment derivation path)
-- .5 on ProjectView page, show immediate feedback when a gift is given (on list?) -- and consider the same for Home & Contacts pages assignee-group:ui
+- .5 on ProjectView page, show immediate feedback when a gift is given (on list?) -- and consider the same for Home & Contacts pages
 - .5 customize favicon assignee-group:ui
-- .5 Do we want to combine first name & last name?
-- .2 Show a warning if both giver and recipient are the same (but still allow?) assignee-group:ui
+- .2 Show a warning if both giver and recipient are the same (but still allow?)
 - 01 Would it look better to shrink the buttons on many pages so they don't expand to the width of the screen? assignee-group:ui
-- .5 Display a more appealing confirmation on the map when erasing the marker assignee-group:ui
+- .5 Display a more appealing confirmation on the map when erasing the marker
 - .5 make a VC details page
 - .1 Add units or different icon to the coins (to distinguish $, BTC, hours, etc)
 - .1 remove firstName (& lastName) from localStorage
@@ -63,6 +57,7 @@ tasks:
 
 - stats v1 :
   - 01 show numeric stats
+  - 04 show different graphic for projects vs people on world
   - 01 link to world for specific stats
   - .5 don't load another instance of a bush if it already exists
   - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")

src/db/index.ts

@@ -6,6 +6,7 @@ import {
   MASTER_SETTINGS_KEY,
   Settings,
   SettingsSchema,
+  SettingsSchemaV1,
 } from "./tables/settings";
 import { AppString } from "@/constants/app";
 
@@ -34,6 +35,8 @@ const SensitiveSchemas = Object.assign({}, AccountsSchema);
 export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
   BaseDexie & T;
 export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
+// eslint-disable-next-line prettier/prettier
+const NonsensitiveSchemasV1 = Object.assign({}, ContactsSchema, SettingsSchemaV1);
 const NonsensitiveSchemas = Object.assign({}, ContactsSchema, SettingsSchema);
 
 /**
@@ -57,7 +60,29 @@ if (localStorage.getItem("secret") == null) {
 encrypted(accountsDB, { secretKey: secret });
 accountsDB.version(1).stores(SensitiveSchemas);
 
-db.version(1).stores(NonsensitiveSchemas);
+db.version(1).stores(NonsensitiveSchemasV1);
+
+db.version(2)
+  .stores(NonsensitiveSchemas)
+  .upgrade((tx) => {
+    return tx
+      .table("settings")
+      .toCollection()
+      .modify((settings) => {
+        if (
+          typeof settings.firstName === "string" &&
+          typeof settings.lastName === "string"
+        ) {
+          settings.firstName += " " + settings.lastName;
+        } else if (typeof settings.lastName === "string") {
+          settings.firstName = settings.lastName;
+        }
+        delete settings.lastName;
+      })
+      .catch((e) => {
+        console.log("caught modify exception", e);
+      });
+  });
 
 // initialize, a la https://dexie.org/docs/Tutorial/Design#the-populate-event
 db.on("populate", function () {

src/db/tables/settings.ts

@@ -22,8 +22,13 @@ export type Settings = {
   showContactGivesInline?: boolean;
 };
 
-export const SettingsSchema = {
+export const SettingsSchemaV1 = {
   settings: "id",
 };
 
+export const SettingsSchema = {
+  settings:
+    "id, activeDid, apiServer, firstName, lastname, lastViewedClaimId, searchBoxes, showContactGivesInline",
+};
+
 export const MASTER_SETTINGS_KEY = 1;

src/router/index.ts

@@ -79,14 +79,6 @@ const routes: Array<RouteRecordRaw> = [
     component: () =>
       import(/* webpackChunkName: "contacts" */ "../views/ContactsView.vue"),
   },
-  {
-    path: "/scan-contact",
-    name: "scan-contact",
-    component: () =>
-      import(
-        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
-      ),
-  },
   {
     path: "/discover",
     name: "discover",
@@ -99,6 +91,14 @@ const routes: Array<RouteRecordRaw> = [
     component: () =>
       import(/* webpackChunkName: "help" */ "../views/HelpView.vue"),
   },
+  {
+    path: "/identity-switcher",
+    name: "identity-switcher",
+    component: () =>
+      import(
+        /* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
+      ),
+  },
   {
     path: "/import-account",
     name: "import-account",
@@ -147,14 +147,6 @@ const routes: Array<RouteRecordRaw> = [
         /* webpackChunkName: "new-identifier" */ "../views/NewIdentifierView.vue"
       ),
   },
-  {
-    path: "/identity-switcher",
-    name: "identity-switcher",
-    component: () =>
-      import(
-        /* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
-      ),
-  },
   {
     path: "/project",
     name: "project",
@@ -168,6 +160,14 @@ const routes: Array<RouteRecordRaw> = [
       import(/* webpackChunkName: "projects" */ "../views/ProjectsView.vue"),
     beforeEnter: enterOrStart,
   },
+  {
+    path: "/scan-contact",
+    name: "scan-contact",
+    component: () =>
+      import(
+        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
+      ),
+  },
   {
     path: "/seed-backup",
     name: "seed-backup",

src/views/ProjectsView.vue

@@ -98,8 +98,6 @@ export default class ProjectsView extends Vue {
   projects: ProjectData[] = [];
   current: IIdentifier;
   isLoading = false;
-  alertTitle = "";
-  alertMessage = "";
   numAccounts = 0;
 
   async beforeCreate() {

web-push.md

@@ -1,3 +1,6 @@
+
+# Overivew of Web Push
+
 Web Push notifications is a web browser messaging protocol defined by the W3C.
 
 Discussions of this interesting technology are clouded because of a
@@ -360,29 +363,29 @@ unsubscribeFromPush().catch((err) => {
 NOTE: We could offer an option within the app to "mute" these notifications. This wouldn't turn off the notifications at the browser level, but you could make it so that your Service Worker doesn't display them even if it receives them.
 
 
-## NOTIFICATION DIALOG WORKFLOW
+# NOTIFICATION DIALOG WORKFLOW
 
-# ON APP FIRST-LAUNCH:
+## ON APP FIRST-LAUNCH:
 The user is periodically presented with the notification permission dialog that asks them if they want to turn on notifications. User is given 3 choices:
 
 - "Turn on Notifications": triggers the browser's own notification permission prompt.
 - "Maybe Later": dismisses the dialog, to reappear at a later instance. (The next time the user launches the app? After X amount of days? A combination of both?)
 - "Never": dismisses the dialog; app remembers to not automatically present the dialog again.
 
-# IF THE USER CHOOSES "NEVER":
+## IF THE USER CHOOSES "NEVER":
 The dialog can still be accessed via the Notifications toggle switch in `AccountViewView` (which also tells the user if notifications are turned on or off).
 
-# TO TEMPORARILY MUTE NOTIFICATIONS:
+## TO TEMPORARILY MUTE NOTIFICATIONS:
 While notifications are turned on, the user can tap on the Mute Notifications toggle switch in `AccountViewView` (visible only when notifications are turned on) to trigger the Mute Notifications Dialog. User is given the following choices:
 
 - Several "Mute for X Hour/s" buttons to temporarily mute notifications.
 - "Mute until I turn it back on" button to indefinitely mute notifications.
 - "Cancel" to make no changes and dismiss the dialog.
 
-# TO UNMUTE NOTIFICATIONS:
+## TO UNMUTE NOTIFICATIONS:
 Simply tap on the Mute Notifications toggle switch in `AccountViewView` to immediately unmute notifications. No dialog needed.
 
-# TO TURN OFF NOTIFICATIONS:
+## TO TURN OFF NOTIFICATIONS:
 While notifications are turned on, the user can tap on the App Notifications toggle switch in `AccountViewView` to trigger the Turn Off Notifications Dialog. User is given the following choices:
 
 - "Turn off Notifications" to fully turn them off (which means the user will need to go through the dialogs agains to turn them back on).