From 3f16d298acf2aa2fe3903d98fc833471f5fb4310 Mon Sep 17 00:00:00 2001
From: Reggie Sibley <Tre@Reggies-MacBook-Pro.local>
Date: Wed, 26 Oct 2016 15:39:28 -0700
Subject: [PATCH] added styling to the app, and sweetalert

---
 index.html                      | 11 ------
 package.json                    |  4 ++-
 src/App.vue                     |  3 +-
 src/components/Goal.vue         | 64 +++++++++++++++++++++++++++++++++
 src/components/Profile.vue      | 28 +++++++++++----
 src/components/navbar.vue       | 13 ++++---
 src/components/top-branding.vue |  7 ++--
 src/main.js                     |  2 ++
 8 files changed, 106 insertions(+), 26 deletions(-)

diff --git a/index.html b/index.html
index e9b0396..1765deb 100644
--- a/index.html
+++ b/index.html
@@ -9,15 +9,4 @@
     <!-- built files will be auto injected -->
     <app></app>
   </body>
-  <form action="http://localhost:3000/stripe/charge" method="POST">
-    <script
-      src="https://checkout.stripe.com/checkout.js" class="stripe-button"
-      data-key="pk_test_IF0JbVVp7Swqk9quPb0tJMyG"
-      data-amount="999"
-      data-name="Incentify"
-      data-description="Pay for your {{data.name}} commitment"
-      data-image="https://stripe.com/img/documentation/checkout/marketplace.png"
-      data-locale="auto">
-    </script>
-  </form>
 </html>
\ No newline at end of file
diff --git a/package.json b/package.json
index 22308c8..82b1406 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,9 @@
     "font-awesome": "^4.6.3",
     "lodash": "^4.16.4",
     "stripe": "^4.12.0",
-    "vue": "^1.0.21"
+    "sweetalert": "^1.1.3",
+    "vue": "^1.0.21",
+    "vue-sweetalert": "^0.1.15"
   },
   "devDependencies": {
     "babel-core": "^6.0.0",
diff --git a/src/App.vue b/src/App.vue
index 49e149e..db97b1c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,6 +13,7 @@
   import Vue from 'vue';
   import auth from './auth/index.js';
 
+
   require('bulma/bulma.sass');
   require('animate.css/animate.css');
   require('!style!css!sass!font-awesome/scss/font-awesome.scss');
@@ -55,7 +56,7 @@
 
   /* this makes the sticky headers/footers without covering up the content */
   #app{
-    margin-top: 5rem;
+    margin-top: 9rem;
     margin-bottom: 3.5rem;
   }
 
diff --git a/src/components/Goal.vue b/src/components/Goal.vue
index 80be6c8..9c3da5d 100644
--- a/src/components/Goal.vue
+++ b/src/components/Goal.vue
@@ -24,6 +24,70 @@
     </div>
   </div>
 </div>
