Merge branch 'master' into fix-contact-totals

package-lock.json

@@ -38,6 +38,7 @@
         "luxon": "^3.3.0",
         "merkletreejs": "^0.3.10",
         "moment": "^2.29.4",
+        "notiwind": "^2.0.2",
         "papaparse": "^5.4.1",
         "pina": "^0.20.2204228",
         "pinia-plugin-persistedstate": "^3.1.0",
@@ -20928,6 +20929,11 @@
         "node": ">= 8"
       }
     },
+    "node_modules/mitt": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+      "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
+    },
     "node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",
@@ -21275,6 +21281,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/notiwind": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/notiwind/-/notiwind-2.0.2.tgz",
+      "integrity": "sha512-wMCf+07E093d0Q78C5UHroT9GQHm4mIGerhg7dGLJ0GN6zONqKj8nTR3clkq/Y44On9k28/0DtDNwOX7FT5p/A==",
+      "dependencies": {
+        "mitt": "^3.0.1"
+      },
+      "peerDependencies": {
+        "vue": "^3.3.4"
+      }
+    },
     "node_modules/npm-package-arg": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-7.0.0.tgz",

package.json

@@ -38,6 +38,7 @@
     "luxon": "^3.3.0",
     "merkletreejs": "^0.3.10",
     "moment": "^2.29.4",
+    "notiwind": "^2.0.2",
     "papaparse": "^5.4.1",
     "pina": "^0.20.2204228",
     "pinia-plugin-persistedstate": "^3.1.0",

project.task.yaml

@@ -26,6 +26,7 @@ tasks:
 
 - 24 Move to Vite
 
+- .5 add link to further project / people when a project pays ahead
 - .5 add project ID to the URL, to make a project publicly-accessible
 - .5 remove edit from project page for projects owned by others
 - .5 fix where user 0 sees no txns from user 1 on contacts page but sees them on list page

src/App.vue

@@ -1,5 +1,132 @@
 <template>
   <router-view />
+
+  <NotificationGroup group="alert">
+    <div
+      class="fixed top-4 right-4 w-full max-w-sm flex flex-col items-start justify-end"
+    >
+      <Notification
+        v-slot="{ notifications, close }"
+        enter="transform ease-out duration-300 transition"
+        enter-from="translate-y-2 opacity-0 sm:translate-y-0 sm:translate-x-4"
+        enter-to="translate-y-0 opacity-100 sm:translate-x-0"
+        leave="transition ease-in duration-500"
+        leave-from="opacity-100"
+        leave-to="opacity-0"
+        move="transition duration-500"
+        move-delay="delay-300"
+      >
+        <div
+          v-for="notification in notifications"
+          :key="notification.id"
+          class="w-full"
+          role="alert"
+        >
+          <div
+            v-if="notification.type === 'toast'"
+            class="w-full max-w-sm mx-auto mb-3 overflow-hidden bg-slate-900/90 text-white rounded-lg shadow-md"
+          >
+            <div class="w-full px-4 py-3">
+              <span class="font-semibold">{{ notification.title }}</span>
+              <p class="text-sm">{{ notification.text }}</p>
+            </div>
+          </div>
+
+          <div
+            v-if="notification.type === 'info'"
+            class="flex w-full max-w-sm mx-auto mb-3 overflow-hidden bg-slate-100 rounded-lg shadow-md"
+          >
+            <div
+              class="flex items-center justify-center w-12 bg-slate-600 text-slate-100"
+            >
+              <fa icon="circle-info" class="fa-fw fa-xl"></fa>
+            </div>
+
+            <div class="relative w-full pl-4 pr-8 py-2 text-slate-900">
+              <span class="font-semibold">{{ notification.title }}</span>
+              <p class="text-sm">{{ notification.text }}</p>
+
+              <button
+                @click="close(notification.id)"
+                class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-slate-200 text-slate-600"
+              >
+                <fa icon="xmark" class="fa-fw"></fa>
+              </button>
+            </div>
+          </div>
+
+          <div
+            v-if="notification.type === 'success'"
+            class="flex w-full max-w-sm mx-auto mb-3 overflow-hidden bg-emerald-100 rounded-lg shadow-md"
+          >
+            <div
+              class="flex items-center justify-center w-12 bg-emerald-600 text-emerald-100"
+            >
+              <fa icon="circle-info" class="fa-fw fa-xl"></fa>
+            </div>
+
+            <div class="relative w-full pl-4 pr-8 py-2 text-emerald-900">
+              <span class="font-semibold">{{ notification.title }}</span>
+              <p class="text-sm">{{ notification.text }}</p>
+
+              <button
+                @click="close(notification.id)"
+                class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-emerald-200 text-emerald-600"
+              >
+                <fa icon="xmark" class="fa-fw"></fa>
+              </button>
+            </div>
+          </div>
+
+          <div
+            v-if="notification.type === 'warning'"
+            class="flex w-full max-w-sm mx-auto mb-3 overflow-hidden bg-amber-100 rounded-lg shadow-md"
+          >
+            <div
+              class="flex items-center justify-center w-12 bg-amber-600 text-amber-100"
+            >
+              <fa icon="triangle-exclamation" class="fa-fw fa-xl"></fa>
+            </div>
+
+            <div class="relative w-full pl-4 pr-8 py-2 text-amber-900">
+              <span class="font-semibold">{{ notification.title }}</span>
+              <p class="text-sm">{{ notification.text }}</p>
+
+              <button
+                @click="close(notification.id)"
+                class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-amber-200 text-amber-600"
+              >
+                <fa icon="xmark" class="fa-fw"></fa>
+              </button>
+            </div>
+          </div>
+
+          <div
+            v-if="notification.type === 'danger'"
+            class="flex w-full max-w-sm mx-auto mb-3 overflow-hidden bg-rose-100 rounded-lg shadow-md"
+          >
+            <div
+              class="flex items-center justify-center w-12 bg-rose-600 text-rose-100"
+            >
+              <fa icon="triangle-exclamation" class="fa-fw fa-xl"></fa>
+            </div>
+
+            <div class="relative w-full pl-4 pr-8 py-2 text-rose-900">
+              <span class="font-semibold">{{ notification.title }}</span>
+              <p class="text-sm">{{ notification.text }}</p>
+
+              <button
+                @click="close(notification.id)"
+                class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-rose-200 text-rose-600"
+              >
+                <fa icon="xmark" class="fa-fw"></fa>
+              </button>
+            </div>
+          </div>
+        </div>
+      </Notification>
+    </div>
+  </NotificationGroup>
 </template>
 
 <style></style>

