Feature/convert2grant #7359

sanchaymittal · 2020-09-11T16:58:02Z

Description

Convert to Grant feature

Video: https://www.loom.com/share/abe0eb4176e34b599442b2fcdd733b11

New Winner Tag before it was a ribbon
New Grant Tag
Filters at sidebar allow the listing of project converted to grants.
The position change of edit button

Owner of the project can convert the project to grant
project-id is passed as an optional param with URL, preloaded the fields in grant page.

The project owner can visit grant page to edit it

The user visiting the project can jump onto the grant page to donate.

Tribe Project tab is also updated to show the filters and tag of winner and grant.

Refers/Fixes

#7098

Testing

codecov · 2020-09-11T17:04:45Z

Codecov Report

Merging #7359 into master will decrease coverage by 0.00%.
The diff coverage is 28.57%.

@@            Coverage Diff             @@
##           master    #7359      +/-   ##
==========================================
- Coverage   26.41%   26.40%   -0.01%     
==========================================
  Files         306      306              
  Lines       30136    30157      +21     
  Branches     4455     4460       +5     
==========================================
+ Hits         7959     7964       +5     
- Misses      21902    21923      +21     
+ Partials      275      270       -5

Impacted Files	Coverage Δ
app/app/context.py	`0.00% <0.00%> (ø)`
app/grants/urls.py	`100.00% <ø> (ø)`
app/dashboard/views.py	`10.54% <18.18%> (+0.03%)`	⬆️
app/grants/views.py	`15.50% <27.27%> (+0.06%)`	⬆️
app/dashboard/router.py	`40.11% <33.33%> (-0.23%)`	⬇️
app/dashboard/admin.py	`60.92% <100.00%> (ø)`
app/dashboard/models.py	`49.86% <100.00%> (+0.01%)`	⬆️
app/quests/views.py	`16.22% <0.00%> (ø)`
...rketing/management/commands/no_applicants_email.py	`0.00% <0.00%> (ø)`
... and 1 more

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 55c416b...799f200. Read the comment docs.

app/grants/views.py

thelostone-mc

https://user-images.githubusercontent.com/19514207/87412921-2b78f800-c5fc-11ea-9509-91e40793edde.jpg

^ The screenshot don't match the design on the ticket
Padding / text align / button color and so on!

Could we keep the code as close to the design as possible.

PixelantDesign

Hi @sanchaymittal lets keep the existing winner banner where it is and move grants image to the left side. What does green Edit button do?

sanchaymittal · 2020-09-14T11:25:03Z

Hi @sanchaymittal lets keep the existing winner banner where it is and move grants image to the left side. What does green Edit button do?

But then it will overlap with the edit button if I move the grant tag to the left side. The green edit button is for the project owner to edit the project.

PixelantDesign · 2020-09-14T11:47:41Z

Just for context -convo w @sanchaymittal -- we'll keep it like this for now until @zoek1 builds project V2 when we will clean the card up as part of that push. @thelostone-mc @octavioamu

PixelantDesign · 2020-09-15T20:22:22Z

@sanchaymittal could you post a video or an ngrok tunnel so that we can play with the feature?

frankchen07 · 2020-09-16T16:04:26Z

yes, would like a video or live demo - that would be perfect!

sanchaymittal · 2020-09-17T07:39:36Z

yes, would like a video or live demo - that would be perfect!

Video demo: https://www.loom.com/share/abe0eb4176e34b599442b2fcdd733b11
I also have the ngrok pipeline setup, ping me on slack I will share it with you guys.

cc: @PixelantDesign

thelostone-mc · 2020-09-23T10:57:31Z

squash the migrations
get CI going
@frankchen07 / @PixelantDesign could you check + approve

Additioanlly calling out that
#7487 shifts the current grant creation form to a new form -> so the changes for that would have to be ported over as well ! not sure how we'd want to handle that

cc @sanchaymittal

thelostone-mc

Left a bunch of comments

app/dashboard/templates/dashboard/hackathon/project_page.html

app/grants/views.py

frankchen07 · 2020-09-24T14:30:42Z

how is a project denoted as a grant in our DB? is there a flag that tell us if it was converted to a grant, and when it occurs?

sanchaymittal · 2020-09-24T14:43:26Z

