Update 'project.task.yaml'

* hide no contacts when there are no contacts
* replace contact property with giver (? can you have another contact give you something ?)

project.task.yaml

@@ -1,50 +1,40 @@
 
 tasks:
-- .5 audit all console.log calls
+- 40 notifications :
-- 01 design ideas for simple gives on the Home page
+  - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
-- 01 add list of 'give' records for a project on ProjectView UI
-- 02 Discover page - display results (currently in console.log) & link, spin when searching
-- 08 search by location, endpoint, etc assignee:trent
-- 01 add a location for a project via map pin (see API by clicking on "Nearby")
-- 01 remove all the "form" fields (or at least investigate to see if that page refresh is desired)
-- .2 change "errorMessage" to "alertMessage" on ProjectViewView.vue
 
-- 08 Scan QR code to import into contacts.
+- 01 add a location for a project via map pin
+- 04 search by a bounding box for local projects (see API by clicking on "Nearby")
+- 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:matthew
+- 02 Fix images on projectview - allow choice of image from a pallete of images or a url image (discovery page display also)
+  - SEE: https://github.com/dmester/jdenticon assignee:jose
 
-- contacts v1 :
+- 08 Scan QR code to import into contacts assignee:matthew
-  - 01 Import contact info a la QR code.
+  - SEE: https://github.com/gruhn/vue-qrcode-reader
-  - 01 Import all the non-sensitive data (ie. contacts & settings).
-  - .2 move all "identity" references to temporary account access assignee:trent
 
-- contacts v+ :
+- Show pop-up or some message confirming that settings & contacts download has been initiated/finished assignee:matthew
-  - .2 show error to user when adding a duplicate contact
-  - 01 parse input more robustly (with CSV lib and not commas)
 
-- refactor UI :
+- Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s)
-  - .5 Alerts show at the top and can be missed, eg. account data download
+  - SEE: https://github.com/emmanuelsw/notiwind assignee:jose
-  - .5 Fix how icons show on top of bottom bar on ContactAmounts page
-  - .2 Hide "Advanced" section in Account page by default
-
-- show pop-up confirming that settings & contacts have been downloaded
-
-- Ensure each action sent to the server has a confirmation - registration
 
 - Home Feed & Quick Give screen :
   - 01 save the feed-viewed status in settings storage ("afterQuery")
-  - 01 quick action - send action, maybe choose via canvas tool https://github.com/konvajs/vue-konva
+  - 01 quick action - send action, maybe choose via canvas tool 
+    - SEE: https://github.com/konvajs/vue-konva
 
-- .5 customize favicon
+- 24 Move to Vite assignee:matthew
-- 04 allow user to download claims, mine + ones I can see about me from others
 
-- 24 Move to Vite
+- .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
-- 40 notifications :
+- .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?) assignee:jose
-  - push
+- .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
 
 - Discuss whether the remaining tasks are worthwhile before MVP release.
 
-- 01 fix images on project page, on discovery page
+- contacts v+ :
-- .2 fix "Rotary" and static icon to the right on project page
+  - 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
@@ -53,7 +43,11 @@ tasks:
   - 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)
 
-- Do we want split first name & last name?
+- .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
+- 04 allow user to download claims, mine + ones I can see about me from others
+- Do we want to combine first name & last name?
+- Show a warning if both giver and recipient are the same (but still allow?)
 
 - Release Minimum Viable Product :
   - 08 thorough testing for errors & edge cases
@@ -66,9 +60,6 @@ tasks:
   - Test PWA features on Android and iOS.
   blocks: ref:https://raw.githubusercontent.com/trentlarson/lives-of-gifts/master/project.yaml#kickstarter%20for%20time
 
-- 40 notifications v+ :
-  - pull, w/ scheduled runs
-
 - linking between projects or plans :
   - show total time given to & from a project
   - terminology:
@@ -97,6 +88,10 @@ tasks:
 
 - Write to or read from a different ledger (eg. private ACDC, attest.sh)
 
+- Do we want split first name & last name?
+
+- 40 notifications v+ :
+  - pull, w/ scheduled runs
 
 log:
 - videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29

src/components/AlertMessage.vue

@@ -1,7 +1,7 @@
 <template>
   <div v-bind:class="computedAlertClassNames()">
     <button
-      class="close-button bg-slate-200 w-8 leading-loose rounded-full absolute top-2 right-2"
+      class="close-button bg-amber-400 w-8 leading-loose rounded-full absolute top-2 right-2"
       @click="onClickClose()"
     >
       <fa icon="xmark"></fa>
