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

Adjust new grants, fix grant details and cards for user details and logos #2399

Merged
merged 4 commits into from Oct 9, 2018

Conversation

mbeacom
Copy link
Contributor

@mbeacom mbeacom commented Oct 9, 2018

Description

The goal of this PR is to adjust the grant cards and details templates to use available admin profile avatars, usernames, and appropriate grant amount funded and received fields while also displaying the appropriate user provided logo assets.

Additionally, this PR adjusts some of the model and view logic while also introducing a GrantForm for future use over request.GET.get for form fields.

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

grants

Testing

Locally

Screenshots

screenshot 2018-10-09 15 07 50

screenshot 2018-10-09 15 27 11

Previously, no logo was displayed other than the placeholders for both grant logo and avatar image. No current_amount or needed amount was displayed in the cards or creator handle/avatar.

@mbeacom mbeacom added frontend This needs frontend expertise. backend This needs backend expertise. grants labels Oct 9, 2018
@mbeacom mbeacom self-assigned this Oct 9, 2018
@mbeacom mbeacom added this to In progress in Grants via automation Oct 9, 2018
@mbeacom mbeacom changed the base branch from master to grants October 9, 2018 19:06
@codecov
Copy link

codecov bot commented Oct 9, 2018

Codecov Report

Merging #2399 into grants will increase coverage by 0.07%.
The diff coverage is 40.81%.

Impacted file tree graph

@@            Coverage Diff             @@
##           grants    #2399      +/-   ##
==========================================
+ Coverage   27.98%   28.06%   +0.07%     
==========================================
  Files         145      147       +2     
  Lines       11508    11521      +13     
  Branches     1558     1554       -4     
==========================================
+ Hits         3221     3233      +12     
- Misses       8176     8177       +1     
  Partials      111      111
Impacted Files Coverage Δ
app/grants/forms.py 0% <0%> (ø)
app/grants/models.py 93.18% <100%> (+0.68%) ⬆️
app/grants/urls.py 100% <100%> (ø) ⬆️
app/grants/views.py 32.78% <29.62%> (+8.54%) ⬆️
app/grants/utils.py 57.14% <57.14%> (ø)

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 4712f6d...40271e8. Read the comment docs.

Grants automation moved this from In progress to Reviewer approved Oct 9, 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.

Looks good!

@mbeacom mbeacom merged commit 6a3c088 into grants Oct 9, 2018
Grants automation moved this from Reviewer approved to Done Oct 9, 2018
@mbeacom mbeacom deleted the grant-fix-logos-avatars-details branch October 9, 2018 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend This needs backend expertise. frontend This needs frontend expertise.
Projects
No open projects
Grants
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

2 participants