shared-ritm 1.3.69 → 1.3.71

package/src/api/services/AuthService.ts

@@ -1,53 +1,67 @@
-import ApiService from '../settings/ApiService'
-import {
-  Api_Auth_Login,
-  ChangePasswordPayload,
-  ChangePasswordResponse,
-  ConfigResponse,
-  LoginPayload,
-} from '@/api/types/Api_Auth'
-
-class AuthService extends ApiService {
-  public login(email: string, password: string): Promise<Api_Auth_Login> {
-    return this.post<LoginPayload, Api_Auth_Login>(`/login`, {
-      email,
-      password,
-    })
-  }
-
-  public loginPhoto(photo: any): Promise<Api_Auth_Login> {
-    return this.post<any, Api_Auth_Login>(`/login/from_photo`, { photo })
-  }
-
-  public loginVideo(data: any): Promise<Api_Auth_Login> {
-    return this.post<any, Api_Auth_Login>(`/login/video`, data, {
-      transformRequest: d => d,
-    })
-  }
-
-  public logout(): Promise<Api_Auth_Login> {
-    return this.post<null, Api_Auth_Login>(`/logout`, null)
-  }
-
-  public userInfo() {
-    return this.get<any>(`/users/auth`)
-  }
-
-  public configs(): Promise<ConfigResponse> {
-    return this.get<ConfigResponse>(`/configs`)
-  }
-
-  public changePassword(id: string, password: string, password_confirmation: string) {
-    return this.put<ChangePasswordPayload, ChangePasswordResponse>(`/users/${id}/password`, {
-      password,
-      password_confirmation,
-    })
-  }
-}
-
-let api: AuthService
-
-export default function useAuthService() {
-  if (!api) api = new AuthService()
-  return api
-}
+import ApiService from '../settings/ApiService'
+import {
+  Api_Auth_Login,
+  ChangePasswordAndActivatePayload,
+  ChangePasswordPayload,
+  ChangePasswordResponse,
+  ConfigResponse,
+  LoginPayload,
+} from '@/api/types/Api_Auth'
+
+class AuthService extends ApiService {
+  public login(email: string, password: string): Promise<Api_Auth_Login> {
+    return this.post<LoginPayload, Api_Auth_Login>(`/v2/login`, {
+      email,
+      password,
+    })
+  }
+
+  public loginPhoto(photo: any): Promise<Api_Auth_Login> {
+    return this.post<any, Api_Auth_Login>(`/login/from_photo`, { photo })
+  }
+
+  public loginVideo(data: any): Promise<Api_Auth_Login> {
+    return this.post<any, Api_Auth_Login>(`/login/video`, data, {
+      transformRequest: d => d,
+    })
+  }
+
+  public logout(): Promise<Api_Auth_Login> {
+    return this.logoutUser()
+  }
+
+  public userInfo() {
+    return this.get<any>(`/users/auth`)
+  }
+
+  public configs(): Promise<ConfigResponse> {
+    return this.get<ConfigResponse>(`/v2/configs`)
+  }
+
+  public changePassword(id: string, password: string, password_confirmation: string) {
+    return this.put<ChangePasswordPayload, ChangePasswordResponse>(`/v2/auth/users/${id}/password`, {
+      password,
+      password_confirmation,
+    })
+  }
+  public changePasswordAndActivate(
+    email: string,
+    currentPassword: string,
+    password: string,
+    passwordConfirmation: string,
+  ) {
+    return this.post<ChangePasswordAndActivatePayload, ChangePasswordResponse>(`/v2/auth/users/activate`, {
+      email,
+      currentPassword,
+      password,
+      passwordConfirmation,
+    })
+  }
+}
+
+let api: AuthService
+
+export default function useAuthService() {
+  if (!api) api = new AuthService()
+  return api
+}

package/src/api/services/ControlsService.ts

