From 2d18153b1d40704ab569ae14826d1cafb04682ab Mon Sep 17 00:00:00 2001
From: Black Coffee <randommw@protonmail.com>
Date: Wed, 28 Sep 2022 15:05:37 +0100
Subject: [PATCH] Added front end and work on db migrations and saving

---
 lnbits/Pipfile                                |   62 +
 lnbits/extensions/gerty/config.json           |    2 +-
 lnbits/extensions/gerty/crud.py               |   50 +-
 lnbits/extensions/gerty/migrations.py         |   21 +-
 lnbits/extensions/gerty/models.py             |   22 +-
 .../gerty/templates/gerty/index.html          | 1262 +++++++++--------
 6 files changed, 841 insertions(+), 578 deletions(-)
 create mode 100644 lnbits/Pipfile

diff --git a/lnbits/Pipfile b/lnbits/Pipfile
new file mode 100644
index 00000000..3517399d
--- /dev/null
+++ b/lnbits/Pipfile
@@ -0,0 +1,62 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+aiofiles = "==0.8.0"
+anyio = "==3.6.1"
+asyncio = "==3.4.3"
+attrs = "==21.4.0"
+bech32 = "==1.2.0"
+bitstring = "==3.1.9"
+cerberus = "==1.3.4"
+certifi = "==2022.6.15"
+cffi = "==1.15.0"
+click = "==8.1.3"
+ecdsa = "==0.18.0"
+embit = "==0.5.0"
+environs = "==9.5.0"
+fastapi = "==0.79.0"
+h11 = "==0.12.0"
+httpcore = "==0.15.0"
+httptools = "==0.4.0"
+httpx = "==0.23.0"
+idna = "==3.3"
+jinja2 = "==3.0.1"
+lnurl = "==0.3.6"
+loguru = "==0.6.0"
+markupsafe = "==2.1.1"
+marshmallow = "==3.17.0"
+outcome = "==1.2.0"
+psycopg2-binary = "==2.9.3"
+pycparser = "==2.21"
+pycryptodomex = "==3.15.0"
+pydantic = "==1.9.1"
+pyngrok = "==5.1.0"
+pyparsing = "==3.0.9"
+pypng = "==0.20220715.0"
+pyqrcode = "==1.2.1"
+pyscss = "==1.4.0"
+python-dotenv = "==0.20.0"
+pyyaml = "==6.0"
+represent = "==1.6.0.post0"
+rfc3986 = "==1.5.0"
+secp256k1 = "==0.14.0"
+shortuuid = "==1.0.9"
+six = "==1.16.0"
+sniffio = "==1.2.0"
+sqlalchemy-aio = "==0.17.0"
+sqlalchemy = "==1.3.23"
+sse-starlette = "==0.10.3"
+starlette = "==0.19.1"
+typing-extensions = "==4.3.0"
+uvicorn = "==0.18.2"
+uvloop = "==0.16.0"
+watchfiles = "==0.16.0"
+websockets = "==10.3"
+
+[dev-packages]
+
+[requires]
+python_version = "3.9"
diff --git a/lnbits/extensions/gerty/config.json b/lnbits/extensions/gerty/config.json
index 158ac52a..a36437be 100644
--- a/lnbits/extensions/gerty/config.json
+++ b/lnbits/extensions/gerty/config.json
@@ -2,5 +2,5 @@
   "name": "Gerty",
   "short_description": "Desktop bitcoin Assistant",
   "icon": "sentiment_satisfied",
-  "contributors": ["arcbtc"]
+  "contributors": ["arcbtc", "blackcoffeebtc"]
 }
