sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-04-14 11:36:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release' into develop

Browse source
This commit is contained in:
Sabe Jones 2021-10-04 19:03:42 -05:00
commit 353493675f
6 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package-lock.json generated
View file

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

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "habitica",
"description": "A habit tracker app which treats your goals like a Role Playing Game.",
"version": "4.207.0",
"version": "4.207.2",
"main": "./website/server/index.js",
"dependencies": {
"@babel/core": "^7.15.5",

6
website/client/src/app.vue
View file

@ -38,7 +38,7 @@
<template v-else>
<template v-if="isUserLoaded">
<damage-paused-banner />
<!-- <gems-promo-banner /> -->
<gems-promo-banner />
<gift-promo-banner />
<notifications-display />
<app-menu />
@ -154,7 +154,7 @@ import { loadProgressBar } from 'axios-progress-bar';
import AppMenu from './components/header/menu';
import AppHeader from './components/header/index';
import DamagePausedBanner from './components/header/banners/damagePaused';
// import GemsPromoBanner from './components/header/banners/gemsPromo';
import GemsPromoBanner from './components/header/banners/gemsPromo';
import GiftPromoBanner from './components/header/banners/giftPromo';
import AppFooter from './components/appFooter';
import notificationsDisplay from './components/notifications';
@ -186,7 +186,7 @@ export default {
AppHeader,
AppFooter,
DamagePausedBanner,
// GemsPromoBanner,
GemsPromoBanner,
GiftPromoBanner,
notificationsDisplay,
snackbars,

20
website/client/src/components/header/banners/gemsPromo.vue
View file

@ -12,7 +12,7 @@
@click="openGemsModal"
>
<img
v-if="eventName === 'fall2020'"
v-if="eventName === 'fall_extra_gems'"
class="d-none d-xl-block"
srcset="
~@/assets/images/gems/fall-confetti-left/confetti.png,
@ -21,7 +21,7 @@
src="~@/assets/images/gems/fall-confetti-left/confetti.png"
>
<img
v-else-if="eventName === 'fall2020SecondPromo'"
v-else-if="eventName === 'spooky_extra_gems'"
class="d-none d-xl-block"
srcset="
~@/assets/images/gems/spooky-confetti-left/confetti.png,
@ -31,7 +31,7 @@
>
<div class="promo-test">
<img
v-if="eventName === 'fall2020'"
v-if="eventName === 'fall_extra_gems'"
srcset="
~@/assets/images/gems/fall-text/text.png,
~@/assets/images/gems/fall-text/text@2x.png 2x,
@ -39,7 +39,7 @@
src="~@/assets/images/gems/fall-text/text.png"
>
<img
v-else-if="eventName === 'fall2020SecondPromo'"
v-else-if="eventName === 'spooky_extra_gems'"
srcset="
~@/assets/images/gems/spooky-text/text.png,
~@/assets/images/gems/spooky-text/text@2x.png 2x,
@ -48,7 +48,7 @@
>
</div>
<img
v-if="eventName === 'fall2020'"
v-if="eventName === 'fall_extra_gems'"
class="d-none d-xl-block"
srcset="
~@/assets/images/gems/fall-confetti-right/confetti.png,
@ -57,7 +57,7 @@
src="~@/assets/images/gems/fall-confetti-right/confetti.png"
>
<img
v-else-if="eventName === 'fall2020SecondPromo'"
v-else-if="eventName === 'spooky_extra_gems'"
class="d-none d-xl-block"
srcset="
~@/assets/images/gems/spooky-confetti-right/confetti.png,
@ -72,11 +72,11 @@
<style lang="scss" scoped>
@import '~@/assets/scss/colors.scss';
.gems-promo-banner-fall2020 {
.gems-promo-banner-fall_extra_gems {
background: $gray-10;
}
.gems-promo-banner-fall2020SecondPromo {
.gems-promo-banner-spooky_extra_gems {
background: $black;
}
@ -105,8 +105,8 @@ export default {
},
showGemsPromoBanner () {
const currEvt = this.currentEvent;
if (!currEvt) return false;
return currEvt.event === 'fall2020' || currEvt.event === 'fall2020SecondPromo';
if (!currEvt || !currEvt.gemsPromo) return false;
return true;
},
bannerClass () {
const bannerClass = 'gems-promo-banner';

16
website/client/src/components/payments/buyGemsModal.vue
View file

@ -21,7 +21,7 @@
class="col-12 text-center"
>
<img
v-if="eventName === 'fall2020'"
v-if="eventName === 'fall_extra_gems'"
:alt="$t('supportHabitica')"
srcset="
~@/assets/images/gems/fall-header.png,
@ -30,7 +30,7 @@
src="~@/assets/images/gems/fall-header.png"
>
<img
v-else-if="eventName === 'fall2020SecondPromo'"
v-else-if="eventName === 'spooky_extra_gems'"
:alt="$t('supportHabitica')"
srcset="
~@/assets/images/gems/spooky-header.png,
@ -207,8 +207,8 @@
}
}
// Fall 2020 events styles
/* #buy-gems.event-fall2020, #buy-gems.event-fall2020SecondPromo {
// Fall events styles
#buy-gems.event-fall_extra_gems, #buy-gems.event-spooky_extra_gems {
.header-wrap {
padding-top: 4.5rem;
padding-bottom: 1.5rem;
@ -234,21 +234,21 @@
.close-icon:hover svg path {
stroke: $gray-400;
}
} */
}
/* #buy-gems.event-fall2020 {
#buy-gems.event-fall_extra_gems {
.header-wrap {
background-image: url('~@/assets/images/gems/fall-header-bg@2x.png');
background-size: 100%;
}
}
#buy-gems.event-fall2020SecondPromo {
#buy-gems.event-spooky_extra_gems {
.header-wrap {
background-image: url('~@/assets/images/gems/spooky-header-bg@2x.png');
background-size: 100%;
}
} */
}
</style>
<style lang="scss" scoped>

8
website/common/script/content/constants/events.js
View file

@ -15,6 +15,14 @@ export const EVENTS = {
season: 'normal',
npcImageSuffix: '',
},
fall_extra_gems: { // eslint-disable-line camelcase
start: '2021-10-05T08:00-04:00',
end: '2021-10-12T20:00-04:00',
npcImageSuffix: '_fall',
season: 'fall',
gemsPromo,
promo: 'fall_extra_gems',
},
fall2021: {
start: '2021-09-21T08:00-04:00',
end: '2021-10-31T20:00-04:00',