fix local & remote search to work, fix beforeId check, fix handleId setting

Merge pull request 'Integrating InfiniteScroll to the Discovery view' (#39 ) from discover-infinite-scroll into master
Reviewed-on: trent_larson/kick-starter-for-time-pwa#39
2023-07-11 21:16:57 -06:00 · 2023-07-11 21:19:49 -04:00 · 2023-07-11 21:19:20 -04:00 · 2023-07-11 21:10:33 -04:00 · 2023-07-11 21:03:39 -04:00 · 2023-07-11 08:40:44 -06:00
13 changed files with 384 additions and 514 deletions
--- a/project.task.yaml
+++ b/project.task.yaml
@@ -1,33 +1,31 @@

 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
- 08 search by location, endpoint, etc assignee:trent
- 01 add a location for a project via map pin (see API by clicking on "Nearby")
+- 02 Discover page - add infinite search
+- 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 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
+- 01 Replace Gifted/Give in ContactsView with GiftedDialog
+- 02 Fix images on projectview: allow choice of image from a pallete of images or a url image.

 - 08 Scan QR code to import into contacts.

 - contacts v1 :
  - 01 Import contact info a la QR code.
-  - 01 Import all the non-sensitive data (ie. contacts & settings).
  - .2 move all "identity" references to temporary account access assignee:trent

 - contacts v+ :
+  - 01 Import all the non-sensitive data (ie. contacts & settings).
  - .2 show error to user when adding a duplicate contact
  - 01 parse input more robustly (with CSV lib and not commas)

 - 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
+  - .5 Alerts show at the top and can be missed if you've scrolled down on the page, eg. account data download
+  - .2 Make alerts at the top more visible (because they're currently a similar color and sometimes aren't seen)

- show pop-up confirming that settings & contacts have been downloaded
+- Show pop-up or some message confirming that settings & contacts download has been initiated/finished

- Ensure each action sent to the server has a confirmation - registration
+- Ensure each action sent to the server has a confirmation - eg registration

 - Home Feed & Quick Give screen :
  - 01 save the feed-viewed status in settings storage ("afterQuery")
@@ -44,7 +42,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
--- a/src/components/HelloWorld.vue
+++ b/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>
--- 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);

--- 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;
+}
--- a/src/views/AccountViewView.vue
+++ b/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>
@@ -153,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 -->
-        <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="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()"
+      Advanced
+    </h3>
+    <div v-if="showAdvanced">
+      <label
+        for="toggleShowAmounts"
+        class="flex items-center cursor-pointer mb-6"
+        @click="handleChange"
      >
-        <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>
+        <!-- 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 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>
-      <button class="text-blue-500">
-        <router-link
-          :to="{ name: 'statistics' }"
-          class="block text-center py-3"
+      <div class="flex py-2">
+        <button
+          class="text-center text-md text-blue-500"
+          @click="checkLimits()"
        >
-          See Achievements & Statistics
-        </router-link>
-      </button>
+          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>
+        </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>
+        <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"
@@ -289,15 +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;
-}
-
@Component({ components: { AlertMessage, QuickNav } })
 export default class AccountViewView extends Vue {
  Constants = AppString;
@@ -322,6 +327,10 @@ export default class AccountViewView extends Vue {
  showB64Copy = false;
  showPubCopy = false;

+  showAdvanced = false;
+  alertMessage = "";
+  alertTitle = "";
+
  public async getIdentity(activeDid) {
    await accountsDB.open();
    const account = await accountsDB.accounts
@@ -478,10 +487,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.";
+        }
      }
    }

@@ -534,9 +547,5 @@ export default class AccountViewView extends Vue {
  setApiServerInput(value) {
    this.apiServerInput = value;
  }
-
-  // This same popup code is in many files.
-  alertMessage = "";
-  alertTitle = "";
 }
 </script>
--- 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 = "";
@@ -208,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;
@@ -233,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);
@@ -313,7 +263,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;
        }
--- 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>
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -457,15 +457,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 = {
-          "Content-Type": "application/json",
-          Authorization: "Bearer " + token,
-        };
+        const headers = await this.getHeaders(identity);

        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 +679,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 = {
-        "Content-Type": "application/json",
-        Authorization: "Bearer " + token,
-      };
+      const headers = await this.getHeaders(identity);

      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.";
--- a/src/views/DiscoverView.vue
+++ b/src/views/DiscoverView.vue
@@ -30,109 +30,76 @@
        <li>
          <a
            href="#"
