From 3b8b5120032b282e88b8b694c3f4152c345d77e2 Mon Sep 17 00:00:00 2001 From: gerlofvanek Date: Thu, 25 Jan 2024 17:50:06 +0100 Subject: [PATCH] ui: Update --- basicswap/templates/footer.html | 4 +- basicswap/templates/offers.html | 1379 ++++++++++++++++-------------- basicswap/templates/style.html | 120 ++- basicswap/templates/wallet.html | 882 +++++++++---------- basicswap/templates/wallets.html | 139 ++- 5 files changed, 1335 insertions(+), 1189 deletions(-) diff --git a/basicswap/templates/footer.html b/basicswap/templates/footer.html index e52c66b..7bb0ec2 100644 --- a/basicswap/templates/footer.html +++ b/basicswap/templates/footer.html @@ -21,9 +21,9 @@
-

© 2023~ (BSX) BasicSwap

+

© 2024~ (BSX) BasicSwap

BSX: v{{ version }}

-

GUI: v2.0.2

+

GUI: v2.0.3

Made with

diff --git a/basicswap/templates/offers.html b/basicswap/templates/offers.html index 9a4076b..cc4aed6 100644 --- a/basicswap/templates/offers.html +++ b/basicswap/templates/offers.html @@ -1,313 +1,332 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, place_new_offer_svg, page_back_svg, page_forwards_svg, filter_clear_svg, filter_apply_svg, input_arrow_down_svg, arrow_right_svg %} +
-
-
-
- -
-
-
+
+
+
+
    +
  • Home
    • +
  • {{ breadcrumb_line_svg | safe }}
    • +
  • {{ page_type }}
    • +
  • {{ breadcrumb_line_svg | safe }}
    • +
+
+
+
+
-
- - - +
+ dots-red + wave
-

{{ page_type }}

-

{{ page_type_description }}

-
-
- - - - - - - - - - - - Place new Offer - -
-
-
-
-
-{% include 'inc_messages.html' %} - -{% if show_chart %} -
-
-
-
-
-
-
-
-
-
- -
-
-
-
- -
-
+

{{ page_type }}

+

{{ page_type_description }}

+
+ + {{ place_new_offer_svg | safe }} Place new Offer + +
+
-
- +
+ + {% include 'inc_messages.html' %} + + {% if show_chart %} +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
-
-
-
- -

Bitcoin (BTC)

+ +
+
+
+ +

Bitcoin (BTC)

+
+
+
+

+
+

-
-
-

-
-

-
-
-
-
-
-

-
-

-
+
+
-

- Volume 24H:

-

+
+

+
+

+
+
+

+ Volume 24H: +

+

+
+

-
-
-
-
- -

Monero (XMR)

-
-
-
-

-
-

-
-
-
-
-
-

-
-

-
-

- Volume 24H:

-

-
-
- -
-
-
- -

Particl (PART)

-
-
-
-

-
-

-
-
-
-
-
-

-
-

+
+
+
+ +

Monero (BTC)

+
+
+
+

+
+

+
+
+
+
+
+

+
+

+
+
+

+ Volume 24H: +

+

+

+ Price in BTC: +

+

+
-
-

- Volume 24H:

-

-
-
-
-
-
- -

PIVX (PIVX)

-
-
-
-

-
-

-
-
-
-
-
-

-
-

+
+
+
+ +

Particl (PART)

+
+
+
+

+
+

+
+
+
+
+
+

+ Volume 24H: +

+

+

+ Price in BTC: +

+

+
-
-

- Volume 24H:

-

-
-
-
-
-
- -

Firo (FIRO)

-
-
-
-

-
-

-
-
-
-
-
-

-
-

+
+
+
+ +

PIVX (PIVX)

+
+
+
+

+
+

+
+
+
+
+
+

+ Volume 24H: +

+

+

+ Price in BTC: +

+

+
-
-

- Volume 24H:

-

-
-
-
-
-
- -

Litecoin (LTC)

-
-
-
-

-
-

+
+
+
+ +

Firo (FIRO)

+
+
+
+

+
+

+
+
+
+
+
+

+ Volume 24H: +

+

+

+ Price in BTC: +

+

+
-
-
+ +
+
+
+ +

Litecoin (LTC)

+
+
+
+

+
+

+
+
+
+
+
+

+ Volume 24H: +

+

+

+ Price in BTC: +

+

+
-
-

-
-

+ +
+
+
+ +

Dash (DASH)

+
+
+
+

+
+

+
+
+
+
+
+

+ Volume 24H: +

+

+

+ Price in BTC: +

+

