Merge branch 'master' into no-accounts-in-memory

project.task.yaml

@@ -1,32 +1,35 @@
 
 tasks:
-- 40 notifications :
-  - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
-
 - 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 Replace Gifted/Give in ContactsView with GiftedDialog assignee:matthew
-- 02 Fix images on projectview - allow choice of image from a pallete of images or a url image (discovery page display also)
-  - SEE: https://github.com/dmester/jdenticon assignee:jose
+- 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:jose
+- 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 assignee:matthew
-  - SEE: https://github.com/gruhn/vue-qrcode-reader
+- 08 Scan QR code to import into contacts.
 
-- Show pop-up or some message confirming that settings & contacts download has been initiated/finished assignee:matthew
+- 40 notifications :
+    - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data
 
-- Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s)
-  - SEE: https://github.com/emmanuelsw/notiwind assignee:jose
+- refactor UI :
+  - .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 or some message confirming that settings & contacts download has been initiated/finished
+
+- 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")
-  - 01 quick action - send action, maybe choose via canvas tool 
-    - SEE: https://github.com/konvajs/vue-konva
+  - 01 quick action - send action, maybe choose via canvas tool https://github.com/konvajs/vue-konva
 
-- 24 Move to Vite assignee:matthew
+- 24 Move to Vite
 
+- .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
+- .2 there are three dots at the top of ProjectViewView that refreshes the page but doesn't do anything else
+- 01 fix images on project page, on discovery page
 - .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist
-- .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?) assignee:jose
+- .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?)
 - .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
 
 - Discuss whether the remaining tasks are worthwhile before MVP release.

src/components/GiftedDialog.vue

@@ -2,7 +2,7 @@
   <div v-if="visible" class="dialog-overlay">
     <div class="dialog">
       <h1 class="text-xl font-bold text-center mb-4">
-        {{ message }} {{ giver?.did || "somebody not specified" }}
+        {{ message }} {{ giver?.name || "somebody not specified" }}
       </h1>
       <input
         type="text"

src/views/ContactAmountsView.vue

@@ -1,18 +1,6 @@
 <template>
   <QuickNav selected="Contacts"></QuickNav>
   <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div id="ViewBreadcrumb" class="mb-8">
-      <h1 class="text-lg text-center font-light relative px-7">
-        <!-- Back -->
-        <router-link
-          :to="{ name: 'contacts' }"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          ><fa icon="chevron-left" class="fa-fw"></fa
-        ></router-link>
-      </h1>
-    </div>
-
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
       Given with {{ contact?.name }}
     </h1>

src/views/ContactsView.vue

@@ -140,6 +140,12 @@
                 >
                   {{ givenByMeDescriptions[contact.did] }}
                 </span>
+                <button
+                  class="text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-6"
+                  @click="onClickAddGive(activeDid, contact.did)"
+                >
+                  +
+                </button>
               </div>
               <div class="tooltip px-2">
                 from:
@@ -159,6 +165,12 @@
                 >
                   {{ givenToMeDescriptions[contact.did] }}
                 </span>
+                <button
+                  class="text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-6"
+                  @click="onClickAddGive(contact.did, activeDid)"
+                >
+                  +
+                </button>
               </div>
               <router-link
                 :to="{
@@ -167,9 +179,6 @@
                 }"
                 class="tooltip"
               >
-                <button>
-                  <fa icon="gift" class="pt-1 pr-2 text-slate-500" />Give
-                </button>
                 <fa icon="file-lines" class="text-slate-600 fa-fw ml-1" />
                 <span class="tooltiptext-left">See All Given Activity</span>
               </router-link>
@@ -203,13 +212,12 @@ import {
 import { Component, Vue } from "vue-facing-decorator";
 import AlertMessage from "@/components/AlertMessage";
 import QuickNav from "@/components/QuickNav";
-import GiftedDialog from "@/components/GiftedDialog.vue";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
 
 @Component({
-  components: { AlertMessage, QuickNav, GiftedDialog },
+  components: { AlertMessage, QuickNav },
 })
 export default class ContactsView extends Vue {
   activeDid = "";

src/views/HomeView.vue

@@ -22,7 +22,7 @@
           <h3
             class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
           >
-            {{ contact.name || contact.did }}
+            {{ contact.name || "(no name)" }}
           </h3>
         </li>
       </ul>
@@ -39,7 +39,6 @@
       <!-- If there are no contacts, show this instead: -->
       <div
         class="rounded border border-dashed border-slate-300 bg-slate-100 px-4 py-3 text-center italic text-slate-500"
-        v-if="allContacts.length === 0"
       >
         (No contacts to show.)
       </div>
@@ -287,7 +286,7 @@ export default class HomeView extends Vue {
   handleDialogResult(result) {
     if (result.action === "confirm") {
       return new Promise((resolve) => {
-        this.recordGive(result.giver?.did, result.description, result.hours);
+        this.recordGive(result.contact?.did, result.description, result.hours);
         resolve();
       });
     } else {

src/views/ProjectViewView.vue

@@ -12,6 +12,13 @@
         >
           <fa icon="chevron-left" class="fa-fw"></fa>
         </button>
+        <!-- Context Menu -->
+        <a
+          href=""
+          class="text-lg text-center px-2 py-1 absolute -right-2 -top-1"
+          ><fa icon="ellipsis-vertical" class="fa-fw"></fa
+        ></a>
+
         View Plan
       </h1>
     </div>
@@ -49,7 +56,6 @@
         </div>
       </div>
       <button
-        v-if="issuer == activeDid"
         type="button"
         class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
         @click="onEditClick()"