Merge branch 'master' into move-id-switch

Reviewed-on: trent_larson/kick-starter-for-time-pwa#61

project.task.yaml

@@ -2,16 +2,12 @@
 tasks:
 - test alerts on all pages -- or refactor to new "notify" (since AlertMessage refactoring may require a change, et. ContactQRScanShowView)
 - .2 bug - on contacts view, click on "to" & "from" and nothing happens
-- 01 add a location for a project via map pin :
-  - add with a "location" field containing this: { "geo":{ "@type":"GeoCoordinates", "latitude":40.883944, "longitude":-111.884787 } }
 - 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 add my bounding box(es) of interest for searches on Nearby part of Discovery page
+- .5 search by a bounding box(s) of interest 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
 
 - 08 Scan QR code to import into contacts assignee:matthew
   - SEE: https://github.com/gruhn/vue-qrcode-reader
@@ -36,7 +32,6 @@ tasks:
 - .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist assignee-group:ui
 - .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?) assignee:jose assignee-group:ui
 - .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
-- .2 move 'switch identity' to the advanced section assignee-group:ui
 - .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164
 - .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
 

src/main.ts

@@ -35,6 +35,7 @@ import {
   faGift,
   faHand,
   faHouseChimney,
+  faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
@@ -80,6 +81,7 @@ library.add(
   faGift,
   faHand,
   faHouseChimney,
+  faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,

src/views/AccountViewView.vue

@@ -117,12 +117,6 @@
     >
       Edit Identity
     </router-link>
-    <router-link
-      :to="{ name: 'identity-switcher' }"
-      class="block text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-    >
-      Switch Identity / No Identity
-    </router-link>
     <button
       @click="
         this.$notify(
@@ -238,6 +232,15 @@
         </div>
       </div>
 
+      <div class="flex py-2">
+        <router-link
+          :to="{ name: 'identity-switcher' }"
+          class="block text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
+        >
+          Switch Identity / No Identity
+        </router-link>
+      </div>
+
       <div class="flex py-2">
         Claim Server
         <input

src/views/HomeView.vue

@@ -111,7 +111,7 @@
 
     <div class="mb-8">
       <h2 class="text-xl font-bold">Quick Action</h2>
-      <p class="mb-4">Show appreciation to a contact:</p>
+      <p class="mb-4">Record a gift from a contact:</p>
 
       <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
         <li @click="openDialog()">

src/views/ProjectViewView.vue

@@ -39,6 +39,16 @@
                 <fa icon="calendar" class="fa-fw text-slate-400"></fa>
                 {{ timeSince }}
               </div>
+              <div v-if="latitude || longitude">
+                <fa icon="location-dot" class="fa-fw text-slate-400"></fa>
+                <a
+                  :href="getOpenStreetMapUrl()"
+                  target="_blank"
+                  class="underline"
+                >
+                  Map View
+                </a>
+              </div>
             </div>
           </div>
         </div>
@@ -231,6 +241,8 @@ export default class ProjectViewView extends Vue {
   expanded = false;
   givesToThis: Array<GiveServerRecord> = [];
   givesByThis: Array<GiveServerRecord> = [];
+  latitude = 0;
+  longitude = 0;
   name = "";
   issuer = "";
   projectId = localStorage.getItem("projectId") || ""; // handle ID
@@ -326,6 +338,8 @@ export default class ProjectViewView extends Vue {
         this.name = resp.data.claim?.name || "(no name)";
         this.description = resp.data.claim?.description || "(no description)";
         this.truncatedDesc = this.description.slice(0, this.truncateLength);
+        this.latitude = resp.data.claim?.location?.geo?.latitude || 0;
+        this.longitude = resp.data.claim?.location?.geo?.longitude || 0;
       } else if (resp.status === 404) {
         // actually, axios throws an error so we never get here
         this.$notify(
@@ -441,6 +455,20 @@ export default class ProjectViewView extends Vue {
     this.$refs.customDialog.open(contact);
   }
 
+  getOpenStreetMapUrl() {
+    // Google URL is https://maps.google.com/?q=LAT,LONG
+    return (
+      "https://www.openstreetmap.org/?mlat=" +
+      this.latitude +
+      "&mlon=" +
+      this.longitude +
+      "#map=15/" +
+      this.latitude +
+      "/" +
+      this.longitude
+    );
+  }
+
   handleDialogResult(result) {
     if (result.action === "confirm") {
       return new Promise((resolve) => {

web-push.md

@@ -314,3 +314,47 @@ OneSignal) can perform in the role of such proxies.
 
 #4 -The INTERMEDIARY- doesn't appear to be anything we should be spending our
 time on.
+
+A BROWSER may also remove a subscription.   In order to remove a subscription,
+the registration record must be retrieved from the serviceWorker using
+`navigator.serviceWorker.ready`.  Within the `ready` property is the
+`pushManager` which has a `getSubscription` method. Once you have the
+subscription object, you may call the `unsubscribe` method.  `unsubscribe` is
+asynchronnous and returns a boolean true if it is successful in removing the
+subscription and false if not.
+
+
+```
+async function unsubscribeFromPush() {
+  // Check if the browser supports service workers
+  if ("serviceWorker" in navigator) {
+    // Get the registration object for the service worker
+    const registration = await navigator.serviceWorker.ready;
+
+    // Get the existing subscription
+    const subscription = await registration.pushManager.getSubscription();
+
+    if (subscription) {
+      // Unsubscribe
+      const successful = await subscription.unsubscribe();
+      if (successful) {
+        console.log("Successfully unsubscribed from push notifications.");
+        // You can also inform your server to remove this subscription
+      } else {
+        console.log("Failed to unsubscribe from push notifications.");
+      }
+    } else {
+      console.log("No subscription was found.");
+    }
+  } else {
+    console.log("Service workers are not supported by this browser.");
+  }
+}
+
+// Unsubscribe from push notifications
+unsubscribeFromPush().catch((err) => {
+  console.error("An error occurred while unsubscribing from push notifications", err);
+});
+```
+
+NOTE: We could offer an option within the app to "mute" these notifications. This wouldn't turn off the notifications at the browser level, but you could make it so that your Service Worker doesn't display them even if it receives them.