Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.107.1",
+  "version": "4.107.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.107.1",
+  "version": "4.107.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^4.0.0",

website/client/components/achievements/newStuff.vue

@@ -15,13 +15,12 @@
 </template>
 
 <style lang='scss'>
-@import '~client/assets/scss/static.scss';
+  @import '~client/assets/scss/static.scss';
-</style>
+  #new-stuff {
-
+    .modal-body .modal-body {
-<style lang='scss' scoped>
+      padding-top: 0rem;
-.modal-body {
+    }
-  padding-top: 2em;
+  }
-}
 </style>
 
 <script>

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 = 'WORLDCON HABITICA MEETUP AND BLOG POST ON ROGUES';
+const LAST_ANNOUNCEMENT_TITLE = 'HABITICA ENAMEL PIN KICKSTARTER!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -30,18 +30,15 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>8/15/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>8/20/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_unconventional_armor center-block"></div>
+        <img src="https://habitica-assets.s3.amazonaws.com/mobileApp/images/promo_kickstarter.png" class="center-block mw-100 h-auto"></div>
-        <h3>Habitica Meetup at Worldcon!</h3>
+        <h3>Our Kickstarter launches today!</h3>
-        <p>shanaqui and Dewines will be representing Habitica at <a href='https://dublin2019.com/' target='_blank'>Worldcon</a>  this year. If you’d like to meet them along with other fellow Habiticans, join us at the Habitica Worldcon Meetup! They'll be handing out promo codes for the special Unconventional Armor set and Habitica stickers (note quantities may be limited). Look for shanaqui's Habitica t-shirt!</p>
+        <p>Hello adventurers! The Habitica team is excited to announce a new way you can bring RPG magic into your daily life. We’re launching a <a href='https://kickstarter.com/projects/habitica/habitica-class-pins' target='_blank'>Kickstarter campaign</a> to fund enamel pins with the insignia of our four playable classes! If our funding goal is met, backers will get the pin(s) of their choice, a special profile badge and, depending on the funding tier you choose, you can get exclusive animated in-game items. The campaign ends on September 10, so be sure to take a peek soon!</p>
-        <p>You can find the meetup on Saturday, August 17, at ground floor foyer of Convention Centre Dublin from 5:00-6:00 PM local time!  Can’t wait to meet you :)</p>
+        <p>We’re excited to bring you these new ways to show your Habitica pride. Thank you all so much for all your support and for just being a part of our community.</p>
-        <div class="scene_casting_spells center-block"></div>
+        <div class="small mb-3">by the Habitica Team</div>
-        <h3>Blog Post: Rogue</h3>
-        <p>This month's <a href='https://habitica.wordpress.com/2019/08/14/rogue/' target='_blank'>featured Wiki article</a> is about the Rogue class! We hope that it will help you as you choose the best class for your Habitica play style. 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>
       `,
     });