fix

EXALLENGE · Mar 25, 2020 · b779061 · b779061
1 parent 3345789
commit b779061
Show file tree

Hide file tree

Showing 11 changed files with 96 additions and 37 deletions.
diff --git a/src/components/CoursesPage.vue b/src/components/CoursesPage.vue
@@ -149,7 +149,7 @@
 <script>
 import firebase from "firebase";
 
-import getUserInfo from "../utils/getUserInfo";
+import { getUserInfo, checkRouter } from "../utils/getUserInfo";
 
 export default {
   data() {
@@ -188,6 +188,10 @@ export default {
   },
   beforeCreate: function() {
     getUserInfo();
+    firebase.auth().onAuthStateChanged(user => {
+      this.$store.dispatch("fetchUser", user);
+      checkRouter();
+    });
     let self = this;
     const db = firebase.firestore();
     if (this.$store.state.courses.length > 0) {

diff --git a/src/components/EnrollCourse.vue b/src/components/EnrollCourse.vue
@@ -9,7 +9,7 @@
 import firebase from "firebase";
 import { mapGetters } from "vuex";
 
-import getUserInfo from "../utils/getUserInfo";
+import {getUserInfo, checkRouter } from "../utils/getUserInfo";
 
 export default {
   computed: {
@@ -33,11 +33,7 @@ export default {
     getUserInfo();
     firebase.auth().onAuthStateChanged(user => {
       this.$store.dispatch("fetchUser", user);
-      console.log(this.$store.state.user.loggedIn); // eslint-disable-line no-console
-      if (!this.$store.state.user.loggedIn) {
-        this.$router.push({ path: "/login" });
-        return;
-      }
+      checkRouter();
       let self = this;
       const db = firebase.firestore();
       let course = db

diff --git a/src/components/FeedbackPage.vue b/src/components/FeedbackPage.vue
@@ -12,11 +12,23 @@ div {
 </style>
 
 <script>
+import firebase from "firebase";
+
 import Feedback from "./Feedback";
 
+import { getUserInfo, checkRouter } from "../utils/getUserInfo";
+
+
 export default {
   components: {
     Feedback
+  },
+  beforeCreate: function() {
+    getUserInfo();
+    firebase.auth().onAuthStateChanged(user => {
+      this.$store.dispatch("fetchUser", user);
+      checkRouter();
+    });
   }
 };
 </script>
diff --git a/src/components/ForgetPassword.vue b/src/components/ForgetPassword.vue
@@ -10,7 +10,8 @@
             <input type="email" name="email" id="email" v-model="form.email" />
           </div>
           <div style="text-align:center">
-            <input type="submit" class="btn" value="Отправить" /><br />
+            <input type="submit" class="btn" value="Отправить" />
+            <br />
           </div>
           <div class="reset-password">
             <router-link to="/login">Вспомнили пароль?</router-link>
@@ -173,6 +174,8 @@ import firebase from "firebase";
 
 import modal from "./Modal";
 
+import { getUserInfo, checkRouter } from "../utils/getUserInfo";
+
 export default {
   components: {
     modal
@@ -213,6 +216,13 @@ export default {
           self.showModal();
         });
     }
+  },
+  beforeCreate: function() {
+    getUserInfo();
+    firebase.auth().onAuthStateChanged(user => {
+      this.$store.dispatch("fetchUser", user);
+      checkRouter();
+    });
   }
 };
 </script>
diff --git a/src/components/InDevelopment.vue b/src/components/InDevelopment.vue
@@ -27,5 +27,17 @@ p {
 </style>
 
 <script>
-export default {};
+import firebase from "firebase";
+
+import { getUserInfo, checkRouter } from "../utils/getUserInfo";
+
+export default {
+    beforeCreate: function() {
+    getUserInfo();
+    firebase.auth().onAuthStateChanged(user => {
+      this.$store.dispatch("fetchUser", user);
+      checkRouter();
+    });
+  }
+};
 </script>
diff --git a/src/components/Login.vue b/src/components/Login.vue
@@ -177,6 +177,8 @@ import firebase from "firebase";
 
 import modal from "./Modal";
 
+import {getUserInfo, checkRouter } from "../utils/getUserInfo";
+
 export default {
   components: {
     modal
@@ -194,7 +196,6 @@ export default {
   methods: {
     submit() {
       let self = this;
-      console.log(123); // eslint-disable-line no-console
       firebase
         .auth()
         .signInWithEmailAndPassword(this.form.email, this.form.password)
@@ -217,12 +218,10 @@ export default {
     }
   },
   beforeCreate: function() {
+    getUserInfo()
     firebase.auth().onAuthStateChanged(user => {
       this.$store.dispatch("fetchUser", user);
-      if (this.$store.state.user.loggedIn) {
-        this.$router.push({ path: "/user/courses" });
-        return;
-      }
+      checkRouter();
     });
   }
 };

diff --git a/src/components/Register.vue b/src/components/Register.vue
@@ -191,6 +191,8 @@
 import firebase from "firebase";
 import modal from "./Modal";
 
+import {getUserInfo, checkRouter } from "../utils/getUserInfo";
+
 export default {
   components: {
     modal
@@ -254,6 +256,13 @@ export default {
     closeModal() {
       this.isModalVisible = false;
     }
+  },
+  beforeCreate: function() {
+    getUserInfo()
+    firebase.auth().onAuthStateChanged(user => {
+      this.$store.dispatch("fetchUser", user);
+      checkRouter();
+    });
   }
 };
 </script>
diff --git a/src/components/ReviewsPage.vue b/src/components/ReviewsPage.vue
@@ -198,5 +198,17 @@
 </style>
 
 <script>
-export default {};
+import firebase from "firebase";
+
+import { getUserInfo, checkRouter } from "../utils/getUserInfo";
+
+export default {
+  beforeCreate: function() {
+    getUserInfo();
+    firebase.auth().onAuthStateChanged(user => {
+      this.$store.dispatch("fetchUser", user);
+      checkRouter();
+    });
+  }
+};
 </script>
diff --git a/src/components/UserCourses.vue b/src/components/UserCourses.vue
@@ -43,17 +43,24 @@ a {
 </style>
 
 <script>
+import firebase from "firebase";
+
 import UserInfo from "./UserInfo";
 import UserTabs from "./UserTabs";
+
+import { getUserInfo, checkRouter } from "../utils/getUserInfo";
+
 export default {
   components: {
     UserInfo,
     UserTabs
   },
   beforeCreate: function() {
-    if (!this.$store.state.user.loggedIn) {
-      this.$router.push({ path: "/login" });
-    }
+    getUserInfo();
+    firebase.auth().onAuthStateChanged(user => {
+      this.$store.dispatch("fetchUser", user);
+      checkRouter();
+    });
   }
 };
 </script>
diff --git a/src/components/UserSettings.vue b/src/components/UserSettings.vue
@@ -34,19 +34,19 @@ import UserInfo from "./UserInfo";
 import UserTabs from "./UserTabs";
 import UserInputs from "./UserInputs";
 
+import { getUserInfo, checkRouter } from "../utils/getUserInfo";
+
 export default {
   components: {
     UserInfo,
     UserTabs,
     UserInputs
   },
   beforeCreate: function() {
+    getUserInfo();
     firebase.auth().onAuthStateChanged(user => {
       this.$store.dispatch("fetchUser", user);
-      if (!this.$store.state.user.loggedIn) {
-        this.$router.push({ path: "/login" });
-        return;
-      }
+      checkRouter();
     });
   }
 };

diff --git a/src/utils/getUserInfo.js b/src/utils/getUserInfo.js
@@ -2,25 +2,24 @@ import firebase from "firebase";
 import store from "../store";
 import router from "../routes";
 
-function checkRouter() {
-  let authRoutes = ["Login", "Register", "ForgetPassword"]; 
-  let independentRoutes = ["Main", "CoursesPage", "ReviewsPage", "FeedbackPage", "InDevelopment", "DescriptionCourse"];
+export function checkRouter() {
+  let authRoutes = ["Login", "Register", "ForgetPassword"];
   let lmsRoutes = ["UserCourses", "UserSettings", "Enroll", "Task"];
-  if (independentRoutes.includes(router.currentRoute.name)){
-    return;
-  }
-  else if (authRoutes.includes(router.currentRoute.name) && store.user.loggedIn) {
-    this.$router.push({ name: "CoursesPage" });
-  }
-  else if (lmsRoutes.includes(router.currentRoute.name) && !store.user.loggedIn) {
-    this.$router.push({ name: "Login" });
+  if (
+    authRoutes.includes(router.currentRoute.name) &&
+    store.state.user.loggedIn
+  ) {
+    router.push({ name: "CoursesPage" });
+  } else if (
+    lmsRoutes.includes(router.currentRoute.name) &&
+    !store.state.user.loggedIn
+  ) {
+    router.push({ name: "Login" });
   }
 }
 
-export default function getUserInfo() {
-  console.log(router.currentRoute); // eslint-disable-line no-console  
+export function getUserInfo() {
   if (store.state.user.getDataFromFirebase) {
-    checkRouter();
     return;
   }
   firebase.auth().onAuthStateChanged(user => {
@@ -34,6 +33,5 @@ export default function getUserInfo() {
           store.commit("saveUserInfo", doc.data());
         });
     }
-    checkRouter();
   });
 }