diff --git a/README.md b/README.md
index 6c4496b..db6ab8d 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,15 @@ vue.js + express.js app starter
 ## Included
  - vue + vue-router with example components
  - express server with routes and api
+ - vue authenticated session with vuex integrated with express
+ - vue express routers integrated login api
+ - vue express integrated authentication,routes,session
  - simple json based database (lowdb)
+ - signup & login using mysql knex bookshelf passport express-session express-mysqlstore vuex axios
  - building\watching scripts and tools
+ - 
+ + Added to Login samples screen Express and Vue joined vuex store with express passport & express session sample using axios 
+ + Added links from  Express to Vue  and  Vue to Express & check if user is loggedin , getuser info
 
 ## Installation
 
diff --git a/template/.babelrc b/template/.babelrc
index c13c5f6..f62a3ba 100644
--- a/template/.babelrc
+++ b/template/.babelrc
@@ -1,3 +1,3 @@
 {
-  "presets": ["es2015"]
-}
+    "presets": ["es2015", "stage-2"]
+}
\ No newline at end of file
diff --git a/template/client/src/client.js b/template/client/src/client.js
index 95db287..7779fdc 100644
--- a/template/client/src/client.js
+++ b/template/client/src/client.js
@@ -1,9 +1,11 @@
 import Vue from 'vue';
 import router from './router/router.js';
 import App from './components/App.vue';
+import store  from './modules/store/';
 
 new Vue({
   el: '#vue-app',
+  store:store,
   router: router,
   render: createElement => createElement(App)
-});
\ No newline at end of file
+});
diff --git a/template/client/src/components/App.vue b/template/client/src/components/App.vue
index 4c4f35d..7b7ab0e 100644
--- a/template/client/src/components/App.vue
+++ b/template/client/src/components/App.vue
@@ -3,6 +3,12 @@
     <nav>
       <span>Vue router links: </span>
       <router-link to="/" exact>Home</router-link>
+      <router-link to="/vuelogin">vuelogin</router-link>
+      <router-link to="/vueauth">vueauth</router-link>
+      <router-link to="/vueprofile">protectedlink</router-link>
+      <router-link to="/isLoggedIn">isLoggedIn</router-link>
+      <router-link to="/getUser">getUser</router-link>
+      <router-link to='/login'>explogin</router-link>
       <router-link to="/about">About</router-link>
       <router-link to="/contacts">Contacts</router-link>
       <router-link to="/!@#$%">404 page</router-link>
