From 5928020c3acf653ee890c53727c9d07ef2e93e5d Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Tue, 20 Dec 2022 22:16:39 +0100
Subject: [PATCH 01/38] hotfix: invalidation was disabled on autorefresh

---
 src/components/RefreshComponent.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/RefreshComponent.vue b/src/components/RefreshComponent.vue
index 66285c6..713b8b4 100644
--- a/src/components/RefreshComponent.vue
+++ b/src/components/RefreshComponent.vue
@@ -34,8 +34,8 @@ const localMethods = {
 
         console.log('is expired', this.isExpired())
 
-        // if(this.isExpired() && this.preferences.refresh)
-        //   this.invalidate(false, this.relay)
+        if(this.isExpired() && this.preferences.refresh)
+          this.invalidate(false, this.relay)
 
       }, 1000)
     }
@@ -60,9 +60,7 @@ export default defineComponent({
   },
   updated(){
     this.setCache('preferences')
-    // if(this.relays && this.isDone())
-    //   this.setCache('lastUpdate')
-
+    
     this.refreshData.untilNext = this.timeUntilRefresh() 
     this.refreshData.sinceLast = this.timeSinceRefresh() 
   },

From b2b8e6b33e0becd4b380e3c06d8c5f3fbca19d66 Mon Sep 17 00:00:00 2001
From: 23po <ckodalo@gmail.com>
Date: Wed, 21 Dec 2022 02:08:16 +0300
Subject: [PATCH 02/38] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index fab2137..34e9636 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -98,3 +98,4 @@ relays:
   - wss://nostr.tunnelsats.com
   - wss://nostr.leximaster.com
   - wss://nostr.hugo.md
+  - wss://nostr.mtandao.xyz

From 5423eaf40921b54135f4bc05b50cc89a2deba845 Mon Sep 17 00:00:00 2001
From: Ben Weeks <ben.weeks@outlook.com>
Date: Tue, 20 Dec 2022 23:20:01 +0000
Subject: [PATCH 03/38] Added nostr.robotechy.com

Added nostr.robotechy.com
---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index fab2137..9398717 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -98,3 +98,4 @@ relays:
   - wss://nostr.tunnelsats.com
   - wss://nostr.leximaster.com
   - wss://nostr.hugo.md
+  - wss://nostr.robotechy.com

From 2679ff114a7a933dc980294f8c6db2fa4817ed8a Mon Sep 17 00:00:00 2001
From: Ron Stoner <6909088+ronaldstoner@users.noreply.github.com>
Date: Tue, 20 Dec 2022 19:46:19 -0500
Subject: [PATCH 04/38] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index f730f86..2179525 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -100,3 +100,4 @@ relays:
   - wss://nostr.hugo.md
   - wss://nostr.robotechy.com
   - wss://nostr.mtandao.xyz
+  - wss://relay.stoner.com

From 96e66cf7e167b2fcfeded3d0862c20acd88ee4aa Mon Sep 17 00:00:00 2001
From: liquidso <48312754+liquidso@users.noreply.github.com>
Date: Tue, 20 Dec 2022 16:52:48 -0800
Subject: [PATCH 05/38] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index f730f86..112d7b9 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -1,4 +1,5 @@
 relays:
+  - wss://nostr.bongbong.com
   - wss://nostr-3.orba.ca
   - wss://satstacker.cloud
   - wss://freedom-relay.herokuapp.com/ws

From 923f0dce16d4dc7b060653af62f341e9780f04b8 Mon Sep 17 00:00:00 2001
From: doood <doood@gruntwerk.org>
Date: Tue, 20 Dec 2022 20:34:09 -0700
Subject: [PATCH 06/38] Updated relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index d39298b..2bb413f 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -102,3 +102,4 @@ relays:
   - wss://nostr.robotechy.com
   - wss://nostr.mtandao.xyz
   - wss://relay.stoner.com
+  - wss://nostr.gruntwerk.org

From e5e9dc2820699fb9e93393a59a5c2c3ab01ba6f1 Mon Sep 17 00:00:00 2001
From: Steven Black <steveb@stevenblack.com>
Date: Tue, 20 Dec 2022 23:06:32 -0500
Subject: [PATCH 07/38] Add new relay nostr.mado.io.

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index d39298b..bd0eafb 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -102,3 +102,4 @@ relays:
   - wss://nostr.robotechy.com
   - wss://nostr.mtandao.xyz
   - wss://relay.stoner.com
+  - wss://nostr.mado.io

From b9e915d68118f952e88c00b37e18882d3df5c50f Mon Sep 17 00:00:00 2001
From: 0x617865 <120437617+0x617865@users.noreply.github.com>
Date: Wed, 21 Dec 2022 13:41:23 +0530
Subject: [PATCH 08/38] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index 2c8940b..f32e948 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -1,4 +1,5 @@
 relays:
+  - wss://relay.nyx.ma
   - wss://nostr.bongbong.com
   - wss://nostr-3.orba.ca
   - wss://satstacker.cloud

From 0d1a897be6111db60faf32df19693e6243da03a3 Mon Sep 17 00:00:00 2001
From: osito <74455114+blckbx@users.noreply.github.com>
Date: Wed, 21 Dec 2022 09:52:49 +0100
Subject: [PATCH 09/38] rm nostr.tunnelsats.com

test server removed
---
 relays.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/relays.yaml b/relays.yaml
index 2c8940b..dee4c81 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -96,7 +96,6 @@ relays:
   - wss://nostr.einundzwanzig.space
   - wss://nostr.d11n.net
   - wss://nostr1.tunnelsats.com
-  - wss://nostr.tunnelsats.com
   - wss://nostr.leximaster.com
   - wss://nostr.hugo.md
   - wss://nostr.robotechy.com

From 19d0bd3b05c004bc0d44d4dfac902249ad5812cf Mon Sep 17 00:00:00 2001
From: Thomas Zarebczan <tzarebczan@users.noreply.github.com>
Date: Wed, 21 Dec 2022 10:00:29 -0500
Subject: [PATCH 10/38] add my relay

---
 relays.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/relays.yaml b/relays.yaml
index f640c25..094877d 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -104,3 +104,5 @@ relays:
   - wss://relay.stoner.com
   - wss://nostr.mado.io
   - wss://nostr.gruntwerk.org
+  - wss://jiggytom.ddns.net
+  

From ef1872c77bc29dadfbbb0d20c5367fd28f05b8f7 Mon Sep 17 00:00:00 2001
From: saneftw <39649316+saneftw@users.noreply.github.com>
Date: Wed, 21 Dec 2022 20:36:31 +0200
Subject: [PATCH 11/38] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index f640c25..9585d63 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -104,3 +104,4 @@ relays:
   - wss://relay.stoner.com
   - wss://nostr.mado.io
   - wss://nostr.gruntwerk.org
+  - wss://nostr.utxo.lol

From 2cf092ba32ec429bd6f90d1a8a87e705bcda98a3 Mon Sep 17 00:00:00 2001
From: livingroomofsatoshi <daniel@livingroomofsatoshi.com>
Date: Thu, 22 Dec 2022 12:26:53 +1000
Subject: [PATCH 12/38] Add nostr relay from Wallet of Satoshi

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index fcde07f..1b97a77 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -106,3 +106,4 @@ relays:
   - wss://nostr.gruntwerk.org
   - wss://nostr.utxo.lol
   - wss://jiggytom.ddns.net
+  - wss://nostr.walletofsatoshi.com

From 128b97e716b41102005b0763d82aceee203adcaf Mon Sep 17 00:00:00 2001
From: wormrobot <103574444+wormrobot@users.noreply.github.com>
Date: Thu, 22 Dec 2022 02:22:41 -0500
Subject: [PATCH 13/38] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index fcde07f..5050ff0 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -2,6 +2,7 @@ relays:
   - wss://relay.nyx.ma
   - wss://nostr.bongbong.com
   - wss://nostr-3.orba.ca
+  - wss://wizards.wormrobot.org
   - wss://satstacker.cloud
   - wss://freedom-relay.herokuapp.com/ws
   - wss://nostr-relay.freeberty.net

From 5b5bbdba8e45068df71892ee199d952dc9508a73 Mon Sep 17 00:00:00 2001
From: Liviu Damian <liviudm@liviudm.com>
Date: Thu, 22 Dec 2022 12:14:17 +0200
Subject: [PATCH 14/38] Add DigitalMOB relay

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index fcde07f..695fe0e 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -106,3 +106,4 @@ relays:
   - wss://nostr.gruntwerk.org
   - wss://nostr.utxo.lol
   - wss://jiggytom.ddns.net
+  - wss://nostr-relay.digitalmob.ro

From 1265f530a347031d8e36084c800448be263c7fa9 Mon Sep 17 00:00:00 2001
From: jason-me <mail@jason-hester.me>
Date: Thu, 22 Dec 2022 13:40:53 -0600
Subject: [PATCH 15/38] Update relays.yaml

Added a relay
---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index a2b0899..a95eaa8 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -109,3 +109,4 @@ relays:
   - wss://jiggytom.ddns.net
   - wss://nostr-relay.digitalmob.ro
   - wss://nostr.walletofsatoshi.com
+  - wss://nostr.roundrockbitcoiners.com

From 5629cbdc2e1bbbbe07f90250ae7a453e5811ef20 Mon Sep 17 00:00:00 2001
From: Ezofox <121224529+Sakhalinfox@users.noreply.github.com>
Date: Thu, 22 Dec 2022 16:06:20 -0500
Subject: [PATCH 16/38] Update relays.yml - Added nostr.orangepill.dev

Added relay wss://nostr.orangepill.dev
---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index a2b0899..189e7ca 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -109,3 +109,4 @@ relays:
   - wss://jiggytom.ddns.net
   - wss://nostr-relay.digitalmob.ro
   - wss://nostr.walletofsatoshi.com
+  - wss://nostr.orangepill.dev

From 230497ad6a30c183a90c2879531648f51bcfa11b Mon Sep 17 00:00:00 2001
From: Arun Nedun <admin@visybl.com>
Date: Thu, 22 Dec 2022 21:16:33 -0500
Subject: [PATCH 17/38] Built on nostr_ts_relay to take on load... AWS EC2
 X-large

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index 2f71fdf..bf4fa57 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -111,3 +111,4 @@ relays:
   - wss://nostr.walletofsatoshi.com
   - wss://nostr.roundrockbitcoiners.com
   - wss://nostr.orangepill.dev
+  - wss://nostr1.starbackr.me

From 35ba7fe94b0f530abf9b941cff4ecf868c2f20f1 Mon Sep 17 00:00:00 2001
From: Sebastian Sieber <sebastian.sieber@gmail.com>
Date: Fri, 23 Dec 2022 22:39:40 +0800
Subject: [PATCH 18/38] Update relays.yaml

Added Singapore-based relay: wss://sg.qemura.xyz
---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index bf4fa57..a503756 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -1,4 +1,5 @@
 relays:
+  - wss://sg.qemura.xyz
   - wss://relay.nyx.ma
   - wss://nostr.bongbong.com
   - wss://nostr-3.orba.ca

From bbfb115dea90938e27efad961dbff08657ac1896 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Fri, 23 Dec 2022 22:56:08 +0100
Subject: [PATCH 19/38] change tab order, fix files mess

---
 src/pages/HomePage.vue                        |  25 +-
 src/pages/groups/GroupByAvailability.vue      | 135 ---------
 src/pages/groups/GroupByNone.vue              | 100 -------
 src/pages/lists/RelayGroupedListComponent.vue | 280 ------------------
 src/pages/lists/RelayListComponent.vue        | 265 -----------------
 src/pages/single/RelaySingleComponent.vue     | 248 ----------------
 6 files changed, 13 insertions(+), 1040 deletions(-)
 delete mode 100644 src/pages/groups/GroupByAvailability.vue
 delete mode 100644 src/pages/groups/GroupByNone.vue
 delete mode 100644 src/pages/lists/RelayGroupedListComponent.vue
 delete mode 100644 src/pages/lists/RelayListComponent.vue
 delete mode 100644 src/pages/single/RelaySingleComponent.vue

diff --git a/src/pages/HomePage.vue b/src/pages/HomePage.vue
index c5ad85f..3f4f7c8 100644
--- a/src/pages/HomePage.vue
+++ b/src/pages/HomePage.vue
@@ -23,16 +23,6 @@
       <column :xs="12" :md="12" :lg="12" class="list">
         <span>Group By:</span>
         <tabs :options="{ useUrlFragment: false }" @clicked="tabClicked" @changed="tabChanged" nav-item-class="nav-item">
-            <tab name="None">
-              <GroupByNone
-                :relays="relays"
-                :result="result"
-                :geo="geo"
-                :messages="messages"
-                :alerts="alerts"
-                :connections="connections">
-              </GroupByNone>
-            </tab>
             <tab name="Availability">
               <GroupByAvailability
                 section="processing"
@@ -45,6 +35,17 @@
                 :showJson="false">
                 </GroupByAvailability>
             </tab>
+            <tab name="None">
+              <GroupByNone
+                :relays="relays"
+                :result="result"
+                :geo="geo"
+                :messages="messages"
+                :alerts="alerts"
+                :connections="connections">
+              </GroupByNone>
+            </tab>
+            
         </tabs>
       </column>
     </row>
@@ -92,8 +93,8 @@ import { version } from '../../package.json'
 import { relays } from '../../relays.yaml'
 import { geo } from '../../cache/geo.yaml'
 
-import GroupByNone from './groups/GroupByNone.vue'
-import GroupByAvailability from './groups/GroupByAvailability.vue'
+import GroupByNone from '../components/GroupByNone.vue'
+import GroupByAvailability from '../components/GroupByAvailability.vue'
 
 export default defineComponent({
   title: "nostr.watch registry & network status",
diff --git a/src/pages/groups/GroupByAvailability.vue b/src/pages/groups/GroupByAvailability.vue
deleted file mode 100644
index db7ec11..0000000
--- a/src/pages/groups/GroupByAvailability.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
-  <table>
-    <RelayGroupedListComponent
-      section="public"
-      :relays="relays"
-      :result="result"
-      :geo="geo"
-      :messages="messages"
-      :alerts="alerts"
-      :connections="connections"
-    />
-
-    <RelayGroupedListComponent
-      section="restricted"
-      :relays="relays"
-      :result="result"
-      :geo="geo"
-      :messages="messages"
-      :alerts="alerts"
-      :connections="connections"
-    />
-
-    <RelayGroupedListComponent
-      section="offline"
-      :relays="relays"
-      :result="result"
-      :geo="geo"
-      :messages="messages"
-      :alerts="alerts"
-      :connections="connections"
-    />
-
-    <RelayGroupedListComponent
-      section="processing"
-      :relays="relays"
-      :result="result"
-      :messages="messages"
-      :alerts="alerts"
-      :connections="connections"
-      :showJson="false"
-    />
-  </table>
-</template>
-
-<script>
-
-
-import { defineComponent} from 'vue'
-import RelayGroupedListComponent from '../lists/RelayGroupedListComponent.vue'
-
-export default defineComponent({
-  title: "nostr.watch registry & network status",
-  name: 'GroupByAvailability',
-  components: {
-    RelayGroupedListComponent,
-  },
-
-  props: {
-    showJson: {
-      type: Boolean,
-      default(){
-        return true
-      }
-    },
-    section: {
-      type: String,
-      required: true,
-      default: ""
-    },
-    relays:{
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    result: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    geo: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    messages: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    alerts: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    connections: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    showColumns: {
-      type: Object,
-      default() {
-        return {
-          connectionStatuses: false,
-          nips: false,
-          geo: false,
-          additionalInfo: false
-        }
-      }
-    },
-    grouping: {
-      type: Boolean,
-      default(){
-        return true
-      }
-    }
-  },
-
-  data() {
-    return {}
-  },
-  computed: {},
-})
-</script>
-<style scoped>
-table {
-  border-collapse: collapse !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/groups/GroupByNone.vue b/src/pages/groups/GroupByNone.vue
deleted file mode 100644
index 208c512..0000000
--- a/src/pages/groups/GroupByNone.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-<template>
-  <table>
-    <RelayListComponent
-      :relays="relays"
-      :result="result"
-      :geo="geo"
-      :messages="messages"
-      :alerts="alerts"
-      :connections="connections"
-    />
-  </table>
-</template> 
-
-<script>
-import { defineComponent} from 'vue'
-import RelayListComponent from '../lists/RelayListComponent.vue'
-
-export default defineComponent({
-  title: "nostr.watch registry & network status",
-  name: 'GroupByNone',
-  components: {
-    RelayListComponent,
-  },
-
-  props: {
-    showJson: {
-      type: Boolean,
-      default(){
-        return true
-      }
-    },
-    relays:{
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    result: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    geo: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    messages: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    alerts: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    connections: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    showColumns: {
-      type: Object,
-      default() {
-        return {
-          connectionStatuses: false,
-          nips: false,
-          geo: false,
-          additionalInfo: false
-        }
-      }
-    },
-    grouping: {
-      type: Boolean,
-      default(){
-        return true
-      }
-    }
-  },
-  mounted(){
-    console.log(this.relays)
-  },
-  data() {
-    return {}
-  },
-  computed: {},
-})
-
-</script>
-<style scoped>
-table {
-  border-collapse: collapse !important;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/lists/RelayGroupedListComponent.vue b/src/pages/lists/RelayGroupedListComponent.vue
deleted file mode 100644
index c33594a..0000000
--- a/src/pages/lists/RelayGroupedListComponent.vue
+++ /dev/null
@@ -1,280 +0,0 @@
-<template>
-  <tr :class="getHeadingClass()">
-    <vue-final-modal v-model="showModal" classes="modal-container" content-class="modal-content">
-      <div class="modal__content">
-        <span>
-          {{ queryJson(section) }}
-        </span>
-      </div>
-    </vue-final-modal>
-    <td colspan="11">
-      <h2><span class="indicator badge">{{ sort(section).length }}</span>{{ section }} <a @click="showModal=true" class="section-json" v-if="showJson">{...}</a></h2>
-    </td>
-  </tr>
-  <tr :class="getHeadingClass()"  v-if="sort(section).length > 0">
-    <th class="table-column status-indicator"></th>
-
-    <th class="table-column relay"></th>
-
-    <th class="table-column verified">
-      <span class="verified-shape-wrapper">
-        <span class="shape verified"></span>
-      </span>
-    </th>
-    <th class="table-column location" v-tooltip:top.tooltip="Ping">
-      🌎
-    </th>
-    <th class="table-column latency" v-tooltip:top.tooltip="'Relay Latency on Read'">
-      ⌛️
-    </th>
-    <th class="table-column connect" v-tooltip:top.tooltip="'Relay connection status'">
-      🔌
-    </th>
-    <th class="table-column read" v-tooltip:top.tooltip="'Relay read status'">
-      👁️‍🗨️
-    </th>
-    <th class="table-column write" v-tooltip:top.tooltip="'Relay write status'">
-      ✏️
-    </th>
-    <th class="table-column info" v-tooltip:top.tooltip="'Additional information detected regarding the relay during processing'">
-      ℹ️
-    </th>
-    <!-- <th class="table-column nip nip-20" v-tooltip:top.tooltip="'Does the relay support NIP-20'">
-      <span>NIP-11</span>
-    </th> -->
-  </tr>
-  <tr v-for="(relay, index) in sort(section)" :key="{relay}" :class="getResultClass(relay, index)" class="relay">
-    <RelaySingleComponent
-      :relay="relay"
-      :result="result[relay]"
-      :geo="geo[relay]"
-      :showColumns="showColumns"
-      :connection="connections[relay]"
-    />
-  </tr>
-</template>
-
-<script>
-
-import { defineComponent} from 'vue'
-import { VueFinalModal } from 'vue-final-modal'
-
-import RelaySingleComponent from '../single/RelaySingleComponent.vue'
-
-import RelaysLib from '../../lib/relays-lib.js'
-
-const localMethods = {
-  getHeadingClass(){
-    return {
-      online: this.section != "offline",
-      public: this.section == "public",
-      offline: this.section == "offline",
-      restricted: this.section == "restricted"
-    }
-  },
-  getResultClass (relay, index) {
-    return {
-      loaded: this.result?.[relay]?.state == 'complete',
-      online: this.section != "offline",
-      offline: this.section == "offline",
-      public: this.section == "public",
-      even: index % 2,
-    }
-  },
-  sort_by_latency(ascending) {
-      const self = this
-      return function (a, b) {
-        // equal items sort equally
-        if (self.result?.[a]?.latency.final === self.result?.[b]?.latency.final) {
-            return 0;
-        }
-
-        // nulls sort after anything else
-        if (self.result?.[a]?.latency.final === null) {
-            return 1;
-        }
-        if (self.result?.[b]?.latency.final === null) {
-            return -1;
-        }
-
-        // otherwise, if we're ascending, lowest sorts first
-        if (ascending) {
-            return self.result?.[a]?.latency.final - self.result?.[b]?.latency.final;
-        }
-
-        // if descending, highest sorts first
-        return self.result?.[b]?.latency.final-self.result?.[a]?.latency.final;
-      };
-    },
-    sortByLatency () {
-      let unsorted
-
-      unsorted = this.relays;
-
-      if (unsorted.length)
-        return unsorted.sort(this.sort_by_latency(true))
-
-      return []
-    },
-  queryJson(aggregate){
-    const relays = this.sort(aggregate)
-    const result = {}
-    result.relays = relays.map( relay => relay )
-    return JSON.stringify(result,null,'\t')
-  },
-  relaysTotal () {
-    return this.relays.length
-  },
-  relaysConnected () {
-    return Object.keys(this.result).length
-  },
-  relaysCompleted () {
-    let value = Object.entries(this.result).map((value) => { return value.state == 'complete' }).length
-    return value
-  },
-  isDone(){
-    return this.relaysTotal()-this.relaysCompleted() == 0
-  },
-}
-
-export default defineComponent({
-  name: 'RelayListComponent',
-  components: {
-    RelaySingleComponent,
-    VueFinalModal
-  },
-  props: {
-    showJson: {
-      type: Boolean,
-      default(){
-        return true
-      }
-    },
-    section: {
-      type: String,
-      required: true,
-      default: ""
-    },
-    relays:{
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    result: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    geo: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    messages: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    alerts: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    connections: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    showColumns: {
-      type: Object,
-      default() {
-        return {
-          connectionStatuses: false,
-          nips: false,
-          geo: false,
-          additionalInfo: false
-        }
-      }
-    },
-    grouping: {
-      type: Boolean,
-      default(){
-        return true
-      }
-    }
-  },
-  data() {
-    return {
-      showModal: false
-    }
-  },
-  mounted(){},
-  computed: {},
-  methods: Object.assign(localMethods, RelaysLib)
-})
-</script>
-
-<style lang='css' scoped>
-  .nip span {
-    text-transform: uppercase;
-    letter-spacing:-1px;
-    font-size:12px;
-  }
-
-  .section-json {
-    font-size:13px;
-    color: #555;
-    cursor:pointer;
-  }
-
-  ::v-deep(.modal-container) {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  ::v-deep(.modal-content) {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    max-height: 90%;
-    max-width:400px;
-    margin: 0 1rem;
-    padding: 1rem;
-    border: 1px solid #e2e8f0;
-    border-radius: 0.25rem;
-    background: #fff;
-  }
-  .modal__title {
-    margin: 0 2rem 0 0;
-    font-size: 1.5rem;
-    font-weight: 700;
-  }
-  .modal__content {
-    flex-grow: 1;
-    overflow-y: auto;
-  }
-  .modal__action {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-shrink: 0;
-    padding: 1rem 0 0;
-  }
-  .modal__close {
-    position: absolute;
-    top: 0.5rem;
-    right: 0.5rem;
-  }
-
-  .nip-11 a { cursor: pointer }
-
-  tr.even {
-    background:#f9f9f9
-  }
-  </style>
diff --git a/src/pages/lists/RelayListComponent.vue b/src/pages/lists/RelayListComponent.vue
deleted file mode 100644
index 9535661..0000000
--- a/src/pages/lists/RelayListComponent.vue
+++ /dev/null
@@ -1,265 +0,0 @@
-<template>
-  <table>
-    <tr>
-      <vue-final-modal v-model="showModal" classes="modal-container" content-class="modal-content">
-        <div class="modal__content">
-          <span>
-            {{ queryJson() }}
-          </span>
-        </div>
-      </vue-final-modal>
-      <td colspan="11">
-        <h2><span class="indicator badge">{{ this.relays.length }}</span>Relays <a @click="showModal=true" class="section-json" v-if="showJson">{...}</a></h2>
-      </td>
-    </tr>
-    <tr v-if="this.relays.length > 0">
-      <th class="table-column status-indicator"></th>
-
-      <th class="table-column relay"></th>
-
-      <th class="table-column verified">
-        <span class="verified-shape-wrapper">
-          <span class="shape verified"></span>
-        </span>
-      </th>
-      <th class="table-column location" v-tooltip:top.tooltip="Ping">
-        🌎
-      </th>
-      <th class="table-column latency" v-tooltip:top.tooltip="'Relay Latency on Read'">
-        ⌛️
-      </th>
-      <th class="table-column connect" v-tooltip:top.tooltip="'Relay connection status'">
-        🔌
-      </th>
-      <th class="table-column read" v-tooltip:top.tooltip="'Relay read status'">
-        👁️‍🗨️
-      </th>
-      <th class="table-column write" v-tooltip:top.tooltip="'Relay write status'">
-        ✏️
-      </th>
-      <!-- <th class="table-column info" v-tooltip:top.tooltip="'Additional information detected regarding the relay during processing'">
-        ℹ️
-      </th> -->
-      <!-- <th class="table-column nip nip-20" v-tooltip:top.tooltip="'Does the relay support NIP-20'">
-        <span>NIP-11</span>
-      </th> -->
-    </tr>
-    <tr v-for="(relay, index) in sort(relays[relay]?.aggregate)" :key="{relay}" class="relay" :class="getResultClass(relay, index)">
-      <RelaySingleComponent
-        :relay="relay"
-        :result="result[relay]"
-        :geo="geo[relay]"
-        :connection="connections[relay]" />
-    </tr>
-  </table>
-</template>
-
-<script>
-import { defineComponent} from 'vue'
-import { VueFinalModal } from 'vue-final-modal'
-
-import RelaySingleComponent from '../single/RelaySingleComponent.vue'
-
-import RelaysLib from '../../lib/relays-lib.js'
-
-const localMethods = {
-    // getHeadingClass(){
-    //   return {
-    //     online: this.section != "offline",
-    //     public: this.section == "public",
-    //     offline: this.section == "offline",
-    //     restricted: this.section == "restricted"
-    //   }
-    // },
-    getResultClass (relay, index) {
-      return {
-        loaded: this.result?.[relay]?.state == 'complete',
-        even: index % 2
-      }
-    },
-    queryJson(){
-      const result = { relays: this.relays }
-      return JSON.stringify(result,null,'\t')
-    },
-    relaysTotal () {
-      return this.relays.length //TODO: Figure out WHY?
-    },
-
-    relaysConnected () {
-      return Object.entries(this.result).length
-    },
-
-    relaysComplete () {
-      if(!Object.keys(this.results).length) return 0
-      return this.relays.filter(relay => this.results?.[relay]?.state == 'complete').length
-    },
-
-    sha1 (message) {
-      const hash = crypto.createHash('sha1').update(JSON.stringify(message)).digest('hex')
-      return hash
-    },
-
-    isDone(){
-      return this.relaysTotal()-this.relaysComplete() <= 0
-    },
-
-    loadingComplete(){
-      return this.isDone() ? 'loaded' : ''
-    },
-
-    sort_by_latency(ascending) {
-      const self = this
-      return function (a, b) {
-        // equal items sort equally
-        if (self.result?.[a]?.latency.final === self.result?.[b]?.latency.final) {
-            return 0;
-        }
-
-        // nulls sort after anything else
-        if (self.result?.[a]?.latency.final === null) {
-            return 1;
-        }
-        if (self.result?.[b]?.latency.final === null) {
-            return -1;
-        }
-
-        // otherwise, if we're ascending, lowest sorts first
-        if (ascending) {
-            return self.result?.[a]?.latency.final - self.result?.[b]?.latency.final;
-        }
-
-        // if descending, highest sorts first
-        return self.result?.[b]?.latency.final-self.result?.[a]?.latency.final;
-      };
-    },
-    sortByLatency () {
-      let unsorted
-
-      unsorted = this.relays;
-
-      if (unsorted.length)
-        return unsorted.sort(this.sort_by_latency(true))
-
-      return []
-    },
-  }
-
-export default defineComponent({
-  name: 'RelayListComponent',
-  components: {
-    RelaySingleComponent,
-    VueFinalModal
-  },
-  props: {
-    showJson: {
-      type: Boolean,
-      default(){
-        return true
-      }
-    },
-    relays:{
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    result: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    geo: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    messages: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    alerts: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    connections: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-  },
-  data() {
-    return {
-      showModal: false
-    }
-  },
-  mounted(){},
-  computed: {},
-  methods: Object.assign(localMethods, RelaysLib)
-})
-</script>
-
-<style lang='css' scoped>
-  .nip span {
-    text-transform: uppercase;
-    letter-spacing:-1px;
-    font-size:12px;
-  }
-
-  .section-json {
-    font-size:13px;
-    color: #555;
-    cursor:pointer;
-  }
-
-  ::v-deep(.modal-container) {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  ::v-deep(.modal-content) {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-    max-height: 90%;
-    max-width:400px;
-    margin: 0 1rem;
-    padding: 1rem;
-    border: 1px solid #e2e8f0;
-    border-radius: 0.25rem;
-    background: #fff;
-  }
-  .modal__title {
-    margin: 0 2rem 0 0;
-    font-size: 1.5rem;
-    font-weight: 700;
-  }
-  .modal__content {
-    flex-grow: 1;
-    overflow-y: auto;
-  }
-  .modal__action {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-shrink: 0;
-    padding: 1rem 0 0;
-  }
-  .modal__close {
-    position: absolute;
-    top: 0.5rem;
-    right: 0.5rem;
-  }
-
-  .nip-11 a { cursor: pointer }
-
-  tr.even {
-    background:#f9f9f9
-  }
-  </style>
diff --git a/src/pages/single/RelaySingleComponent.vue b/src/pages/single/RelaySingleComponent.vue
deleted file mode 100644
index a465334..0000000
--- a/src/pages/single/RelaySingleComponent.vue
+++ /dev/null
@@ -1,248 +0,0 @@
-<template>
-  <td class="status-indicator" :key="generateKey(relay, 'aggregate')">
-    <span :class="result?.aggregate" class="aggregate indicator">
-        <span></span>
-        <span></span>
-    </span>
-  </td>
-
-  <td class="relay left-align relay-url">
-    <router-link :to="`/relay/${relayClean(relay)}`" active-class="active">{{ relay }}</router-link>
-  </td>
-
-  <td class="verified">
-    <span v-if="result?.identities">
-      <span v-tooltip:top.tooltip="identityList()"> <span class="verified-shape-wrapper" v-if="Object.entries(result?.identities).length"><span class="shape verified"></span></span></span>
-    </span>
-  </td>
-
-  <td class="location">{{ getFlag() }}</td>
-
-  <td class="latency">
-    <span>{{ result?.latency.final }}<span v-if="result?.check.latency">ms</span></span>
-  </td>
-
-  <td class="connect" :key="generateKey(relay, 'check.connect')">
-    <span :class="getResultClass(relay, 'connect')"></span>
-  </td>
-
-  <td class="read" :key="generateKey(relay, 'check.read')">
-    <span :class="getResultClass(relay, 'read')"></span>
-  </td>
-
-  <td class="write" :key="generateKey(relay, 'check.write')">
-    <span :class="getResultClass(relay, 'write')"></span>
-  </td>
-
-  <!-- <td class="info">
-    <ul v-if="result?.observations && result?.observations.length">
-      <li class="observation" v-for="(alert) in result?.observations" :key="generateKey(relay, alert.description)">
-        <span v-tooltip:top.tooltip="alert.description" :class="alert.type" v-if="alert.type == 'notice'">✉️</span>
-        <span v-tooltip:top.tooltip="alert.description" :class="alert.type" v-if="alert.type == 'caution'">⚠️</span>
-      </li>
-    </ul>
-  </td> -->
-</template>
-
-<script>
-import { defineComponent} from 'vue'
-import { InspectorResult } from 'nostr-relay-inspector'
-import { countryCodeEmoji } from 'country-code-emoji';
-import emoji from 'node-emoji';
-
-export default defineComponent({
-  name: 'RelaySingleComponent',
-  components: {
-  },
-  props: {
-    relay: String,
-    result: {
-      type: Object,
-      default(){
-        return structuredClone(InspectorResult)
-      }
-    },
-    geo: {
-      type: Object,
-      default(){
-        return {}
-      }
-    },
-    showColumns: {
-      type: Object,
-      default() {
-        return {
-          connectionStatuses: false,
-          nips: false,
-          geo: false,
-          additionalInfo: false
-        }
-      }
-    },
-    connection: {
-      type: Object,
-      default() {
-        return {
-          connectionStatuses: false,
-          nips: false,
-          geo: false,
-          additionalInfo: false
-        }
-      }
-    }
-  },
-  data() {
-    return {
-      showModal: false
-    }
-  },
-  methods: {
-     getResultClass (url, key) {
-       let result = this.result?.check?.[key] === true
-       ? 'success'
-       : this.result?.check?.[key] === false
-         ? 'failure'
-         : 'pending'
-       return `indicator ${result}`
-     },
-     getLoadingClass () {
-       return this.result?.state == 'complete' ? "relay loaded" : "relay"
-     },
-     generateKey (url, key) {
-       return `${url}_${key}`
-     },
-
-     getFlag () {
-       return this.geo?.countryCode ? countryCodeEmoji(this.geo.countryCode) : emoji.get('shrug');
-     },
-
-     setCheck (bool) {
-       return bool ? '✅ ' : ''
-     },
-
-     setCross (bool) {
-       return !bool ? '❌' : ''
-     },
-     setCaution (bool) {
-       return !bool ? '⚠️' : ''
-     },
-     identityList () {
-       let string = '',
-           extraString = '',
-           users = Object.entries(this.result?.identities),
-           count = 0
-
-       if(this.result?.identities) {
-         if(this.result?.identities.serverAdmin) {
-           string = `Relay has registered an administrator pubkey: ${this.result?.identities.serverAdmin}. `
-           extraString = "Additionally, "
-         }
-
-         const total = users.filter(([key]) => key!='serverAdmin').length,
-               isOne = total==1
-
-         if(total) {
-           string = `${string}${extraString}Relay domain contains NIP-05 verification data for:`
-           users.forEach( ([key]) => {
-             if(key == "serverAdmin") return
-             count++
-             string = `${string} ${(count==total && !isOne) ? 'and' : ''}  @${key}${(count!=total && !isOne) ? ', ' : ''}`
-           })
-         }
-       }
-       return string
-     },
-     relayClean(relay) {
-       return relay.replace('wss://', '')
-     },
-     nipSignature(key){
-       return key.toString().length == 1 ? `0${key}` : key
-     },
-     nipFormatted(key){
-       return `NIP-${this.nipSignature(key)}`
-     },
-     nipLink(key){
-       return `https://github.com/nostr-protocol/nips/blob/master/${this.nipSignature(key)}.md`
-     },
-     async copy(text) {
-       try {
-         await navigator.clipboard.writeText(text);
-       } catch(err) {
-        console.error(err)
-       }
-     },
-   }
-})
-</script>
-
-<style scoped>
-ul {
-  margin:0;
-  padding:0;
-}
-
-li {
-  margin:0;
-  padding:0;
-  list-style:none;
-}
-
-td.nip-11,
-td.verified span {
-  cursor: pointer
-}
-
-::v-deep(.modal-container) {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-::v-deep(.modal-content) {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  max-height: 90%;
-  margin: 0 1rem;
-  padding: 1rem;
-  border: 1px solid #e2e8f0;
-  border-radius: 0.25rem;
-  background: #fff;
-}
-.modal__title {
-  margin: 0 2rem 0 0;
-  font-size: 1.5rem;
-  font-weight: 700;
-}
-.modal__content {
-  flex-grow: 1;
-  overflow-y: auto;
-}
-.modal__action {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-shrink: 0;
-  padding: 1rem 0 0;
-}
-.modal__close {
-  position: absolute;
-  top: 0.5rem;
-  right: 0.5rem;
-}
-
-
-.dark-mode div ::v-deep(.modal-content) {
-  border-color: #2d3748;
-  background-color: #1a202c;
-}
-
-.restricted.aggregate.indicator {
-  position:relative;
-  left:-7px;
-}
-
- td {
-    padding-top:2px;
-    padding-bottom:2px;
-  }
-</style>

From 93347b7e5c44724cf5f3030a11d18f3334a67d89 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Fri, 23 Dec 2022 23:40:24 +0100
Subject: [PATCH 20/38] fix file references

---
 src/components/GroupByAvailability.vue       | 135 ++++++++++
 src/components/GroupByNone.vue               | 100 ++++++++
 src/components/HeaderComponent.vue           |   0
 src/components/RelayGroupedListComponent.vue | 242 ++++++++++++++++++
 src/components/RelayListComponent.vue        | 238 ++++++++++++++++++
 src/components/RelaySingleComponent.vue      | 248 +++++++++++++++++++
 src/components/TableHeaders.vue              |  31 +++
 7 files changed, 994 insertions(+)
 create mode 100644 src/components/GroupByAvailability.vue
 create mode 100644 src/components/GroupByNone.vue
 create mode 100644 src/components/HeaderComponent.vue
 create mode 100644 src/components/RelayGroupedListComponent.vue
 create mode 100644 src/components/RelayListComponent.vue
 create mode 100644 src/components/RelaySingleComponent.vue
 create mode 100644 src/components/TableHeaders.vue

diff --git a/src/components/GroupByAvailability.vue b/src/components/GroupByAvailability.vue
new file mode 100644
index 0000000..8288489
--- /dev/null
+++ b/src/components/GroupByAvailability.vue
@@ -0,0 +1,135 @@
+<template>
+  <table>
+    <RelayGroupedListComponent
+      section="favorites"
+      :relays="relays"
+      :result="result"
+      :geo="geo"
+      :messages="messages"
+      :alerts="alerts"
+      :connections="connections"
+    />
+    
+    <RelayGroupedListComponent
+      section="public"
+      :relays="relays"
+      :result="result"
+      :geo="geo"
+      :messages="messages"
+      :alerts="alerts"
+      :connections="connections"
+    />
+
+    <RelayGroupedListComponent
+      section="restricted"
+      :relays="relays"
+      :result="result"
+      :geo="geo"
+      :messages="messages"
+      :alerts="alerts"
+      :connections="connections"
+    />
+
+    <RelayGroupedListComponent
+      section="offline"
+      :relays="relays"
+      :result="result"
+      :geo="geo"
+      :messages="messages"
+      :alerts="alerts"
+      :connections="connections"
+    />
+  </table>
+</template>
+
+<script>
+
+
+import { defineComponent} from 'vue'
+import RelayGroupedListComponent from './RelayGroupedListComponent.vue'
+
+export default defineComponent({
+  title: "nostr.watch registry & network status",
+  name: 'GroupByAvailability',
+  components: {
+    RelayGroupedListComponent,
+  },
+
+  props: {
+    showJson: {
+      type: Boolean,
+      default(){
+        return true
+      }
+    },
+    section: {
+      type: String,
+      required: true,
+      default: ""
+    },
+    relays:{
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    result: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    geo: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    messages: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    alerts: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    connections: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    showColumns: {
+      type: Object,
+      default() {
+        return {
+          connectionStatuses: false,
+          nips: false,
+          geo: false,
+          additionalInfo: false
+        }
+      }
+    },
+    grouping: {
+      type: Boolean,
+      default(){
+        return true
+      }
+    }
+  },
+
+  data() {
+    return {}
+  },
+  computed: {},
+})
+</script>
+<style scoped>
+table {
+  border-collapse: collapse !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/GroupByNone.vue b/src/components/GroupByNone.vue
new file mode 100644
index 0000000..b2494b4
--- /dev/null
+++ b/src/components/GroupByNone.vue
@@ -0,0 +1,100 @@
+<template>
+  <table>
+    <RelayListComponent
+      :relays="relays"
+      :result="result"
+      :geo="geo"
+      :messages="messages"
+      :alerts="alerts"
+      :connections="connections"
+    />
+  </table>
+</template> 
+
+<script>
+import { defineComponent} from 'vue'
+import RelayListComponent from './RelayListComponent.vue'
+
+export default defineComponent({
+  title: "nostr.watch registry & network status",
+  name: 'GroupByNone',
+  components: {
+    RelayListComponent,
+  },
+
+  props: {
+    showJson: {
+      type: Boolean,
+      default(){
+        return true
+      }
+    },
+    relays:{
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    result: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    geo: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    messages: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    alerts: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    connections: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    showColumns: {
+      type: Object,
+      default() {
+        return {
+          connectionStatuses: false,
+          nips: false,
+          geo: false,
+          additionalInfo: false
+        }
+      }
+    },
+    grouping: {
+      type: Boolean,
+      default(){
+        return true
+      }
+    }
+  },
+  mounted(){
+    console.log(this.relays)
+  },
+  data() {
+    return {}
+  },
+  computed: {},
+})
+
+</script>
+<style scoped>
+table {
+  border-collapse: collapse !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/HeaderComponent.vue b/src/components/HeaderComponent.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/RelayGroupedListComponent.vue b/src/components/RelayGroupedListComponent.vue
new file mode 100644
index 0000000..e7872ce
--- /dev/null
+++ b/src/components/RelayGroupedListComponent.vue
@@ -0,0 +1,242 @@
+<template>
+  <tr :class="getHeadingClass()">
+    <vue-final-modal v-model="showModal" classes="modal-container" content-class="modal-content">
+      <div class="modal__content">
+        <span>
+          {{ queryJson(section) }}
+        </span>
+      </div>
+    </vue-final-modal>
+    <td colspan="11">
+      <h2><span class="indicator badge">{{ sort(section).length }}</span>{{ section }} <a @click="showModal=true" class="section-json" v-if="showJson">{...}</a></h2>
+    </td>
+  </tr>
+  <tr :class="getHeadingClass()"  v-if="sort(section).length > 0">
+    <TableHeaders />
+  </tr>
+  <tr v-for="(relay, index) in sort(section)" :key="{relay}" :class="getResultClass(relay, index)" class="relay">
+    <RelaySingleComponent
+      :relay="relay"
+      :result="result[relay]"
+      :geo="geo[relay]"
+      :showColumns="showColumns"
+      :connection="connections[relay]"
+    />
+  </tr>
+</template>
+
+<script>
+import { defineComponent} from 'vue'
+import { VueFinalModal } from 'vue-final-modal'
+
+import RelaySingleComponent from './RelaySingleComponent.vue'
+import TableHeaders from './TableHeaders.vue'
+
+import RelaysLib from '../lib/relays-lib.js'
+
+const localMethods = {
+  getHeadingClass(){
+    return {
+      online: this.section != "offline",
+      public: this.section == "public",
+      offline: this.section == "offline",
+      restricted: this.section == "restricted"
+    }
+  },
+  getResultClass (relay, index) {
+    return {
+      loaded: this.result?.[relay]?.state == 'complete',
+      online: this.section != "offline",
+      offline: this.section == "offline",
+      public: this.section == "public",
+      even: index % 2,
+    }
+  },
+  sort_by_latency(ascending) {
+    const self = this
+    return function (a, b) {
+      // equal items sort equally
+      if (self.result?.[a]?.latency.final === self.result?.[b]?.latency.final) {
+          return 0;
+      }
+
+      // nulls sort after anything else
+      if (self.result?.[a]?.latency.final === null) {
+          return 1;
+      }
+      if (self.result?.[b]?.latency.final === null) {
+          return -1;
+      }
+
+      // otherwise, if we're ascending, lowest sorts first
+      if (ascending) {
+          return self.result?.[a]?.latency.final - self.result?.[b]?.latency.final;
+      }
+
+      // if descending, highest sorts first
+      return self.result?.[b]?.latency.final-self.result?.[a]?.latency.final;
+    };
+  },
+  queryJson(aggregate){
+    const relays = this.sort(aggregate)
+    const result = {}
+    result.relays = relays.map( relay => relay )
+    return JSON.stringify(result,null,'\t')
+  },
+  relaysTotal () {
+    return this.relays.length
+  },
+  relaysConnected () {
+    return Object.keys(this.result).length
+  },
+  relaysCompleted () {
+    let value = Object.entries(this.result).map((value) => { return value.state == 'complete' }).length
+    return value
+  },
+  isDone(){
+    return this.relaysTotal()-this.relaysCompleted() == 0
+  },
+}
+
+export default defineComponent({
+  name: 'RelayListComponent',
+  components: {
+    RelaySingleComponent,
+    VueFinalModal,
+    TableHeaders
+  },
+  props: {
+    showJson: {
+      type: Boolean,
+      default(){
+        return true
+      }
+    },
+    section: {
+      type: String,
+      required: true,
+      default: ""
+    },
+    relays:{
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    result: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    geo: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    messages: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    alerts: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    connections: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    showColumns: {
+      type: Object,
+      default() {
+        return {
+          connectionStatuses: false,
+          nips: false,
+          geo: false,
+          additionalInfo: false
+        }
+      }
+    },
+    grouping: {
+      type: Boolean,
+      default(){
+        return true
+      }
+    }
+  },
+  data() {
+    return {
+      showModal: false
+    }
+  },
+  mounted(){},
+  computed: {},
+  methods: Object.assign(localMethods, RelaysLib)
+})
+</script>
+
+<style lang='css' scoped>
+  .nip span {
+    text-transform: uppercase;
+    letter-spacing:-1px;
+    font-size:12px;
+  }
+
+  .section-json {
+    font-size:13px;
+    color: #555;
+    cursor:pointer;
+  }
+
+  ::v-deep(.modal-container) {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  ::v-deep(.modal-content) {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    max-height: 90%;
+    max-width:400px;
+    margin: 0 1rem;
+    padding: 1rem;
+    border: 1px solid #e2e8f0;
+    border-radius: 0.25rem;
+    background: #fff;
+  }
+  .modal__title {
+    margin: 0 2rem 0 0;
+    font-size: 1.5rem;
+    font-weight: 700;
+  }
+  .modal__content {
+    flex-grow: 1;
+    overflow-y: auto;
+  }
+  .modal__action {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-shrink: 0;
+    padding: 1rem 0 0;
+  }
+  .modal__close {
+    position: absolute;
+    top: 0.5rem;
+    right: 0.5rem;
+  }
+
+  .nip-11 a { cursor: pointer }
+
+  tr.even {
+    background:#f9f9f9
+  }
+  </style>
diff --git a/src/components/RelayListComponent.vue b/src/components/RelayListComponent.vue
new file mode 100644
index 0000000..a353ecb
--- /dev/null
+++ b/src/components/RelayListComponent.vue
@@ -0,0 +1,238 @@
+<template>
+  <table>
+    <tr>
+      <vue-final-modal v-model="showModal" classes="modal-container" content-class="modal-content">
+        <div class="modal__content">
+          <span>
+            {{ queryJson() }}
+          </span>
+        </div>
+      </vue-final-modal>
+      <td colspan="11">
+        <h2><span class="indicator badge">{{ this.relays.length }}</span>Relays <a @click="showModal=true" class="section-json" v-if="showJson">{...}</a></h2>
+      </td>
+    </tr>
+    <tr v-if="this.relays.length > 0">
+      <TableHeaders />
+    </tr>
+    <tr v-for="(relay, index) in sort(relays[relay]?.aggregate)" :key="{relay}" class="relay" :class="getResultClass(relay, index)">
+      <RelaySingleComponent
+        :relay="relay"
+        :result="result[relay]"
+        :geo="geo[relay]"
+        :connection="connections[relay]" />
+    </tr>
+  </table>
+</template>
+
+<script>
+import { defineComponent} from 'vue'
+import { VueFinalModal } from 'vue-final-modal'
+
+import RelaySingleComponent from './RelaySingleComponent.vue'
+import TableHeaders from './TableHeaders.vue'
+
+import RelaysLib from '../lib/relays-lib.js'
+
+const localMethods = {
+    // getHeadingClass(){
+    //   return {
+    //     online: this.section != "offline",
+    //     public: this.section == "public",
+    //     offline: this.section == "offline",
+    //     restricted: this.section == "restricted"
+    //   }
+    // },
+    getResultClass (relay, index) {
+      return {
+        loaded: this.result?.[relay]?.state == 'complete',
+        even: index % 2
+      }
+    },
+    queryJson(){
+      const result = { relays: this.relays }
+      return JSON.stringify(result,null,'\t')
+    },
+    relaysTotal () {
+      return this.relays.length //TODO: Figure out WHY?
+    },
+
+    relaysConnected () {
+      return Object.entries(this.result).length
+    },
+
+    relaysComplete () {
+      if(!Object.keys(this.results).length) return 0
+      return this.relays.filter(relay => this.results?.[relay]?.state == 'complete').length
+    },
+
+    sha1 (message) {
+      const hash = crypto.createHash('sha1').update(JSON.stringify(message)).digest('hex')
+      return hash
+    },
+
+    isDone(){
+      return this.relaysTotal()-this.relaysComplete() <= 0
+    },
+
+    loadingComplete(){
+      return this.isDone() ? 'loaded' : ''
+    },
+
+    sort_by_latency(ascending) {
+      const self = this
+      return function (a, b) {
+        // equal items sort equally
+        if (self.result?.[a]?.latency.final === self.result?.[b]?.latency.final) {
+            return 0;
+        }
+
+        // nulls sort after anything else
+        if (self.result?.[a]?.latency.final === null) {
+            return 1;
+        }
+        if (self.result?.[b]?.latency.final === null) {
+            return -1;
+        }
+
+        // otherwise, if we're ascending, lowest sorts first
+        if (ascending) {
+            return self.result?.[a]?.latency.final - self.result?.[b]?.latency.final;
+        }
+
+        // if descending, highest sorts first
+        return self.result?.[b]?.latency.final-self.result?.[a]?.latency.final;
+      };
+    },
+    sortByLatency () {
+      let unsorted
+
+      unsorted = this.relays;
+
+      if (unsorted.length)
+        return unsorted.sort(this.sort_by_latency(true))
+
+      return []
+    },
+  }
+
+export default defineComponent({
+  name: 'RelayListComponent',
+  components: {
+    RelaySingleComponent,
+    VueFinalModal,
+    TableHeaders
+  },
+  props: {
+    showJson: {
+      type: Boolean,
+      default(){
+        return true
+      }
+    },
+    relays:{
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    result: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    geo: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    messages: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    alerts: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    connections: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+  },
+  data() {
+    return {
+      showModal: false
+    }
+  },
+  mounted(){},
+  computed: {},
+  methods: Object.assign(localMethods, RelaysLib)
+})
+</script>
+
+<style lang='css' scoped>
+  .nip span {
+    text-transform: uppercase;
+    letter-spacing:-1px;
+    font-size:12px;
+  }
+
+  .section-json {
+    font-size:13px;
+    color: #555;
+    cursor:pointer;
+  }
+
+  ::v-deep(.modal-container) {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  ::v-deep(.modal-content) {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    max-height: 90%;
+    max-width:400px;
+    margin: 0 1rem;
+    padding: 1rem;
+    border: 1px solid #e2e8f0;
+    border-radius: 0.25rem;
+    background: #fff;
+  }
+  .modal__title {
+    margin: 0 2rem 0 0;
+    font-size: 1.5rem;
+    font-weight: 700;
+  }
+  .modal__content {
+    flex-grow: 1;
+    overflow-y: auto;
+  }
+  .modal__action {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-shrink: 0;
+    padding: 1rem 0 0;
+  }
+  .modal__close {
+    position: absolute;
+    top: 0.5rem;
+    right: 0.5rem;
+  }
+
+  .nip-11 a { cursor: pointer }
+
+  tr.even {
+    background:#f9f9f9
+  }
+  </style>
diff --git a/src/components/RelaySingleComponent.vue b/src/components/RelaySingleComponent.vue
new file mode 100644
index 0000000..a465334
--- /dev/null
+++ b/src/components/RelaySingleComponent.vue
@@ -0,0 +1,248 @@
+<template>
+  <td class="status-indicator" :key="generateKey(relay, 'aggregate')">
+    <span :class="result?.aggregate" class="aggregate indicator">
+        <span></span>
+        <span></span>
+    </span>
+  </td>
+
+  <td class="relay left-align relay-url">
+    <router-link :to="`/relay/${relayClean(relay)}`" active-class="active">{{ relay }}</router-link>
+  </td>
+
+  <td class="verified">
+    <span v-if="result?.identities">
+      <span v-tooltip:top.tooltip="identityList()"> <span class="verified-shape-wrapper" v-if="Object.entries(result?.identities).length"><span class="shape verified"></span></span></span>
+    </span>
+  </td>
+
+  <td class="location">{{ getFlag() }}</td>
+
+  <td class="latency">
+    <span>{{ result?.latency.final }}<span v-if="result?.check.latency">ms</span></span>
+  </td>
+
+  <td class="connect" :key="generateKey(relay, 'check.connect')">
+    <span :class="getResultClass(relay, 'connect')"></span>
+  </td>
+
+  <td class="read" :key="generateKey(relay, 'check.read')">
+    <span :class="getResultClass(relay, 'read')"></span>
+  </td>
+
+  <td class="write" :key="generateKey(relay, 'check.write')">
+    <span :class="getResultClass(relay, 'write')"></span>
+  </td>
+
+  <!-- <td class="info">
+    <ul v-if="result?.observations && result?.observations.length">
+      <li class="observation" v-for="(alert) in result?.observations" :key="generateKey(relay, alert.description)">
+        <span v-tooltip:top.tooltip="alert.description" :class="alert.type" v-if="alert.type == 'notice'">✉️</span>
+        <span v-tooltip:top.tooltip="alert.description" :class="alert.type" v-if="alert.type == 'caution'">⚠️</span>
+      </li>
+    </ul>
+  </td> -->
+</template>
+
+<script>
+import { defineComponent} from 'vue'
+import { InspectorResult } from 'nostr-relay-inspector'
+import { countryCodeEmoji } from 'country-code-emoji';
+import emoji from 'node-emoji';
+
+export default defineComponent({
+  name: 'RelaySingleComponent',
+  components: {
+  },
+  props: {
+    relay: String,
+    result: {
+      type: Object,
+      default(){
+        return structuredClone(InspectorResult)
+      }
+    },
+    geo: {
+      type: Object,
+      default(){
+        return {}
+      }
+    },
+    showColumns: {
+      type: Object,
+      default() {
+        return {
+          connectionStatuses: false,
+          nips: false,
+          geo: false,
+          additionalInfo: false
+        }
+      }
+    },
+    connection: {
+      type: Object,
+      default() {
+        return {
+          connectionStatuses: false,
+          nips: false,
+          geo: false,
+          additionalInfo: false
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      showModal: false
+    }
+  },
+  methods: {
+     getResultClass (url, key) {
+       let result = this.result?.check?.[key] === true
+       ? 'success'
+       : this.result?.check?.[key] === false
+         ? 'failure'
+         : 'pending'
+       return `indicator ${result}`
+     },
+     getLoadingClass () {
+       return this.result?.state == 'complete' ? "relay loaded" : "relay"
+     },
+     generateKey (url, key) {
+       return `${url}_${key}`
+     },
+
+     getFlag () {
+       return this.geo?.countryCode ? countryCodeEmoji(this.geo.countryCode) : emoji.get('shrug');
+     },
+
+     setCheck (bool) {
+       return bool ? '✅ ' : ''
+     },
+
+     setCross (bool) {
+       return !bool ? '❌' : ''
+     },
+     setCaution (bool) {
+       return !bool ? '⚠️' : ''
+     },
+     identityList () {
+       let string = '',
+           extraString = '',
+           users = Object.entries(this.result?.identities),
+           count = 0
+
+       if(this.result?.identities) {
+         if(this.result?.identities.serverAdmin) {
+           string = `Relay has registered an administrator pubkey: ${this.result?.identities.serverAdmin}. `
+           extraString = "Additionally, "
+         }
+
+         const total = users.filter(([key]) => key!='serverAdmin').length,
+               isOne = total==1
+
+         if(total) {
+           string = `${string}${extraString}Relay domain contains NIP-05 verification data for:`
+           users.forEach( ([key]) => {
+             if(key == "serverAdmin") return
+             count++
+             string = `${string} ${(count==total && !isOne) ? 'and' : ''}  @${key}${(count!=total && !isOne) ? ', ' : ''}`
+           })
+         }
+       }
+       return string
+     },
+     relayClean(relay) {
+       return relay.replace('wss://', '')
+     },
+     nipSignature(key){
+       return key.toString().length == 1 ? `0${key}` : key
+     },
+     nipFormatted(key){
+       return `NIP-${this.nipSignature(key)}`
+     },
+     nipLink(key){
+       return `https://github.com/nostr-protocol/nips/blob/master/${this.nipSignature(key)}.md`
+     },
+     async copy(text) {
+       try {
+         await navigator.clipboard.writeText(text);
+       } catch(err) {
+        console.error(err)
+       }
+     },
+   }
+})
+</script>
+
+<style scoped>
+ul {
+  margin:0;
+  padding:0;
+}
+
+li {
+  margin:0;
+  padding:0;
+  list-style:none;
+}
+
+td.nip-11,
+td.verified span {
+  cursor: pointer
+}
+
+::v-deep(.modal-container) {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+::v-deep(.modal-content) {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  max-height: 90%;
+  margin: 0 1rem;
+  padding: 1rem;
+  border: 1px solid #e2e8f0;
+  border-radius: 0.25rem;
+  background: #fff;
+}
+.modal__title {
+  margin: 0 2rem 0 0;
+  font-size: 1.5rem;
+  font-weight: 700;
+}
+.modal__content {
+  flex-grow: 1;
+  overflow-y: auto;
+}
+.modal__action {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-shrink: 0;
+  padding: 1rem 0 0;
+}
+.modal__close {
+  position: absolute;
+  top: 0.5rem;
+  right: 0.5rem;
+}
+
+
+.dark-mode div ::v-deep(.modal-content) {
+  border-color: #2d3748;
+  background-color: #1a202c;
+}
+
+.restricted.aggregate.indicator {
+  position:relative;
+  left:-7px;
+}
+
+ td {
+    padding-top:2px;
+    padding-bottom:2px;
+  }
+</style>
diff --git a/src/components/TableHeaders.vue b/src/components/TableHeaders.vue
new file mode 100644
index 0000000..dfba28a
--- /dev/null
+++ b/src/components/TableHeaders.vue
@@ -0,0 +1,31 @@
+<template>
+  <th class="table-column status-indicator">
+    
+  </th>
+  <th class="table-column relay">
+    
+  </th>
+  <th class="table-column verified">
+    <span class="verified-shape-wrapper">
+      <span class="shape verified"></span>
+    </span>
+  </th>
+  <th class="table-column location" v-tooltip:top.tooltip="Ping">
+    🌎
+  </th>
+  <th class="table-column latency" v-tooltip:top.tooltip="'Relay Latency on Read'">
+    ⌛️
+  </th>
+  <th class="table-column connect" v-tooltip:top.tooltip="'Relay connection status'">
+    🔌
+  </th>
+  <th class="table-column read" v-tooltip:top.tooltip="'Relay read status'">
+    👁️‍🗨️
+  </th>
+  <th class="table-column write" v-tooltip:top.tooltip="'Relay write status'">
+    ✏️
+  </th>
+  <th class="table-column favorite" v-tooltip:top.tooltip="'Favorite a relay'">
+    ❤️
+  </th>
+</template>
\ No newline at end of file

From edf22ac96276c06b2f3fae5a7539056948c97b6f Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Fri, 23 Dec 2022 23:41:50 +0100
Subject: [PATCH 21/38] disregard component reference

---
 src/components/GroupByAvailability.vue | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/GroupByAvailability.vue b/src/components/GroupByAvailability.vue
index 8288489..7e6e5d4 100644
--- a/src/components/GroupByAvailability.vue
+++ b/src/components/GroupByAvailability.vue
@@ -1,15 +1,6 @@
 <template>
   <table>
-    <RelayGroupedListComponent
-      section="favorites"
-      :relays="relays"
-      :result="result"
-      :geo="geo"
-      :messages="messages"
-      :alerts="alerts"
-      :connections="connections"
-    />
-    
+
     <RelayGroupedListComponent
       section="public"
       :relays="relays"

From 634315c69c2f2c6f67f609796ad326e8d638f059 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Fri, 23 Dec 2022 23:49:08 +0100
Subject: [PATCH 22/38] hotfix: overlapping modal, temporary fix until
 replacement with link to API

---
 src/components/LeafletComponent.vue          | 4 ++--
 src/components/RelayGroupedListComponent.vue | 9 +++++----
 src/components/RelayListComponent.vue        | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/LeafletComponent.vue b/src/components/LeafletComponent.vue
index 3624325..e7885cf 100644
--- a/src/components/LeafletComponent.vue
+++ b/src/components/LeafletComponent.vue
@@ -123,7 +123,7 @@ export default {
 <style scoped>
 .leaflet-container {
   position:relative;
-  z-index:1000;
+  z-index:900;
   margin:0;
   padding:0;
   height:250px !important;
@@ -142,7 +142,7 @@ export default {
 
 button {
   position: relative;
-  z-index:1001;
+  z-index:901;
   top: -30px;
   background:rgba(255,255,255,0.5);
   border:0;
diff --git a/src/components/RelayGroupedListComponent.vue b/src/components/RelayGroupedListComponent.vue
index e7872ce..7cfa3fe 100644
--- a/src/components/RelayGroupedListComponent.vue
+++ b/src/components/RelayGroupedListComponent.vue
@@ -2,9 +2,9 @@
   <tr :class="getHeadingClass()">
     <vue-final-modal v-model="showModal" classes="modal-container" content-class="modal-content">
       <div class="modal__content">
-        <span>
+        <pre>
           {{ queryJson(section) }}
-        </span>
+        </pre>
       </div>
     </vue-final-modal>
     <td colspan="11">
@@ -201,11 +201,12 @@ export default defineComponent({
     align-items: center;
   }
   ::v-deep(.modal-content) {
+    text-align:left;
     position: relative;
     display: flex;
     flex-direction: column;
-    max-height: 90%;
-    max-width:400px;
+    max-height: 500px;
+    max-width:800px;
     margin: 0 1rem;
     padding: 1rem;
     border: 1px solid #e2e8f0;
diff --git a/src/components/RelayListComponent.vue b/src/components/RelayListComponent.vue
index a353ecb..8b54120 100644
--- a/src/components/RelayListComponent.vue
+++ b/src/components/RelayListComponent.vue
@@ -201,7 +201,7 @@ export default defineComponent({
     display: flex;
     flex-direction: column;
     max-height: 90%;
-    max-width:400px;
+    max-width:800px;
     margin: 0 1rem;
     padding: 1rem;
     border: 1px solid #e2e8f0;

From d0adba3b73a8f7afa7b9d36b82baca444ef61f15 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Fri, 23 Dec 2022 23:55:46 +0100
Subject: [PATCH 23/38] cleanup single relay page

---
 src/pages/SingleRelay.vue | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/pages/SingleRelay.vue b/src/pages/SingleRelay.vue
index 0e8d922..41e28c4 100644
--- a/src/pages/SingleRelay.vue
+++ b/src/pages/SingleRelay.vue
@@ -4,52 +4,48 @@
     :relay="relay"
     :result="result"
   />
-  <!-- <NavComponent /> -->
+
   <div id="wrapper">
 
     <row container :gutter="12">
       <column :xs="12" :md="12" :lg="12" class="title-card">
-        <h1>{{ relayUrl() }}</h1>
+        <NavComponent :relays="relays" />
       </column>
     </row>
 
     <row container :gutter="12">
       <column :xs="12" :md="12" :lg="12" class="title-card">
-        <NavComponent :relays="relays" />
+        <h1>{{ relayUrl() }}</h1>
       </column>
     </row>
+    
 
     <row container :gutter="12">
       <column :xs="12" :md="12" :lg="12" class="title-card">
-        <div style="display: none">{{result}}</div> <!-- ? -->
-        <br >
-
         <span  class="badges">
           <span><img :src="badgeCheck('connect')" /></span>
           <span><img :src="badgeCheck('read')" /></span>
           <span><img :src="badgeCheck('write')" /></span>
         </span>
+
+        <span v-if="result.info?.supported_nips" class="badges">
+            <span v-for="(nip) in result.info.supported_nips" :key="`${relay}_${nip}`">
+                <a :href="nipLink(nip)" target="_blank"><img :src="badgeLink(nip)" /></a>
+            </span>
+          </span>
       </column>
     </row>
 
-    <br />
-
     <row container :gutter="12" v-if="!result?.check?.connect">
       <column :xs="12" :md="12" :lg="12" class="title-card">
         This relay appears to be offline.
       </column>
     </row>
 
-    <br />
-
     <row container :gutter="12" v-if="result?.check?.connect">
       <column :xs="12" :md="12" :lg="12" class="title-card">
 
-          <span v-if="result.info?.supported_nips" class="badges">
-            <span v-for="(nip) in result.info.supported_nips" :key="`${relay}_${nip}`">
-                <a :href="nipLink(nip)" target="_blank"><img :src="badgeLink(nip)" /></a>
-            </span>
-          </span>
+          
 
           <table v-if="result.info">
             <tr>
@@ -228,8 +224,8 @@ tr td:first-child { text-align:right }
 tr td:last-child { text-align:left }
 .indicator { display: table-cell; width:33% ; font-weight:bold; text-align: center !important; color: white; text-transform: uppercase; font-size:0.8em}
 body, .grid-column { padding:0; margin:0; }
-.badges { display:block; margin: 10px 0 0}
+.badges { display:block; margin: 10px 0 11px}
 .badges > span {margin-right:5px}
 #wrapper {max-width:800px}
-h1 {margin: 25px 0 15px; padding:0 0 10px; border-bottom:3px solid #e9e9e9}
+h2 {font-size:40pt; margin: 25px 0 15px; padding:0 0 10px; border-bottom:3px solid #e9e9e9}
 </style>

From beb84c8a5625ee81d59e4634504462f26f2bd060 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Sat, 24 Dec 2022 00:17:31 +0100
Subject: [PATCH 24/38] clean up layout components

---
 src/components/FooterComponent.vue |  24 +---
 src/components/HeaderComponent.vue |  40 ++++++
 src/components/NavComponent.vue    |   3 +-
 src/pages/HomePage.vue             |  19 +--
 src/pages/SingleRelay.vue          | 207 +++++++++++++++--------------
 5 files changed, 152 insertions(+), 141 deletions(-)

diff --git a/src/components/FooterComponent.vue b/src/components/FooterComponent.vue
index 47b1a60..bb06e60 100644
--- a/src/components/FooterComponent.vue
+++ b/src/components/FooterComponent.vue
@@ -1,29 +1,7 @@
 <template>
   <section id="footer">
-    <span>Updated {{ refreshData.sinceLast }} ago</span>
-    <span><button @click="invalidate(true)">Update Now</button></span>
-    <span><input type="checkbox" id="checkbox" v-model="preferences.refresh" /><label for="">Refresh Automatically</label></span>
-    <span v-if="preferences.refresh"> Next refresh in: {{ refreshData.untilNext }}</span>
-    <span v-if="preferences.refresh">
-      Refresh Every
-
-      <input type="radio" id="1w" :value="1000*60*60*24*7" v-model="cacheExpiration" />
-      <label for="1w">1 Week</label>
-
-      <input type="radio" id="1d" :value="1000*60*60*24" v-model="cacheExpiration" />
-      <label for="1d">1 day</label>
-
-      <input type="radio" id="30m" :value="1000*60*30" v-model="cacheExpiration" />
-      <label for="30m">30 minutes</label>
-
-      <input type="radio" id="10m" :value="1000*60*10" v-model="cacheExpiration" />
-      <label for="10m">10 minutes</label>
-
-      <input type="radio" id="1m" :value="1000*60" v-model="cacheExpiration" />
-      <label for="1m">1 Minute</label>
-    </span>
+    <span class="credit"><a href="http://sandwich.farm">Another 🥪 by sandwich.farm</a>, built with <a href="https://github.com/jb55/nostr-js">nostr-js</a> and <a href="https://github.com/dskvr/nostr-relay-inspector">nostr-relay-inspector</a>, inspired by <a href="https://github.com/fiatjaf/nostr-relay-registry">nostr-relay-registry</a></span>
   </section>
 </template>
-
 <script>
 </script>
\ No newline at end of file
diff --git a/src/components/HeaderComponent.vue b/src/components/HeaderComponent.vue
index e69de29..75f4f15 100644
--- a/src/components/HeaderComponent.vue
+++ b/src/components/HeaderComponent.vue
@@ -0,0 +1,40 @@
+<template>
+  <row container :gutter="12">
+    <column :xs="12" :md="12" :lg="12" class="title-card">
+      <h1>nostr.watch<sup>{{version}}</sup></h1>
+    </column>
+  </row>
+  
+  <row container :gutter="12">
+    <column :xs="12" :md="12" :lg="12" class="title-card">
+      <NavComponent :relays="relays" />
+    </column>
+  </row>
+</template>
+<script>
+import { version } from '../../package.json'
+
+import { defineComponent} from 'vue'
+import NavComponent from './NavComponent.vue'
+export default defineComponent({
+  title: "nostr.watch registry & network status",
+  name: 'GroupByNone',
+  components: {
+    NavComponent,
+  },
+
+  props: {
+    relays: {
+      type: Array,
+      default(){
+        return []
+      }
+    },
+  },
+  data(){
+    return {
+      version: version
+    }
+  }
+})
+</script>
\ No newline at end of file
diff --git a/src/components/NavComponent.vue b/src/components/NavComponent.vue
index a5f0646..38bd2bf 100644
--- a/src/components/NavComponent.vue
+++ b/src/components/NavComponent.vue
@@ -1,13 +1,12 @@
 <template>
 <nav class="menu">
   <ul>
-    <!-- <router-link :to="`/`" active-class="active" :class="">Home</router-link> -->
+    <router-link :to="`/`" active-class="active">Home</router-link>
     <a href="https://github.com/dskvr/nostr-watch/edit/main/relays.yaml" target="_blank">Add Relay</a>
     <a href="relays.json"><code>{...}</code></a>
     <span>
       <PreferencesComponent :relays="relays" />
     </span>
-
   </ul>
 </nav>
 </template>
diff --git a/src/pages/HomePage.vue b/src/pages/HomePage.vue
index 3f4f7c8..fbde97c 100644
--- a/src/pages/HomePage.vue
+++ b/src/pages/HomePage.vue
@@ -7,18 +7,8 @@
 
   <div id="wrapper">
     
-    <row container :gutter="12">
-      <column :xs="12" :md="12" :lg="12" class="title-card">
-        <h1>nostr.watch<sup>{{version}}</sup></h1>
-      </column>
-    </row>
+    <HeaderComponent :relays="relays" />
     
-    <row container :gutter="12">
-      <column :xs="12" :md="12" :lg="12" class="title-card">
-        <NavComponent :relays="relays" />
-      </column>
-    </row>
-
     <row container :gutter="12">
       <column :xs="12" :md="12" :lg="12" class="list">
         <span>Group By:</span>
@@ -86,10 +76,9 @@ import { Row, Column } from 'vue-grid-responsive';
 import RelaysLib from '../lib/relays-lib.js'
 
 import LeafletComponent from '../components/LeafletComponent.vue'
-import NavComponent from '../components/NavComponent.vue'
 import RefreshComponent from '../components/RefreshComponent.vue'
+import HeaderComponent from '../components/HeaderComponent.vue'
 
-import { version } from '../../package.json'
 import { relays } from '../../relays.yaml'
 import { geo } from '../../cache/geo.yaml'
 
@@ -104,11 +93,10 @@ export default defineComponent({
     Row,
     Column,
     LeafletComponent,
-    NavComponent,
     RefreshComponent,
     GroupByAvailability,
     GroupByNone,
-
+    HeaderComponent
   },
 
   data() {
@@ -123,7 +111,6 @@ export default defineComponent({
       count: 0,
       storage: null,
       geo,
-      version: version,
       hasStorage: false,
       // cacheExpiration: 10*60*1000, //10 minutes
     }
diff --git a/src/pages/SingleRelay.vue b/src/pages/SingleRelay.vue
index 41e28c4..902f8f6 100644
--- a/src/pages/SingleRelay.vue
+++ b/src/pages/SingleRelay.vue
@@ -7,108 +7,110 @@
 
   <div id="wrapper">
 
-    <row container :gutter="12">
-      <column :xs="12" :md="12" :lg="12" class="title-card">
-        <NavComponent :relays="relays" />
-      </column>
-    </row>
-
-    <row container :gutter="12">
-      <column :xs="12" :md="12" :lg="12" class="title-card">
-        <h1>{{ relayUrl() }}</h1>
-      </column>
-    </row>
-    
+    <HeaderComponent :relays="relays" />
 
-    <row container :gutter="12">
-      <column :xs="12" :md="12" :lg="12" class="title-card">
-        <span  class="badges">
-          <span><img :src="badgeCheck('connect')" /></span>
-          <span><img :src="badgeCheck('read')" /></span>
-          <span><img :src="badgeCheck('write')" /></span>
-        </span>
-
-        <span v-if="result.info?.supported_nips" class="badges">
-            <span v-for="(nip) in result.info.supported_nips" :key="`${relay}_${nip}`">
-                <a :href="nipLink(nip)" target="_blank"><img :src="badgeLink(nip)" /></a>
-            </span>
-          </span>
-      </column>
-    </row>
-
-    <row container :gutter="12" v-if="!result?.check?.connect">
-      <column :xs="12" :md="12" :lg="12" class="title-card">
-        This relay appears to be offline.
-      </column>
-    </row>
-
-    <row container :gutter="12" v-if="result?.check?.connect">
-      <column :xs="12" :md="12" :lg="12" class="title-card">
-
-          
-
-          <table v-if="result.info">
-            <tr>
-              <th colspan="2"><h4>Info</h4></th>
-            </tr>
-            <tbody v-if="result.info">
-              <tr v-for="(value, key) in Object.entries(result.info).filter(value => value[0] != 'id' && value[0] != 'supported_nips')" :key="`${value}_${key}`">
-                  <td>{{ value[0] }}</td>
-                  <td v-if="value[0]!='contact' && value[0]!='pubkey' && value[0]!='software' && value[0]!='version'">{{ value[1] }} </td>
-                  <td v-if="value[0]=='contact'"><SafeMail :email="value[1]" /></td>
-                  <td v-if="value[0]=='pubkey' || value[0]=='version'"><code>{{ value[1] }}</code></td>
-                  <td v-if="value[0]=='software'"><a :href="value[1]">{{ value[1] }}</a></td>
-              </tr>
-            </tbody>
-            <tr v-if="Object.entries(result.info).length == 0 && result.check.connect">
-              Relay does not have NIP-11 support, or the administrator has not configured the relay to return information.
-            </tr>
-          </table>
-
-          <h4>Identities</h4>
-          <table v-if="result.identities">
-            <tr v-for="(value, key) in Object.entries(result?.identities)" :key="`${value}_${key}`">
-              <td>{{ value[0] }}</td>
-              <td><code>{{ value[1] }}</code></td>
-            </tr>
-            <tr v-if="Object.entries(result.identities).length==0">
-              Relay does not provide NIP-05 support and has not registered an administrator key.
-            </tr>
-          </table>
-          
-
-          <div style="display: none">{{result}}</div> <!-- ? -->
+    <div id="relay-wrapper">
+
+      <row container :gutter="12">
+        <column :xs="12" :md="12" :lg="12" class="title-card">
+          <h2 @click="copy()">{{ relayUrl() }}</h2>
         </column>
-        <column :xs="12" :md="6" :lg="6" class="title-card">
+      </row>
+      
+
+      <row container :gutter="12">
+        <column :xs="12" :md="12" :lg="12" class="title-card">
+          <span  class="badges">
+            <span><img :src="badgeCheck('connect')" /></span>
+            <span><img :src="badgeCheck('read')" /></span>
+            <span><img :src="badgeCheck('write')" /></span>
+          </span>
 
-          <h4>GEO {{geo?.countryCode ? getFlag() : ''}}</h4>
-          <table v-if="geo[relay]">
-            <tr v-for="(value, key) in Object.entries(geo[relay])" :key="`${value}_${key}`">
-              <td>{{ value[0] }}</td>
-              <td>{{ value[1] }} </td>
-            </tr>
-          </table>
+          <span v-if="result.info?.supported_nips" class="badges">
+              <span v-for="(nip) in result.info.supported_nips" :key="`${relay}_${nip}`">
+                  <a :href="nipLink(nip)" target="_blank"><img :src="badgeLink(nip)" /></a>
+              </span>
+            </span>
+        </column>
+      </row>
 
+      <row container :gutter="12" v-if="!result?.check?.connect">
+        <column :xs="12" :md="12" :lg="12" class="title-card">
+          This relay appears to be offline.
         </column>
-        <column :xs="12" :md="6" :lg="6" class="title-card">
-          <h4>DNS</h4>
-          <table v-if="geo[relay]">
-            <tr v-for="(value, key) in Object.entries(geo[relay].dns)" :key="`${value}_${key}`">
-              <td>{{ value[0] }}</td>
-              <td>{{ value[1] }} </td>
-            </tr>
-          </table>
-
-          <div style="display: none">{{result}}</div> <!-- ? -->
-
-        </column> 
-    </row>
-    
+      </row>
 
-   <!--  <RefreshComponent 
-        :relay="relay"
-      /> -->
-    <span class="credit"><a href="http://sandwich.farm">Another 🥪 by sandwich.farm</a>, built with <a href="https://github.com/jb55/nostr-js">nostr-js</a> and <a href="https://github.com/dskvr/nostr-relay-inspector">nostr-relay-inspector</a>, inspired by <a href="https://github.com/fiatjaf/nostr-relay-registry">nostr-relay-registry</a></span>
+      <row container :gutter="12" v-if="result?.check?.connect">
+        <column :xs="12" :md="12" :lg="12" class="title-card">
+            <table v-if="result.info">
+              <tr>
+                <th colspan="2"><h4>Info</h4></th>
+              </tr>
+              <tbody v-if="result.info">
+                <tr v-for="(value, key) in Object.entries(result.info).filter(value => value[0] != 'id' && value[0] != 'supported_nips')" :key="`${value}_${key}`">
+                    <td>{{ value[0] }}</td>
+                    <td v-if="value[0]!='contact' && value[0]!='pubkey' && value[0]!='software' && value[0]!='version'">{{ value[1] }} </td>
+                    <td v-if="value[0]=='contact'"><SafeMail :email="value[1]" /></td>
+                    <td v-if="value[0]=='pubkey' || value[0]=='version'"><code>{{ value[1] }}</code></td>
+                    <td v-if="value[0]=='software'"><a :href="value[1]">{{ value[1] }}</a></td>
+                </tr>
+              </tbody>
+              <tr v-if="Object.entries(result.info).length == 0 && result.check.connect">
+                Relay does not have NIP-11 support, or the administrator has not configured the relay to return information.
+              </tr>
+            </table>
+
+
+            <table v-if="result.identities">
+              <tr>
+                <th colspan="2"><h4>Identities</h4></th>
+              </tr>
+              <tbody v-if="result.identities">
+                <tr v-for="(value, key) in Object.entries(result?.identities)" :key="`${value}_${key}`">
+                  <td>{{ value[0] }}</td>
+                  <td><code>{{ value[1] }}</code></td>
+                </tr>
+                <tr v-if="Object.entries(result.identities).length==0">
+                  Relay does not provide NIP-05 support and has not registered an administrator key.
+                </tr>
+              </tbody>
+            </table>
+
+          </column>
+          <column :xs="12" :md="6" :lg="6" class="title-card">
+            <table v-if="geo[relay]">
+              <tr>
+                <th colspan="2"><h4>GEO {{geo?.countryCode ? getFlag() : ''}}</h4></th>
+              </tr>
+              <tbody v-if="geo[relay]">
+                <tr v-for="(value, key) in Object.entries(geo[relay])" :key="`${value}_${key}`">
+                  <td>{{ value[0] }}</td>
+                  <td>{{ value[1] }} </td>
+                </tr>
+              </tbody>
+            </table>
+          </column>
+          <column :xs="12" :md="6" :lg="6" class="title-card">
+            <table v-if="geo[relay]">
+              <tr>
+                <th colspan="2"><h4>DNS</h4></th>
+              </tr>
+              <tbody v-if="geo[relay]">
+                <tr v-for="(value, key) in Object.entries(geo[relay].dns)" :key="`${value}_${key}`">
+                <td>{{ value[0] }}</td>
+                <td>{{ value[1] }} </td>
+              </tr>
+              </tbody>
+            </table>
+          </column> 
+      </row>
+      
+
+     <!--  <RefreshComponent 
+          :relay="relay"
+        /> -->
+    </div>
+    
 
   </div>
 </template>
@@ -119,7 +121,8 @@ import { defineComponent} from 'vue'
 import { useStorage } from "vue3-storage";
 
 import LeafletSingleComponent from '../components/LeafletSingleComponent.vue'
-import NavComponent from '../components/NavComponent.vue'
+import HeaderComponent from '../components/HeaderComponent.vue'
+// import NavComponent from '../components/NavComponent.vue'
 // import RefreshComponent from '../components/RefreshComponent.vue'
 
 import { Row, Column } from 'vue-grid-responsive';
@@ -166,8 +169,9 @@ export default defineComponent({
     Row,
     Column,
     LeafletSingleComponent,
-    NavComponent,
+    // NavComponent,
     SafeMail,
+    HeaderComponent,
     // RefreshComponent,
   },
 
@@ -219,7 +223,7 @@ export default defineComponent({
 ul, ul li { padding:0; margin:0; list-style:none; }
 td { padding:5px 10px; }
 th h4 { text-align:center; padding:5px 10px; margin:0 0 6px; background:#f0f0f0; }
-table {width:90%; max-width:90%; margin:0 auto 20px ; border: 2px solid #f5f5f5; padding:20px}
+table {margin:20px 10px 20px; border: 2px solid #f5f5f5; padding:20px}
 tr td:first-child { text-align:right }
 tr td:last-child { text-align:left }
 .indicator { display: table-cell; width:33% ; font-weight:bold; text-align: center !important; color: white; text-transform: uppercase; font-size:0.8em}
@@ -227,5 +231,8 @@ body, .grid-column { padding:0; margin:0; }
 .badges { display:block; margin: 10px 0 11px}
 .badges > span {margin-right:5px}
 #wrapper {max-width:800px}
-h2 {font-size:40pt; margin: 25px 0 15px; padding:0 0 10px; border-bottom:3px solid #e9e9e9}
+
+
+#relay-wrapper { margin: 50px 0 20p;}
+h2 {cursor:pointer;font-size:40pt; margin: 25px 0 15px; padding:0 0 10px; border-bottom:3px solid #e9e9e9}
 </style>

From 8846a0e47eec538c0bdc67252e09922271316063 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Sat, 24 Dec 2022 00:37:52 +0100
Subject: [PATCH 25/38] add copy functionality to single view

---
 src/pages/SingleRelay.vue | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/SingleRelay.vue b/src/pages/SingleRelay.vue
index 902f8f6..3ed9a88 100644
--- a/src/pages/SingleRelay.vue
+++ b/src/pages/SingleRelay.vue
@@ -13,7 +13,9 @@
 
       <row container :gutter="12">
         <column :xs="12" :md="12" :lg="12" class="title-card">
-          <h2 @click="copy()">{{ relayUrl() }}</h2>
+          <span v-tooltip:top.tooltip="'Click to copy'" style="display:block">
+            <h2 @click="copy(relayUrl())">{{ relayUrl() }}</h2>
+          </span>
         </column>
       </row>
       
@@ -159,6 +161,14 @@ const localMethods = {
     nipLink(key){
       return `https://github.com/nostr-protocol/nips/blob/master/${this.nipSignature(key)}.md`
     },
+
+    async copy(text) {
+      try {
+        await navigator.clipboard.writeText(text);
+      } catch($e) {
+        //console.log('Cannot copy');
+      }
+    },
 }
 
 export default defineComponent({
@@ -233,6 +243,6 @@ body, .grid-column { padding:0; margin:0; }
 #wrapper {max-width:800px}
 
 
-#relay-wrapper { margin: 50px 0 20p;}
-h2 {cursor:pointer;font-size:40pt; margin: 25px 0 15px; padding:0 0 10px; border-bottom:3px solid #e9e9e9}
+#relay-wrapper { margin: 50px 0 20px; padding: 20px 0}
+h2 {cursor:pointer;font-size:40pt; margin: 0px 0 15px; padding:0 0 10px; border-bottom:3px solid #e9e9e9}
 </style>

From e797a06fe70df55c9b5f129f0c89f4a5fa956d2d Mon Sep 17 00:00:00 2001
From: alek <ekberg.jose@gmail.com>
Date: Sat, 24 Dec 2022 00:39:23 +0100
Subject: [PATCH 26/38] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index a503756..020f3d2 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -113,3 +113,4 @@ relays:
   - wss://nostr.roundrockbitcoiners.com
   - wss://nostr.orangepill.dev
   - wss://nostr1.starbackr.me
+  - wss://nostr-relay.alekberg.net

From 00b08f54f99072df9aa19f416ca1ba50f79d4d6d Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Sat, 24 Dec 2022 00:40:15 +0100
Subject: [PATCH 27/38] fix runaway interval, remove console logs

---
 src/components/GroupByNone.vue            | 2 +-
 src/components/LeafletSingleComponent.vue | 2 +-
 src/components/PreferencesComponent.vue   | 2 +-
 src/components/RefreshComponent.vue       | 3 ++-
 src/lib/relays-lib.js                     | 8 ++++----
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/GroupByNone.vue b/src/components/GroupByNone.vue
index b2494b4..ec67ceb 100644
--- a/src/components/GroupByNone.vue
+++ b/src/components/GroupByNone.vue
@@ -84,7 +84,7 @@ export default defineComponent({
     }
   },
   mounted(){
-    console.log(this.relays)
+    // console.log(this.relays)
   },
   data() {
     return {}
diff --git a/src/components/LeafletSingleComponent.vue b/src/components/LeafletSingleComponent.vue
index cb3f238..147433e 100644
--- a/src/components/LeafletSingleComponent.vue
+++ b/src/components/LeafletSingleComponent.vue
@@ -60,7 +60,7 @@ export default {
 
       const relay = this.relay
 
-      console.log(this.geo[this.relay]?.lat, this.geo[this.relay]?.lon)
+      //console.log(this.geo[this.relay]?.lat, this.geo[this.relay]?.lon)
 
       if(!this.geo[this.relay]?.lat || !this.geo[this.relay]?.lon)
         return 'transparent'
diff --git a/src/components/PreferencesComponent.vue b/src/components/PreferencesComponent.vue
index c318ff3..26851f5 100644
--- a/src/components/PreferencesComponent.vue
+++ b/src/components/PreferencesComponent.vue
@@ -84,7 +84,7 @@ const localMethods = {
   },
   clearData(){
     this.relays.forEach( relay => {
-      console.log('clearing', relay)
+      // console.log('clearing', relay)
       this.removeCache(`${relay}`)
       this.removeCache(`${relay}_inbox`)
     })
diff --git a/src/components/RefreshComponent.vue b/src/components/RefreshComponent.vue
index 713b8b4..78672e0 100644
--- a/src/components/RefreshComponent.vue
+++ b/src/components/RefreshComponent.vue
@@ -26,13 +26,14 @@ const localMethods = {
       return this.timeSince(Date.now()-(this.lastUpdate+this.preferences.cacheExpiration-Date.now()))
     },
     setRefreshInterval: function(){
+      clearInterval(this.interval)
       this.interval = setInterval(() => {
         this.preferences = this.getCache('preferences') || this.preferences
 
         this.refreshData.untilNext = this.timeUntilRefresh() 
         this.refreshData.sinceLast = this.timeSinceRefresh() 
 
-        console.log('is expired', this.isExpired())
+        //console.log('is expired', this.isExpired())
 
         if(this.isExpired() && this.preferences.refresh)
           this.invalidate(false, this.relay)
diff --git a/src/lib/relays-lib.js b/src/lib/relays-lib.js
index 0af2212..b9e6ce7 100644
--- a/src/lib/relays-lib.js
+++ b/src/lib/relays-lib.js
@@ -11,7 +11,7 @@ export default {
 
       this.setCache('lastUpdate')
 
-      console.log('invalidate', 'total relays', this.relays.length)
+      // console.log('invalidate', 'total relays', this.relays.length)
       
       if(single) {
         await this.check(single) 
@@ -19,11 +19,11 @@ export default {
         this.messages[single] = this.getCache(`${single}_inbox`) 
       } 
       else {
-        console.log('total relays', this.relays.length)
-        console.log(this.relays.length)
+        // console.log('total relays', this.relays.length)
+        // console.log(this.relays.length)
         for(let index = 0; index < this.relays.length; index++) {
           let relay = this.relays[index]
-          console.log('invalidating', relay)
+          // console.log('invalidating', relay)
           await this.delay(20).then( () => { 
             this.check(relay)
               .then(() => {

From b39c3fe8ca553fc63cdaf3c261a836918087b14d Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Sat, 24 Dec 2022 00:40:49 +0100
Subject: [PATCH 28/38] remove favorites column

---
 src/components/TableHeaders.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/TableHeaders.vue b/src/components/TableHeaders.vue
index dfba28a..92cbadd 100644
--- a/src/components/TableHeaders.vue
+++ b/src/components/TableHeaders.vue
@@ -25,7 +25,4 @@
   <th class="table-column write" v-tooltip:top.tooltip="'Relay write status'">
     ✏️
   </th>
-  <th class="table-column favorite" v-tooltip:top.tooltip="'Favorite a relay'">
-    ❤️
-  </th>
 </template>
\ No newline at end of file

From 9c3246eb33ac19af3378ddcc14818048f47c0df7 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Sat, 24 Dec 2022 00:44:20 +0100
Subject: [PATCH 29/38] bump version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 33f6a03..1b98580 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nostr-watch",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build",

From 57fe866a16793019db1196395058641c3a375bfc Mon Sep 17 00:00:00 2001
From: Sandwich <299465+dskvr@users.noreply.github.com>
Date: Sat, 24 Dec 2022 00:51:46 +0100
Subject: [PATCH 30/38] Add notice to README

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eb8355b..c1c40c6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
+> this project is alpha! changes are fast and hard. branching model and tests will come with beta. 
+
 # nostr-watch
 
-A client-side nostr network status built with Vue3, [nostr-js](https://github.com/jb55/nostr-js) and [nostr-relay-inspector](https://github.com/dskvr/nostr-relay-inspector). Goal is to produce a client-side app that collects detailed information about nostr relays and the network in general to assist users, developers and relay operators alike.
+A client-side nostr network status built with Vue3, [nostr-js](https://github.com/jb55/nostr-js) and [nostr-relay-inspector](https://github.com/dskvr/nostr-relay-inspector). Goal is to produce a client-side app that collects detailed information about nostr relays and the network in general to assist users, developers and relay operators alike
 
 ## Features
 - [x] Real-time relay status 

From 0ade5b7de510a81858a1906813c07ef076a633b2 Mon Sep 17 00:00:00 2001
From: Jonathan Serra <jonathan.serra@hotmail.fr>
Date: Sat, 24 Dec 2022 01:16:31 +0100
Subject: [PATCH 31/38] Update relays.yaml

Adds `wss://nostr.blocs.fr`
---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index 020f3d2..54434ea 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -114,3 +114,4 @@ relays:
   - wss://nostr.orangepill.dev
   - wss://nostr1.starbackr.me
   - wss://nostr-relay.alekberg.net
+  - wss://nostr.blocs.fr

From 3f7679a9736b6913188605238a57a42bc1bc5977 Mon Sep 17 00:00:00 2001
From: Wes van der Vleuten <16665772+WesVleuten@users.noreply.github.com>
Date: Sat, 24 Dec 2022 02:24:33 +0100
Subject: [PATCH 32/38] Added nostr.f44.dev relay

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index 54434ea..b27d016 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -115,3 +115,4 @@ relays:
   - wss://nostr1.starbackr.me
   - wss://nostr-relay.alekberg.net
   - wss://nostr.blocs.fr
+  - wss://nostr.f44.dev

From f450d76b8c65b5971ac6a07f42d50ce9223d2f06 Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Sat, 24 Dec 2022 02:26:20 +0100
Subject: [PATCH 33/38] hotfix: missing leading slash for /relays.json nav link

---
 src/components/NavComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/NavComponent.vue b/src/components/NavComponent.vue
index 38bd2bf..abe4096 100644
--- a/src/components/NavComponent.vue
+++ b/src/components/NavComponent.vue
@@ -3,7 +3,7 @@
   <ul>
     <router-link :to="`/`" active-class="active">Home</router-link>
     <a href="https://github.com/dskvr/nostr-watch/edit/main/relays.yaml" target="_blank">Add Relay</a>
-    <a href="relays.json"><code>{...}</code></a>
+    <a href="/relays.json"><code>{...}</code></a>
     <span>
       <PreferencesComponent :relays="relays" />
     </span>

From 73113d41c75acab54d58239e928aad079c480d7e Mon Sep 17 00:00:00 2001
From: dskvr <dskvr@users.noreply.github.com>
Date: Sat, 24 Dec 2022 02:35:06 +0100
Subject: [PATCH 34/38] patch for relay map markers

---
 src/components/LeafletComponent.vue       | 5 ++---
 src/components/LeafletSingleComponent.vue | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/LeafletComponent.vue b/src/components/LeafletComponent.vue
index e7885cf..7d52104 100644
--- a/src/components/LeafletComponent.vue
+++ b/src/components/LeafletComponent.vue
@@ -26,8 +26,8 @@
         v-for="([relay, entry]) in Object.entries(geo)"
         :lat-lng="getLatLng(entry)"
         :key="relay"
-        :radius="3"
-        :weight="6"
+        :radius="2"
+        :weight="4"
         :color="getCircleColor(relay)"
         :fillOpacity="1"
         :class="relay"
@@ -114,7 +114,6 @@ export default {
       }
     },
   },
-  
 };
 
 
diff --git a/src/components/LeafletSingleComponent.vue b/src/components/LeafletSingleComponent.vue
index 147433e..77bd12e 100644
--- a/src/components/LeafletSingleComponent.vue
+++ b/src/components/LeafletSingleComponent.vue
@@ -24,8 +24,8 @@
 
     <l-circle-marker
       :lat-lng="center"
-      :radius="3"
-      :weight="6"
+      :radius="2"
+      :weight="4"
       :color="markerColor"
       :fillOpacity="1"
       :class="relay"

From b6b0fc0faf63b405237380507b5fb7b3285c87b7 Mon Sep 17 00:00:00 2001
From: Fakhrul Khir <m.fakhrulkhir@gmail.com>
Date: Sun, 25 Dec 2022 20:23:30 +0800
Subject: [PATCH 35/38] Update relays.yaml

Added Malaysia-based relay
---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index b27d016..e08fd1b 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -116,3 +116,4 @@ relays:
   - wss://nostr-relay.alekberg.net
   - wss://nostr.blocs.fr
   - wss://nostr.f44.dev
+  - wss://nostr.mustardnodes.com

From 055faa4c5d33346e83454fecc96d31268b061ce1 Mon Sep 17 00:00:00 2001
From: Vincenzo Marcella <marcellavincenzo@protonmail.com>
Date: Sun, 25 Dec 2022 21:34:51 +0100
Subject: [PATCH 36/38] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index b27d016..b4af3de 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -116,3 +116,4 @@ relays:
   - wss://nostr-relay.alekberg.net
   - wss://nostr.blocs.fr
   - wss://nostr.f44.dev
+  - wss://nostr.demovement.net

From d9a38280aea3211e33f01289fea3d05cc0788d75 Mon Sep 17 00:00:00 2001
From: prplsknk <91209727+prplsknk@users.noreply.github.com>
Date: Mon, 26 Dec 2022 16:40:29 +0100
Subject: [PATCH 37/38] Update relays.yaml

Add wss://nostr.ethtozero.fr to relay list
---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index 613c52f..afc2b29 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -118,3 +118,4 @@ relays:
   - wss://nostr.f44.dev
   - wss://nostr.demovement.net
   - wss://nostr.mustardnodes.com
+  - wss://nostr.ethtozero.fr

From cde7fbb4837a85149eb26555d07e1bfd69fcf5d5 Mon Sep 17 00:00:00 2001
From: Ioannis Lazaridis <ilazaridis@protonmail.com>
Date: Mon, 26 Dec 2022 18:25:07 +0100
Subject: [PATCH 38/38] Update relays.yaml

---
 relays.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/relays.yaml b/relays.yaml
index afc2b29..9d268dd 100644
--- a/relays.yaml
+++ b/relays.yaml
@@ -119,3 +119,4 @@ relays:
   - wss://nostr.demovement.net
   - wss://nostr.mustardnodes.com
   - wss://nostr.ethtozero.fr
+  - wss://nostr.hackerman.pro