diff --git a/project.task.yaml b/project.task.yaml
index d04739676..9c5a5cf4a 100644
--- a/project.task.yaml
+++ b/project.task.yaml
@@ -7,6 +7,7 @@ tasks:
- 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.
diff --git a/src/main.ts b/src/main.ts
index 9238712d4..438d10ad6 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -19,6 +19,7 @@ import {
faCircleUser,
faClock,
faCoins,
+ faComment,
faCopy,
faEllipsisVertical,
faEye,
@@ -58,6 +59,7 @@ library.add(
faCircleUser,
faClock,
faCoins,
+ faComment,
faCopy,
faEllipsisVertical,
faEye,
diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue
index 4e52619c4..8ceec6d77 100644
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -23,7 +23,7 @@
-
+
{{ errorMessage }}
@@ -89,7 +89,6 @@
-
-
+
+
+
+
+
+
+
+ {{
+ didInfo(give.agentDid, activeDid, accounts, allContacts)
+ }}
+
+
+
+ {{ give.amount }}
+
+
+
+ {{ give.description }}
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ didInfo(give.agentDid, activeDid, accounts, allContacts)
+ }}
+
+
+
+ {{ give.amount }}
+
+
+
+ {{ give.description }}
+
+
+
+
+
+
import { AxiosError } from "axios";
import * as moment from "moment";
+import { IIdentifier } from "@veramo/core";
import { Component, Vue } from "vue-facing-decorator";
import GiftedDialog from "@/components/GiftedDialog.vue";
@@ -123,9 +167,12 @@ import { accountsDB, db } from "@/db";
import { AccountsSchema } from "@/db/tables/accounts";
import { Contact } from "@/db/tables/contacts";
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { createAndSubmitGive } from "@/libs/endorserServer";
import { accessToken } from "@/libs/crypto";
-import { IIdentifier } from "@veramo/core";
+import {
+ createAndSubmitGive,
+ didInfo,
+ GiveServerRecord,
+} from "@/libs/endorserServer";
import AlertMessage from "@/components/AlertMessage";
import QuickNav from "@/components/QuickNav";
@@ -142,8 +189,8 @@ export default class ProjectViewView extends Vue {
description = "";
errorMessage = "";
expanded = false;
- givesToThis: Array = [];
- givesFromThis: Array = [];
+ givesToThis: Array = [];
+ givesByThis: Array = [];
name = "";
numAccounts = 0;
projectId = localStorage.getItem("projectId") || ""; // handle ID
@@ -204,6 +251,11 @@ export default class ProjectViewView extends Vue {
this.$router.push(route);
}
+ // Isn't there a better way to make this available to the template?
+ didInfo(did, activeDid, identities, contacts) {
+ return didInfo(did, activeDid, identities, contacts);
+ }
+
expandText() {
this.expanded = true;
}
@@ -228,6 +280,8 @@ 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);
@@ -252,6 +306,42 @@ export default class ProjectViewView extends Vue {
console.error("Error retrieving project:", error);
}
}
+
+ const givesInUrl =
+ this.apiServer +
+ "/api/v2/report/givesForPlans?planIds=" +
+ encodeURIComponent(JSON.stringify([this.projectId]));
+ try {
+ const resp = await this.axios.get(givesInUrl, { headers });
+ if (resp.status === 200 && resp.data.data) {
+ this.givesToThis = resp.data.data;
+ } else {
+ this.errorMessage = "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 =
+ "Something went wrong retrieving gives to this project.";
+ }
+
+ const givesOutUrl =
+ this.apiServer +
+ "/api/v2/report/givesProvidedBy?providerId=" +
+ encodeURIComponent(this.projectId);
+ try {
+ const resp = await this.axios.get(givesOutUrl, { headers });
+ if (resp.status === 200 && resp.data.data) {
+ this.givesByThis = resp.data.data;
+ } else {
+ this.errorMessage = "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.";
+ }
}
openDialog(contact) {