diff --git a/src/Services/http.js b/src/Services/http.js index 10eb9bb..71b6113 100644 --- a/src/Services/http.js +++ b/src/Services/http.js @@ -58,10 +58,8 @@ export default () => { switch (errorNo) { case 401: customError = "Session expired" - console.log("what is this - ", vm1) vm1.$store.dispatch("setToken", null); vm1.$router.replace({ path: "/" }); - vm1.$store.dispatch("Id", null); break; diff --git a/src/pages/Dashboard/dashboard.vue b/src/pages/Dashboard/dashboard.vue index 61a60d8..2905b66 100644 --- a/src/pages/Dashboard/dashboard.vue +++ b/src/pages/Dashboard/dashboard.vue @@ -851,11 +851,7 @@ export default { }, getStudents() { http() - .get("/getStudentsList", { - headers: { - Authorization: "Bearer " + this.token, - }, - }) + .get("/getStudentsList") .then((response) => { this.students = response.data.data; this.showLoader = false; @@ -872,11 +868,7 @@ export default { }, getParents() { http() - .get("/getParentsList", { - headers: { - Authorization: "Bearer " + this.token, - }, - }) + .get("/getParentsList") .then((response) => { this.parents = response.data.data; this.showLoader = false; @@ -888,11 +880,7 @@ export default { }, getTeachers() { http() - .get("/getTeachersList", { - headers: { - Authorization: "Bearer " + this.token, - }, - }) + .get("/getTeachersList") .then((response) => { this.teachers = response.data.data; this.showLoader = false; @@ -904,11 +892,7 @@ export default { }, getClasses() { http() - .get("/getClassesList", { - headers: { - Authorization: "Bearer " + this.token, - }, - }) + .get("/getClassesList") .then((response) => { this.classes = response.data.data; this.showLoader = false; @@ -920,11 +904,7 @@ export default { getNoticeData() { this.showLoader = true; http() - .get("/getEventsList", { - headers: { - Authorization: "Bearer " + this.token, - }, - }) + .get("/getEventsList") .then((response) => { this.noticeData = response.data.data; this.showLoader = false; @@ -938,9 +918,7 @@ export default { if (this.$store.state.role === "PARENT") { http() .get("/getParticularUserDetail", { - headers: { - Authorization: "Bearer " + this.token, - }, + params: { studentId: localStorage.getItem("parentStudentId"), }, @@ -954,11 +932,7 @@ export default { }); } else { http() - .get("/getParticularUserDetail", { - headers: { - Authorization: "Bearer " + this.token, - }, - }) + .get("/getParticularUserDetail") .then((response) => { this.userData = response.data.data; this.showLoader = false; @@ -971,11 +945,7 @@ export default { getFeesAndCollectionsData() { http() - .get("/getTotalFeesAndCollections", { - headers: { - Authorization: "Bearer " + this.token, - }, - }) + .get("/getTotalFeesAndCollections") .then((response) => { this.feeData = response.data.data; // this.collectionData = response.data.data; @@ -989,11 +959,7 @@ export default { }, getExpensesData() { http() - .get("/getTotalExpenses", { - headers: { - Authorization: "Bearer " + this.token, - }, - }) + .get("/getTotalExpenses") .then((response) => { this.expenseData = response.data.data; // var array = response.data.data.sum; @@ -1056,11 +1022,7 @@ export default { if (this.role == "TEACHER") { this.showLoader = true; await http() - .get("/getMeetingEventesList", { - headers: { - Authorization: "Bearer " + this.token, - }, - }) + .get("/getMeetingEventesList") .then((response) => { var activityList = response.data.data; this.activityList = activityList; @@ -1093,21 +1055,21 @@ export default { async created() { if (this.$store.state.role === "ADMIN") { - this.token = this.$store.state.token; + // this.token = this.$store.state.token; await this.getFeesAndCollectionsData(); await this.getExpensesData(); } else if (this.$store.state.schoolRole === "SUPERADMIN") { - this.token = this.$store.state.schoolToken; + // this.token = this.$store.state.schoolToken; await this.getFeesAndCollectionsData(); await this.getExpensesData(); } else if (this.$store.state.role === "TEACHER") { - this.token = this.$store.state.token; + // this.token = this.$store.state.token; } else if (this.$store.state.role === "ACCOUNTANT") { - this.token = this.$store.state.token; + // this.token = this.$store.state.token; } else if (this.$store.state.role === "LIBRARIAN") { - this.token = this.$store.state.token; + // this.token = this.$store.state.token; } else if (this.$store.state.role === "PARENT") { - this.token = this.$store.state.token; + // this.token = this.$store.state.token; // await this.getparentStudents(); this.studentsData = this.$store.getters.GET_STUDENTS_DATA; console.log("students data - ",this.studentsData)