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.

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

Add cancel modal on cancelling grants #2995

Merged
merged 3 commits into from
Nov 30, 2018

Conversation

SaptakS
Copy link
Contributor

@SaptakS SaptakS commented Nov 29, 2018

Description

Adds cancel modal based on the design by @willsputra

screen shot 2018-11-29 at 7 14 00 pm

Checklist
  • linter status: 100% pass
  • changes don't break existing behavior
  • commit message follows commit guidelines
Affected core subsystem(s)
Testing
Refers/Fixes

@codecov
Copy link

codecov bot commented Nov 29, 2018

Codecov Report

Merging #2995 into grantz will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           grantz   #2995      +/-   ##
=========================================
- Coverage   30.21%   30.2%   -0.02%     
=========================================
  Files         190     190              
  Lines       14264   14225      -39     
  Branches     1881    1872       -9     
=========================================
- Hits         4310    4296      -14     
+ Misses       9815    9791      -24     
+ Partials      139     138       -1
Impacted Files Coverage Δ
app/dashboard/embed.py 28.16% <0%> (-3.45%) ⬇️
app/grants/models.py 92.68% <0%> (-0.5%) ⬇️
app/grants/views.py 16.75% <0%> (+0.75%) ⬆️
app/kudos/views.py 21.94% <0%> (+0.79%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7218ef5...99c18db. Read the comment docs.

@mbeacom mbeacom added frontend This needs frontend expertise. Gitcoin Grants Gitcoin Grants labels Nov 29, 2018
@mbeacom mbeacom requested review from a team November 29, 2018 14:01
@thelostone-mc
Copy link
Member

thelostone-mc commented Nov 29, 2018

@SaptakS conflicts :trollface:
Also can we remove the shadow / add the shadow to both the buttons ? :P

@mbeacom mbeacom changed the title Add cancel modal on cancelling grants [WOC] Add cancel modal on cancelling grants Nov 29, 2018
Copy link
Contributor

@octavioamu octavioamu left a comment

Choose a reason for hiding this comment

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

Nice! I left a comment.

@@ -70,6 +110,7 @@ $(document).ready(function() {
.send({from: accounts[0], gasPrice: 4000000000})
.on('transactionHash', function() {
document.issueURL = document.getElementById('grant-link').href;
$('.modal .close').trigger('click');
enableWaitState('#grants-details');
})
.on('confirmation', function(confirmationNumber, receipt) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Im worry about how we are doing this if someone decide to reload the page in the waitState we have some kind of mechanist to check if the grants is sync?

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 think this question is there in all the pages if someone refreshes at this stage. It will show the particular page instead of the waiting state. I think not related to this PR. But I will check on it.

Copy link
Contributor

Choose a reason for hiding this comment

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

yes yes agree is not related at all but yesterday was looking the cancel code and started to think about the closed grants in blockchain but not in our db

@SaptakS SaptakS force-pushed the cancel_modal_grants branch from 3d9f115 to 11d3ce4 Compare November 29, 2018 19:55
@mbeacom mbeacom changed the title [WOC] Add cancel modal on cancelling grants Add cancel modal on cancelling grants Nov 29, 2018
Copy link
Contributor

@captnseagraves captnseagraves left a comment

Choose a reason for hiding this comment

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

Can we hold on merging this until #3012 gets merged? Where the modal is fired and how the form is being submitted will change with the above PR.

@SaptakS
Copy link
Contributor Author

SaptakS commented Nov 30, 2018

@captnseagraves sure.

Copy link
Contributor

@mbeacom mbeacom left a comment

Choose a reason for hiding this comment

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

generally lgtm. we just need to resolve the conflict since the grant editing and cancellation changes went in.

@SaptakS SaptakS force-pushed the cancel_modal_grants branch from 11d3ce4 to 99c18db Compare November 30, 2018 18:32
@SaptakS
Copy link
Contributor Author

SaptakS commented Nov 30, 2018

@mbeacom @captnseagraves @thelostone-mc please have a look one last time. :)

@mbeacom mbeacom merged commit 14a3c8e into gitcoinco:grantz Nov 30, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
frontend This needs frontend expertise. Gitcoin Grants Gitcoin Grants
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants