Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New bounty creation flow #10409

Merged
merged 5 commits into from
May 23, 2022
Merged

New bounty creation flow #10409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
849c2df
New bounty creation flow
May 18, 2022
9f138c5
Minor fixes: adressing comments from review
May 19, 2022
16831b5
Bug fixes:
May 19, 2022
7672d89
Adding forgotten vue template to new_bounty.html in hackathons
May 20, 2022
7e25aee
Displaying the funding orgs avatar for custom bounties
May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 20 additions & 136 deletions app/app/fixtures/economy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18939,7 +18939,7 @@
"symbol": "ETH",
"network": "mainnet",
"decimals": 18,
"priority": 999,
"priority": 1,
"metadata": {},
"approved": true
}
Expand Down Expand Up @@ -21449,21 +21449,6 @@
"approved": true
}
},
{
"model": "economy.token",
"pk": 171,
"fields": {
"created_on": "2018-12-26T17:00:13.244Z",
"modified_on": "2018-12-26T17:00:13.244Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "ropsten",
"decimals": 18,
"priority": 999,
"metadata": {},
"approved": true
}
},
{
"model": "economy.token",
"pk": 172,
Expand Down Expand Up @@ -21509,21 +21494,6 @@
"approved": true
}
},
{
"model": "economy.token",
"pk": 175,
"fields": {
"created_on": "2018-12-26T17:00:13.246Z",
"modified_on": "2018-12-26T17:00:13.246Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "rinkeby",
"decimals": 18,
"priority": 999,
"metadata": {},
"approved": true
}
},
{
"model": "economy.token",
"pk": 176,
Expand Down Expand Up @@ -21554,21 +21524,6 @@
"approved": true
}
},
{
"model": "economy.token",
"pk": 178,
"fields": {
"created_on": "2018-12-26T17:00:13.249Z",
"modified_on": "2018-12-26T17:00:13.249Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "custom",
"decimals": 18,
"priority": 999,
"metadata": {},
"approved": true
}
},
{
"model": "economy.token",
"pk": 179,
Expand All @@ -21584,21 +21539,6 @@
"approved": true
}
},
{
"model": "economy.token",
"pk": 180,
"fields": {
"created_on": "2018-12-26T17:00:13.251Z",
"modified_on": "2018-12-26T17:00:13.251Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "unknown",
"decimals": 18,
"priority": 999,
"metadata": {},
"approved": true
}
},
{
"model": "economy.token",
"pk": 181,
Expand Down Expand Up @@ -21629,21 +21569,6 @@
"approved": true
}
},
{
"model": "economy.token",
"pk": 183,
"fields": {
"created_on": "2018-12-26T18:45:52.084Z",
"modified_on": "2018-12-26T18:45:52.084Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "mainnet",
"decimals": 18,
"priority": 999,
"metadata": {},
"approved": true
}
},
{
"model": "economy.token",
"pk": 184,
Expand Down Expand Up @@ -24149,21 +24074,6 @@
"approved": true
}
},
{
"model": "economy.token",
"pk": 351,
"fields": {
"created_on": "2018-12-26T18:45:52.213Z",
"modified_on": "2018-12-26T18:45:52.213Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "ropsten",
"decimals": 18,
"priority": 999,
"metadata": {},
"approved": true
}
},
{
"model": "economy.token",
"pk": 352,
Expand Down Expand Up @@ -24209,21 +24119,6 @@
"approved": true
}
},
{
"model": "economy.token",
"pk": 355,
"fields": {
"created_on": "2018-12-26T18:45:52.216Z",
"modified_on": "2018-12-26T18:45:52.216Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "rinkeby",
"decimals": 18,
"priority": 999,
"metadata": {},
"approved": true
}
},
{
"model": "economy.token",
"pk": 356,
Expand Down Expand Up @@ -24254,21 +24149,6 @@
"approved": true
}
},
{
"model": "economy.token",
"pk": 358,
"fields": {
"created_on": "2018-12-26T18:45:52.217Z",
"modified_on": "2018-12-26T18:45:52.217Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "custom",
"decimals": 18,
"priority": 999,
"metadata": {},
"approved": true
}
},
{
"model": "economy.token",
"pk": 359,
Expand All @@ -24284,21 +24164,6 @@
"approved": true
}
},
{
"model": "economy.token",
"pk": 360,
"fields": {
"created_on": "2018-12-26T18:45:52.219Z",
"modified_on": "2018-12-26T18:45:52.219Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "unknown",
"decimals": 18,
"priority": 999,
"metadata": {},
"approved": true
}
},
{
"model": "economy.token",
"pk": 361,
Expand Down Expand Up @@ -24525,5 +24390,24 @@
"conversion_rate_id": "harmony",
"conversion_rate_source": "coingecko"
}
},
{
"model": "economy.token",
"pk": 374,
"fields": {
"created_on": "2022-04-22T12:35:27Z",
"modified_on": "2022-04-22T12:36:06.267Z",
"address": "0x0000000000000000000000000000000000000000",
"symbol": "ETH",
"network": "testnetrpc",
"decimals": 18,
"priority": 1,
"chain_id": 1,
"network_id": 1,
"metadata": {},
"approved": true,
"conversion_rate_id": null,
"conversion_rate_source": null
}
}
]
5 changes: 5 additions & 0 deletions app/app/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,9 @@
),