+
+<div class="modal">
+  <div class="modal-background"></div>
+  <div class="modal-card">
+    <header class="modal-card-head">
+      <p class="modal-card-title">Modal title</p>
+      <button class="delete"></button>
+    </header>
+    <section class="modal-card-body">
+      Hello World
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla accumsan, metus ultrices eleifend gravida, nulla nunc varius lectus, nec rutrum justo nibh eu lectus. Ut vulputate semper dui. Fusce erat odio, sollicitudin vel erat vel, interdum mattis neque.
+
+Second level
+
+Curabitur accumsan turpis pharetra augue tincidunt blandit. Quisque condimentum maximus mi, sit amet commodo arcu rutrum id. Proin pretium urna vel cursus venenatis. Suspendisse potenti. Etiam mattis sem rhoncus lacus dapibus facilisis. Donec at dignissim dui. Ut et neque nisl.
+
+In fermentum leo eu lectus mollis, quis dictum mi aliquet.
+Morbi eu nulla lobortis, lobortis est in, fringilla felis.
+Aliquam nec felis in sapien venenatis viverra fermentum nec lectus.
+Ut non enim metus.
+Third level
+
+Quisque ante lacus, malesuada ac auctor vitae, congue non ante. Phasellus lacus ex, semper ac tortor nec, fringilla condimentum orci. Fusce eu rutrum tellus.
+
+Donec blandit a lorem id convallis.
+Cras gravida arcu at diam gravida gravida.
+Integer in volutpat libero.
+Donec a diam tellus.
+Aenean nec tortor orci.
+Quisque aliquam cursus urna, non bibendum massa viverra eget.
+Vivamus maximus ultricies pulvinar.
+Ut venenatis, nisl scelerisque sollicitudin fermentum, quam libero hendrerit ipsum, ut blandit est tellus sit amet turpis.
+Quisque at semper enim, eu hendrerit odio. Etiam auctor nisl et justo sodales elementum. Maecenas ultrices lacus quis neque consectetur, et lobortis nisi molestie.
+
+Sed sagittis enim ac tortor maximus rutrum. Nulla facilisi. Donec mattis vulputate risus in luctus. Maecenas vestibulum interdum commodo.
+
+Suspendisse egestas sapien non felis placerat elementum. Morbi tortor nisl, suscipit sed mi sit amet, mollis malesuada nulla. Nulla facilisi. Nullam ac erat ante.
+
+Fourth level
+
+Nulla efficitur eleifend nisi, sit amet bibendum sapien fringilla ac. Mauris euismod metus a tellus laoreet, at elementum ex efficitur.
+
+Maecenas eleifend sollicitudin dui, faucibus sollicitudin augue cursus non. Ut finibus eleifend arcu ut vehicula. Mauris eu est maximus est porta condimentum in eu justo. Nulla id iaculis sapien.
+
+Phasellus porttitor enim id metus volutpat ultricies. Ut nisi nunc, blandit sed dapibus at, vestibulum in felis. Etiam iaculis lorem ac nibh bibendum rhoncus. Nam interdum efficitur ligula sit amet ullamcorper. Etiam tristique, leo vitae porta faucibus, mi lacus laoreet metus, at cursus leo est vel tellus. Sed ac posuere est. Nunc ultricies nunc neque, vitae ultricies ex sodales quis. Aliquam eu nibh in libero accumsan pulvinar. Nullam nec nisl placerat, pretium metus vel, euismod ipsum. Proin tempor cursus nisl vel condimentum. Nam pharetra varius metus non pellentesque.
+
+Fifth level
+
+Aliquam sagittis rhoncus vulputate. Cras non luctus sem, sed tincidunt ligula. Vestibulum at nunc elit. Praesent aliquet ligula mi, in luctus elit volutpat porta. Phasellus molestie diam vel nisi sodales, a eleifend augue laoreet. Sed nec eleifend justo. Nam et sollicitudin odio.
+
+Sixth level
+
+Cras in nibh lacinia, venenatis nisi et, auctor urna. Donec pulvinar lacus sed diam dignissim, ut eleifend eros accumsan. Phasellus non tortor eros. Ut sed rutrum lacus. Etiam purus nunc, scelerisque quis enim vitae, malesuada ultrices turpis. Nunc vitae maximus purus, nec consectetur dui. Suspendisse euismod, elit vel rutrum commodo, ipsum tortor maximus dui, sed varius sapien odio vitae est. Etiam at cursus metus.
+Save changes
+Cancel
+
+    </section>
+    <footer class="modal-card-foot">
+      <a class="button is-primary">Save changes</a>
+      <a class="button">Cancel</a>
+    </footer>
+  </div>
+</div>
 </template>
 
 <script>