diff --git a/lnbits/extensions/gerty/crud.py b/lnbits/extensions/gerty/crud.py
index 9eeb1a4a..fee57dba 100644
--- a/lnbits/extensions/gerty/crud.py
+++ b/lnbits/extensions/gerty/crud.py
@@ -10,8 +10,33 @@ async def create_gerty(wallet_id: str, data: Gerty) -> Gerty:
     gerty_id = urlsafe_short_hash()
     await db.execute(
         """
-        INSERT INTO gerty.gertys (id, name, wallet, lnbits_wallets, mempool_endpoint, sats_quote, exchange, onchain_stats, ln_stats)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
+        INSERT INTO gerty.gertys (
+        id,
+        name,
+        wallet,
+        lnbits_wallets,
+        mempool_endpoint,
+        exchange,
+        show_lnbits_wallets_balance,
+        show_sats_quote,
+        show_pieter_wuille_facts,
+        show_exchange_market_rate,
+        show_onchain_difficulty_epoch_progress,
+        show_onchain_difficulty_retarget_date,
+        show_onchain_difficulty_blocks_remaining,
+        show_onchain_difficulty_epoch_time_remaining,
+        show_onchain_mempool_recommended_fees,
+        show_onchain_mempool_number_of_tx,
+        show_mining_current_hash_rate,
+        show_mining_current_difficulty,
+        show_lightning_channel_count,
+        show_lightning_node_count,
+        show_lightning_tor_node_count,
+        show_lightning_clearnet_nodes,
+        show_lightning_unannounced_nodes,
+        show_lightning_average_channel_capacity
+        )
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
             gerty_id,
@@ -19,10 +44,25 @@ async def create_gerty(wallet_id: str, data: Gerty) -> Gerty:
             data.wallet,
             data.lnbits_wallets,
             data.mempool_endpoint,
-            data.sats_quote,
             data.exchange,
-            data.onchain_stats,
-            data.ln_stats,
+            data.show_lnbits_wallets_balance,
+            data.show_sats_quote,
+            data.show_pieter_wuille_facts,
+            data.show_exchange_market_rate,
+            data.show_onchain_difficulty_epoch_progress,
+            data.show_onchain_difficulty_retarget_date,
+            data.show_onchain_difficulty_blocks_remaining,
+            data.show_onchain_difficulty_epoch_time_remaining,
+            data.show_onchain_mempool_recommended_fees,
+            data.show_onchain_mempool_number_of_tx,
+            data.show_mining_current_hash_rate,
+            data.show_mining_current_difficulty,
+            data.show_lightning_channel_count,
+            data.show_lightning_node_count,
+            data.show_lightning_tor_node_count,
+            data.show_lightning_clearnet_nodes,
+            data.show_lightning_unannounced_nodes,
+            data.show_lightning_average_channel_capacity
         ),
     )
 
diff --git a/lnbits/extensions/gerty/migrations.py b/lnbits/extensions/gerty/migrations.py
index d3bba79c..5e21495a 100644
--- a/lnbits/extensions/gerty/migrations.py
+++ b/lnbits/extensions/gerty/migrations.py
@@ -10,10 +10,25 @@ async def m001_initial(db):
             wallet TEXT NOT NULL,
             lnbits_wallets TEXT,
             mempool_endpoint TEXT,
-            sats_quote BOOL,
             exchange TEXT,
-            onchain_stats BOOL,
-            ln_stats BOOL
+            show_lnbits_wallets_balance BOOL,
+            show_sats_quote BOOL,
+            show_pieter_wuille_facts BOOL,
+            show_exchange_market_rate BOOL,
+            show_onchain_difficulty_epoch_progress BOOL,
+            show_onchain_difficulty_retarget_date BOOL,
+            show_onchain_difficulty_blocks_remaining BOOL,
+            show_onchain_difficulty_epoch_time_remaining BOOL,
+            show_onchain_mempool_recommended_fees BOOL,
+            show_onchain_mempool_number_of_tx BOOL,
+            show_mining_current_hash_rate BOOL,
+            show_mining_current_difficulty BOOL,
+            show_lightning_channel_count BOOL,
+            show_lightning_node_count BOOL,
+            show_lightning_tor_node_count BOOL,
+            show_lightning_clearnet_nodes BOOL,
+            show_lightning_unannounced_nodes BOOL,
+            show_lightning_average_channel_capacity BOOL
         );
     """
     )
\ No newline at end of file
diff --git a/lnbits/extensions/gerty/models.py b/lnbits/extensions/gerty/models.py
index c3590f03..bf3465d6 100644
--- a/lnbits/extensions/gerty/models.py
+++ b/lnbits/extensions/gerty/models.py
@@ -12,10 +12,26 @@ class Gerty(BaseModel):
     wallet: str
     lnbits_wallets: str = Query(None) # Wallets to keep an eye on, {"wallet-id": "wallet-read-key, etc"}
     mempool_endpoint: str = Query(None) # Mempool endpoint to use
-    sats_quote: bool = Query(False) # Fetch Satoshi quotes
     exchange: str = Query(None) # BTC <-> Fiat exchange rate to pull ie "USD", in 0.0001 and sats
-    onchain_stats: bool = Query(False) # Onchain stats
-    ln_stats: bool = Query(False) # ln Sats
+    show_lnbits_wallets_balance: bool = Query(False)
+    show_sats_quote: bool = Query(False)
+    show_pieter_wuille_facts: bool = Query(False)
+    show_exchange_market_rate: bool = Query(False)
+    show_onchain_difficulty_epoch_progress: bool = Query(False)
+    show_onchain_difficulty_retarget_date: bool = Query(False)
+    show_onchain_difficulty_blocks_remaining: bool = Query(False)
+    show_onchain_difficulty_epoch_time_remaining: bool = Query(False)
+    show_onchain_mempool_recommended_fees: bool = Query(False)
+    show_onchain_mempool_number_of_tx: bool = Query(False)
+    show_mining_current_hash_rate: bool = Query(False)
+    show_mining_current_difficulty: bool = Query(False)
+    show_lightning_channel_count: bool = Query(False)
+    show_lightning_node_count: bool = Query(False)
+    show_lightning_tor_node_count: bool = Query(False)
+    show_lightning_clearnet_nodes: bool = Query(False)
+    show_lightning_unannounced_nodes: bool = Query(False)
+    show_lightning_average_channel_capacity: bool = Query(False)
+
 
     @classmethod
     def from_row(cls, row: Row) -> "Gerty":
