From b6b7c56157053f1b76f61908a943530dfa52761e Mon Sep 17 00:00:00 2001
From: Matthew Raymer <matthew.raymer@anomalistdesign.com>
Date: Mon, 10 Jul 2023 18:03:51 +0800
Subject: [PATCH 1/4] DiscoverView searches almost done. Contact fixes
 ContactAmounts fix quick-nav Cleaning up ProjectView still more to do Hide
 advanced by default on StatisticsView project.task updated

---
 project.task.yaml                |   8 +-
 src/db/index.ts                  |   1 -
 src/views/AccountViewView.vue    | 237 +++++++++++++++++--------------
 src/views/ContactAmountsView.vue |  49 +------
 src/views/ContactsView.vue       |   2 -
 src/views/DiscoverView.vue       | 164 ++++++++++++---------
 src/views/ProjectViewView.vue    |  41 +++---
 src/views/StatisticsView.vue     |   1 -
 8 files changed, 255 insertions(+), 248 deletions(-)

diff --git a/project.task.yaml b/project.task.yaml
index 9c5a5cf4a..6a8a95457 100644
--- a/project.task.yaml
+++ b/project.task.yaml
@@ -1,13 +1,11 @@
 
 tasks:
-- .5 audit all console.log calls
 - 01 design ideas for simple gives on the Home page
 - 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
+- 02 Discover page - add infinite search
 - 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.
 
@@ -22,8 +20,6 @@ tasks:
 
 - refactor UI :
   - .5 Alerts show at the top and can be missed, eg. account data download
-  - .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
 
@@ -44,7 +40,7 @@ tasks:
 - Discuss whether the remaining tasks are worthwhile before MVP release.
 
 - 01 fix images on project page, on discovery page
-- .2 fix "Rotary" and static icon to the right on project page
+- .2 fix static icon to the right on project page (Matthew:  I've made "Rotary" into issuer?)
 
 - stats v1 :
   - 01 show numeric stats
diff --git a/src/db/index.ts b/src/db/index.ts
index 58bd23171..8091e5c84 100644
--- a/src/db/index.ts
+++ b/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);
 
diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index dfdddafe7..524e5c3cc 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -158,117 +158,126 @@
       </form>
     </dialog>
 
-    <h3 class="text-sm uppercase font-semibold mb-3">Advanced</h3>
-
-    <label
-      for="toggleShowAmounts"
-      class="flex items-center cursor-pointer mb-6"
-      @click="handleChange"
+    <h3
+      class="text-sm uppercase font-semibold mb-3"
+      @click="showAdvanced = !showAdvanced"
     >
-      <!-- toggle -->
-      <div class="relative">
-        <!-- input -->
+      Advanced
+    </h3>
+    <div v-if="showAdvanced">
+      <label
+        for="toggleShowAmounts"
+        class="flex items-center cursor-pointer mb-6"
+        @click="handleChange"
+      >
+        <!-- toggle -->
+        <div class="relative">
+          <!-- input -->
+          <input
+            type="checkbox"
+            v-model="showContactGives"
+            name="showContactGives"
+            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="checkbox"
-          v-model="showContactGives"
-          name="showContactGives"
-          class="sr-only"
+          type="text"
+          class="block w-full rounded border border-slate-400 px-3 py-2"
+          v-model="apiServerInput"
         />
-        <!-- 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>
+        <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>
 
-    <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 v-if="numAccounts > 0" class="flex py-2">
+        Switch Identifier
+        <span>
+          <button class="text-blue-500 px-2" @click="switchAccount(0)">
+            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 v-if="numAccounts > 0" class="flex py-2">
-      Switch Identifier
-      <span>
-        <button class="text-blue-500 px-2" @click="switchAccount(0)">
-          None
-        </button>
-      </span>
-      <span v-for="accountNum in numAccounts" :key="accountNum">
-        <button class="text-blue-500 px-2" @click="switchAccount(accountNum)">
-          #{{ accountNum }}
+      <div>
+        <button class="text-blue-500">
+          <router-link
+            :to="{ name: 'statistics' }"
+            class="block text-center py-3"
+          >
+            See Achievements & Statistics
+          </router-link>
         </button>
-      </span>
-    </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"
@@ -303,6 +312,12 @@ interface RateLimits {
   nextWeekBeginDateTime: string;
 }
 
