Skip to content

Commit

Permalink
chore(news): Bailey
Browse files Browse the repository at this point in the history
also conclude email A/B testing
  • Loading branch information
SabreCat committed Apr 18, 2019
1 parent c91de90 commit f16e0bd
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 44 deletions.
38 changes: 13 additions & 25 deletions website/client/assets/css/sprites/spritesmith-largeSprites-0.css
@@ -1,78 +1,66 @@
.promo_april_fools_2019 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -445px -163px;
background-position: 0px -425px;
width: 423px;
height: 147px;
}
.promo_armoire_backgrounds_201904 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -424px -337px;
background-position: 0px -573px;
width: 423px;
height: 147px;
}
.promo_celestial_rainbow_potions {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -337px;
background-position: 0px -277px;
width: 423px;
height: 147px;
}
.promo_classes_spring2019 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -445px 0px;
background-position: -328px 0px;
width: 432px;
height: 162px;
}
.promo_egg_hunt {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -485px;
background-position: -761px 0px;
width: 354px;
height: 147px;
}
.promo_mystery_201903 {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px -633px;
background-position: -761px -444px;
width: 351px;
height: 147px;
}
.promo_seasonalshop_spring {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -878px -332px;
background-position: -424px -277px;
width: 162px;
height: 138px;
}
.promo_shiny_seeds {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -352px -633px;
background-position: -761px -296px;
width: 351px;
height: 147px;
}
.promo_spring_avatar_customizations {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -355px -485px;
background-position: -761px -148px;
width: 354px;
height: 147px;
}
.promo_take_this {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -878px -471px;
background-position: -761px -592px;
width: 96px;
height: 69px;
}
.scene_burnout {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -878px 0px;
width: 240px;
height: 180px;
}
.scene_hat_guild {
.scene_yesterdailies_repeatables {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: 0px 0px;
width: 444px;
height: 336px;
}
.scene_podcast {
background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
background-position: -878px -181px;
width: 150px;
height: 150px;
width: 327px;
height: 276px;
}
Binary file modified website/client/assets/images/sprites/spritesmith-largeSprites-0.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 5 additions & 9 deletions website/server/controllers/api-v3/news.js
Expand Up @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth';
let api = {};

// @TODO export this const, cannot export it from here because only routes are exported from controllers
const LAST_ANNOUNCEMENT_TITLE = 'HABITICA BLOGS: GUILD SPOTLIGHT AND WIKI SPOTLIGHT';
const LAST_ANNOUNCEMENT_TITLE = 'HABITICA BLOG: USE CASE SPOTLIGHT';
const worldDmg = { // @TODO
bailey: false,
};
Expand All @@ -30,18 +30,14 @@ api.getNews = {
<div class="mr-3 ${baileyClass}"></div>
<div class="media-body">
<h1 class="align-self-center">${res.t('newStuff')}</h1>
<h2>4/11/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
<h2>4/18/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
</div>
</div>
<hr/>
<div class="scene_podcast center-block"></div>
<h3>Guild Spotlight: More New and Notable Guilds!</h3>
<p>There's a new <a href='https://habitica.wordpress.com/2019/04/11/new-and-notable-guild-spotlight-4/' target='_blank'>Guild Spotlight on the blog</a> that highlights even more new and upcoming Guilds! Check it out now to find new communities where you can discuss your goals and interests.</p>
<div class="scene_yesterdailies_repeatables center-block"></div>
<p>This month's <a href='https://habitica.wordpress.com/2019/04/18/use-case-spotlight-reviewing-and-evaluating-your-tasks/' target='_blank'>Use Case Spotlight</a> is about Reviewing and Evaluating your Tasks! It features a number of great suggestions submitted by Habiticans in the <a href='/groups/guild/1d3a10bf-60aa-4806-a38b-82d1084a59e6'>Use Case Spotlights Guild</a>. We hope it helps any of you who might be considering a refresh for your Task Lists.</p>
<p>Plus, we're collecting user submissions for the next spotlight! How do you keep things fresh and interesting if you've been using Habitica for a long time? We’ll be featuring player-submitted examples in Use Case Spotlights on the Habitica Blog next month, so post your suggestions in the Use Case Spotlight Guild now. We look forward to learning more about how you use Habitica to improve your life and get things done!</p>
<div class="small mb-3">by shanaqui</div>
<div class="scene_burnout center-block"></div>
<h3>Blog Post: Burnout</h3>
<p>This month's <a href='https://habitica.wordpress.com/2019/04/10/burnout/' target='_blank'>featured Wiki article</a> is about burnout! We hope that it will help you as you balance realistic expectations for productivity. Be sure to check it out, and let us know what you think by reaching out on <a href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a href='http://blog.habitrpg.com' target='_blank'>Tumblr</a>, and <a href='https://facebook.com/habitica' target='_blank'>Facebook</a>.</p>
<div class="small mb-3">by shanaqui and the Wiki Wizards</div>
</div>
`,
});
Expand Down
4 changes: 2 additions & 2 deletions website/server/libs/auth/index.js
Expand Up @@ -184,8 +184,8 @@ async function registerLocal (req, res, { isV3 = false }) {
.remove({email: savedUser.auth.local.email})
.then(() => {
if (existingUser) return;
if (savedUser._ABtests && savedUser._ABtests.welcomeEmailSplit) {
sendTxnEmail(savedUser, savedUser._ABtests.welcomeEmailSplit);
if (newUser.registeredThrough === 'habitica-web') {
sendTxnEmail(savedUser, 'welcome-v2b');
} else {
sendTxnEmail(savedUser, 'welcome');
}
Expand Down
8 changes: 0 additions & 8 deletions website/server/models/user/hooks.js
Expand Up @@ -130,14 +130,6 @@ function _setUpNewUser (user) {
user.purchased.background.violet = true;
user.preferences.background = 'violet';

const testGroup = Math.random();

if (testGroup < 0.5) {
user._ABtests.welcomeEmailSplit = 'welcome-v2b';
} else {
user._ABtests.welcomeEmailSplit = 'welcome';
}

if (user.registeredThrough === 'habitica-web') {
taskTypes = ['habit', 'daily', 'todo', 'reward', 'tag'];

Expand Down

0 comments on commit f16e0bd

Please sign in to comment.