maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use explicit email domain for badge email links and minor cleanup (#3943)

Browse source 
* Set domain for badge email links

* Add credits + listings info to plain text badge email

* Update environment variable setting

* Use ENV when ApplicationConfig has not been init
This commit is contained in:
Andy Zhao 2019-09-06 10:20:48 -04:00 • committed by Ben Halpern
parent 69c8b24c34
commit aadd376f9c
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/mailers/notify_mailer/new_badge_email.html.erb
View file

@ -15,16 +15,16 @@
</p>
<br />
<p>
<a href="https://dev.to/<%= @user.username %>" style="font-weight:bold;color:white;background:#4e57ef;padding: 5px 10px;border-radius:3px;text-decoration:none">
<a href="<%= "#{ApplicationConfig["APP_DOMAIN"]}/#{@user.username}" %>" style="font-weight:bold;color:white;background:#4e57ef;padding: 5px 10px;border-radius:3px;text-decoration:none">
Check out your profile
</a>
</p>
<hr style="opacity:0.4;width: 150px;margin: 30px auto;" />
<p>
You also get <strong><a href="/credits">5 new credits</a></strong> to use for <strong><a href="/listings">community listings</a></strong><br />
You also get <strong><a href="<%= ApplicationConfig["APP_DOMAIN"] %>/credits">5 new credits</a></strong> to use for <strong><a href="<%= ApplicationConfig["APP_DOMAIN"] %>/listings">community listings</a></strong><br />
if you have anything you'd like to promote. 🎉
</p>
<p>
<strong><a href="/about-listings">More information about listings<a></strong>
<strong><a href="<%= ApplicationConfig["APP_DOMAIN"] %>/about-listings">More information about listings<a></strong>
</p>
</center>

6
app/views/mailers/notify_mailer/new_badge_email.text.erb
View file

@ -5,3 +5,9 @@ Congratulations, <%= @user.name %>! You got the <%= @badge.title %> badge! Be su
<%= strip_tags @badge_achievement.rewarding_context_message %>
https://dev.to/<%= @user.username %>
You also get 5 new credits to use for community listings if you have anything you'd like to promote: https://dev.to/listings
To manage your credits: visit: https://dev.to/credits
For more information about listings, visit: https://dev.to/about-listings

2
app/views/pages/live.html.erb
View file

@ -32,7 +32,7 @@
<iframe class="live-video" src="//iframe.dacast.com/b/105417/c/465464" width="1920" height="1080" frameborder="0" scrolling="no" allow="autoplay" allowfullscreen webkitallowfullscreen mozallowfullscreen oallowfullscreen msallowfullscreen></iframe>
</div>
<div class="live-chat-wrapper">
<div id="chat" class="live-chat" data-pusher-key="<%= ENV["PUSHER_KEY"] %>" data-chat-channels="<%= @chat_channels %>" data-chat-options="<%= { showChannelsList: false, showTimestamp: false, activeChannelId: @active_channel.id }.to_json %>">
<div id="chat" class="live-chat" data-pusher-key="<%= ApplicationConfig["PUSHER_KEY"] %>" data-chat-channels="<%= @chat_channels %>" data-chat-options="<%= { showChannelsList: false, showTimestamp: false, activeChannelId: @active_channel.id }.to_json %>">
</div>
</div>
</div>