src/libs/endorserServer.ts

@@ -82,10 +82,15 @@ export function isHiddenDid(did) {
 /**
  always returns text, maybe UNNAMED_VISIBLE or UNKNOWN_ENTITY
  **/
-export function didInfo(did, activeDid, allMyDids, contacts) {
+export function didInfo(
-  const myId: string | undefined = R.find(R.identity, allMyDids);
+  did: string,
+  activeDid: string,
+  allMyDids: Array<string>,
+  contacts: Array<Contact>,
+): string {
+  const myId: string | undefined = R.find(R.equals(did), allMyDids, did);
   if (myId) {
-    return "You" + (myId.did !== activeDid ? " (Alt ID)" : "");
+    return "You" + (myId !== activeDid ? " (Alt ID)" : "");
   } else {
     const contact: Contact | undefined = R.find((c) => c.did === did, contacts);
     if (contact) {

src/main.ts

@@ -5,6 +5,7 @@ import "./registerServiceWorker";
 import router from "./router";
 import axios from "axios";
 import VueAxios from "vue-axios";
+import Notifications from "notiwind";
 
 import "./assets/styles/tailwind.css";
 
@@ -16,6 +17,7 @@ import {
   faChevronRight,
   faCircle,
   faCircleCheck,
+  faCircleInfo,
   faCircleQuestion,
   faCircleUser,
   faClock,
@@ -45,6 +47,7 @@ import {
   faSquareCaretDown,
   faSquareCaretUp,
   faTrashCan,
+  faTriangleExclamation,
   faUser,
   faUsers,
   faXmark,
@@ -57,6 +60,7 @@ library.add(
   faChevronRight,
   faCircle,
   faCircleCheck,
+  faCircleInfo,
   faCircleQuestion,
   faCircleUser,
   faClock,
@@ -86,6 +90,7 @@ library.add(
   faSquareCaretDown,
   faSquareCaretUp,
   faTrashCan,
+  faTriangleExclamation,
   faUser,
   faUsers,
   faXmark,
@@ -98,4 +103,5 @@ createApp(App)
   .use(createPinia())
   .use(VueAxios, axios)
   .use(router)
+  .use(Notifications)
   .mount("#app");

src/router/index.ts

@@ -182,4 +182,14 @@ const router = createRouter({
   routes,
 });
 
+const errorHandler = (error, to, from) => {
+  // Handle the error here
+  console.error(error, to, from);
+  console.log("XXXXX");
+
+  // You can also perform additional actions, such as displaying an error message or redirecting the user to a specific page
+};
+
+router.onError(errorHandler); // Assign the error handler to the router instance
+
 export default router;

src/views/AccountViewView.vue

@@ -400,13 +400,19 @@ export default class AccountViewView extends Vue {
         this.limitsMessage = "No identity.";
         this.loadingLimits = false;
       } else {
-        this.alertMessage =
+        this.$notify(
-          "Clear your cache and start over (after data backup).";
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error Creating Account",
+            text: "Clear your cache and start over (after data backup).",
+          },
+          -1,
+        );
         console.error(
           "Telling user to clear cache at page create because:",
           err,
         );
-        this.alertTitle = "Error Creating Account";
       }
     }
   }
@@ -418,13 +424,19 @@ export default class AccountViewView extends Vue {
         showContactGivesInline: this.showContactGives,
       });
     } catch (err) {
-      this.alertMessage =
+      this.$notify(
-        "Clear your cache and start over (after data backup).";
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Updating Contact Setting",
+          text: "Clear your cache and start over (after data backup).",
+        },
+        -1,
+      );
       console.error(
         "Telling user to clear cache after contact setting update because:",
         err,
       );
-      this.alertTitle = "Error Updating Contact Setting";
     }
   }
 
@@ -440,11 +452,25 @@ export default class AccountViewView extends Vue {
 
       URL.revokeObjectURL(url);
 
-      this.alertTitle = "Download Started";
+      this.$notify(
-      this.alertMessage = "See your downloads directory for the backup.";
+        {
+          group: "alert",
+          type: "toast",
+          title: "Download Started",
+          text: "See your downloads directory for the backup.",
+        },
+        5000,
+      );
     } catch (error) {
-      this.alertTitle = "Export Error";
+      this.$notify(
-      this.alertMessage = "See console logs for more info.";
+        {
+          group: "alert",
+          type: "danger",
+          title: "Export Error",
+          text: "See console logs for more info.",
+        },
+        -1,
+      );
       console.error("Export Error:", error);
     }
   }

src/views/ContactAmountsView.vue

@@ -151,10 +151,17 @@ export default class ContactsView extends Vue {
         this.loadGives(this.activeDid, this.contact);
       }
     } catch (err) {
-      this.alertTitle = "Error";
+      this.$notify(
-      this.alertMessage =
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
             err.userMessage ||
-        "There was an error retrieving the latest sweet, sweet action.";
+            "There was an error retrieving the latest sweet, sweet action.",
+        },
+        -1,
+      );
     }
   }
 