diff --git a/src/components/Profile.vue b/src/components/Profile.vue
index 8b74250..36dc0c1 100644
--- a/src/components/Profile.vue
+++ b/src/components/Profile.vue
@@ -59,9 +59,6 @@ export default {
     };
   },
   methods: {
-    editProfile() {
-      this.formDisabled = !this.formDisabled;
-    },
     submitProfile() {
       // vue-resource POST of new user data
       this.$http.put(process.env.API_URL + '/users', this.profile).then((response) => {
@@ -74,10 +71,27 @@ export default {
       });
     },
       logout() {
-        console.log("hi")
-        localStorage.removeItem('token')
-        this.$router.go('/');
-     }
+        var that = this;
+        this.$swal({
+          title: 'Logout',
+          text: "Are you sure you want to logout?",
+          type: 'warning',
+          showCancelButton: true,
+          confirmButtonColor: '#3085d6',
+          cancelButtonColor: '#d33',
+          confirmButtonText: 'Logout'
+      }).then(function() {
+        // swal(
+        //   function() {
+          // 'Deleted!',
+          // 'Your file has been deleted.',
+          // 'success',
+          localStorage.removeItem('token')
+          that.$router.go('/');
+        // }
+        // )
+      })
+     },
   },
   created() {
     this.$http.get(process.env.API_URL + '/users').then((response) => {
diff --git a/src/components/navbar.vue b/src/components/navbar.vue
index b376790..a49dd1f 100644
--- a/src/components/navbar.vue
+++ b/src/components/navbar.vue
@@ -6,21 +6,21 @@
       <!-- Dashboard -->
       <li v-bind:class="{ 'is-active': isActive.tab === 1}">
         <a v-link="{path:'dashboard'}" @click="isActive.tab = 1">
-          <span class="icon"><i class="fa fa-tachometer navbar-font-size" aria-hidden="true"></i></span>
+          <span class=""><i class="fa fa-tachometer navbar-font-size" aria-hidden="true"></i></span>
         </a>
       </li>
 
       <!-- Goal -->
       <li v-bind:class="{ 'is-active': isActive.tab === 2}">
         <a v-link="{path:'goal'}" @click="isActive.tab = 2">
-          <span class="icon"><i class="fa fa-plus navbar-font-size" aria-hidden="true"></i></span>
+          <span class=""><i class="fa fa-plus navbar-font-size" aria-hidden="true"></i></span>
         </a>
       </li>
 
       <!-- Profile -->
       <li v-bind:class="{ 'is-active': isActive.tab === 3}">
         <a v-link="{path:'profile'}" @click="isActive.tab = 3">
-          <span class="icon"><i class="fa fa-user navbar-font-size" aria-hidden="true"></i></span>
+          <span class=""><i class="fa fa-user navbar-font-size" aria-hidden="true"></i></span>
         </a>
       </li>
 
@@ -55,6 +55,11 @@
 <style scoped>
 
   .navbar-font-size {
-    font-size: 3rem;
+    font-size: 2rem;
   }
+
+  .tabs.is-toggle li.is-active a {
+    color: #fff !important;
+  }
+
 </style>
diff --git a/src/components/top-branding.vue b/src/components/top-branding.vue
index 457f784..8587205 100644
--- a/src/components/top-branding.vue
+++ b/src/components/top-branding.vue
@@ -1,6 +1,6 @@
 <template>
 	<nav class="box box-slim stickyHeader">
-      <a class="" href="#"><img class="logo-size" src="../assets/incentify-logo-rectangle.png"></a>
+      <a class="" href="#"><img class="logo-size" src="../assets/incentify.logo.png"></a>
   </nav>
 </template>
 
@@ -23,13 +23,16 @@ export default {
     top: 0;
     width:  100%;
     border-radius: 0px;
+    background-color: #61cbec; 
   }
 
   .logo-size{
-    width: 12rem;
+    margin:0 auto;
+
   }
 
   .box-slim{
     padding: 1%;
+    padding: 1rem;
   }
 </style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 59e2622..d2f96bd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,6 +3,7 @@ import App from './App';
 import VueRouter from 'vue-router';
 import VueResource from 'vue-resource';
 import FastClick from 'fastclick';
+import VueSweetAlert from 'vue-sweetalert';
 // import Interceptor from './auth/interceptor.js';
 
 // routes
@@ -12,6 +13,7 @@ import Settings from './components/Settings.vue';
 import Dashboard from './components/Dashboard.vue';
 import Goal from './components/Goal.vue';
 
+Vue.use(VueSweetAlert);
 // global HTTP header interception
 // Interceptor.init();