bump version

package.json

@@ -1,6 +1,6 @@
 {
   "name": "discipleofland",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "private": true,
   "type": "module",
   "scripts": {

public/data/items.json

@@ -134,5 +134,11 @@
     "level": 90,
     "stars": 2,
     "perception": 3600
+  },
+  "shaaloani-coffee": {
+    "name": "Shaaloani Coffee",
+    "level": 100,
+    "stars": 2,
+    "perception": 4740
   }
 }

public/data/nodes.json

@@ -249,7 +249,7 @@
     ]
   },
   {
-    "job": "botanist",
+    "job": "miner",
     "type": "unspoiled",
     "position": {
       "zone": "kozamauka",
@@ -311,5 +311,21 @@
     "items": [
       "paldao-log"
     ]
+  },
+  {
+    "job": "botanist",
+    "type": "legendary",
+    "position": {
+      "zone": "shaaloani",
+      "x": 34.9,
+      "y": 16.3
+    },
+    "times": [
+      "04:00-06:00",
+      "16:00-18:00"
+    ],
+    "items": [
+      "shaaloani-coffee"
+    ]
   }
 ]

src/App.vue

@@ -91,7 +91,7 @@ export default defineComponent({
     this.eorzeaTime = new EorzeaTime();
     setInterval(() => {
       this.eorzeaTime = new EorzeaTime();
-    }, 500);
+    }, 1000);
 
     const itemData: Response | null = await fetch("/data/items.json")
       .catch((): null => {

src/components/GatheringNode.vue

@@ -3,51 +3,53 @@
     class="node"
     :class="{active: gatheringNode.isActive(eorzeaTime)}"
   >
-    <div
-      v-if="!gatheringNode.isActive(eorzeaTime)"
-    >
-      <div class="timer">
-        {{
-          prettyTimer(gatheringNode.getSecondsToNextActiveTime(eorzeaTime))
-        }}
-      </div>
-    </div>
-    <div
-      v-else
-    >
-      <div class="timer">
-        Active
-        <div class="countdown">
+    <div class="location-info">
+      <div
+        v-if="!gatheringNode.isActive(eorzeaTime)"
+      >
+        <div class="timer">
           {{
-            prettyTimer(gatheringNode.getSecondsToNextInactiveTime(eorzeaTime))
+            prettyTimer(secondsToNextActiveTime)
           }}
         </div>
       </div>
-    </div>
-    <div class="job">
-      <div class="icon">
-        <img
-          :alt="gatheringNode.job"
-          :src="`https://xivapi.com/cj/1/${gatheringNode.job}.png`"
-          :title="gatheringNode.job"
-          draggable="false"
-        >
+      <div
+        v-else
+      >
+        <div class="timer">
+          Active
+          <div class="countdown">
+            {{
+              prettyTimer(secondsToNextInactiveTime)
+            }}
+          </div>
+        </div>
       </div>
-    </div>
-    <div class="aetheryte">
-      <span class="icon">
-        <img
-          src="https://xivapi.com/img-misc/mappy/aetheryte.png"
-          alt="Aetheryte icon"
-          draggable="false"
-        >
-      </span>
-      <div class="info">
-        <span>{{ zones[gatheringNode.nearestAetheryte.position.zone]?.name?.en }}</span>
-        <span>{{ gatheringNode.nearestAetheryte.name.en }}</span>
-        <span>{{
-          gatheringNode.nearestAetheryte.position.x.toFixed(1)
-        }}, {{ gatheringNode.nearestAetheryte.position.y.toFixed(1) }}</span>
+      <div class="job">
+        <div class="icon">
+          <img
+            :alt="gatheringNode.job"
+            :src="`https://xivapi.com/cj/1/${gatheringNode.job}.png`"
+            :title="gatheringNode.job"
+            draggable="false"
+          >
+        </div>
+      </div>
+      <div class="aetheryte">
+        <span class="icon">
+          <img
+            src="https://xivapi.com/img-misc/mappy/aetheryte.png"
+            alt="Aetheryte icon"
+            draggable="false"
+          >
+        </span>
+        <div class="info">
+          <span class="zone-name">{{ zones[gatheringNode.location.zone]?.name?.en }}</span>
+          <span class="aetheryte-name">{{ gatheringNode.nearestAetheryte.name.en }}</span>
+          <span class="coords">{{
+            gatheringNode.nearestAetheryte.position.x.toFixed(1)
+          }}, {{ gatheringNode.nearestAetheryte.position.y.toFixed(1) }}</span>
+        </div>
       </div>
     </div>
     <div class="items">
@@ -69,6 +71,12 @@ import Zone from "@/entities/Zone";
 
 export default defineComponent({
   name: "GatheringNode",
+  data() {
+    return {
+      secondsToNextInactiveTime: 0 as number,
+      secondsToNextActiveTime: 0 as number,
+    };
+  },
   props: {
     gatheringNode: {
       type: Object as PropType<Node>,
@@ -83,13 +91,27 @@ export default defineComponent({
       required: true
     },
   },
+  watch: {
+    eorzeaTime: {
+      handler() {
+        this.calculateTimers()
+      }
+    }
+  },
   methods: {
     prettyTimer(seconds: number): string {
       const minutes = Math.floor(seconds / 60);
       const remainingSeconds = seconds % 60;
       return `${minutes}:${remainingSeconds < 10 ? '0' : ''}${remainingSeconds}`;
+    },
+    calculateTimers() {
+      this.secondsToNextInactiveTime = this.gatheringNode.getSecondsToNextInactiveTime(this.eorzeaTime);
+      this.secondsToNextActiveTime = this.gatheringNode.getSecondsToNextActiveTime(this.eorzeaTime);
     }
   },
+  mounted() {
+    this.calculateTimers();
+  }
 });
 </script>
 
@@ -119,6 +141,14 @@ export default defineComponent({
   border-radius: 0.25rem;
   content-visibility: auto;
 
+  .location-info {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 1rem;
+    align-items: center;
+  }
+
   &.active {
     animation: infinite pulsing 6s;
   }
@@ -152,7 +182,7 @@ export default defineComponent({
   .aetheryte {
     display: flex;
     flex-direction: row;
-    justify-content: center;
+    justify-content: flex-start;
     align-items: center;
     gap: 0.25rem;
     font-size: 1.5rem;
@@ -176,6 +206,17 @@ export default defineComponent({
       justify-content: center;
       align-items: start;
       gap: 0.1rem;
+      line-height: 1;
+
+      .zone-name {
+        font-size: 0.75rem;
+      }
+      .aetheryte-name {
+        font-size: 1.1rem;
+      }
+      .coords {
+        padding-top: 0.15rem;
+      }
     }
   }
 

src/components/SortedNodeList.vue

@@ -49,9 +49,7 @@ export default defineComponent(
         }
       },
       eorzeaTime: {
-        handler(newValue, oldValue) {
-          if (oldValue === undefined) return;
-          if (newValue?.getMinutes() === oldValue?.getMinutes()) return;
+        handler() {
           this.sortListByTime();
         }
       }

src/entities/TimeRange.ts

@@ -13,7 +13,7 @@ export default class TimeRange {
   public isWithinTimeFrame(hour: number, minute: number): boolean {
     return (
         this.from[0] < hour || this.from[0] == hour && this.from[1] <= minute)
-        && (hour < this.to[0] || hour == this.to[0] && minute <= this.to[1]
+        && (hour < this.to[0] || hour == this.to[0] && minute < this.to[1]
       );
   }