@@ -178,9 +185,15 @@ export default class ContactsView extends Vue {
           resp.status,
           resp.data,
         );
-        this.alertTitle = "Error With Server";
+        this.$notify(
-        this.alertMessage =
+          {
-          "Got an error retrieving your given time from the server.";
+            group: "alert",
+            type: "danger",
+            title: "Error With Server",
+            text: "Got an error retrieving your given time from the server.",
+          },
+          -1,
+        );
       }
 
       const url2 =
@@ -199,9 +212,15 @@ export default class ContactsView extends Vue {
           resp2.status,
           resp2.data,
         );
-        this.alertTitle = "Error With Server";
+        this.$notify(
-        this.alertMessage =
+          {
-          "Got an error retrieving your given time from the server.";
+            group: "alert",
+            type: "danger",
+            title: "Error With Server",
+            text: "Got an error retrieving your given time from the server.",
+          },
+          -1,
+        );
       }
 
       const sortedResult: Array<GiveServerRecord> = R.sort(
@@ -211,8 +230,15 @@ export default class ContactsView extends Vue {
       );
       this.giveRecords = sortedResult;
     } catch (error) {
-      this.alertTitle = "Error With Server";
+      this.$notify(
-      this.alertMessage = error as string;
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error With Server",
+          text: error as string,
+        },
+        -1,
+      );
     }
   }
 
@@ -281,15 +307,29 @@ export default class ContactsView extends Vue {
           userMessage = error as string;
         }
         // Now set that error for the user to see.
-        this.alertTitle = "Error With Server";
+        this.$notify(
-        this.alertMessage = userMessage;
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error With Server",
+            text: userMessage,
+          },
+          -1,
+        );
       }
     }
   }
 
   cannotConfirmMessage() {
-    this.alertTitle = "Not Allowed";
+    this.$notify(
-    this.alertMessage = "Only the recipient can confirm final receipt.";
+      {
+        group: "alert",
+        type: "danger",
+        title: "Not Allowed",
+        text: "Only the recipient can confirm final receipt.",
+      },
+      -1,
+    );
   }
 }
 </script>

src/views/ContactGiftingView.vue

@@ -145,10 +145,17 @@ export default class HomeView extends Vue {
       this.feedLastViewedId = settings?.lastViewedClaimId;
       this.updateAllFeed();
     } catch (err) {
-      this.alertTitle = "Error";
+      this.$notify(
-      this.alertMessage =
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
             err.userMessage ||
-        "There was an error retrieving the latest sweet, sweet action.";
+            "There was an error retrieving the latest sweet, sweet action.",
+        },
+        -1,
+      );
     }
   }
 
