krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2018-12-03 22:54:08 +00:00
parent 757160d6b7 757959529b
commit bb01475e02
48 changed files with 238 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
website/server/controllers/api-v3/news.js
View File

@@ -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 = 'LAST CHANCE! SPLENDID SORCERER SET, FROST HATCHING POTIONS, ODDBALLS QUEST BUNDLE';
const LAST_ANNOUNCEMENT_TITLE = 'DECEMBER 2018 RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE';
const worldDmg = { // @TODO
bailey: false,
};
@@ -30,24 +30,17 @@ api.getNews = {
<div class="mr-3 ${baileyClass}"></div>
<div class="media-body">
<h1 class="align-self-center">${res.t('newStuff')}</h1>
<h2>11/30/2018 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
<h2>12/3/2018 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
</div>
</div>
<hr/>
<div class="promo_mystery_201811 center-block"></div>
<h3>Last Chance for Splendid Sorcerer Item Set</h3>
<p>Reminder: this is the final weekend to <a href='/user/settings/subscription' target='_blank'>subscribe</a> and receive the Splendid Sorcerer Set! Subscribing also lets you buy Gems for Gold. The longer your subscription, the more Gems you get!</p>
<p>Thanks so much for your support! You help keep Habitica running.</p>
<div class="small mb-3">by Beffymaroo</div>
<div class="promo_frost_potions center-block"></div>
<h3>Last Chance for Frost and Thunderstorm Hatching Potions</h3>
<p>This weekend is also your last chance to <a href='/shops/market' target='_blank'>buy Frost and Thunderstorm Hatching Potions</a>! If they come back, it won't be until next year at the earliest, so don't delay!</p>
<div class="small mb-3">by Balduranne</div>
<div class="promo_oddballs_bundle center-block"></div>
<h3>Last Chance for Oddball Pet Quest Bundle</h3>
<p>And finally, this weekend is all that's left to buy the discounted Oddballs Pet Quest Bundle, featuring the Yarn, Rock, and Marshmallow Slime quests all for seven Gems! Be sure to glomp it from the <a href='/shops/quests' target='_blank'>Quest Shop</a> right away!</p>
<div class="small">Art by PainterProphet, Pfeffernusse, Zorelya, intune, starsystemic, Leephon, Arcosine, stefalupagus, Hachiseiko, TheMushroomKing, khdarkwolf, Vampitch, JinjooHat, UncommonCriminal, Oranges, Darkly, overomega, celticdragon, and Shaner</div>
<div class="small mb-3">Writing by Bartelmy, Faelwyn the Rising Phoenix, Theothermeme, Bethany Woll, itokro, and Lemoness</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. For this month's Challenge, <a href='/challenges/8348aa6f-7687-4d89-9bdf-c26a10061465' target='_blank'>Journey's End and New Beginnings</a>, we're focusing on reviewing your 2018 resolution successes and planning for an even better 2019! It has a 15 gem prize, which will be awarded to five lucky winners on January 2.</p>
<p>Congratulations to the winners of the November Challenge, misketti, CamelliaLynne, DrearyDear, Mikachu, and Zsuzsa!</p>
<p>The next Take This Challenge has also launched, "<a href='/challenges/7a28b529-49da-49fa-818e-c76317dbcb2a' target='_blank'>Don't Be a Completionist!</a>" with a focus on setting priorities. 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, "This One Goes to 11!": grand prize winner digitalkitty isawesome, and runners-up jtm119, Jicaffo, Azburn, Snowdesert, and Hicholyta. 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="scene_hiking center-block"></div>
</div>
`,
});