+interface ErrorResponse {
+  error?: {
+    message?: string;
+  };
+}
+
 @Component({ components: { AlertMessage, QuickNav } })
 export default class AccountViewView extends Vue {
   Constants = AppString;
@@ -327,6 +342,8 @@ export default class AccountViewView extends Vue {
   showB64Copy = false;
   showPubCopy = false;
 
+  showAdvanced = false;
+
   public async getIdentity(activeDid) {
     await accountsDB.open();
     const account = await accountsDB.accounts
@@ -483,10 +500,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: any = serverError.response?.data;
-        this.limitsMessage = data?.error?.message || "Bad server response.";
+
+        const data: ErrorResponse | undefined =
+          serverError.response && serverError.response.data;
+        if (data && data.error && data.error.message) {
+          this.limitsMessage = data.error.message;
+        } else {
+          this.limitsMessage = "Bad server response.";
+        }
       }
     }
 
diff --git a/src/views/ContactAmountsView.vue b/src/views/ContactAmountsView.vue
index e45ce8478..641112d08 100644
--- a/src/views/ContactAmountsView.vue
+++ b/src/views/ContactAmountsView.vue
@@ -1,48 +1,5 @@
 <template>
-  <!-- QUICK NAV -->
-  <nav id="QuickNav" class="fixed bottom-0 left-0 right-0 bg-slate-200 z-50">
-    <ul class="flex text-2xl p-2 gap-2">
-      <!-- Home Feed -->
-      <li class="basis-1/5 rounded-md text-slate-500">
-        <router-link :to="{ name: 'home' }" class="block text-center py-3 px-1"
-          ><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"
-          ><fa icon="users" class="fa-fw"></fa
-        ></router-link>
-      </li>
-      <!-- Profile -->
-      <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>
-
+  <QuickNav selected="Contacts"></QuickNav>
   <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 }}
@@ -134,8 +91,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 = "";
@@ -313,7 +271,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;
         }
diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue
index 21f352f57..666215e96 100644
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -465,7 +465,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?.embeddedRecordError) {
             this.alertTitle = "Registration Still Unknown";
             let message = "There was some problem with the registration.";
@@ -692,7 +691,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?.handleId) {
           this.alertTitle = "Done";
           this.alertMessage = "Successfully logged time to the server.";
diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue
index 2bc861f68..14428ead8 100644
--- a/src/views/DiscoverView.vue
+++ b/src/views/DiscoverView.vue
@@ -31,39 +31,48 @@
           <a
             href="#"
             @click="searchLocal()"
-            class="inline-block py-3 rounded-t-lg border-b-2 active text-blue-600 border-blue-600 font-semibold"
+            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="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="">
-      <li class="border-b border-slate-300">
+    <ul v-if="projects.length > 0">
+      <li
+        class="border-b border-slate-300"
+        v-for="project in projects"
+        :key="project.handleId"
+      >
         <a
-          @click="
-            onClickLoadProject(
-              'https://endorser.ch/entity/01H3HER4DTNCR6ZC4VXA3VPWVQ',
-            )
-          "
+          @click="onClickLoadProject(project.handleId)"
           class="block py-4 flex gap-4"
         >
           <div class="w-12">
@@ -76,63 +85,14 @@
           <div class="grow">
             <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">
-        <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=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>
-      </li>
-
-      <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>
+              <fa icon="user" class="fa-fw text-slate-400"></fa>
+              {{ project.name }}
             </div>
           </div>
         </a>
       </li>
     </ul>
+    <p v-else>No projects found yet.</p>
     <AlertMessage
       :alertTitle="alertTitle"
       :alertMessage="alertMessage"
@@ -149,6 +109,28 @@ import { accessToken } from "@/libs/crypto";
 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: { AlertMessage, QuickNav },
 })