diff --git a/lnbits/extensions/gerty/templates/gerty/index.html b/lnbits/extensions/gerty/templates/gerty/index.html
index 7ba0e029..657b68a6 100644
--- a/lnbits/extensions/gerty/templates/gerty/index.html
+++ b/lnbits/extensions/gerty/templates/gerty/index.html
@@ -1,575 +1,705 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block page %}
-<div class="row q-col-gutter-md">
-  <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <q-btn unelevated color="primary" @click="formDialog.show = true"
-          >New Gerty</q-btn
-        >
-      </q-card-section>
-    </q-card>
-    <q-card>
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Gerty</h5>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportCSV">Export to CSV</q-btn>
-          </div>
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context %} {% block page %}
+    <div class="row q-col-gutter-md">
+        <div class="col-12 col-md-8 col-lg-7 q-gutter-y-md">
+            <q-card>
+                <q-card-section>
+                    <q-btn unelevated color="primary" @click="formDialog.show = true"
+                    >New Gerty
+                    </q-btn
+                    >
+                </q-card-section>
+            </q-card>
+            <q-card>
+                <q-card-section>
+                    <div class="row items-center no-wrap q-mb-md">
+                        <div class="col">
+                            <h5 class="text-subtitle1 q-my-none">Gerty</h5>
+                        </div>
+                        <div class="col-auto">
+                            <q-btn flat color="grey" @click="exportCSV">Export to CSV</q-btn>
+                        </div>
+                    </div>
+                    <q-table
+                            dense
+                            flat
+                            :data="gertys"
+                            row-key="id"
+                            :columns="gertysTable.columns"
+                            :pagination.sync="gertysTable.pagination"
+                    >
+                        {% raw %}
+                        <template v-slot:header="props">
+                            <q-tr :props="props">
+                                <q-th auto-width></q-th>
+                                <q-th v-for="col in props.cols" :key="col.name" :props="props">
+                                    {{ col.label }}
+                                </q-th>
+                                <q-th auto-width></q-th>
+                                <q-th auto-width></q-th>
+                            </q-tr>
+                        </template>
+
+                        <template v-slot:body="props">
+                            <q-tr :props="props">
+                                <q-td auto-width>
+                                    <q-btn
+                                            unelevated
+                                            dense
+                                            size="xs"
+                                            icon="sentiment_satisfied"
+                                            color="green"
+                                            type="a"
+                                            :href="props.row.gerty"
+                                            target="_blank"
+                                    >
+                                        <q-tooltip>Launch software Gerty</q-tooltip>
+                                    </q-btn>
+                                    <q-btn
+                                            unelevated
+                                            dense
+                                            size="xs"
+                                            icon="code"
+                                            color="pink"
+                                            type="a"
+                                            :href="props.row.gertyJson"
+                                            target="_blank"
+                                    >
+                                        <q-tooltip>Launch software Gerty</q-tooltip>
+                                    </q-btn>
+                                </q-td>
+                                <q-td v-for="col in props.cols" :key="col.name" :props="props">
+                                    {{ (col.name == 'tip_options' && col.value ?
+                                    JSON.parse(col.value).join(", ") : col.value) }}
+                                </q-td>
+                                <q-td auto-width>
+                                    <q-btn
+                                            flat
+                                            dense
+                                            size="xs"
+                                            @click="updateformDialog(props.row.id)"
+                                            icon="edit"
+                                            color="light-blue"
+                                    ></q-btn>
+                                </q-td>
+                                <q-td auto-width>
+                                    <q-btn
+                                            flat
+                                            dense
+                                            size="xs"
+                                            @click="deleteGerty(props.row.id)"
+                                            icon="cancel"
+                                            color="pink"
+                                    ></q-btn>
+                                </q-td>
+                            </q-tr>
+                        </template>
+                        {% endraw %}
+                    </q-table>
+                </q-card-section>
+            </q-card>
         </div>
-        <q-table
-          dense
-          flat
-          :data="gertys"
-          row-key="id"
-          :columns="gertysTable.columns"
-          :pagination.sync="gertysTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
-            <q-tr :props="props">
-              <q-th auto-width></q-th>
-              <q-th v-for="col in props.cols" :key="col.name" :props="props">
-                {{ col.label }}
-              </q-th>
-              <q-th auto-width></q-th>
-              <q-th auto-width></q-th>
-            </q-tr>
-          </template>
 
-          <template v-slot:body="props">
-            <q-tr :props="props">
-              <q-td auto-width>
-                <q-btn
-                  unelevated
-                  dense
-                  size="xs"
-                  icon="sentiment_satisfied"
-                  color="green"
-                  type="a"
-                  :href="props.row.gerty"
-                  target="_blank"
-                ><q-tooltip>Launch software Gerty</q-tooltip></q-btn>
-                <q-btn
-                  unelevated
-                  dense
-                  size="xs"
-                  icon="code"
-                  color="pink"
-                  type="a"
-                  :href="props.row.gertyJson"
-                  target="_blank"
-                ><q-tooltip>Launch software Gerty</q-tooltip></q-btn>
-              </q-td>
-              <q-td v-for="col in props.cols" :key="col.name" :props="props">
-                {{ (col.name == 'tip_options' && col.value ?
-                JSON.parse(col.value).join(", ") : col.value) }}
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="updateformDialog(props.row.id)"
-                  icon="edit"
-                  color="light-blue"
-                ></q-btn>
-              </q-td>
-              <q-td auto-width>
-                <q-btn
-                  flat
-                  dense
-                  size="xs"
-                  @click="deleteGerty(props.row.id)"
-                  icon="cancel"
-                  color="pink"
-                ></q-btn>
-              </q-td>
-            </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  <div class="col-12 col-md-5 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <h6 class="text-subtitle1 q-my-none">{{SITE_TITLE}} Gerty extension</h6>
-      </q-card-section>
-      <q-card-section class="q-pa-none">
-        <q-separator></q-separator>
-        <q-list>
-          {% include "gerty/_api_docs.html" %}
-        </q-list>
-      </q-card-section>
-    </q-card>
-  </div>
-
-  <q-dialog v-model="formDialog.show" position="top" @hide="closeFormDialog">
-    <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
-      <q-form @submit="sendFormDataGerty" class="q-gutter-md">
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialog.data.name"
-          label="Name"
-          placeholder="Son of Gerty"
-        ></q-input>
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="formDialog.data.wallet"
-          :options="g.user.walletOptions"
-          label="Wallet *"
-        ></q-select>
-        <q-select
-          filled
-          multiple
-          dense
-          emit-value
-          v-model="formDialog.data.lnbits_wallets"
-          use-input
-          use-chips
-          multiple
-          hide-dropdown-icon
-          new-value-mode="add-unique"
-          label="Invoice keys of wallets to watch"
-          ><q-tooltip>Hit enter to add values</q-tooltip></q-select>
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="formDialog.data.exchange"
-          :options="currencyOptions"
-          label="Exchange rate"
-        ></q-select>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialog.data.mempool_endpoint"
-          label="Mempool link"
-        ><q-tooltip>Used for getting onchain/ln stats</q-tooltip></q-input>
-        <q-toggle
-          v-model="formDialog.data.sats_quote"
-          label="Satoshi Quotes"
-        ><q-tooltip>Gets random quotes from satoshi</q-tooltip></q-toggle>
-        <q-toggle
-          v-model="formDialog.data.onchain_stats"
-          label="Onchain Statistics"
-        ><q-tooltip>Gets Onchain Statistics</q-tooltip></q-toggle>
-        <q-toggle
-          v-model="formDialog.data.ln_stats"
-          label="LN Statistics"
-        ><q-tooltip>Gets Lightning-Network Statistics</q-tooltip></q-toggle>
-        <div class="row q-mt-lg">
-          <q-btn
-            unelevated
-            color="primary"
-            :disable="formDialog.data.wallet == null || formDialog.data.name == null"
-            type="submit"
-            class="q-mr-md"
-            >Create Gerty</q-btn
-          >
-          <q-btn
-          v-if="formDialog.data.id"
-          unelevated
-          color="primary"
-          :disable="formDialog.data.wallet == null || formDialog.data.name == null"
-          type="submit"
-          >Update Gerty</q-btn
-        >
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-            >Cancel</q-btn
-          >
+        <div class="col-12 col-md-5 q-gutter-y-md">
+            <q-card>
+                <q-card-section>
+                    <h6 class="text-subtitle1 q-my-none">{{ SITE_TITLE }} Gerty extension</h6>
+                </q-card-section>
+                <q-card-section class="q-pa-none">
+                    <q-separator></q-separator>
+                    <q-list>
+                        {% include "gerty/_api_docs.html" %}
+                    </q-list>
+                </q-card-section>
+            </q-card>
         </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
