From dcc9fbf03b369421650e49e15598560171580c8b Mon Sep 17 00:00:00 2001
From: wishinghand <wishinghand@gmail.com>
Date: Mon, 24 Oct 2016 19:45:54 -0700
Subject: [PATCH 1/9] non working commit to show props issue

---
 src/components/Goal.vue     |  2 +-
 src/components/add-goal.vue | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/Goal.vue b/src/components/Goal.vue
index ccd5eee..f1becfa 100644
--- a/src/components/Goal.vue
+++ b/src/components/Goal.vue
@@ -18,7 +18,7 @@
 
         <div v-show="integration.showIntegration" class="animated fadeIn">
           <p>{{integration.description}}</p>
-          <add-goal></add-goal>
+          <add-goal :integration-name="{{integration.name}}"></add-goal>
         </div>
       </div>
     </div>
diff --git a/src/components/add-goal.vue b/src/components/add-goal.vue
index 56f8078..e1d370e 100644
--- a/src/components/add-goal.vue
+++ b/src/components/add-goal.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
-    <div class="colorBlock">Type Your {{tempData.name}} Username</div>
+  <div>data-binding: {{integrationName}}</div>
+    <div class="colorBlock">Type Your {{integrationData.name}} Username</div>
     <input class="input " type="text" v-model="goal.username">
 
     <div class="colorBlock">Choose A Goal</div>
-    <input class="input " type="number" min="{{tempData.min}}" placeholder="{{tempData.name}} requires at least {{tempData.min}} points" v-model="goal.pointGoal">
+    <input class="input " type="number" min="{{tempData.min}}" placeholder="{{integration.name}} requires at least {{tempData.min}} points" v-model="goal.pointGoal">
 
     <div class="colorBlock">Choose Incentive</div>
     <div class="animated fadeIn">
@@ -15,13 +16,16 @@
       </a>
     </p>
   </div>
+  <button class="button is-info is-fullwidth" @click="commit()">Commit</button>
   </div>
 