@@ -1,96 +1,96 @@
-import ApiService from '../settings/ApiService'
-
-import {
-  Api_ControlLogs_Dto,
-  Api_ControlZones_Dto,
-  Api_Instrument_Category,
-  Api_instrument_Type,
-  Api_instrument_Type_Create,
-  Api_Instrument_Type_Search,
-} from '../types/Api_Controls'
-import { ResponseApi } from '../types/Api_Service'
-
-class ControlsService extends ApiService {
-  public fetchControlZones(params: Record<string, any>): Promise<ResponseApi<Api_ControlZones_Dto[]>> {
-    return this.get('/frame/list', { params })
-  }
-
-  public async fetchControlZone(id: string): Promise<ResponseApi<Api_ControlZones_Dto>> {
-    return this.get(`/frame/${id}`)
-  }
-
-  public createControlZone(params: any): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>('/frame', params)
-  }
-
-  public editControlZone(id: string, params: any): Promise<ResponseApi<any>> {
-    return this.put<any, ResponseApi<any>>(`/frame/${id}`, params)
-  }
-
-  public deleteControlZone(id: string): Promise<any> {
-    return this.delete<ResponseApi<any>>(`/frame/${id}`)
-  }
-
-  public fetchControlLogs(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {
-    return this.get('/exposed_equipment_zones/list_for_controller', { params })
-  }
-
-  public fetchControllers(params?: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {
-    return this.get('/frame/controllers/list', { params })
-  }
-
-  public fetchUsersWithPasses(): Promise<any> {
-    return this.get('inspector/users-with-passes')
-  }
-
-  public fetchWarehousesList(): Promise<any> {
-    return this.get('tasks/warehouse/list?only_outside_exposed_equipment_zone=1')
-  }
-
-  public manualEntry(params: any): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>('exposed_equipment_zones/hand/enter', params)
-  }
-
-  public manualExit(params: any): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>('exposed_equipment_zones/hand/exit', params)
-  }
-
-  public deleteControlLogs(params: any): Promise<any> {
-    return this.delete<ResponseApi<any>>(`exposed_equipment_zones`, params)
-  }
-
-  public fetchInstrumentTypeList(params: any): Promise<ResponseApi<Api_Instrument_Type_Search[]>> {
-    return this.get<ResponseApi<Api_Instrument_Type_Search[]>>('search/instrument_types', { params })
-  }
-
-  public fetchInstrumentCategoryList(params: { search?: string } = {}): Promise<Api_Instrument_Category[]> {
-    return this.get<Api_Instrument_Category[]>('instrument_category/list', { params })
-  }
-
-  public createInstrumentType(body: Api_instrument_Type_Create): Promise<Api_instrument_Type> {
-    return this.post<Api_instrument_Type_Create, Api_instrument_Type>('admin/instruments', body)
-  }
-
-  public editInstrumentType(id: string, body: Partial<Api_instrument_Type_Create>): Promise<Api_instrument_Type> {
-    return this.put<Partial<Api_instrument_Type_Create>, Api_instrument_Type>(`admin/instruments/${id}`, body)
-  }
-
-  public deleteInstrumentType(id: string): Promise<any> {
-    return this.delete<ResponseApi<any>>(`admin/instruments/${id}`)
-  }
-
-  public fetchRpdzLogList(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {
-    return this.get('exposed_equipment_zones_history/list', { params })
-  }
-
-  public exportRpdzLogList(params: Record<string, any>): Promise<Blob> {
-    return this.get('exposed_equipment_zones_history/list/export', { params, responseType: 'blob' })
-  }
-}
-
-let api: ControlsService
-
-export default function useControlsService() {
-  if (!api) api = new ControlsService()
-  return api
-}
+import ApiService from '../settings/ApiService'
+
+import {
+  Api_ControlLogs_Dto,
+  Api_ControlZones_Dto,
+  Api_Instrument_Category,
+  Api_instrument_Type,
+  Api_instrument_Type_Create,
+  Api_Instrument_Type_Search,
+} from '../types/Api_Controls'
+import { ResponseApi } from '../types/Api_Service'
+
+class ControlsService extends ApiService {
+  public fetchControlZones(params: Record<string, any>): Promise<ResponseApi<Api_ControlZones_Dto[]>> {
+    return this.get('/frame/list', { params })
+  }
+
+  public async fetchControlZone(id: string): Promise<ResponseApi<Api_ControlZones_Dto>> {
+    return this.get(`/frame/${id}`)
+  }
+
+  public createControlZone(params: any): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>('/frame', params)
+  }
+
+  public editControlZone(id: string, params: any): Promise<ResponseApi<any>> {
+    return this.put<any, ResponseApi<any>>(`/frame/${id}`, params)
+  }
+
+  public deleteControlZone(id: string): Promise<any> {
+    return this.delete<ResponseApi<any>>(`/frame/${id}`)
+  }
+
+  public fetchControlLogs(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {
+    return this.get('/exposed_equipment_zones/list_for_controller', { params })
+  }
+
+  public fetchControllers(params?: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {
+    return this.get('/frame/controllers/list', { params })
+  }
+
+  public fetchUsersWithPasses(): Promise<any> {
+    return this.get('inspector/users-with-passes')
+  }
+
+  public fetchWarehousesList(): Promise<any> {
+    return this.get('tasks/warehouse/list?only_outside_exposed_equipment_zone=1')
+  }
+
+  public manualEntry(params: any): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>('exposed_equipment_zones/hand/enter', params)
+  }
+
+  public manualExit(params: any): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>('exposed_equipment_zones/hand/exit', params)
+  }
+
+  public deleteControlLogs(params: any): Promise<any> {
+    return this.delete<ResponseApi<any>>(`exposed_equipment_zones`, params)
+  }
+
+  public fetchInstrumentTypeList(params: any): Promise<ResponseApi<Api_Instrument_Type_Search[]>> {
+    return this.get<ResponseApi<Api_Instrument_Type_Search[]>>('search/instrument_types', { params })
+  }
+
+  public fetchInstrumentCategoryList(params: { search?: string } = {}): Promise<Api_Instrument_Category[]> {
+    return this.get<Api_Instrument_Category[]>('instrument_category/list', { params })
+  }
+
+  public createInstrumentType(body: Api_instrument_Type_Create): Promise<Api_instrument_Type> {
+    return this.post<Api_instrument_Type_Create, Api_instrument_Type>('admin/instruments', body)
+  }
+
+  public editInstrumentType(id: string, body: Partial<Api_instrument_Type_Create>): Promise<Api_instrument_Type> {
+    return this.put<Partial<Api_instrument_Type_Create>, Api_instrument_Type>(`admin/instruments/${id}`, body)
+  }
+
+  public deleteInstrumentType(id: string): Promise<any> {
+    return this.delete<ResponseApi<any>>(`admin/instruments/${id}`)
+  }
+
+  public fetchRpdzLogList(params: Record<string, any>): Promise<ResponseApi<Api_ControlLogs_Dto[]>> {
+    return this.get('exposed_equipment_zones_history/list', { params })
+  }
+
+  public exportRpdzLogList(params: Record<string, any>): Promise<Blob> {
+    return this.get('exposed_equipment_zones_history/list/export', { params, responseType: 'blob' })
+  }
+}
+
+let api: ControlsService
+
+export default function useControlsService() {
+  if (!api) api = new ControlsService()
+  return api
+}