+
-
-

- Volume 24H:

-

-
-
-
-
-
- -

Dash (DASH)

-
-
-
-

-
-

+ +
+
+
+ +

Dogecoin (DOGE)

+
+
+
+

+
+

+
+
+
+
+
+

+ Volume 24H: +

+

+

+ Price in BTC: +

+

+
-
-
-
-
-

-
-

-
-
-

- Volume 24H:

-

-
-
-
-
-
- -

Dogecoin (DOGE)

-
-
-
-

-
-

-
-
-
-
-
-

-
-

-
-
-

- Volume 24H:

-

-
-
-
- -{% endif %} -
-
-
-
-
-
-
-
-
-
-
-
- - - - -
-
-
-
-

- -

-
-
-
-
- - - - - -
-
-
-
-

Sort By:

-
-
-
-
- - - - -
-
-
-
- - - - -
-
-
-
-

Sent From Node:

-
-
-
-
- - - - -
-
- {% if sent_offers %} -
-
-

State:

-
-
-
-
- - - - -
-
- {% endif %} -
-
- -
-
-
-
- -
-
+ {% endif %} + +
+
+
+
+
+ +
+
+
+
+
+
{{ input_arrow_down_svg | safe }} + +
+
+
+
+

{{ arrow_right_svg | safe }} +

+
+
+
+
{{ input_arrow_down_svg | safe }} + + + +
+
+
+
+

Sort By:

+
+
+
+
{{ input_arrow_down_svg | safe }} + +
+
+
+
{{ input_arrow_down_svg | safe }} + +
+
+
+
+

Sent From Node:

+
+
+
+
{{ input_arrow_down_svg | safe }} + +
+
+ {% if sent_offers %} +
+
+

State:

+
+
+
+
{{ input_arrow_down_svg | safe }} + +
+
+ {% endif %} +
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + {% for o in offers %} + + + + + + + + + + + + + + + + + + + {% if o[9] == true %} + + + + + {% else %} + + {% endif %} + + + + + {% if o[9] == true %} + + + + + {% else %} + + {% endif %} + + + + + + + + + + + + + + + {% endfor %} +
+
+ Date/Time at +
+ 		+
+ Details +
+ 		+
+ Recipient +
+ 		+
+ You get +
+ 		+
+ You Send +
+ 		+
+ Rate +
+ 		+
+ Trade +
+
+ + + + + + +
+
{{ o[0] }}
+
+ 		+
Network: {{ o[7] }}
+
Amount Variable:{{ o[14] }}
+
Swap Type: {{ o[13] }}
+ + 		+ {{ o[8] }} + +
+ +
+
+ {{ o[5]|truncate(8, true, '', 0) }} {{ o[3] }} +
+
+
+
+ 		+
+ +
+
+ {{ o[4]|truncate(8, true, '', 0) }} {{ o[2] }} +
+
+
+
+ 		+
+ +
+
+ {{ o[4]|truncate(8,true,'',0) }} {{ o[2] }} +
+
+
+
+ 		+
+ +
+ + +
+ {{ o[5]|truncate(8, true, '', 0) }} {{ o[3] }} +
+
+
+
+ 		+
{{ o[6]|truncate(8,true,'',0) }}
+
+ +
+ 		+ {% if o[9]==true %} Edit {% else %} Swap {% endif %} +
+ + +
+
+ +
+
+
+
+ +
+
+
+

Page: {{ filters.page_no }}

+
+
+
+ +
+
+
+
+ +
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - {% for o in offers %} - - - - - - - - - {% else %} - - {{ o[2] }} - - - {% endif %} - - - {% else %} - - {{ o[3] }} - - - {% endif %} - - - - - - {% endfor %} -
-
- Date/Time at -
- 		-
- Details -
- 		-
- Recipient -
- 		-
- You get -
- 		-
- Amount -
- 		-
- You Send -
- 		-
- Amount -
- 		-
- Rate -
- 		-
- Trade -
-
- - - - - - -
-
{{ o[0] }}
-
- 		-
Network: {{ o[7] }}
-
Amount Variable: {{ o[14] }}
-
Swap Type: {{ o[13] }}
- -
- {{ o[8] }} - - - {% if o[9]==true %} - {{ o[3] }} - -
{{ o[5]|truncate(8,true,'',0) }}
-
- 		-
{{ o[4]|truncate(8,true,'',0) }}
-
- 		- {% if o[9]==true %} - {{ o[2] }} - -
{{ o[4]|truncate(8,true,'',0) }}
-
- 		-
{{ o[5]|truncate(8,true,'',0) }}
-
- 		-
{{ o[6]|truncate(8,true,'',0) }}
-
- 		- {% if o[9]==true %}Edit{% else %}Swap{% endif %} -
- - -
-
-
-
-
-
- -
-
-
-

