Merge branch 'master' into fix-contact-totals

Reviewed-on: trent_larson/kick-starter-for-time-pwa#49

package-lock.json

@@ -33,6 +33,7 @@
         "ethereum-cryptography": "^2.0.0",
         "ethereumjs-util": "^7.1.5",
         "ethr-did-resolver": "^8.0.0",
+        "jdenticon": "^3.2.0",
         "js-generate-password": "^0.1.9",
         "localstorage-slim": "^2.4.0",
         "luxon": "^3.3.0",
@@ -12049,6 +12050,14 @@
       "resolved": "https://registry.npmjs.org/canonicalize/-/canonicalize-2.0.0.tgz",
       "integrity": "sha512-ulDEYPv7asdKvqahuAY35c1selLdzDwHqugK92hfkzvlDCwXRRelDkR+Er33md/PtnpqHemgkuDPanZ4fiYZ8w=="
     },
+    "node_modules/canvas-renderer": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/canvas-renderer/-/canvas-renderer-2.2.1.tgz",
+      "integrity": "sha512-RrBgVL5qCEDIXpJ6NrzyRNoTnXxYarqm/cS/W6ERhUJts5UQtt/XPEosGN3rqUkZ4fjBArlnCbsISJ+KCFnIAg==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/case-sensitive-paths-webpack-plugin": {
       "version": "2.4.0",
       "resolved": "https://registry.npmmirror.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
@@ -17798,6 +17807,20 @@
       "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
       "dev": true
     },
+    "node_modules/jdenticon": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jdenticon/-/jdenticon-3.2.0.tgz",
+      "integrity": "sha512-z6Iq3fTODUMSOiR2nNYrqigS6Y0GvdXfyQWrUby7htDHvX7GNEwaWR4hcaL+FmhEgBe08Xkup/BKxXQhDJByPA==",
+      "dependencies": {
+        "canvas-renderer": "~2.2.0"
+      },
+      "bin": {
+        "jdenticon": "bin/jdenticon.js"
+      },
+      "engines": {
+        "node": ">=6.4.0"
+      }
+    },
     "node_modules/jest-environment-node": {
       "version": "29.5.0",
       "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.5.0.tgz",

package.json

@@ -33,6 +33,7 @@
     "ethereum-cryptography": "^2.0.0",
     "ethereumjs-util": "^7.1.5",
     "ethr-did-resolver": "^8.0.0",
+    "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
     "localstorage-slim": "^2.4.0",
     "luxon": "^3.3.0",

project.task.yaml

@@ -1,6 +1,8 @@
 
 tasks:
-- 01 add a location for a project via map pin
+- .2 bug - on contacts view, click on "to" & "from" and nothing happens
+- 01 add a location for a project via map pin :
+  - add with a "location" field containing this: { "geo":{ "@type":"GeoCoordinates", "latitude":40.883944, "longitude":-111.884787 } }
 - 04 search by a bounding box for local projects (see API by clicking on "Nearby")
 - 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:jose
 - 02 Fix images on projectview - allow choice of image from a pallete of images or a url image.
@@ -33,6 +35,8 @@ tasks:
 - .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist
 - .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?)
 - .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
+- .2 move 'switch identity' to the advanced section
+- .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164
 
 - Discuss whether the remaining tasks are worthwhile before MVP release.
 

src/components/EntityIcon.vue

@@ -0,0 +1,19 @@
+<template>
+  <div v-html="generateIdenticon()" class="w-fit"></div>
+</template>
+<script lang="ts">
+import { Vue, Component, Prop } from "vue-facing-decorator";
+import { toSvg } from "jdenticon";
+
+@Component
+export default class EntityIcon extends Vue {
+  @Prop entityId = "";
+  @Prop iconSize = "";
+
+  generateIdenticon() {
+    const svgString = toSvg(this.entityId, this.iconSize);
+    return svgString;
+  }
+}
+</script>
+<style scoped></style>

src/views/ContactAmountsView.vue

@@ -4,6 +4,11 @@
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
       Given with {{ contact?.name }}
     </h1>
+    <div class="flex justify-around">
+      <span />
+      <span class="justify-around">(Only 50 most recent)</span>
+      <span />
+    </div>
 
     <!-- Results List -->
     <div>