package/src/api/services/EquipmentService.ts

@@ -1,29 +1,29 @@
-import ApiService from '../settings/ApiService'
-import { ResponseApi } from '../types/Api_Service'
-import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs'
-import { Api_Equipment_Create } from '@/api/types/Api_Equipment'
-
-class EquipmentService extends ApiService {
-  public fetchEquipment(params?: any): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
-    return this.get<ResponseApi<Api_Equipment_Full_Dto[]>>('repairs/equipment/list', { params })
-  }
-
-  public createEquipment(body: Api_Equipment_Create): Promise<Api_Equipment_Full_Dto> {
-    return this.post<Api_Equipment_Create, Api_Equipment_Full_Dto>('repairs/equipment', body)
-  }
-
-  public editEquipment(id: string, body: Partial<Api_Equipment_Create>): Promise<Api_Equipment_Full_Dto> {
-    return this.put<Partial<Api_Equipment_Create>, Api_Equipment_Full_Dto>(`repairs/equipment/${id}`, body)
-  }
-
-  public deleteEquipment(id: string): Promise<{ data: boolean; status: number }> {
-    return this.delete(`repairs/equipment/${id}`)
-  }
-}
-
-let api: EquipmentService
-
-export default function useEquipmentService() {
-  if (!api) api = new EquipmentService()
-  return api
-}
+import ApiService from '../settings/ApiService'
+import { ResponseApi } from '../types/Api_Service'
+import { Api_Equipment_Full_Dto } from '@/api/types/Api_Repairs'
+import { Api_Equipment_Create } from '@/api/types/Api_Equipment'
+
+class EquipmentService extends ApiService {
+  public fetchEquipment(params?: any): Promise<ResponseApi<Api_Equipment_Full_Dto[]>> {
+    return this.get<ResponseApi<Api_Equipment_Full_Dto[]>>('repairs/equipment/list', { params })
+  }
+
+  public createEquipment(body: Api_Equipment_Create): Promise<Api_Equipment_Full_Dto> {
+    return this.post<Api_Equipment_Create, Api_Equipment_Full_Dto>('repairs/equipment', body)
+  }
+
+  public editEquipment(id: string, body: Partial<Api_Equipment_Create>): Promise<Api_Equipment_Full_Dto> {
+    return this.put<Partial<Api_Equipment_Create>, Api_Equipment_Full_Dto>(`repairs/equipment/${id}`, body)
+  }
+
+  public deleteEquipment(id: string): Promise<{ data: boolean; status: number }> {
+    return this.delete(`repairs/equipment/${id}`)
+  }
+}
+
+let api: EquipmentService
+
+export default function useEquipmentService() {
+  if (!api) api = new EquipmentService()
+  return api
+}

