From 0ef5d72275b037c3794ca00dcac3e97ba1fddef9 Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
Date: Sun, 14 Jul 2024 23:45:26 +0200
Subject: [PATCH] fix up some things

---
 .github/workflows/deploy.yml      |  2 +-
 src/App.vue                       |  1 +
 src/components/GatheringNode.vue  | 13 ++++++++++++-
 src/components/SortedNodeList.vue |  8 +++++++-
 src/entities/Item.ts              | 11 -----------
 src/entities/Node.ts              |  1 +
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 16e943b..a9e7052 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -13,4 +13,4 @@ jobs:
         with:
           username: 'YouHaveTrouble'
           reponame: 'DiscipleOfLand'
-          token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/src/App.vue b/src/App.vue
index e088964..b43803d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -56,6 +56,7 @@ export default defineComponent({
     }
   },
   async mounted() {
+    this.eorzeaTime = new EorzeaTime();
     setInterval(() => {
       this.eorzeaTime = new EorzeaTime();
     }, 500);
diff --git a/src/components/GatheringNode.vue b/src/components/GatheringNode.vue
index 18c9ff1..b5f2595 100644
--- a/src/components/GatheringNode.vue
+++ b/src/components/GatheringNode.vue
@@ -1,5 +1,5 @@
 <template>
-  <article class="node">
+  <article class="node" :class="{active: gatheringNode.isActive(eorzeaTime)}">
     <div class="timer">
       {{
         gatheringNode.isActive(eorzeaTime) ? 'Active' : prettyTimer(gatheringNode.getSecondsToNextActiveTime(eorzeaTime))
@@ -73,6 +73,13 @@ export default defineComponent({
 </script>
 
 <style scoped lang="scss">
+
+@keyframes pulsing {
+  0% {background-color: rgba(255,255,255, 0.05);}
+  50% {background-color: rgba(255,255,255, 0.075);}
+  100% {background-color: rgba(255,255,255, 0.05);}
+}
+
 .node {
   display: flex;
   flex-direction: row;
@@ -84,6 +91,10 @@ export default defineComponent({
   padding: 0.5rem;
   border-radius: 0.25rem;
 
+  &.active {
+    animation: infinite pulsing 6s;
+  }
+
   .timer {
     min-width: 7rem;
     font-size: 2rem;
diff --git a/src/components/SortedNodeList.vue b/src/components/SortedNodeList.vue
index a2fa0b3..00ef0c5 100644
--- a/src/components/SortedNodeList.vue
+++ b/src/components/SortedNodeList.vue
@@ -42,6 +42,11 @@ export default defineComponent(
           this.displayNodes = this.nodes;
         }
       },
+      displayNodes: {
+        handler() {
+          this.sortListByTime();
+        }
+      },
       eorzeaTime: {
         immediate: true,
         handler(newValue, oldValue) {
@@ -64,8 +69,9 @@ export default defineComponent(
         });
       },
     },
-    mounted() {
+    async mounted() {
       this.displayNodes = this.nodes;
+      this.sortListByTime();
     },
   }
 );
diff --git a/src/entities/Item.ts b/src/entities/Item.ts
index 9830c65..a40a0a3 100644
--- a/src/entities/Item.ts
+++ b/src/entities/Item.ts
@@ -3,23 +3,12 @@ export default class Item {
   readonly id: string;
   readonly name: string;
   readonly level: number;
-  readonly scripType: ScripType | null;
 
   constructor(id: string, data: {[key: string]: number | string | undefined}) {
     this.id = id;
     this.name = data?.name as string;
     this.level = data?.level as number;
-    const scripType: string | undefined = data?.scripType as string;
-    if (scripType != undefined) {
-      this.scripType = typeof data?.scripType === "string" ? scripType.toUpperCase() as ScripType : null;
-    } else {
-      this.scripType = null;
-    }
   }
 
 }
 
-enum ScripType {
-  WHITE = 'white',
-  PURPLE = 'purple',
-}
diff --git a/src/entities/Node.ts b/src/entities/Node.ts
index 64223b1..c4b25db 100644
--- a/src/entities/Node.ts
+++ b/src/entities/Node.ts
@@ -28,6 +28,7 @@ export default class Node {
     this.times = times;
     this.items = items;
     this.nearestAetheryte = nearestAetheryte;
+    items.sort((a, b) => b.level - a.level);
   }
 
   isActive(eorzeaTime: EorzeaTime): boolean {