@@ -197,17 +204,27 @@ export default class HomeView extends Vue {
    */
   public async recordGive(giverDid, description, hours) {
     if (!this.activeDid) {
-      this.setAlert(
+      this.$notify(
-        "Error",
+        {
-        "You must select an identity before you can record a give.",
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identity before you can record a give.",
+        },
+        -1,
       );
       return;
     }
 
     if (!description && !hours) {
-      this.setAlert(
+      this.$notify(
-        "Error",
+        {
-        "You must enter a description or some number of hours.",
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must enter a description or some number of hours.",
+        },
+        -1,
       );
       return;
     }
@@ -227,18 +244,38 @@ export default class HomeView extends Vue {
       if (isGiveCreationError(result)) {
         const errorMessage = getGiveCreationErrorMessage(result);
         console.log("Error with give result:", result);
-        this.setAlert(
+        this.$notify(
-          "Error",
+          {
-          errorMessage || "There was an error recording the give.",
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: errorMessage || "There was an error recording the give.",
+          },
+          -1,
         );
       } else {
-        this.setAlert("Success", "That gift was recorded.");
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: "That gift was recorded.",
+          },
+          -1,
+        );
       }
     } catch (error) {
       console.log("Error with give caught:", error);
-      this.setAlert(
+      this.$notify(
-        "Error",
+        {
-        getGiveErrorMessage(error) || "There was an error recording the give.",
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
+            getGiveErrorMessage(error) ||
+            "There was an error recording the give.",
+        },
+        -1,
       );
     }
   }

src/views/ContactQRScanShowView.vue

@@ -85,7 +85,15 @@ export default class ContactQRScanShow extends Vue {
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === this.activeDid, accounts);
     if (!account) {
-      this.alertMessage = "You have no identity yet.";
+      this.$notify(
+        {
+          group: "alert",
+          type: "warning",
+          title: "",
+          text: "You have no identity yet.",
+        },
+        -1,
+      );
     } else {
       const identity = await this.getIdentity(this.activeDid);
       const publicKeyHex = identity.keys[0].publicKeyHex;

src/views/ContactsView.vue

@@ -331,12 +331,19 @@ export default class ContactsView extends Vue {
           resp.status,
           resp.data,
         );
-        this.alertTitle = "Error With Server";
+        this.$notify(
-        this.alertMessage =
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error With Server",
+            text:
               "Got an error retrieving your " +
               resp.config.url.includes("recipientDid")
                 ? "received"
-            : "given" + " time from the server.";
+                : "given" + " time from the server.",
+          },
+          -1,
+        );
       }
     };
 
@@ -384,8 +391,15 @@ export default class ContactsView extends Vue {
       this.givenToMeConfirmed = givenToMeConfirmed;
       this.givenToMeUnconfirmed = givenToMeUnconfirmed;
     } catch (error) {
-      this.alertTitle = "Error With Server";
+      this.$notify(
-      this.alertMessage = error as string;
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error With Server",
+          text: error as string,
+        },
+        -1,
+      );
     }
   }
 
@@ -478,18 +492,32 @@ export default class ContactsView extends Vue {
         try {
           const resp = await this.axios.post(url, payload, { headers });
           if (resp.data?.success?.embeddedRecordError) {
-            this.alertTitle = "Registration Still Unknown";
             let message = "There was some problem with the registration.";
             if (typeof resp.data.success.embeddedRecordError == "string") {
               message += " " + resp.data.success.embeddedRecordError;
             }
-            this.alertMessage = message;
+            this.$notify(
+              {
+                group: "alert",
+                type: "danger",
+                title: "Registration Still Unknown",
+                text: message,
+              },
+              -1,
+            );
           } else if (resp.data?.success?.handleId) {
             contact.registered = true;
             db.contacts.update(contact.did, { registered: true });
 
-            this.alertTitle = "Registration Success";
+            this.$notify(
-            this.alertMessage = contact.name + " has been registered.";
+              {
+                group: "alert",
+                type: "info",
+                title: "Registration Success",
+                text: contact.name + " has been registered.",
+              },
+              -1,
+            );
           }
         } catch (error) {
           let userMessage = "There was an error. See logs for more info.";
@@ -504,8 +532,15 @@ export default class ContactsView extends Vue {
             userMessage = error as string;
           }
           // Now set that error for the user to see.
-          this.alertTitle = "Error With Server";
+          this.$notify(
-          this.alertMessage = userMessage;
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error With Server",
+              text: userMessage,
+            },
+            -1,
+          );
         }
       }
     }
@@ -526,17 +561,39 @@ export default class ContactsView extends Vue {
         contact.seesMe = visibility;
         db.contacts.update(contact.did, { seesMe: visibility });
       } else {
-        this.alertTitle = "Error With Server";
         console.error("Bad response setting visibility: ", resp.data);
         if (resp.data.error?.message) {
-          this.alertMessage = resp.data.error?.message;
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error With Server",
+              text: resp.data.error?.message,
+            },
+            -1,
+          );
         } else {
-          this.alertMessage = "Bad server response of " + resp.status;
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error With Server",
+              text: "Bad server response of " + resp.status,
+            },
+            -1,
+          );
         }
       }
     } catch (err) {
-      this.alertTitle = "Error With Server";
+      this.$notify(
-      this.alertMessage = err as string;
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error With Server",
+          text: err as string,
+        },
+        -1,
+      );
     }
   }
 
@@ -553,23 +610,52 @@ export default class ContactsView extends Vue {
         contact.seesMe = visibility;
         db.contacts.update(contact.did, { seesMe: visibility });
 
-        this.alertTitle = "Refreshed";
+        this.$notify(
-        this.alertMessage =
+          {
+            group: "alert",
+            type: "toast",
+            title: "Refreshed",
+            text:
               this.nameForContact(contact, true) +
               " can " +
               (visibility ? "" : "not ") +
-          "see your activity.";
+              "see your activity.",
+          },
+          5000,
+        );
       } else {
-        this.alertTitle = "Error With Server";
         if (resp.data.error?.message) {
-          this.alertMessage = resp.data.error?.message;
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error With Server",
+              text: resp.data.error?.message,
+            },
+            -1,
+          );
         } else {
-          this.alertMessage = "Bad server response of " + resp.status;
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error With Server",
+              text: "Bad server response of " + resp.status,
+            },
+            -1,
+          );
         }
       }
     } catch (err) {
-      this.alertTitle = "Error With Server";
+      this.$notify(
-      this.alertMessage = err as string;
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error With Server",
+          text: err as string,
+        },
+        -1,
+      );
     }
   }
 
