From 7692cc2b35238340f4f96a89831e18b2c54d047e Mon Sep 17 00:00:00 2001
From: Trent Larson <trent@trentlarson.com>
Date: Mon, 1 Apr 2024 19:04:54 -0600
Subject: [PATCH] add logic to send a time for notifications

---
 src/App.vue      | 106 ++++++++++++++++++++++++++++++++++++++++-------
 src/libs/util.ts |   6 ++-
 src/main.ts      |   4 ++
 3 files changed, 100 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 63c3ebab7..d4f9aa0b6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -191,7 +191,7 @@
             >
               <div class="w-full px-6 py-6 text-slate-900 text-center">
                 <p v-if="serviceWorkerReady" class="text-lg mb-4">
-                  Would you like to <b>turn on</b> notifications for this app?
+                  Would you like to be notified of new activity once a day?
                 </p>
                 <p v-else class="text-lg mb-4">
                   Waiting for system initialization, which may take up to 10
@@ -199,22 +199,42 @@
                   <fa icon="spinner" spin />
                 </p>
 
-                <button
-                  v-if="serviceWorkerReady"
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                  @click="
-                    close(notification.id);
-                    turnOnNotifications();
-                  "
-                >
-                  Turn on Notifications
-                </button>
+                <div v-if="serviceWorkerReady">
+                  <span class="flex flex-row justify-center">
+                    <span class="mt-2">Yes, tell me at: </span>
+                    <input
+                      type="number"
+                      class="rounded-l border border-r-0 border-slate-400 ml-2 mt-2 px-2 py-2 text-center w-20"
+                      v-model="hourInput"
+                    />
+                    <span
+                      class="rounded-r border border-slate-400 bg-slate-200 text-center text-blue-500 mt-2 px-2 py-2 w-20"
+                      @click="hourAm = !hourAm"
+                    >
+                      <span v-if="hourAm"> AM <fa icon="chevron-down" /> </span>
+                      <span v-else> PM <fa icon="chevron-up" /> </span>
+                    </span>
+                  </span>
+                  <button
+                    class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white mt-2 px-2 py-2 rounded-md"
+                    @click="
+                      () => {
+                        if (checkHour()) {
+                          close(notification.id);
+                          turnOnNotifications();
+                        }
+                      }
+                    "
+                  >
+                    Turn on Daily Message
+                  </button>
+                </div>
 
                 <button
                   @click="close(notification.id)"
-                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
+                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white mt-4 px-2 py-2 rounded-md"
                 >
-                  Maybe Later
+                  No, Not Now
                 </button>
               </div>
             </div>
@@ -297,8 +317,11 @@
 <style></style>
 
 <script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
 import axios from "axios";
+import { Vue, Component } from "vue-facing-decorator";
+
+import * as libsUtil from "@/libs/util";
+
 interface ServiceWorkerMessage {
   type: string;
   data: string;
@@ -332,7 +355,9 @@ export default class App extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   b64 = "";
-  serviceWorkerReady = false;
+  hourAm = true;
+  hourInput = "8";
+  serviceWorkerReady = true;
 
   async mounted() {
     try {
@@ -461,6 +486,48 @@ export default class App extends Vue {
     });
   }
 
+  // this allows us to show an error without closing the dialog
+  checkHour() {
+    if (!libsUtil.isNumeric(this.hourInput)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Not a Number",
+          text: "The time must be an hour number.",
+        },
+        5000,
+      );
+      return false;
+    }
+    const hourNum = libsUtil.numberOrZero(this.hourInput);
+    if (!Number.isInteger(hourNum)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Not a Whole Number",
+          text: "The time must be a whole hour number.",
+        },
+        5000,
+      );
+      return false;
+    }
+    if (hourNum < 1 || hourNum > 12) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Not a Whole Number",
+          text: "The time must be an hour between 1 and 12.",
+        },
+        5000,
+      );
+      return false;
+    }
+    return true;
+  }
+
   public async turnOnNotifications() {
     return this.askPermission()
       .then((permission) => {
@@ -486,6 +553,15 @@ export default class App extends Vue {
                 },
                 -1,
               );
+              // we already checked that this is a valid hour number
+              const hourNum = libsUtil.numberOrZero(this.hourInput);
+              const utcHour =
+                hourNum + Math.round(new Date().getTimezoneOffset() / 60);
+
+              // This ignore commentary is because I'm adding non-standard stuff to the subscription object.
+              // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+              // @ts-ignore
+              subscription.notifyTime = { utcHour: utcHour };
               this.sendSubscriptionToServer(subscription);
               return subscription;
             } else {
diff --git a/src/libs/util.ts b/src/libs/util.ts
index 1a613df8c..7c69b7830 100644
--- a/src/libs/util.ts
+++ b/src/libs/util.ts
@@ -56,9 +56,13 @@ export function iconForUnitCode(unitCode: string) {
 }
 
 // from https://stackoverflow.com/a/175787/845494
+// ... though it appears even this isn't precisely right so keep doing "|| 0" or something in sensitive places
 //
 export function isNumeric(str: string): boolean {
-  return !isNaN(+str);
+  // This ignore commentary is because typescript complains when you pass a string to isNaN.
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  return !isNaN(str) && !isNaN(parseFloat(str));
 }
 
 export function numberOrZero(str: string): number {
diff --git a/src/main.ts b/src/main.ts
index ebf431c2e..9d5c93516 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -20,8 +20,10 @@ import {
   faCalendar,
   faCamera,
   faCheck,
+  faChevronDown,
   faChevronLeft,
   faChevronRight,
+  faChevronUp,
   faCircle,
   faCircleCheck,
   faCircleInfo,
@@ -81,8 +83,10 @@ library.add(
   faCalendar,
   faCamera,
   faCheck,
+  faChevronDown,
   faChevronLeft,
   faChevronRight,
+  faChevronUp,
   faCircle,
   faCircleCheck,
   faCircleInfo,