-  <button class="button is-info is-fullwidth" @click="commit()">Commit</button>
 </template>
 
 <script>
   export default {
+    props: [
+      'integration-name',
+    ],
     data() {
       return {
         showIntegration$Input: true,
@@ -41,7 +45,7 @@
     },
     methods: {
       commit() {
-        this.$http.put('http://localhost:3000/commitments', this.goal).then((response) => {
+        this.$http.put('http://localhost:3000/commitments' + integration.name, this.goal).then((response) => {
           // success callback
           this.success = !this.success;
         }, (response) => {

From e90f3aa05db4ee2763b39efd3eb286ea4f5d99cc Mon Sep 17 00:00:00 2001
From: wishinghand <wishinghand@gmail.com>
Date: Mon, 24 Oct 2016 21:41:16 -0700
Subject: [PATCH 2/9] switched object name to send register details instead of
 login

---
 src/components/Register.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Register.vue b/src/components/Register.vue
index aca681f..231e224 100644
--- a/src/components/Register.vue
+++ b/src/components/Register.vue
@@ -88,7 +88,7 @@ export default {
   methods: {
 
     registerUser() {
-      this.$http.post('http://localhost:3000/auth/register', this.login).then((response) => {
+      this.$http.post('http://localhost:3000/auth/register', this.register).then((response) => {
         // server sends back JWT, we put it in localStorage
         localStorage.setItem('token', response.body.token)
 

From d0d926cf1118c7dffc1424c99f155c0c3c2e9259 Mon Sep 17 00:00:00 2001
From: wishinghand <wishinghand@gmail.com>
Date: Tue, 25 Oct 2016 09:27:40 -0700
Subject: [PATCH 3/9] formatting- indentations

---
 src/components/Dashboard.vue | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
index a2298f6..45c9e5e 100644
--- a/src/components/Dashboard.vue
+++ b/src/components/Dashboard.vue
@@ -37,18 +37,17 @@ export default {
     };
   },
   ready() {
-        this.$http.get('http://localhost:3000/users').then((response) => {
-            console.log(response)
-            // success callback
-            this.dashboardData = response.body.map(function(i) {
-              return _.extend(i, { showUserInfo: false })
-            })
-          }, (response) => {
-            // error callback
-            this.failure = !this.failure;
-          });
-      }
-
+    this.$http.get('http://localhost:3000/users').then((response) => {
+      console.log(response)
+      // success callback
+      this.dashboardData = response.body.map(function(i) {
+        return _.extend(i, { showUserInfo: false })
+      })
+    }, (response) => {
+      // error callback
+      this.failure = !this.failure;
+    });
+  }
 };
 
 </script>

From bbc78965e3d7161e5f5e4c2a0548bd0de8445cc9 Mon Sep 17 00:00:00 2001
From: wishinghand <wishinghand@gmail.com>
Date: Tue, 25 Oct 2016 09:28:10 -0700
Subject: [PATCH 4/9] added passing of props

---
 src/components/Goal.vue | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/Goal.vue b/src/components/Goal.vue
index f1becfa..916388d 100644
--- a/src/components/Goal.vue
+++ b/src/components/Goal.vue
@@ -18,7 +18,7 @@
 
         <div v-show="integration.showIntegration" class="animated fadeIn">
           <p>{{integration.description}}</p>
-          <add-goal :integration-name="{{integration.name}}"></add-goal>
+          <add-goal :integration-name="integration.name" :integration-short-name="integration.short_name"></add-goal>
         </div>
       </div>
     </div>
@@ -28,7 +28,6 @@
 
 <script>
 import addGoal from './add-goal.vue';
-
 import _ from 'lodash';
 
 export default {
@@ -36,7 +35,9 @@ export default {
   data() {
     return {
       showIntegration: true,
-      integrations: "",
+      integrations: {
+        name: "",
+      },
     };
   },
   methods: {
@@ -63,21 +64,22 @@ export default {
 </script>
 
 <style lang="css" scoped>
-    .page-title {
+  .page-title {
     font-size: 1.8rem;
     color: #587272;
     margin-right: 2%;
     padding-bottom: 2%;
   }
-   .goal-vertical-spacing {
-      margin-top: .75rem;
-    }
 
-    .submitButton {
-      margin-left: 5%;
-    }
+  .goal-vertical-spacing {
+    margin-top: .75rem;
+  }
 
-    .integrationPanel{
-      margin-bottom: .5rem;
-    }
+  .submitButton {
+    margin-left: 5%;
+  }
+
+  .integrationPanel{
+    margin-bottom: .5rem;
+  }
 </style>
\ No newline at end of file

From 3e6e9ead175215a4e6fdc68329157d72deb340b7 Mon Sep 17 00:00:00 2001
From: wishinghand <wishinghand@gmail.com>
Date: Tue, 25 Oct 2016 09:29:21 -0700
Subject: [PATCH 5/9] receving props

---
 src/components/add-goal.vue | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/add-goal.vue b/src/components/add-goal.vue
index e1d370e..73e699b 100644
--- a/src/components/add-goal.vue
+++ b/src/components/add-goal.vue
@@ -1,30 +1,29 @@
 <template>
   <div>
-  <div>data-binding: {{integrationName}}</div>
-    <div class="colorBlock">Type Your {{integrationData.name}} Username</div>
+    <div class="colorBlock">Type Your {{integrationName}} Username:</div>
     <input class="input " type="text" v-model="goal.username">
 
     <div class="colorBlock">Choose A Goal</div>
-    <input class="input " type="number" min="{{tempData.min}}" placeholder="{{integration.name}} requires at least {{tempData.min}} points" v-model="goal.pointGoal">
+    <input class="input " type="number" min="{{tempData.min}}" placeholder="{{integrationName}} requires at least {{tempData.min}} points" v-model="goal.pointGoal">
 
     <div class="colorBlock">Choose Incentive</div>
     <div class="animated fadeIn">
-    <p class="control has-addons has-addons-centered">
-      <input class="input" type="text" placeholder="$5 to $1000" v-model="goal.amount">
-      <a class="button is-active">
-        <strong>Amount</strong>
-      </a>
-    </p>
+      <p class="control has-addons has-addons-centered">
+        <input class="input" type="number" max="1000" placeholder="$5 to $1000" v-model="goal.amount">
+        <a class="button is-active">
+          <strong>Amount</strong>
+        </a>
+      </p>
+    </div>
+    <button class="button is-info is-fullwidth" @click="commit()">Commit</button>
   </div>
-  <button class="button is-info is-fullwidth" @click="commit()">Commit</button>
-  </div>
-
 </template>
 
 <script>
   export default {
     props: [
       'integration-name',
+      'integration-short-name',
     ],
     data() {
       return {
@@ -39,13 +38,13 @@
         goal: {
           username: '',
           pointGoal: '',
-          amount: 500,
         }
       };
     },
     methods: {
       commit() {
-        this.$http.put('http://localhost:3000/commitments' + integration.name, this.goal).then((response) => {
+        var shortname = this.integrationShortName.toLowerCase();
+        this.$http.put('http://localhost:3000/commitments/' + shortname, this.goal).then((response) => {
           // success callback
           this.success = !this.success;
         }, (response) => {

From 25889c05dfb20a3641ed0c54a84c703a25e4cbb2 Mon Sep 17 00:00:00 2001
From: wishinghand <wishinghand@gmail.com>
Date: Tue, 25 Oct 2016 10:53:03 -0700
Subject: [PATCH 6/9] adding environment variables

---
 config/dev.env.js  | 3 ++-
 config/prod.env.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index efead7c..cb4c150 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -2,5 +2,6 @@ var merge = require('webpack-merge')
 var prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"'
+  NODE_ENV: '"development"',
+  API_URL: 'http://localhost:3000/'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 773d263..dcdcf67 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,3 +1,4 @@
 module.exports = {
-  NODE_ENV: '"production"'
+  NODE_ENV: '"production"',
+  API_URL: 'https://incentifyapi.herokuapp.com/'
 }

From 337e229e94440ff721a8e8b0f938a12a03485386 Mon Sep 17 00:00:00 2001
From: wishinghand <wishinghand@gmail.com>
Date: Tue, 25 Oct 2016 10:59:00 -0700
Subject: [PATCH 7/9] adding DEBUG keys to environment files

---
 config/dev.env.js  | 1 +
 config/prod.env.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/dev.env.js b/config/dev.env.js
index cb4c150..e8e46cd 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -2,6 +2,7 @@ var merge = require('webpack-merge')
 var prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
+  DEBUG_MODE: true,
   NODE_ENV: '"development"',
   API_URL: 'http://localhost:3000/'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index dcdcf67..37720fe 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,4 +1,5 @@
 module.exports = {
+  DEBUG_MODE: false,
   NODE_ENV: '"production"',
   API_URL: 'https://incentifyapi.herokuapp.com/'
 }

From a59a8eb59549c47e1050fe00041ee6ee4bf3d5c4 Mon Sep 17 00:00:00 2001
From: Reggie Sibley <Tre@Reggies-MacBook-Pro.local>
Date: Tue, 25 Oct 2016 13:54:06 -0700
Subject: [PATCH 8/9] added enviroment variables

---
 config/dev.env.js            | 2 +-
 config/prod.env.js           | 2 +-
 src/components/Dashboard.vue | 2 +-
 src/components/Goal.vue      | 2 +-
 src/components/Profile.vue   | 5 ++---
 src/components/Register.vue  | 4 ++--
 src/components/add-goal.vue  | 3 ++-
 src/main.js                  | 1 +
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/config/dev.env.js b/config/dev.env.js
index e8e46cd..a499fad 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -4,5 +4,5 @@ var prodEnv = require('./prod.env')
 module.exports = merge(prodEnv, {
   DEBUG_MODE: true,
   NODE_ENV: '"development"',
-  API_URL: 'http://localhost:3000/'
+  API_URL: '"http://localhost:3000"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index 37720fe..6576b0b 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,5 @@
 module.exports = {
   DEBUG_MODE: false,
   NODE_ENV: '"production"',
-  API_URL: 'https://incentifyapi.herokuapp.com/'
+  API_URL: '"https://incentifyapi.herokuapp.com"'
 }
diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
index 45c9e5e..bf7c968 100644
--- a/src/components/Dashboard.vue
+++ b/src/components/Dashboard.vue
@@ -37,7 +37,7 @@ export default {
     };
   },
   ready() {
-    this.$http.get('http://localhost:3000/users').then((response) => {
+    this.$http.get(process.env.API_URL + '/users').then((response) => {
       console.log(response)
       // success callback
       this.dashboardData = response.body.map(function(i) {
diff --git a/src/components/Goal.vue b/src/components/Goal.vue
index 916388d..80be6c8 100644
--- a/src/components/Goal.vue
+++ b/src/components/Goal.vue
@@ -49,7 +49,7 @@ export default {
     addGoal,
   },
   ready() {
-    this.$http.get('http://localhost:3000/integrations').then((response) => {
+    this.$http.get(process.env.API_URL + '/integrations').then((response) => {
       // success callback
       this.integrations = response.body.map(function(i) {
         return _.extend(i, { showIntegration: false })
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index 91b91a1..69a97c8 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -42,7 +42,6 @@
 
 <script>
 
-
 export default {
   data() {
     return {
@@ -65,7 +64,7 @@ export default {
     },
     submitProfile() {
       // vue-resource POST of new user data
-      this.$http.put('http://localhost:3000/users', this.profile).then((response) => {
+      this.$http.put(process.env.API_URL + '/users', this.profile).then((response) => {
         // success callback
         this.formDisabled = !this.formDisabled;
         this.success = !this.success;
@@ -76,7 +75,7 @@ export default {
     },
   },
   created() {
-    this.$http.get('http://localhost:3000/users').then((response) => {
+    this.$http.get(process.env.API_URL + '/users').then((response) => {
       // success callback
       console.log(response);
       this.profileData.email = response.body[0].email;
diff --git a/src/components/Register.vue b/src/components/Register.vue
index 231e224..e26b360 100644
--- a/src/components/Register.vue
+++ b/src/components/Register.vue
@@ -88,7 +88,7 @@ export default {
   methods: {
 
     registerUser() {
-      this.$http.post('http://localhost:3000/auth/register', this.register).then((response) => {
+      this.$http.post(process.env.API_URL + '/auth/register', this.register).then((response) => {
         // server sends back JWT, we put it in localStorage
         localStorage.setItem('token', response.body.token)
 
@@ -115,7 +115,7 @@ export default {
       });
     },
     loginUser() {
-        this.$http.post('http://localhost:3000/auth/login', this.login).then((response) => {
+        this.$http.post(process.env.API_URL + '/auth/login', this.login).then((response) => {
           // server sends back JWT, we put it in localStorage
 
           localStorage.setItem('token', response.body.token)
diff --git a/src/components/add-goal.vue b/src/components/add-goal.vue
index 73e699b..06da52a 100644
--- a/src/components/add-goal.vue
+++ b/src/components/add-goal.vue
@@ -44,7 +44,8 @@
     methods: {
       commit() {
         var shortname = this.integrationShortName.toLowerCase();
-        this.$http.put('http://localhost:3000/commitments/' + shortname, this.goal).then((response) => {
+        this.$http.post(process.env.API_URL + '/commitments' + shortname, this.goal)
+        .then((response) => {
           // success callback
           this.success = !this.success;
         }, (response) => {
diff --git a/src/main.js b/src/main.js
index 55c9ed3..59e2622 100644
--- a/src/main.js
+++ b/src/main.js
@@ -24,6 +24,7 @@ const router = new VueRouter();
 
 // get rid of 300ms tap delay
 FastClick.attach(document.body);
+console.log(process.env.API_URL);
 
 router.map({
   '/': {

From f78980d232f78ff26124dd0c348a445175a99199 Mon Sep 17 00:00:00 2001
From: Reggie Sibley <Tre@Reggies-MacBook-Pro.local>
Date: Tue, 25 Oct 2016 16:01:01 -0700
Subject: [PATCH 9/9] commitment on add-goal screen now works

---
 src/components/Dashboard.vue | 4 ++--
 src/components/Profile.vue   | 7 ++++++-
 src/components/add-goal.vue  | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
index bf7c968..2e52aaa 100644
--- a/src/components/Dashboard.vue
+++ b/src/components/Dashboard.vue
@@ -8,7 +8,7 @@
     <div class="card is-fullwidth goal-vertical-spacing">
         <div class="card-content">
             <div class="content">
-                <h1><strong>Treehouse</strong> comrww <img src="../assets/treehouse-logo.png" class="is-pulled-right goal-provider-icon"></h1>
+                <h1><strong>Treehouse</strong> Reggiesibley <img src="../assets/treehouse-logo.png" class="is-pulled-right goal-provider-icon"></h1>
                 <progress class="progress is-small is-success" value="45" max="100">45%</progress>
                 <h3>45% of {{55}} Points</h3> Time Remaining: 1 day, 23 hours, 21 minutes
             </div>
@@ -18,7 +18,7 @@
     <div class="card is-fullwidth goal-vertical-spacing">
         <div class="card-content">
             <div class="content">
-                <h1><strong>DuoLingo</strong> comrww <img src="../assets/duolingo-logo.png" class="is-pulled-right goal-provider-icon"></h1>
+                <h1><strong>DuoLingo</strong> Reggiesibley <img src="../assets/duolingo-logo.png" class="is-pulled-right goal-provider-icon"></h1>
                 <progress class="progress is-small is-success" value="5" max="100">5%</progress>
                 <h3>5% of {{55}} Points</h3> Time Remaining: 2 days, 3 hours, 10 minutes
             </div>
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index 69a97c8..8b74250 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -73,6 +73,11 @@ export default {
         this.failure = !this.failure;
       });
     },
+      logout() {
+        console.log("hi")
+        localStorage.removeItem('token')
+        this.$router.go('/');
+     }
   },
   created() {
     this.$http.get(process.env.API_URL + '/users').then((response) => {
@@ -83,7 +88,7 @@ export default {
       // error callback
       this.failure = !this.failure;
     });
-  }
+  },
 };
 </script>
 
diff --git a/src/components/add-goal.vue b/src/components/add-goal.vue
index 06da52a..69f4904 100644
--- a/src/components/add-goal.vue
+++ b/src/components/add-goal.vue
@@ -44,7 +44,7 @@
     methods: {
       commit() {
         var shortname = this.integrationShortName.toLowerCase();
-        this.$http.post(process.env.API_URL + '/commitments' + shortname, this.goal)
+        this.$http.post(process.env.API_URL + '/commitments/' + shortname, this.goal)
         .then((response) => {
           // success callback
           this.success = !this.success;