Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,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>
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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;
}

Expand Down
64 changes: 64 additions & 0 deletions src/components/Goal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
27 changes: 21 additions & 6 deletions src/components/Profile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand All @@ -74,9 +71,27 @@ export default {
});
},
logout() {
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) => {
Expand Down
13 changes: 9 additions & 4 deletions src/components/navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
7 changes: 5 additions & 2 deletions src/components/top-branding.vue
Original file line number Diff line number Diff line change
@@ -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>

Expand All @@ -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>
2 changes: 2 additions & 0 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();

Expand Down