From 22028c5a3b2345f6e3a7383ee8dff04305ee4609 Mon Sep 17 00:00:00 2001 From: Believethehype <1097224+believethehype@users.noreply.github.com> Date: Fri, 15 Mar 2024 15:22:52 +0100 Subject: [PATCH] fixes --- ui/noogle/src/components/Login.vue | 97 +++++++++++++-------- ui/noogle/src/layouts/ThreeColumnLayout.vue | 6 +- 2 files changed, 63 insertions(+), 40 deletions(-) diff --git a/ui/noogle/src/components/Login.vue b/ui/noogle/src/components/Login.vue index 6f6b651..563993f 100644 --- a/ui/noogle/src/components/Login.vue +++ b/ui/noogle/src/components/Login.vue @@ -28,7 +28,8 @@

Noogle

-

Enter a Nostr Wallet connect string for easier zapping on the page

+
+

Enter a Nostr Wallet connect string for easier zapping on the page

@@ -65,44 +66,42 @@
-
- -
- -
-

Mutiny Wallet

-

Connect with your Mutiny Wallet

-
+
+ +
+ +
+

Mutiny Wallet

+

Connect with your Mutiny Wallet

+
+
+ +
+

Add a new Wallet Connection from:

+
    +
  • Settings
    • +
  • Wallet Connections
    • +
  • Add Connection
  • copy the connection string.
    • +
+ +
+
+
+ +
+ +
+

Nostr Wallet Connect

+

Manually connect with NWC string

+
-
+
+
+ -
-

Add a new Wallet Connection from:

-
    -
  • Settings
    • -
  • Wallet Connections
    • -
  • Add Connection
  • copy the connection string.
    • -
- -
-
-
- -
- -
-

Nostr Wallet Connect

-

Manually connect with NWC string

-
- - -
-
- - -
-
+
+
@@ -112,6 +111,17 @@
+
+
+
+
+
+ + + +
+
+ @@ -219,6 +229,7 @@ export default { nwc: ref(""), nwcmutiny: ref(""), nwcalby: ref(""), + hasNWC: ref(""), nwcconnector: ref("user"), pw: ref("") @@ -263,6 +274,11 @@ export default { } await this.getnip89s() let nwc = loadNWCObject() + this.hasNWC = false + + if(nwc != null && nwc.nwcUrl){ + this.hasNWC = true + } if(nwc.connectorType === "alby"){ @@ -902,6 +918,14 @@ export default { await this.sign_in_anon() }, + async disconnect_nwc(){ + this.nwc = "" + this.nwcalby = "" + this.nwcmutiny = "" + this.hasNWC = false + localStorage.setItem("nwc", "{\"nwcUrl\":\"" + "" + "\",\"connectorName\":\""+ "" +"\",\"connectorType\":\"" + "" +"\"}" ) + }, + async store_nwc(){ let connector = "" let nwc = "" @@ -918,6 +942,7 @@ export default { nwc = this.nwc } localStorage.setItem("nwc", "{\"nwcUrl\":\"" + nwc + "\",\"connectorName\":\""+ connector +"\",\"connectorType\":\"" + connector +"\"}" ) + this.hasNWC = true }, diff --git a/ui/noogle/src/layouts/ThreeColumnLayout.vue b/ui/noogle/src/layouts/ThreeColumnLayout.vue index c50cb9e..0b60d9f 100644 --- a/ui/noogle/src/layouts/ThreeColumnLayout.vue +++ b/ui/noogle/src/layouts/ThreeColumnLayout.vue @@ -6,18 +6,16 @@ import {isVisible} from "bootstrap/js/src/util/index.js";