package/src/api/services/GanttService.ts

@@ -1,23 +1,23 @@
-import ApiService from '../settings/ApiService'
-
-class GanttService extends ApiService {
-  public async fetchCriticalPathTasks(params: string): Promise<any> {
-    return await this.get(`gantt/get_list_task_on_critical_path?${params}`)
-  }
-  public async fetchGanttList(params: string): Promise<any> {
-    return await this.get(`/list/tasks/search?${params}&gantt=1`)
-  }
-  public async setFixPlan(project_id: string): Promise<any> {
-    const params = new URLSearchParams()
-    params.append(`projects[0]`, project_id)
-    params.append(`filter[state]`, '1')
-    return await this.post<null, any>(`/gantt/set-planned-date?${params.toString()}`, null)
-  }
-}
-
-let api: GanttService
-
-export default function useGanttService() {
-  if (!api) api = new GanttService()
-  return api
-}
+import ApiService from '../settings/ApiService'
+
+class GanttService extends ApiService {
+  public async fetchCriticalPathTasks(params: string): Promise<any> {
+    return await this.get(`gantt/get_list_task_on_critical_path?${params}`)
+  }
+  public async fetchGanttList(params: string): Promise<any> {
+    return await this.get(`/list/tasks/search?${params}&gantt=1`)
+  }
+  public async setFixPlan(project_id: string): Promise<any> {
+    const params = new URLSearchParams()
+    params.append(`projects[0]`, project_id)
+    params.append(`filter[state]`, '1')
+    return await this.post<null, any>(`/gantt/set-planned-date?${params.toString()}`, null)
+  }
+}
+
+let api: GanttService
+
+export default function useGanttService() {
+  if (!api) api = new GanttService()
+  return api
+}