how is a project denoted as a grant in our DB? is there a flag that tell us if it was converted to a grant, and when it occurs?

A field is created in HackathonProject DB grant_link which is a foreign Key to Grant. Once a grant is created through convert2grant flow then it updates the field with grant object.

frankchen07 · 2020-09-24T15:50:31Z

got it, so when the grant is created via convert2grant flow, that means the created_on field in the grant object is essentially when the project -> grant, and we can find that by just joining the project model to the grants model via the foreign key?

if yes, then LGTM, we can track the outcome of this feature

sanchaymittal · 2020-09-24T18:09:41Z

got it, so when the grant is created via convert2grant flow, that means the created_on field in the grant object is essentially when the project -> grant, and we can find that by just joining the project model to the grants model via the foreign key?

if yes, then LGTM, we can track the outcome of this feature

Yes, when we create the grant we save the project object to the foreign key field.

thelostone-mc

left a few comments !

app/grants/templates/grants/new.html

app/dashboard/views.py

app/dashboard/models.py

app/dashboard/migrations/0151_auto_20200921_1510.py

octavioamu · 2020-10-05T15:08:56Z

PR is failing because migrations

- To share the project params with intra view functions

ordering of projects - winners, grants, created_on, id

- winner ribbon conflicting with grant tag. - fetch project_pk

- After making change to grant_link - API call to DB doesn't fetch the updates - if queried with filter then updated data is fetched only

- revert the changes done in last commit

- change the styling close to the design - rmv the unwanted logic

- padding change for ribbon tag to make it smaller - change the position of grant tag to left

app/dashboard/templates/dashboard/hackathon/project_page.html

thelostone-mc

Minor comment on indentation, otherwise LGTM
@sanchaymittal this is something I would your help as a follow up PR against zcash branch https://gitcoincore.slack.com/archives/G01CNNGMT3K/p1602241297000100

sanchaymittal · 2020-10-09T12:10:17Z

Minor comment on indentation, otherwise LGTM
@sanchaymittal this is something I would your help as a follow up PR against zcash branch gitcoincore.slack.com/archives/G01CNNGMT3K/p1602241297000100

Noted!

octavioamu

left a few comments. the rest seems looking good

app/grants/views.py

rnm: rename data to project_data

sanchaymittal marked this pull request as ready for review September 13, 2020 08:53

sanchaymittal requested review from danlipert, frankchen07, octavioamu, PixelantDesign and thelostone-mc as code owners September 13, 2020 08:53

thelostone-mc reviewed Sep 13, 2020

View reviewed changes

app/grants/views.py Outdated Show resolved Hide resolved

thelostone-mc requested changes Sep 13, 2020

View reviewed changes

PixelantDesign reviewed Sep 14, 2020

View reviewed changes

sanchaymittal requested a review from thelostone-mc September 22, 2020 03:57

thelostone-mc requested changes Sep 23, 2020

View reviewed changes

thelostone-mc reviewed Sep 30, 2020

View reviewed changes

app/grants/templates/grants/new.html Show resolved Hide resolved

app/dashboard/views.py Show resolved Hide resolved

app/dashboard/models.py Show resolved Hide resolved

app/dashboard/migrations/0151_auto_20200921_1510.py Outdated Show resolved Hide resolved

sanchaymittal force-pushed the feature/convert2grant branch from 8e17842 to 67a1e39 Compare October 1, 2020 00:20

sanchaymittal requested review from thelostone-mc and PixelantDesign October 5, 2020 10:02

PixelantDesign approved these changes Oct 5, 2020

View reviewed changes

frankchen07 approved these changes Oct 5, 2020

View reviewed changes

chg create common function for project data

8295862

- To share the project params with intra view functions

sanchaymittal added 15 commits October 7, 2020 17:54

Add: ordering of project based on grants

60c7d2f

ordering of projects - winners, grants, created_on, id

Add replace winner ribbon with tag

29f7ea5

- winner ribbon conflicting with grant tag. - fetch project_pk

chg: project-card with winner & grant tag for tribe

85d7c44

Add: grant & winner filter in tribe

420e31c

build fix

57e3d5d

chg: temp solution to update HackathonProject data

143c4c5

- After making change to grant_link - API call to DB doesn't fetch the updates - if queried with filter then updated data is fetched only

