Email design update #746

jakerockland · 2018-03-30T01:54:52Z

Description

This PR is a current work in progress solution for updating the email templates as described in issue #563.

Checklist

linter status: 100% pass
changes don't break existing behavior
commit message follows commit guidelines

Affected core subsystem(s)

n/a?

Testing

I have only changed HTML/CSS for email templates (all Django templating has been left unchanged).

Refers/Fixes

Fixes: #563

Screenshots of Current Progress

codecov · 2018-03-30T02:00:30Z

Codecov Report

Merging #746 into master will decrease coverage by 0.05%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master     #746      +/-   ##
==========================================
- Coverage   33.97%   33.92%   -0.06%     
==========================================
  Files         101      101              
  Lines        5774     5784      +10     
  Branches      672      676       +4     
==========================================
  Hits         1962     1962              
- Misses       3733     3742       +9     
- Partials       79       80       +1

Impacted Files	Coverage Δ
app/app/urls.py	`93.33% <ø> (ø)`	⬆️
app/retail/emails.py	`24.02% <0%> (ø)`	⬆️
...eting/management/commands/bounty_feedback_email.py	`0% <0%> (ø)`	⬆️

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 f912f7d...519207d. Read the comment docs.

owocki · 2018-03-30T14:44:17Z

purdy excited about this.. what is still left TODO on this PR?

thelostone-mc · 2018-03-31T09:23:17Z

@jakerockland Could we

update the fonts to Muli ?
Make the title bold while the text normal
reduce the overall padding of the box, looks like we've got a lot of breathing space within the box
remove the fire emoji :P and update it with the number of newly funded issues
last but on least -> squash the commits

PS: Does this PR also update the Gitcoin weekly mail ?

jakerockland · 2018-03-31T23:18:00Z

@thelostone-mc sure thing, can take care of all of those things. I like to commit early and often so was waiting to squash commits until after the WIP is a bit more finalized. 😄Also I don't believe that this PR updates the Gitcoin weekly email (unless the weekly email uses template.html). The design file for the weekly email was included as a reference in #563 but it wasn't mentioned that it was part of the included changes so I wasn't sure if I was to look into addressing that with this PR.

@owocki only outstanding things are those listed above from @thelostone-mc (I wanted to start off with WIP PR to see if there were any other outstanding tweaks changes that anyone had in feedback) and also I still need to verify if new_tip and roundup pages look like they should. I saw and appreciate your feedback in #563 on verifying that but haven't had the chance to generate tip object in the DB (new to this stack/Django in general) and adjust parameters for roundup testing.

thelostone-mc · 2018-04-01T05:49:21Z

Ah other than that , everything else looks solid :D
Let's get this PR merged once everything is addressed \m/

owocki · 2018-04-02T21:40:52Z

screenshots of the tip / roundup emails:

owocki · 2018-04-02T21:42:02Z

@owocki only outstanding things are those listed above from @thelostone-mc (I wanted to start off with WIP PR to see if there were any other outstanding tweaks changes that anyone had in feedback)

makes sense to me!

also I still need to verify if new_tip and roundup pages look like they should. I saw and appreciate your feedback in #563 on verifying that but haven't had the chance to generate tip object in the DB (new to this stack/Django in general) and adjust parameters for roundup testing.

i posted some screenshots of this above. tip email looks okay. roundup email needs a little work though

thanks... looking forward to getting this to merge!

PixelantDesign · 2018-04-03T18:09:07Z

Looking good @jakerockland!

thelostone-mc · 2018-04-03T21:45:08Z

@owocki The redeem tip button!
Thoughts on putting it above the logo + make it a big fat button to grab the users attention ?

owocki · 2018-04-04T16:56:08Z

Thoughts on putting it above the logo + make it a big fat button to grab the users attention ?

I agree! @jakerockland can you make it so!?

roundup email needs a little work though

i think this could use another pass too. you can edit the source data in retail/emails.py if you are still having problems with the bounties not existing in your local DB

owocki · 2018-04-04T16:56:31Z

@jakerockland once we get the merge conflicts resolved and resolve the above issues im looking forward to merging this!

jakerockland · 2018-04-04T17:23:02Z

Yes yes! Sorry for the delay, I will wrap this up tomorrow or Friday at the very latest. Been a bit tied up! 😓😅

…

On Apr 4, 2018, 9:57 AM -0700, Kevin Owocki ***@***.***>, wrote: @jakerockland once we get the merge conflicts resolved im looking forward to merging this! — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

jakerockland · 2018-04-07T03:53:23Z

So I believe that this PR addresses almost all outstanding issues now except for one thing, on the single bounty page, are we sure we want to remove the fire emojis? From what I understand, that email currently will only ever have content for one bounty.

@owocki I was able to get things working with being able to effectively work on roundup and new_tip. Work on the roundup email is taking more time than I expected but should be able to finish things up tomorrow.

Fixes: gitcoinco#563

jakerockland · 2018-04-09T07:55:39Z

@thelostone-mc Is it possible to merge this with Githubs squash & merge feature? I'm having trouble squashing my commits now that I've pulled the upstream changes to resolve the merge conflicts from adding translation support.

Also I was able to cleanup the roundup email so I think this may be close to being ready to merge?

