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

feat: update grants landing page #5637

Merged
merged 2 commits into from
Dec 16, 2019
Merged

Conversation

thelostone-mc
Copy link
Member

@thelostone-mc thelostone-mc commented Dec 14, 2019

Description
  • new field added to grant model -> grant_type
  • new field added to pledge model -> pledge_type
  • admin view for tips + pledges + grants updated tabular
  • view updated to distinguish between grant types
  • fixed buggy search + shareable URI with filters
Refers/Fixes
Testing

DEMO: https://share.vidyard.com/watch/ZhWopgeHmmTrxd5G46vhD6?

ADMIN TABULAR

Screenshot 2019-12-14 at 1 12 38 PM

image

image

- new field added to grant model -> grant_type
- new field added to pledge model -> pledge_type
- admin view for tips + pledges + grants updated tabular
- view updated to distinguish between grant types
- fixed buggy search + shareable URI with filters
@codecov
Copy link

codecov bot commented Dec 14, 2019

Codecov Report

Merging #5637 into master will increase coverage by 0.03%.
The diff coverage is 35%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #5637      +/-   ##
=========================================
+ Coverage   30.06%   30.1%   +0.03%     
=========================================
  Files         248     248              
  Lines       21380   21395      +15     
  Branches     3102    3103       +1     
=========================================
+ Hits         6427    6440      +13     
- Misses      14677   14679       +2     
  Partials      276     276
Impacted Files Coverage Δ
app/retail/views.py 27.76% <ø> (+0.08%) ⬆️
app/grants/views.py 15.14% <0%> (-0.34%) ⬇️
app/grants/models.py 61.9% <100%> (+0.38%) ⬆️
app/grants/admin.py 44.7% <100%> (+1.33%) ⬆️
app/dashboard/admin.py 63.97% <100%> (+0.13%) ⬆️
app/dashboard/embed.py 31.6% <0%> (+3.44%) ⬆️

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 e47d0e9...51237dc. Read the comment docs.

Copy link
Contributor

@danlipert danlipert left a comment

Choose a reason for hiding this comment

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

Approved with some minor comments - nice job!

app/grants/views.py Outdated Show resolved Hide resolved
app/grants/views.py Outdated Show resolved Hide resolved
app/retail/views.py Show resolved Hide resolved
@@ -110,6 +125,12 @@ def grants(request):
if grant_stats.exists():
grant_amount = grant_stats.first().val / 1000
Copy link
Contributor

Choose a reason for hiding this comment

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

maybe do the formatting to the $x k amount in the frontend instead of here? Just thinking if someone else tries to use this context var they might be confused... probably doesn't matter either way though.... what do you think?

app/assets/v2/css/grants/grant.css Outdated Show resolved Hide resolved
app/assets/v2/css/grants/grant.css Outdated Show resolved Hide resolved
app/grants/templates/grants/index.html Show resolved Hide resolved
@thelostone-mc thelostone-mc merged commit 0d98e52 into gitcoinco:master Dec 16, 2019
@thelostone-mc thelostone-mc deleted the grant branch January 16, 2020 12:23
@thelostone-mc thelostone-mc restored the grant branch January 16, 2020 12:23
@thelostone-mc thelostone-mc deleted the grant branch January 16, 2020 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants