From fcc5ff46b7567876d2fbcc4ac1cdac89b913e6d2 Mon Sep 17 00:00:00 2001 From: moneymanolis Date: Tue, 3 Jan 2023 19:02:59 +0100 Subject: [PATCH] bitcoin core info overlay --- pyinstaller/electron/styles.css | 4 - src/cryptoadvance/specter/static/output.css | 56 +++---- src/cryptoadvance/specter/static/style.css | 3 +- src/cryptoadvance/specter/static/styles.css | 5 - .../node/components/bitcoin_core_info.jinja | 150 +++++++++--------- 5 files changed, 105 insertions(+), 113 deletions(-) diff --git a/pyinstaller/electron/styles.css b/pyinstaller/electron/styles.css index 0831439de..3689d41b6 100644 --- a/pyinstaller/electron/styles.css +++ b/pyinstaller/electron/styles.css @@ -839,10 +839,6 @@ table tr:hover .btn.hovering{ z-index: 5; padding: 1.5em; } -.page_overlay_popup_cancel { - margin-top: 2em; - float: right; -} /************** Tool Tip Styles ********************************/ .tool-tip { diff --git a/src/cryptoadvance/specter/static/output.css b/src/cryptoadvance/specter/static/output.css index c5da28023..5538bd6c7 100644 --- a/src/cryptoadvance/specter/static/output.css +++ b/src/cryptoadvance/specter/static/output.css @@ -696,11 +696,17 @@ select { line-height: 1.75rem; } +.button:hover { + opacity: 0.8; +} + .button img { height: 1.75rem; width: 1.75rem; } +/* Smaller button, that also has darker background color as of now, naming should be changed!*/ + .btn { margin-right: 0.25rem; margin-left: -2px; @@ -972,14 +978,14 @@ select { z-index: 50; } -.clear-both { - clear: both; -} - .m-1 { margin: 0.25rem; } +.m-4 { + margin: 1rem; +} + .my-2 { margin-top: 0.5rem; margin-bottom: 0.5rem; @@ -1083,6 +1089,10 @@ select { margin-top: 1rem; } +.mt-1 { + margin-top: 0.25rem; +} + .ml-2 { margin-left: 0.5rem; } @@ -1339,10 +1349,6 @@ select { flex-wrap: wrap; } -.content-evenly { - align-content: space-evenly; -} - .items-center { align-items: center; } @@ -1400,18 +1406,18 @@ select { margin-left: calc(0.25rem * calc(1 - var(--tw-space-x-reverse))); } -.space-y-1 > :not([hidden]) ~ :not([hidden]) { - --tw-space-y-reverse: 0; - margin-top: calc(0.25rem * calc(1 - var(--tw-space-y-reverse))); - margin-bottom: calc(0.25rem * var(--tw-space-y-reverse)); -} - .space-y-5 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; margin-top: calc(1.25rem * calc(1 - var(--tw-space-y-reverse))); margin-bottom: calc(1.25rem * var(--tw-space-y-reverse)); } +.space-y-1 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(0.25rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(0.25rem * var(--tw-space-y-reverse)); +} + .self-end { align-self: flex-end; } @@ -1503,6 +1509,11 @@ select { background-color: rgb(27 28 33 / var(--tw-bg-opacity)); } +.bg-white { + --tw-bg-opacity: 1; + background-color: rgb(255 255 255 / var(--tw-bg-opacity)); +} + .bg-black\/60 { background-color: rgb(0 0 0 / 0.6); } @@ -1512,11 +1523,6 @@ select { background-color: rgb(44 45 49 / var(--tw-bg-opacity)); } -.bg-white { - --tw-bg-opacity: 1; - background-color: rgb(255 255 255 / var(--tw-bg-opacity)); -} - .fill-current { fill: currentColor; } @@ -1571,6 +1577,10 @@ select { padding-right: 0.25rem; } +.pt-3 { + padding-top: 0.75rem; +} + .pl-1 { padding-left: 0.25rem; } @@ -1579,14 +1589,6 @@ select { padding-right: 0.75rem; } -.pt-4 { - padding-top: 1rem; -} - -.pt-3 { - padding-top: 0.75rem; -} - .text-center { text-align: center; } diff --git a/src/cryptoadvance/specter/static/style.css b/src/cryptoadvance/specter/static/style.css index a2519ebad..48723b0cb 100644 --- a/src/cryptoadvance/specter/static/style.css +++ b/src/cryptoadvance/specter/static/style.css @@ -126,13 +126,14 @@ */ .button { - @apply rounded h-11 rounded-xl text-lg flex items-center space-x-2 justify-center bg-dark-600 px-10 cursor-pointer w-[calc(688px/2)] mb-5; + @apply h-11 rounded-xl text-lg flex items-center space-x-2 justify-center bg-dark-600 hover:opacity-80 px-10 cursor-pointer w-[calc(688px/2)] mb-5; } .button img { @apply w-7 h-7; } + /* Smaller button, that also has darker background color as of now, naming should be changed!*/ .btn { @apply py-[2px] px-3 rounded-full bg-dark-800 border-dark-800 border-2 hover:border-dark-700 mr-1 ml-[-2px] break-keep; } diff --git a/src/cryptoadvance/specter/static/styles.css b/src/cryptoadvance/specter/static/styles.css index 6aa167bb1..627ed43de 100644 --- a/src/cryptoadvance/specter/static/styles.css +++ b/src/cryptoadvance/specter/static/styles.css @@ -1170,11 +1170,6 @@ table tr:hover .btn.hovering { padding: 1.5em; } -.page_overlay_popup_cancel { - margin-top: 2em; - float: right; -} - .switch-label { height: 25px; vertical-align: sub; diff --git a/src/cryptoadvance/specter/templates/node/components/bitcoin_core_info.jinja b/src/cryptoadvance/specter/templates/node/components/bitcoin_core_info.jinja index 64890bb5a..74b56cfe8 100644 --- a/src/cryptoadvance/specter/templates/node/components/bitcoin_core_info.jinja +++ b/src/cryptoadvance/specter/templates/node/components/bitcoin_core_info.jinja @@ -1,84 +1,82 @@ -

{{ _("Bitcoin Core Node Info") }}:

-{% if specter.chain %} - {% if specter.info['pruned'] %} -


{{ _("You are using a pruned node.")}}
{{ _("Pruned nodes may not be able to scan for old balances when importing an existing wallet.")}}
{{ _("It is recommended to use Specter with an unpruned node.") }}

-
- {% elif not specter.info['blockfilterindex'] %} -


{{ _("Your node does not have ")}}blockfilterindex{{ _(" enabled.")}}
{{ _("Setting ")}}blockfilterindex=1{{ _(" in your ")}}bitcoin.conf{{ _(" file is recommended as it takes just a few GB of storage")}}
{{ _("and helps to speed-up blockchain rescanning.") }}

-
- {% endif %} - - - - - - - - - - - {% if specter.info['pruned'] %} - - - - {% endif %} -
{{ _("Network") }}: {{specter.chain}}
{{ _("Bitcoin Core Version") }}: v{{specter.bitcoin_core_version}} ({{specter.network_info['version']}})
{{ _("Connections count") }}: {{specter.network_info['connections']}}
{{ _("Difficulty") }}: {{specter.info.get('difficulty', 0) | int}}
{{ _("Size on disk") }}: {{specter.info['size_on_disk']|bytessize }}
{{ _("Blocks count") }}: {{specter.info['blocks']}}
{{ _("Last block hash") }}: {{specter.info['bestblockhash']}}
{{ _("Mempool Size") }}: {{specter.info['mempool_info'].size}} transactions
{{ _("Node uptime") }}: ~ {{(specter.info['uptime'] / 60 // 60) | int }} {{ _("Hours") }}
{{ _("Automatic pruning") }}: {{specter.info['automatic_pruning']}}
{{ _("Prune height") }}: {{specter.info['pruneheight']}}
{{ _("Prune target size") }}: {{specter.info['prune_target_size']}}
+
+

{{ _("Bitcoin Core Node Info") }}

+ {% if specter.chain %} + + + + + + + + + + {% if specter.info['pruned'] %} + + + + {% endif %} +
{{ _("Network") }}: {{specter.chain}}
{{ _("Bitcoin Core Version") }}: v{{specter.bitcoin_core_version}}
{{ _("Connections count") }}: {{specter.network_info['connections']}}
{{ _("Difficulty") }}: {{specter.info.get('difficulty', 0) | int}}
{{ _("Size on disk") }}: {{specter.info['size_on_disk']|bytessize }}
{{ _("Blocks count") }}: {{specter.info['blocks']}}
{{ _("Mempool Size") }}: {{specter.info['mempool_info'].size}} transactions
{{ _("Node uptime") }}: ~ {{(specter.info['uptime'] / 60 // 60) | int }} {{ _("Hours") }}
{{ _("Automatic pruning") }}: {{specter.info['automatic_pruning']}}
{{ _("Prune height") }}: {{specter.info['pruneheight']}}
{{ _("Prune target size") }}: {{specter.info['prune_target_size']}}
-

-
- -

- +
{% if current_user.is_admin %} -
- - - {{ _("Configure Bitcoin Core RPC Connection") }} +
+ +
+ {{ _("Configure connection") }} + +
{% endif %} -{% endif %} + + {% endif %} +