diff --git a/app/assets/onepager/css/main.css b/app/assets/onepager/css/main.css index f5a9f9f115c..139e80ef99f 100644 --- a/app/assets/onepager/css/main.css +++ b/app/assets/onepager/css/main.css @@ -327,7 +327,7 @@ input[type='checkbox']:checked + label::before, input[type='radio']:checked + label::before { color: #ff7496; content: '\f00c'; - font-family: "Font Awesome 5 free", sans-serif; + font-family: "Font Awesome 5 Pro", sans-serif; font-weight: 900; } diff --git a/app/assets/v2/css/bounty.css b/app/assets/v2/css/bounty.css index 25fad1b6277..c7f86df8925 100644 --- a/app/assets/v2/css/bounty.css +++ b/app/assets/v2/css/bounty.css @@ -761,6 +761,10 @@ a.btn { margin: 0; } +.bounty_details .tooltip-inner { + max-width: 500px !important; +} + @media (max-width: 575.98px) { #timer { diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css index 2222392f368..59d54c52888 100644 --- a/app/assets/v2/css/gitcoin.css +++ b/app/assets/v2/css/gitcoin.css @@ -546,13 +546,15 @@ div.button-pink { .accordion:after { /* stylelint-disable-next-line */ - font-family: 'Font Awesome 5 Free'; + font-family: 'Font Awesome 5 Pro'; content: '\f107'; - font-size: 1.2em; + font-size: 1em; margin-right: auto; margin-top: auto; float: right; font-weight: 600; + top: 1px; + position: relative; } .accordion.active:after { diff --git a/app/assets/v2/js/pages/bounty_details2.js b/app/assets/v2/js/pages/bounty_details2.js index 2471ca03462..c696a2b2969 100644 --- a/app/assets/v2/js/pages/bounty_details2.js +++ b/app/assets/v2/js/pages/bounty_details2.js @@ -9,7 +9,6 @@ const loadingState = { }; document.result = bounty; -// listen_for_web3_changes(); Vue.mixin({ methods: { @@ -44,6 +43,73 @@ Vue.mixin({ _alert('Error fetching bounties. Please contact founders@gitcoin.co', 'error'); }); }, + getTransactionURL: function(token_name, txn) { + let url; + + switch (token_name) { + case 'ETC': + url = `https://blockscout.com/etc/mainnet/tx/${txn}`; + break; + + case 'cUSD': + case 'cGLD': + url = `https://alfajores-blockscout.celo-testnet.org/tx/${txn}`; + break; + + case 'ZIL': + url = `https://viewblock.io/zilliqa/tx/${txn}`; + break; + + default: + url = `https://etherscan.io/tx/${txn}`; + + } + return url; + }, + getAddressURL: function(token_name, address) { + let url; + + switch (token_name) { + case 'ETC': + url = `https://blockscout.com/etc/mainnet/address/${address}`; + break; + + case 'cUSD': + case 'cGLD': + url = `https://alfajores-blockscout.celo-testnet.org/address/${address}`; + break; + + case 'ZIL': + url = `https://viewblock.io/zilliqa/address/${address}`; + break; + + default: + url = `https://etherscan.io/address/${address}`; + } + return url; + }, + getQRString: function(token_name, address) { + let qr_string; + + switch (token_name) { + case 'ETC': + qr_string = `ethereum:${address}`; + break; + + case 'cUSD': + case 'cGLD': + // TOOD : UPDATE + qr_string = `ethereum:${address}`; + break; + + case 'ZIL': + // TOOD : UPDATE + qr_string = `ethereum:${address}`; + break; + } + + return qr_string; + }, syncBounty: function() { let vm = this; @@ -272,15 +338,6 @@ Vue.mixin({ } document.location.href = `${vm.bounty.url}?snooze=${text}`; }, - overrideStatus: function() { - let vm = this; - let text = window.prompt('What new status (valid choices: "open", "started", "submitted", "done", "expired", "cancelled", "" to remove override )?', ''); - - if (text === null) { - return; - } - document.location.href = `${vm.bounty.url}?admin_override_satatus=${text}`; - }, hasAcceptedFulfillments: function() { let vm = this; @@ -370,13 +427,6 @@ Vue.mixin({ activities.forEach(activity => { if (activity.metadata) { if (activity.metadata.new_bounty) { - // ETH - activity.metadata.new_bounty['token_value'] = activity.metadata.new_bounty.value_in_token / 10 ** decimals; - if (activity.metadata.old_bounty) { - activity.metadata.old_bounty['token_value'] = activity.metadata.old_bounty.value_in_token / 10 ** decimals; - } - } else { - // cross-chain activity.metadata['token_value'] = activity.metadata.value_in_token / 10 ** decimals; } } @@ -502,7 +552,6 @@ var extend_expiration = function(bounty_pk, data) { }; var show_interest_modal = function() { - var self = this; var modals = $('#modalInterest'); let modalBody = $('#modalInterest .modal-content'); let modalUrl = `/interest/modal?redirect=${window.location.pathname}&pk=${document.result['pk']}`; @@ -529,9 +578,6 @@ var show_interest_modal = function() { discord_username: $('#discord_username').length ? $('#discord_username').val() : null }).then(success => { if (success) { - // $(self).attr('href', '/uninterested'); - // $(self).find('span').text(gettext('Stop Work')); - // $(self).parent().attr('title', '
' + gettext('Notify the funder that you will not be working on this project') + '
'); appBounty.fetchBounty(); modals.bootstrapModal('hide'); @@ -579,17 +625,4 @@ const promisify = (inner) => resolve(res); } }) - ); - -// async function waitBlock(txid) { -// while (true) { -// let receipt = web3.eth.getTransactionReceipt(txid); -// if (receipt && receipt.contractAddress) { -// console.log("Your contract has been deployed at http://testnet.etherscan.io/address/" + receipt.contractAddress); -// console.log("Note that it might take 30 - 90 sceonds for the block to propagate befor it's visible in etherscan.io"); -// break; -// } -// console.log("Waiting a mined block to include your contract... currently in block " + web3.eth.blockNumber); -// await sleep(4000); -// } -// } + ); \ No newline at end of file diff --git a/app/dashboard/templates/bounty/details2.html b/app/dashboard/templates/bounty/details2.html index bfc96079abc..4cbc48ef361 100644 --- a/app/dashboard/templates/bounty/details2.html +++ b/app/dashboard/templates/bounty/details2.html @@ -38,7 +38,6 @@ [[ link.label ]] -
{% if event_tag %} @@ -273,7 +272,7 @@
{% trans "SUBMISSIONS" %}
[[ fulfillment.profile.handle ]]
- [[ fulfillment.fulfiller_address | truncateHash ]] + [[ fulfillment.fulfiller_address | truncateHash ]] @@ -291,7 +290,7 @@
{% trans "SUBMISSIONS" %}
Bounty Paid

- ([[ fulfillment.payout_tx_id | truncateHash ]]) + ([[ fulfillment.payout_tx_id | truncateHash ]]) @@ -303,16 +302,26 @@

{% trans "SUBMISSIONS" %}
Pending Verification

- ([[ fulfillment.payout_tx_id | truncateHash ]]) + ([[ fulfillment.payout_tx_id | truncateHash ]])

- + +