details

sandwichfarm · Apr 12, 2024 · 7993f03 · 7993f03
1 parent cd9f492
commit 7993f03
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/src/lib/components/layout/Footer.svelte b/src/lib/components/layout/Footer.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
     import { onMount } from 'svelte';
     import { browser } from '$app/environment';
-    
 
     onMount(async ()=>{
       if(browser) {
@@ -11,12 +10,22 @@
     })
 </script>
 
-<span class="block mt-5 mb-32 text-purple-950 dark:text-purple-50 font-bold text-sm ">
+<span id="ohai" class="mt-5 mb-32 text-purple-950 dark:text-purple-50 font-bold text-sm transition-opacity duration-100">
   powered by <a href="https://github.com/sandwichfarm/myrelay.page" target="_blank">myrelay.page</a> 
   <button
       id="mrp-support"
       data-npub="npub1uac67zc9er54ln0kl6e4qp2y6ta3enfcg7ywnayshvlw9r5w6ehsqq99rx"
       class="px-1 rounded-xl">
     ⚡️
     </button>
-</span>
+</span>
+
+<style>
+  :global(body #ohai) {
+    opacity: 0;
+  }
+
+  :global(body.loaded #ohai) {
+    opacity: 1;
+  }
+</style>
diff --git a/src/lib/core/MRP.ts b/src/lib/core/MRP.ts
@@ -11,14 +11,14 @@ import type { DD } from './kinds/geocoded';
 import { MRPFeed } from './MRPFeed';
 
 import { EventEmitter } from 'tseep';
-import { MRPStage, MRPStatus } from './MRPData';
+import { MRPData, MRPStage, MRPStatus } from './MRPData';
 
 export interface MRPState {
   signal: EventEmitter<any>;
   ndk?: NDK;
 }
 
-export class MyRelayPage {
+export class MyRelayPage extends MRPData {
   private readonly defaultRelays: Set<string> = new Set(['wss://purplepag.es', 'wss://user.kindpag.es', 'wss://history.nostr.watch'] as string[])
   private _url: string;
   private _nostr: MRPNostr;
@@ -28,12 +28,15 @@ export class MyRelayPage {
   private _userFollowsOnRelay: NDKUser[] = []
   private _promises: Promise<any>[] = []
 
-  public $: MRPState = { signal: new EventEmitter() }
+  public $: MRPState;
 
   constructor(url?: string){
+    const signal = new EventEmitter()
+    super(signal, 'root')
+    this.begin()
+    this.$ = { signal }
     this.url = url
     if(!this.url) throw new Error(`No valid URL provided/detected: ${this.url}`)
-    this.$.signal.emit('sync:start', Date.now())
     this._nostr = new MRPNostr(this.$.signal, this.defaultRelays, this.url)
     this.$.ndk = this._nostr.ndk
     this._editor = new MRPEditor()
@@ -46,7 +49,8 @@ export class MyRelayPage {
     await this.config?.init()
     await this.nostr?.init()
     // await this.editor?.init()
-    this.$.signal.once('relay:completed', () => { this.$.signal.emit('sync:finish', Date.now()) })
+    this.$.signal.once('relay:completed', () => { this.complete() })
+
   }
 
   bindHandlers(){

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -46,11 +46,11 @@
         mrp.set(_mrp);
       });
 
-      _mrp.$.signal.on('sync:start', function(timestamp: number){ 
+      _mrp.$.signal.on('root:pending', function(timestamp: number){ 
         document.body.classList.add('loading')
       })
 
-      _mrp.$.signal.on('sync:finish', function(timestamp: number){ 
+      _mrp.$.signal.on('root:completed', function(timestamp: number){ 
         document.body.classList.remove('loading')
         document.body.classList.add('loaded')
         console.log(`loaded in ${Date.now()-$start}ms`)
@@ -77,7 +77,13 @@
     <div class="flex flex-col items-center justify-center">
       <div id="mrp-wrapper" class="mrp-wrapper-bg mrp-wrapper-content transition-colors duration-200 ease-in-out">
         <Header></Header>
+
         <slot></slot>
+        {#if !$mrp?.nostr?.relay?.config?.isComplete}
+          <span class="mt-5 text-center block text-black/20 dark:text-white/20 italic text-lg"> 
+            loading operator config...  
+          </span>
+        {/if}
       </div>
       <Footer></Footer>
     </div>