diff --git a/Dockerfile-Production b/Dockerfile-Production index c7162ec9af..df09fdec5a 100644 --- a/Dockerfile-Production +++ b/Dockerfile-Production @@ -17,7 +17,7 @@ RUN npm install -g gulp-cli mocha # Clone Habitica repo and install dependencies RUN mkdir -p /usr/src/habitrpg WORKDIR /usr/src/habitrpg -RUN git clone --branch v4.36.0 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg +RUN git clone --branch v4.37.1 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg RUN npm install RUN gulp build:prod --force diff --git a/package-lock.json b/package-lock.json index 1a3479ae9f..4268cbef30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.37.1", + "version": "4.37.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7b822828b8..104f238be0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.37.1", + "version": "4.37.2", "main": "./website/server/index.js", "dependencies": { "@slack/client": "^3.8.1", diff --git a/website/client/app.vue b/website/client/app.vue index c7214ad1c4..3f9031a071 100644 --- a/website/client/app.vue +++ b/website/client/app.vue @@ -373,6 +373,11 @@ export default { document.title = title; }); + this.$nextTick(() => { + // Load external scripts after the app has been rendered + Analytics.load(); + }); + if (this.isUserLoggedIn && !this.isStaticPage) { // Load the user and the user tasks Promise.all([ @@ -395,7 +400,6 @@ export default { this.$nextTick(() => { // Load external scripts after the app has been rendered setupPayments(); - Analytics.load(); }); }).catch((err) => { console.error('Impossible to fetch user. Clean up localStorage and refresh.', err); // eslint-disable-line no-console diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index 4481ca50b6..2202e86c7b 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,6 +1,6 @@ .promo_armoire_background_201804 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -142px -244px; + background-position: -142px -581px; width: 141px; height: 441px; } @@ -10,6 +10,12 @@ width: 141px; height: 441px; } +.promo_ios { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: 0px -244px; + width: 325px; + height: 336px; +} .promo_mystery_201803 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); background-position: -915px -296px; @@ -18,7 +24,7 @@ } .promo_rainbow_potions { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -284px -244px; + background-position: -284px -581px; width: 141px; height: 441px; } @@ -42,7 +48,7 @@ } .promo_spring_fling_2018 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -244px; + background-position: 0px -581px; width: 141px; height: 588px; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index 3174bfaa8e..6f4e7ef31a 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/client/components/auth/authForm.vue b/website/client/components/auth/authForm.vue index b2fc6cdc01..ced6e1e44f 100644 --- a/website/client/components/auth/authForm.vue +++ b/website/client/components/auth/authForm.vue @@ -73,7 +73,6 @@