Merge pull request 'allow access to a different project by link' (#79) from project-ids into master

Reviewed-on: https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/pulls/79

project.task.yaml

@@ -49,6 +49,7 @@ tasks:
 - .5 make a VC details page
 - .1 Add units or different icon to the coins (to distinguish $, BTC, hours, etc)
 - .5 include the hash of the latest commit on help page next to version
+- .5 remove references to localStorage for projectId (now that it's pulling from the path)
 
 - contacts v+ :
   - 01 Import all the non-sensitive data (ie. contacts & settings).

src/router/index.ts

@@ -148,7 +148,7 @@ const routes: Array<RouteRecordRaw> = [
       ),
   },
   {
-    path: "/project",
+    path: "/project/:id?",
     name: "project",
     component: () =>
       import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),

src/views/ProjectViewView.vue

@@ -137,10 +137,12 @@
     <div class="grid items-start grid-cols-1 sm:grid-cols-2 gap-4">
       <div class="bg-slate-100 px-4 py-3 rounded-md">
         <h3 class="text-sm uppercase font-semibold mb-3">
-          Given to this Project
+          Given To This Project
         </h3>
 
-        <ul class="text-sm border-t border-slate-300">
+        <div v-if="givesToThis.length === 0">(None yet. Record one above.)</div>
+
+        <ul v-else class="text-sm border-t border-slate-300">
           <li
             v-for="give in givesToThis"
             :key="give.id"
@@ -164,31 +166,33 @@
         </ul>
       </div>
 
-      <div class="bg-slate-100 px-4 py-3 rounded-md">
+      <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
         <h3 class="text-sm uppercase font-semibold mb-3">
-          &hellip;and from this Project
+          Contributions By This Project
         </h3>
+        <button
+          @click="onClickLoadProject(fulfilledByThis.handleId)"
+          class="text-blue-500"
+        >
+          {{ fulfilledByThis.name }}
+        </button>
+      </div>
 
-        <ul class="text-sm border-t border-slate-300">
+      <div
-          <li
+        v-if="fulfillersToThis.length > 0"
-            v-for="give in givesByThis"
+        class="bg-slate-100 px-4 py-3 rounded-md"
-            :key="give.id"
+      >
-            class="py-1.5 border-b border-slate-300"
+        <h3 class="text-sm uppercase font-semibold mb-3">
-          >
+          Contributions To This Project
-            <div class="flex justify-between gap-4">
+        </h3>
-              <span
+        <ul>
-                ><fa icon="user" class="fa-fw text-slate-400"></fa>
+          <li v-for="plan in fulfillersToThis" :key="plan.handleId">
-                {{ didInfo(give.agentDid, activeDid, allMyDids, allContacts) }}
+            <button
-              </span>
+              @click="onClickLoadProject(plan.handleId)"
-              <span v-if="give.amount"
+              class="text-blue-500"
-                ><fa icon="coins" class="fa-fw text-slate-400"></fa>
+            >
-                {{ give.amount }}
+              {{ plan.name }}
-              </span>
+            </button>
-            </div>
-            <div v-if="give.description" class="text-slate-500">
-              <fa icon="comment" class="fa-fw text-slate-400"></fa>
-              {{ give.description }}
-            </div>
           </li>
         </ul>
       </div>
@@ -218,6 +222,7 @@ import {
   didInfo,
   GiverInputInfo,
   GiveServerRecord,
+  PlanServerRecord,
 } from "@/libs/endorserServer";
 import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
@@ -242,8 +247,9 @@ export default class ProjectViewView extends Vue {
   apiServer = "";
   description = "";
   expanded = false;
+  fulfilledByThis: PlanServerRecord | null = null;
+  fulfillersToThis: Array<PlanServerRecord> = [];
   givesToThis: Array<GiveServerRecord> = [];
-  givesByThis: Array<GiveServerRecord> = [];
   latitude = 0;
   longitude = 0;
   name = "";
@@ -266,7 +272,12 @@ export default class ProjectViewView extends Vue {
     this.allMyDids = accountsArr.map((acc) => acc.did);
     const account = accountsArr.find((acc) => acc.did === this.activeDid);
     const identity = JSON.parse(account?.identity || "null");
-    this.LoadProject(identity);
+
+    const pathParam = window.location.pathname.substring("/project/".length);
+    if (pathParam) {
+      this.projectId = decodeURIComponent(pathParam);
+    }
+    this.LoadProject(this.projectId, identity);
   }
 
   public async getIdentity(activeDid: string) {
@@ -320,11 +331,11 @@ export default class ProjectViewView extends Vue {
     this.expanded = false;
   }
 
-  async LoadProject(identity: IIdentifier) {
+  async LoadProject(projectId: string, identity: IIdentifier) {
+    this.projectId = projectId;
+
     const url =
-      this.apiServer +
+      this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
-      "/api/claim/byHandle/" +
-      encodeURIComponent(this.projectId);
     const headers: RawAxiosRequestHeaders = {
       "Content-Type": "application/json",
     };
@@ -389,7 +400,7 @@ export default class ProjectViewView extends Vue {
     const givesInUrl =
       this.apiServer +
       "/api/v2/report/givesForPlans?planIds=" +
-      encodeURIComponent(JSON.stringify([this.projectId]));
+      encodeURIComponent(JSON.stringify([projectId]));
     try {
       const resp = await this.axios.get(givesInUrl, { headers });
       if (resp.status === 200 && resp.data.data) {
@@ -422,21 +433,21 @@ export default class ProjectViewView extends Vue {
       );
     }
 
-    const givesOutUrl =
+    const fulfilledByUrl =
       this.apiServer +
-      "/api/v2/report/givesProvidedBy?providerId=" +
+      "/api/v2/report/planFulfilledByPlan?planHandleId=" +
-      encodeURIComponent(this.projectId);
+      encodeURIComponent(projectId);
     try {
-      const resp = await this.axios.get(givesOutUrl, { headers });
+      const resp = await this.axios.get(fulfilledByUrl, { headers });
-      if (resp.status === 200 && resp.data.data) {
+      if (resp.status === 200) {
-        this.givesByThis = resp.data.data;
+        this.fulfilledByThis = resp.data.data;
       } else {
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Error",
-            text: "Failed to retrieve gives by this project.",
+            text: "Failed to retrieve plans fulfilled by this project.",
           },
           -1,
         );
@@ -448,15 +459,64 @@ export default class ProjectViewView extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "Something went wrong retrieving gives by project.",
+          text: "Something went wrong retrieving plans fulfilled by this project.",
         },
         -1,
       );
       console.error(
-        "Error retrieving gives by this project:",
+        "Error retrieving plans fulfilled by this project:",
         serverError.message,
       );
     }
+
+    const fulfillersToUrl =
+      this.apiServer +
+      "/api/v2/report/planFulfillersToPlan?planHandleId=" +
+      encodeURIComponent(projectId);
+    try {
+      const resp = await this.axios.get(fulfillersToUrl, { headers });
+      if (resp.status === 200) {
+        this.fulfillersToThis = resp.data.data;
+      } else {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Failed to retrieve plan fulfillers to this project.",
+          },
+          -1,
+        );
+      }
+    } catch (error: unknown) {
+      const serverError = error as AxiosError;
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Something went wrong retrieving plan fulfillers to this project.",
+        },
+        -1,
+      );
+      console.error(
+        "Error retrieving plan fulfillers to this project:",
+        serverError.message,
+      );
+    }
+  }
+
+  /**
+   * Handle clicking on a project entry found in the list
+   * @param id of the project
+   **/
+  async onClickLoadProject(projectId: string) {
+    localStorage.setItem("projectId", projectId);
+    const route = {
+      path: "/project/" + encodeURIComponent(projectId),
+    };
+    this.$router.push(route);
+    this.LoadProject(projectId, await this.getIdentity(this.activeDid));
   }
 
   getOpenStreetMapUrl() {

web-push.md

@@ -29,8 +29,8 @@ from the SERVICE.
 The SERVICE will provide context and obtain explicit permission before prompting
 for notification permission:
 
-In order to provide this context and explict permission a two-step opt-in process
+In order to provide this context and explicit permission, a two-step opt-in process
-where the user is first presented with a pre-permission dialog box that explains
+first presents the user with a pre-permission dialog box that explains
 what the notifications are for and why they are useful. This may help reduce the
 possibility of users clicking "don't allow".
 
@@ -91,7 +91,7 @@ The `sw.js` file contains the logic for what a service worker should do.
 It executes in a separate thread of execution from the web page but provides a
 means of communicating between itself and the web page via messages.
 
-Note that there is a scope can specify what network requests it may
+Note that there is a scope that can specify what network requests it may
 intercept.
 
 The Vue project already has its own service worker but it is possible to
@@ -389,4 +389,4 @@ Simply tap on the Mute Notifications toggle switch in `AccountViewView` to immed
 While notifications are turned on, the user can tap on the App Notifications toggle switch in `AccountViewView` to trigger the Turn Off Notifications Dialog. User is given the following choices:
 
 - "Turn off Notifications" to fully turn them off (which means the user will need to go through the dialogs agains to turn them back on).
-- "Leave it On" to make no changes and dismiss the dialog.
+- "Leave it On" to make no changes and dismiss the dialog.