Made sure some links use vue router

This commit is contained in:
Stefan Zermatten
2018-10-03 16:37:12 +02:00
parent 6835f5f4f9
commit d0ce162315
5 changed files with 20 additions and 10 deletions

View File

@@ -10,7 +10,7 @@
</v-tooltip>
</v-layout>
<v-layout row justify-center v-else="signedIn">
<v-btn flat>Sign in</v-btn>
<v-btn flat to="/sign-in">Sign in</v-btn>
</v-layout>
</v-toolbar>
<v-list>

View File

@@ -57,9 +57,9 @@
</v-layout>
</v-layout>
</section>
<section class="ma-5">
<section class="ma-5" v-if="!signedIn">
<v-layout row align-center justify-space-around>
<v-btn color="accent" round large>
<v-btn color="accent" round large to="/register">
Sign up
</v-btn>
</v-layout>
@@ -130,6 +130,11 @@
components: {
ToolbarLayout,
},
meteor: {
signedIn(){
return Meteor.userId();
},
}
};
</script>

View File

@@ -1,6 +1,6 @@
<template>
<ToolbarLayout>
<div slot="toolbar">Sign In</div>
<div slot="toolbar">Sign Up</div>
<v-form ref="form" class="mt-4">
<v-layout column align-center>
<v-img

View File

@@ -35,7 +35,7 @@
>
Sign In
</v-btn>
<v-btn color="accent" href="/register">
<v-btn color="accent" to="/register">
Register
</v-btn>
</v-layout>
@@ -55,6 +55,7 @@
<script>
import ToolbarLayout from "/imports/ui/layouts/ToolbarLayout.vue";
import {router} from "/imports/ui/vueSetup.js";
export default{
data: () => ({
valid: true,
@@ -74,7 +75,11 @@
console.log("submitting");
if (this.$refs.form.validate()) {
Meteor.loginWithPassword(this.name, this.password, e => {
this.error = e && e.reason;
if (e){
this.error = e.reason;
} else {
Router
}
});
}
},

View File

@@ -7,6 +7,7 @@ import VueMeteorTracker from 'vue-meteor-tracker';
import AppLayout from '/imports/ui/layouts/AppLayout.vue';
import "vuetify/dist/vuetify.min.css";
Vue.use(VueMeteorTracker);
Vue.use(Vuetify, {
theme: {
primary: "#424242",
@@ -20,13 +21,12 @@ Vue.use(Vuetify, {
iconfont: "mdi",
});
Vue.use(VueMeteorTracker);
// Create the router instance
const router = routerFactory.create();
export router;
// App start
Meteor.startup(() => {
// Create the router instance
const router = routerFactory.create();
// Start the Vue app
new Vue({
router,