@@ -15,4 +21,4 @@
 export default {
   name: 'app'
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/template/client/src/modules/store/actions.js b/template/client/src/modules/store/actions.js
new file mode 100644
index 0000000..d7b9a54
--- /dev/null
+++ b/template/client/src/modules/store/actions.js
@@ -0,0 +1,153 @@
+import Vue from "vue";
+import axios from "axios";
+import { ADD_MESSAGE, ADD_NOTIFICATION, SET_USER, SESSION, LOGIN, LOGOUT, LOGIN_SUCCESS, LOGIN_ERROR, LOGIN_FAILED, ISLOGGEDIN} from "./types";
+
+export const NAMESPACE= "/api/session";
+export const VERSION="/v1";
+
+
+export const addMessage = ({ commit,state }, item) => {
+	commit(ADD_MESSAGE, item);
+};
+
+export const addNotification = ({ commit,state }, item) => {
+	commit(ADD_NOTIFICATION, item);
+};
+
+export default {
+
+/**
+   * Authenticates a new user with given email and password
+   * @param {object} store
+   * @param {object} email and password
+   */
+	  authenticate({ commit }, {email, password,router}) {
+			return new Promise(resolve => {
+        setTimeout(() => {
+	       commit(LOGIN); // show spinner
+				 let sr=this.$router
+					 let sdata={
+							 email: email,
+							 password: password
+						 }
+
+							 	axios.post('/loginvue',sdata) .then(function (response) {
+							 					let user =  response.data.user;
+												localStorage.setItem("token", "JWT");
+							 				 commit(SET_USER, user)
+							 				 if (user ) {
+							 					 commit('setDisplayName', user.displayName)
+							        	 commit(LOGIN_SUCCESS);
+												 commit(ISLOGGEDIN,1);
+											 }
+											 else {
+												 commit(LOGIN_FAILED);
+												 commit(ISLOGGEDIN,0);
+											 }
+							          resolve();
+												router.push(response.data.path,{params:{user:response.data.user,found:response.data.found}})
+
+			 })
+			 .catch(function (error) {
+				 commit(ISLOGGEDIN,0);
+				  commit(LOGIN_ERROR,error.message);
+			 })
+
+		 }, 1000);
+	 });
+   },
+	 /**
+		* checks if  the user is isLoggedIn the application
+		* @param {object} store
+		*/
+    isLoggedIn({ commit }) {
+			return new Promise(resolve => {
+				setTimeout(() => {
+			  localStorage.removeItem("token");
+		 localStorage.setItem("token", "JWT");
+		 axios.post('/isLoggedIn') .then(function (response) {
+			 commit(ISLOGGEDIN,response.data.isLoggedIn);
+			// return (response.isLoggedIn);
+  })
+ .catch(function (error) {
+	 commit(ISLOGGEDIN,0);
+	 commit(LOGIN_ERROR,error.message);
+	 //console.log(error);
+ resolve();
+})
+}, 1000);
+});
+
+},
+	 /**
+		* fetches the LoggedIn user of the application
+		* @param {object} store
+		*/
+    getLoggedInUser({ commit }) {
+			return new Promise(resolve => {
+        setTimeout(() => {
+ 			localStorage.removeItem("token");
+		 axios.post('/getLoggedInUser') .then(function (response) {
+			 let user =  response.data.user;
+ 			localStorage.setItem("token", "JWT");
+ 		 commit(SET_USER, user);
+ 		resolve();
+  })
+ .catch(function (error) {
+	 commit(LOGIN_ERROR,error.message);
+	 //console.log(error);
+ resolve();
+})
+}, 1000);
+});
+
+},
+	 /**
+		* FEtches the session of the user , probably not the best way to go  in
+		security terms,  better to add/find/remove/get/set api for items in session
+		usnig vuex && axios rather than sharing the session itself, just shown here for
+		simplicity...
+		* @param {object} store
+		*/
+    getUserSession({ commit }) {
+			return new Promise(resolve => {
+				setTimeout(() => {
+     localStorage.removeItem("token");
+		  axios.post('/getUserSession') .then(function (response) {
+				localStorage.setItem("token", response.data.session.sessId);
+			 commit(SESSION,response.data.session);
+resolve();
+  })
+ .catch(function (error) {
+	 commit(LOGIN_ERROR,error.message);
+ //console.log(error);
+ resolve();
+})
+}, 1000);
+});
+
+},
+
+	 /**
+	  * Logouts the user from the application
+	  * @param {object} store
+	  */
+	 logout({ commit }) {
+		 return new Promise(resolve => {
+		 	setTimeout(() => {
+		localStorage.removeItem("token");
+	 	axios.post('/logoutvue') .then(function (response) {
+	 	 commit(LOGOUT);
+		 resolve();
+	 })
+	 .catch(function (error) {
+	 commit(LOGOUT);
+	// console.log(error);
+	 resolve();
+	 })
+ }, 1000);
+});
+
+	 }
+
+};
diff --git a/template/client/src/modules/store/getters.js b/template/client/src/modules/store/getters.js
new file mode 100644
index 0000000..08c8b38
--- /dev/null
+++ b/template/client/src/modules/store/getters.js
@@ -0,0 +1,10 @@
+export default {
+ me:state=> state.user,
+  getSession: state => state.session,
+  getUser: state => state.user,
+  getDisplayName: state => state.displayName,
+  getMessages: state => state.messages,
+  getNotifications: state => state.notifications,
+	isLoggedIn: state => state.isLoggedIn&&state.user,
+	getErrorMesg: state => state.errormesg
+}
diff --git a/template/client/src/modules/store/index.js b/template/client/src/modules/store/index.js
new file mode 100644
index 0000000..f135460
--- /dev/null
+++ b/template/client/src/modules/store/index.js
@@ -0,0 +1,23 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+import state from './state'
+import getters from './getters'
+import mutations from './mutations'
+import actions from './actions'
+import types from "./types";
+Vue.use(Vuex)
+
+
+export default new Vuex.Store({
+	namespaced: true,
+     state: {
+    ...state
+
+  },
+  getters,
+  mutations: {
+    ...mutations,
+  },
+  actions,
+	types
+})
diff --git a/template/client/src/modules/store/mutations.js b/template/client/src/modules/store/mutations.js
new file mode 100644
index 0000000..8b42ad0
--- /dev/null
+++ b/template/client/src/modules/store/mutations.js
@@ -0,0 +1,48 @@
+import { ADD_MESSAGE, ADD_NOTIFICATION, SET_USER, SESSION, LOGIN, LOGOUT, LOGIN_SUCCESS, LOGIN_ERROR, LOGIN_FAILED, ISLOGGEDIN} from "./types";
+export default {
+
+	    [LOGIN] (state) {
+	      state.pending = true;
+	    },
+			[LOGIN_SUCCESS] (state) {
+	      state.isLoggedIn = 1;
+	      state.pending = false;
+	    },
+			[LOGIN_ERROR] (state,value) {
+	      state.pending = false;
+				state.errormesg = value;
+	    },
+			[LOGIN_FAILED] (state) {
+	      state.isLoggedIn = 0;
+	      state.pending = false;
+	    },
+			[LOGIN_SUCCESS] (state) {
+	      state.isLoggedIn = 1;
+	      state.pending = false;
+	    },
+
+			[ISLOGGEDIN] (state,value) {
+	      state.isLoggedIn = value;
+	     },
+	    [LOGOUT](state) {
+	      state.isLoggedIn = 0;
+	    },
+
+	[ADD_MESSAGE] (state, item) {
+		state.messages.splice(0);
+		state.messages.push(item);
+	},
+
+	[ADD_NOTIFICATION] (state, item) {
+		state.notifications.splice(0);
+		state.notifications.push(item);
+	},
+
+	[SET_USER] (state, user) {
+		state.user = user;
+	},
+	[SESSION]  (state, session) {
+		state.session = session;
+	},
+ 
+}
diff --git a/template/client/src/modules/store/state.js b/template/client/src/modules/store/state.js
new file mode 100644
index 0000000..ef8fa3a
--- /dev/null
+++ b/template/client/src/modules/store/state.js
@@ -0,0 +1,18 @@
+const user = null
+const session =null
+const isLoggedIn=0
+const displayName = ''
+const notifications= [
+		{ id: 1, text: "Something happened!", time: 1, user: null }
+	]
+const messages= []
+const errormesg = null
+export default {
+  user,
+	errormesg,
+  session,
+	isLoggedIn,
+  displayName,
+  notifications,
+  messages
+}
diff --git a/template/client/src/modules/store/types.js b/template/client/src/modules/store/types.js
new file mode 100644
index 0000000..fbfde74
--- /dev/null
+++ b/template/client/src/modules/store/types.js
@@ -0,0 +1,10 @@
+export const ADD_NOTIFICATION 	= "ADD_NOTIFICATION";
+export const ADD_MESSAGE 				= "ADD_MESSAGE";
+export const SET_USER	 				  = "SET_SESSION_USER";
+export const SESSION	 				  = "SESSION";
+export const ISLOGGEDIN         = "ISLOGGEDIN";
+export const LOGIN              = "LOGIN";
+export const LOGIN_SUCCESS      = "LOGIN_SUCCESS";
+export const LOGIN_FAILED       = "LOGIN_FAILED";
+export const LOGIN_ERROR        = "LOGIN_ERROR";
+export const LOGOUT             = "LOGOUT";
diff --git a/template/client/src/pages/ContactsPage.vue b/template/client/src/pages/ContactsPage.vue
index 0f7abc2..4d44da4 100644
--- a/template/client/src/pages/ContactsPage.vue
+++ b/template/client/src/pages/ContactsPage.vue
@@ -14,4 +14,4 @@ export default {
   }
 
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/template/client/src/pages/LoginPage.vue b/template/client/src/pages/LoginPage.vue
new file mode 100644
index 0000000..0c4bd5e
--- /dev/null
+++ b/template/client/src/pages/LoginPage.vue
@@ -0,0 +1,108 @@
+<template lang='ejs'>
+<div style="position:relative ;flow:left;">
+<div style="position:absolute`">
+    <!-- Site stylesheet-->
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css"> <!-- load bootstrap css -->
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css"> <!-- load fontawesome -->
+  <!--style>
+      body 		{ padding-top:80px; }
+  </style-->
+  <div class="bg"></div>
+    <div class="bg-overlay"></div>
+    <div class="center">
+    <div class="panel">
+      <div class="bg"></div>
+      <div class="bg-overlay"></div>
+      <div class="content">
+
+
+<div class="">
+<!--div style="  background:red; color:white; padding:10px;" v-if="failedlogin">
+I should only display if  <strong>failedlogin</strong>
+</div-->
+
+<div><small>Login</small></div>
+<form method="POST" action="/login" @submit.prevent="login({ email, password })">
+  <div class="form-group">
+    <input class="rounded-0 border-top-0 border-left-0 border-right-0 form-control" v-model="email" type="email" placeholder="email">
+  </div>
+  <div class="form-group">
+    <input class="rounded-0 border-top-0 border-left-0 border-right-0 form-control" v-model="password" type="password" placeholder="password">
+  </div>
+  <button type="submit" class="rounded-0 btn btn-secondary btn-block">LOGIN</button>
+</form>
+<hr/>
+
+</div>
+
+
+
+<hr>
+
+<p>Need an account? <a href="/signup">Signup</a></p>
+<p>Or go <a href="/">home</a>.</p>
+
+
+</div>
+<div class="flash">
+
+<!-- show any messages that come back with authentication -->
+<% if (message.length > 0) { %>
+<div class="alert alert-danger"><%= message %></div>
+<% } %>
+
+<!-- show any messages that come back with authentication
+
+<div class="alert alert-danger"><%= message %></div>
+<!-- if messages.error--
+<div class="alert alert-danger">
+<!--               for error in messages.erro--
+</div>
+<div>"error.msg"</div>
+<!-- if messages.info--
+<div class="alert alert-success"></div>
+<!--for info in messages.info
+div= info.msg
+//if messages.error
+-->
+</div>
+</div>
+</div>
+</div></div>
+</template>
+<script src="/scripts/frontend.js"></script>
+
+<script>
+
+import {mapActions} from 'vuex'
+import * as axios from 'axios'
+
+export default {
+data (){ return {
+  email: '',
+  password: ''
+}
+},
+computed: {
+},
+methods: {
+...mapActions([ 'authenticate']),
+login: function() {
+ let sr=this.$router
+let sdata={
+    email: this.email,
+    password: this.password,
+    router:sr
+  }
+  this.$store.dispatch('authenticate',sdata);
+  //this.authenticate(sdata);
+}
+
+}
+}
+</script>
+<style scoped>
+button {
+cursor: pointer
+}
+</style>
diff --git a/template/client/src/pages/ProfilePage.vue b/template/client/src/pages/ProfilePage.vue
new file mode 100644
index 0000000..06c55b4
--- /dev/null
+++ b/template/client/src/pages/ProfilePage.vue
@@ -0,0 +1,66 @@
+<template lang='ejs'>
+  <div class="page page--profile">
+    <h3>profile page</h3>
+    <p>{{ welcome }}</p>
+    	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css">
+    	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css">
+
+
+    <div style="padding-top:80px; word-wrap:break-word;">
+    <div class="container">
+
+    	<div class="page-header text-center">
+    		<h1><span class="fa fa-anchor"></span> Profile Page</h1>
+    		<a href="/logout" class="btn btn-default btn-sm">Logout</a>
+    	</div>
+
+    	<div class="row">
+
+    		<!-- LOCAL INFORMATION -->
+    		<div class="col-sm-6">
+    			<div class="well">
+            <h3><span class="fa fa-user"></span>{{ user.email}}Local</h3>
+
+              <p>
+                <strong>id</strong>:  {{user.id}} <br>
+                <strong>email</strong>:  {{user.email}}<br>
+                <strong>password</strong>:  {{user.password}}
+
+    					</p>
+
+    			</div>
+    		</div>
+
+    	</div>
+
+    </div>
+  </div>
+
+  </div>
+</template>
+
+<script>
+import store from '../modules/store'
+export default {
+  data: function() {
+    return {
+      welcome: 'Welcome to profile page!',
+      user:  store.state.user
+
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+  .profile-logo a {
+    padding: 20px;
+    outline: 1px solid rgb(169, 169, 169);
+    display: inline-block;
+  }
+
+  .profile-logo a:hover {
+    opacity: 0.8;
+  }
+</style>
diff --git a/template/client/src/pages/getUser.vue b/template/client/src/pages/getUser.vue
new file mode 100644
index 0000000..3477424
--- /dev/null
+++ b/template/client/src/pages/getUser.vue
@@ -0,0 +1,59 @@
+<template lang='ejs'>
+  <div class="page page--profile">
+    <h3>getLoggedInUser page</h3>
+    <p>{{ welcome }}</p>
+    	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css">
+    	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css">
+
+
+    <div style="padding-top:80px; word-wrap:break-word;">
+    <div class="container">
+
+    	<div class="row">
+          getLoggedInUser:{{user}}
+    		<!-- LOCAL INFORMATION -->
+    		<div class="col-sm-6">
+    			<div class="well">
+
+    			</div>
+    		</div>
+
+    	</div>
+
+    </div>
+  </div>
+
+  </div>
+</template>
+
+<script>
+import {mapActions} from 'vuex'
+import store from '../modules/store'
+export default {
+
+
+  methods:{
+    ...mapActions(['getLoggedInUser']),
+      },
+  data: function() {
+
+    return {
+      welcome: 'Welcome to getLoggedInUser page!',
+      user:  store.state.user
+    }
+  },
+
+}
+</script>
+
+<style scoped>
+  .profile-logo a {
+    padding: 20px;
+    outline: 1px solid rgb(169, 169, 169);
+    display: inline-block;
+  }
+
+  .profile-logo a:hover {
+    opacity: 0.8;
+  }
+</style>
diff --git a/template/client/src/pages/loggedIn.vue b/template/client/src/pages/loggedIn.vue
new file mode 100644
index 0000000..392d9ea
--- /dev/null
+++ b/template/client/src/pages/loggedIn.vue
@@ -0,0 +1,59 @@
+<template lang='ejs'>
+  <div class="page page--profile">
+    <h3>loggedIn page</h3>
+    <p>{{ welcome }}</p>
+    	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css">
+    	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css">
+
+
+    <div style="padding-top:80px; word-wrap:break-word;">
+    <div class="container">
+
+    	<div class="row">
+        isLoggedIn:{{loggedIn}}
+    		<!-- LOCAL INFORMATION -->
+    		<div class="col-sm-6">
+    			<div class="well">
+
+    			</div>
+    		</div>
+
+    	</div>
+
+    </div>
+  </div>
+
+  </div>
+</template>
+
+<script>
+import {mapActions} from 'vuex'
+import store from '../modules/store'
+export default {
+
+
+  methods:{
+...mapActions(['isLoggedIn']),
+},
+  data: function() {
+    //isLoggedIn()
+    return {
+      welcome: 'Welcome to isLoggedIn page!',
+      loggedIn:store.state.isLoggedIn
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+  .profile-logo a {
+    padding: 20px;
+    outline: 1px solid rgb(169, 169, 169);
+    display: inline-block;
+  }
+
+  .profile-logo a:hover {
+    opacity: 0.8;
+  }
+</style>
diff --git a/template/client/src/router/router.js b/template/client/src/router/router.js
index 041f662..18b6d9d 100644
--- a/template/client/src/router/router.js
+++ b/template/client/src/router/router.js
@@ -1,19 +1,56 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-
+import store  from '../modules/store/';
 import IndexPage from '../pages/IndexPage.vue';
 import ContactsPage from '../pages/ContactsPage.vue';
 import AboutPage from '../pages/AboutPage.vue';
+import LoginPage from '../pages/LoginPage.vue';
+import getUser from '../pages/getUser.vue';
+import isLoggedIn from '../pages/loggedIn.vue';
+import Authentication from '../pages/Authentication.vue';
+import ProfilePage from '../pages/ProfilePage.vue';
 import NotFound from '../pages/404.vue';
 
 Vue.use(VueRouter);
 const router = new VueRouter({
   routes: [
     { path: '/', component: IndexPage },
-    { path: '/contacts/', component: ContactsPage },
+    { path: '/vuelogin', component: LoginPage },
+     {
+       path: '/vueprofile',
+       component:ProfilePage,
+       meta: { requiresAuth: true }
+      },
+        { path: '/login/',  beforeEnter: (to, from, next) => {
+          window.location = "/login"
+        }
+    },
+
+    { path: '/isLoggedIn', component:isLoggedIn},
+    { path: '/getUser', component: getUser },
+    { path: '/contacts', component:ContactsPage},
     { path: '/about/', component: AboutPage },
-    { path: '*', component: NotFound }
+   { path: '*', component: NotFound }
   ]
 });
+router.beforeEach((to, from, next) => {
+  if (to.matched.some(record => record.meta.requiresAuth)) {
+// this route requires auth, check if logged in
+// if not, redirect to login page.
+store.dispatch('isLoggedIn');//.then(function(res));
+    if(store.state.isLoggedIn!==1){
+            next({
+   path: '/vuelogin/',
+   query: { redirect: to.fullPath }
+ });
+    }
+    else{
+     next();
+    }
 
+  }
+    else {
+next();                      // make sure to always call next()!
+}
+});
 export default router;
diff --git a/template/package.json b/template/package.json
index 0ab7172..e13a8cb 100644
--- a/template/package.json
+++ b/template/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "{{ name }}",
-  "description": "{{ description }}",
-  "author": "{{ author }}",
+  "name": "demovueexpress",
+  "description": "a vue express demo",
+  "author": "merovignan <merovignan@localhost>",
   "private": true,
   "scripts": {
     "start": "node ./server/server.js",
@@ -12,27 +12,52 @@
   },
   "dependencies": {
     "axios": "^0.17.1",
-    "body-parser": "~1.18.2",
+    "bcrypt-nodejs": "latest",
+    "bluebird": "^3.5.1",
+    "body-parser": "^1.4.3",
+    "bookshelf": "^0.7.6",
     "compression": "^1.7.1",
+    "connect-flash": "~0.1.1",
+    "connect-history-api-fallback": "^1.5.0",
     "cookie-parser": "~1.4.3",
     "ejs": "~2.5.7",
-    "express": "~4.15.5",
+    "ejs-lint": "^0.3.0",
+    "engine-lodash": "^0.8.2",
+    "express": "^4.4.5",
+    "express-flash": "0.0.2",
+    "express-session": "^1.15.6",
+    "knex": "^0.6.23",
+    "lodash": "^2.4.2",
     "lowdb": "^1.0.0",
     "moment": "^2.20.1",
     "morgan": "~1.9.0",
+    "mysql": "^2.4.0",
+    "nuxt": "^1.3.0",
+    "nuxt-ext": "^0.10.6-2",
+    "passport": "~0.1.17",
+    "passport-facebook": "~1.0.2",
+    "passport-google-oauth": "~0.1.5",
+    "passport-local": "~0.1.6",
+    "passport-twitter": "~1.0.2",
+    "precss": "^3.1.0",
+    "promise-mysql": "^3.2.0",
+    "sequence": "^3.0.0",
+    "template": "^0.17.5",
     "vue": "^2.0.1",
-    "vue-router": "^3.0.1"
+    "vue-router": "^3.0.1",
+    "when": "^3.7.8"
   },
   "devDependencies": {
     "babel-core": "^6.0.0",
     "babel-preset-es2015": "^6.0.0",
     "babelify": "^7.2.0",
     "browserify": "^13.0.1",
+    "concurrently": "^3.5.0",
     "cross-env": "^1.0.6",
+    "node-sass": "^4.7.2",
     "uglify-js": "^2.5.0",
     "vueify": "^9.1.0",
-    "watchify": "^3.4.0",
-    "concurrently": "^3.5.0"
+    "watchify": "^3.4.0"
   },
   "browserify": {
     "transform": [
diff --git a/template/server/app/models/user.js b/template/server/app/models/user.js
new file mode 100644
index 0000000..598bb75
--- /dev/null
+++ b/template/server/app/models/user.js
@@ -0,0 +1,28 @@
+// app/models/user.js
+// load the things we need
+
+
+var Bookshelf = require('../../lbookshelfjs');
+var bcrypt   = require('bcrypt-nodejs');// User model
+var User = Bookshelf.Model.extend({
+  tableName: 'users',
+  generateHash : function(password) {
+      return bcrypt.hashSync(password, bcrypt.genSaltSync(8), null);
+  },
+  // checking if password is valid
+  validPassword : function(password) {
+    return bcrypt.compareSync(password,this.toJSON().password);
+  }
+
+});
+var Users = Bookshelf.Collection.extend({
+  model: User
+});
+
+//
+
+module.export=User;
+
+// create the model for users and expose it to our app
+ module.exports.User=User;
+module.exports.Users=Users;
diff --git a/template/server/config/auth.js b/template/server/config/auth.js
new file mode 100644
index 0000000..e69de29
diff --git a/template/server/config/database.js b/template/server/config/database.js
new file mode 100644
index 0000000..84af3c7
--- /dev/null
+++ b/template/server/config/database.js
@@ -0,0 +1,24 @@
+// config/database.js
+module.exports = {
+  client: 'mysql',
+  connection: {
+    host: 'localhost',
+    user: 'root',
+    password: 'test',
+    database: 'widget_cms',
+    debug:false,
+    charset: 'utf8'
+  },//or...
+/*	'url':"mysql://localhost/db?debug=true&unicode=true&charset=utf-8",
+		options: {
+			user: "user",
+			pass: "pass",
+			debug:true,
+			server: {
+				socketOptions: {
+					keepAlive: 1
+				}
+			}
+		},
+	DB:url*/
+};
diff --git a/template/server/config/passport.js b/template/server/config/passport.js
new file mode 100644
index 0000000..03d551e
--- /dev/null
+++ b/template/server/config/passport.js
@@ -0,0 +1,118 @@
+// config/passport.js
+
+// load all the things we need
+var LocalStrategy   = require('passport-local').Strategy;
+
+// load up the user model
+var User       		= require('../app/models/user').User;
+//var Bookshelf = require('../lbookshelfjs');
+
+// expose this function to our app using module.exports
+module.exports = function(passport) {
+
+	// =========================================================================
+    // passport session setup ==================================================
+    // =========================================================================
+    // required for persistent login sessions
+    // passport needs ability to serialize and unserialize users out of session
+
+    // used to serialize the user for the session
+    passport.serializeUser(function(user, done) {
+        done(null, user.id);
+    });
+
+    // used to deserialize the user
+    passport.deserializeUser(function(id, done) {
+      console.log(id);
+      User.forge({id:id}).fetch().then(function( user){
+        //User.findById(id, function(err, user) {
+            done(null,user.toJSON());
+        });
+    });
+
+ 	// =========================================================================
+    // LOCAL SIGNUP ============================================================
+    // =========================================================================
+    // we are using named strategies since we have one for login and one for signup
+	// by default, if there was no name, it would just be called 'local'
+
+    passport.use('local-signup', new LocalStrategy({
+        // by default, local strategy uses username and password, we will override with email
+        usernameField : 'email',
+        passwordField : 'password',
+        passReqToCallback : true // allows us to pass back the entire request to the callback
+    },
+    function(req, email, password, done) {
+
+		// find a user whose email is the same as the forms email
+		// we are checking to see if the user trying to login already exists
+    User.where('email', email).fetch().then(function( user){
+            // if there are any errors, return the error
+          //  if (err)
+            //    return done(err);
+             // check to see if theres already a user with that email
+            if (user) {
+                return done(null, false, req.flash('signupMessage', 'That email is already taken.'));
+            } else {
+
+				// if there is no user with that email
+                // create the user
+
+                // set the user's local credentials
+              User.forge({
+                role_id:1,
+                   name: email,
+                   email: email,
+                   password:new User().generateHash(password) // use the generateHash function in our user model
+                 })
+                				// save the user
+                .save().then(function(user) {
+                    if (!user){
+                      console.log('user creattion failed:', JSON.stringify(user));
+                    }
+                        //throw err;
+
+                    return done(null, user);
+                });
+            }
+
+        });
+
+    }));
+
+    // =========================================================================
+    // LOCAL LOGIN =============================================================
+    // =========================================================================
+    // we are using named strategies since we have one for login and one for signup
+    // by default, if there was no name, it would just be called 'local'
+
+    passport.use('local-login', new LocalStrategy({
+        // by default, local strategy uses username and password, we will override with email
+        usernameField : 'email',
+        passwordField : 'password',
+        passReqToCallback : true // allows us to pass back the entire request to the callback
+    },
+    function(req, email, password, done) { // callback with email and password from our form
+        console.log(email,password);
+        // find a user whose email is the same as the forms email
+        // we are checking to see if the user trying to login already ;qexists
+        User.where('email', email).fetch().then(function( user) {
+            // if there are any errors, return the error before anything else
+            /*if (err)
+                return done(err);
+                */
+            // if no user is found, return the message
+            if (!user)
+                return done(null, false, req.flash('loginMessage', 'No user found.')); // req.flash is the way to set flashdata using connect-flas
+
+            // if the user is found but the password is wrong
+            if (!(user.validPassword(password)))
+                return done(null, false, req.flash('loginMessage', 'Oops! Wrong password.')); // create the loginMessage and save it to session as flashdata
+
+            // all is                            v  v v v    , return successful user
+            return done(null, user);//.toJSON());
+        });
+
+    }));
+
+};
diff --git a/template/server/db.json b/template/server/db.json
index b6ab03f..604d411 100644
--- a/template/server/db.json
+++ b/template/server/db.json
@@ -19,11 +19,6 @@
       "text": "At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga.\n",
       "id": 1514927714244,
       "date": "Jan 3rd, 04:15"
-    },
-    {
-      "text": "Let's try some text with \nline \nbreaks.",
-      "id": 1514928896950,
-      "date": "Jan 3rd, 04:34"
     }
   ]
 }
\ No newline at end of file
diff --git a/template/server/lbookshelfjs.js b/template/server/lbookshelfjs.js
new file mode 100644
index 0000000..a437f30
--- /dev/null
+++ b/template/server/lbookshelfjs.js
@@ -0,0 +1,7 @@
+var      config = require('./config/database');
+var knex = require('knex')(config);
+
+//var Bookshelf = require('bookshelf')(knex);
+
+module.exports = require('bookshelf')(knex);
+module.exports.knexconn=knex;
\ No newline at end of file
diff --git a/template/server/modules/routes.js b/template/server/modules/routes.js
index 6ce0120..cc176d5 100644
--- a/template/server/modules/routes.js
+++ b/template/server/modules/routes.js
@@ -1,12 +1,125 @@
-var express = require('express');
+
 var path = require('path');
-var app = express();
 
-app.set('views', path.join(__dirname, '../views'));
+let axios=require('axios');
+/*
+let { Nuxt, Builder } = require('nuxt');
+
+// Launch nuxt build with given options
+let nconfig = require('./nuxt.config.js')
+let nuxt = new Nuxt(nconfig)
+nconfig.dev = !(process.env.NODE_ENV === 'production');
+*/
+// =====================================
+module.exports = function(app, passport) {
+  app.set('views', path.join(__dirname, '../views'));
+
+  	// =====================================
+  	// HOME PAGE (with login links) ========
+
+    app.get('/', function (req, res) {
+      res.render('index.ejs', { title: 'vue-express starter' });
+    });
+  	// =====================================
+  	// LOGIN ===============================
+  	// =====================================
+  	// show the login form
+    app.get('/login', function(req, res) {
+
+  		// render the page and pass in any flash data if it exists
+  		res.render('login.ejs', { message: req.flash('loginMessage') });
+  	});
+  	// process the login form
+    app.post('/login', passport.authenticate('local-login', {
+  		successRedirect : '/profile', // redirect to the secure profile section
+  		failureRedirect : '/login', // redirect back to the signup page if there is an error
+  		failureFlash : true // allow flash messages
+  	}));
+
+  	// =====================================
+  	// SIGNUP ==============================
+  	// =====================================
+  	// show the signup form
+  	app.get('/signup', function(req, res) {
+
+  		// render the page and pass in any flash data if it exists
+  		res.render('signup.ejs', { message: req.flash('signupMessage') });
+  	});
+
+  	// process the signup form
+  	app.post('/signup', passport.authenticate('local-signup', {
+  		successRedirect : '/profile', // redirect to the secure profile section
+  		failureRedirect : '/signup', // redirect back to the signup page if there is an error
+  		failureFlash : true // allow flash messages
+  	}));
+
+
+  	// =====================================
+  	// PROFILE SECTION =========================
+  	// =====================================
+  	// we will want this protected so you have to be logged in to visit
+  	// we will use route middleware to verify this (the isLoggedIn function)
+    app.get('/profile', isLoggedIn, function(req, res) {
+  		res.render('profile.ejs', {
+  			user : req.user // get the user out of session and pass to template
+  		});
+  	});
+      	// =====================================
+      	// AXIOS API RESP SECTION =========================0
+      	// =====================================
+
+        app.post('/loginvue', passport.authenticate('local-login', {
+          successRedirect : '/profilevue', // redirect to the secure profile section
+          failureRedirect : '/loginvue', // redirect back to the signup page if there is an error
+          failureFlash : false // allow flash messages
+        }));
+
+              app.post('/profilevue', isLoggedIn, function(req, res) {
+          		res.send({found:true,user : req.user,path:'/vueprofile' });// get the user out of session and pass to template
+          	});
+            app.post('/loginvue', isLoggedIn, function(req, res) {
+            res.send({found:false,user : req.user,path:'/vuelogin' });// get the user out of session and pass to template
+          	});
+      app.get('/profilevue', function(req, res) {
+        res.send({found:true,user : req.user,path:'/vueprofile' });// get the user out of session and pass to template
+  	});
+    app.get('/loginvue', function(req, res) {
+    	res.send({found:false,user : req.user,path:'/vuelogin' });// get the user out of session and pass to template
+  	});
+    app.post('/isLoggedIn',  function(req, res) {
+    	res.send({isLoggedIn:(req.user && req.isAuthenticated())?1:0 });// get the user out of session and pass to template
+  	});
+  
+    app.post('/getLoggedInUser', isLoggedIn, function(req, res) {
+
+      		res.send({user:req.user });// get the user out of session and pass to template
+      	});
+
+    // =====================================
+  	// =====================================
+  	app.post('/logoutvue', function(req, res) {
+  		req.logout();
+  	});
+    // =====================================
+  	// LOGOUT ==============================
+  	// =====================================
+  	app.get('/logout', function(req, res) {
+  		req.logout();
+  		res.redirect('/');
+  	});
+
+
+  // route middleware to make sure
+  function isLoggedIn(req, res, next) {
+
+  	// if user is authenticated in the session, carry on
+  	if (req.isAuthenticated())
+  		return next();
+
+  	// if they aren't redirect them to the home page
+  	res.redirect('/');
+  }
 
-app.get('/', function (req, res) {
-  res.render('index.ejs', { title: 'vue-express starter' });
-});
 
 app.get('/example-server-route', function (req, res) {
   res.render('example-server-route.ejs', { title: 'example server route', message: 'hello!' });
@@ -15,5 +128,4 @@ app.get('/example-server-route', function (req, res) {
 app.get('*', function (req, res) {
   res.status(404).render('404.ejs', {title: '404'});
 });
-
-module.exports = app;
\ No newline at end of file
+}
diff --git a/template/server/server.js b/template/server/server.js
index 31b4965..d8eb080 100644
--- a/template/server/server.js
+++ b/template/server/server.js
@@ -6,22 +6,52 @@ var path = require('path');
 var logger = require('morgan');
 var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
-var routes = require('./modules/routes.js');
 var api = require('./modules/api.js');
+const session = require('express-session')
+var passport = require('passport');
+require('./config/passport')(passport); // pass passport for configuration
 
-var app = express();
+const flash = require('express-flash')
+var Bookshelf = require('./lbookshelfjs');
+const history = require('connect-history-api-fallback');
+const app = express();
+  app.use(compression());
+  app.use(logger('dev'));
+  app.use(bodyParser.json());
+  app.use(bodyParser.urlencoded({ extended: false }));
+  app.use(cookieParser());
 
-app.set('view engine', 'ejs');
-app.use(compression());
-// app.use(logger('dev'));
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: false }));
-app.use(cookieParser());
+	app.set('view engine', 'ejs'); // set up ejs for templating
+
+	// required for passport
+  app.use(session({
+    secret: process.env.SECRET || '12345687987',
+    saveUninitialized: true,
+    resave: false
+}))
+
+	app.use(passport.initialize());
+	app.use(passport.session()); // persistent login sessions
+
+	app.use(flash()); // use connect-flash for flash messages stored in session
+// routes ======================================================================
 
 app.use(express.static(path.join(__dirname, '../client/public')));
 app.use(api);
-app.use(routes); // routes should be below api, to catch undeclared routes and render page 404
+var routes = require('./modules/routes.js')(app, passport);
+
+const staticFileMiddleware = express.static(__dirname);
+//needed
+app.use(staticFileMiddleware);
+app.use(history({
+  verbose: true,
+  disableDotRule: true
+
+}));
+//needed twice
+ app.use(staticFileMiddleware);
 
+// launch ======================================================================
 var server = http.createServer(app);
 server.listen(port);
-console.log('Server is running at localhost:' + port);
\ No newline at end of file
+console.log('Server is running at localhost:' + port);
diff --git a/template/server/views/index.ejs b/template/server/views/index.ejs
index ce9230a..138445c 100644
--- a/template/server/views/index.ejs
+++ b/template/server/views/index.ejs
@@ -2,16 +2,31 @@
 <html lang="en">
   <%- include('partials/head.ejs') %>
   <body>
-    <div class="express-welcome">
-      <h1><%= title %></h1>
-      <p>Welcome to <%= title %></p>
+    <div class="container">
+
+      <div class="express-welcome">
+        <h1><%= title %></h1>
+        <p>Welcome to <%= title %></p>
+	<div class="jumbotron text-center">
+		<h1><span class="fa fa-lock"></span> Node Authentication</h1>
+
+		<p>Login or Register with:</p>
+
+    <a href="/login" class="btn btn-default"><span class="fa fa-user"></span> Local Login</a>
+    <a href="/#/vuelogin" class="btn btn-default"><span class="fa fa-user"></span>Vue Local Login</a>
+		<a href="/signup" class="btn btn-default"><span class="fa fa-user"></span> Local Signup</a>
+	</div>
+
       <nav class="express-welcome-nav">
         <span>Express router links: </span>
         <a href="example-server-route/">example server route</a>
         <a href="!@#$%/">server 404 page</a>
       </nav>
     </div>
+
     <div id="vue-app"></div>
+
+</div>
     <script src="js/bundle.js"></script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/template/server/views/login.ejs b/template/server/views/login.ejs
new file mode 100644
index 0000000..f00d699
--- /dev/null
+++ b/template/server/views/login.ejs
@@ -0,0 +1,47 @@
+<!-- views/login.ejs -->
+<!doctype html>
+<html>
+<head>
+	<title>Node Authentication</title>
+	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css"> <!-- load bootstrap css -->
+	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css"> <!-- load fontawesome -->
+	<style>
+		body 		{ padding-top:80px; }
+	</style>
+</head>
+<body>
+<div class="container">
+
+<div class="col-sm-6 col-sm-offset-3">
+
+	<h1><span class="fa fa-sign-in"></span> Login</h1>
+
+	<!-- show any messages that come back with authentication -->
+	<% if (message.length > 0) { %>
+		<div class="alert alert-danger"><%= message %></div>
+	<% } %>
+
+	<!-- LOGIN FORM -->
+	<form action="/login" method="post">
+		<div class="form-group">
+			<label>Email</label>
+			<input type="text" class="form-control" name="email">
+		</div>
+		<div class="form-group">
+			<label>Password</label>
+			<input type="password" class="form-control" name="password">
+		</div>
+
+		<button type="submit" class="btn btn-warning btn-lg">Login</button>
+	</form>
+
+	<hr>
+
+	<p>Need an account? <a href="/signup">Signup</a></p>
+	<p>Or go <a href="/">home</a>.</p>
+
+</div>
+
+</div>
+</body>
+</html>
diff --git a/template/server/views/partials/head.ejs b/template/server/views/partials/head.ejs
index eea1914..ab5ac47 100644
--- a/template/server/views/partials/head.ejs
+++ b/template/server/views/partials/head.ejs
@@ -2,6 +2,11 @@
   <title><%= title %></title>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css"> <!-- load bootstrap css -->
+<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css"> <!-- load fontawesome -->
+<style>
+  body 		{ padding-top:80px; }
+</style>
   <link rel='stylesheet' href='/css/style.css' />
   <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600" rel="stylesheet">
-</head>
\ No newline at end of file
+</head>
diff --git a/template/server/views/profile.ejs b/template/server/views/profile.ejs
new file mode 100644
index 0000000..729d260
--- /dev/null
+++ b/template/server/views/profile.ejs
@@ -0,0 +1,40 @@
+<!-- views/profile.ejs -->
+<!doctype html>
+<html>
+<head>
+	<title>Node Authentication</title>
+	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css">
+	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css">
+	<style>
+		body 		{ padding-top:80px; word-wrap:break-word; }
+	</style>
+</head>
+<body>
+<div class="container">
+
+	<div class="page-header text-center">
+		<h1><span class="fa fa-anchor"></span> Profile Page</h1>
+		<a href="/logout" class="btn btn-default btn-sm">Logout</a>
+	</div>
+
+	<div class="row">
+
+		<!-- LOCAL INFORMATION -->
+		<div class="col-sm-6">
+			<div class="well">
+				<h3><span class="fa fa-user"></span><%= user.name%> Local</h3>
+
+					<p>
+						<strong>id</strong>: <%= user.id %><br>
+						<strong>email</strong>: <%= user.email %><br>
+						<strong>password</strong>: <%= user.password %>
+					</p>
+
+			</div>
+		</div>
+
+	</div>
+
+</div>
+</body>
+</html>
diff --git a/template/server/views/signup.ejs b/template/server/views/signup.ejs
new file mode 100644
index 0000000..2fec7f5
--- /dev/null
+++ b/template/server/views/signup.ejs
@@ -0,0 +1,47 @@
+<!-- views/signup.ejs -->
+<!doctype html>
+<html>
+<head>
+	<title>Node Authentication</title>
+	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css"> <!-- load bootstrap css -->
+	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.min.css"> <!-- load fontawesome -->
+	<style>
+		body 		{ padding-top:80px; }
+	</style>
+</head>
+<body>
+<div class="container">
+
+<div class="col-sm-6 col-sm-offset-3">
+
+	<h1><span class="fa fa-sign-in"></span> Signup</h1>
+
+	<!-- show any messages that come back with authentication -->
+	<% if (message.length > 0) { %>
+		<div class="alert alert-danger"><%= message %></div>
+	<% } %>
+
+	<!-- LOGIN FORM -->
+	<form action="/signup" method="post">
+		<div class="form-group">
+			<label>Email</label>
+			<input type="text" class="form-control" name="email">
+		</div>
+		<div class="form-group">
+			<label>Password</label>
+			<input type="password" class="form-control" name="password">
+		</div>
+
+		<button type="submit" class="btn btn-warning btn-lg">Signup</button>
+	</form>
+
+	<hr>
+
+	<p>Already have an account? <a href="/login">Login</a></p>
+	<p>Or go <a href="/">home</a>.</p>
+
+</div>
+
+</div>
+</body>
+</html>