thelostone-mc · 2018-04-09T13:00:13Z

@jakerockland You won't have merge conflicts in this case but it's always good to rebase before getting the PR is merged!

That said, let's get this merged and celebrate 🍻

Squash dem commits

git rebase -i HEAD~10 # this will list last 10 commits
Leaving the first one , reword pick to f # this says squash(fixup) last 9 commits

git log and verify there is only one commit and check your changes
git push origin email-designs -f # will rewrite the history on github

Rebase with upstream :

git fetch upstream master
git rebase upstream master
git push origin email-designs -f

That should do the trick ^_^

mbeacom

lgtm. @owocki Are you good with this PR?

owocki · 2018-04-09T17:12:35Z

519207d <= there were some untested emails.. i just submitted some fixes for them here.. now i'm good with the merge

shipit!

jakerockland · 2018-04-09T17:35:18Z

@thelostone-mc So the problem is that there were previously merge conflicts with the master branch so I pulled the master branch into this branch to resolve those conflicts, but now when I try to rebase using the above method, the commit history includes all of the commits that were on master that I pulled into my branch, not just my commits onto this branch before pulling master in. 😓

mbeacom · 2018-04-09T17:48:45Z

@jakerockland Don't worry about rebasing this branch. I'll squash commits when I merge it.

jakerockland added 5 commits March 27, 2018 10:29

updated template.html to match updated design

297a82a

updated bounty.html to match template.html

04fe7f8

some responsiveness fixes

df56cfe

removed message before footer

deb0755

responsive design

84c6977

jakerockland mentioned this pull request Apr 2, 2018

Update Gitcoin Email Designs #563

Closed

PixelantDesign added the in progress label Apr 3, 2018

jakerockland added 2 commits April 6, 2018 20:05

updated new_tip and small suggested fixes

a10a919

progress on roundup

8cc55ce

jakerockland added 3 commits April 7, 2018 19:54

Updated email templates to match updated designs.

6a66ff2

Fixes: gitcoinco#563

fixed merge conflicts

037977c

resolved merge conflicts

5cee799

mbeacom approved these changes Apr 9, 2018

View reviewed changes

mbeacom added needs-testing labels Apr 9, 2018

mbeacom added the Gitcoin Emails Gitcoin Emails label Apr 9, 2018

mbeacom changed the title ~~WIP: Email design update~~ Email design update Apr 9, 2018

fixes for emails

519207d

mbeacom merged commit 0e22100 into gitcoinco:master Apr 9, 2018

mbeacom removed in progress labels Apr 9, 2018

jakerockland deleted the email-designs branch April 9, 2018 17:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Email design update #746

Email design update #746

jakerockland commented Mar 30, 2018 •

edited

Loading

codecov bot commented Mar 30, 2018 •

edited

Loading

owocki commented Mar 30, 2018

thelostone-mc commented Mar 31, 2018

jakerockland commented Mar 31, 2018

thelostone-mc commented Apr 1, 2018

owocki commented Apr 2, 2018

owocki commented Apr 2, 2018

PixelantDesign commented Apr 3, 2018

thelostone-mc commented Apr 3, 2018

owocki commented Apr 4, 2018 •

edited

Loading

owocki commented Apr 4, 2018 •

edited

Loading

jakerockland commented Apr 4, 2018 via email

jakerockland commented Apr 7, 2018 •

edited

Loading

jakerockland commented Apr 9, 2018

thelostone-mc commented Apr 9, 2018 •

edited

Loading

mbeacom left a comment

owocki commented Apr 9, 2018

jakerockland commented Apr 9, 2018

mbeacom commented Apr 9, 2018

Email design update #746

Email design update #746

Conversation

jakerockland commented Mar 30, 2018 • edited Loading

Description

Checklist

Affected core subsystem(s)

Testing

Refers/Fixes

Screenshots of Current Progress

codecov bot commented Mar 30, 2018 • edited Loading

Codecov Report

owocki commented Mar 30, 2018

thelostone-mc commented Mar 31, 2018

jakerockland commented Mar 31, 2018

thelostone-mc commented Apr 1, 2018

owocki commented Apr 2, 2018

owocki commented Apr 2, 2018

PixelantDesign commented Apr 3, 2018

thelostone-mc commented Apr 3, 2018

owocki commented Apr 4, 2018 • edited Loading

owocki commented Apr 4, 2018 • edited Loading

jakerockland commented Apr 4, 2018 via email

jakerockland commented Apr 7, 2018 • edited Loading

jakerockland commented Apr 9, 2018

thelostone-mc commented Apr 9, 2018 • edited Loading

Squash dem commits

Rebase with upstream :

mbeacom left a comment

Choose a reason for hiding this comment

owocki commented Apr 9, 2018

jakerockland commented Apr 9, 2018

mbeacom commented Apr 9, 2018

jakerockland commented Mar 30, 2018 •

edited

Loading

codecov bot commented Mar 30, 2018 •

edited

Loading

owocki commented Apr 4, 2018 •

edited

Loading

owocki commented Apr 4, 2018 •

edited

Loading

jakerockland commented Apr 7, 2018 •

edited

Loading

thelostone-mc commented Apr 9, 2018 •

edited

Loading