viithiisys / School-Management-dashboard

Download as
Browse Code ยป

Commit 02a8418782ef936e3441a92c3d30170af716bcfe

Authored by Amber Dev
1 parent bdcd68fbce
Exists in master and in 2 other branches amber-development, ui-design

ccommented token

Showing 2 changed files with 16 additions and 56 deletions   Show diff stats
src/Services/http.js
Diff comments   View file @02a8418
... ... @@ -58,10 +58,8 @@ export default () => {
58 58 switch (errorNo) {
59 59 case 401:
60 60 customError = "Session expired"
61   - console.log("what is this - ", vm1)
62 61 vm1.$store.dispatch("setToken", null);
63 62 vm1.$router.replace({ path: "/" });
64   -
65 63 vm1.$store.dispatch("Id", null);
66 64  
67 65 break;
... ...
src/pages/Dashboard/dashboard.vue
Diff comments   View file @02a8418
... ... @@ -851,11 +851,7 @@ export default {
851 851 },
852 852 getStudents() {
853 853 http()
854   - .get("/getStudentsList", {
855   - headers: {
856   - Authorization: "Bearer " + this.token,
857   - },
858   - })
  854 + .get("/getStudentsList")
859 855 .then((response) => {
860 856 this.students = response.data.data;
861 857 this.showLoader = false;
... ... @@ -872,11 +868,7 @@ export default {
872 868 },
873 869 getParents() {
874 870 http()
875   - .get("/getParentsList", {
876   - headers: {
877   - Authorization: "Bearer " + this.token,
878   - },
879   - })
  871 + .get("/getParentsList")
880 872 .then((response) => {
881 873 this.parents = response.data.data;
882 874 this.showLoader = false;
... ... @@ -888,11 +880,7 @@ export default {
888 880 },
889 881 getTeachers() {
890 882 http()
891   - .get("/getTeachersList", {
892   - headers: {
893   - Authorization: "Bearer " + this.token,
894   - },
895   - })
  883 + .get("/getTeachersList")
896 884 .then((response) => {
897 885 this.teachers = response.data.data;
898 886 this.showLoader = false;
... ... @@ -904,11 +892,7 @@ export default {
904 892 },
905 893 getClasses() {
906 894 http()
907   - .get("/getClassesList", {
908   - headers: {
909   - Authorization: "Bearer " + this.token,
910   - },
911   - })
  895 + .get("/getClassesList")
912 896 .then((response) => {
913 897 this.classes = response.data.data;
914 898 this.showLoader = false;
... ... @@ -920,11 +904,7 @@ export default {
920 904 getNoticeData() {
921 905 this.showLoader = true;
922 906 http()
923   - .get("/getEventsList", {
924   - headers: {
925   - Authorization: "Bearer " + this.token,
926   - },
927   - })
  907 + .get("/getEventsList")
928 908 .then((response) => {
929 909 this.noticeData = response.data.data;
930 910 this.showLoader = false;
... ... @@ -938,9 +918,7 @@ export default {
938 918 if (this.$store.state.role === "PARENT") {
939 919 http()
940 920 .get("/getParticularUserDetail", {
941   - headers: {
942   - Authorization: "Bearer " + this.token,
943   - },
  921 +
944 922 params: {
945 923 studentId: localStorage.getItem("parentStudentId"),
946 924 },
... ... @@ -954,11 +932,7 @@ export default {
954 932 });
955 933 } else {
956 934 http()
957   - .get("/getParticularUserDetail", {
958   - headers: {
959   - Authorization: "Bearer " + this.token,
960   - },
961   - })
  935 + .get("/getParticularUserDetail")
962 936 .then((response) => {
963 937 this.userData = response.data.data;
964 938 this.showLoader = false;
... ... @@ -971,11 +945,7 @@ export default {
971 945  
972 946 getFeesAndCollectionsData() {
973 947 http()
974   - .get("/getTotalFeesAndCollections", {
975   - headers: {
976   - Authorization: "Bearer " + this.token,
977   - },
978   - })
  948 + .get("/getTotalFeesAndCollections")
979 949 .then((response) => {
980 950 this.feeData = response.data.data;
981 951 // this.collectionData = response.data.data;
... ... @@ -989,11 +959,7 @@ export default {
989 959 },
990 960 getExpensesData() {
991 961 http()
992   - .get("/getTotalExpenses", {
993   - headers: {
994   - Authorization: "Bearer " + this.token,
995   - },
996   - })
  962 + .get("/getTotalExpenses")
997 963 .then((response) => {
998 964 this.expenseData = response.data.data;
999 965 // var array = response.data.data.sum;
... ... @@ -1056,11 +1022,7 @@ export default {
1056 1022 if (this.role == "TEACHER") {
1057 1023 this.showLoader = true;
1058 1024 await http()
1059   - .get("/getMeetingEventesList", {
1060   - headers: {
1061   - Authorization: "Bearer " + this.token,
1062   - },
1063   - })
  1025 + .get("/getMeetingEventesList")
1064 1026 .then((response) => {
1065 1027 var activityList = response.data.data;
1066 1028 this.activityList = activityList;
... ... @@ -1093,21 +1055,21 @@ export default {
1093 1055  
1094 1056 async created() {
1095 1057 if (this.$store.state.role === "ADMIN") {
1096   - this.token = this.$store.state.token;
  1058 + // this.token = this.$store.state.token;
1097 1059 await this.getFeesAndCollectionsData();
1098 1060 await this.getExpensesData();
1099 1061 } else if (this.$store.state.schoolRole === "SUPERADMIN") {
1100   - this.token = this.$store.state.schoolToken;
  1062 + // this.token = this.$store.state.schoolToken;
1101 1063 await this.getFeesAndCollectionsData();
1102 1064 await this.getExpensesData();
1103 1065 } else if (this.$store.state.role === "TEACHER") {
1104   - this.token = this.$store.state.token;
  1066 + // this.token = this.$store.state.token;
1105 1067 } else if (this.$store.state.role === "ACCOUNTANT") {
1106   - this.token = this.$store.state.token;
  1068 + // this.token = this.$store.state.token;
1107 1069 } else if (this.$store.state.role === "LIBRARIAN") {
1108   - this.token = this.$store.state.token;
  1070 + // this.token = this.$store.state.token;
1109 1071 } else if (this.$store.state.role === "PARENT") {
1110   - this.token = this.$store.state.token;
  1072 + // this.token = this.$store.state.token;
1111 1073 // await this.getparentStudents();
1112 1074 this.studentsData = this.$store.getters.GET_STUDENTS_DATA;
1113 1075 console.log("students data - ",this.studentsData)
... ...