shared-ritm 1.0.50 → 1.0.51

package/src/api/settings/ApiService.ts

@@ -1,124 +1,124 @@
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
-
-export enum ApiServiceType {
-  SERVICE_AUTH = 'SERVICE_AUTH',
-}
-
-export type ResponseApi<T> = {
-  count: number
-  current_page: number
-  data: T
-  per_page: number
-  total: number
-  total_pages: number
-}
-
-export default class ApiService {
-  private axiosInstance: AxiosInstance
-
-  constructor() {
-    this.axiosInstance = axios.create({
-      baseURL: process.env.VUE_APP_BACKEND,
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    })
-
-    this.axiosInstance.interceptors.request.use(
-      (config: InternalAxiosRequestConfig) => {
-        const token = this.getToken()
-        if (token && config.headers) {
-          config.headers.Authorization = `Bearer ${token}`
-        }
-        return config
-      },
-      (error: AxiosError) => {
-        return Promise.reject(error)
-      },
-    )
-
-    this.axiosInstance.interceptors.response.use(
-      (response: AxiosResponse) => {
-        return response.data
-      },
-      (error: AxiosError) => {
-        if (error.response?.status === 401 || error.response?.status === 403) {
-          this.logout()
-        }
-        return Promise.reject(error)
-      },
-    )
-  }
-  private getToken() {
-    return localStorage.getItem('token')
-  }
-
-  private removeToken() {
-    localStorage.removeItem('token')
-  }
-
-  public logout(): void {
-    this.removeToken()
-    window.location.href = '/sign-in'
-  }
-
-  private handleError(error: AxiosError): void {
-    if (error.response) {
-      console.error('API Error:', error.response.status, error.response.data)
-    } else if (error.request) {
-      console.error('No response received:', error.request)
-    } else {
-      console.error('Error during request setup:', error.message)
-    }
-  }
-
-  protected async get<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
-      return response?.data ?? (response as unknown as T)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
-    try {
-      return await this.axiosInstance.delete<T>(url, options)
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-
-  // protected patch<T1, T2>(url: string, payload: T1, type: ApiServiceType, options?: AxiosRequestConfig): Promise<T2> {
-  //   return axios
-  //     .patch<T1, AxiosResponse<T2>>(apiServiceUrls[type] + url, payload, options)
-  //     .catch((err: AxiosError) => processError401<T2>(err))
-  //     .then(extractData)
-  // }
-  //
-  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
-    try {
-      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
-      return response.data
-    } catch (error) {
-      const axiosError = error as AxiosError
-      this.handleError(axiosError)
-      throw error
-    }
-  }
-}
+import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig } from 'axios'
+
+export enum ApiServiceType {
+  SERVICE_AUTH = 'SERVICE_AUTH',
+}
+
+export type ResponseApi<T> = {
+  count: number
+  current_page: number
+  data: T
+  per_page: number
+  total: number
+  total_pages: number
+}
+
+export default class ApiService {
+  private axiosInstance: AxiosInstance
+
+  constructor() {
+    this.axiosInstance = axios.create({
+      baseURL: process.env.VUE_APP_BACKEND,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+
+    this.axiosInstance.interceptors.request.use(
+      (config: InternalAxiosRequestConfig) => {
+        const token = this.getToken()
+        if (token && config.headers) {
+          config.headers.Authorization = `Bearer ${token}`
+        }
+        return config
+      },
+      (error: AxiosError) => {
+        return Promise.reject(error)
+      },
+    )
+
+    this.axiosInstance.interceptors.response.use(
+      (response: AxiosResponse) => {
+        return response.data
+      },
+      (error: AxiosError) => {
+        if (error.response?.status === 401 || error.response?.status === 403) {
+          this.logout()
+        }
+        return Promise.reject(error)
+      },
+    )
+  }
+  private getToken() {
+    return localStorage.getItem('token')
+  }
+
+  private removeToken() {
+    localStorage.removeItem('token')
+  }
+
+  public logout(): void {
+    this.removeToken()
+    window.location.href = '/sign-in'
+  }
+
+  private handleError(error: AxiosError): void {
+    if (error.response) {
+      console.error('API Error:', error.response.status, error.response.data)
+    } else if (error.request) {
+      console.error('No response received:', error.request)
+    } else {
+      console.error('Error during request setup:', error.message)
+    }
+  }
+
+  protected async get<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T> = await this.axiosInstance.get<T>(url, options)
+      return response?.data ?? (response as unknown as T)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async delete<T>(url: string, options?: AxiosRequestConfig) {
+    try {
+      return await this.axiosInstance.delete<T>(url, options)
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  protected async post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.post<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
+  // protected patch<T1, T2>(url: string, payload: T1, type: ApiServiceType, options?: AxiosRequestConfig): Promise<T2> {
+  //   return axios
+  //     .patch<T1, AxiosResponse<T2>>(apiServiceUrls[type] + url, payload, options)
+  //     .catch((err: AxiosError) => processError401<T2>(err))
+  //     .then(extractData)
+  // }
+  //
+  protected async put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig) {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.put<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+}

package/src/api/types/Api_Repairs.ts

@@ -1,57 +1,57 @@
-export type Api_Team = {
-  id: string
-  display_name: string
-}
-
-export type Api_Equipment_Short_Dto = {
-  id: string
-  name: string
-}
-
-export type Api_Repairs = {
-  id: string
-  name: string
-}
-
-export type Api_Projects = {
-  id: string
-  name: string
-}
-
-export type OptionFilters = {
-  teams?: Api_Team[]
-  equipments?: Api_Equipment_Short_Dto[]
-}
-
-export type Api_Equipment_Full_Dto = {
-  id: string
-  model: null | string
-  name: string
-  registration_number: string
-  repair_frequency: number
-  repair_range: number
-}
-
-export type Api_Create_Repair_With_Equipments = {
-  name: string
-  display_name: string
-  description: string
-  equipment_id: string
-}
-
-export type Api_Update_Repair = {
-  name?: string
-  display_name?: string
-  description: string
-}
-
-export type Api_Repair_Dto = {
-  id: string
-  name: string
-  display_name: string
-  description: string
-  start_date: string
-  end_date: string
-  projects: Api_Projects[]
-  equipments: Api_Equipment_Full_Dto[]
-}
+export type Api_Team = {
+  id: string
+  display_name: string
+}
+
+export type Api_Equipment_Short_Dto = {
+  id: string
+  name: string
+}
+
+export type Api_Repairs = {
+  id: string
+  name: string
+}
+
+export type Api_Projects = {
+  id: string
+  name: string
+}
+
+export type OptionFilters = {
+  teams?: Api_Team[]
+  equipments?: Api_Equipment_Short_Dto[]
+}
+
+export type Api_Equipment_Full_Dto = {
+  id: string
+  model: null | string
+  name: string
+  registration_number: string
+  repair_frequency: number
+  repair_range: number
+}
+
+export type Api_Create_Repair_With_Equipments = {
+  name: string
+  display_name: string
+  description: string
+  equipment_id: string
+}
+
+export type Api_Update_Repair = {
+  name?: string
+  display_name?: string
+  description: string
+}
+
+export type Api_Repair_Dto = {
+  id: string
+  name: string
+  display_name: string
+  description: string
+  start_date: string
+  end_date: string
+  projects: Api_Projects[]
+  equipments: Api_Equipment_Full_Dto[]
+}

package/src/api/types/Api_Tasks.ts

@@ -1,99 +1,99 @@
-export type Api_Tasks_Responsible_Dto = {
-  id: string
-  first_name: string
-  last_name: string
-  patronymic: string
-  full_name: string
-}
-
-export type Api_Tasks_Assigned_Dto = {
-  id: string
-  first_name: string
-  last_name: string
-  patronymic: null | string
-  full_name: string
-}
-
-export type Api_Tasks_Status_Dto = {
-  id: string
-  name: string
-  title: string
-}
-export type Api_Tasks_Project_Dto = {
-  id: string
-  name: string
-  teams: string[]
-}
-export type Api_Tasks_Position_Dto = {
-  id: string
-  name: string
-  display_name: string
-}
-
-export type Api_Tasks_Position_Assigned_Dto = {
-  id: number
-  user: {
-    id: string
-    full_name: string
-  }
-  position: Api_Tasks_Position_Dto
-}
-
-export type Api_Tasks_Teams_Dto = {
-  id: string
-  name: string
-  display_name: string
-}
-
-export type Api_Tasks_Equipment_Dto = {
-  id: string
-  name: string
-  model: string
-  registration_number: string
-  created_at: string
-  updated_at: string
-  repair_frequency: number
-  repair_range: number
-}
-
-export type Api_Tasks_Task_Dto = {
-  id: string
-  name: string
-  type: string
-  project_id: string
-  description: string
-  subtask_counter: number
-  subtasks: Api_Tasks_Task_Dto[]
-  state_id: null | string
-  start_date: string
-  end_date: string
-  deadline: string
-  plan_date: string
-  time_to_complete: null | string | number
-  time_to_complete_sec: number
-  priority: number
-  work_zone_id: null | string
-  location_id: null | string
-  target: any
-  status: Api_Tasks_Status_Dto
-  project: Api_Tasks_Project_Dto
-  position: Api_Tasks_Position_Dto[]
-  assigned: Api_Tasks_Assigned_Dto[]
-  instruments: any[]
-  warehouse: any[]
-  responsible: Api_Tasks_Responsible_Dto[]
-  position_assigned: Api_Tasks_Position_Assigned_Dto[]
-  comments: any[]
-  files: any[]
-  teams: Api_Tasks_Teams_Dto[]
-  work_zone: string
-  planned_start: null | string
-  planned_end: null | string
-  fact_start_date: string
-  fact_end_date: null | string
-  work_sec: number
-  pause_sec: number
-  repair_object: null | string
-  isPause: boolean
-  equipment: Api_Tasks_Equipment_Dto[]
-}
+export type Api_Tasks_Responsible_Dto = {
+  id: string
+  first_name: string
+  last_name: string
+  patronymic: string
+  full_name: string
+}
+
+export type Api_Tasks_Assigned_Dto = {
+  id: string
+  first_name: string
+  last_name: string
+  patronymic: null | string
+  full_name: string
+}
+
+export type Api_Tasks_Status_Dto = {
+  id: string
+  name: string
+  title: string
+}
+export type Api_Tasks_Project_Dto = {
+  id: string
+  name: string
+  teams: string[]
+}
+export type Api_Tasks_Position_Dto = {
+  id: string
+  name: string
+  display_name: string
+}
+
+export type Api_Tasks_Position_Assigned_Dto = {
+  id: number
+  user: {
+    id: string
+    full_name: string
+  }
+  position: Api_Tasks_Position_Dto
+}
+
+export type Api_Tasks_Teams_Dto = {
+  id: string
+  name: string
+  display_name: string
+}
+
+export type Api_Tasks_Equipment_Dto = {
+  id: string
+  name: string
+  model: string
+  registration_number: string
+  created_at: string
+  updated_at: string
+  repair_frequency: number
+  repair_range: number
+}
+
+export type Api_Tasks_Task_Dto = {
+  id: string
+  name: string
+  type: string
+  project_id: string
+  description: string
+  subtask_counter: number
+  subtasks: Api_Tasks_Task_Dto[]
+  state_id: null | string
+  start_date: string
+  end_date: string
+  deadline: string
+  plan_date: string
+  time_to_complete: null | string | number
+  time_to_complete_sec: number
+  priority: number
+  work_zone_id: null | string
+  location_id: null | string
+  target: any
+  status: Api_Tasks_Status_Dto
+  project: Api_Tasks_Project_Dto
+  position: Api_Tasks_Position_Dto[]
+  assigned: Api_Tasks_Assigned_Dto[]
+  instruments: any[]
+  warehouse: any[]
+  responsible: Api_Tasks_Responsible_Dto[]
+  position_assigned: Api_Tasks_Position_Assigned_Dto[]
+  comments: any[]
+  files: any[]
+  teams: Api_Tasks_Teams_Dto[]
+  work_zone: string
+  planned_start: null | string
+  planned_end: null | string
+  fact_start_date: string
+  fact_end_date: null | string
+  work_sec: number
+  pause_sec: number
+  repair_object: null | string
+  isPause: boolean
+  equipment: Api_Tasks_Equipment_Dto[]
+}

package/src/common/app-button/AppButton.vue

@@ -121,7 +121,7 @@ const isDisabled = computed(() => {
     border-radius: 14px;
   }
   &:global(.q-btn) {
-    color: #0a1629;
+    color: #ea0e3f;
     font-size: 16px;
     font-style: normal;
     font-weight: 700;