@@ -28,7 +28,7 @@ export default class AlertMessage extends Vue {
     return {
       hidden: !this.isAlertVisible,
       "dismissable-alert": true,
-      "bg-slate-100": true,
+      "bg-amber-200": true,
       "p-5": true,
       rounded: true,
       "drop-shadow-lg": true,

src/components/GiftedDialog.vue

@@ -1,41 +1,51 @@
 <template>
   <div v-if="visible" class="dialog-overlay">
     <div class="dialog">
-      <h1 class="text-lg text-center">
+      <h1 class="text-xl font-bold text-center mb-4">
-        {{ message }} {{ giver?.name || "somebody not specified" }}
+        {{ message }} {{ giver?.did || "somebody not specified" }}
       </h1>
       <input
         type="text"
-        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
+        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">
+      <div class="flex flex-row mb-6">
-        <span class="py-4">Hours</span>
+        <span
+          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 w-1/3 text-center px-2 py-2"
+          >Hours</span
+        >
+        <div
+          class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
+          @click="decrement()"
+        >
+          <fa icon="chevron-left" />
+        </div>
         <input
           type="text"
-          class="block w-8 rounded border border-slate-400 ml-4 text-center"
+          class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
           v-model="hours"
         />
-        <div class="flex flex-col px-1">
+        <div
-          <div>
+          class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
-            <fa icon="square-caret-up" size="2xl" @click="increment()" />
+          @click="increment()"
-          </div>
+        >
-          <div>
+          <fa icon="chevron-right" />
-            <fa icon="square-caret-down" size="2xl" @click="decrement()" />
-          </div>
         </div>
       </div>
-      <p class="text-right">Sign & Send to publish to the world</p>
+      <p class="text-center mb-2 italic">Sign & Send to publish to the world</p>
-      <div class="text-right">
+      <button
-        <button class="rounded border border-slate-400" @click="confirm">
+        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-          <span class="m-2">Sign & Send</span>
+        @click="confirm"
-        </button>
+      >
-        &nbsp;
+        Sign &amp; Send
-        <button class="rounded border border-slate-400" @click="cancel">
+      </button>
-          <span class="m-2">Cancel</span>
+      <button
-        </button>
+        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      </div>
+        @click="cancel"
+      >
+        Cancel
+      </button>
     </div>
   </div>
 </template>
@@ -106,12 +116,14 @@ export default class GiftedDialog extends Vue {
   display: flex;
   justify-content: center;
   align-items: center;
+  padding: 1.5rem;
 }
 
 .dialog {
   background-color: white;
   padding: 1rem;
   border-radius: 0.5rem;
-  width: 50%;
+  width: 100%;
+  max-width: 500px;
 }
 </style>

src/components/HelloWorld.vue

@@ -1,146 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-    <p>
-      For a guide and recipes on how to configure / customize this project,<br />
-      check out the
-      <a href="https://cli.vuejs.org" target="_blank" rel="noopener"
-        >vue-cli documentation</a
-      >.
-    </p>
-    <h3>Installed CLI Plugins</h3>
-    <ul>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-babel"
-          target="_blank"
-          rel="noopener"
-          >babel</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-pwa"
-          target="_blank"
-          rel="noopener"
-          >pwa</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-router"
-          target="_blank"
-          rel="noopener"
-          >router</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-vuex"
-          target="_blank"
-          rel="noopener"
-          >vuex</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint"
-          target="_blank"
-          rel="noopener"
-          >eslint</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-typescript"
-          target="_blank"
-          rel="noopener"
-          >typescript</a
-        >
-      </li>
-    </ul>
-    <h3>Essential Links</h3>
-    <ul>
-      <li>
-        <a href="https://vuejs.org" target="_blank" rel="noopener">Core Docs</a>
-      </li>
-      <li>
-        <a href="https://forum.vuejs.org" target="_blank" rel="noopener"
-          >Forum</a
-        >
-      </li>
-      <li>
-        <a href="https://chat.vuejs.org" target="_blank" rel="noopener"
-          >Community Chat</a
-        >
-      </li>
-      <li>
-        <a href="https://twitter.com/vuejs" target="_blank" rel="noopener"
-          >Twitter</a
-        >
-      </li>
-      <li>
-        <a href="https://news.vuejs.org" target="_blank" rel="noopener">News</a>
-      </li>
-    </ul>
-    <h3>Ecosystem</h3>
-    <ul>
-      <li>
-        <a href="https://router.vuejs.org" target="_blank" rel="noopener"
-          >vue-router</a
-        >
-      </li>
-      <li>
-        <a href="https://vuex.vuejs.org" target="_blank" rel="noopener">vuex</a>
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/vue-devtools#vue-devtools"
-          target="_blank"
-          rel="noopener"
-          >vue-devtools</a
-        >
-      </li>
-      <li>
-        <a href="https://vue-loader.vuejs.org" target="_blank" rel="noopener"
-          >vue-loader</a
-        >
-      </li>
-      <li>
-        <a
-          href="https://github.com/vuejs/awesome-vue"
-          target="_blank"
-          rel="noopener"
-          >awesome-vue</a
-        >
-      </li>
-    </ul>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from "vue-facing-decorator";
-
-@Component
-export default class HelloWorld extends Vue {
-  @Prop msg!: string;
-}
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h3 {
-  margin: 40px 0 0;
-}
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-a {
-  color: #42b983;
-}
-</style>

src/db/index.ts

@@ -54,7 +54,6 @@ if (localStorage.getItem("secret") == null) {
   localStorage.setItem("secret", secret);
 }
 
-//console.log("IndexedDB Encryption Secret:", secret);
 encrypted(accountsDB, { secretKey: secret });
 accountsDB.version(1).stores(SensitiveSchemas);
 

src/libs/endorserServer.ts

@@ -82,11 +82,8 @@ export function isHiddenDid(did) {
 /**
  always returns text, maybe UNNAMED_VISIBLE or UNKNOWN_ENTITY
  **/
-export function didInfo(did, activeDid, identifiers, contacts) {
+export function didInfo(did, activeDid, allMyDids, contacts) {
-  const myId: IIdentifier | undefined = R.find(
+  const myId: string | undefined = R.find(R.identity, allMyDids);
-    (i) => i.did === did,
-    identifiers,
-  );
   if (myId) {
     return "You" + (myId.did !== activeDid ? " (Alt ID)" : "");
   } else {
@@ -197,3 +194,53 @@ export function isNumeric(str: string): boolean {
 export function numberOrZero(str: string): number {
   return isNumeric(str) ? +str : 0;
 }
+
+export interface ErrorResponse {
+  error?: {
+    message?: string;
+  };
+}
+
+export interface RateLimits {
+  doneClaimsThisWeek: string;
+  doneRegistrationsThisMonth: string;
+  maxClaimsPerWeek: string;
+  maxRegistrationsPerMonth: string;
+  nextMonthBeginDateTime: string;
+  nextWeekBeginDateTime: string;
+}
+
+/**
+ * Represents data about a project
+ **/
+export interface ProjectData {
+  /**
+   * Name of the project
+   **/
+  name: string;
+  /**
+   * Description of the project
+   **/
+  description: string;
+  /**
+   * URL referencing information about the project
+   **/
+  handleId: string;
+  /**
+   * The Identier of the project
+   **/
+  rowid: string;
+}
+
+export interface VerifiableCredential {
+  "@context": string;
+  "@type": string;
+  name: string;
+  description: string;
+  identifier?: string;
+}
+
+export interface WorldProperties {
+  startTime?: string;
+  endTime?: string;
+}

src/main.ts

@@ -13,6 +13,7 @@ import {
   faBurst,
   faCalendar,
   faChevronLeft,
+  faChevronRight,
   faCircle,
   faCircleCheck,
   faCircleQuestion,
@@ -53,6 +54,7 @@ library.add(
   faBurst,
   faCalendar,
   faChevronLeft,
+  faChevronRight,
   faCircle,
   faCircleCheck,
   faCircleQuestion,

src/router/index.ts

@@ -123,6 +123,14 @@ 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",
@@ -158,6 +166,14 @@ const routes: Array<RouteRecordRaw> = [
         /* webpackChunkName: "statistics" */ "../views/StatisticsView.vue"
       ),
   },
+  {
+    path: "/contact-gives",
+    name: "contact-gives",
+    component: () =>
+      import(
+        /* webpackChunkName: "statistics" */ "../views/ContactGiftingView.vue"
+      ),
+  },
 ];
 
 /** @type {*} */

src/views/AccountViewView.vue

@@ -3,10 +3,23 @@
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24">
     <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-4">
       Your Identity
     </h1>
 
+    <div class="flex justify-between">
+      <span />
+      <span class="whitespace-nowrap">
+        <router-link
+          :to="{ name: 'contact-qr' }"
+          class="text-xs uppercase bg-slate-500 text-white px-1.5 py-1 rounded-md"
+        >
+          <fa icon="qrcode" class="fa-fw"></fa>
+        </router-link>
+      </span>
+      <span />
+    </div>
+
     <div class="flex justify-between py-2">
       <span />
       <span>
@@ -53,14 +66,6 @@
           <fa icon="copy" class="text-slate-400 fa-fw"></fa>
         </button>
         <span v-show="showDidCopy">Copied!</span>
-        <span class="whitespace-nowrap ml-4">
-          <router-link
-            :to="{ name: 'contact-qr' }"
-            class="text-xs uppercase bg-slate-500 text-white px-1.5 py-1 rounded-md ml-1"
-          >
-            <fa icon="qrcode" class="fa-fw"></fa>
-          </router-link>
-        </span>
       </div>
 
       <div class="text-slate-500 text-sm font-bold">Public Key (base 64)</div>
@@ -108,10 +113,16 @@
 
     <router-link
       :to="{ name: 'new-edit-account' }"
-      class="block text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-8"
+      class="block text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
     >
       Edit Identity
     </router-link>
+    <router-link
+      :to="{ name: 'identity-switcher' }"
+      class="block text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-8"
+    >
+      Switch Identity / No Identity
+    </router-link>
 
     <h3 class="text-sm uppercase font-semibold mb-3">Data</h3>
 
@@ -132,138 +143,131 @@
 
     <!-- QR code popup -->
     <dialog id="dlgQR" class="backdrop:bg-black/75 rounded-md">
-      <form method="dialog">
+      <div class="text-slate-500 text-center">
-        <div class="text-slate-500 text-center">
+        <b>ID:</b> <code>did:peer:kl45kj41lk451kl3</code>
-          <b>ID:</b> <code>did:peer:kl45kj41lk451kl3</code>
+      </div>
-        </div>
+      <img src="/img/sample-qr-code.png" class="w-full mb-3" />
-        <img src="/img/sample-qr-code.png" class="w-full mb-3" />
 
-        <button
+      <button
-          value="cancel"
+        value="cancel"
-          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
+        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-        >
+      >
-          Copy to Clipboard
+        Copy to Clipboard
-        </button>
+      </button>
-        <button
+      <button
-          value="cancel"
+        value="cancel"
-          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-slate-500 text-white px-1.5 py-2 rounded-md"
-        >
+      >
-          Close
+        Close
-        </button>
+      </button>
-      </form>
     </dialog>
 
-    <h3 class="text-sm uppercase font-semibold mb-3">Advanced</h3>
+    <h3
-
+      class="text-sm uppercase font-semibold mb-3"
-    <label
+      @click="showAdvanced = !showAdvanced"
-      for="toggleShowAmounts"
-      class="flex items-center cursor-pointer mb-6"
-      @click="handleChange"
     >
-      <!-- toggle -->
+      Advanced
-      <div class="relative">
+    </h3>
-        <!-- input -->
+    <div v-if="showAdvanced">
-        <input
+      <label
-          type="checkbox"
+        for="toggleShowAmounts"
-          v-model="showContactGives"
+        class="flex items-center cursor-pointer mb-6"
-          name="showContactGives"
+        @click="handleChange"
-          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="ml-2">Show amounts given with contacts</div>
-    </label>
-
-    <div class="flex py-2">
-      <button class="text-center text-md text-blue-500" @click="checkLimits()">
-        Check Limits
-      </button>
-      <!-- show spinner if loading limits -->
-      <div v-if="loadingLimits" class="ml-2">
-        Checking... <fa icon="spinner" class="fa-spin"></fa>
-      </div>
-      <div class="ml-2">
-        {{ limitsMessage }}
-      </div>
-      <div v-if="!!limits?.nextWeekBeginDateTime" class="px-9">
-        <span class="font-bold">Rate Limits</span>
-        <p>
-          You have done {{ limits.doneClaimsThisWeek }} claims out of
-          {{ limits.maxClaimsPerWeek }} for this week. Your claims counter
-          resets at {{ readableTime(limits.nextWeekBeginDateTime) }}
-        </p>
-        <p>
-          You have done {{ limits.doneRegistrationsThisMonth }} registrations
-          out of {{ limits.maxRegistrationsPerMonth }} for this month. Your
-          registrations counter resets at
-          {{ readableTime(limits.nextMonthBeginDateTime) }}
-        </p>
-      </div>
-    </div>
-
-    <div class="flex py-2">
-      Claim Server
-      <input
-        type="text"
-        class="block w-full rounded border border-slate-400 px-3 py-2"
-        v-model="apiServerInput"
-      />
-      <button
-        v-if="apiServerInput != apiServer"
-        class="px-4 rounded bg-red-500 border border-slate-400"
-        @click="onClickSaveApiServer()"
       >
-        <fa icon="floppy-disk" class="fa-fw" color="white"></fa>
+        <!-- toggle -->
-      </button>
+        <div class="relative">
-      <button
+          <!-- input -->
-        class="px-4 rounded bg-slate-200 border border-slate-400"
+          <input
-        @click="setApiServerInput(Constants.PROD_ENDORSER_API_SERVER)"
+            type="checkbox"
-      >
+            v-model="showContactGives"
-        Use Prod
+            name="showContactGives"
-      </button>
+            class="sr-only"
-      <button
+          />
-        class="px-4 rounded bg-slate-200 border border-slate-400"
+          <!-- line -->
-        @click="setApiServerInput(Constants.TEST_ENDORSER_API_SERVER)"
+          <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
-      >
+          <!-- dot -->
-        Use Test
+          <div
-      </button>
+            class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
-      <button
+          ></div>
-        class="px-4 rounded bg-slate-200 border border-slate-400"
+        </div>
-        @click="setApiServerInput(Constants.LOCAL_ENDORSER_API_SERVER)"
+        <!-- label -->
-      >
+        <div class="ml-2">Show amounts given with contacts</div>
-        Use Local
+      </label>
-      </button>
-    </div>
 
-    <div v-if="numAccounts > 0" class="flex py-2">
+      <div class="flex py-2">
-      Switch Identifier
+        <button
-      <span>
+          class="text-center text-md text-blue-500"
-        <button class="text-blue-500 px-2" @click="switchAccount(0)">
+          @click="checkLimits()"
-          None
-        </button>
-      </span>
-      <span v-for="accountNum in numAccounts" :key="accountNum">
-        <button class="text-blue-500 px-2" @click="switchAccount(accountNum)">
-          #{{ accountNum }}
-        </button>
-      </span>
-    </div>
-
-    <div>
-      <button class="text-blue-500">
-        <router-link
-          :to="{ name: 'statistics' }"
-          class="block text-center py-3"
         >
-          See Achievements & Statistics
+          Check Limits
-        </router-link>
+        </button>
-      </button>
+        <!-- show spinner if loading limits -->
+        <div v-if="loadingLimits" class="ml-2">
+          Checking... <fa icon="spinner" class="fa-spin"></fa>
+        </div>
+        <div class="ml-2">
+          {{ limitsMessage }}
+        </div>
+        <div v-if="!!limits?.nextWeekBeginDateTime" class="px-9">
+          <span class="font-bold">Rate Limits</span>
+          <p>
+            You have done {{ limits.doneClaimsThisWeek }} claims out of
+            {{ limits.maxClaimsPerWeek }} for this week. Your claims counter
+            resets at {{ readableTime(limits.nextWeekBeginDateTime) }}
+          </p>
+          <p>
+            You have done {{ limits.doneRegistrationsThisMonth }} registrations
+            out of {{ limits.maxRegistrationsPerMonth }} for this month. Your
+            registrations counter resets at
+            {{ readableTime(limits.nextMonthBeginDateTime) }}
+          </p>
+        </div>
+      </div>
+
+      <div class="flex py-2">
+        Claim Server
+        <input
+          type="text"
+          class="block w-full rounded border border-slate-400 px-3 py-2"
+          v-model="apiServerInput"
+        />
+        <button
+          v-if="apiServerInput != apiServer"
+          class="px-4 rounded bg-red-500 border border-slate-400"
+          @click="onClickSaveApiServer()"
+        >
+          <fa icon="floppy-disk" class="fa-fw" color="white"></fa>
+        </button>
+        <button
+          class="px-4 rounded bg-slate-200 border border-slate-400"
+          @click="setApiServerInput(Constants.PROD_ENDORSER_API_SERVER)"
+        >
+          Use Prod
+        </button>
+        <button
+          class="px-4 rounded bg-slate-200 border border-slate-400"
+          @click="setApiServerInput(Constants.TEST_ENDORSER_API_SERVER)"
+        >
+          Use Test
+        </button>
+        <button
+          class="px-4 rounded bg-slate-200 border border-slate-400"
+          @click="setApiServerInput(Constants.LOCAL_ENDORSER_API_SERVER)"
+        >
+          Use Local
+        </button>
+      </div>
+
+      <div>
+        <button class="text-blue-500">
+          <router-link
+            :to="{ name: 'statistics' }"
+            class="block text-center py-3"
+          >
+            See Achievements & Statistics
+          </router-link>
+        </button>
+      </div>
     </div>
     <AlertMessage
       :alertTitle="alertTitle"
@@ -279,25 +283,16 @@ import { useClipboard } from "@vueuse/core";
 
 import { AppString } from "@/constants/app";
 import { db, accountsDB } from "@/db";
-import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { AxiosError } from "axios/index";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
+import { IIdentifier } from "@veramo/core";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
 
-interface RateLimits {
-  doneClaimsThisWeek: string;
-  doneRegistrationsThisMonth: string;
-  maxClaimsPerWeek: string;
-  maxRegistrationsPerMonth: string;
-  nextMonthBeginDateTime: string;
-  nextWeekBeginDateTime: string;
-}
-
 @Component({ components: { AlertMessage, QuickNav } })
 export default class AccountViewView extends Vue {
   Constants = AppString;
@@ -315,13 +310,16 @@ export default class AccountViewView extends Vue {
   limitsMessage = "";
   loadingLimits = true; // might as well now that we do it on mount, to avoid flashing the registration message
   showContactGives = false;
-  private accounts: AccountsSchema;
 
   showDidCopy = false;
   showDerCopy = false;
   showB64Copy = false;
   showPubCopy = false;
 
+  showAdvanced = false;
+  alertMessage = "";
+  alertTitle = "";
+
   public async getIdentity(activeDid) {
     await accountsDB.open();
     const account = await accountsDB.accounts
@@ -329,12 +327,6 @@ export default class AccountViewView extends Vue {
       .equals(activeDid)
       .first();
     const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load Give records with no identity available.",
-      );
-    }
     return identity;
   }
 
@@ -365,9 +357,8 @@ export default class AccountViewView extends Vue {
   }
 
   async beforeCreate() {
-    accountsDB.open();
+    await accountsDB.open();
-    this.accounts = accountsDB.accounts;
+    this.numAccounts = await accountsDB.accounts.count();
-    this.numAccounts = await this.accounts.count();
   }
 
   async created() {
@@ -389,14 +380,18 @@ export default class AccountViewView extends Vue {
 
       const identity = await this.getIdentity(this.activeDid);
 
-      this.publicHex = identity.keys[0].publicKeyHex;
+      if (identity) {
-      this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
+        this.publicHex = identity.keys[0].publicKeyHex;
-      this.derivationPath = identity.keys[0].meta.derivationPath;
+        this.publicBase64 = Buffer.from(this.publicHex, "hex").toString(
+          "base64",
+        );
+        this.derivationPath = identity.keys[0].meta.derivationPath;
 
-      db.settings.update(MASTER_SETTINGS_KEY, {
+        db.settings.update(MASTER_SETTINGS_KEY, {
-        activeDid: identity.did,
+          activeDid: identity.did,
-      });
+        });
-      this.checkLimits();
+        this.checkLimitsFor(identity);
+      }
     } catch (err) {
       if (
         err.message ===
@@ -455,12 +450,18 @@ export default class AccountViewView extends Vue {
   }
 
   async checkLimits() {
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity) {
+      this.checkLimitsFor(identity);
+    }
+  }
+
+  async checkLimitsFor(identity: IIdentifier) {
     this.loadingLimits = true;
     this.limitsMessage = "";
 
     try {
       const url = this.apiServer + "/api/report/rateLimits";
-      const identity = await this.getIdentity(this.activeDid);
       const headers = await this.getHeaders(identity);
 
       const resp = await this.axios.get(url, { headers });
@@ -478,10 +479,14 @@ export default class AccountViewView extends Vue {
       } else {
         const serverError = error as AxiosError;
         console.error("Bad response retrieving limits: ", serverError);
-        // Anybody know how to access items inside "response.data" without this?
+
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const data: ErrorResponse | undefined =
-        const data: any = serverError.response?.data;
+          serverError.response && serverError.response.data;
-        this.limitsMessage = data?.error?.message || "Bad server response.";
+        if (data && data.error && data.error.message) {
+          this.limitsMessage = data.error.message;
+        } else {
+          this.limitsMessage = "Bad server response.";
+        }
       }
     }
 
@@ -534,9 +539,5 @@ export default class AccountViewView extends Vue {
   setApiServerInput(value) {
     this.apiServerInput = value;
   }
-
-  // This same popup code is in many files.
-  alertMessage = "";
-  alertTitle = "";
 }
 </script>

src/views/ConfirmContactView.vue

@@ -15,35 +15,33 @@
       </h1>
     </div>
 
-    <form>
+    <p class="text-center text-xl mb-4 font-light">
-      <p class="text-center text-xl mb-4 font-light">
+      Would you like to add <i>Firstname</i> to your network?
-        Would you like to add <i>Firstname</i> to your network?
+    </p>
-      </p>
 
-      <!-- Account Details -->
+    <!-- Account Details -->
-      <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-        <h2 class="text-xl font-semibold mb-2">Firstname Lastname</h2>
+      <h2 class="text-xl font-semibold mb-2">Firstname Lastname</h2>
 
-        <div class="text-slate-500 text-sm font-bold">ID</div>
+      <div class="text-slate-500 text-sm font-bold">ID</div>
-        <div class="text-sm text-slate-500 mb-1">
+      <div class="text-sm text-slate-500 mb-1">
-          <span><code>did:peer:kl45kj41lk451kl3</code></span>
+        <span><code>did:peer:kl45kj41lk451kl3</code></span>
-        </div>
       </div>
+    </div>
 
-      <div class="mt-8">
+    <div class="mt-8">
-        <input
+      <input
-          type="submit"
+        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"
+        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"
+        value="Add Contact"
-        />
+      />
-        <button
+      <button
-          type="button"
+        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-slate-500 text-white px-1.5 py-2 rounded-md"
-        >
+      >
-          Cancel
+        Cancel
-        </button>
+      </button>
-      </div>
+    </div>
-    </form>
   </section>
 </template>
 

src/views/ContactAmountsView.vue

@@ -1,49 +1,18 @@
 <template>
-  <!-- QUICK NAV -->
+  <QuickNav selected="Contacts"></QuickNav>
-  <nav id="QuickNav" class="fixed bottom-0 left-0 right-0 bg-slate-200 z-50">
+  <section id="Content" class="p-6 pb-24">
-    <ul class="flex text-2xl p-2 gap-2">
+    <!-- Breadcrumb -->
-      <!-- Home Feed -->
+    <div id="ViewBreadcrumb" class="mb-8">
-      <li class="basis-1/5 rounded-md text-slate-500">
+      <h1 class="text-lg text-center font-light relative px-7">
-        <router-link :to="{ name: 'home' }" class="block text-center py-3 px-1"
+        <!-- Back -->
-          ><fa icon="house-chimney" class="fa-fw"></fa
-        ></router-link>
-      </li>
-      <!-- Search -->
-      <li class="basis-1/5 rounded-md text-slate-500">
-        <router-link
-          :to="{ name: 'discover' }"
-          class="block text-center py-3 px-1"
-          ><fa icon="magnifying-glass" class="fa-fw"></fa
-        ></router-link>
-      </li>
-      <!-- Contacts -->
-      <li class="basis-1/5 rounded-md text-slate-500">
-        <router-link
-          :to="{ name: 'projects' }"
-          class="block text-center py-3 px-1"
-          ><fa icon="folder-open" class="fa-fw"></fa
-        ></router-link>
-      </li>
-      <!-- Contacts -->
-      <li class="basis-1/5 rounded-md text-slate-500">
         <router-link
           :to="{ name: 'contacts' }"
-          class="block text-center py-3 px-1"
+          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          ><fa icon="users" class="fa-fw"></fa
+          ><fa icon="chevron-left" class="fa-fw"></fa
         ></router-link>
-      </li>
+      </h1>
-      <!-- Profile -->
+    </div>
-      <li class="basis-1/5 rounded-md text-slate-500">
-        <router-link
-          :to="{ name: 'account' }"
-          class="block text-center py-3 px-1"
-          ><fa icon="circle-user" class="fa-fw"></fa
-        ></router-link>
-      </li>
-    </ul>
-  </nav>
 
-  <section id="Content" class="p-6 pb-24">
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
       Given with {{ contact?.name }}
     </h1>
@@ -121,7 +90,6 @@ import * as R from "ramda";
 
 import { Component, Vue } from "vue-facing-decorator";
 import { accountsDB, db } from "@/db";
-import { AccountsSchema } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
@@ -134,8 +102,9 @@ import {
 import * as didJwt from "did-jwt";
 import { AxiosError } from "axios";
 import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
 
-@Component({ components: { AlertMessage } })
+@Component({ components: { AlertMessage, QuickNav } })
 export default class ContactsView extends Vue {
   activeDid = "";
   apiServer = "";
@@ -143,13 +112,11 @@ export default class ContactsView extends Vue {
   giveRecords: Array<GiveServerRecord> = [];
   alertTitle = "";
   alertMessage = "";
-  accounts: AccountsSchema;
   numAccounts = 0;
 
   async beforeCreate() {
-    accountsDB.open();
+    await accountsDB.open();
-    this.accounts = accountsDB.accounts;
+    this.numAccounts = await accountsDB.accounts.count();
-    this.numAccounts = await this.accounts.count();
   }
 
   public async getIdentity(activeDid) {
@@ -208,11 +175,7 @@ export default class ContactsView extends Vue {
         encodeURIComponent(identity.did) +
         "&recipientDid=" +
         encodeURIComponent(contact.did);
-      const token = await accessToken(identity);
+      const headers = this.getHeaders(identity);
-      const headers = {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + token,
-      };
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
         result = resp.data.data;
@@ -233,11 +196,7 @@ export default class ContactsView extends Vue {
         encodeURIComponent(contact.did) +
         "&recipientDid=" +
         encodeURIComponent(identity.did);
-      const token2 = await accessToken(identity);
+      const headers2 = await this.getHeaders(identity);
-      const headers2 = {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + token2,
-      };
       const resp2 = await this.axios.get(url2, { headers: headers2 });
       if (resp2.status === 200) {
         result = R.concat(result, resp2.data.data);
@@ -313,7 +272,6 @@ export default class ContactsView extends Vue {
 
       try {
         const resp = await this.axios.post(url, payload, { headers });
-        //console.log("Got resp data:", resp.data);
         if (resp.data?.success) {
           record.amountConfirmed = origClaim.object?.amountOfThisGood || 1;
         }

src/views/ContactGiftingView.vue

@@ -0,0 +1,265 @@
+<template>
+  <QuickNav selected="Home"></QuickNav>
+  <!-- CONTENT -->
+  <section id="Content" class="p-6 pb-24">
+    <!-- Breadcrumb -->
+    <div id="ViewBreadcrumb" class="mb-8">
+      <h1 class="text-lg text-center font-light relative px-7">
+        <!-- Back -->
+        <router-link
+          :to="{ name: 'home' }"
+          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
+          ><fa icon="chevron-left" class="fa-fw"></fa
+        ></router-link>
+
+        Give to Contacts
+      </h1>
+    </div>
+
+    <!-- Quick Search -->
+
+    <!-- Initial Loading Animation -->
+
+    <!-- Results List -->
+    <ul class="border-t border-slate-300">
+      <li class="border-b border-slate-300 py-3">
+        <h2 class="text-base flex gap-4 items-center">
+          <span class="grow italic"
+            ><fa icon="question-circle" class="fa-fw fa-xl text-slate-400"></fa>
+            Anonymous
+          </span>
+          <span class="text-right">
+            <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"
+            >
+              <fa icon="gift" class="fa-fw"></fa>
+            </button>
+          </span>
+        </h2>
+      </li>
+      <li
+        v-for="contact in allContacts"
+        :key="contact.did"
+        class="border-b border-slate-300 py-3"
+      >
+        <h2 class="text-base flex gap-4 items-center">
+          <span class="grow font-semibold"
+            ><fa icon="user" class="fa-fw fa-xl text-slate-400"></fa>
+            {{ contact.name || "(no name)" }}
+          </span>
+          <span class="text-right">
+            <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"
+            >
+              <fa icon="gift" class="fa-fw"></fa>
+            </button>
+          </span>
+        </h2>
+      </li>
+    </ul>
+
+    <GiftedDialog
+      ref="customDialog"
+      @dialog-result="handleDialogResult"
+      message="Received from"
+    >
+    </GiftedDialog>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
+  </section>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-facing-decorator";
+import GiftedDialog from "@/components/GiftedDialog.vue";
+import { db, accountsDB } from "@/db";
+import { AccountsSchema } from "@/db/tables/accounts";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
+import { createAndSubmitGive } from "@/libs/endorserServer";
+import { Account } from "@/db/tables/accounts";
+import { Contact } from "@/db/tables/contacts";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
+
+@Component({
+  components: { GiftedDialog, AlertMessage, QuickNav },
+})
+export default class HomeView extends Vue {
+  activeDid = "";
+  allAccounts: Array<Account> = [];
+  allContacts: Array<Contact> = [];
+  apiServer = "";
+  isHiddenSpinner = true;
+  alertTitle = "";
+  alertMessage = "";
+  accounts: AccountsSchema;
+  numAccounts = 0;
+
+  async beforeCreate() {
+    accountsDB.open();
+    this.accounts = accountsDB.accounts;
+    this.numAccounts = await this.accounts.count();
+  }
+
+  public async getIdentity(activeDid) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load Give records with no identity available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
+  async created() {
+    try {
+      await accountsDB.open();
+      this.allAccounts = await accountsDB.accounts.toArray();
+      await db.open();
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+      this.apiServer = settings?.apiServer || "";
+      this.activeDid = settings?.activeDid || "";
+      this.allContacts = await db.contacts.toArray();
+      this.feedLastViewedId = settings?.lastViewedClaimId;
+      this.updateAllFeed();
+    } catch (err) {
+      this.alertTitle = "Error";
+      this.alertMessage =
+        err.userMessage ||
+        "There was an error retrieving the latest sweet, sweet action.";
+    }
+  }
+
+  public async buildHeaders() {
+    const headers = { "Content-Type": "application/json" };
+
+    if (this.activeDid) {
+      await accountsDB.open();
+      const allAccounts = await accountsDB.accounts.toArray();
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
+      const identity = JSON.parse(account?.identity || "null");
+
+      if (!identity) {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service.",
+        );
+      }
+
+      headers["Authorization"] = "Bearer " + (await accessToken(identity));
+    } else {
+      // it's OK without auth... we just won't get any identifiers
+    }
+    return headers;
+  }
+
+  openDialog(giver) {
+    this.$refs.customDialog.open(giver);
+  }
+
+  handleDialogResult(result) {
+    if (result.action === "confirm") {
+      return new Promise((resolve) => {
+        this.recordGive(result.contact?.did, result.description, result.hours);
+        resolve();
+      });
+    } else {
+      // action was "cancel" so do nothing
+    }
+  }
+
+  /**
+   *
+   * @param giverDid may be null
+   * @param description may be an empty string
+   * @param hours may be 0
+   */
+  public async recordGive(giverDid, description, hours) {
+    if (!this.activeDid) {
+      this.setAlert(
+        "Error",
+        "You must select an identity before you can record a give.",
+      );
+      return;
+    }
+
+    if (!description && !hours) {
+      this.setAlert(
+        "Error",
+        "You must enter a description or some number of hours.",
+      );
+      return;
+    }
+
+    try {
+      const identity = await this.getIdentity(this.activeDid);
+      const result = await createAndSubmitGive(
+        this.axios,
+        this.apiServer,
+        identity,
+        giverDid,
+        this.activeDid,
+        description,
+        hours,
+      );
+
+      if (isGiveCreationError(result)) {
+        const errorMessage = getGiveCreationErrorMessage(result);
+        console.log("Error with give result:", result);
+        this.setAlert(
+          "Error",
+          errorMessage || "There was an error recording the give.",
+        );
+      } else {
+        this.setAlert("Success", "That gift was recorded.");
+      }
+    } catch (error) {
+      console.log("Error with give caught:", error);
+      this.setAlert(
+        "Error",
+        getGiveErrorMessage(error) || "There was an error recording the give.",
+      );
+    }
+  }
+
+  private setAlert(title, message) {
+    this.alertTitle = title;
+    this.alertMessage = message;
+  }
+
+  // Helper functions for readability
+
+  isGiveCreationError(result) {
+    return result.status !== 201 || result.data?.error;
+  }
+
+  getGiveCreationErrorMessage(result) {
+    return result.data?.error?.message;
+  }
+
+  getGiveErrorMessage(error) {
+    return error.userMessage || error.response?.data?.error?.message;
+  }
+}
+</script>

src/views/ContactQRScanShowView.vue

@@ -37,6 +37,8 @@ import QuickNav from "@/components/QuickNav";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
+alertTitle = "";
+alertMessage = "";
 
 @Component({
   components: {
@@ -110,9 +112,5 @@ export default class ContactQRScanShow extends Vue {
       this.qrValue = viewPrefix + vcJwt;
     }
   }
-
-  // This same popup code is in many files.
-  alertTitle = "";
-  alertMessage = "";
 }
 </script>

src/views/ContactScanView.vue

@@ -14,75 +14,69 @@
       </h1>
     </div>
 
-    <form>
+    <h3 class="text-sm uppercase font-semibold mb-2">Scan a QR Code…</h3>
-      <h3 class="text-sm uppercase font-semibold mb-2">Scan a QR Code…</h3>
+    <div class="bg-black rounded overflow-hidden relative mb-4">
-      <div class="bg-black rounded overflow-hidden relative mb-4">
+      <img src="https://picsum.photos/400/400?random=1" class="w-full" />
-        <img src="https://picsum.photos/400/400?random=1" class="w-full" />
 
-        <!-- Darken overlay -->
+      <!-- Darken overlay -->
-        <!-- Top -->
+      <!-- Top -->
-        <div class="absolute top-0 left-0 right-0 bg-black/50 h-1/4"></div>
+      <div class="absolute top-0 left-0 right-0 bg-black/50 h-1/4"></div>
-        <!-- Reft -->
+      <!-- Reft -->
-        <div class="absolute top-1/4 bottom-1/4 left-0 bg-black/50 w-1/4"></div>
+      <div class="absolute top-1/4 bottom-1/4 left-0 bg-black/50 w-1/4"></div>
-        <!-- Right -->
+      <!-- Right -->
-        <div
+      <div class="absolute top-1/4 bottom-1/4 right-0 bg-black/50 w-1/4"></div>
-          class="absolute top-1/4 bottom-1/4 right-0 bg-black/50 w-1/4"
+      <!-- Bottom -->
-        ></div>
+      <div class="absolute bottom-0 left-0 right-0 bg-black/50 h-1/4"></div>
-        <!-- Bottom -->
-        <div class="absolute bottom-0 left-0 right-0 bg-black/50 h-1/4"></div>
 
-        <!-- Reticle overlay -->
+      <!-- Reticle overlay -->
-        <!-- Top-left -->
+      <!-- Top-left -->
-        <div
+      <div
-          class="absolute top-1/4 left-1/4 h-6 w-6 border-white border-t-4 border-l-4 drop-shadow"
+        class="absolute top-1/4 left-1/4 h-6 w-6 border-white border-t-4 border-l-4 drop-shadow"
-        ></div>
+      ></div>
-        <!-- Top-right -->
+      <!-- Top-right -->
-        <div
+      <div
-          class="absolute top-1/4 right-1/4 h-6 w-6 border-white border-t-4 border-r-4 drop-shadow"
+        class="absolute top-1/4 right-1/4 h-6 w-6 border-white border-t-4 border-r-4 drop-shadow"
-        ></div>
+      ></div>
-        <!-- Bottom-left -->
+      <!-- Bottom-left -->
-        <div
+      <div
-          class="absolute bottom-1/4 left-1/4 h-6 w-6 border-white border-b-4 border-l-4 drop-shadow"
+        class="absolute bottom-1/4 left-1/4 h-6 w-6 border-white border-b-4 border-l-4 drop-shadow"
-        ></div>
+      ></div>
-        <!-- Bottom-right -->
+      <!-- Bottom-right -->
-        <div
+      <div
-          class="absolute bottom-1/4 right-1/4 h-6 w-6 border-white border-b-4 border-r-4 drop-shadow"
+        class="absolute bottom-1/4 right-1/4 h-6 w-6 border-white border-b-4 border-r-4 drop-shadow"
-        ></div>
+      ></div>
-      </div>
+    </div>
 
-      <h3 class="text-sm uppercase font-semibold mb-2">
+    <h3 class="text-sm uppercase font-semibold mb-2">…or Enter Contact Data</h3>
-        …or Enter Contact Data
+    <input
-      </h3>
+      type="text"
+      placeholder="Name (optional)"
+      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+    />
+    <input
+      type="text"
+      placeholder="ID"
+      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+    />
+    <input
+      type="text"
+      placeholder="Public Key (optional)"
+      class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
+    />
+
+    <div class="mt-8">
       <input
-        type="text"
+        type="submit"
-        placeholder="Name (optional)"
+        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-        class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+        value="Look Up Contact"
       />
-      <input
+      <button
-        type="text"
+        type="button"
-        placeholder="ID"
+        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 rounded border border-slate-400 mb-2 px-3 py-2"
+      >
-      />
+        Cancel
-      <input
+      </button>
-        type="text"
+    </div>
-        placeholder="Public Key (optional)"
-        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-      />
-
-      <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>
-    </form>
   </section>
 </template>
 

src/views/ContactsView.vue

@@ -140,12 +140,6 @@
                 >
                   {{ givenByMeDescriptions[contact.did] }}
                 </span>
-                <button
-                  class="text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-6"
-                  @click="onClickAddGive(activeDid, contact.did)"
-                >
-                  +
-                </button>
               </div>
               <div class="tooltip px-2">
                 from:
@@ -165,12 +159,6 @@
                 >
                   {{ givenToMeDescriptions[contact.did] }}
                 </span>
-                <button
-                  class="text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-6"
-                  @click="onClickAddGive(contact.did, activeDid)"
-                >
-                  +
-                </button>
               </div>
               <router-link
                 :to="{
@@ -179,6 +167,9 @@
                 }"
                 class="tooltip"
               >
+                <button>
+                  <fa icon="gift" class="pt-1 pr-2 text-slate-500" />Give
+                </button>
                 <fa icon="file-lines" class="text-slate-600 fa-fw ml-1" />
                 <span class="tooltiptext-left">See All Given Activity</span>
               </router-link>
@@ -212,12 +203,13 @@ import {
 import { Component, Vue } from "vue-facing-decorator";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
+import GiftedDialog from "@/components/GiftedDialog.vue";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
 
 @Component({
-  components: { AlertMessage, QuickNav },
+  components: { AlertMessage, QuickNav, GiftedDialog },
 })
 export default class ContactsView extends Vue {
   activeDid = "";
@@ -457,15 +449,10 @@ export default class ContactsView extends Vue {
         // Make the xhr request payload
         const payload = JSON.stringify({ jwtEncoded: vcJwt });
         const url = this.apiServer + "/api/v2/claim";
-        const token = await accessToken(identity);
+        const headers = await this.getHeaders(identity);
-        const headers = {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        };
 
         try {
           const resp = await this.axios.post(url, payload, { headers });
-          //console.log("Got resp data:", resp.data);
           if (resp.data?.success?.embeddedRecordError) {
             this.alertTitle = "Registration Still Unknown";
             let message = "There was some problem with the registration.";
@@ -684,15 +671,10 @@ export default class ContactsView extends Vue {
 
       const payload = JSON.stringify({ jwtEncoded: vcJwt });
       const url = this.apiServer + "/api/v2/claim";
-      const token = await accessToken(identity);
+      const headers = await this.getHeaders(identity);
-      const headers = {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + token,
-      };
 
       try {
         const resp = await this.axios.post(url, payload, { headers });
-        //console.log("Got resp data:", resp.data);
         if (resp.data?.success?.handleId) {
           this.alertTitle = "Done";
           this.alertMessage = "Successfully logged time to the server.";

src/views/DiscoverView.vue

@@ -30,109 +30,76 @@
         <li>
           <a
             href="#"
-            @click="searchLocal()"
+            @click="
-            class="inline-block py-3 rounded-t-lg border-b-2 active text-blue-600 border-blue-600 font-semibold"
+              projects = [];
+              searchLocal();
+            "
+            v-bind:class="computedLocalTabClassNames()"
           >
             Nearby
             <span
               class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
-              >20+</span
+              >{{ localCount }}</span
             >
           </a>
         </li>
         <li>
           <a
             href="#"
-            class="inline-block py-3 rounded-t-lg border-b-2 border-transparent hover:text-slate-600 hover:border-slate-300"
+            v-bind:class="computedRemoteTabClassNames()"
+            @click="
+              projects = [];
+              search();
+            "
           >
             Remote
             <span
               class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
-              >13</span
+              >{{ remoteCount }}</span
             >
           </a>
         </li>
       </ul>
     </div>
 
+    <!-- Loading Animation -->
+    <div
+      class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
+      v-if="isLoading"
+    >
+      <fa icon="spinner" class="fa-spin-pulse"></fa>
+    </div>
+
     <!-- Results List -->
-    <ul class="">
+    <InfiniteScroll @reached-bottom="loadMoreData">
-      <li class="border-b border-slate-300">
+      <ul>
-        <a
+        <li
-          @click="
+          class="border-b border-slate-300"
-            onClickLoadProject(
+          v-for="project in projects"
-              'https://endorser.ch/entity/01H3HER4DTNCR6ZC4VXA3VPWVQ',
+          :key="project.handleId"
-            )
-          "
-          class="block py-4 flex gap-4"
         >
-          <div class="w-12">
+          <a
-            <img
+            @click="onClickLoadProject(project.handleId)"
-              src="https://picsum.photos/200/200?random=1"
+            class="block py-4 flex gap-4"
-              class="w-full rounded"
+          >
-            />
+            <div class="w-12">
-          </div>
+              <img
-
+                src="https://picsum.photos/200/200?random=1"
-          <div class="grow">
+                class="w-full rounded"
-            <h2 class="text-base font-semibold">Canyon cleanup</h2>
+              />
-            <div class="text-sm">
-              <fa icon="user" class="fa-fw text-slate-400"></fa> Rotary
             </div>
-          </div>
-        </a>
-      </li>
 
-      <li class="border-b border-slate-300">
+            <div class="grow">
-        <a
+              <h2 class="text-base font-semibold">Canyon cleanup</h2>
-          @click="
+              <div class="text-sm">
-            onClickLoadProject(
+                <fa icon="user" class="fa-fw text-slate-400"></fa>
-              'https://endorser.ch/entity/01H3HER4DTNCR6ZC4VXA3VPWVQ',
+                {{ project.name }}
-            )
+              </div>
-          "
-          class="block py-4 flex gap-4"
-        >
-          <div class="w-12">
-            <img
-              src="https://picsum.photos/200/200?random=2"
-              class="w-full rounded"
-            />
-          </div>
-
-          <div class="grow">
-            <h2 class="text-base font-semibold">Potluck with neighbors</h2>
-            <div class="text-sm">
-              <fa icon="user" class="fa-fw text-slate-400"></fa> Andrew A.
             </div>
-          </div>
+          </a>
-        </a>
+        </li>
-      </li>
+      </ul>
-
+    </InfiniteScroll>
-      <li class="border-b border-slate-300">
-        <a
-          @click="
-            onClickLoadProject(
-              'https://endorser.ch/entity/01H3HER4DTNCR6ZC4VXA3VPWVQ',
-            )
-          "
-          class="block py-4 flex gap-4"
-        >
-          <div class="w-12">
-            <img
-              src="https://picsum.photos/200/200?random=3"
-              class="w-full rounded"
-            />
-          </div>
-
-          <div class="grow">
-            <h2 class="text-base font-semibold">Historical site</h2>
-            <div class="text-sm">
-              <fa icon="user" class="fa-fw text-slate-400 mr-1"></fa>
-              <em>Unknown</em>
-            </div>
-          </div>
-        </a>
-      </li>
-    </ul>
     <AlertMessage
       :alertTitle="alertTitle"
       :alertMessage="alertMessage"
@@ -148,9 +115,10 @@ import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
+import InfiniteScroll from "@/components/InfiniteScroll";
 
 @Component({
-  components: { AlertMessage, QuickNav },
+  components: { AlertMessage, QuickNav, InfiniteScroll },
 })
 export default class DiscoverView extends Vue {
   activeDid = "";
@@ -158,12 +126,19 @@ export default class DiscoverView extends Vue {
   searchTerms = "";
   alertMessage = "";
   alertTitle = "";
+  projects: ProjectData[] = [];
+  isLocalActive = true;
+  isRemoteActive = false;
+  localCount = 0;
+  remoteCount = 0;
+  isLoading = false;
 
   async mounted() {
     await db.open();
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
+    this.searchLocal();
   }
 
   public async buildHeaders() {
@@ -188,15 +163,21 @@ export default class DiscoverView extends Vue {
     return headers;
   }
 
-  public async search() {
+  public async search(beforeId?: string) {
-    const claimContents =
+    let queryParams = "claimContents=" + encodeURIComponent(this.searchTerms);
-      "claimContents=" + encodeURIComponent(this.searchTerms);
+
-    const claimType = "claimType=PlanAction";
+    console.log(beforeId);
-    const queryParams = [claimContents, claimType].join("&");
+    if (beforeId) {
+      queryParams = queryParams + `&beforeId=${beforeId}`;
+    }
+
+    this.isRemoteActive = true;
+    this.isLocalActive = false;
 
     try {
+      this.isLoading = true;
       const response = await fetch(
-        this.apiServer + "/api/v2/report/claims?" + queryParams,
+        this.apiServer + "/api/v2/report/plans?" + queryParams,
         {
           method: "GET",
           headers: await this.buildHeaders(),
@@ -210,8 +191,14 @@ export default class DiscoverView extends Vue {
 
       const results = await response.json();
 
-      if (results.data) {
+      const plans: ProjectData[] = results.data;
-        console.log("Plans found in that search:", results.data);
+      if (plans) {
+        for (const plan of plans) {
+          const { name, description, handleId = plan.handleId, rowid } = plan;
+          console.log("here");
+          this.projects.push({ name, description, handleId, rowid });
+        }
+        this.remoteCount = this.projects.length;
       } else {
         throw JSON.stringify(results);
       }
@@ -220,13 +207,15 @@ export default class DiscoverView extends Vue {
       this.alertMessage =
         e.userMessage || "There was an error retrieving projects.";
       this.alertTitle = "Error";
+    } finally {
+      this.isLoading = false;
     }
   }
 
-  public async searchLocal() {
+  public async searchLocal(beforeId?: string) {
     const claimContents =
       "claimContents=" + encodeURIComponent(this.searchTerms);
-    const queryParams = [
+    let queryParams = [
       claimContents,
       "minLocLat=40.901000",
       "maxLocLat=40.904000",
@@ -234,7 +223,14 @@ export default class DiscoverView extends Vue {
       "eastLocLon=-111.909000",
     ].join("&");
 
+    if (beforeId) {
+      queryParams = queryParams + `&beforeId=${beforeId}`;
+    }
+
     try {
+      this.isLoading = true;
+      this.isLocalActive = true;
+      this.isRemoteActive = false;
       const response = await fetch(
         this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
         {
@@ -250,7 +246,18 @@ export default class DiscoverView extends Vue {
       const results = await response.json();
 
       if (results.data) {
-        console.log("Plans found in that location:", results.data);
+        if (beforeId) {
+          const plans: ProjectData[] = results.data;
+          for (const plan of plans) {
+            const { name, description, handleId = plan.handleId, rowid } = plan;
+            if (beforeId !== plan["rowid"]) {
+              this.projects.push({ name, description, handleId, rowid });
+            }
+          }
+        } else {
+          this.projects = results.data;
+        }
+        this.localCount = this.projects.length;
       } else {
         throw JSON.stringify(results);
       }
@@ -259,6 +266,25 @@ export default class DiscoverView extends Vue {
       this.alertMessage =
         e.userMessage || "There was an error retrieving projects.";
       this.alertTitle = "Error";
+    } finally {
+      this.isLoading = false;
+    }
+  }
+
+  /**
+   * Data loader used by infinite scroller
+   * @param payload is the flag from the InfiniteScroll indicating if it should load
+   **/
+  async loadMoreData(payload: boolean) {
+    if (this.projects.length > 0 && payload) {
+      const latestProject = this.projects[this.projects.length - 1];
+      console.log("rowid", latestProject, payload);
+      console.log(Object.keys(latestProject));
+      if (this.isLocalActive) {
+        this.searchLocal(latestProject["rowid"]);
+      } else if (this.isRemoteActive) {
+        this.search(latestProject["rowid"]);
+      }
     }
   }
 
@@ -273,5 +299,37 @@ export default class DiscoverView extends Vue {
     };
     this.$router.push(route);
   }
+
+  public computedLocalTabClassNames() {
+    return {
+      "inline-block": true,
+      "py-3": true,
+      "rounded-t-lg": true,
+      "border-b-2": true,
+      active: this.isLocalActive,
+      "text-blue-600": this.isLocalActive,
+      "border-blue-600": this.isLocalActive,
+      "font-semibold": this.isLocalActive,
+      "border-transparent": !this.isLocalActive,
+      "hover:text-slate-600": !this.isLocalActive,
+      "hover:border-slate-300": !this.isLocalActive,
+    };
+  }
+
+  public computedRemoteTabClassNames() {
+    return {
+      "inline-block": true,
+      "py-3": true,
+      "rounded-t-lg": true,
+      "border-b-2": true,
+      active: this.isRemoteActive,
+      "text-blue-600": this.isRemoteActive,
+      "border-blue-600": this.isRemoteActive,
+      "font-semibold": this.isRemoteActive,
+      "border-transparent": !this.isRemoteActive,
+      "hover:text-slate-600": !this.isRemoteActive,
+      "hover:border-slate-300": !this.isRemoteActive,
+    };
+  }
 }
 </script>

src/views/HomeView.vue

@@ -7,22 +7,41 @@
     </h1>
 
     <div class="mb-8">
-      <h1 class="text-2xl">Quick Action</h1>
+      <h2 class="text-xl font-bold">Quick Action</h2>
-      <p>Choose a contact to whom to show appreciation:</p>
+      <p class="mb-4">Show appreciation to a contact:</p>
-      <!-- similar contact selection code is in multiple places -->
+
-      <div class="px-4">
+      <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
-        <button
+        <li
           v-for="contact in allContacts"
           :key="contact.did"
           @click="openDialog(contact)"
-          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
         >
-          {{ contact.name || "(no name)" }}
+          <div class="mb-1">
-        </button>
+            <fa icon="user" class="fa-fw fa-xl text-slate-400"></fa>
-        <span v-if="allContacts.length > 0">&nbsp;or&nbsp;</span>
+          </div>
-        <button @click="openDialog()" class="text-blue-500">
+          <h3
-          someone not specified
+            class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-        </button>
+          >
+            {{ contact.name || contact.did }}
+          </h3>
+        </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>
     </div>
 
@@ -33,29 +52,27 @@
     >
     </GiftedDialog>
 
-    <div>
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-      <h1 class="text-2xl">Latest Activity</h1>
+      <h2 class="text-xl font-bold mb-4">Latest Activity</h2>
-      <span :class="{ hidden: isHiddenSpinner }">
+      <div :class="{ hidden: isHiddenSpinner }">
-        <fa icon="spinner" class="fa-spin-pulse"></fa>
+        <p class="text-slate-500 text-center italic mt-4 mb-4">
-        Loading&hellip;
+          <fa icon="spinner" class="fa-spin-pulse"></fa> Loading&hellip;
-      </span>
+        </p>
-      <ul>
+      </div>
+      <ul class="border-t border-slate-300">
         <li
           class="border-b border-slate-300 py-2"
           v-for="record in feedData"
           :key="record.jwtId"
         >
           <div
-            class="border-b border-dashed border-slate-400 text-orange-400 py-2 mb-2 font-bold uppercase text-sm"
+            class="border-b border-dashed border-slate-400 text-orange-400 pb-2 mb-2 font-bold uppercase text-sm"
             v-if="record.jwtId == feedLastViewedId"
           >
             You've seen all claims below:
           </div>
           <div class="flex">
-            <fa
+            <fa icon="gift" class="pt-1 pr-2 text-slate-500"></fa>
-              icon="gift"
-              class="fa-fw flex-none pt-1 pr-2 text-slate-500"
-            ></fa>
             <!-- icon values: "coins" = money; "clock" = time; "gift" = others -->
             <span class="">{{ this.giveDescription(record) }}</span>
           </div>
@@ -73,11 +90,9 @@
 import { Component, Vue } from "vue-facing-decorator";
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import { db, accountsDB } from "@/db";
-import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { createAndSubmitGive, didInfo } from "@/libs/endorserServer";
-import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
@@ -87,8 +102,8 @@ import QuickNav from "@/components/QuickNav";
 })
 export default class HomeView extends Vue {
   activeDid = "";
-  allAccounts: Array<Account> = [];
   allContacts: Array<Contact> = [];
+  allMyDids: Array<string> = [];
   apiServer = "";
   feedAllLoaded = false;
   feedData = [];
@@ -97,13 +112,11 @@ export default class HomeView extends Vue {
   isHiddenSpinner = true;
   alertTitle = "";
   alertMessage = "";
-  accounts: AccountsSchema;
   numAccounts = 0;
 
   async beforeCreate() {
-    accountsDB.open();
+    await accountsDB.open();
-    this.accounts = accountsDB.accounts;
+    this.numAccounts = await accountsDB.accounts.count();
-    this.numAccounts = await this.accounts.count();
   }
 
   public async getIdentity(activeDid) {
@@ -134,7 +147,9 @@ export default class HomeView extends Vue {
   async created() {
     try {
       await accountsDB.open();
-      this.allAccounts = await accountsDB.accounts.toArray();
+      const allAccounts = await accountsDB.accounts.toArray();
+      this.allMyDids = allAccounts.map((acc) => acc.did);
+
       await db.open();
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
       this.apiServer = settings?.apiServer || "";
@@ -231,14 +246,13 @@ export default class HomeView extends Vue {
     if (claim.claim) {
       claim = claim.claim;
     }
-
     // agent.did is for legacy data, before March 2023
     const giverDid =
       claim.agent?.identifier || claim.agent?.did || giveRecord.issuer;
     const giverInfo = didInfo(
       giverDid,
       this.activeDid,
-      this.allAccounts,
+      this.allMyDids,
       this.allContacts,
     );
     const gaveAmount = claim.object?.amountOfThisGood
@@ -251,7 +265,7 @@ export default class HomeView extends Vue {
         didInfo(
           gaveRecipientId,
           this.activeDid,
-          this.allAccounts,
+          this.allMyDids,
           this.allContacts,
         )
       : "";
@@ -273,7 +287,7 @@ export default class HomeView extends Vue {
   handleDialogResult(result) {
     if (result.action === "confirm") {
       return new Promise((resolve) => {
-        this.recordGive(result.contact?.did, result.description, result.hours);
+        this.recordGive(result.giver?.did, result.description, result.hours);
         resolve();
       });
     } else {
@@ -316,8 +330,8 @@ export default class HomeView extends Vue {
         hours,
       );
 
-      if (isGiveCreationError(result)) {
+      if (this.isGiveCreationError(result)) {
-        const errorMessage = getGiveCreationErrorMessage(result);
+        const errorMessage = this.getGiveCreationErrorMessage(result);
         console.log("Error with give result:", result);
         this.setAlert(
           "Error",
@@ -330,7 +344,8 @@ export default class HomeView extends Vue {
       console.log("Error with give caught:", error);
       this.setAlert(
         "Error",
-        getGiveErrorMessage(error) || "There was an error recording the give.",
+        this.getGiveErrorMessage(error) ||
+          "There was an error recording the give.",
       );
     }
   }

src/views/IdentitySwitcherView.vue

@@ -0,0 +1,169 @@
+<template>
+  <QuickNav selected="Profile"></QuickNav>
+  <section id="Content" class="p-6 pb-24">
+    <!-- Breadcrumb -->
+    <div id="ViewBreadcrumb" class="mb-8">
+      <h1 class="text-lg text-center font-light relative px-7">
+        <!-- Cancel -->
+        <router-link
+          :to="{ name: 'account' }"
+          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
+          ><fa icon="chevron-left" class="fa-fw"></fa>
+        </router-link>
+
+        Switch Identity
+      </h1>
+    </div>
+
+    <!-- Identity List -->
+
+    <!-- Current Identity - Display First! -->
+    <div class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-4">
+      <fa icon="circle-check" class="fa-fw text-blue-600 text-xl mr-3"></fa>
+      <span class="overflow-hidden">
+        <h2 class="text-xl font-semibold mb-0">
+          {{ firstName }} {{ lastName }}
+        </h2>
+        <div class="text-sm text-slate-500 truncate">
+          <b>ID:</b> <code>{{ activeDid }}</code>
+        </div>
+      </span>
+    </div>
+
+    <!-- Other Identity/ies -->
+    <ul class="mb-4">
+      <li
+        class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-2"
+        v-for="ident in otherIdentities"
+        :key="ident.did"
+        @click="switchAccount(ident.did)"
+      >
+        <fa icon="circle" class="fa-fw text-slate-400 text-xl mr-3"></fa>
+        <span class="overflow-hidden">
+          <h2 class="text-xl font-semibold mb-0"></h2>
+          <div class="text-sm text-slate-500 truncate">
+            <b>ID:</b> <code>{{ ident.did }}</code>
+          </div>
+        </span>
+      </li>
+    </ul>
+
+    <!-- Actions -->
+    <router-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"
+    >
+      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"
+      @click="switchAccount('0')"
+    >
+      No Identity
+    </a>
+
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
+  </section>
+</template>
+<script lang="ts">
+import { Component, Vue } from "vue-facing-decorator";
+import { AppString } from "@/constants/app";
+import { db, accountsDB } from "@/db";
+import { AccountsSchema } from "@/db/tables/accounts";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";
+
+@Component({ components: { AlertMessage, QuickNav } })
+export default class IdentitySwitcherView extends Vue {
+  Constants = AppString;
+  public accounts: AccountsSchema;
+  public activeDid;
+  public firstName;
+  public lastName;
+  public alertTitle;
+  public alertMessage;
+  public otherIdentities = [];
+
+  public async getIdentity(activeDid) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse(account?.identity || "null");
+    return identity;
+  }
+
+  async created() {
+    try {
+      await db.open();
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+      this.activeDid = settings?.activeDid || "";
+      this.apiServer = settings?.apiServer || "";
+      this.apiServerInput = settings?.apiServer || "";
+      this.firstName = settings?.firstName || "No";
+      this.lastName = settings?.lastName || "Name";
+      this.showContactGives = !!settings?.showContactGivesInline;
+
+      const identity = await this.getIdentity(this.activeDid);
+
+      if (identity) {
+        db.settings.update(MASTER_SETTINGS_KEY, {
+          activeDid: identity.did,
+        });
+      }
+      await accountsDB.open();
+      const accounts = await accountsDB.accounts.toArray();
+      for (let n = 0; n < accounts.length; n++) {
+        const did = JSON.parse(accounts[n].identity)["did"];
+        if (did && this.activeDid !== did) {
+          this.otherIdentities.push({ did: did });
+        }
+      }
+    } catch (err) {
+      if (
+        err.message ===
+        "Attempted to load account records with no identity available."
+      ) {
+        this.limitsMessage = "No identity.";
+        this.loadingLimits = false;
+      } else {
+        this.alertMessage =
+          "Clear your cache and start over (after data backup).";
+        console.error(
+          "Telling user to clear cache at page create because:",
+          err,
+        );
+        this.alertTitle = "Error Creating Account";
+      }
+    }
+  }
+
+  async switchAccount(did: string) {
+    // 0 means none
+    if (did === "0") {
+      did = undefined;
+    }
+    await db.open();
+    db.settings.update(MASTER_SETTINGS_KEY, {
+      activeDid: did,
+    });
+    this.activeDid = did;
+    this.otherIdentities = [];
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    for (let n = 0; n < accounts.length; n++) {
+      const did = JSON.parse(accounts[n].identity)["did"];
+      if (did && this.activeDid !== did) {
+        this.otherIdentities.push({ did: did });
+      }
+    }
+    this.$router.push({ name: "account" });
+  }
+}
+</script>

src/views/NewEditAccountView.vue

@@ -13,38 +13,37 @@
         [New/Edit] Identity
       </h1>
     </div>
-    <form>
-      <input
-        type="text"
-        placeholder="First Name"
-        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-        v-model="firstName"
-      />
-      <input
-        type="text"
-        placeholder="Last Name"
-        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-        v-model="lastName"
-      />
 
-      <div class="mt-8">
+    <input
-        <button
+      type="text"
-          type="button"
+      placeholder="First Name"
-          class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
+      class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-          @click="onClickSaveChanges()"
+      v-model="firstName"
-        >
+    />
-          Save Changes
+    <input
-        </button>
+      type="text"
-        <!-- SHOW ME instead while processing saving changes -->
+      placeholder="Last Name"
-        <button
+      class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-          type="button"
+      v-model="lastName"
-          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+    />
-          @click="onClickCancel()"
+
-        >
+    <div class="mt-8">
-          Cancel
+      <button
-        </button>
+        type="button"
-      </div>
+        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-    </form>
+        @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>
   </section>
 </template>
 

src/views/NewEditCommitmentView.vue

@@ -16,47 +16,44 @@
     </div>
 
     <!-- Project Details -->
-    <form>
+
-      <select
+    <select class="block w-full rounded border border-slate-400 mb-4 px-3 py-2">
-        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
+      <option disabled>Choose a commitment type…</option>
+      <option selected>Time</option>
+      <option>Cryptocurrency</option>
+      <option>Money</option>
+    </select>
+
+    <!-- Time amount -->
+    <div class="mb-4 flex items-stretch">
+      <input
+        type="number"
+        placeholder="0.0"
+        class="block w-full rounded-l border border-slate-400 px-3 py-2"
+      />
+      <span
+        class="px-4 py-2 rounded-r bg-slate-200 border border-l-0 border-slate-400"
+        >hours</span
       >
-        <option disabled>Choose a commitment type…</option>
+    </div>
-        <option selected>Time</option>
-        <option>Cryptocurrency</option>
-        <option>Money</option>
-      </select>
 
-      <!-- Time amount -->
+    <!-- Crypto amount -->
-      <div class="mb-4 flex items-stretch">
-        <input
-          type="number"
-          placeholder="0.0"
-          class="block w-full rounded-l border border-slate-400 px-3 py-2"
-        />
-        <span
-          class="px-4 py-2 rounded-r bg-slate-200 border border-l-0 border-slate-400"
-          >hours</span
-        >
-      </div>
 
-      <!-- Crypto amount -->
+    <!-- Money amount -->
 
-      <!-- Money amount -->
+    <div class="mt-8">
-
+      <input
-      <div class="mt-8">
+        type="submit"
-        <input
+        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-          type="submit"
+        value="Commit"
-          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="Commit"
+      <button
-        />
+        type="button"
-        <button
+        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-          type="button"
+      >
-          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+        Maybe Later
-        >
+      </button>
-          Maybe Later
+    </div>
-        </button>
-      </div>
-    </form>
   </section>
 </template>
 

src/views/NewEditProjectView.vue

@@ -76,21 +76,12 @@ import * as didJwt from "did-jwt";
 import { Component, Vue } from "vue-facing-decorator";
 
 import { accountsDB, db } from "@/db";
-import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
 import { useAppStore } from "@/store/app";
 import { IIdentifier } from "@veramo/core";
 import AlertMessage from "@/components/AlertMessage";
 
-interface VerifiableCredential {
-  "@context": string;
-  "@type": string;
-  name: string;
-  description: string;
-  identifier?: string;
-}
-
 @Component({
   components: { AlertMessage },
 })
@@ -100,13 +91,13 @@ export default class NewEditProjectView extends Vue {
   projectName = "";
   description = "";
   errorMessage = "";
-  accounts: AccountsSchema;
   numAccounts = 0;
+  alertTitle = "";
+  alertMessage = "";
 
   async beforeCreate() {
-    accountsDB.open();
+    await accountsDB.open();
-    this.accounts = accountsDB.accounts;
+    this.numAccounts = await accountsDB.accounts.count();
-    this.numAccounts = await this.accounts.count();
   }
 
   public async getIdentity(activeDid) {
@@ -290,9 +281,5 @@ export default class NewEditProjectView extends Vue {
   public onCancelClick() {
     this.$router.back();
   }
-
-  // This same popup code is in many files.
-  alertTitle = "";
-  alertMessage = "";
 }
 </script>

src/views/NewIdentifierView.vue

@@ -50,7 +50,6 @@ export default class AccountViewView extends Vue {
   loading = true;
 
   async mounted() {
-    await accountsDB.open();
     const mnemonic = generateSeed();
     // address is 0x... ETH address, without "did:eth:"
     const [address, privateHex, publicHex, derivationPath] =
@@ -58,6 +57,8 @@ export default class AccountViewView extends Vue {
 
     const newId = newIdentifier(address, publicHex, privateHex, derivationPath);
     const identity = JSON.stringify(newId);
+
+    await accountsDB.open();
     await accountsDB.accounts.add({
       dateCreated: new Date().toISOString(),
       derivationPath: derivationPath,

src/views/ProjectViewView.vue

@@ -12,27 +12,19 @@
         >
           <fa icon="chevron-left" class="fa-fw"></fa>
         </button>
-        <!-- Context Menu -->
-        <a
-          href=""
-          class="text-lg text-center px-2 py-1 absolute -right-2 -top-1"
-          ><fa icon="ellipsis-vertical" class="fa-fw"></fa
-        ></a>
-
         View Plan
       </h1>
     </div>
 
-    <div class="text-red-500">
-      {{ errorMessage }}
-    </div>
-
     <!-- Project Details -->
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
       <div>
         <h2 class="text-xl font-semibold">{{ name }}</h2>
         <div class="flex justify-between gap-4 text-sm mb-3">
-          <span><fa icon="user" class="fa-fw text-slate-400"></fa> Rotary</span>
+          <span
+            ><fa icon="user" class="fa-fw text-slate-400"></fa>
+            {{ issuer }}</span
+          >
           <span
             ><fa icon="calendar" class="fa-fw text-slate-400"></fa
             >{{ timeSince }}
@@ -57,6 +49,7 @@
         </div>
       </div>
       <button
+        v-if="issuer == activeDid"
         type="button"
         class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
         @click="onEditClick()"
@@ -105,7 +98,7 @@
               <div class="flex gap-2">
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
                 <span>{{
-                  didInfo(give.agentDid, activeDid, accounts, allContacts)
+                  didInfo(give.agentDid, activeDid, allMyDids, allContacts)
                 }}</span>
               </div>
               <div class="flex gap-2" v-if="give.amount">
@@ -127,7 +120,7 @@
               <div class="flex gap-2">
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
                 <span>{{
-                  didInfo(give.agentDid, activeDid, accounts, allContacts)
+                  didInfo(give.agentDid, activeDid, allMyDids, allContacts)
                 }}</span>
               </div>
               <div class="flex gap-2" v-if="give.amount">
@@ -164,7 +157,6 @@ import { Component, Vue } from "vue-facing-decorator";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import { accountsDB, db } from "@/db";
-import { AccountsSchema } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
@@ -180,30 +172,23 @@ import QuickNav from "@/components/QuickNav";
   components: { GiftedDialog, AlertMessage, QuickNav },
 })
 export default class ProjectViewView extends Vue {
-  accounts: AccountsSchema;
   activeDid = "";
   alertMessage = "";
   alertTitle = "";
+  allMyDids: Array<string> = [];
   allContacts: Array<Contact> = [];
   apiServer = "";
   description = "";
-  errorMessage = "";
   expanded = false;
   givesToThis: Array<GiveServerRecord> = [];
   givesByThis: Array<GiveServerRecord> = [];
   name = "";
-  numAccounts = 0;
+  issuer = "";
   projectId = localStorage.getItem("projectId") || ""; // handle ID
   timeSince = "";
   truncatedDesc = "";
   truncateLength = 40;
 
-  async beforeCreate() {
-    accountsDB.open();
-    this.accounts = accountsDB.accounts;
-    this.numAccounts = (await this.accounts?.count()) || 0;
-  }
-
   async created() {
     await db.open();
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
@@ -211,9 +196,11 @@ export default class ProjectViewView extends Vue {
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
 
-    this.accounts = accountsDB.accounts;
+    await accountsDB.open();
-    const accountsArr = await this.accounts?.toArray();
+    const accounts = accountsDB.accounts;
-    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    const accountsArr = await accounts?.toArray();
+    this.allMyDids = accountsArr.map((acc) => acc.did);
+    const account = accountsArr?.find((acc) => acc.did === this.activeDid);
     const identity = JSON.parse(account?.identity || "null");
     this.LoadProject(identity);
   }
@@ -252,8 +239,8 @@ export default class ProjectViewView extends Vue {
   }
 
   // Isn't there a better way to make this available to the template?
-  didInfo(did, activeDid, identities, contacts) {
+  didInfo(did, activeDid, dids, contacts) {
-    return didInfo(did, activeDid, identities, contacts);
+    return didInfo(did, activeDid, dids, contacts);
   }
 
   expandText() {
@@ -280,30 +267,29 @@ export default class ProjectViewView extends Vue {
     try {
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
-        // feel free to remove this; I haven't yet because it's helpful
-        console.log('Loaded project: ', resp.data);
         const startTime = resp.data.startTime;
         if (startTime != null) {
           const eventDate = new Date(startTime);
           const now = moment.now();
           this.timeSince = moment.utc(now).to(eventDate);
         }
+        this.issuer = resp.data.issuer;
         this.name = resp.data.claim?.name || "(no name)";
         this.description = resp.data.claim?.description || "(no description)";
         this.truncatedDesc = this.description.slice(0, this.truncateLength);
       } else if (resp.status === 404) {
         // actually, axios throws an error so we never get here
-        this.errorMessage = "That project does not exist.";
+        this.alertMessage = "That project does not exist.";
       }
     } catch (error: unknown) {
       const serverError = error as AxiosError;
       if (serverError.response?.status === 404) {
-        this.errorMessage = "That project does not exist.";
+        this.alertMessage = "That project does not exist.";
       } else {
-        this.errorMessage =
+        this.alertMessage =
           "Something went wrong retrieving that project." +
           " See logs for more info.";
-        console.error("Error retrieving project:", error);
+        console.error("Error retrieving project:", serverError.message);
       }
     }
 
@@ -316,13 +302,16 @@ export default class ProjectViewView extends Vue {
       if (resp.status === 200 && resp.data.data) {
         this.givesToThis = resp.data.data;
       } else {
-        this.errorMessage = "Failed to retrieve gives to this project.";
+        this.alertMessage = "Failed to retrieve gives to this project.";
       }
     } catch (error: unknown) {
-      console.error("Error retrieving gives to this project:", error);
       const serverError = error as AxiosError;
-      this.errorMessage =
+      this.alertMessage =
         "Something went wrong retrieving gives to this project.";
+      console.error(
+        "Error retrieving gives to this project:",
+        serverError.message,
+      );
     }
 
     const givesOutUrl =
@@ -334,13 +323,15 @@ export default class ProjectViewView extends Vue {
       if (resp.status === 200 && resp.data.data) {
         this.givesByThis = resp.data.data;
       } else {
-        this.errorMessage = "Failed to retrieve gives by this project.";
+        this.alertMessage = "Failed to retrieve gives by this project.";
       }
     } catch (error: unknown) {
-      console.error("Error retrieving gives by this project:", error);
       const serverError = error as AxiosError;
-      this.errorMessage =
+      this.alertMessage = "Something went wrong retrieving gives by project.";
-        "Something went wrong retrieving gives by project.";
+      console.error(
+        "Error retrieving gives by this project:",
+        serverError.message,
+      );
     }
   }
 

src/views/ProjectsView.vue

@@ -7,18 +7,17 @@
     </h1>
 
     <!-- Quick Search -->
-    <form id="QuickSearch" class="mb-4 flex">
+
-      <input
+    <input
-        type="text"
+      type="text"
-        placeholder="Search…"
+      placeholder="Search…"
-        class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
+      class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
-      />
+    />
-      <button
+    <button
-        class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
+      class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
-      >
+    >
-        <fa icon="magnifying-glass" class="fa-fw"></fa>
+      <fa icon="magnifying-glass" class="fa-fw"></fa>
-      </button>
+    </button>
-    </form>
 
     <!-- New Project -->
     <button
@@ -75,7 +74,6 @@
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 import { accountsDB, db } from "@/db";
-import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { IIdentifier } from "@veramo/core";
@@ -83,28 +81,6 @@ import InfiniteScroll from "@/components/InfiniteScroll";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
 
-/**
- * Represents data about a project
- **/
-interface ProjectData {
-  /**
-   * Name of the project
-   **/
-  name: string;
-  /**
-   * Description of the project
-   **/
-  description: string;
-  /**
-   * URL referencing information about the project
-   **/
-  handleId: string;
-  /**
-   * The Identier of the project
-   **/
-  rowid: string;
-}
-
 @Component({
   components: { InfiniteScroll, AlertMessage, QuickNav },
 })
@@ -115,13 +91,11 @@ export default class ProjectsView extends Vue {
   isLoading = false;
   alertTitle = "";
   alertMessage = "";
-  accounts: AccountsSchema;
   numAccounts = 0;
 
   async beforeCreate() {
-    accountsDB.open();
+    await accountsDB.open();
-    this.accounts = accountsDB.accounts;
+    this.numAccounts = await accountsDB.accounts.count();
-    this.numAccounts = await this.accounts.count();
   }
 
   /**

src/views/StatisticsView.vue

@@ -47,11 +47,6 @@ import { World } from "@/components/World/World.js";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
 
-interface WorldProperties {
-  startTime?: string;
-  endTime?: string;
-}
-
 @Component({ components: { AlertMessage, World, QuickNav } })
 export default class StatisticsView extends Vue {
   world: World;
@@ -62,7 +57,6 @@ export default class StatisticsView extends Vue {
   mounted() {
     try {
       const container = document.querySelector("#scene-container");
-      console.log(container);
       const newWorld = new World(container, this);
       newWorld.start();
       this.world = newWorld;