From e21266d1cbb840b860e6333ff3ecfda1d3b7a980 Mon Sep 17 00:00:00 2001 From: dskvr Date: Sat, 7 Jan 2023 11:03:01 +0100 Subject: [PATCH] beautification --- src/components/relays/blocks/MapSingle.vue | 2 +- .../relays/blocks/RelaysResultTable.vue | 16 +- src/components/relays/nav/RelaysFindNav.vue | 8 +- src/components/relays/pages/RelaysSingle.vue | 150 ++++++++++++++---- .../relays/partials/NostrSyncPopoverNag.vue | 43 +++-- 5 files changed, 159 insertions(+), 60 deletions(-) diff --git a/src/components/relays/blocks/MapSingle.vue b/src/components/relays/blocks/MapSingle.vue index cf071ed..caf6078 100644 --- a/src/components/relays/blocks/MapSingle.vue +++ b/src/components/relays/blocks/MapSingle.vue @@ -108,7 +108,7 @@ export default { }, data() { return { - zoom: 2, + zoom: 5, center: [40.41322, -1.219482], markerColor: 'transparent' }; diff --git a/src/components/relays/blocks/RelaysResultTable.vue b/src/components/relays/blocks/RelaysResultTable.vue index 3cd6ff0..d14adf3 100644 --- a/src/components/relays/blocks/RelaysResultTable.vue +++ b/src/components/relays/blocks/RelaysResultTable.vue @@ -27,7 +27,7 @@ - + @@ -41,15 +41,15 @@ Latency - + Connect - + Read - + Write @@ -74,7 +74,7 @@ {{ relay.replace('wss://', '') }} - + @@ -95,15 +95,15 @@ border-width:0px; } --> - +   - +   - +   diff --git a/src/components/relays/nav/RelaysFindNav.vue b/src/components/relays/nav/RelaysFindNav.vue index 60ff6da..6f8cbb3 100644 --- a/src/components/relays/nav/RelaysFindNav.vue +++ b/src/components/relays/nav/RelaysFindNav.vue @@ -14,9 +14,9 @@ -
+
@@ -52,7 +52,7 @@ import { defineComponent } from 'vue' //pinia import { setupStore } from '@/store' //components -import RelaysSearchFilter from '@/components/relays/blocks/RelaysSearchFilter.vue' +// import RelaysSearchFilter from '@/components/relays/blocks/RelaysSearchFilter.vue' //nav conf import { items } from './config/relays.find.yaml' //shared methods @@ -67,7 +67,7 @@ export default defineComponent({ title: "nostr.watch registry & network status", name: 'RelaysFindNav', components: { - RelaysSearchFilter, + // RelaysSearchFilter, Disclosure, DisclosureButton, DisclosurePanel, Bars3Icon, XMarkIcon, // PreferencesComponent, diff --git a/src/components/relays/pages/RelaysSingle.vue b/src/components/relays/pages/RelaysSingle.vue index 2795e7d..7719634 100644 --- a/src/components/relays/pages/RelaysSingle.vue +++ b/src/components/relays/pages/RelaysSingle.vue @@ -9,61 +9,133 @@ v-if="(geo instanceof Object)" /> -
- - -
+
+

{{geo?.countryCode ? getFlag : ''}}{{ relayFromUrl }}

-

{{ result.info.description }}

+

{{ result.info.description }}

-
+
This Relay Appears to be offline
+ + + +
+
+ {{key}} +
+
+ +
+
+ +
+
+

nips

+
+ + NIP-{{key}} + +
+
+
+ +
+
+ + The IP of {{ geo.dns.name }} is {{ geo.dns.data }} + and appears to be in {{ geo.city }} {{ geo.country }}. + Hosting is provided by {{ geo.as }}. + + + + + The current time in {{ geo.city }} is {{ getLocalTime }} + + +
+
+ + + +
+
+ It's running {{ getSoftware }}:{{ result.info.version }} + + Some links... + + {{ result.info.software.includes('+https') ? 'https' : ' http' }} + + + git + + +
+
-
+
+
+ {{ this.result?.info.pubkey }} + was recieved via {{ relayFromUrl }}/.well-known/nostr.json +
+
+ +
+
+ Here's the details... +
+
+ + + +
-

Relay Info NIP-11

+

Relay Info NIP-11

-
-
Connection Status
-
- - - + +
-
Relay Name
+
Relay Name
{{ result.info.name }}
-
Public Key
+
Public Key
{{ result.info.pubkey }}
-
Contact
+
Contact
-
Software
+
Software
{{ getSoftware }} -
-{{result.info.software}}
+
+ {{result.info.software}}
-
Software Version
+
Software Version
{{ result.info.version }}
@@ -92,7 +164,7 @@
-

DNS

+

DNS

@@ -106,7 +178,7 @@
-

Geo Data {{geo?.countryCode ? getFlag : ''}}

+

Geo Data {{geo?.countryCode ? getFlag : ''}}

@@ -335,9 +407,7 @@ import { RelayPool } from 'nostr' import crypto from 'crypto' const localMethods = { - badgeCheck(which){ - return `https://img.shields.io/static/v1?style=for-the-badge&label=&message=${which}&color=${this.result?.check?.[which] ? 'green' : 'red'}` - }, + async copy(text) { try { await navigator.clipboard.writeText(text); @@ -452,6 +522,19 @@ export default defineComponent({ }, computed: Object.assign(SharedComputed, { + getLocalTime: function(){ + let options = { + timeZone: this.geo.timezone, + year: 'numeric', + month: 'numeric', + day: 'numeric', + hour: 'numeric', + minute: 'numeric', + second: 'numeric', + } + const formatter = new Intl.DateTimeFormat([], options); + return formatter.format(new Date()) + }, getSoftware: function(){ return pathSegments(this.result?.info?.software, { last: 2 }) }, @@ -529,7 +612,12 @@ export default defineComponent({ // }, methods: Object.assign(localMethods, RelaysLib, { - + check(key){ + return { + 'bg-green-800': this.result?.check?.[key], + 'bg-red-800': !this.result?.check?.[key] + } + }, }), }) diff --git a/src/components/relays/partials/NostrSyncPopoverNag.vue b/src/components/relays/partials/NostrSyncPopoverNag.vue index 5101391..39d2cc0 100644 --- a/src/components/relays/partials/NostrSyncPopoverNag.vue +++ b/src/components/relays/partials/NostrSyncPopoverNag.vue @@ -1,21 +1,32 @@ -