From 2099a8b7bb5c4e6d79a90408ead3ea4989038042 Mon Sep 17 00:00:00 2001
From: Vlad Stan <stan.v.vlad@gmail.com>
Date: Wed, 15 Feb 2023 11:58:15 +0200
Subject: [PATCH] refactor: allow&block clean-up

---
 migrations.py                                 |  1 -
 .../relay-details/relay-details.html          | 71 +++----------------
 .../components/relay-details/relay-details.js |  2 +-
 3 files changed, 11 insertions(+), 63 deletions(-)

diff --git a/migrations.py b/migrations.py
index 6b81a94..e69c350 100644
--- a/migrations.py
+++ b/migrations.py
@@ -52,7 +52,6 @@ async def m001_initial(db):
         CREATE TABLE nostrrelay.accounts (
             relay_id TEXT NOT NULL,
             pubkey TEXT NOT NULL,
-            sats {db.big_int} DEFAULT 0,
             storage {db.big_int} DEFAULT 0,
             paid_to_join BOOLEAN DEFAULT false,
             allowed BOOLEAN DEFAULT false,
diff --git a/static/components/relay-details/relay-details.html b/static/components/relay-details/relay-details.html
index 0041c3c..d999f48 100644
--- a/static/components/relay-details/relay-details.html
+++ b/static/components/relay-details/relay-details.html
@@ -3,8 +3,7 @@
     <q-tab name="info" label="Relay Info"></q-tab>
     <q-tab name="payment" label="Payment"></q-tab>
     <q-tab name="config" label="Config"></q-tab>
-    <q-tab name="allowed" label="Allowed"></q-tab>
-    <q-tab name="blocked" label="Blocked"></q-tab>
+    <q-tab name="access" label="Access"></q-tab>
   </q-tabs>
   <q-tab-panels v-model="tab">
     <q-tab-panel name="info">
@@ -528,11 +527,11 @@
         </div>
       </div>
     </q-tab-panel>
-    <q-tab-panel name="allowed">
+    <q-tab-panel name="access">
       <div v-if="relay">
         <div class="row items-center no-wrap q-mb-md">
-          <div class="col-3 q-pr-lg">Allowed Public Key</div>
-          <div class="col-7 q-pr-lg">
+          <div class="col-2 q-pr-lg">Public Key: </div>
+          <div class="col-6 q-pr-lg">
             <q-input
               filled
               dense
@@ -540,76 +539,26 @@
               type="text"
             ></q-input>
           </div>
-          <div class="col-2 q-pr-lg">
+          <div class="col-2 q-pr-md">
             <q-btn
               unelevated
-              color="secondary"
+              color="green"
               class="float-right"
               @click="allowPublicKey()"
-              >Add</q-btn
+              >Allow</q-btn
             >
           </div>
-        </div>
-        <div
-          :key="p"
-          v-for="p in relay.config.allowedPublicKeys"
-          class="row q-mb-xs"
-        >
-          <div class="col-3 q-pr-lg"></div>
-          <div class="col-9 q-pr-lg">
-            {{p}}
+          <div class="col-2">
             <q-btn
-              size="sm"
               unelevated
               color="pink"
-              icon="cancel"
-              class="float-right"
-              @click="deleteAllowedPublicKey(p)"
-            ></q-btn>
-          </div>
-        </div>
-      </div>
-    </q-tab-panel>
-    <q-tab-panel name="blocked">
-      <div v-if="relay">
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col-3 q-pr-lg">Blocked Public Key</div>
-          <div class="col-7 q-pr-lg">
-            <q-input
-              filled
-              dense
-              v-model.trim="blockedPubkey"
-              type="text"
-            ></q-input>
-          </div>
-          <div class="col-2 q-pr-lg">
-            <q-btn
-              unelevated
-              color="secondary"
               class="float-right"
               @click="blockPublicKey()"
-              >Add</q-btn
+              >Block</q-btn
             >
           </div>
         </div>
-        <div
-          :key="p"
-          v-for="p in relay.config.blockedPublicKeys"
-          class="row q-mb-xs"
-        >
-          <div class="col-3 q-pr-lg"></div>
-          <div class="col-9 q-pr-lg">
-            {{p}}
-            <q-btn
-              unelevated
-              size="sm"
-              color="pink"
-              icon="cancel"
-              class="float-right"
-              @click="deleteBlockedPublicKey(p)"
-            ></q-btn>
-          </div>
-        </div>
+
       </div>
     </q-tab-panel>
   </q-tab-panels>
diff --git a/static/components/relay-details/relay-details.js b/static/components/relay-details/relay-details.js
index 01011db..99f75c4 100644
--- a/static/components/relay-details/relay-details.js
+++ b/static/components/relay-details/relay-details.js
@@ -126,11 +126,11 @@ async function relayDetails(path) {
         this.relay.config.allowedPublicKeys =
           this.relay.config.allowedPublicKeys.filter(p => p !== pubKey)
       },
-
       deleteBlockedPublicKey: function (pubKey) {
         this.relay.config.blockedPublicKeys =
           this.relay.config.blockedPublicKeys.filter(p => p !== pubKey)
       },
+
       addSkipAuthForEvent: function () {
         value = +this.skipEventKind
         if (this.relay.config.skipedAuthEvents.indexOf(value) != -1) {