@@ -158,12 +140,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() {
@@ -194,7 +183,11 @@ export default class DiscoverView extends Vue {
     const claimType = "claimType=PlanAction";
     const queryParams = [claimContents, claimType].join("&");
 
+    this.isRemoteActive = true;
+    this.isLocalActive = false;
+
     try {
+      this.isLoading = true;
       const response = await fetch(
         this.apiServer + "/api/v2/report/claims?" + queryParams,
         {
@@ -211,7 +204,8 @@ export default class DiscoverView extends Vue {
       const results = await response.json();
 
       if (results.data) {
-        console.log("Plans found in that search:", results.data);
+        this.projects = results.data;
+        this.remoteCount = this.projects.length;
       } else {
         throw JSON.stringify(results);
       }
@@ -220,6 +214,8 @@ export default class DiscoverView extends Vue {
       this.alertMessage =
         e.userMessage || "There was an error retrieving projects.";
       this.alertTitle = "Error";
+    } finally {
+      this.isLoading = false;
     }
   }
 
@@ -235,6 +231,9 @@ export default class DiscoverView extends Vue {
     ].join("&");
 
     try {
+      this.isLoading = true;
+      this.isLocalActive = true;
+      this.isRemoteActive = false;
       const response = await fetch(
         this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
         {
@@ -250,7 +249,8 @@ export default class DiscoverView extends Vue {
       const results = await response.json();
 
       if (results.data) {
-        console.log("Plans found in that location:", results.data);
+        this.projects = results.data;
+        this.localCount = this.projects.length;
       } else {
         throw JSON.stringify(results);
       }
@@ -259,6 +259,8 @@ export default class DiscoverView extends Vue {
       this.alertMessage =
         e.userMessage || "There was an error retrieving projects.";
       this.alertTitle = "Error";
+    } finally {
+      this.isLoading = false;
     }
   }
 
@@ -273,5 +275,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>
diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue
index 8ceec6d77..188094361 100644
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -23,16 +23,15 @@
       </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 }}
@@ -187,11 +186,11 @@ export default class ProjectViewView extends Vue {
   allContacts: Array<Contact> = [];
   apiServer = "";
   description = "";
-  errorMessage = "";
   expanded = false;
   givesToThis: Array<GiveServerRecord> = [];
   givesByThis: Array<GiveServerRecord> = [];
   name = "";
+  issuer = "";
   numAccounts = 0;
   projectId = localStorage.getItem("projectId") || ""; // handle ID
   timeSince = "";
@@ -280,30 +279,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 +314,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 +335,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 =
-        "Something went wrong retrieving gives by project.";
+      this.alertMessage = "Something went wrong retrieving gives by project.";
+      console.error(
+        "Error retrieving gives by this project:",
+        serverError.message,
+      );
     }
   }
 
diff --git a/src/views/StatisticsView.vue b/src/views/StatisticsView.vue
index ec66cf796..0dcf2f57f 100644
--- a/src/views/StatisticsView.vue
+++ b/src/views/StatisticsView.vue
@@ -62,7 +62,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;

From fed23a61ee424c23df8bd4e8bbb02c39af71c39f Mon Sep 17 00:00:00 2001
From: Matthew Raymer <matthew.raymer@anomalistdesign.com>
Date: Mon, 10 Jul 2023 18:20:13 +0800
Subject: [PATCH 2/4] Remove HelloWorld and do sweeping

---
 src/components/HelloWorld.vue       | 146 ----------------------------
 src/views/AccountViewView.vue       |   6 +-
 src/views/ContactQRScanShowView.vue |   6 +-
 src/views/NewEditProjectView.vue    |   6 +-
 4 files changed, 6 insertions(+), 158 deletions(-)
 delete mode 100644 src/components/HelloWorld.vue

diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue
deleted file mode 100644
index ec7d2898e..000000000
--- a/src/components/HelloWorld.vue
+++ /dev/null
@@ -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>
diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index 524e5c3cc..2d63d4b8a 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -343,6 +343,8 @@ export default class AccountViewView extends Vue {
   showPubCopy = false;
 
   showAdvanced = false;
+  alertMessage = "";
+  alertTitle = "";
 
   public async getIdentity(activeDid) {
     await accountsDB.open();
@@ -560,9 +562,5 @@ export default class AccountViewView extends Vue {
   setApiServerInput(value) {
     this.apiServerInput = value;
   }
-
-  // This same popup code is in many files.
-  alertMessage = "";
-  alertTitle = "";
 }
 </script>
diff --git a/src/views/ContactQRScanShowView.vue b/src/views/ContactQRScanShowView.vue
index db8715da2..acef71f1d 100644
--- a/src/views/ContactQRScanShowView.vue
+++ b/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>
diff --git a/src/views/NewEditProjectView.vue b/src/views/NewEditProjectView.vue
index 94de7fc29..193899b39 100644
--- a/src/views/NewEditProjectView.vue
+++ b/src/views/NewEditProjectView.vue
@@ -102,6 +102,8 @@ export default class NewEditProjectView extends Vue {
   errorMessage = "";
   accounts: AccountsSchema;
   numAccounts = 0;
+  alertTitle = "";
+  alertMessage = "";
 
   async beforeCreate() {
     accountsDB.open();
@@ -290,9 +292,5 @@ export default class NewEditProjectView extends Vue {
   public onCancelClick() {
     this.$router.back();
   }
-
-  // This same popup code is in many files.
-  alertTitle = "";
-  alertMessage = "";
 }
 </script>

From cef346e487f28bb48e82beafd8cda510f5a1faaf Mon Sep 17 00:00:00 2001
From: Matthew Raymer <matthew.raymer@anomalistdesign.com>
Date: Mon, 10 Jul 2023 18:45:50 +0800
Subject: [PATCH 3/4] Move almost all interfaces to endorserServer.ts

---
 src/libs/endorserServer.ts       | 50 ++++++++++++++++++++++++++++++++
 src/views/AccountViewView.vue    | 15 ----------
 src/views/DiscoverView.vue       | 22 --------------
 src/views/NewEditProjectView.vue |  8 -----
 src/views/ProjectsView.vue       | 22 --------------
 src/views/StatisticsView.vue     |  5 ----
 6 files changed, 50 insertions(+), 72 deletions(-)

diff --git a/src/libs/endorserServer.ts b/src/libs/endorserServer.ts
index 0a8c38cff..fb6e30059 100644
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -197,3 +197,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;
+}
diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index 2d63d4b8a..a60c2af71 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -303,21 +303,6 @@ import QuickNav from "@/components/QuickNav";
 // 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;
-}
-
-interface ErrorResponse {
-  error?: {
-    message?: string;
-  };
-}
-
 @Component({ components: { AlertMessage, QuickNav } })
 export default class AccountViewView extends Vue {
   Constants = AppString;
diff --git a/src/views/DiscoverView.vue b/src/views/DiscoverView.vue
index 14428ead8..d2fab6153 100644
--- a/src/views/DiscoverView.vue
+++ b/src/views/DiscoverView.vue
@@ -109,28 +109,6 @@ import { accessToken } from "@/libs/crypto";
 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: { AlertMessage, QuickNav },
 })
diff --git a/src/views/NewEditProjectView.vue b/src/views/NewEditProjectView.vue
index 193899b39..3dc6633c9 100644
--- a/src/views/NewEditProjectView.vue
+++ b/src/views/NewEditProjectView.vue
@@ -83,14 +83,6 @@ 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 },
 })
diff --git a/src/views/ProjectsView.vue b/src/views/ProjectsView.vue
index cd4a2a265..3c5672adc 100644
--- a/src/views/ProjectsView.vue
+++ b/src/views/ProjectsView.vue
@@ -83,28 +83,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 },
 })