@@ -608,15 +694,35 @@ export default class ContactsView extends Vue {
       }
     }
     if (!this.isNumeric(this.hourInput)) {
-      this.alertTitle = "Input Error";
+      this.$notify(
-      this.alertMessage =
+        {
-        "This is not a valid number of hours: " + this.hourInput;
+          group: "alert",
+          type: "danger",
+          title: "Input Error",
+          text: "This is not a valid number of hours: " + this.hourInput,
+        },
+        -1,
+      );
     } else if (!parseFloat(this.hourInput)) {
-      this.alertTitle = "Input Error";
+      this.$notify(
-      this.alertMessage = "Giving 0 hours does nothing.";
+        {
+          group: "alert",
+          type: "danger",
+          title: "Input Error",
+          text: "Giving 0 hours does nothing.",
+        },
+        -1,
+      );
     } else if (!identity) {
-      this.alertTitle = "Status Error";
+      this.$notify(
-      this.alertMessage = "No identity is available.";
+        {
+          group: "alert",
+          type: "danger",
+          title: "Status Error",
+          text: "No identity is available.",
+        },
+        -1,
+      );
     } else {
       // ask to confirm amount
       let toFrom;
@@ -700,8 +806,15 @@ export default class ContactsView extends Vue {
       try {
         const resp = await this.axios.post(url, payload, { headers });
         if (resp.data?.success?.handleId) {
-          this.alertTitle = "Done";
+          this.$notify(
-          this.alertMessage = "Successfully logged time to the server.";
+            {
+              group: "alert",
+              type: "success",
+              title: "Done",
+              text: "Successfully logged time to the server.",
+            },
+            -1,
+          );
 
           if (fromDid === identity.did) {
             const newList = R.clone(this.givenByMeUnconfirmed);
@@ -726,8 +839,15 @@ export default class ContactsView extends Vue {
           userMessage = error as string;
         }
         // Now set that error for the user to see.
-        this.alertTitle = "Error With Server";
+        this.$notify(
-        this.alertMessage = userMessage;
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error With Server",
+            text: userMessage,
+          },
+          -1,
+        );
       }
     }
   }

src/views/DiscoverView.vue

@@ -90,10 +90,12 @@
             </div>
 
             <div class="grow">
-              <h2 class="text-base font-semibold">Canyon cleanup</h2>
+              <h2 class="text-base font-semibold">{{ project.name }}</h2>
               <div class="text-sm">
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{ project.name }}
+                {{
+                  didInfo(project.issuerDid, activeDid, allMyDids, allContacts)
+                }}
               </div>
             </div>
           </a>
@@ -111,8 +113,10 @@
 import { Component, Vue } from "vue-facing-decorator";
 
 import { accountsDB, db } from "@/db";
+import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
+import { didInfo } from "@/libs/endorserServer";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
 import InfiniteScroll from "@/components/InfiniteScroll";
