[WIP] Фикс просроченного токена

src/components/base/BaseClientFormCreate.vue

@@ -431,7 +431,7 @@ export default {
   background-color: var(--default-white)
   border-radius: 4px
   width: 634px
-  min-height: 700px
+  min-height: 585px
   box-shadow: var(--default-shadow)
 
 .title

src/pages/calendar/TheCalendar.vue

@@ -104,16 +104,10 @@ export default {
     saveEmployeesData(res) {
       this.employeesData = res.results;
     },
-    logout() {
-      localStorage.removeItem("tokenAccess");
-      this.$router.push("/login");
-    },
     fetchEmployeesData() {
-      fetchWrapper.get("general/employee/").then((res) => {
+      fetchWrapper
-        if (res.type === "client_error") {
+        .get("general/employee/")
-          this.logout();
+        .then((res) => this.saveEmployeesData(res));
-        } else this.saveEmployeesData(res);
-      });
     },
     fetchEventsData() {
       fetchWrapper

src/pages/clients/components/ClientsTable.vue

@@ -118,10 +118,6 @@ export default {
         this.fetchDataClients();
       }
     },
-    logout() {
-      localStorage.removeItem("tokenAccess");
-      this.$router.push("/login");
-    },
     async fetchDataClients() {
       let response = {};
       if (this.textSearch) {
@@ -130,25 +126,18 @@ export default {
             this.limit
           }&offset=${(this.currentTablePage - 1) * this.limit}`
         );
-        if (response.type === "client_error") {
-          this.logout();
-        } else {
         this.saveDataClients(response);
         this.saveFilteredClientsCount(response);
         this.paginationInfo = {
           currentPage: this.currentTablePage,
           length: this.calculatePageCount(this.filteredClientsCount),
         };
-        }
       } else {
         response = await fetchWrapper.get(
           `general/person/?limit=${this.limit}&offset=${
             (this.currentTablePage - 1) * this.limit
           }`
         );
-        if (response.type === "client_error") {
-          this.logout();
-        } else {
         this.saveDataClients(response);
         this.saveClientsCount(response);
         this.paginationInfo = {
@@ -156,7 +145,6 @@ export default {
           length: this.calculatePageCount(this.clientsCount),
         };
       }
-      }
     },
     calculatePageCount(count) {
       return Math.ceil(count / this.limit);

src/pages/clients/components/FormCreateBasicInfo.vue

@@ -87,7 +87,7 @@ export default {
 
 <style lang="sass" scoped>
 .wrapper-info
-  min-height: 443px
+  min-height: 336px
   max-height: 443px
   overflow-y: auto
   color: var(--font-grey-color)

src/shared/fetchWrapper.js

@@ -1,3 +1,5 @@
+import router from "@/router";
+
 function prepareUrl(url) {
   if (url.startsWith("http")) return url;
   return `http://45.84.227.122:8080/api/${url}`;
@@ -12,7 +14,10 @@ function handleRequest(method, url, headers, attempts, body, type) {
     })();
   })
     .then((res) => {
-      if (res) return res.json();
+      if (res.status === 401) {
+        localStorage.removeItem("tokenAccess");
+        return router.push("/login");
+      } else if (res) return res.json();
     })
     .catch((err) => {
       return err;