diff --git a/src/views/StatisticsView.vue b/src/views/StatisticsView.vue
index 0dcf2f57f..d98755332 100644
--- a/src/views/StatisticsView.vue
+++ b/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;

From 3f13d3ea3355fc6c1ccdfd6421b66ff30a282533 Mon Sep 17 00:00:00 2001
From: Matthew Raymer <matthew.raymer@anomalistdesign.com>
Date: Mon, 10 Jul 2023 19:03:20 +0800
Subject: [PATCH 4/4] CLeanup header creation

---
 src/views/ContactAmountsView.vue | 12 ++----------
 src/views/ContactsView.vue       | 12 ++----------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/views/ContactAmountsView.vue b/src/views/ContactAmountsView.vue
index 641112d08..ca01ea427 100644
--- a/src/views/ContactAmountsView.vue
+++ b/src/views/ContactAmountsView.vue
@@ -166,11 +166,7 @@ export default class ContactsView extends Vue {
         encodeURIComponent(identity.did) +
         "&recipientDid=" +
         encodeURIComponent(contact.did);
-      const token = await accessToken(identity);
-      const headers = {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + token,
-      };
+      const headers = this.getHeaders(identity);
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
         result = resp.data.data;
@@ -191,11 +187,7 @@ export default class ContactsView extends Vue {
         encodeURIComponent(contact.did) +
         "&recipientDid=" +
         encodeURIComponent(identity.did);
-      const token2 = await accessToken(identity);
-      const headers2 = {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + token2,
-      };
+      const headers2 = await this.getHeaders(identity);
       const resp2 = await this.axios.get(url2, { headers: headers2 });
       if (resp2.status === 200) {
         result = R.concat(result, resp2.data.data);
diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue
index 666215e96..57b69cf0f 100644
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -457,11 +457,7 @@ 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 = {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        };
+        const headers = await this.getHeaders(identity);
 
         try {
           const resp = await this.axios.post(url, payload, { headers });
@@ -683,11 +679,7 @@ 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 = {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + token,
-      };
+      const headers = await this.getHeaders(identity);
 
       try {
         const resp = await this.axios.post(url, payload, { headers });