Made sure some links use vue router
This commit is contained in:
@@ -10,7 +10,7 @@
|
|||||||
</v-tooltip>
|
</v-tooltip>
|
||||||
</v-layout>
|
</v-layout>
|
||||||
<v-layout row justify-center v-else="signedIn">
|
<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-layout>
|
||||||
</v-toolbar>
|
</v-toolbar>
|
||||||
<v-list>
|
<v-list>
|
||||||
|
|||||||
@@ -57,9 +57,9 @@
|
|||||||
</v-layout>
|
</v-layout>
|
||||||
</v-layout>
|
</v-layout>
|
||||||
</section>
|
</section>
|
||||||
<section class="ma-5">
|
<section class="ma-5" v-if="!signedIn">
|
||||||
<v-layout row align-center justify-space-around>
|
<v-layout row align-center justify-space-around>
|
||||||
<v-btn color="accent" round large>
|
<v-btn color="accent" round large to="/register">
|
||||||
Sign up
|
Sign up
|
||||||
</v-btn>
|
</v-btn>
|
||||||
</v-layout>
|
</v-layout>
|
||||||
@@ -130,6 +130,11 @@
|
|||||||
components: {
|
components: {
|
||||||
ToolbarLayout,
|
ToolbarLayout,
|
||||||
},
|
},
|
||||||
|
meteor: {
|
||||||
|
signedIn(){
|
||||||
|
return Meteor.userId();
|
||||||
|
},
|
||||||
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<ToolbarLayout>
|
<ToolbarLayout>
|
||||||
<div slot="toolbar">Sign In</div>
|
<div slot="toolbar">Sign Up</div>
|
||||||
<v-form ref="form" class="mt-4">
|
<v-form ref="form" class="mt-4">
|
||||||
<v-layout column align-center>
|
<v-layout column align-center>
|
||||||
<v-img
|
<v-img
|
||||||
|
|||||||
@@ -35,7 +35,7 @@
|
|||||||
>
|
>
|
||||||
Sign In
|
Sign In
|
||||||
</v-btn>
|
</v-btn>
|
||||||
<v-btn color="accent" href="/register">
|
<v-btn color="accent" to="/register">
|
||||||
Register
|
Register
|
||||||
</v-btn>
|
</v-btn>
|
||||||
</v-layout>
|
</v-layout>
|
||||||
@@ -55,6 +55,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import ToolbarLayout from "/imports/ui/layouts/ToolbarLayout.vue";
|
import ToolbarLayout from "/imports/ui/layouts/ToolbarLayout.vue";
|
||||||
|
import {router} from "/imports/ui/vueSetup.js";
|
||||||
export default{
|
export default{
|
||||||
data: () => ({
|
data: () => ({
|
||||||
valid: true,
|
valid: true,
|
||||||
@@ -74,7 +75,11 @@
|
|||||||
console.log("submitting");
|
console.log("submitting");
|
||||||
if (this.$refs.form.validate()) {
|
if (this.$refs.form.validate()) {
|
||||||
Meteor.loginWithPassword(this.name, this.password, e => {
|
Meteor.loginWithPassword(this.name, this.password, e => {
|
||||||
this.error = e && e.reason;
|
if (e){
|
||||||
|
this.error = e.reason;
|
||||||
|
} else {
|
||||||
|
Router
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import VueMeteorTracker from 'vue-meteor-tracker';
|
|||||||
import AppLayout from '/imports/ui/layouts/AppLayout.vue';
|
import AppLayout from '/imports/ui/layouts/AppLayout.vue';
|
||||||
import "vuetify/dist/vuetify.min.css";
|
import "vuetify/dist/vuetify.min.css";
|
||||||
|
|
||||||
|
Vue.use(VueMeteorTracker);
|
||||||
Vue.use(Vuetify, {
|
Vue.use(Vuetify, {
|
||||||
theme: {
|
theme: {
|
||||||
primary: "#424242",
|
primary: "#424242",
|
||||||
@@ -20,13 +21,12 @@ Vue.use(Vuetify, {
|
|||||||
iconfont: "mdi",
|
iconfont: "mdi",
|
||||||
});
|
});
|
||||||
|
|
||||||
Vue.use(VueMeteorTracker);
|
// Create the router instance
|
||||||
|
const router = routerFactory.create();
|
||||||
|
export router;
|
||||||
|
|
||||||
// App start
|
// App start
|
||||||
Meteor.startup(() => {
|
Meteor.startup(() => {
|
||||||
// Create the router instance
|
|
||||||
const router = routerFactory.create();
|
|
||||||
|
|
||||||
// Start the Vue app
|
// Start the Vue app
|
||||||
new Vue({
|
new Vue({
|
||||||
router,
|
router,
|
||||||
|
|||||||
Reference in New Issue
Block a user