From 2db5ab235291b8124a7e00b22e51a8eb39099965 Mon Sep 17 00:00:00 2001
From: Keith Holliday <krh121791@yahoo.com>
Date: Mon, 25 Sep 2017 17:26:23 -0500
Subject: [PATCH] Sept 25 fixes (#9076)

* Fixed amazon config

* Added breakpoint for fixed footer

* Fixed some minor sorting bugs
---
 webpack/config/prod.env.js                       |  7 +++++--
 website/client/components/auth/registerLogin.vue | 11 ++++++++++-
 website/client/components/tasks/taskModal.vue    | 10 ++++++----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/webpack/config/prod.env.js b/webpack/config/prod.env.js
index b5dc59b6b0..ea7ffdd0be 100644
--- a/webpack/config/prod.env.js
+++ b/webpack/config/prod.env.js
@@ -23,12 +23,15 @@ nconf.set('IS_TEST', nconf.get('NODE_ENV') === 'test');
 //                      'AMAZON_PAYMENTS', 'STRIPE_PUB_KEY', 'AMPLITUDE_KEY',
 //                      'worldDmg', 'mods', 'IS_MOBILE', 'PUSHER:KEY', 'PUSHER:ENABLED'];
 
+const AMAZON_SELLER_ID = nconf.get('AMAZON_PAYMENTS:SELLER_ID') || nconf.get('AMAZON_PAYMENTS_SELLER_ID');
+const AMAZON_CLIENT_ID = nconf.get('AMAZON_PAYMENTS:CLIENT_ID') || nconf.get('AMAZON_PAYMENTS_CLIENT_ID');
+
 let env = {
   NODE_ENV: '"production"',
   // clientVars: CLIENT_VARS,
   AMAZON_PAYMENTS: {
-    SELLER_ID: `"${nconf.get('AMAZON_PAYMENTS:SELLER_ID')}"`,
-    CLIENT_ID: `"${nconf.get('AMAZON_PAYMENTS:CLIENT_ID')}"`,
+    SELLER_ID: `"${AMAZON_SELLER_ID}"`,
+    CLIENT_ID: `"${AMAZON_CLIENT_ID}"`,
   },
   EMAILS: {
     COMMUNITY_MANAGER_EMAIL: `"${nconf.get('EMAILS:COMMUNITY_MANAGER_EMAIL')}"`,
diff --git a/website/client/components/auth/registerLogin.vue b/website/client/components/auth/registerLogin.vue
index e6dca8efcf..216a6a70ba 100644
--- a/website/client/components/auth/registerLogin.vue
+++ b/website/client/components/auth/registerLogin.vue
@@ -79,6 +79,15 @@
 <style lang="scss" scoped>
   @import '~client/assets/scss/colors.scss';
 
+  @media only screen  and (min-height: 1080px) {
+    #bottom-wrap {
+      margin-top: 6em;
+      position: fixed !important;
+      width: 100%;
+      bottom: 0;
+    }
+  }
+
   .form-wrapper {
     background-color: $purple-200;
     background: $purple-200; /* For browsers that do not support gradients */
@@ -184,7 +193,7 @@
 
   #bottom-wrap {
     margin-top: 6em;
-    position: fixed;
+    position: static;
     width: 100%;
     bottom: 0;
   }
diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index 00b6708dc8..1058ed13d8 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -577,7 +577,7 @@ export default {
   methods: {
     ...mapActions({saveTask: 'tasks:save', destroyTask: 'tasks:destroy', createTask: 'tasks:create'}),
     sortedChecklist (data) {
-      let sorting = clone(this.checklist);
+      let sorting = clone(this.task.checklist);
       let movingItem = sorting[data.oldIndex];
       sorting.splice(data.oldIndex, 1);
       sorting.splice(data.newIndex, 0, movingItem);
@@ -591,12 +591,14 @@ export default {
       }
     },
     addChecklistItem (e) {
-      this.task.checklist.push({
+      let checkListItem = {
         id: uuid.v4(),
         text: this.newChecklistItem,
         completed: false,
-      });
-      this.checklist = clone(this.task.checklist);
+      };
+      this.task.checklist.push(checkListItem);
+      // @TODO: managing checklist separately to help with sorting on the UI
+      this.checklist.push(checkListItem);
       this.newChecklistItem = null;
       if (e) e.preventDefault();
     },