it clear

blakcoder2017 · blakcoder2017 · commit d1c02c649e92 · 2018-08-13T12:20:04.000Z
diff --git a/src/App.vue b/src/App.vue
@@ -1,24 +1,5 @@
 <template>
     <v-app>
-<<<<<<< HEAD
-=======
-      <v-toolbar dark color="cyan darken-1" v-show="isLoggedIn">
-        <v-toolbar-side-icon></v-toolbar-side-icon>
-        <v-toolbar-title class="white--text">{{title}}</v-toolbar-title>
-        <v-spacer></v-spacer>
-        <v-btn to="/dashboard" outline>
-        <v-icon>person_add</v-icon>
-          Dashboard
-        </v-btn>
-        <v-btn to="/add" outline>
-        <v-icon>person_add</v-icon>
-          Add Guest
-        </v-btn>
-        <v-btn flat @click="logout">
-          <v-icon>exit_to_app</v-icon>
-        </v-btn>
-      </v-toolbar>
->>>>>>> feb45de64ec349a35717bf212a5be4b5b648b2ab
       <v-content >
         <navbar/>
         <v-container fluid fill-height >
@@ -39,36 +20,9 @@
 <script>
 import Navbar from './components/navbar';
 export default {
-<<<<<<< HEAD
   components: {
     Navbar
   }
-=======
-  data(){
-    return{
-       title: "BlakCoder's Guestbook",
-       isLoggedIn: false,
-       currentUser: '', 
-    }
-  },
-    methods: {
-      logout(e){
-          firebase.auth().signOut()
-          .then(() => {
-              this.$router.push('/');
-              this.isLoggedIn=false;
-              this.currentUser = false;
-          });
-      },
-   
-   },
-   created() {
-       if(firebase.auth().currentUser){
-           this.isLoggedIn = true;
-           this.currentUser = firebase.auth().currentUser.email;
-       }
-   },
->>>>>>> feb45de64ec349a35717bf212a5be4b5b648b2ab
 }
 </script>
 
diff --git a/src/components/add.vue b/src/components/add.vue
@@ -106,7 +106,7 @@ data() {
                 this.newGuest.lat = '';
                 this.newGuest.long = '';
                 console.log(ref);
-                this.$router.push('dashboard');
+                this.$router.go({path: this.$router.path});
               }).catch(err => {
                   console.log(err);
               })
diff --git a/src/components/login.vue b/src/components/login.vue
@@ -23,7 +23,8 @@
                           label="Password"
                            v-model="user.password" 
                            type="password" 
-                           :rules="[rules.required, rules.min]"></v-text-field>
+                           :rules="[rules.required, rules.min]"
+                           @keyup.enter="login"></v-text-field>
                         </v-form>
                       </v-card-text>
                       <v-card-actions>
@@ -61,10 +62,11 @@ export default {
   methods:{
     
       login (e){
-         if (this.$refs.form.validate()){
+
+          if (this.$refs.form.validate()){
          firebase.auth().signInWithEmailAndPassword(this.user.email, this.user.password)
         .then(user =>{
-            this.$emit('loginStatus', true);
+            //this.$emit('loginStatus', true);
             //this.$router.push('/');//re-rendering th path
             this.$router.go({path: this.$router.path});
         }),
@@ -81,7 +83,3 @@ export default {
 }
 </script>
 
-
-<style>
-
-</style>
diff --git a/src/components/register.vue b/src/components/register.vue
@@ -29,7 +29,8 @@
                           name="cpassword" 
                           label="Confirm Password"
                           type="password" 
-                          :rules="passwordConfirmationRules"></v-text-field>
+                          :rules="passwordConfirmationRules"
+                          @keyup.enter="register"></v-text-field>
                         </v-form>
                       </v-card-text>
                       <v-card-actions>