@@ -170,7 +175,7 @@ export default class ContactsView extends Vue {
         encodeURIComponent(identity.did) +
         "&recipientDid=" +
         encodeURIComponent(contact.did);
-      const headers = this.getHeaders(identity);
+      const headers = await this.getHeaders(identity);
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
         result = resp.data.data;

src/views/ContactGiftingView.vue

@@ -24,8 +24,12 @@
     <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"
+          <span class="grow italic text-slate-500"
-            ><fa icon="question-circle" class="fa-fw fa-xl text-slate-400"></fa>
+            ><EntityIcon
+              entityId="Anonymous"
+              :iconSize="32"
+              class="opacity-50 inline-block align-middle border border-dashed border-slate-400 bg-slate-200 rounded-md mr-1"
+            ></EntityIcon>
             Anonymous
           </span>
           <span class="text-right">
@@ -46,7 +50,11 @@
       >
         <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>
+            ><EntityIcon
+              :entityId="contact.did"
+              :iconSize="32"
+              class="inline-block align-middle border border-slate-300 rounded-md mr-1"
+            ></EntityIcon>
             {{ contact.name || "(no name)" }}
           </span>
           <span class="text-right">
@@ -87,9 +95,10 @@ import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: { GiftedDialog, AlertMessage, QuickNav },
+  components: { GiftedDialog, AlertMessage, QuickNav, EntityIcon },
 })
 export default class HomeView extends Vue {
   activeDid = "";

src/views/ContactsView.vue

@@ -66,18 +66,27 @@
               : "Unconfirmed"
           }}
         </button>
+        <br />
+        (Only hours shown)
+        <br />
+        (Only recent shown)
       </div>
     </div>
 
     <!-- Results List -->
     <ul v-if="contacts.length > 0" class="border-t border-slate-300">
       <li
-        class="border-b border-slate-300 py-4"
+        class="border-b border-slate-300 pt-2.5 pb-4"
         v-for="contact in contacts"
         :key="contact.did"
       >
         <div class="grow overflow-hidden">
           <h2 class="text-base font-semibold">
+            <EntityIcon
+              :entityId="contact.did"
+              :iconSize="24"
+              class="inline-block align-text-bottom border border-slate-300 rounded"
+            ></EntityIcon>
             {{ contact.name || "(no name)" }}
           </h2>
           <div class="text-sm truncate">{{ contact.did }}</div>
@@ -135,9 +144,12 @@
               <fa icon="trash-can" class="fa-fw" />
             </button>
 
-            <div v-if="showGiveNumbers" class="ml-auto flex gap-1.5">
+            <div
+              v-if="showGiveNumbers && contact.did != activeDid"
+              class="ml-auto flex gap-1.5"
+            >
               <button
-                class="text-sm uppercase bg-blue-600 text-white px-2 py-1.5 rounded-md"
+                class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded-l-md"
                 @click="onClickAddGive(activeDid, contact.did)"
                 title="givenByMeDescriptions[contact.did]"
               >
@@ -152,11 +164,11 @@
                         : (givenByMeUnconfirmed[contact.did] || 0)
                   /* eslint-enable prettier/prettier */
                 }}
-                <fa icon="plus" class="fa-fw" />
+                <fa icon="plus" />
               </button>
 
               <button
-                class="text-sm uppercase bg-blue-600 text-white px-2 py-1.5 rounded-md"
+                class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded-r-md -ml-1.5 border-l border-blue-400"
                 @click="onClickAddGive(contact.did, activeDid)"
                 title="givenToMeDescriptions[contact.did]"
               >
@@ -171,7 +183,7 @@
                         : (givenToMeUnconfirmed[contact.did] || 0)
                   /* eslint-enable prettier/prettier */
                 }}
-                <fa icon="plus" class="fa-fw" />
+                <fa icon="plus" />
               </button>
 
               <router-link
