shared-ritm 1.2.87 → 1.2.89

package/dist/types/api/services/PhotoService.d.ts

@@ -1,53 +1,40 @@
-import * as faceapi from 'face-api.js'
+import * as faceapi from 'face-api.js';
 declare class PhotoService {
-  getVideoStreamConfig(
-    width: number,
-    height: number,
-  ): {
-    audio: boolean
-    video: {
-      width: {
-        min: number
-        ideal: number
-      }
-      height: {
-        min: number
-        ideal: number
-      }
-      facingMode: string
-    }
-  }
-  getContourCoordinate(
-    width: number,
-    height: number,
-  ): {
-    x: number
-    y: number
-    width: number
-    height: number
-  }
-  getBoxData(box: any): {
-    x: any
-    y: any
-    width: any
-    height: any
-  } | null
-  setStylesForCanvas(canvasContainer: any): void
-  checkFaceInclusion(frame: any, face: any): boolean
-  getFaceDetections(videoRef: any): Promise<
-    faceapi.WithFaceExpressions<
-      faceapi.WithFaceLandmarks<
-        {
-          detection: faceapi.FaceDetection
-        },
-        faceapi.FaceLandmarks68
-      >
-    >[]
-  >
-  getCanvas(videoRef: any): HTMLCanvasElement
-  getResizedAndDetection(canvas: any, detections: any, ctx: any, videoWidth: number, videoHeight: number): void
-  getFaceSnapshot(inputImage: any, box: any): Promise<string | null>
-  initModels(): Promise<void>
+    getVideoStreamConfig(width: number, height: number): {
+        audio: boolean;
+        video: {
+            width: {
+                min: number;
+                ideal: number;
+            };
+            height: {
+                min: number;
+                ideal: number;
+            };
+            facingMode: string;
+        };
+    };
+    getContourCoordinate(width: number, height: number): {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    };
+    getBoxData(box: any): {
+        x: any;
+        y: any;
+        width: any;
+        height: any;
+    } | null;
+    setStylesForCanvas(canvasContainer: any): void;
+    checkFaceInclusion(frame: any, face: any): boolean;
+    getFaceDetections(videoRef: any): Promise<faceapi.WithFaceExpressions<faceapi.WithFaceLandmarks<{
+        detection: faceapi.FaceDetection;
+    }, faceapi.FaceLandmarks68>>[]>;
+    getCanvas(videoRef: any): HTMLCanvasElement;
+    getResizedAndDetection(canvas: any, detections: any, ctx: any, videoWidth: number, videoHeight: number): void;
+    getFaceSnapshot(inputImage: any, box: any): Promise<string | null>;
+    initModels(): Promise<void>;
 }
-export default function usePhotoService(): PhotoService
-export {}
+export default function usePhotoService(): PhotoService;
+export {};

package/dist/types/api/services/UserService.d.ts

@@ -1,5 +1,5 @@
 import ApiService from '../settings/ApiService';
