shared-ritm 1.2.55 → 1.2.56

package/src/api/settings/ApiService.ts

@@ -1,128 +1,128 @@
-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)
-      if (response?.data === false) return false as unknown as T
-      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)
-      if (response?.data === false) return false
-      return response?.data || (response as any)
-    } 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)
+      if (response?.data === false) return false as unknown as T
+      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)
+      if (response?.data === false) return false
+      return response?.data || (response as any)
+    } 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_Controls.ts

@@ -23,7 +23,7 @@ export interface ControlMeta {
   currentPage: number
 }
 
-export interface FiltersValue {
+export type FiltersValue = {
   users?: {
     users: Api_User_Dto[]
   }
@@ -37,12 +37,12 @@ export interface FiltersValue {
     status: boolean
   }
 }
-export interface Api_Instrument_Dto {
+export type Api_Instrument_Dto = {
   id: string
   name: string
   storage_id?: string
 }
-export interface Api_Warehouse_Dto {
+export type Api_Warehouse_Dto = {
   id: string
   invoice_ref_key: string
   inventory_number: string

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

@@ -1,173 +1,173 @@
-<template>
-  <q-btn
-    v-bind="$props"
-    :class="[$style.wrapper]"
-    :disable="isDisabled"
-    :no-caps="!uppercase"
-    :no-wrap="!wrap"
-    class="hover-bg-secondary hover-text-black"
-    @click="onClick"
-  >
-    <slot></slot>
-    <q-badge
-      v-if="badge"
-      style="padding: 6px; top: -10px; right: -10px; font-size: 12px"
-      :color="badgeColor"
-      :floating="!badgeInline"
-      :rounded="true"
-      >{{ badgeText }}</q-badge
-    >
-    <q-tooltip v-if="tooltip" class="text-body2" :delay="400">{{ tooltip }}</q-tooltip>
-  </q-btn>
-</template>
-
-<script lang="ts" setup>
-import { computed, defineProps, defineEmits } from 'vue'
-
-interface QBtnProps {
-  size?: string | undefined
-  type?: string | undefined
-  to?: string | any | undefined
-  replace?: boolean | undefined
-  href?: string | undefined
-  target?: string | undefined
-  label?: string | number | undefined
-  icon?: string | undefined
-  iconRight?: string | undefined
-  outline?: boolean | undefined
-  flat?: boolean | undefined
-  unelevated?: boolean | undefined
-  rounded?: boolean | undefined
-  push?: boolean | undefined
-  square?: boolean | undefined
-  glossy?: boolean | undefined
-  fab?: boolean | undefined
-  fabMini?: boolean | undefined
-  padding?: string | undefined
-  color?: string | undefined
-  textColor?: string | undefined
-  noCaps?: boolean | undefined
-  noWrap?: boolean | undefined
-  dense?: boolean | undefined
-  ripple?: boolean | any | undefined
-  tabindex?: number | string | undefined
-  align?: 'left' | 'right' | 'center' | 'around' | 'between' | 'evenly' | undefined
-  stack?: boolean | undefined
-  stretch?: boolean | undefined
-  loading?: boolean | undefined
-  round?: boolean | undefined
-  percentage?: number | undefined
-  darkPercentage?: boolean | undefined
-}
-
-interface Props extends QBtnProps {
-  disable?: boolean | ((...args: any[]) => boolean)
-  tooltip?: string
-  uppercase?: boolean
-  xSmall?: boolean
-  small?: boolean
-  large?: boolean
-  fullWidth?: boolean
-  wrap?: boolean
-  largeIcon?: boolean
-  modelValue?: boolean
-  badge?: string | boolean | number
-  badgeColor?: string
-  badgeInline?: boolean
-  link?: boolean
-  borderColor?: string
-  borderRadius?: string
-  borderWidth?: string
-  width?: string
-  height?: string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  borderRadius: '16px',
-  borderWidth: '1px',
-  width: 'auto',
-  height: 'auto',
-  disable: false,
-})
-
-const emit = defineEmits(['update:modelValue', 'click'])
-
-function onClick(event: any) {
-  emit('click', event)
-  emit('update:modelValue', !props.modelValue)
-}
-
-const badgeText = computed(() => {
-  if (props.badge === undefined || props.badge === false) return ''
-  if (props.badge === true || props.badge === '') return ''
-  return props.badge
-})
-
-// const btnClasses = computed(() => {
-//   return {
-//     '--icon': props.icon && !props.label,
-//     '--width-left-icon': props.icon && props.label,
-//     '--width-right-icon': props.iconRight && props.label,
-//     '--default': !props.small && !props.large && !props.xSmall,
-//     '--x-small': props.xSmall,
-//     '--small': props.small,
-//     '--large': props.large,
-//     '--full-width': props.fullWidth,
-//     '--large-icon': props.largeIcon,
-//     '--is-active': props.modelValue,
-//     '--link': props.link,
-//     '--loading': props.loading,
-//   }
-// })
-
-const isDisabled = computed(() => {
-  return typeof props.disable === 'function' ? props.disable() : props.disable
-})
-</script>
-
-<style lang="scss" module>
-.wrapper {
-  flex: 0 0 auto;
-  width: v-bind(width);
-  height: v-bind(height);
-  &:global(.q-btn--rounded) {
-    border-radius: v-bind(borderRadius);
-  }
-  &:global(.q-btn--outline:before) {
-    border-width: v-bind(borderWidth);
-  }
-  &:global(.q-btn) {
-    color: #0a1629;
-    font-size: 16px;
-    font-style: normal;
-    font-weight: 700;
-    font-family: NunitoSansFont, sans-serif;
-  }
-
-  &:global(.--loading) {
-    span:has(> svg) {
-      overflow: hidden;
-    }
-  }
-
-  :global(.q-icon) {
-    font-size: 1.2em;
-  }
-
-  &:global(.--large-icon .q-icon) {
-    font-size: 1.715em;
-  }
-
-  &:global(.--full-width) {
-    width: 100%;
-  }
-
-  &:global(.--link) {
-    padding: 0 8px;
-    display: inline;
-    min-height: unset;
-    font-size: inherit;
-    text-decoration: underline;
-  }
-}
-</style>
+<template>
+  <q-btn
+    v-bind="$props"
+    :class="[$style.wrapper]"
+    :disable="isDisabled"
+    :no-caps="!uppercase"
+    :no-wrap="!wrap"
+    class="hover-bg-secondary hover-text-black"
+    @click="onClick"
+  >
+    <slot></slot>
+    <q-badge
+      v-if="badge"
+      style="padding: 6px; top: -10px; right: -10px; font-size: 12px"
+      :color="badgeColor"
+      :floating="!badgeInline"
+      :rounded="true"
+      >{{ badgeText }}</q-badge
+    >
+    <q-tooltip v-if="tooltip" class="text-body2" :delay="400">{{ tooltip }}</q-tooltip>
+  </q-btn>
+</template>
+
+<script lang="ts" setup>
+import { computed, defineProps, defineEmits } from 'vue'
+
+interface QBtnProps {
+  size?: string | undefined
+  type?: string | undefined
+  to?: string | any | undefined
+  replace?: boolean | undefined
+  href?: string | undefined
+  target?: string | undefined
+  label?: string | number | undefined
+  icon?: string | undefined
+  iconRight?: string | undefined
+  outline?: boolean | undefined
+  flat?: boolean | undefined
+  unelevated?: boolean | undefined
+  rounded?: boolean | undefined
+  push?: boolean | undefined
+  square?: boolean | undefined
+  glossy?: boolean | undefined
+  fab?: boolean | undefined
+  fabMini?: boolean | undefined
+  padding?: string | undefined
+  color?: string | undefined
+  textColor?: string | undefined
+  noCaps?: boolean | undefined
+  noWrap?: boolean | undefined
+  dense?: boolean | undefined
+  ripple?: boolean | any | undefined
+  tabindex?: number | string | undefined
+  align?: 'left' | 'right' | 'center' | 'around' | 'between' | 'evenly' | undefined
+  stack?: boolean | undefined
+  stretch?: boolean | undefined
+  loading?: boolean | undefined
+  round?: boolean | undefined
+  percentage?: number | undefined
+  darkPercentage?: boolean | undefined
+}
+
+interface Props extends QBtnProps {
+  disable?: boolean | ((...args: any[]) => boolean)
+  tooltip?: string
+  uppercase?: boolean
+  xSmall?: boolean
+  small?: boolean
+  large?: boolean
+  fullWidth?: boolean
+  wrap?: boolean
+  largeIcon?: boolean
+  modelValue?: boolean
+  badge?: string | boolean | number
+  badgeColor?: string
+  badgeInline?: boolean
+  link?: boolean
+  borderColor?: string
+  borderRadius?: string
+  borderWidth?: string
+  width?: string
+  height?: string
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  borderRadius: '16px',
+  borderWidth: '1px',
+  width: 'auto',
+  height: 'auto',
+  disable: false,
+})
+
+const emit = defineEmits(['update:modelValue', 'click'])
+
+function onClick(event: any) {
+  emit('click', event)
+  emit('update:modelValue', !props.modelValue)
+}
+
+const badgeText = computed(() => {
+  if (props.badge === undefined || props.badge === false) return ''
+  if (props.badge === true || props.badge === '') return ''
+  return props.badge
+})
+
+// const btnClasses = computed(() => {
+//   return {
+//     '--icon': props.icon && !props.label,
+//     '--width-left-icon': props.icon && props.label,
+//     '--width-right-icon': props.iconRight && props.label,
+//     '--default': !props.small && !props.large && !props.xSmall,
+//     '--x-small': props.xSmall,
+//     '--small': props.small,
+//     '--large': props.large,
+//     '--full-width': props.fullWidth,
+//     '--large-icon': props.largeIcon,
+//     '--is-active': props.modelValue,
+//     '--link': props.link,
+//     '--loading': props.loading,
+//   }
+// })
+
+const isDisabled = computed(() => {
+  return typeof props.disable === 'function' ? props.disable() : props.disable
+})
+</script>
+
+<style lang="scss" module>
+.wrapper {
+  flex: 0 0 auto;
+  width: v-bind(width);
+  height: v-bind(height);
+  &:global(.q-btn--rounded) {
+    border-radius: v-bind(borderRadius);
+  }
+  &:global(.q-btn--outline:before) {
+    border-width: v-bind(borderWidth);
+  }
+  &:global(.q-btn) {
+    color: #0a1629;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 700;
+    font-family: NunitoSansFont, sans-serif;
+  }
+
+  &:global(.--loading) {
+    span:has(> svg) {
+      overflow: hidden;
+    }
+  }
+
+  :global(.q-icon) {
+    font-size: 1.2em;
+  }
+
+  &:global(.--large-icon .q-icon) {
+    font-size: 1.715em;
+  }
+
+  &:global(.--full-width) {
+    width: 100%;
+  }
+
+  &:global(.--link) {
+    padding: 0 8px;
+    display: inline;
+    min-height: unset;
+    font-size: inherit;
+    text-decoration: underline;
+  }
+}
+</style>