Skip to content

Commit

Permalink
update formatting, refactor to less loc
Browse files Browse the repository at this point in the history
  • Loading branch information
cklmercer committed Jan 26, 2017
1 parent c090913 commit 4cdc620
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 102 deletions.
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/.idea
/node_modules
node_modules
public/css
public/js
public/fonts
54 changes: 18 additions & 36 deletions app/components/app.vue
Original file line number Diff line number Diff line change
@@ -1,42 +1,24 @@
<template>
<div id="app" :class="routeClass">
<navbar></navbar>
<div class="container">
<h1>{{ message }}</h1>
</div>
<router-view></router-view>
</div>
<div id="app">
<navbar></navbar>
<div class="container">
<h1>{{ message }}</h1>
</div>
<router-view></router-view>
</div>
</template>

<script type="text/babel">
export default {
name: 'app',
store: ['message'],
events: {
testEvent(message) {
this.message = message
},
testTwo(message) {
this.message = message
}
},
computed: {
/**
* Get a class name based on the route path.
*
* @return {String}
*/
routeClass() {
return this.$route.path.split('/').filter(part => Boolean(part)).join('-')
}
},
components: {
'navbar': require('./nav/navbar.vue')
}
export default {
name: 'app',
store: ['message'],
events: {
test(message) {
this.message = message
}
},
components: {
'navbar': require('./nav/navbar.vue')
}
}
</script>
62 changes: 15 additions & 47 deletions app/components/nav/navbar.vue
Original file line number Diff line number Diff line change
@@ -1,48 +1,16 @@
<template>
<nav class="navbar navbar-default">
<div class="container-fluid">

<div class="navbar-header">
<button type="button"
class="navbar-toggle collapsed"
data-toggle="collapse"
data-target="#main-navbar"
aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">
<i class="fa fa-server"></i>
Vue Stack 2.0
</a>
</div>

<div class="collapse navbar-collapse" id="main-navbar">

<ul class="nav navbar-nav navbar-right">
<li>
<router-link :to="{ name: 'index' }">
Home
</router-link>
</li>
<li>
<router-link :to="{ name: 'test' }">
Fire Event
</router-link>
</li>
</ul>

</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
</template>

<style rel="stylesheet/scss" lang="sass">
.navbar {
border-left: 0;
border-right: 0;
border-top: 0;
}
</style>
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href="#">
<i class="fa fa-server"></i>
Vue Stack 2.0
</a>
</div>
<ul class="nav navbar-nav navbar-right">
<li><router-link :to="{ name: 'index' }">Home</router-link></li>
<li><router-link :to="{ name: 'test' }">Fire Event</router-link></li>
</ul>
</div>
</nav>
</template>
22 changes: 11 additions & 11 deletions app/components/test.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<template>
<div class="container">
<input class="form-control" v-model="message">
</div>
<div class="container">
<input class="form-control" v-model="message">
</div>
</template>

<script>
export default {
name: 'test',
store: ['message'],
mounted() {
setTimeout(() => this.$events.fire('test', 'You just received a message from test.vue'), 1500)
setTimeout(() => this.$events.fire('test', 'hahah you got another message'), 5000)
}
}
export default {
name: 'test',
store: ['message'],
mounted() {
setTimeout(() => this.$events.fire('test', 'You just received a message from test.vue'), 1500)
setTimeout(() => this.$events.fire('test', 'hahah you got another message'), 5000)
}
}
</script>
10 changes: 5 additions & 5 deletions app/routes.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export default [
{
path: '/test',
name: 'test',
component: require('./components/test.vue')
}
{
path: '/test',
name: 'test',
component: require('./components/test.vue')
}
]
2 changes: 1 addition & 1 deletion app/store.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export default {
message: 'Hello world!'
message: 'Hello world!'
}

0 comments on commit 4cdc620

Please sign in to comment.