Browse Source

resolves #36

update/libraries
dskvr 2 years ago
parent
commit
962fc045d7
  1. 1
      package.json
  2. 13
      src/App.vue
  3. 9
      src/components/RefreshComponent.vue
  4. 6
      src/main.js
  5. 2
      src/pages/ByStatus.vue
  6. 3
      src/pages/HomePage.vue
  7. 10
      src/pages/SingleRelay.vue
  8. 7
      src/shared.js

1
package.json

@ -41,6 +41,7 @@
"vue": "^3.2.13",
"vue-final-modal": "3",
"vue-grid-responsive": "1.3.0",
"vue-meta": "3.0.0-alpha.2",
"vue-nav-tabs": "0.5.7",
"vue-router": "4.1.6",
"vue-simple-maps": "1.1.3",

13
src/App.vue

@ -7,7 +7,18 @@
export default {
name: 'App',
components: {}
components: {},
metaInfo: {
title: 'nostr.watch registry & network status',
titleTemplate: '%s | nostr.watch',
meta: [
{
vmid: 'description',
name: 'description',
content: 'nostr.watch monitors the relays that make up the nostr network providing useful information for developers and users.'
}
]
}
}
</script>

9
src/components/RefreshComponent.vue

@ -43,6 +43,8 @@ export default defineComponent({
name: 'RefreshComponent',
components: {},
mounted(){
clearInterval(this.interval)
this.storage = useStorage()
this.lastUpdate = this.getState('lastUpdate')|| this.lastUpdate
this.preferences = this.getState('preferences') || this.preferences
@ -57,7 +59,8 @@ export default defineComponent({
updated(){
this.saveState('preferences')
this.saveState('lastUpdate')
if(this.relays && this.isDone())
this.saveState('lastUpdate')
this.refreshData.untilNext = this.timeUntilRefresh()
this.refreshData.sinceLast = this.timeSinceRefresh()
@ -72,9 +75,9 @@ export default defineComponent({
}
},
relaysProp:{
type: Object,
type: Array,
default(){
return {}
return []
}
},
messagesProp:{

6
src/main.js

@ -5,15 +5,17 @@ import Vue3Storage from "vue3-storage";
import router from './router'
import "./styles/main.scss"
import directives from "./directives/"
import titleMixin from './mixins/titleMixin'
// import titleMixin from './mixins/titleMixin'
import {Tabs, Tab} from 'vue3-tabs-component';
import VueMeta from 'vue-meta'
const app = createApp(App)
.use(router)
.use(VueMeta)
.use(Vue3Storage, { namespace: "nostrwatch_" })
.component('tabs', Tabs)
.component('tab', Tab)
.mixin(titleMixin)
// .mixin(titleMixin)
directives(app);

2
src/pages/ByStatus.vue

@ -98,8 +98,8 @@ import { geo } from '../../geo.yaml'
import { messages as RELAY_MESSAGES, codes as RELAY_CODES } from '../../codes.yaml'
export default defineComponent({
title: "nostr.watch registry & network status",
name: 'ByStatus',
components: {
Row,
Column,

3
src/pages/HomePage.vue

@ -57,7 +57,6 @@
import { defineComponent } from 'vue'
import { useStorage } from "vue3-storage";
// import { CallbackResult } from "vue3-storage/dist/lib/types";
import { Row, Column } from 'vue-grid-responsive';
// import { Inspector, InspectorObservation } from '../../lib/nostr-relay-inspector'
@ -75,8 +74,8 @@ import { relays } from '../../relays.yaml'
import { geo } from '../../geo.yaml'
export default defineComponent({
title: "nostr.watch registry & network status",
name: 'HomePage',
components: {
Row,
Column,

10
src/pages/SingleRelay.vue

@ -109,9 +109,9 @@
</row>
<RefreshComponent
<!-- <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>
</div>
@ -124,7 +124,7 @@ import { useStorage } from "vue3-storage";
import LeafletSingleComponent from '../components/LeafletSingleComponent.vue'
import NavComponent from '../components/NavComponent.vue'
import RefreshComponent from '../components/RefreshComponent.vue'
// import RefreshComponent from '../components/RefreshComponent.vue'
import { Row, Column } from 'vue-grid-responsive';
import SafeMail from "@2alheure/vue-safe-mail";
@ -163,15 +163,15 @@ const localMethods = {
}
export default defineComponent({
title: "nostr.watch registry & network status",
name: 'SingleRelay',
components: {
Row,
Column,
LeafletSingleComponent,
NavComponent,
SafeMail,
RefreshComponent,
// RefreshComponent,
},
data() {

7
src/shared.js

@ -1,4 +1,5 @@
import { Inspector, InspectorObservation } from 'nostr-relay-inspector'
// import { Inspector, InspectorObservation } from '../lib/nostr-relay-inspector'
import { messages as RELAY_MESSAGES, codes as RELAY_CODES } from '../codes.yaml'
import crypto from "crypto"
@ -64,7 +65,13 @@ export default {
})
.on('notice', (notice) => {
const hash = this.sha1(notice)
console.log('hash', hash)
let message_obj = RELAY_MESSAGES[hash]
console.log('message_obj', message_obj)
if(message_obj && Object.prototype.hasOwnProperty.call(message_obj, 'code'))
return
let code_obj = RELAY_CODES[message_obj.code]
let response_obj = {...message_obj, ...code_obj}

Loading…
Cancel
Save