-</div>
+
+        <q-dialog v-model="formDialog.show" position="top" @hide="closeFormDialog">
+            <q-card class="q-pa-lg q-pt-xl" style="width: 500px">
+                <q-form @submit="sendFormDataGerty" class="q-gutter-md">
+                    <q-input
+                            filled
+                            dense
+                            v-model.trim="formDialog.data.name"
+                            label="Name"
+                            placeholder="Son of Gerty"
+                    ></q-input>
+                    <q-select
+                            filled
+                            dense
+                            emit-value
+                            v-model="formDialog.data.wallet"
+                            :options="g.user.walletOptions"
+                            label="Wallet *"
+                    ></q-select>
+                    <q-select
+                            filled
+                            multiple
+                            dense
+                            emit-value
+                            v-model="formDialog.data.lnbits_wallets"
+                            use-input
+                            use-chips
+                            multiple
+                            hide-dropdown-icon
+                            new-value-mode="add-unique"
+                            label="Invoice keys of wallets to watch"
+                    >
+                        <q-tooltip>Hit enter to add values</q-tooltip>
+                    </q-select>
+                    <q-select
+                            filled
+                            dense
+                            emit-value
+                            v-model="formDialog.data.exchange"
+                            :options="currencyOptions"
+                            label="Exchange rate"
+                    ></q-select>
+                    <q-input
+                            filled
+                            dense
+                            v-model.trim="formDialog.data.mempool_endpoint"
+                            label="Mempool link"
+                    >
+                        <q-tooltip>Used for getting onchain/ln stats</q-tooltip>
+                    </q-input>
+
+                    <p>Use the toggles below to control what your Gerty will display</p>
+                    <q-expansion-item
+                            expand-separator
+                            icon="perm_identity"
+                            label="LNbits wallets"
+                    >
+                        <q-toggle
+                                v-model="formDialog.data.show_lnbits_wallets_balance"
+                                label="Show LNbits wallet balances"
+                        ></q-toggle>
+                    </q-expansion-item>
+                    <q-expansion-item
+                            expand-separator
+                            icon="celebration"
+                            label="The Fun Stuff"
+                    >
+                        <q-toggle
+                                v-model="formDialog.data.show_sats_quote"
+                                label="Satoshi Quotes"
+                        >
+                            <q-tooltip>Displays random quotes from Satoshi</q-tooltip>
+                        </q-toggle>
+                        <q-toggle
+                                v-model="formDialog.data.show_pieter_wuille_facts"
+                                label="Pieter Wuille Facts"
+                        >
+                            <q-tooltip>Show accurate facts about Pieter Wuille</q-tooltip>
+                        </q-toggle>
+                        <q-toggle
+                                v-model="formDialog.data.show_exchange_market_rate"
+                                label="Current dirty fiat to BTC  price"
+                        ></q-toggle>
+                    </q-expansion-item>
+                    <q-expansion-item
+                            expand-separator
+                            icon="link"
+                            label="Onchain Information"
+                    >
+                        <q-toggle
+                                v-model="formDialog.data.show_onchain_difficulty_epoch_progress"
+                                label="Percent of current difficulty epoch complete"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_onchain_difficulty_retarget_date"
+                                label="Estimated retarget date"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_onchain_difficulty_blocks_remaining"
+                                label="Blocks until next difficulty adjustment"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_onchain_difficulty_epoch_time_remaining"
+                                label="Estimated time until next difficulty adjustment"
+                        ></q-toggle>
+                    </q-expansion-item>
+                    <q-expansion-item
+                            expand-separator
+                            icon="psychology"
+                            label="The Mempool"
+                    >
+
+                        <q-toggle
+                                v-model="formDialog.data.show_onchain_mempool_recommended_fees"
+                                label="Recommended fees"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_onchain_mempool_number_of_tx"
+                                label="Number of transactions in the mempool"
+                        ></q-toggle>
+                    </q-expansion-item>
+
+                    <q-expansion-item
+                            expand-separator
+                            icon="reorder"
+                            label="Mining Data"
+                    >
+                        <q-toggle
+                                v-model="formDialog.data.show_mining_current_hash_rate"
+                                label="Current mining hashrate"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_mining_current_difficulty"
+                                label="Current mining difficulty"
+                        ></q-toggle>
+                    </q-expansion-item>
+
+                    <q-expansion-item
+                            expand-separator
+                            icon="bolt"
+                            label="Lightning Network"
+                    >
+                        <q-toggle
+                                v-model="formDialog.data.show_lightning_channel_count"
+                                label="Channel count"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_lightning_node_count"
+                                label="Number of nodes"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_lightning_tor_node_count"
+                                label="Number of Tor nodes"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_lightning_clearnet_nodes"
+                                label="Number of clearnet nodes"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_lightning_unannounced_nodes"
+                                label="Number of unannounced nodes"
+                        ></q-toggle>
+
+                        <q-toggle
+                                v-model="formDialog.data.show_lightning_average_channel_capacity"
+                                label="Average channel capacity"
+                        ></q-toggle>
+                    </q-expansion-item>
+                    <div class="row q-mt-lg">
+                        <q-btn
+                                unelevated
+                                color="primary"
+                                :disable="formDialog.data.wallet == null || formDialog.data.name == null"
+                                type="submit"
+                                class="q-mr-md"
+                        >Create Gerty
+                        </q-btn
+                        >
+                        <q-btn
+                                v-if="formDialog.data.id"
+                                unelevated
+                                color="primary"
+                                :disable="formDialog.data.wallet == null || formDialog.data.name == null"
+                                type="submit"
+                        >Update Gerty
+                        </q-btn
+                        >
+                        <q-btn v-close-popup flat color="grey" class="q-ml-auto"
+                        >Cancel
+                        </q-btn
+                        >
+                    </div>
+                </q-form>
+            </q-card>
+        </q-dialog>
+    </div>
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script>
-  var mapGerty = function (obj) {
-    obj.date = Quasar.utils.date.formatDate(
-      new Date(obj.time * 1000),
-      'YYYY-MM-DD HH:mm'
-    )
-    obj.fsat = new Intl.NumberFormat(LOCALE).format(obj.amount)
-    obj.gerty = ['/gerty/', obj.id].join('')
-    obj.gertyJson = ['/gerty/api/v1/gerty/', obj.id].join('')
-    return obj
-  }
+    <script>
+        var mapGerty = function (obj) {
+            obj.date = Quasar.utils.date.formatDate(
+                new Date(obj.time * 1000),
+                'YYYY-MM-DD HH:mm'
+            )
+            obj.fsat = new Intl.NumberFormat(LOCALE).format(obj.amount)
+            obj.gerty = ['/gerty/', obj.id].join('')
+            obj.gertyJson = ['/gerty/api/v1/gerty/', obj.id].join('')
+            return obj
+        }
 
