diff --git a/src/Services/http.js b/src/Services/http.js index 2683a41..bad831f 100644 --- a/src/Services/http.js +++ b/src/Services/http.js @@ -17,71 +17,69 @@ const baseURL = `${baseDomain}`; // console.log("token",`${store.state.schoolToken}`); export default () => { - // return axios.create({ - // // baseURL: 'http://192.168.2.221:3002/v1', - // baseURL, - // headers: { - // Authorization: `Bearer ${store.state.token}` - // } - // }) - let instance = axios.create({ - // LIVE - //baseURL: 'https://annadata.patanjaliayurved.org/api', - // DEVELOPMENT - baseURL: baseURL, + // return axios.create({ + // // baseURL: 'http://192.168.2.221:3002/v1', + // baseURL, + // headers: { + // Authorization: `Bearer ${store.state.token}` + // } + // }) + let instance = axios.create({ + // LIVE + //baseURL: 'https://annadata.patanjaliayurved.org/api', + // DEVELOPMENT + baseURL: baseURL, - headers: { - Authorization: `Bearer ${store.state.token}`, - // Authorization: `Bearer sdfsdfsfsdf`, - // 'Access-Control-Allow-Origin': '*' + headers: { + Authorization: `Bearer ${store.state.token}`, + // Authorization: `Bearer sdfsdfsfsdf`, + // 'Access-Control-Allow-Origin': '*' - } - }) + } + }) - instance.interceptors.request.use((config) => { - // Do something before request is sent + instance.interceptors.request.use((config) => { + // Do something before request is sent - return config - }, error => { - return Promise.reject(error) - }) - instance.interceptors.response.use((response) => { - // do something with the response data + return config + }, error => { + return Promise.reject(error) + }) + instance.interceptors.response.use((response) => { + // do something with the response data + return response; + }, error => { + // handle the response error + console.log("error in interceptor - ", error.response.status) + var customError + const errorNo = error.response.status + switch (errorNo) { + case 401: + customError = "Session expired" + vm1.$store.dispatch("RESET_STORE", { + token: null, + data: null, + isUserLoggedIn: false, + isSchoolLoggedIn: false, + id: null, + role: null, + // schoolId: null, + schoolToken: null, + schoolRole: null, + studentsData: [], + }); + window.getApp.$emit("APP_LOGOUT"); + console.log("store is - ", vm1.$store.state) + vm1.$router.push({ name: "Login" }); + // vm1.$store.dispatch("Id", null); - return response; - }, error => { - // handle the response error - console.log("error in interceptor - ", error.response.status) - var customError - const errorNo = error.response.status + break; + } - switch (errorNo) { - case 401: - customError = "Session expired" - vm1.$store.dispatch("RESET_STORE", { - token: null, - data: null, - isUserLoggedIn: false, - isSchoolLoggedIn: false, - id: null, - role: null, - // schoolId: null, - schoolToken: null, - schoolRole: null, - studentsData: [], - }); - window.getApp.$emit("APP_LOGOUT"); - console.log("store is - ",vm1.$store.state) - vm1.$router.push({ name: "Login" }); - // vm1.$store.dispatch("Id", null); + return Promise.reject(error); + }) + // response parse - break; - } - - return Promise.reject(error); - }) - // response parse - - return instance; + return instance; } \ No newline at end of file diff --git a/src/pages/Payroll/manageSalary.vue b/src/pages/Payroll/manageSalary.vue index efc4797..cd65fe1 100644 --- a/src/pages/Payroll/manageSalary.vue +++ b/src/pages/Payroll/manageSalary.vue @@ -508,10 +508,10 @@ export default { data: () => ({ search: "", pagination: { - rowsPerPage: 10 + rowsPerPage: 10, }, - role: [v => !!v || "Role Name is required"], + role: [(v) => !!v || "Role Name is required"], getRoles: [], teacherList: [], roleList: [], @@ -522,7 +522,7 @@ export default { salaryItem: "", getReport: { - role: "" + role: "", }, showTeacher: false, @@ -536,9 +536,9 @@ export default { editedItem: { salaryTemplate: { allowances: {}, - deduction: {} + deduction: {}, }, - hourlyTemplate: {} + hourlyTemplate: {}, }, // salaryGrades: {}, @@ -561,31 +561,31 @@ export default { text: "No", align: "", sortable: false, - value: "No" + value: "No", }, { text: "Profile Pic", value: "profilePicUrl", sortable: false, - align: "center" + align: "center", }, { text: "Name", value: "name", sortable: false, align: "center" }, { text: "Join Date", value: "joinDate", sortable: false, - align: "center" + align: "center", }, - { text: "Action", value: "", sortable: false, align: "center" } + { text: "Action", value: "", sortable: false, align: "center" }, ], - desserts: [] + desserts: [], }), methods: { close() { this.editHourDialog = false; }, - dates: function(date) { + dates: function (date) { return moment(date).format("MMMM DD, YYYY"); }, editItem(item) { @@ -611,29 +611,24 @@ export default { var token = this.$store.state.token; http() .get("/getRolesList", { - headers: { Authorization: "Bearer " + token } + headers: { Authorization: "Bearer " + token }, }) - .then(response => { + .then((response) => { this.getRoles = response.data.data; // if (this.getRoles[2].role !== 3) { // this.getRoles = response.data.data; // console.log("roles", this.getRoles[2].role); // } - this.getRoles = response.data.data; - var removedRoles = _.remove(this.getRoles, function(c) { - //remove if color is green or yellow - return c.role === 1 || c.role === 4 || c.role === 5; - // console.log(c); - }); + + // var removedRoles = _.remove(this.getRoles, function (c) { + // //remove if color is green or yellow + // return c.role === 1 || c.role === 4 || c.role === 5; + // // console.log(c); + // }); this.showLoader = false; }) - .catch(error => { + .catch((error) => { this.showLoader = false; - if (error.response.status === 401) { - this.$router.replace({ path: "/" }); - this.$store.dispatch("setToken", null); - this.$store.dispatch("Id", null); - } }); }, @@ -650,14 +645,14 @@ export default { var token = this.$store.state.token; http() .get("/getTeachersList", { - headers: { Authorization: "Bearer " + token } + headers: { Authorization: "Bearer " + token }, }) - .then(response => { + .then((response) => { this.teacherList = response.data.data; this.showTeacher = true; this.showLoader = false; }) - .catch(error => { + .catch((error) => { this.showLoader = false; if (error.response.status === 401) { this.$router.replace({ path: "/" }); @@ -674,14 +669,14 @@ export default { "/getUserDetailWithRoles", { params: { role: this.getReport.role } }, { - headers: { Authorization: "Bearer " + this.token } + headers: { Authorization: "Bearer " + this.token }, } ) - .then(response => { + .then((response) => { this.roleList = response.data.data; this.showLoader = false; }) - .catch(err => { + .catch((err) => { this.showLoader = false; }); }, @@ -690,14 +685,14 @@ export default { this.loadingSearch = true; http() .get("/getSalaryList", { - headers: { Authorization: "Bearer " + this.token } + headers: { Authorization: "Bearer " + this.token }, }) - .then(response => { + .then((response) => { this.salaryData = response.data.data; this.showLoader = false; this.loadingSearch = false; }) - .catch(error => { + .catch((error) => { // console.log("err====>", err); this.showLoader = false; this.loadingSearch = false; @@ -715,14 +710,14 @@ export default { this.loadingSearch = true; http() .get("/getHourlyList", { - headers: { Authorization: "Bearer " + this.token } + headers: { Authorization: "Bearer " + this.token }, }) - .then(response => { + .then((response) => { this.hourlyData = response.data.data; this.showLoader = false; this.loadingSearch = false; }) - .catch(error => { + .catch((error) => { // console.log("err====>", err); this.showLoader = false; this.loadingSearch = false; @@ -755,7 +750,7 @@ export default { } }, selectGrade() { - console.log("this.editedItem", this.editedItem); + // console.log("this.editedItem", this.editedItem); }, selectView() { if (this.editedItem.view.png === "Monthly") { @@ -772,15 +767,15 @@ export default { role: this.editedItem.role, userId: this.editedItem._id, templateName: this.editedItem.salary, - templateId: this.editedItem.salaryId + templateId: this.editedItem.salaryId, }; http() .put("/updateUserSalary", updateSalary, { headers: { - Authorization: "Bearer " + this.token - } + Authorization: "Bearer " + this.token, + }, }) - .then(response => { + .then((response) => { this.getUserDetailWithRoles(); this.close(); this.snackbar = true; @@ -788,10 +783,12 @@ export default { this.color = "green"; this.editSalaryDialog = false; }) - .catch(error => { - console.log("error", error); + .catch((error) => { + // console.log("error", error); + this.snackbar = true; this.snackbar = true; - this.color = "red"; + this.color = "error"; + this.text = error.response.data.message; }); }, @@ -824,7 +821,7 @@ export default { // this.text = error.response.data.message; // this.color = "red"; // }); - } + }, // selectAllowances() { // this.salaryTypeData.push({ @@ -911,6 +908,6 @@ export default { this.getRole(); this.getSalaryList(); this.getHourlyList(); - } + }, }; \ No newline at end of file