-            @click="searchLocal()"
-            class="inline-block py-3 rounded-t-lg border-b-2 active text-blue-600 border-blue-600 font-semibold"
+            @click="
+              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="">
-      <li class="border-b border-slate-300">
-        <a
-          @click="
-            onClickLoadProject(
-              'https://endorser.ch/entity/01H3HER4DTNCR6ZC4VXA3VPWVQ',
-            )
-          "
-          class="block py-4 flex gap-4"
+    <InfiniteScroll @reached-bottom="loadMoreData">
+      <ul>
+        <li
+          class="border-b border-slate-300"
+          v-for="project in projects"
+          :key="project.handleId"
        >
-          <div class="w-12">
-            <img
-              src="https://picsum.photos/200/200?random=1"
-              class="w-full rounded"
-            />
-          </div>
-
-          <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
+          <a
+            @click="onClickLoadProject(project.handleId)"
+            class="block py-4 flex gap-4"
+          >
+            <div class="w-12">
+              <img
+                src="https://picsum.photos/200/200?random=1"
+                class="w-full rounded"
+              />
            </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 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>
+                {{ project.name }}
+              </div>
            </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>
-            </div>
-          </div>
-        </a>
-      </li>
-    </ul>
+          </a>
+        </li>
+      </ul>
+    </InfiniteScroll>
    <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() {
-    const claimContents =
-      "claimContents=" + encodeURIComponent(this.searchTerms);
-    const claimType = "claimType=PlanAction";
-    const queryParams = [claimContents, claimType].join("&");
+  public async search(beforeId?: string) {
+    let queryParams = "claimContents=" + encodeURIComponent(this.searchTerms);
+
+    console.log(beforeId);
+    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) {
-        console.log("Plans found in that search:", results.data);
+      const plans: ProjectData[] = 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>
--- 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 },
 })
@@ -102,6 +94,8 @@ export default class NewEditProjectView extends Vue {
  errorMessage = "";
  accounts: AccountsSchema;
  numAccounts = 0;
+  alertTitle = "";
+  alertMessage = "";

  async beforeCreate() {
    accountsDB.open();
@@ -290,9 +284,5 @@ export default class NewEditProjectView extends Vue {
  public onCancelClick() {
    this.$router.back();
  }
-
-  // This same popup code is in many files.
-  alertTitle = "";
-  alertMessage = "";
 }
 </script>
--- 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,
+      );
    }
  }

--- 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 },
 })
--- 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;
@@ -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;
Author	SHA1	Message	Date
Trent Larson	2493f2ad39	fix local & remote search to work, fix beforeId check, fix handleId setting	2023-07-11 21:16:57 -06:00
anomalist	00954693b5	Merge pull request 'Integrating InfiniteScroll to the Discovery view' (#39 ) from discover-infinite-scroll into master Reviewed-on: trent_larson/kick-starter-for-time-pwa#39	2023-07-11 21:19:49 -04:00
anomalist	2dd77f898f	Merge branch 'master' into discover-infinite-scroll	2023-07-11 21:19:20 -04:00
anomalist	c1f218c2f3	Update 'project.task.yaml'	2023-07-11 21:10:33 -04:00
anomalist	b5e78e5dc8	Update 'project.task.yaml'	2023-07-11 21:03:39 -04:00
Trent Larson	47442655cb	update tasks	2023-07-11 08:40:44 -06:00
Matthew Raymer	1d362c314b	Beginning of integration. Seems the data coming back from local and remote are different?	2023-07-11 18:31:58 +08:00
anomalist	3eda246e85	Merge pull request 'DiscoverView searches almost done.' (#38 ) from discover-view-etc into master Reviewed-on: trent_larson/kick-starter-for-time-pwa#38	2023-07-11 01:36:19 -04:00
Matthew Raymer	3f13d3ea33	CLeanup header creation	2023-07-10 19:03:20 +08:00
Matthew Raymer	cef346e487	Move almost all interfaces to endorserServer.ts	2023-07-10 18:45:50 +08:00
Matthew Raymer	fed23a61ee	Remove HelloWorld and do sweeping	2023-07-10 18:20:13 +08:00
Matthew Raymer	b6b7c56157	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	2023-07-10 18:03:51 +08:00
anomalist	3f8be3b4de	Merge pull request 'Show the gives to & from a project (plan)' (#37 ) from project-gives into master Reviewed-on: trent_larson/kick-starter-for-time-pwa#37	2023-07-10 00:39:01 -04:00
anomalist	21af37c2c2	Merge pull request 'move QR for contact up, right under header' (#36 ) from move-qr-up into master Reviewed-on: trent_larson/kick-starter-for-time-pwa#36	2023-07-10 00:38:51 -04:00
Trent Larson	ed7d37c649	move QR for contact up, right under header	2023-07-09 08:15:51 -06:00