From 480c8f83e4c705ac165379f460bd1d4c5a80d88f Mon Sep 17 00:00:00 2001 From: Dennis Reimann Date: Tue, 16 Apr 2024 13:09:10 +0200 Subject: [PATCH] Categorize and clean up icons --- src/design/icons.js | 96 ++++++++++--------- src/icons/{new.svg => actions/add.svg} | 0 src/icons/{ => actions}/archive.svg | 0 src/icons/{ => actions}/copy.svg | 0 src/icons/{ => actions}/drag.svg | 0 src/icons/{ => actions}/refresh.svg | 0 src/icons/{ => actions}/remove.svg | 0 src/icons/{ => actions}/search.svg | 0 src/icons/{ => actions}/send.svg | 0 src/icons/{ => actions}/trash.svg | 0 src/icons/{caret-down.svg => caret/down.svg} | 0 .../{caret-right.svg => caret/right.svg} | 0 .../complete.svg} | 0 .../expired.svg} | 0 .../{payment-sent.svg => checkout/sent.svg} | 0 src/icons/{ => nav}/account.svg | 0 src/icons/nav/back.svg | 3 + src/icons/nav/close.svg | 3 + src/icons/{ => nav}/crowdfund.svg | 0 src/icons/{home.svg => nav/dashboard.svg} | 0 src/icons/nav/explore.svg | 4 + src/icons/{invoice-2.svg => nav/invoice.svg} | 0 src/icons/{invoice.svg => nav/invoices.svg} | 0 src/icons/nav/keypad.svg | 3 + .../{spark.svg => nav/lightning-address.svg} | 0 .../{manage-plugins.svg => nav/manage.svg} | 0 src/icons/{ => nav}/menu.svg | 0 src/icons/{ => nav}/notifications.svg | 0 src/icons/{ => nav}/pay-button.svg | 0 src/icons/{ => nav}/payment-requests.svg | 0 src/icons/{ => nav}/payouts.svg | 0 src/icons/{ => nav}/plugin.svg | 0 src/icons/{ => nav}/pointofsale.svg | 0 src/icons/{ => nav}/pull-payments.svg | 0 src/icons/nav/reporting.svg | 3 + src/icons/{ => nav}/server-settings.svg | 0 src/icons/{ => nav}/settings.svg | 0 src/icons/{ => nav}/store.svg | 0 src/icons/new-wallet.svg | 3 - src/icons/note.svg | 3 - src/icons/onion.svg | 3 - src/icons/payment/receive.svg | 5 + src/icons/payment/send.svg | 5 + src/icons/wallet-lightning.svg | 3 - src/icons/wallet-onchain.svg | 3 - .../existing.svg} | 0 .../{wallet-file.svg => wallet/file.svg} | 0 .../hardware.svg} | 0 src/icons/{hot-wallet.svg => wallet/hot.svg} | 0 src/icons/{ => wallet}/key.svg | 0 src/icons/{new-store.svg => wallet/new.svg} | 0 src/icons/{ => wallet}/seed.svg | 0 .../watchonly.svg} | 0 src/icons/{ => wallet}/xpub.svg | 0 src/static/svg/icons.svg | 88 ++++++++--------- 55 files changed, 120 insertions(+), 105 deletions(-) rename src/icons/{new.svg => actions/add.svg} (100%) rename src/icons/{ => actions}/archive.svg (100%) rename src/icons/{ => actions}/copy.svg (100%) rename src/icons/{ => actions}/drag.svg (100%) rename src/icons/{ => actions}/refresh.svg (100%) rename src/icons/{ => actions}/remove.svg (100%) rename src/icons/{ => actions}/search.svg (100%) rename src/icons/{ => actions}/send.svg (100%) rename src/icons/{ => actions}/trash.svg (100%) rename src/icons/{caret-down.svg => caret/down.svg} (100%) rename src/icons/{caret-right.svg => caret/right.svg} (100%) rename src/icons/{payment-complete.svg => checkout/complete.svg} (100%) rename src/icons/{invoice-expired.svg => checkout/expired.svg} (100%) rename src/icons/{payment-sent.svg => checkout/sent.svg} (100%) rename src/icons/{ => nav}/account.svg (100%) create mode 100644 src/icons/nav/back.svg create mode 100644 src/icons/nav/close.svg rename src/icons/{ => nav}/crowdfund.svg (100%) rename src/icons/{home.svg => nav/dashboard.svg} (100%) create mode 100644 src/icons/nav/explore.svg rename src/icons/{invoice-2.svg => nav/invoice.svg} (100%) rename src/icons/{invoice.svg => nav/invoices.svg} (100%) create mode 100644 src/icons/nav/keypad.svg rename src/icons/{spark.svg => nav/lightning-address.svg} (100%) rename src/icons/{manage-plugins.svg => nav/manage.svg} (100%) rename src/icons/{ => nav}/menu.svg (100%) rename src/icons/{ => nav}/notifications.svg (100%) rename src/icons/{ => nav}/pay-button.svg (100%) rename src/icons/{ => nav}/payment-requests.svg (100%) rename src/icons/{ => nav}/payouts.svg (100%) rename src/icons/{ => nav}/plugin.svg (100%) rename src/icons/{ => nav}/pointofsale.svg (100%) rename src/icons/{ => nav}/pull-payments.svg (100%) create mode 100644 src/icons/nav/reporting.svg rename src/icons/{ => nav}/server-settings.svg (100%) rename src/icons/{ => nav}/settings.svg (100%) rename src/icons/{ => nav}/store.svg (100%) delete mode 100644 src/icons/new-wallet.svg delete mode 100644 src/icons/note.svg delete mode 100644 src/icons/onion.svg create mode 100644 src/icons/payment/receive.svg create mode 100644 src/icons/payment/send.svg delete mode 100644 src/icons/wallet-lightning.svg delete mode 100644 src/icons/wallet-onchain.svg rename src/icons/{existing-wallet.svg => wallet/existing.svg} (100%) rename src/icons/{wallet-file.svg => wallet/file.svg} (100%) rename src/icons/{hardware-wallet.svg => wallet/hardware.svg} (100%) rename src/icons/{hot-wallet.svg => wallet/hot.svg} (100%) rename src/icons/{ => wallet}/key.svg (100%) rename src/icons/{new-store.svg => wallet/new.svg} (100%) rename src/icons/{ => wallet}/seed.svg (100%) rename src/icons/{watchonly-wallet.svg => wallet/watchonly.svg} (100%) rename src/icons/{ => wallet}/xpub.svg (100%) diff --git a/src/design/icons.js b/src/design/icons.js index 6646455..cbfb922 100644 --- a/src/design/icons.js +++ b/src/design/icons.js @@ -1,91 +1,93 @@ module.exports = [ - { id: 'account', category: 'general' }, + { id: 'actions-add', category: 'actions' }, + { id: 'actions-archive', category: 'actions' }, + { id: 'actions-copy', category: 'actions' }, + { id: 'actions-drag', category: 'actions' }, + { id: 'actions-refresh', category: 'actions' }, + { id: 'actions-remove', category: 'actions' }, + { id: 'actions-search', category: 'actions' }, + { id: 'actions-send', category: 'actions' }, + { id: 'actions-trash', category: 'actions' }, { id: 'api', category: 'general' }, - { id: 'archive', category: 'general' }, { id: 'back', category: 'general' }, - { id: 'caret-down', category: 'general' }, - { id: 'caret-right', category: 'general' }, + { id: 'caret-down', category: 'caret' }, + { id: 'caret-right', category: 'caret' }, { id: 'checkmark', category: 'general' }, + { id: 'checkout-complete', category: 'checkout' }, + { id: 'checkout-expired', category: 'checkout' }, + { id: 'checkout-sent', category: 'checkout' }, { id: 'close', category: 'general' }, - { id: 'copy', category: 'general' }, { id: 'cross', category: 'general' }, - { id: 'crowdfund', category: 'general' }, { id: 'docs', category: 'general' }, { id: 'donate', category: 'general' }, { id: 'done', category: 'general' }, { id: 'dots', category: 'general' }, - { id: 'drag', category: 'general' }, - { id: 'existing-wallet', category: 'general' }, { id: 'forms-checkbox', category: 'forms' }, { id: 'forms-date', category: 'forms' }, { id: 'forms-number', category: 'forms' }, { id: 'forms-select', category: 'forms' }, { id: 'forms-text', category: 'forms' }, - { id: 'hardware-wallet', category: 'general' }, - { id: 'home', category: 'general' }, - { id: 'hot-wallet', category: 'general' }, { id: 'info', category: 'general' }, - { id: 'invoice-2', category: 'general' }, - { id: 'invoice-expired', category: 'general' }, - { id: 'invoice', category: 'general' }, - { id: 'key', category: 'general' }, { id: 'logo-btcpay', category: 'logo' }, { id: 'logo-lightningterminal', category: 'logo' }, { id: 'logo-rtl', category: 'logo' }, { id: 'logo-shopify', category: 'logo' }, { id: 'logo-thunderhub', category: 'logo' }, { id: 'logo-tor', category: 'logo' }, - { id: 'manage-plugins', category: 'general' }, - { id: 'menu', category: 'general' }, { id: 'minus', category: 'general' }, - { id: 'new-store', category: 'general' }, - { id: 'new-wallet', category: 'general' }, - { id: 'new', category: 'general' }, - { id: 'note', category: 'general' }, - { id: 'notifications', category: 'general' }, + { id: 'nav-account', category: 'nav' }, + { id: 'nav-back', category: 'nav' }, + { id: 'nav-close', category: 'nav' }, + { id: 'nav-crowdfund', category: 'nav' }, + { id: 'nav-dashboard', category: 'nav' }, + { id: 'nav-explore', category: 'nav' }, + { id: 'nav-invoice', category: 'nav' }, + { id: 'nav-invoices', category: 'nav' }, + { id: 'nav-keypad', category: 'nav' }, + { id: 'nav-lightning-address', category: 'nav' }, + { id: 'nav-manage', category: 'nav' }, + { id: 'nav-menu', category: 'nav' }, + { id: 'nav-notifications', category: 'nav' }, + { id: 'nav-pay-button', category: 'nav' }, + { id: 'nav-payment-requests', category: 'nav' }, + { id: 'nav-payouts', category: 'nav' }, + { id: 'nav-plugin', category: 'nav' }, + { id: 'nav-pointofsale', category: 'nav' }, + { id: 'nav-pull-payments', category: 'nav' }, + { id: 'nav-reporting', category: 'nav' }, + { id: 'nav-server-settings', category: 'nav' }, + { id: 'nav-settings', category: 'nav' }, + { id: 'nav-store', category: 'nav' }, { id: 'notifications-invoice-failure', category: 'notifications' }, { id: 'notifications-invoice-settled', category: 'notifications' }, { id: 'notifications-new-version', category: 'notifications' }, { id: 'notifications-payout-approved', category: 'notifications' }, { id: 'notifications-payout', category: 'notifications' }, - { id: 'onion', category: 'general' }, - { id: 'pay-button', category: 'general' }, - { id: 'payment-complete', category: 'general' }, - { id: 'payment-requests', category: 'general' }, - { id: 'payment-sent', category: 'general' }, - { id: 'payouts', category: 'general' }, - { id: 'plugin', category: 'general' }, + { id: 'payment-receive', category: 'payment' }, + { id: 'payment-send', category: 'payment' }, { id: 'plus', category: 'general' }, - { id: 'pointofsale', category: 'general' }, { id: 'pos-cart', category: 'pos' }, { id: 'pos-light', category: 'pos' }, { id: 'pos-print', category: 'pos' }, { id: 'pos-static', category: 'pos' }, - { id: 'pull-payments', category: 'general' }, { id: 'qr-code', category: 'general' }, - { id: 'refresh', category: 'general' }, - { id: 'remove', category: 'general' }, { id: 'scan-qr', category: 'general' }, - { id: 'search', category: 'general' }, - { id: 'seed', category: 'general' }, - { id: 'send', category: 'general' }, - { id: 'server-settings', category: 'general' }, - { id: 'settings', category: 'general' }, { id: 'social-github', category: 'social' }, { id: 'social-mattermost', category: 'social' }, { id: 'social-nostr', category: 'social' }, { id: 'social-telegram', category: 'social' }, { id: 'social-twitter', category: 'social' }, - { id: 'spark', category: 'general' }, - { id: 'store', category: 'general' }, { id: 'themes-dark', category: 'themes' }, { id: 'themes-light', category: 'themes' }, { id: 'themes-system', category: 'themes' }, - { id: 'trash', category: 'general' }, - { id: 'wallet-file', category: 'general' }, - { id: 'wallet-lightning', category: 'general' }, - { id: 'wallet-onchain', category: 'general' }, - { id: 'warning', category: 'general' }, - { id: 'watchonly-wallet', category: 'general' }, - { id: 'xpub', category: 'general' } + { id: 'wallet-existing', category: 'wallet' }, + { id: 'wallet-file', category: 'wallet' }, + { id: 'wallet-hardware', category: 'wallet' }, + { id: 'wallet-hot', category: 'wallet' }, + { id: 'wallet-key', category: 'wallet' }, + { id: 'wallet-new', category: 'wallet' }, + { id: 'wallet-seed', category: 'wallet' }, + { id: 'wallet-watchonly', category: 'wallet' }, + { id: 'wallet-xpub', category: 'wallet' }, + { id: 'warning', category: 'general' } ] diff --git a/src/icons/new.svg b/src/icons/actions/add.svg similarity index 100% rename from src/icons/new.svg rename to src/icons/actions/add.svg diff --git a/src/icons/archive.svg b/src/icons/actions/archive.svg similarity index 100% rename from src/icons/archive.svg rename to src/icons/actions/archive.svg diff --git a/src/icons/copy.svg b/src/icons/actions/copy.svg similarity index 100% rename from src/icons/copy.svg rename to src/icons/actions/copy.svg diff --git a/src/icons/drag.svg b/src/icons/actions/drag.svg similarity index 100% rename from src/icons/drag.svg rename to src/icons/actions/drag.svg diff --git a/src/icons/refresh.svg b/src/icons/actions/refresh.svg similarity index 100% rename from src/icons/refresh.svg rename to src/icons/actions/refresh.svg diff --git a/src/icons/remove.svg b/src/icons/actions/remove.svg similarity index 100% rename from src/icons/remove.svg rename to src/icons/actions/remove.svg diff --git a/src/icons/search.svg b/src/icons/actions/search.svg similarity index 100% rename from src/icons/search.svg rename to src/icons/actions/search.svg diff --git a/src/icons/send.svg b/src/icons/actions/send.svg similarity index 100% rename from src/icons/send.svg rename to src/icons/actions/send.svg diff --git a/src/icons/trash.svg b/src/icons/actions/trash.svg similarity index 100% rename from src/icons/trash.svg rename to src/icons/actions/trash.svg diff --git a/src/icons/caret-down.svg b/src/icons/caret/down.svg similarity index 100% rename from src/icons/caret-down.svg rename to src/icons/caret/down.svg diff --git a/src/icons/caret-right.svg b/src/icons/caret/right.svg similarity index 100% rename from src/icons/caret-right.svg rename to src/icons/caret/right.svg diff --git a/src/icons/payment-complete.svg b/src/icons/checkout/complete.svg similarity index 100% rename from src/icons/payment-complete.svg rename to src/icons/checkout/complete.svg diff --git a/src/icons/invoice-expired.svg b/src/icons/checkout/expired.svg similarity index 100% rename from src/icons/invoice-expired.svg rename to src/icons/checkout/expired.svg diff --git a/src/icons/payment-sent.svg b/src/icons/checkout/sent.svg similarity index 100% rename from src/icons/payment-sent.svg rename to src/icons/checkout/sent.svg diff --git a/src/icons/account.svg b/src/icons/nav/account.svg similarity index 100% rename from src/icons/account.svg rename to src/icons/nav/account.svg diff --git a/src/icons/nav/back.svg b/src/icons/nav/back.svg new file mode 100644 index 0000000..f8df94b --- /dev/null +++ b/src/icons/nav/back.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/nav/close.svg b/src/icons/nav/close.svg new file mode 100644 index 0000000..59b585c --- /dev/null +++ b/src/icons/nav/close.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/crowdfund.svg b/src/icons/nav/crowdfund.svg similarity index 100% rename from src/icons/crowdfund.svg rename to src/icons/nav/crowdfund.svg diff --git a/src/icons/home.svg b/src/icons/nav/dashboard.svg similarity index 100% rename from src/icons/home.svg rename to src/icons/nav/dashboard.svg diff --git a/src/icons/nav/explore.svg b/src/icons/nav/explore.svg new file mode 100644 index 0000000..d79ed99 --- /dev/null +++ b/src/icons/nav/explore.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/icons/invoice-2.svg b/src/icons/nav/invoice.svg similarity index 100% rename from src/icons/invoice-2.svg rename to src/icons/nav/invoice.svg diff --git a/src/icons/invoice.svg b/src/icons/nav/invoices.svg similarity index 100% rename from src/icons/invoice.svg rename to src/icons/nav/invoices.svg diff --git a/src/icons/nav/keypad.svg b/src/icons/nav/keypad.svg new file mode 100644 index 0000000..755f51e --- /dev/null +++ b/src/icons/nav/keypad.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/spark.svg b/src/icons/nav/lightning-address.svg similarity index 100% rename from src/icons/spark.svg rename to src/icons/nav/lightning-address.svg diff --git a/src/icons/manage-plugins.svg b/src/icons/nav/manage.svg similarity index 100% rename from src/icons/manage-plugins.svg rename to src/icons/nav/manage.svg diff --git a/src/icons/menu.svg b/src/icons/nav/menu.svg similarity index 100% rename from src/icons/menu.svg rename to src/icons/nav/menu.svg diff --git a/src/icons/notifications.svg b/src/icons/nav/notifications.svg similarity index 100% rename from src/icons/notifications.svg rename to src/icons/nav/notifications.svg diff --git a/src/icons/pay-button.svg b/src/icons/nav/pay-button.svg similarity index 100% rename from src/icons/pay-button.svg rename to src/icons/nav/pay-button.svg diff --git a/src/icons/payment-requests.svg b/src/icons/nav/payment-requests.svg similarity index 100% rename from src/icons/payment-requests.svg rename to src/icons/nav/payment-requests.svg diff --git a/src/icons/payouts.svg b/src/icons/nav/payouts.svg similarity index 100% rename from src/icons/payouts.svg rename to src/icons/nav/payouts.svg diff --git a/src/icons/plugin.svg b/src/icons/nav/plugin.svg similarity index 100% rename from src/icons/plugin.svg rename to src/icons/nav/plugin.svg diff --git a/src/icons/pointofsale.svg b/src/icons/nav/pointofsale.svg similarity index 100% rename from src/icons/pointofsale.svg rename to src/icons/nav/pointofsale.svg diff --git a/src/icons/pull-payments.svg b/src/icons/nav/pull-payments.svg similarity index 100% rename from src/icons/pull-payments.svg rename to src/icons/nav/pull-payments.svg diff --git a/src/icons/nav/reporting.svg b/src/icons/nav/reporting.svg new file mode 100644 index 0000000..0d21618 --- /dev/null +++ b/src/icons/nav/reporting.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/icons/server-settings.svg b/src/icons/nav/server-settings.svg similarity index 100% rename from src/icons/server-settings.svg rename to src/icons/nav/server-settings.svg diff --git a/src/icons/settings.svg b/src/icons/nav/settings.svg similarity index 100% rename from src/icons/settings.svg rename to src/icons/nav/settings.svg diff --git a/src/icons/store.svg b/src/icons/nav/store.svg similarity index 100% rename from src/icons/store.svg rename to src/icons/nav/store.svg diff --git a/src/icons/new-wallet.svg b/src/icons/new-wallet.svg deleted file mode 100644 index 3165523..0000000 --- a/src/icons/new-wallet.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/note.svg b/src/icons/note.svg deleted file mode 100644 index 3d93b59..0000000 --- a/src/icons/note.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/onion.svg b/src/icons/onion.svg deleted file mode 100644 index f9d69ee..0000000 --- a/src/icons/onion.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/payment/receive.svg b/src/icons/payment/receive.svg new file mode 100644 index 0000000..356cb34 --- /dev/null +++ b/src/icons/payment/receive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/icons/payment/send.svg b/src/icons/payment/send.svg new file mode 100644 index 0000000..bd8ed75 --- /dev/null +++ b/src/icons/payment/send.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/icons/wallet-lightning.svg b/src/icons/wallet-lightning.svg deleted file mode 100644 index df282d3..0000000 --- a/src/icons/wallet-lightning.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/wallet-onchain.svg b/src/icons/wallet-onchain.svg deleted file mode 100644 index fd64ef1..0000000 --- a/src/icons/wallet-onchain.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/icons/existing-wallet.svg b/src/icons/wallet/existing.svg similarity index 100% rename from src/icons/existing-wallet.svg rename to src/icons/wallet/existing.svg diff --git a/src/icons/wallet-file.svg b/src/icons/wallet/file.svg similarity index 100% rename from src/icons/wallet-file.svg rename to src/icons/wallet/file.svg diff --git a/src/icons/hardware-wallet.svg b/src/icons/wallet/hardware.svg similarity index 100% rename from src/icons/hardware-wallet.svg rename to src/icons/wallet/hardware.svg diff --git a/src/icons/hot-wallet.svg b/src/icons/wallet/hot.svg similarity index 100% rename from src/icons/hot-wallet.svg rename to src/icons/wallet/hot.svg diff --git a/src/icons/key.svg b/src/icons/wallet/key.svg similarity index 100% rename from src/icons/key.svg rename to src/icons/wallet/key.svg diff --git a/src/icons/new-store.svg b/src/icons/wallet/new.svg similarity index 100% rename from src/icons/new-store.svg rename to src/icons/wallet/new.svg diff --git a/src/icons/seed.svg b/src/icons/wallet/seed.svg similarity index 100% rename from src/icons/seed.svg rename to src/icons/wallet/seed.svg diff --git a/src/icons/watchonly-wallet.svg b/src/icons/wallet/watchonly.svg similarity index 100% rename from src/icons/watchonly-wallet.svg rename to src/icons/wallet/watchonly.svg diff --git a/src/icons/xpub.svg b/src/icons/wallet/xpub.svg similarity index 100% rename from src/icons/xpub.svg rename to src/icons/wallet/xpub.svg diff --git a/src/static/svg/icons.svg b/src/static/svg/icons.svg index 72ed20d..e0f04f8 100644 --- a/src/static/svg/icons.svg +++ b/src/static/svg/icons.svg @@ -1,92 +1,94 @@ - + + + + + + + + + - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + - - - - - - - - - - - - + - - + + + + + + + - - \ No newline at end of file