From 561ff2b53fd16992b4648b74f9fa8bf7975fbb5d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Jun 2021 12:38:03 -0500 Subject: [PATCH 01/10] Crypocoin: scaffolding --- app/soapbox/features/cryptocoin/coin.js | Bin 0 -> 476 bytes app/soapbox/features/cryptocoin/coin_db.json | 17 +++++++++++++++++ app/soapbox/features/cryptocoin/coin_list.js | Bin 0 -> 1290 bytes app/soapbox/features/cryptocoin/index.js | Bin 0 -> 792 bytes app/soapbox/features/ui/index.js | Bin 23862 -> 23990 bytes .../features/ui/util/async-components.js | Bin 7042 -> 7158 bytes 6 files changed, 17 insertions(+) create mode 100644 app/soapbox/features/cryptocoin/coin.js create mode 100644 app/soapbox/features/cryptocoin/coin_db.json create mode 100644 app/soapbox/features/cryptocoin/coin_list.js create mode 100644 app/soapbox/features/cryptocoin/index.js diff --git a/app/soapbox/features/cryptocoin/coin.js b/app/soapbox/features/cryptocoin/coin.js new file mode 100644 index 0000000000000000000000000000000000000000..01c8253488bcbc2110ff9d04307f6fc47573d95f GIT binary patch literal 476 zcmZvWJx{|h5Qg{sirbP%H0-ot>BNFi#a>q&l8-%lj=JL-KmsdAFKyFGkTNY3U@Ow6a_$H#a2Vcnz36L<>N%3)h- vxf&U488kTuqVqv;@p?H7?xdH3`4Q>HVlJeGp!bXL6V0AuK)W;$?``xpKS5* z>G6@Ys@g_d_>MBSaMn!)vF7)9A1NQ|A#ds$DLgCzTa86`ona4E)meEe@kuxB^Q}d* zLaPwowiLG<|6gvW@zBt{HP$OR+eJQMws`=}Bt3jp#)333N#TQylks?*)K5%vYTl^& z%jZ#Vy5rAZ#VP%5ntBEu=yV04P(;?you+HqMJyO&AX_UCo<3cplKq(MqS8uAWB(tI z0UrW{9HEuGkUgq)g=UcJTWcH0?xBwWG}=zr@3f@cr5uHjdA6nM^WK3G2enHWX3OAFa zfs5yqu{z>N+s?c?k0=H(Y~Hz@(DAUatUX$3@wwr-l$Vk^ zatO`FtHruljP}!NQ+hUu3sX7pe);{&+*~ZxO`9<-XBHV*G5lrU%5-?7AzV`7*!y6|9>}K918G?izY48C*Ls2wDe*vvNs;~e6 literal 0 HcmV?d00001 diff --git a/app/soapbox/features/cryptocoin/index.js b/app/soapbox/features/cryptocoin/index.js new file mode 100644 index 0000000000000000000000000000000000000000..b509bbb2c4c678c697bc3962095a3009f1fd7f58 GIT binary patch literal 792 zcmZ`$!EW0y487|scyj{8@;!}*VcDfXR}}5;gCa96S4;9FxoBYc-$&VUofX(kBH!a9 z-y_pGAK?*|j&SzQK;hH7xDhnB259h17Jpy}>KVfh$o@thZ*6R0yyld|rIq;LUH9|S zVaS+{|7A>t6?1D$AJwVFhu-7Sv7$x$&mtu)kg{V;sTa^XC>3j9pn zYc$zA3X6zj0NGzHR~RF-v)nTIR;WK6zZnF;3#x|f^BxAEW)H=zAho}A(WPm{F40uq z#%vmczB{WT!f^)m-lNr*0>+&fx2%irQx2IXzOEh%-Kr24B2Nc=k7%0!|1ob6ykm$e zl7{5@oIwp~b>Q$~yN8c#q&uZBC51=))04+$$FPw%0^k)J^qXyF&erhFbMQ697YZ^d zgbAJqvG*1>lMuim2Sd!Pixb7ko5j9*NQ30rd7~DeHjD8xd%PXtr1a~zXrEd#U-Doc o-Ow9M#@s7|b#dkW3Ys>^VOMMUP%(M=9;$iC`Oiu4@j{H^FNUBA%K!iX literal 0 HcmV?d00001 diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js index 20b2ecf5819f865de326a42d172cdf8bdba8f474..d193ae606301bd57d849f8374c4b5aa1f1ddc47f 100644 GIT binary patch delta 65 zcmdnCi*eg-#tlcfc@z|!iz*9B@{{v3^EMyizNb3bUxuAGB|k5*Bvn5dEHyb%O_d8t JRiWWgZ2(Zq8F2sr delta 19 bcmdnCn{nGN#tlcfH(%nuqq Date: Wed, 9 Jun 2021 15:58:35 -0500 Subject: [PATCH 02/10] Cryptocoin: display images and QR codes --- app/soapbox/features/cryptocoin/coin.js | Bin 476 -> 846 bytes app/soapbox/features/cryptocoin/coin_db.json | 2 +- app/soapbox/features/cryptocoin/icons.js | Bin 0 -> 413 bytes app/styles/application.scss | 1 + app/styles/components/cryptocoin.scss | 3 +++ package.json | 1 + yarn.lock | 5 +++++ 7 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 app/soapbox/features/cryptocoin/icons.js create mode 100644 app/styles/components/cryptocoin.scss diff --git a/app/soapbox/features/cryptocoin/coin.js b/app/soapbox/features/cryptocoin/coin.js index 01c8253488bcbc2110ff9d04307f6fc47573d95f..2474aaebf07b9e9859ebc16ce444e2ca25cbc8d9 100644 GIT binary patch literal 846 zcmbVJyKciU4BY({+-w7lvo~>PiM(D(Aot z0G=6ZG~vo|2*j%r9Q1;E46FsxXhefBbX<=i#F8pAe9QW~&1@ z(s>{JTH>`bX(X}i`iT^$=>V$ayblpBF_!)^FkMQhpqz42AFh6*>&+jLc!zg%-xxVb@)o9)hc;rmmeS@`TgFV_=yM5l30umH*B1tk$-Y$-vSZG$6 zJs#@hd6JGD Date: Wed, 9 Jun 2021 17:11:37 -0500 Subject: [PATCH 03/10] CryptoDonate: refactor, rename, reorganize --- .../components/crypto_address.js | Bin 0 -> 1074 bytes .../crypto_donate/components/site_wallet.js | Bin 0 -> 959 bytes .../{cryptocoin => crypto_donate}/index.js | Bin 792 -> 817 bytes .../features/crypto_donate/utils/coin_db.js | Bin 0 -> 220 bytes .../crypto_donate/utils/coin_icons.js | Bin 0 -> 585 bytes .../crypto_donate/utils/manifest_map.js | Bin 0 -> 468 bytes app/soapbox/features/cryptocoin/coin.js | Bin 846 -> 0 bytes app/soapbox/features/cryptocoin/coin_db.json | 17 ----------------- app/soapbox/features/cryptocoin/coin_list.js | Bin 1290 -> 0 bytes app/soapbox/features/cryptocoin/icons.js | Bin 413 -> 0 bytes app/soapbox/features/ui/index.js | Bin 23990 -> 23994 bytes .../features/ui/util/async-components.js | Bin 7158 -> 7166 bytes app/styles/application.scss | 2 +- .../{cryptocoin.scss => crypto-donate.scss} | 2 +- 14 files changed, 2 insertions(+), 19 deletions(-) create mode 100644 app/soapbox/features/crypto_donate/components/crypto_address.js create mode 100644 app/soapbox/features/crypto_donate/components/site_wallet.js rename app/soapbox/features/{cryptocoin => crypto_donate}/index.js (69%) create mode 100644 app/soapbox/features/crypto_donate/utils/coin_db.js create mode 100644 app/soapbox/features/crypto_donate/utils/coin_icons.js create mode 100644 app/soapbox/features/crypto_donate/utils/manifest_map.js delete mode 100644 app/soapbox/features/cryptocoin/coin.js delete mode 100644 app/soapbox/features/cryptocoin/coin_db.json delete mode 100644 app/soapbox/features/cryptocoin/coin_list.js delete mode 100644 app/soapbox/features/cryptocoin/icons.js rename app/styles/components/{cryptocoin.scss => crypto-donate.scss} (51%) diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.js b/app/soapbox/features/crypto_donate/components/crypto_address.js new file mode 100644 index 0000000000000000000000000000000000000000..512ba686c9118b9b3f278a3ad2a20c1fcbb75d69 GIT binary patch literal 1074 zcmbu7!EW0y42JK13ZCi&h@Jad7g)1PE<+dWHVlR;v6(PiawNKFVffugS#pxL+uC6# zo6=A6<4@_fvyNbgLK56N+d}Tbe}0+icy;S+_w}hmpRPNO3knA(&9-fO5_b*W_6|3e z6AhYY^$I;pijFmfoJFT1Uv?X-Fm*XN$wB#oWn;DZbdw}yx$a3fel7X5R(GdL1MHE4 zb}Oxc@wa--S7Cw-A14PC-iy8=kd5#jHtwk-`%x)}9N{COQ6By<=8$Coo&;$L!JX(< z1p^-gh*;zU9E~hJIc@f(_B%ZE+M!xaO3wd@?j1s7317=Xkujh+hDEnnCV(&~!7ziY zAof{7D8uelKtHrE1G&GPKw<`IYLIWE=_OmbHH&X^a&AP6`S&F|7^ZYcy)&?w0)Q)} zAEK3?Sytt8^0P=@Zx4HNkY>$5g%209D> zidWYM#}8ED^Tz3YK8U8rYDlB}PnQWZzfQPU|Au(9@<{Tcz%Z@%;^K{6)OFA?Mfi-d Q#yD^Bgv5KEUe}oY0#-?2%K!iX literal 0 HcmV?d00001 diff --git a/app/soapbox/features/crypto_donate/components/site_wallet.js b/app/soapbox/features/crypto_donate/components/site_wallet.js new file mode 100644 index 0000000000000000000000000000000000000000..3e5d30bc55d2a2065d7aba560f917b97b0b37512 GIT binary patch literal 959 zcmZuvO>f&U488kTaJkq95~o|&eI#+QA*T+-P_(%X!=TtqtJRhqiC&x;`R}9r5!c%c z9W3$j@sW=*FSH@JN0AWhjLyL~?%!W}vJKUcXr++Dr_TgE}@DAqMNN5MM*>0nF#nGhrq2BEv=dT2DwO&uAtKm~1JTOkvV-H!sQS z{l}!byb@`VzrPgwH@m~zizB`x`{8Lws`|%Af8s_ir6J*0LUE#uX;q-&r6kA#{D`#H^HE}0IX8^3!3)6iX3C# zO2XMeWEqlw-C+Rgo-yLl1n%Niqvvq6tI@)p6J6*Tk8wlb3<~^qWBkzBIec{#MUFQj b{pBGT1?Pi~@ElmpS$G==UFRpyJ9&Qq0|qn{ literal 0 HcmV?d00001 diff --git a/app/soapbox/features/cryptocoin/index.js b/app/soapbox/features/crypto_donate/index.js similarity index 69% rename from app/soapbox/features/cryptocoin/index.js rename to app/soapbox/features/crypto_donate/index.js index b509bbb2c4c678c697bc3962095a3009f1fd7f58..a06652ffefc9535d4fc81603036a1ba74df1a160 100644 GIT binary patch delta 120 zcmbQiwvlbZCyn6DlGO0ToSf7Wg|wplTm^MK{p9@Ig8aPHypm%5VxVk%IY@dkH=`SS zd`f;^VoB=cP{t@e7cf&HwW1_7FQs^5oy6qJjKAb`Au81ExD?>P25!gXXG}%_Ta_vi delta 85 zcmdnUHiK=#CrRi0%sijW;u3|lqWoM1bv^xLpg??1X7OYxMmH7^XL34Y6qvF3IHMG! UBuGfzj!OX!Y@kL={?B9t0NL0ZI{*Lx diff --git a/app/soapbox/features/crypto_donate/utils/coin_db.js b/app/soapbox/features/crypto_donate/utils/coin_db.js new file mode 100644 index 0000000000000000000000000000000000000000..33c566cdbdd8a86c9afdc0c935180b08169d2041 GIT binary patch literal 220 zcmYk1O$q`r42AbSMRuc`nFACTiW>!29zdd#Vx@ny84<+08>drnmGJo9dx`ZaW`;MI z9R2YOpLv1KdOtB<9d%mS%6JUcP~j7%1?q>UT|6cs)iA);IpDi3Fh(jM^A^LCG8a(^ xGL^}3_5Yjuhp>SoV1PsGmL?_c!jfUbeg~W7%vG}rvDS)S^AjT({DoIot1qFDO|}34 literal 0 HcmV?d00001 diff --git a/app/soapbox/features/crypto_donate/utils/coin_icons.js b/app/soapbox/features/crypto_donate/utils/coin_icons.js new file mode 100644 index 0000000000000000000000000000000000000000..2c0376bfa5357448791ff77067faf9331c23d08b GIT binary patch literal 585 zcmZ9K!EW0y42JJ|3LXm7E@}xWhM{Ya0z`c@2T!3LEwbcNR2!qsyN|Y$9(poJ zksp8lv@viWF+qwQ0+X{lqyadB>-tCxwfDeV1ZQJN;DWr2VNdZNT2{uuAH*BjGWY4m zn8dZ+#aE=p$2VYcTc2!+%90@$q zQ03%8TfO1mUbsq)BKW9f1@DKYQcVtaO`ScDrH68<4oc0-Pm=K^%hKXlVBB+YZfWQ_+DwGOicKTZjG}Gyk<9s} z94q7HxRPYgOesW#`{`!KL9-4?%aMLZf)<&@&Che5%4eVC^)9;bAdyHut$X`rnU9Y- Qp<4_ne+x(=Wbc>iKN*w9ssI20 literal 0 HcmV?d00001 diff --git a/app/soapbox/features/crypto_donate/utils/manifest_map.js b/app/soapbox/features/crypto_donate/utils/manifest_map.js new file mode 100644 index 0000000000000000000000000000000000000000..bab27695fca05995dbfa0766d9134dbc4a2609d9 GIT binary patch literal 468 zcmZuu%}&EG48Hd%d}}I=GX^t0SQA5A!0TZ5SP1skA?$PXput&gP~^(%Bqx;~aS2DF zRF+B|EFJ40P4udyNXL`9qg~YC;-I`Pgqe>o8~IjZXd3orhq(!B$atzYqiF9c&A=PG z?N;CX3%u&IglF$7>A@l27Pl3)JzRf_+8Hr%|Cuw1q0{2qUd%?F%($xth0w+<00ZT* zgY_d^8sMx{a{!*mf+TK3dElxoqaUJcJ4x{+zGL3#f})%GtLD1+6IOIn93OYpp~R0A Qr*B&SJPRjdAx_1pPeApfe*gdg literal 0 HcmV?d00001 diff --git a/app/soapbox/features/cryptocoin/coin.js b/app/soapbox/features/cryptocoin/coin.js deleted file mode 100644 index 2474aaebf07b9e9859ebc16ce444e2ca25cbc8d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmbVJyKciU4BY({+-w7lvo~>PiM(D(Aot z0G=6ZG~vo|2*j%r9Q1;E46FsxXhefBbX<=i#F8pAe9QW~&1@ z(s>{JTH>`bX(X}i`iT^$=>V$ayblpBF_!)^FkMQhpqzf&U488kTuqVqv;@p?H7?xdH3`4Q>HVlJeGp!bXL6V0AuK)W;$?``xpKS5* z>G6@Ys@g_d_>MBSaMn!)vF7)9A1NQ|A#ds$DLgCzTa86`ona4E)meEe@kuxB^Q}d* zLaPwowiLG<|6gvW@zBt{HP$OR+eJQMws`=}Bt3jp#)333N#TQylks?*)K5%vYTl^& z%jZ#Vy5rAZ#VP%5ntBEu=yV04P(;?you+HqMJyO&AX_UCo<3cplKq(MqS8uAWB(tI z0UrW{9HEuGkUgq)g=UcJTWcH0?xBwWG}=zr@3f@cr5uHjdA6nM^WK3G2enHWX3OAFa zfs5yqu{z>N+s?c?k0=H(Y~Hz@(DAUatUX$3@wwr-l$Vk^ zatO`FtHruljP}!NQ+hUu3sX7pe);{&+*~ZxO`9<-XBHV*G5lrU%5-?7AzV`7*!y6|9>}K918G?izY48C*Ls2wDe*vvNs;~e6 diff --git a/app/soapbox/features/cryptocoin/icons.js b/app/soapbox/features/cryptocoin/icons.js deleted file mode 100644 index f3b6b878cac8583cc8df6a285d4a8ac81dcbeec4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 413 zcmZ9JL2JV>42AFh6*>&+jLc!zg%-xxVb@)o9)hc;rmmeS@`TgFV_=yM5l30umH*B1tk$-Y$-vSZG$6 zJs#@hd6JGDObpuq diff --git a/app/soapbox/features/ui/util/async-components.js b/app/soapbox/features/ui/util/async-components.js index 9e94c3e85200637e164e96335e09243539503584..dc06d16777e94f29ba7a731b78dc7ac968e9627a 100644 GIT binary patch delta 61 zcmexn{?B~FOlek^{Jg}H$qSfGwUdh~3rh0iQ$PZ#N(x%~>Uw(mK!hT$u4&Cx%LM?? CU=>0D delta 54 ycmexo{>^;DOlg+n{LH+`3zgbv-?OAVLVLYg%*FasdD~1QLt@ diff --git a/app/styles/application.scss b/app/styles/application.scss index 068c6a528d..457a4faf4e 100644 --- a/app/styles/application.scss +++ b/app/styles/application.scss @@ -81,7 +81,7 @@ @import 'components/server-info'; @import 'components/admin'; @import 'components/backups'; -@import 'components/cryptocoin'; +@import 'components/crypto-donate'; // Holiday @import 'holiday/halloween'; diff --git a/app/styles/components/cryptocoin.scss b/app/styles/components/crypto-donate.scss similarity index 51% rename from app/styles/components/cryptocoin.scss rename to app/styles/components/crypto-donate.scss index 4deaf3341d..255acfeaa8 100644 --- a/app/styles/components/cryptocoin.scss +++ b/app/styles/components/crypto-donate.scss @@ -1,3 +1,3 @@ -.coin { +.crypto-address { padding: 20px; } From fde99ff11cc92a4ea7f4995f2d89b762e73fd64d Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Jun 2021 17:39:45 -0500 Subject: [PATCH 04/10] CryptoDonate: make crypto addresses copyable --- .../components/crypto_address.js | Bin 1074 -> 1451 bytes app/styles/components/crypto-donate.scss | 5 +++++ 2 files changed, 5 insertions(+) diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.js b/app/soapbox/features/crypto_donate/components/crypto_address.js index 512ba686c9118b9b3f278a3ad2a20c1fcbb75d69..483c04953e8cbd6777f6289eac3b2f5a56879d6b 100644 GIT binary patch delta 507 zcmZWm%}T>S5T@o*>sh>17!R@uYFfdIr0Jy~D2PxWK;vf8E+)GnnMg|weE=^)4!(dl zPwH#<1cLA4CJh+u9QH8Zem^tw(SF-{e%fEanMxv$2>nY;Q*VNhLy)KlSb`p>BOxh# zf9airq;C=~o&WBA7r0hoJ# zL<rmSxp4zT#Pgl5CtIAE_wPiA=_I zB4#MKjkDNVJlPE1KDN-Zv)yoWh*aukau2V8)aC3x~QR#5=f#3S+m diff --git a/app/styles/components/crypto-donate.scss b/app/styles/components/crypto-donate.scss index 255acfeaa8..dde631cd12 100644 --- a/app/styles/components/crypto-donate.scss +++ b/app/styles/components/crypto-donate.scss @@ -1,3 +1,8 @@ .crypto-address { padding: 20px; } + +.site-wallet { + display: grid; + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); +} From 51ac3e3d4e1583f422cde8eb7de21d9b6eb85d94 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Jun 2021 17:55:28 -0500 Subject: [PATCH 05/10] CryptoDonate: improve styling --- .../components/crypto_address.js | Bin 1451 -> 1521 bytes app/styles/components/crypto-donate.scss | 32 ++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.js b/app/soapbox/features/crypto_donate/components/crypto_address.js index 483c04953e8cbd6777f6289eac3b2f5a56879d6b..66828954d7808bc48b032350be70c03f697f6cc2 100644 GIT binary patch delta 52 zcmZ3@{gHb^6EkNO$oX4aUj&my}ynq?Xz0PScCrT_o{ diff --git a/app/styles/components/crypto-donate.scss b/app/styles/components/crypto-donate.scss index dde631cd12..3111cf8b24 100644 --- a/app/styles/components/crypto-donate.scss +++ b/app/styles/components/crypto-donate.scss @@ -1,5 +1,37 @@ .crypto-address { padding: 20px; + display: flex; + flex-direction: column; + + &__head { + display: flex; + align-items: center; + margin-bottom: 6px; + } + + &__title { + font-weight: bold; + } + + &__icon { + display: flex; + align-items: flex-start; + justify-content: center; + width: 24px; + margin-right: 10px; + + img { + width: 100%; + } + } + + &__note { + margin-bottom: 10px; + } + + &__address { + margin-top: auto; + } } .site-wallet { From acbfd7bcc35ad63f807145d7bc7f0026139fd67a Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Jun 2021 18:28:54 -0500 Subject: [PATCH 06/10] CryptoDonate: add block explorer links --- .../components/crypto_address.js | Bin 1521 -> 2034 bytes .../crypto_donate/utils/block_explorers.json | 8 ++++++++ app/styles/components/crypto-donate.scss | 14 ++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 app/soapbox/features/crypto_donate/utils/block_explorers.json diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.js b/app/soapbox/features/crypto_donate/components/crypto_address.js index 66828954d7808bc48b032350be70c03f697f6cc2..279b1c2cfc8b21ee1897ec1814c11f25e013352c 100644 GIT binary patch delta 482 zcmZ8e%}&BV5Ke^?#CZ2Ka#`@Fy?KFh^WXz`GD4Pis%w|sW_C%MG=x{s_#!5F@~!j< z94QrHZad%KeA%z=_sPrW?mH4hncoXep43O z5|Z1h!Z2ERrCqc^r`W*Zv$N*)eX?Q;=iw23qr4*xG4#Dka->U;X-eqa0OB!J9e|qe zab9TYk(v9k_qFa}$W)a<|EysSfY2|9+eq#37v8)t3^a_8kUbOZi)tIX6ubOkXSwbM zr$^VoQyFpH~yrc3aW*fti^nU*F$ ikN}J}-=or4VCj*J)K^+D526F}Nd7HaoVkwMAHfe)L7uz- delta 25 hcmeyw|B-vbuE|P_A)A$%#F;i1v#2v}_GMej2mpMo2tfb< diff --git a/app/soapbox/features/crypto_donate/utils/block_explorers.json b/app/soapbox/features/crypto_donate/utils/block_explorers.json new file mode 100644 index 0000000000..624cd5026e --- /dev/null +++ b/app/soapbox/features/crypto_donate/utils/block_explorers.json @@ -0,0 +1,8 @@ +{ + "bch": "https://explorer.bitcoin.com/bch/address/{address}", + "btc": "https://explorer.bitcoin.com/btc/address/{address}", + "doge": "https://dogechain.info/address/{address}", + "eth": "https://etherscan.io/address/{address}", + "ubq": "https://ubiqscan.io/address/{address}", + "xmr": "https://monerohash.com/explorer/search?value={address}" +} diff --git a/app/styles/components/crypto-donate.scss b/app/styles/components/crypto-donate.scss index 3111cf8b24..11ef3867a0 100644 --- a/app/styles/components/crypto-donate.scss +++ b/app/styles/components/crypto-donate.scss @@ -25,12 +25,26 @@ } } + &__actions { + margin-left: auto; + padding-left: 10px; + + a { + color: var(--primary-text-color--faint); + } + } + &__note { margin-bottom: 10px; } &__address { margin-top: auto; + display: flex; + + input { + flex: 1; + } } } From 940af0dd85ede991d0613ea573d8053cf24ef5a8 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Jun 2021 18:53:13 -0500 Subject: [PATCH 07/10] CryptoDonate: style form elements --- .../components/crypto_address.js | Bin 2034 -> 2046 bytes app/styles/components/crypto-donate.scss | 12 ++++++++++++ 2 files changed, 12 insertions(+) diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.js b/app/soapbox/features/crypto_donate/components/crypto_address.js index 279b1c2cfc8b21ee1897ec1814c11f25e013352c..d3f6c3301d35e18248a5ac114f51c5b717c34ad2 100644 GIT binary patch delta 25 gcmeyw|Brve2{s;u;>_HFoYeTV{G!~=C)l(Y0gRIh0ssI2 delta 12 Tcmeyz|A~LY3AW8w*t8e{DCPx4 diff --git a/app/styles/components/crypto-donate.scss b/app/styles/components/crypto-donate.scss index 11ef3867a0..95857df690 100644 --- a/app/styles/components/crypto-donate.scss +++ b/app/styles/components/crypto-donate.scss @@ -41,9 +41,21 @@ &__address { margin-top: auto; display: flex; + align-items: center; + justify-content: center; input { flex: 1; + font-size: 14px !important; + border-radius: 4px 0 0 4px !important; + } + + button { + width: auto; + font-size: 14px; + margin: 0; + padding-bottom: 9px; + border-radius: 0 4px 4px 0; } } } From 39ee6505d8b332eb9537507942c3f3ab223de018 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 9 Jun 2021 19:28:16 -0500 Subject: [PATCH 08/10] CryptoDonate: add CryptoDonateModal --- .../components/crypto_address.js | Bin 2046 -> 2377 bytes .../components/detailed_crypto_address.js | Bin 0 -> 2240 bytes .../ui/components/crypto_donate_modal.js | Bin 0 -> 542 bytes .../features/ui/components/modal_root.js | Bin 2868 -> 2997 bytes app/styles/components/crypto-donate.scss | 16 +++++++++++++++- 5 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 app/soapbox/features/crypto_donate/components/detailed_crypto_address.js create mode 100644 app/soapbox/features/ui/components/crypto_donate_modal.js diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.js b/app/soapbox/features/crypto_donate/components/crypto_address.js index d3f6c3301d35e18248a5ac114f51c5b717c34ad2..3d6966af8b6c8d04baa495ad2c576ca258e85eca 100644 GIT binary patch delta 302 zcmeyze^O|Il5Dj?a(-T3YI2D}twLH+ey)OgQEFmxiEdG9N@>MLiC9L1%-n+fq7sE_ zh5UllJm373#2mQN;{3#dr2GnfpoYx+ykh-aknH3l#sl0AP*XKDxi%Xy&19_4NX$#g zNd;?n&dE&9RFsOC}tf|88PV!eW*{DNY=l+5CS#FFF;4Y+k0>drxt0U`eJ zF8+RwA+G8=NXj)et-%JQ0(GaBrRJ5mq^2d7=9FlF#cR2Ml0~U`DXE(;Fmo|6s!#T3 p7t=;KqSg+q8RP;8u<-=CTOl*WR=uz&IX@+JvK*Vj<_oNPOaNe)VW|KB delta 29 lcmX>p^pAgn(nil<#>wXy_imofG?Q`jDi(gG&8qAwOaQdu3T6NR diff --git a/app/soapbox/features/crypto_donate/components/detailed_crypto_address.js b/app/soapbox/features/crypto_donate/components/detailed_crypto_address.js new file mode 100644 index 0000000000000000000000000000000000000000..70a5888903b52e4f9c04b4939b6c39a16abe889e GIT binary patch literal 2240 zcmb7F!H(ND5WV{=CYMMCY&q9-twmd>0rrq0aoba|5NK)aWtSoqk_x;K^zRu`q$PQg z-P9LZ;^Xkmn>RyVH%eRBBP%T&wW=Y}?tgN#;KNb}rIHe9xt{{o8msm^!ai%&{QcCR z3804F*VcU)F?V&{T6Pflxz)H+6knp89lPccvTg{oE+c3R(!ociYi2E0pU@a~!Yg82 zS~0@!h<%`B6l)IZytxE58&0bu_RD^!Dh%kax}=xvN{xe1<>MdcMktLs=9*=j)^cGs zezm~3oc(8};dhG555I@-mpvtYEvm!FqJtA!hxOE>=ySZ|?Sx&pr*#`5r+>7798$~6 zN7O4|Ri#O#CFHlzEx^^1@D}SvFpGqoC-m>I@BW6M{0Qlrh+Kk3+iH@M34?Aqyhi{D zMIlQ}lP;XuC*$!qi=N1mFwSfh9$70a{7Ph;vC`$D6wDa-fR=HA)lNS(R{b_m2RvJp zm4P3)r&|yiV;M0AXS%_Jxz842{=dM*pP8|m%Tvb99>2DnY`mfX07K?K0hG$(bC?U# zdn#z}WYgL`9!cIZ3Qq?-aFcPjDd6Pdh+%tK?^xX>HyWcWIsZ`n4)Q1_Kv81l7iBOu9L?|IhV5zAD zsMBSTb+AzvCWwjvY35%F{`5RL6X}L?0;{kJAfQxX6X`p1`isK zc{eFb50+_4CQpikVDj;53vKd)j8}Q$T3Jgb)`Ammo*>~iY?k0W>D>hFoDVx9xoJie6Yc1V{KWv1e@I4Po`awiCbmQe}JoVEGQP5|1u`Bb? lU`3@Q-7(n^H4Oc5W#@?-cvlYCZU&0u5i=zxFL5sQi|-1;)T#gg literal 0 HcmV?d00001 diff --git a/app/soapbox/features/ui/components/crypto_donate_modal.js b/app/soapbox/features/ui/components/crypto_donate_modal.js new file mode 100644 index 0000000000000000000000000000000000000000..90ae87842fe4f52fc1da346a0f52010f80dbb3c7 GIT binary patch literal 542 zcma)3O;5ux487-9_|{FL>78vzXuE=@iF*|q52Ce6aXhqX+JDDMIyk_Aoc!_po}c4} zF%ZKJO~OyQcHV;n7;cc*DnF#@BFa z_GtJh^`^_9)&_4Fn=XiqN6)db6H7ZGOyLn3g{Qox#l1Q93|()8zo>08&r`6b2Rt!) z8;c#i6}k0|9xh4&L^kX?NFIu(mDEArq;(J9c6DTO{!P2M!;hmQw09XP^9Q7V0DWNm z4ND|faRflJD$;B|Z9pjJ@i5CG088sWi_d2>;Hnyu!J0zgw#_k=E7j$Wb*@zp)3nV0 e{U;Z#HNU&4(+T1gn%l&(5y6to7imYOuIdY{7P#yH literal 0 HcmV?d00001 diff --git a/app/soapbox/features/ui/components/modal_root.js b/app/soapbox/features/ui/components/modal_root.js index b6cfa573721e3fa7341316562d2026e6109f8c1c..b3f7f8681e38cfd101f7790507d36fbb2a6bc426 100644 GIT binary patch delta 98 zcmdlYwpDz?8YaEW+=Bd~5(Vd?%7T)7m;AiMl2qUPl*Al`w4(f61$90BWUx$p3Rr6M mVx}}^0R;th=b*@d5dU}=e?P|%*U2APRCth0*!-W>lobH{M Date: Wed, 9 Jun 2021 19:49:53 -0500 Subject: [PATCH 09/10] CryptoDonate: refactor duplicated code --- .../components/crypto_address.js | Bin 2377 -> 1788 bytes .../components/detailed_crypto_address.js | Bin 2240 -> 1651 bytes .../crypto_donate/utils/block_explorer.js | Bin 0 -> 233 bytes app/soapbox/features/forms/index.js | Bin 5906 -> 6616 bytes app/styles/components/crypto-donate.scss | 17 --------------- app/styles/forms.scss | 20 ++++++++++++++++++ 6 files changed, 20 insertions(+), 17 deletions(-) create mode 100644 app/soapbox/features/crypto_donate/utils/block_explorer.js diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.js b/app/soapbox/features/crypto_donate/components/crypto_address.js index 3d6966af8b6c8d04baa495ad2c576ca258e85eca..76ccbefa6ac4e48e93ac47e492d3de2e82142b20 100644 GIT binary patch delta 152 zcmX>p^oMuCril-ACVMir1!m?JxA>7w0Dy zB;{A=r==#Aloq8H>!;-xSftoovD>3IK)TH~0Vm delta 673 zcmZWnziQkt7^i7+(1R=;I)n~ihawxUzD$AQ^DRdU9YP_YQz(Zbf4(@8B_n-?I}Vdq zXnHS^p;Nne?-oiPAWx7d=upXLr&ppuApL&d?+?fHj}6C?zL!%>P|a)^nd@N6j+`UUke63{qtjWL#SG zus;vnMaPH?I!%EATehY(`{y6`>(%X(yGx7oL6sF9Vdl(57Yl&SavS9y^7r1L?z`=b zt5o7dmy3yXl^o_mud8$k9|pUOu^-%2j4VnN6om1|#|RxaV6N2>S2GOu2k_Rfu$4)* zs0vgR;T*+87llg{FyRuhF#hpvYiB!H$2OQH%cjOg$r@-;V!{aL#8y9hFP{O7PAej< zR`*Z$def;_T8(#J6b~iqag)+_@N4ww|Kw@HgjtlNr>R!%9it`=q?qwaQv1yk<`o$X NH|0jd*8HY7_zTPTg_?c(Iril;zC+9E*2WI9LxA>7w0Dy zB;{A=r==#Aloq8H>!;-x=7?Y+LL`Mq43pV+FKcFJmYH|qj$=6l ze}Lisf`zrV78a@f9rhNsnb{A$BvTCRJkR@l%+8S)!0JMCT&qgPsu?beaMKw&+Z2_TN7q)T_%ozn2#2r79~r#LStCJ{AC-&CJt!X575QogRhi$@d$p@MyW{Fl=Wi}+(}aM%nl_o>1=5Jm=!i( yXqa3r6wUwH%Qsht?1Q>?U<>3Q2+^l#p%#i%z#T~ajw literal 0 HcmV?d00001 diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index d73e428dc0ae795a65cb66f9136735b69ff40d74..7a481d21120c684630589c31c418245dee0bfac3 100644 GIT binary patch delta 565 zcmZWm%}T>S5WaW{;tzto2u=^ODb!T(ByD;r2p+st@V?zl+R$XTWGA&Hgua59hw$th zh)?0;xVvp>i+k8*XXg99nQuOV-~0FCri4e8XPgM5XVjXH5h{ptl>y6<3%X4trC-y} z%PY^r#Z2V{BIR1cK+TqXl;V?|6;z*J^y{Cq#;WZBRGzsslFJM+h7bgVeJD*BfF_9! z5(~2N?zVoyWt5^N9i)kvnjG#hNeq5-2W&x(ROGU2h4vYPSB)tO@>`boAY=M@ak)gv zA(vzH@7nNSkEwOVkrG9Qk^)?y7^o~W9r;X{j#%A1ZXV5fTGZbsje2-`y|Q6Dy|Kqk z!upQEO7_;Hv+$I3TQdQkP$A3f#t)nbWa7HJ&I95q$DWmtl01z81yEl)ec}( t|1B|zLKd6N>cC9^5yreoX|v;yS*O{7YG*CGrR{a1WWN45H_cWn?+@V1vVZ^p delta 10 Rcmca%JV|dt>Bc2<#Q+ Date: Wed, 9 Jun 2021 20:36:02 -0500 Subject: [PATCH 10/10] CryptoDonate: parse Profile Fields as CrypoAddresses --- .../components/crypto_address.js | Bin 1788 -> 1829 bytes .../components/detailed_crypto_address.js | Bin 1651 -> 1692 bytes app/soapbox/features/forms/index.js | Bin 6616 -> 6625 bytes .../ui/components/profile_info_panel.js | Bin 6638 -> 7105 bytes app/styles/components/crypto-donate.scss | 6 ++++++ 5 files changed, 6 insertions(+) diff --git a/app/soapbox/features/crypto_donate/components/crypto_address.js b/app/soapbox/features/crypto_donate/components/crypto_address.js index 76ccbefa6ac4e48e93ac47e492d3de2e82142b20..b2498101c23a389682d76c153f7b2c1e22526f8a 100644 GIT binary patch delta 67 zcmeyvyOeLkTNX)$ni_?Y%;fCUBE6FQ(1L>0BIm^7R1MAA$?I7RC(E-o@mHr-6y)R= Xr51%21aun3mCU0U%VyWd)P?&syRbsO~s|zCl?gkkB delta 34 qcmbQk`1tS2>#R|9p diff --git a/app/soapbox/features/forms/index.js b/app/soapbox/features/forms/index.js index 7a481d21120c684630589c31c418245dee0bfac3..0ad1f361dce910e8bfa2af34d280c2a461065420 100644 GIT binary patch delta 20 bcmca%{LpxVu_Q-PYGR6iUQXp?Bgtg|R?7$G delta 11 ScmaE8e8YHyvE*bM$)x}vIs~Zz diff --git a/app/soapbox/features/ui/components/profile_info_panel.js b/app/soapbox/features/ui/components/profile_info_panel.js index 4af0d84c435c5e0314b87c08ee0392e28b9a0894..cb8a7ed760408e6f63d30a1a43cadcc4871991ea 100644 GIT binary patch delta 499 zcmZXQ-%0{O7{$?uz@R``>#mOoW+&7|yoj#iO(BRAg=