# View Bounty
# TODO: The 2 URLs below issue_details_new2 and issue_details_new3 will not be used any more (we should not create such
# links any more), and can be removed in the future. We are keeping these for now to avoid breaking the
# existing links that users might have saved already.
url(
r'^issue/(?P<ghuser>.*)/(?P<ghrepo>.*)/(?P<ghissue>.*)/(?P<stdbounties_id>.*)',
dashboard.views.bounty_details,
Expand All @@ -454,6 +457,7 @@
name='issue_details_new2'
),
re_path(r'^funding/details/?', dashboard.views.bounty_details, name='funding_details'),
re_path(r'^issue/(?P<bounty_id>\d+)', dashboard.views.bounty_details, name='issue_details_new4'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couldn't we remove the old ones issue_details_new2 / is that still needed ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not remove this now, see my comment above.

re_path(r'^issue/(?P<invitecode>.*)', dashboard.views.bounty_invite_url, name='unique_bounty_invite'),

# Tips
Expand Down Expand Up @@ -513,6 +517,7 @@
url(r'^sync/web3/?', dashboard.views.sync_web3, name='sync_web3'),
url(r'^sync/get_amount/?', dashboard.helpers.amount, name='helpers_amount'),
re_path(r'^sync/get_issue_details/?', dashboard.helpers.issue_details, name='helpers_issue_details'),
re_path(r'^sync/validate_org_url/?', dashboard.helpers.validate_org_url, name='helpers_validate_org_url'),

# modals
re_path(r'^modal/get_quickstart_video/?', dashboard.views.get_quickstart_video, name='get_quickstart_video'),
Expand Down
19 changes: 18 additions & 1 deletion app/assets/v2/js/data-chains.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,7 +1449,24 @@ var dataChains =
"shortName": "hmy-b-s3",
"chainId": 1666700003,
"networkId": 1666700003
}
},
{ // Creating a testnet entry, with the ID 1111111111, such that it is possible to use testnet when running integration tests for payments
"name": "Ethereum Testnet RPC",
"chainId": 1111111111,
"shortName": "rpc",
"chain": "ETH",
"network": "testnetrpc",
"networkId": 1111111111,
"nativeCurrency": {
"name": "Testnet Ether",
"symbol": "ETH",
"decimals": 18
},
"rpc": [
],
"faucets": [
],
},
];

function searchDataChains(name, obj) {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/js/grants/form_wrapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Vue.component('form-wrapper', {
'total-steps': {
type: Number, required: true
},
disableConfirm: {
'disable-confirm': {
type: Boolean,
'default': false
},
Expand Down
13 changes: 0 additions & 13 deletions app/assets/v2/js/pages/bounty_details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,19 +333,6 @@ var callbacks = {
);

}

$('#value_in_usdt').html(Math.round(totalUSDValue));

$('#value_in_usdt_wrapper').attr('title',
'<div class="tooltip-info tooltip-sm">' +
'<p class="text-highlight-gc-purple">How did we calculate this?</p>' +
'<div style="float:left; text-align:left;">' +
leftHtml +
'</div><div style="margin-left: .5rem; float:right; text-align:left;">' +
rightHtml +
'</div></div>'
);

return [ key, val ];
},
'token_value_time_peg': function(key, val, result) {
Expand Down
Loading