Page: {{ filters.page_no }}

-
-
-
- -
-
-
-
- -
+
-
-
-
+
{% include 'footer.html' %} - - + \ No newline at end of file diff --git a/basicswap/templates/style.html b/basicswap/templates/style.html index f8db68b..8627a35 100644 --- a/basicswap/templates/style.html +++ b/basicswap/templates/style.html @@ -1,12 +1,118 @@ {% set select_box_arrow_svg = ' - + ' %} -{% set select_box_class = 'hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-white text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0' %} - {% set circular_arrows_svg = ' - - - - + + + + ' %} + +{% set circular_error_svg = ' + +' %} + +{% set circular_info_svg = '' %} + +{% set cross_close_svg = '' %} + +{% set breadcrumb_line_svg = '' %} + +{% set withdraw_svg = '' %} + +{% set utxo_groups_svg = ' + + + + + +' %} + +{% set create_utxo_svg = ' + + + + + +' %} + +{% set lock_svg = ' + + +' %} + +{% set eye_show_svg = ' + + + + +' %} + +{% set place_new_offer_svg = ' + + + + + + + + + +' %} + +{% set page_back_svg = ' +' %} + +{% set page_forwards_svg = ' +' %} + + +{% set filter_clear_svg = ' + + + + + + + + + + + +' %} + +{% set filter_apply_svg = ' + + + + + + + +' %} + + +{% set input_arrow_down_svg = ' + + +' %} + +{% set arrow_right_svg = ' +' %} + + + + + +{% set select_box_class = 'hover:border-blue-500 bg-gray-50 text-gray-900 appearance-none pr-10 dark:bg-gray-500 dark:text-white border border-gray-300 dark:border-gray-400 dark:text-gray-50 dark:placeholder-white text-sm rounded-lg outline-none focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 focus:ring-0' %} \ No newline at end of file diff --git a/basicswap/templates/wallet.html b/basicswap/templates/wallet.html index 4c615bd..d389d9b 100644 --- a/basicswap/templates/wallet.html +++ b/basicswap/templates/wallet.html @@ -1,106 +1,86 @@ {% include 'header.html' %} -{% from 'style.html' import select_box_arrow_svg, select_box_class, circular_arrows_svg %} +{% from 'style.html' import select_box_arrow_svg, select_box_class, circular_arrows_svg, circular_error_svg, circular_info_svg, cross_close_svg, breadcrumb_line_svg, withdraw_svg, utxo_groups_svg, create_utxo_svg %}
-
+ +
-
- -
-
-
-
-
-
- - - -
-
-

- - {{ w.name }} - {{ w.name }} Wallet - -

-

Manage your {{ w.ticker }} wallet. {% if refresh %} (Page Refresh: {{ refresh }} seconds) {% endif %}

-
-
- - - {{ circular_arrows_svg }} - Refresh - -
+
+
-
-
- {% include 'inc_messages.html' %} - {% if w.updating %} - + +
-
-
-
-
-
- - -
-
-

Updating...

-
+
+ dots-red + wave +
+
+

+ {{ w.name }}{{ w.name }} Wallet - +

+

Manage your {{ w.ticker }} wallet. {% if refresh %} (Page Refresh: {{ refresh }} seconds) {% endif %}

