4.0.5

* change tasks column height

* stack columns on smaller screens

Dockerfile-Production

@@ -9,7 +9,7 @@ RUN npm install -g gulp grunt-cli bower mocha
 # Clone Habitica repo and install dependencies
 RUN mkdir -p /usr/src/habitrpg
 WORKDIR /usr/src/habitrpg
-RUN git clone --branch release https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
+RUN git clone --branch v4.0.3 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
 RUN npm install
 RUN bower install --allow-root
 RUN gulp build:prod --force

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.0.2",
+  "version": "4.0.5",
   "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.0.2",
+  "version": "4.0.5",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

website/client/components/achievements/newStuff.vue

@@ -14,7 +14,7 @@
       hr
       p Welcome to the new Habitica! We're so excited to share it with you at last. This project, which has been a labor of love since last December, is the single biggest update that Habitica has ever released (with over 150 pages of designs, an entire rewrite of all of our front-end code, countless rounds of testing and iteration, and many, many meetings). Just refresh your page to load the new website!
       .promo_login_screen.center-block
-      p(v-markdown="'You can find a full list of changes [here](https://docs.google.com/document/d/1GZ0A2MK3JCZPuFUOStR7aVUI8fQlmjFDtLdj5Lg5XHY/edit), as well as explanations for why we made each, but here are a few quick tips to help you get oriented:'")
+      p(v-markdown="'You can find a full list of changes [here](http://habitica.wikia.com/wiki/Habitica_Redesign_Fact_Sheet), as well as explanations for why we made each, but here are a few quick tips to help you get oriented:'")
       .grassy-meadow-backdrop
         .daniel_front
       ul
@@ -49,7 +49,7 @@
   }
 
   .grassy-meadow-backdrop {
-    background-image: url('~assets/images/npc/normal/tavern_background.png');
+    background-image: url('~assets/images/npc/fall/tavern_background.png');
     background-repeat: repeat-x;
     width: 100%;
     height: 246px;
@@ -69,7 +69,7 @@
   }
 
   .sorceress_front {
-    background-image: url('~assets/images/npc/normal/seasonal_shop_opened_npc.png');
+    background-image: url('~assets/images/npc/fall/seasonal_shop_opened_npc.png');
     height: 246px;
     width: 471px;
     background-repeat: no-repeat;

website/client/components/appFooter.vue

@@ -36,7 +36,7 @@
           li
             router-link(to='/hall/contributors') {{ $t('hall') }}
           li
-            router-link(to='/groups/a29da26b-37de-4a71-b0c6-48e72a900dac') {{ $t('reportBug') }}
+            router-link(to='/groups/guild/a29da26b-37de-4a71-b0c6-48e72a900dac') {{ $t('reportBug') }}
           li
             a(href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents', target='_blank') {{ $t('requestFeature') }}
           li

website/client/components/auth/registerLoginReset.vue

@@ -485,14 +485,14 @@ export default {
         return;
       }
 
-      const res = await axios.post('/api/v3/user/reset-password', {
+      const res = await axios.post('/api/v3/user/auth/reset-password-set-new-one', {
         newPassword: this.password,
         confirmPassword: this.passwordConfirm,
         code: this.resetPasswordSetNewOneData.code,
       });
 
-      if (res.message) {
-        alert(res.message);
+      if (res.data.message) {
+        alert(res.data.message);
       }
 
       this.password = '';

website/client/components/tasks/column.vue

@@ -43,7 +43,7 @@
   @import '~client/assets/scss/colors.scss';
 
   .tasks-column {
-    height: 556px;
+    min-height: 556px;
   }
 
   .task-wrapper + .reward-items {
@@ -60,11 +60,9 @@
     border-radius: 4px;
     background: $gray-600;
     padding: 8px;
-    // not sure why but this is necessary or the last task will overflow the container
-    padding-bottom: 0.1px;
-    position: relative;
-    height: calc(100% - 64px);
-    overflow: auto;
+    position: relative; // needed for the .bottom-gradient to be position: absolute
+    height: calc(100% - 56px);
+    padding-bottom: 30px;
   }
 
   .bottom-gradient {

website/client/components/tasks/user.vue

@@ -72,7 +72,7 @@
               span.text {{$t(type)}}
 
     .row.tasks-columns
-      task-column.col-3(
+      task-column.col-lg-3.col-md-6(
         v-for="column in columns",
         :type="column", :key="column",
         :isUser="true", :searchText="searchTextThrottled",
@@ -114,25 +114,25 @@
   }
 
   .dropdown-icon-item {
-      .icon_habit {
-        width: 30px;
-        height: 20px;
-      }
+    .icon_habit {
+      width: 30px;
+      height: 20px;
+    }
 
-      .icon_daily {
-        width: 24px;
-        height: 20px;
-      }
+    .icon_daily {
+      width: 24px;
+      height: 20px;
+    }
 
-      .icon_todo {
-        width: 20px;
-        height: 20px;
-      }
+    .icon_todo {
+      width: 20px;
+      height: 20px;
+    }
 
-      .icon_reward {
-        width: 26px;
-        height: 20px;
-      }
+    .icon_reward {
+      width: 26px;
+      height: 20px;
+    }
   }
 
   .dropdown-icon-item:hover .svg-icon, .dropdown-item.active .svg-icon {

website/server/middlewares/static.js

@@ -11,9 +11,19 @@ const BUILD_DIR = path.join(__dirname, '/../../build');
 
 module.exports = function staticMiddleware (expressApp) {
   // Expose static files for new client
-  // if (IS_PROD && IS_NEW_CLIENT_ENABLED) {
+  expressApp.use('/static/js', express.static(`${PUBLIC_DIR}/../../dist-client/static/js`, { maxAge: MAX_AGE }));
+  expressApp.use('/static/css', express.static(`${PUBLIC_DIR}/../../dist-client/static/css`, { maxAge: MAX_AGE }));
+  expressApp.use('/static/img', express.static(`${PUBLIC_DIR}/../../dist-client/static/img`, { maxAge: MAX_AGE }));
+
+  // @TODO img/js/css under /static have their names hashed after every change so they can be cached
+  // Not files in /audio and /sprites, that's why we don't cache them.
+  // Hash their file names and cache the entire /static folder
   expressApp.use('/static', express.static(`${PUBLIC_DIR}/../../dist-client/static`));
-  // }
+
+
+  // @TODO all these paths are not used by the new client, remove them
+  // But first check that they're not used anywhere else
+  // In particular the images used by emails
 
   // TODO move all static files to a single location (one for public and one for build)
   expressApp.use(express.static(BUILD_DIR, { maxAge: MAX_AGE }));