Considerable cleanup and merge

src/views/DiscoverView.vue

@@ -30,6 +30,7 @@
         <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"
           >
             Nearby
@@ -123,7 +124,6 @@ import { Component, Vue } from "vue-facing-decorator";
 
 import { accountsDB, db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import * as R from "ramda";
 import { accessToken } from "@/libs/crypto";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
@@ -135,6 +135,8 @@ export default class DiscoverView extends Vue {
   activeDid = "";
   apiServer = "";
   searchTerms = "";
+  alertMessage = "";
+  alertTitle = "";
 
   async mounted() {
     await db.open();
@@ -143,53 +145,100 @@ export default class DiscoverView extends Vue {
     this.apiServer = settings?.apiServer || "";
   }
 
-  public async search() {
+  public async buildHeaders() {
     const headers = { "Content-Type": "application/json" };
+
     if (this.activeDid) {
       await accountsDB.open();
       const allAccounts = await accountsDB.accounts.toArray();
-      const account = R.find((acc) => acc.did === this.activeDid, allAccounts);
-      //console.log("about to parse from", this.activeDid, account?.identity);
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
       const identity = JSON.parse(account?.identity || "null");
+
       if (!identity) {
-        throw new Error("No identity found.");
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service."
+        );
       }
-      const token = await accessToken(identity);
-      headers["Authorization"] = "Bearer " + token;
+
+      headers["Authorization"] = "Bearer " + (await accessToken(identity));
     } else {
       // it's OK without auth... we just won't get any identifiers
     }
+    return headers;
+  }
+
+  public async search() {
     const claimContents =
       "claimContents=" + encodeURIComponent(this.searchTerms);
     const claimType = "claimType=PlanAction";
     const queryParams = [claimContents, claimType].join("&");
-    return fetch(this.apiServer + "/api/v2/report/claims?" + queryParams, {
-      method: "GET",
-      headers: headers,
-    })
-      .then(async (response) => {
-        if (response.status !== 200) {
-          const details = await response.text();
-          throw details;
+
+    try {
+      const response = await fetch(
+        this.apiServer + "/api/v2/report/claims?" + queryParams,
+        {
+          method: "GET",
+          headers: await this.buildHeaders(),
         }
-        return response.json();
-      })
-      .then((results) => {
-        if (results.data) {
-          console.log(results.data);
-        } else {
-          throw JSON.stringify(results);
-        }
-      })
-      .catch((e) => {
-        console.log("Error with feed load:", e);
-        this.alertMessage =
-          e.userMessage || "There was an error retrieving projects.";
-        this.alertTitle = "Error";
-      });
+      );
+
+      if (response.status !== 200) {
+        const details = await response.text();
+        throw details;
+      }
+
+      const results = await response.json();
+
+      if (results.data) {
+        console.log("Plans found in that search:", results.data);
+      } else {
+        throw JSON.stringify(results);
+      }
+    } catch (e) {
+      console.log("Error with feed load:", e);
+      this.alertMessage =
+        e.userMessage || "There was an error retrieving projects.";
+      this.alertTitle = "Error";
+    }
   }
 
-  alertMessage = "";
-  alertTitle = "";
+  public async searchLocal() {
+    const claimContents =
+      "claimContents=" + encodeURIComponent(this.searchTerms);
+    const queryParams = [
+      claimContents,
+      "minLocLat=40.901000",
+      "maxLocLat=40.904000",
+      "westLocLon=-111.914000",
+      "eastLocLon=-111.909000",
+    ].join("&");
+
+    try {
+      const response = await fetch(
+        this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
+        {
+          method: "GET",
+          headers: await this.buildHeaders(),
+        }
+      );
+
+      if (response.status !== 200) {
+        throw await response.text();
+      }
+
+      const results = await response.json();
+
+      if (results.data) {
+        console.log("Plans found in that location:", results.data);
+      } else {
+        throw JSON.stringify(results);
+      }
+    } catch (e) {
+      console.log("Error with feed load:", e);
+      this.alertMessage =
+        e.userMessage || "There was an error retrieving projects.";
+      this.alertTitle = "Error";
+    }
+  }
 }
 </script>