diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index 0b5aaa8e8c..48dbcfc757 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/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; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index a12e5b4d78..e5b968f66a 100644 Binary files a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_burnout.png b/website/raw_sprites/spritesmith_large/scene_burnout.png deleted file mode 100644 index a6d3424d4c..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_burnout.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_hat_guild.png b/website/raw_sprites/spritesmith_large/scene_hat_guild.png deleted file mode 100644 index 1c432698ea..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_hat_guild.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_podcast.png b/website/raw_sprites/spritesmith_large/scene_podcast.png deleted file mode 100644 index 942ede75f4..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_podcast.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_yesterdailies_repeatables.png b/website/raw_sprites/spritesmith_large/scene_yesterdailies_repeatables.png new file mode 100644 index 0000000000..d6218704ff Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_yesterdailies_repeatables.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index ef0667ffa4..5c5279997f 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -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, }; @@ -30,18 +30,14 @@ api.getNews = {

${res.t('newStuff')}

-

4/11/2019 - ${LAST_ANNOUNCEMENT_TITLE}

+

4/18/2019 - ${LAST_ANNOUNCEMENT_TITLE}

-
-

Guild Spotlight: More New and Notable Guilds!

-

There's a new Guild Spotlight on the blog that highlights even more new and upcoming Guilds! Check it out now to find new communities where you can discuss your goals and interests.

+
+

This month's Use Case Spotlight is about Reviewing and Evaluating your Tasks! It features a number of great suggestions submitted by Habiticans in the Use Case Spotlights Guild. We hope it helps any of you who might be considering a refresh for your Task Lists.

+

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!

by shanaqui
-
-

Blog Post: Burnout

-

This month's featured Wiki article 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 Twitter, Tumblr, and Facebook.

-
by shanaqui and the Wiki Wizards
`, }); diff --git a/website/server/libs/auth/index.js b/website/server/libs/auth/index.js index 1a806ead3c..609f546ad8 100644 --- a/website/server/libs/auth/index.js +++ b/website/server/libs/auth/index.js @@ -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'); } diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index ed3a7514b5..676231ef59 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -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'];