@@ -214,12 +226,13 @@ import {
 import { Component, Vue } from "vue-facing-decorator";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
 
 @Component({
-  components: { AlertMessage, QuickNav },
+  components: { AlertMessage, QuickNav, EntityIcon },
 })
 export default class ContactsView extends Vue {
   activeDid = "";
@@ -294,20 +307,27 @@ export default class ContactsView extends Vue {
   }
 
   async loadGives() {
-    const handleResponse = (resp, descriptions, confirmed, unconfirmed) => {
+    const handleResponse = (
+      resp,
+      descriptions,
+      confirmed,
+      unconfirmed,
+      useRecipient,
+    ) => {
       if (resp.status === 200) {
         const allData = resp.data.data;
         for (const give of allData) {
+          const otherDid = useRecipient ? give.recipientDid : give.agentDid;
           if (give.unit === "HUR") {
             if (give.amountConfirmed) {
-              const prevAmount = confirmed[give.agentDid] || 0;
+              const prevAmount = confirmed[otherDid] || 0;
-              confirmed[give.agentDid] = prevAmount + give.amount;
+              confirmed[otherDid] = prevAmount + give.amount;
             } else {
-              const prevAmount = unconfirmed[give.agentDid] || 0;
+              const prevAmount = unconfirmed[otherDid] || 0;
-              unconfirmed[give.agentDid] = prevAmount + give.amount;
+              unconfirmed[otherDid] = prevAmount + give.amount;
             }
-            if (!descriptions[give.agentDid] && give.description) {
+            if (!descriptions[otherDid] && give.description) {
-              descriptions[give.agentDid] = give.description;
+              descriptions[otherDid] = give.description;
             }
           }
         }
@@ -334,17 +354,15 @@ export default class ContactsView extends Vue {
     };
 
     try {
-      const { headers, identity } = await this.getHeadersAndIdentity(
+      const { headers } = await this.getHeadersAndIdentity(this.activeDid);
-        this.activeDid,
-      );
       const givenByUrl =
         this.apiServer +
         "/api/v2/report/gives?agentDid=" +
-        encodeURIComponent(identity.did);
+        encodeURIComponent(this.activeDid);
       const givenToUrl =
         this.apiServer +
         "/api/v2/report/gives?recipientDid=" +
-        encodeURIComponent(identity.did);
+        encodeURIComponent(this.activeDid);
 
       const [givenByMeResp, givenToMeResp] = await Promise.all([
         this.axios.get(givenByUrl, { headers }),
@@ -359,6 +377,7 @@ export default class ContactsView extends Vue {
         givenByMeDescriptions,
         givenByMeConfirmed,
         givenByMeUnconfirmed,
+        true,
       );
       this.givenByMeDescriptions = givenByMeDescriptions;
       this.givenByMeConfirmed = givenByMeConfirmed;
@@ -372,6 +391,7 @@ export default class ContactsView extends Vue {
         givenToMeDescriptions,
         givenToMeConfirmed,
         givenToMeUnconfirmed,
+        false,
       );
       this.givenToMeDescriptions = givenToMeDescriptions;
       this.givenToMeConfirmed = givenToMeConfirmed;

src/views/DiscoverView.vue

@@ -83,13 +83,15 @@
             class="block py-4 flex gap-4"
           >
             <div class="w-12">
-              <img
+              <EntityIcon
-                src="https://picsum.photos/200/200?random=1"
+                :entityId="project.handleId"
-                class="w-full rounded"
+                :iconSize="48"
-              />
+                class="block border border-slate-300 rounded-md"
+              ></EntityIcon>
             </div>
 
             <div class="grow">
+              <h2 class="text-base font-semibold">{{ project.name }}</h2>
               <h2 class="text-base font-semibold">{{ project.name }}</h2>
               <div class="text-sm">
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
@@ -120,9 +122,10 @@ import { didInfo } from "@/libs/endorserServer";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
 import InfiniteScroll from "@/components/InfiniteScroll";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: { AlertMessage, QuickNav, InfiniteScroll },
+  components: { AlertMessage, QuickNav, InfiniteScroll, EntityIcon },
 })
 export default class DiscoverView extends Vue {
   activeDid = "";

src/views/HelpView.vue

@@ -128,6 +128,14 @@
         key.
       </p>
 
+      <h2 class="text-xl font-semibold">How do I create another identity?</h2>
+      <p>
+        Go
+        <router-link to="start" class="text-blue-500">
+          create another identity here.
+        </router-link>
+      </p>
+
       <h2 class="text-xl font-semibold">
         I know there is a record from someone, so why can't I see that info?
       </h2>
@@ -146,14 +154,6 @@
         page.
       </p>
 
-      <h2 class="text-xl font-semibold">How do I create another identity?</h2>
-      <p>
-        Go
-        <router-link to="start" class="text-blue-500">
-          create another identity here.
-        </router-link>
-      </p>
-
       <h2 class="text-xl font-semibold">What is your privacy policy?</h2>
       <p>
         See

src/views/HomeView.vue

@@ -104,9 +104,11 @@
           :key="contact.did"
           @click="openDialog(contact)"
         >
-          <div class="mb-1">
+          <EntityIcon
-            <fa icon="user" class="fa-fw fa-xl text-slate-400"></fa>
+            :entityId="contact.did"
-          </div>
+            :iconSize="64"
+            class="mx-auto border border-slate-300 rounded-md mb-1"
+          ></EntityIcon>
           <h3
             class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
           >
@@ -183,9 +185,10 @@ import { createAndSubmitGive, didInfo } from "@/libs/endorserServer";
 import { Contact } from "@/db/tables/contacts";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: { GiftedDialog, AlertMessage, QuickNav },
+  components: { GiftedDialog, AlertMessage, QuickNav, EntityIcon },
 })
 export default class HomeView extends Vue {
   activeDid = "";
@@ -348,7 +351,7 @@ export default class HomeView extends Vue {
     }
     // agent.did is for legacy data, before March 2023
     const giverDid =
-      claim.agent?.identifier || claim.agent?.did || giveRecord.issuer;
+      claim.agent?.identifier || claim.agent?.did;
     const giverInfo = didInfo(
       giverDid,
       this.activeDid,

src/views/ProjectViewView.vue

@@ -26,16 +26,28 @@
     <!-- Project Details -->
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
       <div>
+        <div class="block pb-4 flex gap-4">
+          <div class="flex-none w-16 pt-1">
+            <EntityIcon
+              :entityId="projectId"
+              :iconSize="64"
+              class="block border border-slate-300 rounded-md"
+            ></EntityIcon>
+          </div>
+
+          <div class="overflow-hidden">
             <h2 class="text-xl font-semibold">{{ name }}</h2>
-        <div class="flex justify-between gap-4 text-sm mb-3">
+            <div class="text-sm mb-3">
-          <span
+              <div class="truncate"
                 ><fa icon="user" class="fa-fw text-slate-400"></fa>
-            {{ issuer }}</span
+                {{ issuer }}</div
               >
-          <span
+              <div
                 ><fa icon="calendar" class="fa-fw text-slate-400"></fa
                 >{{ timeSince }}
-          </span>
+              </div>
+            </div>
+          </div>
         </div>
 
         <div class="text-sm text-slate-500">
@@ -183,9 +195,10 @@ import {
 } from "@/libs/endorserServer";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: { GiftedDialog, AlertMessage, QuickNav },
+  components: { GiftedDialog, AlertMessage, QuickNav, EntityIcon },
 })
 export default class ProjectViewView extends Vue {
   activeDid = "";

src/views/ProjectsView.vue

@@ -50,10 +50,11 @@
             class="block py-4 flex gap-4"
           >
             <div class="flex-none w-12">
-              <img
+              <EntityIcon
-                src="https://picsum.photos/200/200?random=1"
+                :entityId="project.handleId"
-                class="w-full rounded"
+                :iconSize="48"
-              />
+                class="inline-block align-middle border border-slate-300 rounded-md"
+              ></EntityIcon>
             </div>
 
             <div class="grow overflow-hidden">
@@ -82,9 +83,10 @@ import { IIdentifier } from "@veramo/core";
 import InfiniteScroll from "@/components/InfiniteScroll";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
+import EntityIcon from "@/components/EntityIcon";
 
 @Component({
-  components: { InfiniteScroll, AlertMessage, QuickNav },
+  components: { InfiniteScroll, AlertMessage, QuickNav, EntityIcon },
 })
 export default class ProjectsView extends Vue {
   apiServer = "";