fix: errors

lnbits · Nov 8, 2024 · cc9dcc4 · cc9dcc4
1 parent 43a1bdf
commit cc9dcc4
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/crud.py b/crud.py
@@ -294,7 +294,7 @@ async def get_accounts(
     return await db.fetchall(
         """
         SELECT * FROM nostrrelay.accounts
-        WHERE relay_id = :id AND allowed = :allowed OR blocked = :blocked"
+        WHERE relay_id = :id AND allowed = :allowed OR blocked = :blocked
         """,
         {"id": relay_id, "allowed": allowed, "blocked": blocked},
         NostrAccount,

diff --git a/relay/relay.py b/relay/relay.py
@@ -100,11 +100,11 @@ class RelaySpec(RelayPublicSpec, WalletSpec, AuthSpec):
 
 class NostrRelay(BaseModel):
     id: str
-    user_id: str
+    user_id: Optional[str] = None
     name: str
-    description: Optional[str]
-    pubkey: Optional[str]
-    contact: Optional[str]
+    description: Optional[str] = None
+    pubkey: Optional[str] = None
+    contact: Optional[str] = None
     active: bool = False
     meta: RelaySpec = RelaySpec()
 

diff --git a/templates/nostrrelay/index.html b/templates/nostrrelay/index.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %} {% from "macros.jinja" import window_vars with context
 %} {% block page %}
-<template id="relay-details">
-  {% include("nostrrelay/relay-details.html") %}
-</template>
+
 <div class="row q-col-gutter-md">
   <div class="col-12 col-md-7 q-gutter-y-md">
     <q-card>
@@ -107,7 +105,13 @@ <h5 class="text-subtitle1 q-my-none">Relays</h5>
               <q-td colspan="100%">
                 <div class="row items-center q-mb-lg">
                   <div class="col-12">
+                    wwww<br/>
+                    <span v-text="props.row.id"></span><br/>
+                    <span v-text="g.user.wallets[0].inkey"></span><br/>
+                    <span v-text="g.user.wallets[0].adminkey"></span><br/>
+                    <span v-text="g.user.walletOptions"></span><br/>
                     <relay-details
+
                       :relay-id="props.row.id"
                       :adminkey="g.user.wallets[0].adminkey"
                       :inkey="g.user.wallets[0].inkey"
@@ -198,9 +202,15 @@ <h6 class="text-subtitle1 q-my-none">
     </q-card>
   </q-dialog>
 </div>
+{% endblock %} {% block vue_templates %}
+<template id="relay-details">
+  {% include("nostrrelay/relay-details.html") %}
+</template>
+
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
 <script src="{{ static_url_for('nostrrelay/static', path='js/utils.js') }}"></script>
-<script src="{{ static_url_for('nostrrelay/static', path='components/relay-details.js') }}"></script>
 <script src="{{ static_url_for('nostrrelay/static', path='js/index.js') }}"></script>
+<script src="{{ static_url_for('nostrrelay/static', path='components/relay-details.js') }}"></script>
+
 
 {% endblock %}
diff --git a/templates/nostrrelay/relay-details.html b/templates/nostrrelay/relay-details.html
@@ -400,8 +400,7 @@
               color="primary"
               text-color="white"
             >
-            <span v-text="e"></span>
-
+              <span v-text="e"></span>
             </q-chip>
           </div>
         </div>
@@ -433,7 +432,7 @@
               color="primary"
               text-color="white"
             >
-            <span v-text="e"></span>
+              <span v-text="e"></span>
             </q-chip>
           </div>
         </div>
@@ -642,10 +641,14 @@
                       @input="togglePublicKey(props.row, 'block')"
                     ></q-toggle>
                   </q-td>
-
-                  <q-td auto-width><span v-text="props.row.paid_to_join"></span> </q-td>
+
+                  <q-td auto-width
+                    ><span v-text="props.row.paid_to_join"></span>
+                  </q-td>
                   <q-td auto-width> <span v-text="props.row.sats"></span></q-td>
-                  <q-td auto-width><span v-text="props.row.storage"></span> </q-td>
+                  <q-td auto-width
+                    ><span v-text="props.row.storage"></span>
+                  </q-td>
                 </q-tr>
               </template>
             </q-table>