-import { Api_User, Api_User_Role } from '../types/Api_User';
+import { Api_User, Api_User_Create, Api_User_Position, Api_User_Role, Api_User_Team, Api_User_Team_Search } from '../types/Api_User';
 import { ResponseApi } from '../types/Api_Service';
 declare class UserService extends ApiService {
     editUser({ id, model }: {
@@ -7,7 +7,7 @@ declare class UserService extends ApiService {
         model: any;
     }): Promise<Api_User>;
     getUser(id: string): Promise<Api_User>;
-    createUser(model: Partial<Api_User>): Promise<Api_User>;
+    createUser(model: Api_User_Create): Promise<Api_User>;
     deleteUser(id: string): Promise<{
         data: boolean;
         status: number;
@@ -15,6 +15,27 @@ declare class UserService extends ApiService {
     getRoles(params?: {
         per_page?: number;
     }): Promise<ResponseApi<Api_User_Role[]>>;
+    getPositions(params?: {
+        per_page?: number;
+    }): Promise<ResponseApi<Api_User_Position[]>>;
+    createPosition(body: Partial<Api_User_Position>): Promise<ResponseApi<Api_User_Position>>;
+    editPosition(id: string, body: Partial<Api_User_Position>): Promise<ResponseApi<Api_User_Position>>;
+    deletePosition(id: string): Promise<{
+        data: boolean;
+        status: number;
+    }>;
+    getTeams(params?: {
+        per_page?: number;
+    }): Promise<ResponseApi<Api_User_Team_Search[]>>;
+    createTeam(body: Partial<Api_User_Team_Search>): Promise<ResponseApi<Api_User_Team>>;
+    editTeam(id: string, body: Partial<Api_User_Team_Search>): Promise<{
+        data: boolean;
+        status: number;
+    }>;
+    deleteTeam(id: string): Promise<{
+        data: boolean;
+        status: number;
+    }>;
 }
 export default function useUserService(): UserService;
 export {};

package/dist/types/api/settings/ApiService.d.ts

@@ -12,5 +12,6 @@ export default class ApiService {
     protected get<T>(url: string, options?: AxiosRequestConfig): Promise<T>;
     protected delete<T>(url: string, options?: AxiosRequestConfig): Promise<AxiosResponse<T, any>>;
     protected post<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<any>;
+    protected patch<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<T2>;
     protected put<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<T2>;
 }

package/dist/types/api/types/Api_User.d.ts

@@ -5,11 +5,16 @@ export type Api_User_Team = {
     description: string;
     created_at: string;
     updated_at: string;
-    pivot: {
+    pivot?: {
         team_id: string;
         user_id: string;
     };
 };
+export type Api_User_Team_Search = {
+    id: string;
+    name: string;
+    display_name: string;
+};
 export type Api_User_Photo = {
     id: string;
     name: string;
@@ -40,6 +45,22 @@ export type Api_User = {
     teams: Api_User_Team[];
     photos: Api_User_Photo[];
 };
+export type Api_User_Create = {
+    last_name?: string;
+    first_name?: string;
+    patronymic?: string;
+    email?: string;
+    phone?: string;
+    divisions?: string;
+    positions?: [string];
+    teams?: {
+        team_id: string;
+        roles: string[];
+    }[];
+    current_password?: string;
+    password?: string;
+    password_confirmation?: string;
+};
 export type Api_User_Permission = {
     id: string;
     name: string;
@@ -51,3 +72,9 @@ export type Api_User_Role = {
     display_name: string;
     permissions?: Api_User_Permission[];
 };
+export type Api_User_Position = {
+    id: string;
+    name: string;
+    display_name: string;
+    description?: string;
+};

package/package.json

@@ -1,64 +1,64 @@
-{
-  "name": "shared-ritm",
-  "version": "1.2.87",
-  "private": false,
-  "files": [
-    "dist",
-    "src"
-  ],
-  "main": "dist/shared-ritm.umd.js",
-  "type": "module",
-  "module": "./dist/shared-ritm.es.js",
-  "types": "./dist/types/index.d.ts",
-  "exports": {
-    ".": {
-      "import": "./dist/shared-ritm.es.js",
-      "require": "./dist/shared-ritm.umd.js",
-      "default": "./dist/shared-ritm.es.js",
-      "types": "./dist/types/index.d.ts"
-    },
-    "./style": "./dist/index.css"
-  },
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build && tsc --emitDeclarationOnly",
-    "typecheck": "vue-tsc --noEmit",
-    "lint": "eslint --fix",
-    "format": "prettier -w -u ."
-  },
-  "dependencies": {
-    "@quasar/extras": "^1.16.17",
-    "@vueuse/core": "^10.1.2",
-    "face-api.js": "^0.22.2",
-    "axios": "^1.7.7",
-    "vue": "^3.5.12",
-    "vue-router": "^4.0.3"
-  },
-  "peerDependencies": {
-    "quasar": "^2.18.1"
-  },
-  "devDependencies": {
-    "@quasar/vite-plugin": "^1.9.0",
-    "@rollup/pluginutils": "^5.1.3",
-    "@types/node": "^22.7.9",
-    "@typescript-eslint/eslint-plugin": "^4.25.0",
-    "@typescript-eslint/parser": "^4.25.0",
-    "@vitejs/plugin-vue": "^5.1.4",
-    "@vue/compiler-sfc": "^3.0.5",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/eslint-config-typescript": "^7.0.0",
-    "eslint": "^7.27.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-vue": "^7.10.0",
-    "install": "^0.13.0",
-    "npm": "^11.4.0",
-    "prettier": "^2.3.0",
-    "quasar": "^2.18.1",
-    "rollup-plugin-visualizer": "^5.14.0",
-    "sass": "^1.80.4",
-    "typescript": "^5.6.3",
-    "vite": "^5.4.9",
-    "vite-plugin-css-modules": "^0.0.1",
-    "vue-tsc": "^2.1.6"
-  }
-}
+{
+  "name": "shared-ritm",
+  "version": "1.2.89",
+  "private": false,
+  "files": [
+    "dist",
+    "src"
+  ],
+  "main": "dist/shared-ritm.umd.js",
+  "type": "module",
+  "module": "./dist/shared-ritm.es.js",
+  "types": "./dist/types/index.d.ts",
+  "exports": {
+    ".": {
+      "import": "./dist/shared-ritm.es.js",
+      "require": "./dist/shared-ritm.umd.js",
+      "default": "./dist/shared-ritm.es.js",
+      "types": "./dist/types/index.d.ts"
+    },
+    "./style": "./dist/index.css"
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build && tsc --emitDeclarationOnly",
+    "typecheck": "vue-tsc --noEmit",
+    "lint": "eslint --fix",
+    "format": "prettier -w -u ."
+  },
+  "dependencies": {
+    "@quasar/extras": "^1.16.17",
+    "@vueuse/core": "^10.1.2",
+    "face-api.js": "^0.22.2",
+    "axios": "^1.7.7",
+    "vue": "^3.5.12",
+    "vue-router": "^4.0.3"
+  },
+  "peerDependencies": {
+    "quasar": "^2.18.1"
+  },
+  "devDependencies": {
+    "@quasar/vite-plugin": "^1.9.0",
+    "@rollup/pluginutils": "^5.1.3",
+    "@types/node": "^22.7.9",
+    "@typescript-eslint/eslint-plugin": "^4.25.0",
+    "@typescript-eslint/parser": "^4.25.0",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "@vue/compiler-sfc": "^3.0.5",
+    "@vue/eslint-config-prettier": "^6.0.0",
+    "@vue/eslint-config-typescript": "^7.0.0",
+    "eslint": "^7.27.0",
+    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-vue": "^7.10.0",
+    "install": "^0.13.0",
+    "npm": "^11.4.0",
+    "prettier": "^2.3.0",
+    "quasar": "^2.18.1",
+    "rollup-plugin-visualizer": "^5.14.0",
+    "sass": "^1.80.4",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.9",
+    "vite-plugin-css-modules": "^0.0.1",
+    "vue-tsc": "^2.1.6"
+  }
+}

package/src/api/services/UserService.ts

@@ -1,5 +1,12 @@
 import ApiService from '../settings/ApiService'
-import { Api_User, Api_User_Role } from '../types/Api_User'
+import {
+  Api_User,
+  Api_User_Create,
+  Api_User_Position,
+  Api_User_Role,
+  Api_User_Team,
+  Api_User_Team_Search,
+} from '../types/Api_User'
 import { ResponseApi } from '../types/Api_Service'
 
 class UserService extends ApiService {
@@ -11,16 +18,48 @@ class UserService extends ApiService {
     return await this.get<Api_User>(`/admin/users/${id}`)
   }
 
-  public async createUser(model: Partial<Api_User>): Promise<Api_User> {
-    return await this.post<Partial<Api_User>, Api_User>('/admin/users', model)
+  public async createUser(model: Api_User_Create): Promise<Api_User> {
+    return await this.post<Api_User_Create, Api_User>('/admin/users', model)
   }
 
   public async deleteUser(id: string): Promise<{ data: boolean; status: number }> {
     return await this.delete(`/admin/users/${id}`)
   }
 
-  public getRoles(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Role[]>> {
-    return this.get('/search/roles', { params })
+  public async getRoles(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Role[]>> {
+    return await this.get<ResponseApi<Api_User_Role[]>>('/search/roles', { params })
+  }
+
+  public async getPositions(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Position[]>> {
+    return await this.get<ResponseApi<Api_User_Position[]>>('/search/positions', { params })
+  }
+
+  public async createPosition(body: Partial<Api_User_Position>): Promise<ResponseApi<Api_User_Position>> {
+    return await this.post<Partial<Api_User_Position>, ResponseApi<Api_User_Position>>('/admin/positions', body)
+  }
+
+  public async editPosition(id: string, body: Partial<Api_User_Position>): Promise<ResponseApi<Api_User_Position>> {
+    return await this.put<Partial<Api_User_Position>, ResponseApi<Api_User_Position>>(`/admin/positions/${id}`, body)
+  }
+
+  public async deletePosition(id: string): Promise<{ data: boolean; status: number }> {
+    return await this.delete(`/admin/positions/${id}`)
+  }
+
+  public async getTeams(params?: { per_page?: number }): Promise<ResponseApi<Api_User_Team_Search[]>> {
+    return await this.get<ResponseApi<Api_User_Team_Search[]>>('/search/teams', { params })
+  }
+
+  public async createTeam(body: Partial<Api_User_Team_Search>): Promise<ResponseApi<Api_User_Team>> {
+    return await this.post<Partial<Api_User_Team_Search>, ResponseApi<Api_User_Team>>('/teams', body)
+  }
+
+  public async editTeam(id: string, body: Partial<Api_User_Team_Search>): Promise<{ data: boolean; status: number }> {
+    return await this.patch<Partial<Api_User_Team_Search>, { data: boolean; status: number }>(`/teams/${id}`, body)
+  }
+
+  public async deleteTeam(id: string): Promise<{ data: boolean; status: number }> {
+    return await this.delete(`/teams/${id}`)
   }
 }
 

package/src/api/settings/ApiService.ts

@@ -99,13 +99,17 @@ export default class ApiService {
     }
   }
 
-  // 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 patch<T1, T2>(url: string, payload: T1, options?: AxiosRequestConfig): Promise<T2> {
+    try {
+      const response: AxiosResponse<T2> = await this.axiosInstance.patch<T1, AxiosResponse<T2>>(url, payload, options)
+      return response.data
+    } catch (error) {
+      const axiosError = error as AxiosError
+      this.handleError(axiosError)
+      throw error
+    }
+  }
+
   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)

package/src/api/types/Api_User.ts

@@ -5,12 +5,18 @@ export type Api_User_Team = {
   description: string
   created_at: string
   updated_at: string
-  pivot: {
+  pivot?: {
     team_id: string
     user_id: string
   }
 }
 
+export type Api_User_Team_Search = {
+  id: string
+  name: string
+  display_name: string
+}
+
 export type Api_User_Photo = {
   id: string
   name: string
@@ -43,6 +49,23 @@ export type Api_User = {
   photos: Api_User_Photo[]
 }
 
+export type Api_User_Create = {
+  last_name?: string
+  first_name?: string
+  patronymic?: string
+  email?: string
+  phone?: string
+  divisions?: string
+  positions?: [string]
+  teams?: {
+    team_id: string
+    roles: string[]
+  }[]
+  current_password?: string
+  password?: string
+  password_confirmation?: string
+}
+
 export type Api_User_Permission = {
   id: string
   name: string
@@ -55,3 +78,10 @@ export type Api_User_Role = {
   display_name: string
   permissions?: Api_User_Permission[]
 }
+
+export type Api_User_Position = {
+  id: string
+  name: string
+  display_name: string
+  description?: string
+}

package/src/common/app-sheet-new/AppSheetNew.vue

@@ -1,7 +1,6 @@
 <template>
   <q-dialog
-    ref="DialogRef"
-    :model-value="true"
+    :model-value="modelValue"
     :position="'right'"
     :class="$style['sheet-dialog']"
     :persistent="persistent"
@@ -9,7 +8,7 @@
     no-esc-dismiss
     full-height
     full-width
-    @before-hide="emit('before-hide')"
+    @update:model-value="emit('update:modelValue', $event)"
   >
     <div v-if="loading" class="custom-wrapper">
       <div class="loader">
@@ -57,11 +56,11 @@
 </template>
 
 <script setup lang="ts">
-import { computed, defineEmits, defineProps, Ref, useSlots, withDefaults } from 'vue'
+import { computed, defineEmits, defineProps, useSlots, withDefaults } from 'vue'
 import { QDialog } from 'quasar'
 
 interface DialogProps {
-  dialogRef: Ref<QDialog | undefined, QDialog | undefined>
+  modelValue: boolean
   loading?: boolean
   title?: string
   tabsTitle?: string
@@ -74,6 +73,7 @@ interface DialogProps {
 }
 
 const props = withDefaults(defineProps<DialogProps>(), {
+  modelValue: false,
   title: '',
   tabsTitle: '',
   width: '1200px',
@@ -85,19 +85,10 @@ const props = withDefaults(defineProps<DialogProps>(), {
   persistent: false,
 })
 
-const emit = defineEmits(['update:dialogRef', 'update:tabId', 'close', 'before-hide'])
+const emit = defineEmits(['update:modelValue', 'update:tabId', 'close', 'before-hide'])
 
 const slots = useSlots()
 
-const DialogRef = computed({
-  get() {
-    return props.dialogRef
-  },
-  set(value) {
-    emit('update:dialogRef', value)
-  },
-})
-
 const currTabId = computed({
   get() {
     return props.tabs?.find(t => t.id === props.tabId)?.title

package/src/common/app-table/AppTable.vue

@@ -29,7 +29,11 @@
       </template>
 
       <template v-for="col in resCols" :key="col.name" #[`header-cell-${col.name}`]="propsSlot">
-        <q-th :props="propsSlot" :class="{ 'cursor-pointer': col.filterType, actions: col.name === 'actions' }">
+        <q-th
+          :props="propsSlot"
+          :class="{ 'cursor-pointer': col.filterType, actions: col.name === 'actions' }"
+          :style="col.style"
+        >
           <div
             v-if="col.filterType"
             class="row items-center no-wrap"