-  new Vue({
-    el: '#vue',
-    mixins: [windowMixin],
-    data: function () {
-      return {
-        gertys: [],
-        currencyOptions: [
-          'USD',
-          'EUR',
-          'GBP',
-          'AED',
-          'AFN',
-          'ALL',
-          'AMD',
-          'ANG',
-          'AOA',
-          'ARS',
-          'AUD',
-          'AWG',
-          'AZN',
-          'BAM',
-          'BBD',
-          'BDT',
-          'BGN',
-          'BHD',
-          'BIF',
-          'BMD',
-          'BND',
-          'BOB',
-          'BRL',
-          'BSD',
-          'BTN',
-          'BWP',
-          'BYN',
-          'BZD',
-          'CAD',
-          'CDF',
-          'CHF',
-          'CLF',
-          'CLP',
-          'CNH',
-          'CNY',
-          'COP',
-          'CRC',
-          'CUC',
-          'CUP',
-          'CVE',
-          'CZK',
-          'DJF',
-          'DKK',
-          'DOP',
-          'DZD',
-          'EGP',
-          'ERN',
-          'ETB',
-          'EUR',
-          'FJD',
-          'FKP',
-          'GBP',
-          'GEL',
-          'GGP',
-          'GHS',
-          'GIP',
-          'GMD',
-          'GNF',
-          'GTQ',
-          'GYD',
-          'HKD',
-          'HNL',
-          'HRK',
-          'HTG',
-          'HUF',
-          'IDR',
-          'ILS',
-          'IMP',
-          'INR',
-          'IQD',
-          'IRR',
-          'IRT',
-          'ISK',
-          'JEP',
-          'JMD',
-          'JOD',
-          'JPY',
-          'KES',
-          'KGS',
-          'KHR',
-          'KMF',
-          'KPW',
-          'KRW',
-          'KWD',
-          'KYD',
-          'KZT',
-          'LAK',
-          'LBP',
-          'LKR',
-          'LRD',
-          'LSL',
-          'LYD',
-          'MAD',
-          'MDL',
-          'MGA',
-          'MKD',
-          'MMK',
-          'MNT',
-          'MOP',
-          'MRO',
-          'MUR',
-          'MVR',
-          'MWK',
-          'MXN',
-          'MYR',
-          'MZN',
-          'NAD',
-          'NGN',
-          'NIO',
-          'NOK',
-          'NPR',
-          'NZD',
-          'OMR',
-          'PAB',
-          'PEN',
-          'PGK',
-          'PHP',
-          'PKR',
-          'PLN',
-          'PYG',
-          'QAR',
-          'RON',
-          'RSD',
-          'RUB',
-          'RWF',
-          'SAR',
-          'SBD',
-          'SCR',
-          'SDG',
-          'SEK',
-          'SGD',
-          'SHP',
-          'SLL',
-          'SOS',
-          'SRD',
-          'SSP',
-          'STD',
-          'SVC',
-          'SYP',
-          'SZL',
-          'THB',
-          'TJS',
-          'TMT',
-          'TND',
-          'TOP',
-          'TRY',
-          'TTD',
-          'TWD',
-          'TZS',
-          'UAH',
-          'UGX',
-          'USD',
-          'UYU',
-          'UZS',
-          'VEF',
-          'VES',
-          'VND',
-          'VUV',
-          'WST',
-          'XAF',
-          'XAG',
-          'XAU',
-          'XCD',
-          'XDR',
-          'XOF',
-          'XPD',
-          'XPF',
-          'XPT',
-          'YER',
-          'ZAR',
-          'ZMW',
-          'ZWL'
-        ],
-        gertysTable: {
-          columns: [
-            {name: 'id', align: 'left', label: 'ID', field: 'id'},
-            {name: 'name', align: 'left', label: 'Name', field: 'name'},
-            {
-              name: 'lnbits_wallets',
-              align: 'left',
-              label: 'Wallets',
-              field: 'lnbits_wallets'
+        new Vue({
+            el: '#vue',
+            mixins: [windowMixin],
+            data: function () {
+                return {
+                    gertys: [],
+                    currencyOptions: [
+                        'USD',
+                        'EUR',
+                        'GBP',
+                        'AED',
+                        'AFN',
+                        'ALL',
+                        'AMD',
+                        'ANG',
+                        'AOA',
+                        'ARS',
+                        'AUD',
+                        'AWG',
+                        'AZN',
+                        'BAM',
+                        'BBD',
+                        'BDT',
+                        'BGN',
+                        'BHD',
+                        'BIF',
+                        'BMD',
+                        'BND',
+                        'BOB',
+                        'BRL',
+                        'BSD',
+                        'BTN',
+                        'BWP',
+                        'BYN',
+                        'BZD',
+                        'CAD',
+                        'CDF',
+                        'CHF',
+                        'CLF',
+                        'CLP',
+                        'CNH',
+                        'CNY',
+                        'COP',
+                        'CRC',
+                        'CUC',
+                        'CUP',
+                        'CVE',
+                        'CZK',
+                        'DJF',
+                        'DKK',
+                        'DOP',
+                        'DZD',
+                        'EGP',
+                        'ERN',
+                        'ETB',
+                        'EUR',
+                        'FJD',
+                        'FKP',
+                        'GBP',
+                        'GEL',
+                        'GGP',
+                        'GHS',
+                        'GIP',
+                        'GMD',
+                        'GNF',
+                        'GTQ',
+                        'GYD',
+                        'HKD',
+                        'HNL',
+                        'HRK',
+                        'HTG',
+                        'HUF',
+                        'IDR',
+                        'ILS',
+                        'IMP',
+                        'INR',
+                        'IQD',
+                        'IRR',
+                        'IRT',
+                        'ISK',
+                        'JEP',
+                        'JMD',
+                        'JOD',
+                        'JPY',
+                        'KES',
+                        'KGS',
+                        'KHR',
+                        'KMF',
+                        'KPW',
+                        'KRW',
+                        'KWD',
+                        'KYD',
+                        'KZT',
+                        'LAK',
+                        'LBP',
+                        'LKR',
+                        'LRD',
+                        'LSL',
+                        'LYD',
+                        'MAD',
+                        'MDL',
+                        'MGA',
+                        'MKD',
+                        'MMK',
+                        'MNT',
+                        'MOP',
+                        'MRO',
+                        'MUR',
+                        'MVR',
+                        'MWK',
+                        'MXN',
+                        'MYR',
+                        'MZN',
+                        'NAD',
+                        'NGN',
+                        'NIO',
+                        'NOK',
+                        'NPR',
+                        'NZD',
+                        'OMR',
+                        'PAB',
+                        'PEN',
+                        'PGK',
+                        'PHP',
+                        'PKR',
+                        'PLN',
+                        'PYG',
+                        'QAR',
+                        'RON',
+                        'RSD',
+                        'RUB',
+                        'RWF',
+                        'SAR',
+                        'SBD',
+                        'SCR',
+                        'SDG',
+                        'SEK',
+                        'SGD',
+                        'SHP',
+                        'SLL',
+                        'SOS',
+                        'SRD',
+                        'SSP',
+                        'STD',
+                        'SVC',
+                        'SYP',
+                        'SZL',
+                        'THB',
+                        'TJS',
+                        'TMT',
+                        'TND',
+                        'TOP',
+                        'TRY',
+                        'TTD',
+                        'TWD',
+                        'TZS',
+                        'UAH',
+                        'UGX',
+                        'USD',
+                        'UYU',
+                        'UZS',
+                        'VEF',
+                        'VES',
+                        'VND',
+                        'VUV',
+                        'WST',
+                        'XAF',
+                        'XAG',
+                        'XAU',
+                        'XCD',
+                        'XDR',
+                        'XOF',
+                        'XPD',
+                        'XPF',
+                        'XPT',
+                        'YER',
+                        'ZAR',
+                        'ZMW',
+                        'ZWL'
+                    ],
+                    gertysTable: {
+                        columns: [
+                            {name: 'id', align: 'left', label: 'ID', field: 'id'},
+                            {name: 'name', align: 'left', label: 'Name', field: 'name'},
+                            {
+                                name: 'lnbits_wallets',
+                                align: 'left',
+                                label: 'Wallets',
+                                field: 'lnbits_wallets'
+                            },
+                            {
+                                name: 'exchange',
+                                align: 'left',
+                                label: 'Exchange',
+                                field: 'exchange'
+                            },
+                            {
+                                name: 'sats_quote',
+                                align: 'left',
+                                label: 'Sats Quote',
+                                field: 'sats_quote'
+                            },
+                            {
+                                name: 'mempool_endpoint',
+                                align: 'left',
+                                label: 'Mempool Endpoint',
+                                field: 'mempool_endpoint'
+                            },
+                            {
+                                name: 'onchain_stats',
+                                align: 'left',
+                                label: 'Onchain Stats',
+                                field: 'onchain_stats'
+                            },
+                            {
+                                name: 'ln_stats',
+                                align: 'left',
+                                label: 'LN Stats',
+                                field: 'ln_stats'
+                            }
+                        ],
+                        pagination: {
+                            rowsPerPage: 10
+                        }
+                    },
+                    formDialog: {
+                        show: false,
+                        data: {
+                            sats_quote: false,
+                            onchain_stats: false,
+                            ln_stats: false,
+                            lnbits_wallets: [],
+                            mempool_endpoint: "https://mempool.space"
+                        }
+                    }
+                }
             },
-            {
-              name: 'exchange',
-              align: 'left',
-              label: 'Exchange',
-              field: 'exchange'
+            methods: {
+                closeFormDialog: function () {
+                    this.formDialog.data = {
+                        sats_quote: false,
+                        onchain_stats: false,
+                        ln_stats: false,
+                        lnbits_wallets: [],
+                        mempool_endpoint: "https://mempool.space"
+                    }
+                },
+                getGertys: function () {
+                    var self = this
+                    LNbits.api
+                        .request(
+                            'GET',
+                            '/gerty/api/v1/gerty?all_wallets=true',
+                            this.g.user.wallets[0].inkey
+                        )
+                        .then(function (response) {
+                            self.gertys = response.data.map(function (obj) {
+                                return mapGerty(obj)
+                            })
+                        })
+                },
+                updateformDialog: function (formId) {
+                    var gerty = _.findWhere(this.gertys, {id: formId})
+                    this.formDialog.data.id = gerty.id
+                    this.formDialog.data.name = gerty.name
+                    this.formDialog.data.wallet = gerty.wallet
+                    this.formDialog.data.lnbits_wallets = JSON.parse(gerty.lnbits_wallets)
+                    this.formDialog.data.exchange = gerty.exchange,
+                        this.formDialog.data.mempool_endpoint = gerty.mempool_endpoint,
+                        this.formDialog.data.sats_quote = Boolean(gerty.sats_quote)
+                    this.formDialog.data.onchain_stats = Boolean(gerty.onchain_stats)
+                    this.formDialog.data.ln_stats = Boolean(gerty.ln_stats)
+                    this.formDialog.show = true
+                },
+                sendFormDataGerty: function () {
+                    var self = this
+                    if (self.formDialog.data.id) {
+                        this.updateGerty(
+                            self.g.user.wallets[0].adminkey,
+                            self.formDialog.data
+                        )
+                    } else {
+                        this.createGerty(
+                            self.g.user.wallets[0].adminkey,
+                            self.formDialog.data
+                        )
+                    }
+                },
+                createGerty: function () {
+                    var data = {
+                        name: this.formDialog.data.name,
+                        wallet: this.formDialog.data.wallet,
+                        lnbits_wallets: JSON.stringify(this.formDialog.data.lnbits_wallets),
+                        sats_quote: this.formDialog.data.sats_quote,
+                        exchange: this.formDialog.data.exchange,
+                        mempool_endpoint: this.formDialog.data.mempool_endpoint,
+                        onchain_stats: this.formDialog.data.onchain_stats,
+                        ln_stats: this.formDialog.data.ln_stats
+                    }
+                    var self = this
+
+                    LNbits.api
+                        .request(
+                            'POST',
+                            '/gerty/api/v1/gerty',
+                            _.findWhere(this.g.user.wallets, {id: this.formDialog.data.wallet})
+                                .inkey,
+                            data
+                        )
+                        .then(function (response) {
+                            self.gertys.push(mapGerty(response.data))
+                            self.formDialog.show = false
+                        })
+                        .catch(function (error) {
+                            LNbits.utils.notifyApiError(error)
+                        })
+                },
+                updateGerty: function (wallet, data) {
+                    var self = this
+                    data.lnbits_wallets = JSON.stringify(this.formDialog.data.lnbits_wallets)
+                    LNbits.api
+                        .request(
+                            'PUT',
+                            '/gerty/api/v1/gerty/' + data.id,
+                            wallet,
+                            data
+                        )
+                        .then(function (response) {
+                            self.gertys = _.reject(self.gertys, function (obj) {
+                                return obj.id == data.id
+                            })
+                            self.gertys.push(mapGerty(response.data))
+                            self.formDialog.show = false
+                        })
+                        .catch(function (error) {
+                            LNbits.utils.notifyApiError(error)
+                        })
+                },
+                deleteGerty: function (gertyId) {
+                    var self = this
+                    var gerty = _.findWhere(this.gertys, {id: gertyId})
+
+                    LNbits.utils
+                        .confirmDialog('Are you sure you want to delete this Gerty?')
+                        .onOk(function () {
+                            LNbits.api
+                                .request(
+                                    'DELETE',
+                                    '/gerty/api/v1/gerty/' + gertyId,
+                                    _.findWhere(self.g.user.wallets, {id: gerty.wallet}).adminkey
+                                )
+                                .then(function (response) {
+                                    self.gertys = _.reject(self.gertys, function (obj) {
+                                        return obj.id == gertyId
+                                    })
+                                })
+                                .catch(function (error) {
+                                    LNbits.utils.notifyApiError(error)
+                                })
+                        })
+                },
+                exportCSV: function () {
+                    LNbits.utils.exportCSV(this.gertysTable.columns, this.gertys)
+                }
             },
-            {
-              name: 'sats_quote',
-              align: 'left',
-              label: 'Sats Quote',
-              field: 'sats_quote'
-            },
-            {
-              name: 'mempool_endpoint',
-              align: 'left',
-              label: 'Mempool Endpoint',
-              field: 'mempool_endpoint'
-            },
-            {
-              name: 'onchain_stats',
-              align: 'left',
-              label: 'Onchain Stats',
-              field: 'onchain_stats'
-            },
-            {
-              name: 'ln_stats',
-              align: 'left',
-              label: 'LN Stats',
-              field: 'ln_stats'
+            created: function () {
+                if (this.g.user.wallets.length) {
+                    this.getGertys()
+                }
             }
-          ],
-          pagination: {
-            rowsPerPage: 10
-          }
-        },
-        formDialog: {
-          show: false,
-          data: {sats_quote: false,
-          onchain_stats: false,
-          ln_stats: false,
-          lnbits_wallets:[],
-          mempool_endpoint: "https://mempool.space"}
-        }
-      }
-    },
-    methods: {
-      closeFormDialog: function () {
-        this.formDialog.data = {sats_quote: false,
-          onchain_stats: false,
-          ln_stats: false,
-          lnbits_wallets:[],
-          mempool_endpoint: "https://mempool.space"}
-      },
-      getGertys: function () {
-        var self = this
-        LNbits.api
-          .request(
-            'GET',
-            '/gerty/api/v1/gerty?all_wallets=true',
-            this.g.user.wallets[0].inkey
-          )
-          .then(function (response) {
-            self.gertys = response.data.map(function (obj) {
-              return mapGerty(obj)
-            })
-          })
-      },
-      updateformDialog: function (formId) {
-        var gerty = _.findWhere(this.gertys, {id: formId})
-        this.formDialog.data.id = gerty.id
-        this.formDialog.data.name = gerty.name
-        this.formDialog.data.wallet = gerty.wallet
-        this.formDialog.data.lnbits_wallets = JSON.parse(gerty.lnbits_wallets)
-        this.formDialog.data.exchange = gerty.exchange,
-        this.formDialog.data.mempool_endpoint = gerty.mempool_endpoint,
-        this.formDialog.data.sats_quote = Boolean(gerty.sats_quote)
-        this.formDialog.data.onchain_stats = Boolean(gerty.onchain_stats)
-        this.formDialog.data.ln_stats = Boolean(gerty.ln_stats)
-        this.formDialog.show = true
-      },
-      sendFormDataGerty: function () {
-        var self = this
-        if (self.formDialog.data.id) {
-          this.updateGerty(
-            self.g.user.wallets[0].adminkey,
-            self.formDialog.data
-          )
-        } else {
-          this.createGerty(
-            self.g.user.wallets[0].adminkey,
-            self.formDialog.data
-          )
-        }
-      },
-      createGerty: function () {
-        var data = {
-          name: this.formDialog.data.name,
-          wallet: this.formDialog.data.wallet,
-          lnbits_wallets: JSON.stringify(this.formDialog.data.lnbits_wallets),
-          sats_quote: this.formDialog.data.sats_quote,
-          exchange: this.formDialog.data.exchange,
-          mempool_endpoint: this.formDialog.data.mempool_endpoint,
-          onchain_stats: this.formDialog.data.onchain_stats, 
-          ln_stats: this.formDialog.data.ln_stats
-        }
-        var self = this
-
-        LNbits.api
-          .request(
-            'POST',
-            '/gerty/api/v1/gerty',
-            _.findWhere(this.g.user.wallets, {id: this.formDialog.data.wallet})
-              .inkey,
-            data
-          )
-          .then(function (response) {
-            self.gertys.push(mapGerty(response.data))
-            self.formDialog.show = false
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      updateGerty: function (wallet, data) {
-        var self = this
-        data.lnbits_wallets = JSON.stringify(this.formDialog.data.lnbits_wallets)
-        LNbits.api
-          .request(
-            'PUT',
-            '/gerty/api/v1/gerty/' + data.id,
-            wallet,
-            data
-          )
-          .then(function (response) {
-            self.gertys = _.reject(self.gertys, function (obj) {
-              return obj.id == data.id
-            })
-            self.gertys.push(mapGerty(response.data))
-            self.formDialog.show = false
-          })
-          .catch(function (error) {
-            LNbits.utils.notifyApiError(error)
-          })
-      },
-      deleteGerty: function (gertyId) {
-        var self = this
-        var gerty = _.findWhere(this.gertys, {id: gertyId})
-
-        LNbits.utils
-          .confirmDialog('Are you sure you want to delete this Gerty?')
-          .onOk(function () {
-            LNbits.api
-              .request(
-                'DELETE',
-                '/gerty/api/v1/gerty/' + gertyId,
-                _.findWhere(self.g.user.wallets, {id: gerty.wallet}).adminkey
-              )
-              .then(function (response) {
-                self.gertys = _.reject(self.gertys, function (obj) {
-                  return obj.id == gertyId
-                })
-              })
-              .catch(function (error) {
-                LNbits.utils.notifyApiError(error)
-              })
-          })
-      },
-      exportCSV: function () {
-        LNbits.utils.exportCSV(this.gertysTable.columns, this.gertys)
-      }
-    },
-    created: function () {
-      if (this.g.user.wallets.length) {
-        this.getGertys()
-      }
-    }
-  })
-</script>
+        })
+    </script>
 {% endblock %}