shared-ritm 1.1.86 → 1.1.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shared-ritm",
-  "version": "1.1.86",
+  "version": "1.1.87",
   "private": false,
   "files": [
     "dist",

package/src/App.vue

@@ -18,6 +18,7 @@
         "
       />
       <app-input v-model="test" type="text" />
+      <app-date-picker v-model="dateStart" view="standard" :disabled="true" label="Прогнозируемая дата старта" />
     </div>
   </app-layout>
 </template>
@@ -31,6 +32,7 @@ import AppSidebar from '@/common/app-sidebar/AppSidebar.vue'
 import AppLayout from '@/common/app-layout/AppLayout.vue'
 import AppLayoutHeader from '@/common/app-layout/components/AppLayoutHeader.vue'
 import { useRoute } from 'vue-router'
+import AppDatePicker from '@/common/app-date-picker/AppDatePicker.vue'
 const test = ref('sdf')
 
 const $q = useQuasar()
@@ -43,6 +45,8 @@ const isRouteActive = (item: any) => {
   return item.to === route.path || item?.items?.find((x: any) => x.to === route.path)
 }
 
+const dateStart = ref('11.01.2022')
+
 const userData = {
   id: '9d340f1a-8d46-4606-b102-76d0a8a70e10',
   last_name: 'Савин',

package/src/api/services/AuthService.ts

@@ -1,41 +1,41 @@
-import ApiService from '@/api/settings/ApiService'
-
-type LoginPayload = {
-  email: string
-  password: string
-}
-
-type LoginResponse = {
-  token: string
-  user: any
-}
-
-type ConfigResponse = any
-
-class AuthService extends ApiService {
-  public login(email: string, password: string) {
-    return this.post<LoginPayload, LoginResponse>(`/login`, {
-      email,
-      password,
-    })
-  }
-
-  public logout() {
-    return this.post<null, LoginResponse>(`/logout`, null)
-  }
-
-  public userInfo() {
-    return this.get<any>(`/users/auth`)
-  }
-
-  public configs() {
-    return this.get<ConfigResponse>(`/configs`)
-  }
-}
-
-let api: AuthService
-
-export default function useAuthService() {
-  if (!api) api = new AuthService()
-  return api
-}
+import ApiService from '@/api/settings/ApiService'
+
+type LoginPayload = {
+  email: string
+  password: string
+}
+
+type LoginResponse = {
+  token: string
+  user: any
+}
+
+type ConfigResponse = any
+
+class AuthService extends ApiService {
+  public login(email: string, password: string) {
+    return this.post<LoginPayload, LoginResponse>(`/login`, {
+      email,
+      password,
+    })
+  }
+
+  public logout() {
+    return this.post<null, LoginResponse>(`/logout`, null)
+  }
+
+  public userInfo() {
+    return this.get<any>(`/users/auth`)
+  }
+
+  public configs() {
+    return this.get<ConfigResponse>(`/configs`)
+  }
+}
+
+let api: AuthService
+
+export default function useAuthService() {
+  if (!api) api = new AuthService()
+  return api
+}

package/src/api/services/FileService.ts

@@ -1,15 +1,15 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService'
-import { Api_Files_Responsible_Dto } from '@/api/types/Api_Files'
-
-class FileService extends ApiService {
-  public uploadFile(data: FormData): Promise<ResponseApi<Api_Files_Responsible_Dto>> {
-    return this.post<FormData, any>(`/upload-file`, data, { headers: { 'Content-Type': 'multipart/form-data' } })
-  }
-}
-
-let api: FileService
-
-export default function useFileService() {
-  if (!api) api = new FileService()
-  return api
-}
+import ApiService, { ResponseApi } from '@/api/settings/ApiService'
+import { Api_Files_Responsible_Dto } from '@/api/types/Api_Files'
+
+class FileService extends ApiService {
+  public uploadFile(data: FormData): Promise<ResponseApi<Api_Files_Responsible_Dto>> {
+    return this.post<FormData, any>(`/upload-file`, data, { headers: { 'Content-Type': 'multipart/form-data' } })
+  }
+}
+
+let api: FileService
+
+export default function useFileService() {
+  if (!api) api = new FileService()
+  return api
+}

package/src/api/settings/ApiService.ts

@@ -1,126 +1,126 @@
-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',
-        Accept: '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',
+        Accept: '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,93 +1,93 @@
-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_Task_Video_Source = {
-  id: string
-  name: string
-  work_zones_by_tasks: Array<{
-    coordinates: { x0: number; x1: number; y0: number; y1: number }
-    id: string
-    tasks: unknown[]
-    title: string
-  }>
-}
-
-export type Api_Task_Video_Source_Stream = {
-  id: string
-  name: string
-  url: string
-  width: number
-  height: number
-  fps: string
-  login: string
-  password: string
-  comment: unknown
-  work_zones: unknown[]
-  video_source: unknown[]
-  related_video_sources: unknown[]
-  interactive_zones: unknown
-  domed: boolean
-  snapshot_path: string
-  shapes: unknown[]
-}
-
-export type Api_Create_Repair_With_Equipments = {
-  name: string
-  display_name: string
-  description: string
-  equipment_id: string
-  power_output_MWh?: number
-  cost_per_MWh?: number
-  category?: string
-}
-
-export type Api_Update_Repair = {
-  name?: string
-  display_name?: string
-  description: string
-  power_output_MWh?: number
-  cost_per_MWh?: number
-  category?: 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_Task_Video_Source = {
+  id: string
+  name: string
+  work_zones_by_tasks: Array<{
+    coordinates: { x0: number; x1: number; y0: number; y1: number }
+    id: string
+    tasks: unknown[]
+    title: string
+  }>
+}
+
+export type Api_Task_Video_Source_Stream = {
+  id: string
+  name: string
+  url: string
+  width: number
+  height: number
+  fps: string
+  login: string
+  password: string
+  comment: unknown
+  work_zones: unknown[]
+  video_source: unknown[]
+  related_video_sources: unknown[]
+  interactive_zones: unknown
+  domed: boolean
+  snapshot_path: string
+  shapes: unknown[]
+}
+
+export type Api_Create_Repair_With_Equipments = {
+  name: string
+  display_name: string
+  description: string
+  equipment_id: string
+  power_output_MWh?: number
+  cost_per_MWh?: number
+  category?: string
+}
+
+export type Api_Update_Repair = {
+  name?: string
+  display_name?: string
+  description: string
+  power_output_MWh?: number
+  cost_per_MWh?: number
+  category?: 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[]
+}