Merge branch 'master' into give-to-project

README.md

@@ -20,11 +20,6 @@ npm run build
 npm run lint
 ```
 
-### Clear data & restart
-
-Clear cache for localhost, then go to http://localhost:8080/start
-(because it'll generate a new one automatically if you start on the `/account` page).
-
 ### Test key contents
 
 See [this page](openssl_signing_console.rst)
@@ -59,17 +54,35 @@ playing one of two ways:
 
 ### Create multiple identifiers
 
-Go to /import-account and import a new one. Then switch identifiers on the
-bottom of the Your Identity page.
+Go to /start and create or import a new one. Then switch identifiers on the bottom of the Your Identity page.
 
 ### Create keys with alternate tools
 
 See [this page](openssl_signing_console.rst)
 
-### Customize configuration
+### Customize Vue configuration
 See [Configuration Reference](https://cli.vuejs.org/config/).
 
 
+## Scenarios
+
+- Create a new identity as prompted. Go to "Your Identity" screen and copy the ID to the clipboard.
+
+- Go back to /start and import test User `did:ethr:0x000Ee5654b9742f6Fe18ea970e32b97ee2247B51` with this this seed phrase:
+  `seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control`
+  (Other test users are found [here](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js).)
+
+- Go to "Your Contacts" screen and add the ID you copied to the clipboard, and hit "+" to add them.
+
+- Click on the "Registration Unknown" button and register that person to be able to make claims as them.
+
+### Clear data & restart
+
+Clear cache for localhost, then go to http://localhost:8080/start
+(because it'll generate a new one automatically if you start on the `/account` page).
+
+
+
 ## Dependencies
 
 See https://tea.xyz

project.task.yaml

@@ -1,8 +1,8 @@
 
 tasks:
-- allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
 - replace user-affecting console.log & console.error with error messages (eg. catches)
 - if there's no identity, handle it on pages which expect an identity (eg. project -- look for JSON.parse identity calls)
+- .1 show an appropriate message when there are no contacts
 
 - 8 Move to vue-facing-decorator
 
@@ -10,6 +10,9 @@ tasks:
 - 01 give time to a particular project - use "provider" attribute
   - give example assignee:trent
 
+- .1 remove commitments from ProjectView UI
+- 01 add list of 'give' records for a project on ProjectView UI
+
 - 02 Discover page :
   - search :
     - give example assignee:trent
@@ -33,15 +36,12 @@ tasks:
   - 01 Change alerts into a component (to cut down duplicate code)
   - 01 Change "nav" tabs across the bottom into a component (eliminating duplicate code).
   - .5 Fix how icons show on top of bottom bar on ContactAmounts page
+  - .2 Hide "Advanced" section in Account page by default
 
 - show pop-up confirming that settings & contacts have been downloaded
 
 - Ensure each action sent to the server has a confirmation - registration
 
-- stats v1 :
-    - 01 show numeric stats
-    - 01 link to world for specific stats
-
 - 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 https://github.com/konvajs/vue-konva
@@ -55,10 +55,13 @@ tasks:
 - 40 notifications :
   - push
 
+- Discuss whether the remaining tasks are worthwhile before MVP release.
+
 - stats v1 :
-    - 01 show numeric stats
-    - 01 link to world for specific stats
-    - .5 don't load another instance of a bush if it already exists
+  - 01 show numeric stats
+  - 01 link to world for specific stats
+  - .5 don't load another instance of a bush if it already exists
+  - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
 
 - Do we want split first name & last name?
 - remove 'about' page

src/main.ts

@@ -17,6 +17,8 @@ import {
   faCircleCheck,
   faCircleQuestion,
   faCircleUser,
+  faClock,
+  faCoins,
   faCopy,
   faEllipsisVertical,
   faEye,
@@ -24,6 +26,7 @@ import {
   faFileLines,
   faFloppyDisk,
   faFolderOpen,
+  faGift,
   faHand,
   faHouseChimney,
   faLongArrowAltLeft,
@@ -53,6 +56,8 @@ library.add(
   faCircleCheck,
   faCircleQuestion,
   faCircleUser,
+  faClock,
+  faCoins,
   faCopy,
   faEllipsisVertical,
   faEye,
@@ -60,6 +65,7 @@ library.add(
   faFileLines,
   faFloppyDisk,
   faFolderOpen,
+  faGift,
   faHand,
   faHouseChimney,
   faLongArrowAltLeft,

src/views/HomeView.vue

@@ -49,7 +49,7 @@
       Time Safari
     </h1>
 
-    <div>
+    <div class="mb-8">
       <h1 class="text-2xl">Quick Action</h1>
       <p>Choose a contact to whom to show appreciation:</p>
       <!-- similar contact selection code is in multiple places -->
@@ -58,9 +58,9 @@
           v-for="contact in allContacts"
           :key="contact.did"
           @click="openDialog(contact)"
-          class="text-blue-500"
+          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
         >
-          &nbsp;{{ contact.name }},
+          {{ contact.name }}
         </button>
         <span v-if="allContacts.length > 0">&nbsp;or&nbsp;</span>
         <button @click="openDialog()" class="text-blue-500">
@@ -76,25 +76,32 @@
     >
     </GiftedDialog>
 
-    <div class="py-4">
+    <div>
       <h1 class="text-2xl">Latest Activity</h1>
       <span :class="{ hidden: isHiddenSpinner }">
-        <fa icon="spinner" class="fa-fw"></fa>
+        <fa icon="spinner" class="fa-spin-pulse"></fa>
         Loading&hellip;
       </span>
-      <ul class="">
+      <ul>
         <li
-          class="border-b border-slate-300"
+          class="border-b border-slate-300 py-2"
           v-for="record in feedData"
           :key="record.jwtId"
         >
           <div
-            class="border-b text-orange-400 px-8 py-4"
+            class="border-b border-dashed border-slate-400 text-orange-400 py-2 mb-2 font-bold uppercase text-sm"
             v-if="record.jwtId == feedLastViewedId"
           >
-            You've seen all claims below.
+            You've seen all claims below:
+          </div>
+          <div class="flex">
+            <fa
+              icon="gift"
+              class="fa-fw flex-none pt-1 pr-2 text-slate-500"
+            ></fa>
+            <!-- icon values: "coins" = money; "clock" = time; "gift" = others -->
+            <span class="">{{ this.giveDescription(record) }}</span>
           </div>
-          {{ this.giveDescription(record) }}
         </li>
       </ul>
     </div>

src/views/ProjectsView.vue

@@ -70,6 +70,14 @@
       <fa icon="plus" class="fa-fw"></fa>
     </button>
 
+    <!-- Loading Animation -->
+    <div
+      class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
+      v-if="isLoading"
+    >
+      <fa icon="spinner" class="fa-spin-pulse"></fa>
+    </div>
+
     <!-- Results List -->
     <InfiniteScroll @reached-bottom="loadMoreData">
       <ul>