@@ -122,6 +126,8 @@ import InfiniteScroll from "@/components/InfiniteScroll";
 })
 export default class DiscoverView extends Vue {
   activeDid = "";
+  allContacts: Array<Contact> = [];
+  allMyDids: Array<string> = [];
   apiServer = "";
   searchTerms = "";
   alertMessage = "";
@@ -133,11 +139,20 @@ export default class DiscoverView extends Vue {
   remoteCount = 0;
   isLoading = false;
 
+  // make this function available to the Vue template
+  didInfo = didInfo;
+
   async mounted() {
     await db.open();
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
+    this.allContacts = await db.contacts.toArray();
+
+    await accountsDB.open();
+    const allAccounts = await accountsDB.accounts.toArray();
+    this.allMyDids = allAccounts.map((acc) => acc.did);
+
     this.searchLocal();
   }
 
@@ -166,7 +181,6 @@ export default class DiscoverView extends Vue {
   public async search(beforeId?: string) {
     let queryParams = "claimContents=" + encodeURIComponent(this.searchTerms);
 
-    console.log(beforeId);
     if (beforeId) {
       queryParams = queryParams + `&beforeId=${beforeId}`;
     }
@@ -186,6 +200,16 @@ export default class DiscoverView extends Vue {
 
       if (response.status !== 200) {
         const details = await response.text();
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: `There was a problem accessing the server. Please try again later. (${details})`,
+          },
+          -1,
+        );
+
         throw details;
       }
 
@@ -194,9 +218,8 @@ export default class DiscoverView extends Vue {
       const plans: ProjectData[] = results.data;
       if (plans) {
         for (const plan of plans) {
-          const { name, description, handleId = plan.handleId, rowid } = plan;
+          const { name, description, handleId, rowid, issuerDid } = plan;
-          console.log("here");
+          this.projects.push({ name, description, handleId, rowid, issuerDid });
-          this.projects.push({ name, description, handleId, rowid });
         }
         this.remoteCount = this.projects.length;
       } else {
@@ -204,9 +227,15 @@ export default class DiscoverView extends Vue {
       }
     } catch (e) {
       console.log("Error with feed load:", e);
-      this.alertMessage =
+      this.$notify(
-        e.userMessage || "There was an error retrieving projects.";
+        {
-      this.alertTitle = "Error";
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: e.userMessage || "There was a problem retrieving projects.",
+        },
+        -1,
+      );
     } finally {
       this.isLoading = false;
     }
@@ -240,6 +269,16 @@ export default class DiscoverView extends Vue {
       );
 
       if (response.status !== 200) {
+        const details = await response.text();
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: `There was a problem accessing the server. Please try again later. (${details})`,
+          },
+          -1,
+        );
         throw await response.text();
       }
 
@@ -263,9 +302,15 @@ export default class DiscoverView extends Vue {
       }
     } catch (e) {
       console.log("Error with feed load:", e);
-      this.alertMessage =
+      this.$notify(
-        e.userMessage || "There was an error retrieving projects.";
+        {
-      this.alertTitle = "Error";
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: e.userMessage || "There was a problem retrieving projects.",
+        },
+        -1,
+      );
     } finally {
       this.isLoading = false;
     }
@@ -278,8 +323,6 @@ export default class DiscoverView extends Vue {
   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) {

src/views/HomeView.vue

@@ -6,6 +6,94 @@
       Time Safari
     </h1>
 
+    <div class="mb-8">
+      <h2 class="text-xl font-bold mb-4">Notiwind Alert Test Suite</h2>
+
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'toast',
+              text: 'I\'m a toast. Don\'t mind me.',
+            },
+            5000,
+          )
+        "
+        class="font-bold uppercase bg-slate-400 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Toast (self-dismiss)
+      </button>
+
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'info',
+              title: 'Information Alert',
+              text: 'Just wanted you to know.',
+            },
+            -1,
+          )
+        "
+        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Info
+      </button>
+
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'success',
+              title: 'Success Alert',
+              text: 'Congratulations!',
+            },
+            -1,
+          )
+        "
+        class="font-bold uppercase bg-emerald-600 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Success
+      </button>
+
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'warning',
+              title: 'Warning Alert',
+              text: 'You might wanna look at this.',
+            },
+            -1,
+          )
+        "
+        class="font-bold uppercase bg-amber-600 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Warning
+      </button>
+
+      <button
+        @click="
+          this.$notify(
+            {
+              group: 'alert',
+              type: 'danger',
+              title: 'Danger Alert',
+              text: 'Something terrible has happened!',
+            },
+            -1,
+          )
+        "
+        class="font-bold uppercase bg-rose-600 text-white px-3 py-2 rounded-md mr-2"
+      >
+        Danger
+      </button>
+    </div>
+
     <div class="mb-8">
       <h2 class="text-xl font-bold">Quick Action</h2>
       <p class="mb-4">Show appreciation to a contact:</p>
@@ -157,10 +245,17 @@ export default class HomeView extends Vue {
       this.feedLastViewedId = settings?.lastViewedClaimId;
       this.updateAllFeed();
     } catch (err) {
-      this.alertTitle = "Error";
+      this.$notify(
-      this.alertMessage =
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
             err.userMessage ||
-        "There was an error retrieving the latest sweet, sweet action.";
+            "There was an error retrieving the latest sweet, sweet action.",
+        },
+        -1,
+      );
     }
   }
 
@@ -209,9 +304,15 @@ export default class HomeView extends Vue {
       })
       .catch((e) => {
         console.log("Error with feed load:", e);
-        this.alertMessage =
+        this.$notify(
-          e.userMessage || "There was an error retrieving feed data.";
+          {
-        this.alertTitle = "Error";
+            group: "alert",
+            type: "danger",
+            title: "Export Error",
+            text: e.userMessage || "There was an error retrieving feed data.",
+          },
+          -1,
+        );
       });
 
     this.isHiddenSpinner = true;