+
+
+ + {{ circular_arrows_svg | safe }}Refresh + +
-
-
- -
-
-
- {% endif %} - {% if w.havedata %} - {% if w.error %} -
+
+ +{% include 'inc_messages.html' %} + +{% if w.updating %} + +{% endif %} + +{% if w.havedata %} + +{% if w.error %} + - {% else %} -
-
-
+ +{% else %} + + +
+
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - {% if w.cid == '1' %} {# PART #} - - - - - - - - - - {% endif %} {# / PART #} - {% if w.cid == '3' %} {# LTC #} - - - - - {% endif %} {# / LTC #} - - - - - - - - {% if w.bootstrapping %} - - - {% endif %} {# / bootstrapping #} - {% if w.encrypted %} - - - - - {% endif %} {# / encrypted #} - - - {% if block_unknown_seeds and w.expected_seed != true %} {# Only show addresses if wallet seed is correct #} - -
-
- Wallet -
- 		-
- Details -
-
Last updated:{{ w.lastupdated }}
{{ w.name }} Version:{{ w.version }}
- - {{ w.name }} - Balance: - {{ w.balance }} {{ w.ticker }} (){% if w.unconfirmed %} Unconfirmed: +{{ w.unconfirmed }} {{ w.ticker }}{% endif %}
- - {{ w.name }} Blind - Blind Balance: - {{ w.blind_balance }} {{ w.ticker }} () {% if w.blind_unconfirmed %} Unconfirmed: +{{ w.blind_unconfirmed }} {{ w.ticker }}{% endif %}
- - {{ w.name }} Anon - Anon Balance: - {{ w.anon_balance }} {{ w.ticker }} () {% if w.anon_pending %} Pending: +{{ w.anon_pending }} {{ w.ticker }}{% endif %}
- - {{ w.name }} MWEB - MWEB Balance: - {{ w.mweb_balance }} {{ w.ticker }} () {% if w.mweb_pending %} Pending: +{{ w.mweb_pending }} {{ w.ticker }}{% endif %}
Blocks:{{ w.blocks }} {% if w.known_block_count %} / {{ w.known_block_count }} {% endif %}
Synced:{{ w.synced }}
Bootstrapping:{{ w.bootstrapping }}
Locked:{{ w.locked }}
Expected Seed:{{ w.expected_seed }}
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + {% if w.cid == '1' %} {# PART #} + + + + + + + + + + {% endif %} {# / PART #} + {% if w.cid == '3' %} {# LTC #} + + + + + {% endif %} {# / LTC #} + + + + + + + + {% if w.bootstrapping %} + + + {% endif %} {# / bootstrapping #} + {% if w.encrypted %} + + + + + {% endif %} {# / encrypted #} + + + {% if block_unknown_seeds and w.expected_seed != true %} {# Only show addresses if wallet seed is correct #} + +
+
+ Wallet +
+ 		+
+ Details +
+
Last updated:{{ w.lastupdated }}
{{ w.name }} Version:{{ w.version }}
+ + {{ w.name }} + Balance: + {{ w.balance }} {{ w.ticker }} (){% if w.unconfirmed %} Unconfirmed: +{{ w.unconfirmed }} {{ w.ticker }}{% endif %}
+ + {{ w.name }} Blind + Blind Balance: + {{ w.blind_balance }} {{ w.ticker }} () {% if w.blind_unconfirmed %} Unconfirmed: +{{ w.blind_unconfirmed }} {{ w.ticker }}{% endif %}
+ + {{ w.name }} Anon + Anon Balance: + {{ w.anon_balance }} {{ w.ticker }} () {% if w.anon_pending %} Pending: +{{ w.anon_pending }} {{ w.ticker }}{% endif %}
+ + {{ w.name }} MWEB + MWEB Balance: + {{ w.mweb_balance }} {{ w.ticker }} () {% if w.mweb_pending %} Pending: +{{ w.mweb_pending }} {{ w.ticker }}{% endif %}
Blocks:{{ w.blocks }} {% if w.known_block_count %} / {{ w.known_block_count }} {% endif %}
Synced:{{ w.synced }}
Bootstrapping:{{ w.bootstrapping }}
Locked:{{ w.locked }}
Expected Seed:{{ w.expected_seed }}
+
+
+
-
-
- - -
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+{% else %} + +{% if w.cid == '1' %} {# PART #} + + Stealth Address + {{ w.stealth_address }} + +{% endif %} {# / PART #} + +{% if w.cid == '3' %} {# LTC #} + + + + + {{ w.mweb_address }} + +{% endif %} {# / LTC #} + +{% if w.cid == '6' %} {# XMR #} + + Main Address + {{ w.main_address }} + + + + + + {{ w.deposit_address }} + + +{% else %} + + + + + {{ w.deposit_address }} + +{% endif %} - {% else %} - - {% if w.cid == '1' %} {# PART #} - - Stealth Address - {{ w.stealth_address }} - - {% endif %} {# / PART #} - {% if w.cid == '3' %} {# LTC #} - - - - - {{ w.mweb_address }} - - {% endif %} {# / LTC #} - {% if w.cid == '6' %} {# XMR #} - - Main Address - {{ w.main_address }} - - - - - - {{ w.deposit_address }} - - {% else %} - - - - - {{ w.deposit_address }} - - {% endif %}
@@ -290,255 +276,236 @@
+
-
-
-

Withdraw

+
+

Withdraw

-
+
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - {% if w.cid == '1' %} {# PART #} - - - - - - {% endif %} {# / PART #} - {% if w.cid == '3' %} {# LTC #} - - - - - {% endif %} {# / LTC #} - - - - - -
-
- Options -
- 		-
- -
- 		-
- -
-
- - - - - -
Subtract Fee: - -
Type From -> To: -
-
- {{ select_box_arrow_svg }} - -
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + {% if w.cid == '1' %} {# PART #} + + + + + + {% endif %} {# / PART #} + {% if w.cid == '3' %} {# LTC #} + + + + + {% endif %} {# / LTC #} + + + + + +
+
+ Options +
+ 		+
+ +
+ 		+
+ +
+
+ + + + + +
Subtract Fee: + +
Type From -> To: +
+
+ {{ select_box_arrow_svg | safe }} + +
+
+ 		+
+
+ {{ select_box_arrow_svg }} + +
+
+
Type From: +
+
+ {{ select_box_arrow_svg }} + +
+
+
Fee Rate:{{ w.fee_rate }} + Est Fee: {{ w.est_fee }} +
+
+
-
-
-
- {{ select_box_arrow_svg }} - -
-
-
Type From: -
-
- {{ select_box_arrow_svg }} - -
-
-
Fee Rate:{{ w.fee_rate }} - Est Fee: {{ w.est_fee }} -
+
-
-
-
-
+ {% if w.cid != '6' %} {# !XMR #} {% if w.show_utxo_groups %} +
-
-
-

UTXO Groups

+
+

UTXO Groups

-
+
-
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - -
-
- Options -
- 		-
- -
-
UTXO Groups: - -
- - - -
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + +
+
+ Options +
+ 		+
+ +
+
UTXO Groups: + +
+ + + +
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
- -
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
-
-
-
-
+ {% else %} +
-
-
-
-
-
-
-
-
-
- -
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
-
-
-
-
+ {% endif %} {% endif %} {% endif %} {% endif %} {% endif %} - @@ -546,6 +513,7 @@ + + {% include 'footer.html' %} + + - + \ No newline at end of file diff --git a/basicswap/templates/wallets.html b/basicswap/templates/wallets.html index 7c3a3fc..ffd6214 100644 --- a/basicswap/templates/wallets.html +++ b/basicswap/templates/wallets.html @@ -1,98 +1,71 @@ {% include 'header.html' %} +{% from 'style.html' import breadcrumb_line_svg, circular_arrows_svg, withdraw_svg, utxo_groups_svg, create_utxo_svg, lock_svg, eye_show_svg %} +
-
+
-
- -
+
+
    +

  • Home

    • +
  • {{ breadcrumb_line_svg | safe }}
    • +
  • Wallets
    • +
  • {{ breadcrumb_line_svg | safe }}
    • +
+
-
-
+
+ +
- - - + dots-red + dots-red + wave

Wallets

-
-

Total Assets:

- -
-
-
-
USD
-
-
+
+

Total Assets:

+ +
+
+
+
USD
+
+
-
- - - - - - - - - Change Password - - - - - - - - - Refresh - +
+ {{ lock_svg | safe }}Change Password + {{ circular_arrows_svg | safe }}Refresh
+ {% include 'inc_messages.html' %} +
-
{% for w in wallets %} {% if w.havedata %} {% if w.error %}

Error: {{ w.error }}

{% else %}
+
+ {% for w in wallets %} + {% if w.havedata %} + {% if w.error %}

Error: {{ w.error }}

+ {% else %} +
- + {{ w.name }} - Manage + Manage Wallet

{{ w.name }} ({{ w.ticker }})

-

Version: {{ w.version }} {% if w.updating %} Updating.. -

{% endif %} +

Version: {{ w.version }} {% if w.updating %} Updating..

+ {% endif %}
@@ -172,30 +145,38 @@
{% endif %} - {% endif %} {# / LTC #} + {% endif %} + {# / LTC #} +

Blocks:

- {{ w.blocks }}{% if w.known_block_count %} / {{ w.known_block_count }}{% endif %} + {{ w.blocks }}{% if w.known_block_count %} / {{ w.known_block_count }} + {% endif %} +

Last Updated:

{{ w.lastupdated }} -
{% if w.bootstrapping %} +
+ {% if w.bootstrapping %}

Bootstrapping:

{{ w.bootstrapping }} -
{% endif %} +
+ {% endif %} {% if w.encrypted %}

Locked:

{{ w.locked }} -
{% endif %}
+
+ {% endif %} +

Expected Seed:

{{ w.expected_seed }}
- Blockchain - {{ w.synced }}% + Blockchain + {{ w.synced }}%
@@ -204,12 +185,14 @@
{% endif %} {% endif %} - -
{% endfor %} +
+ {% endfor %}
+ {% include 'footer.html' %} + - + \ No newline at end of file