chg: grant link field change from url to char.

d567c3b

- revert the changes done in last commit

fix: requested changes

2998638

- change the styling close to the design - rmv the unwanted logic

chg: winner tag with the ribbon used prior

8f72132

- padding change for ribbon tag to make it smaller - change the position of grant tag to left

chg: grant_link from char to foriegn key grant

b1f5ba7

fix: requested changes

a8a1fea

fix: squash migrations

47b6fa7

fix: requested changes

6db4371

fix: fix indent & squash migrations.

036db4d

fix: migration file.

e384bc9

sanchaymittal force-pushed the feature/convert2grant branch from eb3a787 to e384bc9 Compare October 7, 2020 13:44

thelostone-mc reviewed Oct 9, 2020

View reviewed changes

app/dashboard/templates/dashboard/hackathon/project_page.html Show resolved Hide resolved

thelostone-mc approved these changes Oct 9, 2020

View reviewed changes

fix: indentation

ac98c75

thelostone-mc requested review from amustapha and chibie October 9, 2020 14:34

octavioamu suggested changes Oct 12, 2020

View reviewed changes

app/grants/views.py Outdated Show resolved Hide resolved

app/grants/views.py Outdated Show resolved Hide resolved

add: validation for covert to grant query

d9439e8

rnm: rename data to project_data

sanchaymittal requested a review from octavioamu October 13, 2020 08:20

octavioamu approved these changes Oct 14, 2020

View reviewed changes

thelostone-mc merged commit 2ccfbc4 into master Oct 14, 2020

amustapha mentioned this pull request Dec 18, 2020

Convert to Grant #8154

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/convert2grant #7359

Feature/convert2grant #7359

sanchaymittal commented Sep 11, 2020 •

edited

Loading

codecov bot commented Sep 11, 2020 •

edited

Loading

thelostone-mc left a comment

PixelantDesign left a comment

sanchaymittal commented Sep 14, 2020

PixelantDesign commented Sep 14, 2020

PixelantDesign commented Sep 15, 2020 •

edited

Loading

frankchen07 commented Sep 16, 2020

sanchaymittal commented Sep 17, 2020 •

edited

Loading

thelostone-mc commented Sep 23, 2020

thelostone-mc left a comment

frankchen07 commented Sep 24, 2020

sanchaymittal commented Sep 24, 2020

frankchen07 commented Sep 24, 2020 •

edited

Loading

sanchaymittal commented Sep 24, 2020

thelostone-mc left a comment

octavioamu commented Oct 5, 2020

thelostone-mc left a comment

sanchaymittal commented Oct 9, 2020

octavioamu left a comment

Feature/convert2grant #7359

Feature/convert2grant #7359

Conversation

sanchaymittal commented Sep 11, 2020 • edited Loading

Description

Refers/Fixes

Testing

codecov bot commented Sep 11, 2020 • edited Loading

Codecov Report

thelostone-mc left a comment

Choose a reason for hiding this comment

PixelantDesign left a comment

Choose a reason for hiding this comment

sanchaymittal commented Sep 14, 2020

PixelantDesign commented Sep 14, 2020

PixelantDesign commented Sep 15, 2020 • edited Loading

frankchen07 commented Sep 16, 2020

sanchaymittal commented Sep 17, 2020 • edited Loading

thelostone-mc commented Sep 23, 2020

thelostone-mc left a comment

Choose a reason for hiding this comment

frankchen07 commented Sep 24, 2020

sanchaymittal commented Sep 24, 2020

frankchen07 commented Sep 24, 2020 • edited Loading

sanchaymittal commented Sep 24, 2020

thelostone-mc left a comment

Choose a reason for hiding this comment

octavioamu commented Oct 5, 2020

thelostone-mc left a comment

Choose a reason for hiding this comment

sanchaymittal commented Oct 9, 2020

octavioamu left a comment

Choose a reason for hiding this comment

sanchaymittal commented Sep 11, 2020 •

edited

Loading

codecov bot commented Sep 11, 2020 •

edited

Loading

PixelantDesign commented Sep 15, 2020 •

edited

Loading

sanchaymittal commented Sep 17, 2020 •

edited

Loading

frankchen07 commented Sep 24, 2020 •

edited

Loading