@@ -302,17 +403,27 @@ export default class HomeView extends Vue {
    */
   public async recordGive(giverDid, description, hours) {
     if (!this.activeDid) {
-      this.setAlert(
+      this.$notify(
-        "Error",
+        {
-        "You must select an identity before you can record a give.",
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identity before you can record a give.",
+        },
+        -1,
       );
       return;
     }
 
     if (!description && !hours) {
-      this.setAlert(
+      this.$notify(
-        "Error",
+        {
-        "You must enter a description or some number of hours.",
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must enter a description or some number of hours.",
+        },
+        -1,
       );
       return;
     }
@@ -332,19 +443,38 @@ export default class HomeView extends Vue {
       if (this.isGiveCreationError(result)) {
         const errorMessage = this.getGiveCreationErrorMessage(result);
         console.log("Error with give result:", result);
-        this.setAlert(
+        this.$notify(
-          "Error",
+          {
-          errorMessage || "There was an error recording the give.",
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: errorMessage || "There was an error recording the give.",
+          },
+          -1,
         );
       } else {
-        this.setAlert("Success", "That gift was recorded.");
+        this.$notify(
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: "That gift was recorded.",
+          },
+          -1,
+        );
       }
     } catch (error) {
       console.log("Error with give caught:", error);
-      this.setAlert(
+      this.$notify(
-        "Error",
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
             this.getGiveErrorMessage(error) ||
             "There was an error recording the give.",
+        },
+        -1,
       );
     }
   }

src/views/IdentitySwitcherView.vue

@@ -133,13 +133,19 @@ export default class IdentitySwitcherView extends Vue {
         this.limitsMessage = "No identity.";
         this.loadingLimits = false;
       } else {
-        this.alertMessage =
+        this.$notify(
-          "Clear your cache and start over (after data backup).";
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error Creating Account",
+            text: "Clear your cache and start over (after data backup).",
+          },
+          -1,
+        );
         console.error(
           "Telling user to clear cache at page create because:",
           err,
         );
-        this.alertTitle = "Error Creating Account";
       }
     }
   }

src/views/NewEditProjectView.vue

@@ -245,20 +245,41 @@ export default class NewEditProjectView extends Vue {
         if (serverError) {
           if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
             console.log(serverError);
-            this.alertTitle = "User Message";
             userMessage = serverError.response.data.error.message; // This is info for the user.
-            this.alertMessage = userMessage;
+            this.$notify(
+              {
+                group: "alert",
+                type: "danger",
+                title: "User Message",
+                text: userMessage,
+              },
+              -1,
+            );
           } else {
-            this.alertTitle = "Server Message";
+            this.$notify(
-            this.alertMessage = JSON.stringify(serverError.toJSON());
+              {
+                group: "alert",
+                type: "danger",
+                title: "Server Message",
+                text: JSON.stringify(serverError.toJSON()),
+              },
+              -1,
+            );
           }
         } else {
           console.error(
             "Here's the full error trying to save the claim:",
             error,
           );
-          this.alertTitle = "Claim Error";
+          this.$notify(
-          this.alertMessage = error as string;
+            {
+              group: "alert",
+              type: "danger",
+              title: "Claim Error",
+              text: error as string,
+            },
+            -1,
+          );
         }
         // Now set that error for the user to see.
         this.errorMessage = userMessage;

src/views/ProjectViewView.vue

@@ -93,7 +93,7 @@
         <h1 class="text-xl">Given to this Project</h1>
       </div>
       <div>
-        <h1 class="text-xl">... and from this Project</h1>
+        <h1 class="text-xl">... and paid forward from this Project</h1>
       </div>
     </div>
     <div class="flex justify-around">
@@ -108,7 +108,12 @@
                 }}</span>
               </div>
               <div class="flex gap-2" v-if="give.amount">
-                <fa icon="coins" class="fa-fw text-slate-400"></fa>
+                <fa
+                  icon="clock"
+                  v-if="give.unit === 'HUR'"
+                  class="fa-fw text-slate-400"
+                ></fa>
+                <fa icon="coins" v-else class="fa-fw text-slate-400"></fa>
                 <span>{{ give.amount }}</span>
               </div>
               <div class="flex gap-2" v-if="give.description">
@@ -130,7 +135,12 @@
                 }}</span>
               </div>
               <div class="flex gap-2" v-if="give.amount">
-                <fa icon="coins" class="fa-fw text-slate-400"></fa>
+                <fa
+                  icon="clock"
+                  v-if="give.unit === 'HUR'"
+                  class="fa-fw text-slate-400"
+                ></fa>
+                <fa icon="coins" v-else class="fa-fw text-slate-400"></fa>
                 <span>{{ give.amount }}</span>
               </div>
               <div class="flex gap-2">
@@ -285,16 +295,38 @@ export default class ProjectViewView extends Vue {
         this.truncatedDesc = this.description.slice(0, this.truncateLength);
       } else if (resp.status === 404) {
         // actually, axios throws an error so we never get here
-        this.alertMessage = "That project does not exist.";
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "That project does not exist.",
+          },
+          -1,
+        );
       }
     } catch (error: unknown) {
       const serverError = error as AxiosError;
       if (serverError.response?.status === 404) {
-        this.alertMessage = "That project does not exist.";
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "That project does not exist.",
+          },
+          -1,
+        );
       } else {
-        this.alertMessage =
+        this.$notify(
-          "Something went wrong retrieving that project." +
+          {
-          " See logs for more info.";
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Something went wrong retrieving that project. See logs for more info.",
+          },
+          -1,
+        );
         console.error("Error retrieving project:", serverError.message);
       }
     }
