Merge branch 'release' into develop

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 = 'JUNE 2019 RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE';
+const LAST_ANNOUNCEMENT_TITLE = 'JUNE BACKGROUNDS AND ARMOIRE ITEMS!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -30,19 +30,14 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>6/3/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>6/4/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="scene_hiking center-block"></div>
-        <p>The Habitica team has launched a special official Challenge series hosted in the <a href='/groups/guild/6e6a8bd3-9f5f-4351-9188-9f11fcd80a99' target='_blank'>Official New Year's Resolution Guild</a>. These Challenges are designed to help you build and maintain goals that are destined for success and then stick with them as the year progresses.</p>
-        <p>For this month's Challenge, <a href='/challenges/7d413b28-24ce-4806-8755-2aa0cd6b3c57'>Mark Your Journey</a>, we're reflecting on your achievements since January and looking ahead to the rest of the year! It has a 15 Gem prize, which will be awarded to five lucky winners on July 1st.</p>
-        <p>Congratulations to the winners of May's Challenge, @CamelliaLynne, @wespe, @bdwilson, @skyflower, and @Mawri!</p>
-        <p>The next Take This Challenge has also launched, "<a href='/challenges/2a8c41ec-4a6b-490b-94e2-bdeddce1446d'>You've Got a Friend in Me!</a>", with a focus on expressing gratitude to people who improve our lives. Be sure to check it out to earn additional pieces of the Take This armor set!</p>
-        <p><a href='http://www.takethis.org/' target='_blank'>Take This</a> is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.</p>
-        <p>Congratulations to the winners of the last Take This Challenge, "Organize Your Inventory!": grand prize winner t3h5rC, and runners-up avogad-ro, DrearyDear, BlueSky, Riou, and Keeva! Plus, all participants in that Challenge have received a piece of the <a href='http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set' target='_blank'>Take This item set</a> if they hadn't completed it already. It is located in your Rewards column. Enjoy!</p>
-        <div class="small mb-3">by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat</div>
-        <div class="promo_take_this center-block"></div>
+        <div class="promo_armoire_backgrounds_201906 center-block"></div>
+        <p>We’ve added three new backgrounds to the Background Shop! Now your avatar can take a deep dive to Underwater Vents, swim with a School of Fish, and enjoy the beauty of Seaside Cliffs. Check them out under User Icon > Backgrounds!</p>
+        <p>Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the Boating Outfit. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)</p>
+        <div class="small mb-3">by Tyche Alba, The Mushroom King, Manostion, FolleMente, Katy133, Chimera Liani, and SabreCat</div>
       </div>
       `,
     });