@@ -308,12 +340,27 @@ export default class ProjectViewView extends Vue {
       if (resp.status === 200 && resp.data.data) {
         this.givesToThis = resp.data.data;
       } else {
-        this.alertMessage = "Failed to retrieve gives to this project.";
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Failed to retrieve gives to this project.",
+          },
+          -1,
+        );
       }
     } catch (error: unknown) {
       const serverError = error as AxiosError;
-      this.alertMessage =
+      this.$notify(
-        "Something went wrong retrieving gives to this project.";
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Something went wrong retrieving gives to this project.",
+        },
+        -1,
+      );
       console.error(
         "Error retrieving gives to this project:",
         serverError.message,
@@ -329,11 +376,27 @@ export default class ProjectViewView extends Vue {
       if (resp.status === 200 && resp.data.data) {
         this.givesByThis = resp.data.data;
       } else {
-        this.alertMessage = "Failed to retrieve gives by this project.";
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Failed to retrieve gives by this project.",
+          },
+          -1,
+        );
       }
     } catch (error: unknown) {
       const serverError = error as AxiosError;
-      this.alertMessage = "Something went wrong retrieving gives by project.";
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Something went wrong retrieving gives by project.",
+        },
+        -1,
+      );
       console.error(
         "Error retrieving gives by this project:",
         serverError.message,
@@ -364,16 +427,28 @@ export default class ProjectViewView extends Vue {
    */
   async recordGive(giverDid, description, hours) {
     if (!this.activeDid) {
-      this.alertTitle = "Error";
+      this.$notify(
-      this.alertMessage =
+        {
-        "You must select an identity before you can record a give.";
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identity before you can record a give.",
+        },
+        -1,
+      );
       return;
     }
 
     if (!description && !hours) {
-      this.alertTitle = "Error";
+      this.$notify(
-      this.alertMessage =
+        {
-        "You must enter a description or some number of hours.";
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must enter a description or some number of hours.",
+        },
+        -1,
+      );
       return;
     }
 
@@ -392,21 +467,42 @@ export default class ProjectViewView extends Vue {
 
       if (result.status !== 201 || result.data?.error) {
         console.log("Error with give result:", result);
-        this.alertTitle = "Error";
+        this.$notify(
-        this.alertMessage =
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text:
               result.data?.error?.message ||
-          "There was an error recording the give.";
+              "There was an error recording the give.",
+          },
+          -1,
+        );
       } else {
-        this.alertTitle = "Success";
+        this.$notify(
-        this.alertMessage = "That gift was recorded.";
+          {
+            group: "alert",
+            type: "success",
+            title: "Success",
+            text: "That gift was recorded.",
+          },
+          -1,
+        );
       }
     } catch (e) {
       console.log("Error with give caught:", e);
-      this.alertTitle = "Error";
+      this.$notify(
-      this.alertMessage =
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
             e.userMessage ||
             e.response?.data?.error?.message ||
-        "There was an error recording the give.";
+            "There was an error recording the give.",
+        },
+        -1,
+      );
     }
   }
 }

src/views/ProjectsView.vue

@@ -126,8 +126,15 @@ export default class ProjectsView extends Vue {
       }
     } catch (error) {
       console.error("Got error loading projects:", error.message);
-      this.alertTitle = "Error";
+      this.$notify(
-      this.alertMessage = "Got an error loading projects:" + error.message;
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Got an error loading projects: " + error.message,
+        },
+        -1,
+      );
     } finally {
       this.isLoading = false;
     }
@@ -196,8 +203,15 @@ export default class ProjectsView extends Vue {
 
       if (this.numAccounts === 0) {
         console.error("No accounts found.");
-        this.alertTitle = "Error";
+        this.$notify(
-        this.alertMessage = "You need an identity to load your projects.";
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "You need an identity to load your projects.",
+          },
+          -1,
+        );
       } else {
         const identity = await this.getIdentity(activeDid);
         this.current = identity;
@@ -205,8 +219,15 @@ export default class ProjectsView extends Vue {
       }
     } catch (err) {
       console.log("Error initializing:", err);
-      this.alertTitle = "Error";
+      this.$notify(
-      this.alertMessage = "Something went wrong loading your projects.";
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Something went wrong loading your projects.",
+        },
+        -1,
+      );
     }
   }
 

src/views/SeedBackupView.vue

@@ -72,8 +72,15 @@ export default class SeedBackupView extends Vue {
       this.activeAccount = R.find((acc) => acc.did === activeDid, accounts);
     } catch (err) {
       console.error("Got an error loading an identity:", err);
-      this.alertTitle = "Error Loading Account";
+      this.$notify(
-      this.alertMessage = "Got an error loading your seed data.";
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Loading Account",
+          text: "Got an error loading your seed data.",
+        },
+        -1,
+      );
     }
   }
 

src/views/StatisticsView.vue

@@ -62,8 +62,15 @@ export default class StatisticsView extends Vue {
       this.world = newWorld;
     } catch (err) {
       console.log(err);
-      this.alertTitle = "Mounting error";
+      this.$notify(
-      this.alertMessage = err.message;
+        {
+          group: "alert",
+          type: "danger",
+          title: "Mounting Error",
+          text: err.message,
+        },
+        -1,
+      );
     }
   }