shared-ritm 1.2.17 → 1.2.19

package/package.json

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

package/src/App.vue

@@ -1,7 +1,13 @@
 <template>
   <app-layout :logged="false">
-    <template #header>
-      <app-layout-header page-title="Проекты и рабочие задания" :user-data="userData" full-width auto-margin />
+    <template #header="{ style }">
+      <app-layout-header
+        :style="style"
+        page-title="Проекты и рабочие задания"
+        :user-data="userData"
+        full-width
+        auto-margin
+      />
     </template>
     <template #drawer>
       <app-sidebar :is-drawer="true" :menu-items="menuItems" :is-route-active="isRouteActive" />

package/src/api/services/ProjectsService.ts

@@ -1,67 +1,67 @@
-import ApiService, { ResponseApi } from '@/api/settings/ApiService'
-
-import { Api_Project_Dto } from '@/api/types/Api_Projects'
-
-class ProjectsService extends ApiService {
-  public async fetchProjectById(id: string): Promise<ResponseApi<Api_Project_Dto>> {
-    return this.get(`/projects/${id}`)
-  }
-
-  public createProject(params: any): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>('/projects', params)
-  }
-
-  public editProject(id: string, params: any): Promise<ResponseApi<any>> {
-    return this.put<any, ResponseApi<any>>(`/projects/${id}`, params)
-  }
-
-  public fetchProjects(params: any): Promise<ResponseApi<Api_Project_Dto[]>> {
-    return this.get(`/get_list_project`, { params })
-  }
-
-  public cloneProject(project: any): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>(`projects/${project.id}/clone`, project)
-  }
-
-  public archiveProject(id: string, data: any): Promise<ResponseApi<any>> {
-    return this.put<any, ResponseApi<any>>(`/projects/${id}`, data)
-  }
-
-  public unArchiveProject(id: string, data: any): Promise<ResponseApi<any>> {
-    return this.put<any, ResponseApi<any>>(`/projects/${id}`, data)
-  }
-
-  public moveAprProject(id: string): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>('repairs/move_plan_to_real', {
-      repairs: [id],
-    })
-  }
-  public restoreProject(id: string): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>('/restore_project', { projects_ids: [id] })
-  }
-
-  public importTasks(payload: any): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>('tasks/import', payload)
-  }
-
-  public importKtd(payload: any): Promise<ResponseApi<any>> {
-    return this.post<any, ResponseApi<any>>('/parse_ktd', payload, {
-      headers: { 'Content-Type': 'multipart/form-data' },
-    })
-  }
-
-  public fetchProjectTeamList(id: string): Promise<ResponseApi<any>> {
-    return this.put<any, ResponseApi<any>>(`/projects/${id}`, null)
-  }
-
-  public deleteProject(id: string): Promise<any> {
-    return this.delete<ResponseApi<any>>(`/projects/${id}`)
-  }
-}
-
-let api: ProjectsService
-
-export default function useProjectsService() {
-  if (!api) api = new ProjectsService()
-  return api
-}
+import ApiService, { ResponseApi } from '@/api/settings/ApiService'
+
+import { Api_Project_Dto } from '@/api/types/Api_Projects'
+
+class ProjectsService extends ApiService {
+  public async fetchProjectById(id: string): Promise<ResponseApi<Api_Project_Dto>> {
+    return this.get(`/projects/${id}`)
+  }
+
+  public createProject(params: any): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>('/projects', params)
+  }
+
+  public editProject(id: string, params: any): Promise<ResponseApi<any>> {
+    return this.put<any, ResponseApi<any>>(`/projects/${id}`, params)
+  }
+
+  public fetchProjects(params: any): Promise<ResponseApi<Api_Project_Dto[]>> {
+    return this.get(`/search/projects`, { params })
+  }
+
+  public cloneProject(project: any): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>(`projects/${project.id}/clone`, project)
+  }
+
+  public archiveProject(id: string, data: any): Promise<ResponseApi<any>> {
+    return this.put<any, ResponseApi<any>>(`/projects/${id}`, data)
+  }
+
+  public unArchiveProject(id: string, data: any): Promise<ResponseApi<any>> {
+    return this.put<any, ResponseApi<any>>(`/projects/${id}`, data)
+  }
+
+  public moveAprProject(id: string): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>('repairs/move_plan_to_real', {
+      repairs: [id],
+    })
+  }
+  public restoreProject(id: string): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>('/restore_project', { projects_ids: [id] })
+  }
+
+  public importTasks(payload: any): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>('tasks/import', payload)
+  }
+
+  public importKtd(payload: any): Promise<ResponseApi<any>> {
+    return this.post<any, ResponseApi<any>>('/parse_ktd', payload, {
+      headers: { 'Content-Type': 'multipart/form-data' },
+    })
+  }
+
+  public fetchProjectTeamList(id: string): Promise<ResponseApi<any>> {
+    return this.put<any, ResponseApi<any>>(`/projects/${id}`, null)
+  }
+
+  public deleteProject(id: string): Promise<any> {
+    return this.delete<ResponseApi<any>>(`/projects/${id}`)
+  }
+}
+
+let api: ProjectsService
+
+export default function useProjectsService() {
+  if (!api) api = new ProjectsService()
+  return api
+}

package/src/common/app-layout/AppLayout.vue

@@ -4,18 +4,22 @@
       <app-loader :loading="logged" size="md" :thickness="3" :backdrop="true" />
     </div>
 
-    <slot name="drawer"></slot>
-    <slot name="header"></slot>
+    <slot name="drawer" />
+
+    <slot name="header" :style="marginLeft" />
+
     <q-page-container :class="{ container: container }" @wheel="mouseMove">
-      <slot name="content"></slot>
+      <div :style="marginLeft">
+        <slot name="content" />
+      </div>
     </q-page-container>
 
-    <slot name="footer"></slot>
+    <slot name="footer" />
   </q-layout>
 </template>
 
 <script lang="ts" setup>
-import { defineProps } from 'vue'
+import { computed, defineProps, onBeforeUnmount, onMounted, ref } from 'vue'
 import AppLoader from '@/common/app-loader/index.vue'
 interface LayoutProps {
   logged: boolean
@@ -26,6 +30,8 @@ interface LayoutProps {
 
 const props = defineProps<LayoutProps>()
 
+const hasPaddingLeft = ref(false)
+
 function mouseMove(e: any) {
   const content = document.getElementById('content')
   const scrollable = e.target
@@ -33,6 +39,27 @@ function mouseMove(e: any) {
     content.scrollBy({ top: e.deltaY })
   }
 }
+
+const marginLeft = computed(() => {
+  return hasPaddingLeft.value ? { 'margin-left': '0px' } : { 'margin-left': '72px' }
+})
+
+function checkPaddingLeft() {
+  const el = document.querySelector('.q-page-container') as HTMLElement | null
+
+  if (el) {
+    const observer = new ResizeObserver(() => {
+      console.log(window.getComputedStyle(el).paddingLeft)
+      hasPaddingLeft.value = window.getComputedStyle(el).paddingLeft !== '0px'
+    })
+    observer.observe(el)
+    onBeforeUnmount(() => observer.disconnect())
+  }
+}
+
+onMounted(() => {
+  checkPaddingLeft()
+})
 </script>
 
 <style lang="scss" module>

package/src/common/app-layout/components/AppLayoutHeader.vue

@@ -1,135 +1,108 @@
-<template>
-  <q-header ref="myDiv" :style="marginLeft" :class="[$style.header, { [$style[`header-full`]]: fullWidth }]">
-    <q-toolbar :class="$style.toolbar">
-      <h1>{{ pageTitle }}</h1>
-      <div :class="$style['action-buttons']">
-        <app-button icon="person" text-color="black" :label="shortName" rounded :class="$style['button-person']" />
-      </div>
-    </q-toolbar>
-  </q-header>
-</template>
-
-<script lang="ts" setup>
-import { computed, defineProps, withDefaults, onBeforeUnmount, onMounted, ref } from 'vue'
-import AppButton from '@/common/app-button/AppButton.vue'
-interface Props {
-  userData: any
-  fullWidth?: boolean
-  autoMargin?: boolean
-  pageTitle?: string
-  leftMini?: string
-  leftMax?: string
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  pageTitle: '',
-  leftMini: '100px',
-  leftMax: '30px',
-})
-
-const hasPaddingLeft = ref(false)
-// const counter = ref(1)
-const shortName = computed(
-  () =>
-    `${props.userData?.last_name} ${props.userData?.first_name?.[0]}. ${props.userData?.patronymic?.[0] || ''} ${
-      props.userData?.patronymic?.[0] ? '.' : ''
-    }`,
-)
-
-const marginLeft = computed(() => {
-  if (!props.autoMargin) return {}
-  return hasPaddingLeft.value ? { 'margin-left': props.leftMax } : { 'margin-left': props.leftMini }
-})
-
-function checkPaddingLeft() {
-  const el = document.querySelector('.q-header') as HTMLElement | null
-  if (el) {
-    const observer = new ResizeObserver(() => {
-      console.log(window.getComputedStyle(el).left)
-      hasPaddingLeft.value = window.getComputedStyle(el).left !== '0px'
-    })
-    observer.observe(el)
-    onBeforeUnmount(() => observer.disconnect())
-  }
-}
-
-onMounted(() => {
-  checkPaddingLeft()
-})
-</script>
-
-<style lang="scss" module>
-.header {
-  height: 100px;
-  background: transparent;
-  margin: 0 auto;
-  max-width: 1300px;
-}
-.header-full {
-  max-width: 100%;
-  padding-right: 20px;
-}
-.toolbar {
-  padding: 0;
-  min-height: 100%;
-  h1 {
-    font-weight: 600;
-    font-size: 28px;
-    line-height: 100%;
-    font-family: Montserrat, sans-serif;
-  }
-}
-
-.header-search {
-  width: 412px;
-  font-size: 16px;
-}
-
-.action-buttons {
-  flex: 1;
-  position: relative;
-  display: flex;
-  align-items: center;
-  column-gap: 16px;
-  justify-content: end;
-}
-
-.button {
-  padding: 12px;
-  background: white;
-  transition: all 0.3s ease, color 0.3s ease;
-}
-
-.button-person {
-  padding: 10px 14px;
-  background: white;
-}
-
-@media (max-width: 1440px) {
-  .header {
-    height: 100px;
-    background: transparent;
-    margin: 0 auto;
-    max-width: 874px;
-  }
-  .header-search {
-    width: 343px;
-    font-size: 16px;
-  }
-  .action-buttons {
-    position: relative;
-    display: flex;
-    align-items: center;
-    column-gap: 8px;
-  }
-  .button {
-    padding: 10px;
-    background: white;
-    transition: all 0.3s ease, color 0.3s ease;
-  }
-  .button-person {
-    padding: 8px 10px;
-    background: white;
-  }
-}
-</style>
+<template>
+  <q-header :class="[$style.header, { [$style[`header-full`]]: fullWidth }]">
+    <q-toolbar :class="$style.toolbar">
+      <h1>{{ pageTitle }}</h1>
+      <div :class="$style['action-buttons']">
+        <app-button icon="person" text-color="black" :label="shortName" rounded :class="$style['button-person']" />
+      </div>
+    </q-toolbar>
+  </q-header>
+</template>
+
+<script lang="ts" setup>
+import { computed, defineProps, withDefaults } from 'vue'
+import AppButton from '@/common/app-button/AppButton.vue'
+interface Props {
+  userData: any
+  fullWidth?: boolean
+  pageTitle?: string
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  pageTitle: '',
+})
+
+const shortName = computed(
+  () =>
+    `${props.userData?.last_name} ${props.userData?.first_name?.[0]}. ${props.userData?.patronymic?.[0] || ''} ${
+      props.userData?.patronymic?.[0] ? '.' : ''
+    }`,
+)
+</script>
+
+<style lang="scss" module>
+.header {
+  height: 100px;
+  background: transparent;
+  margin: 0 auto;
+  max-width: 1300px;
+}
+.header-full {
+  max-width: 100%;
+  padding-right: 20px;
+  padding-left: 20px;
+}
+.toolbar {
+  padding: 0;
+  min-height: 100%;
+  h1 {
+    font-weight: 600;
+    font-size: 28px;
+    line-height: 100%;
+    font-family: Montserrat, sans-serif;
+  }
+}
+
+.header-search {
+  width: 412px;
+  font-size: 16px;
+}
+
+.action-buttons {
+  flex: 1;
+  position: relative;
+  display: flex;
+  align-items: center;
+  column-gap: 16px;
+  justify-content: end;
+}
+
+.button {
+  padding: 12px;
+  background: white;
+  transition: all 0.3s ease, color 0.3s ease;
+}
+
+.button-person {
+  padding: 10px 14px;
+  background: white;
+}
+
+@media (max-width: 1440px) {
+  .header {
+    height: 100px;
+    background: transparent;
+    margin: 0 auto;
+    max-width: 874px;
+  }
+  .header-search {
+    width: 343px;
+    font-size: 16px;
+  }
+  .action-buttons {
+    position: relative;
+    display: flex;
+    align-items: center;
+    column-gap: 8px;
+  }
+  .button {
+    padding: 10px;
+    background: white;
+    transition: all 0.3s ease, color 0.3s ease;
+  }
+  .button-person {
+    padding: 8px 10px;
+    background: white;
+  }
+}
+</style>

package/src/common/app-layout/components/AppLayoutPage.vue

@@ -1,32 +1,15 @@
-<template>
-  <q-page class="page-container" :style="marginLeft">
-    <slot />
-  </q-page>
-</template>
-
-<script setup lang="ts">
-import { computed, onMounted, ref, onBeforeUnmount } from 'vue'
-
-const hasPaddingLeft = ref(false)
-
-const marginLeft = computed(() => {
-  return hasPaddingLeft.value ? { 'margin-left': '0px' } : { 'margin-left': '72px' }
-})
-
-function checkPaddingLeft() {
-  const el = document.querySelector('.q-page-container') as HTMLElement | null
-  if (el) {
-    const observer = new ResizeObserver(() => {
-      hasPaddingLeft.value = window.getComputedStyle(el).paddingLeft !== '0px'
-    })
-    observer.observe(el)
-    onBeforeUnmount(() => observer.disconnect())
-  }
-}
-
-onMounted(() => {
-  checkPaddingLeft()
-})
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <q-page class="page-container">
+    <slot />
+  </q-page>
+</template>
+
+<script setup lang="ts"></script>
+
+<style scoped lang="scss">
+.page-container {
+  display: flex;
+  flex-direction: column;
+  padding: 0px 20px;
+}
+</style>

package/src/index.ts

@@ -1,64 +1,64 @@
-import '@/shared/styles/general.css'
-import AppButton from '@/common/app-button/AppButton.vue'
-import AppCheckbox from '@/common/app-checkbox/AppCheckbox.vue'
-import AppDatePicker from '@/common/app-date-picker/AppDatePicker.vue'
-import AppInput from '@/common/app-input/AppInput.vue'
-import AppInputSearch from '@/common/app-input-search/AppInputSearch.vue'
-import AppLayout from '@/common/app-layout/AppLayout.vue'
-import AppLayoutHeader from '@/common/app-layout/components/AppLayoutHeader.vue'
-import AppLayoutPage from '@/common/app-layout/components/AppLayoutPage.vue'
-import AppLoader from '@/common/app-loader/index.vue'
-import AppSelect from '@/common/app-select/AppSelect.vue'
-import AppSheet from '@/common/app-sheet/AppSheet.vue'
-import AppSidebar from '@/common/app-sidebar/AppSidebar.vue'
-import AppToggle from '@/common/app-toggle/AppToggle.vue'
-import AppWrapper from '@/common/app-wrapper/AppWrapper.vue'
-import AppConfirmDialog from '@/common/app-dialogs/AppConfirmDialog.vue'
-import AppDropdown from '@/common/app-dropdown/AppDropdown.vue'
-
-import useGanttService from '@/api/services/GanttService'
-import useMetricsService from '@/api/services/MetricsService'
-import useProjectsService from '@/api/services/ProjectsService'
-import useRepairsService from '@/api/services/RepairsService'
-import useTasksService from '@/api/services/TasksService'
-import useAuthService from '@/api/services/AuthService'
-import useFileService from '@/api/services/FileService'
-import ApiService from '@/api/settings/ApiService'
-
-export {
-  AppButton,
-  AppCheckbox,
-  AppDatePicker,
-  AppInput,
-  AppInputSearch,
-  AppLayout,
-  AppLayoutHeader,
-  AppLayoutPage,
-  AppLoader,
-  AppSelect,
-  AppSheet,
-  AppSidebar,
-  AppToggle,
-  AppWrapper,
-  AppConfirmDialog,
-  AppDropdown,
-}
-
-export {
-  ApiService,
-  useAuthService,
-  useGanttService,
-  useMetricsService,
-  useProjectsService,
-  useRepairsService,
-  useTasksService,
-  useFileService,
-}
-
-export type { NotificationType } from './utils/notification'
-export { notificationSettings } from './utils/notification'
-
-export * from './api/types/Api_Tasks'
-export * from './api/types/Api_Repairs'
-export * from './api/types/Api_Projects'
-// export * from '@/api/types/Api_Metrics'
+import '@/shared/styles/general.css'
+import AppButton from '@/common/app-button/AppButton.vue'
+import AppCheckbox from '@/common/app-checkbox/AppCheckbox.vue'
+import AppDatePicker from '@/common/app-date-picker/AppDatePicker.vue'
+import AppInput from '@/common/app-input/AppInput.vue'
+import AppInputSearch from '@/common/app-input-search/AppInputSearch.vue'
+import AppLayout from '@/common/app-layout/AppLayout.vue'
+import AppLayoutHeader from '@/common/app-layout/components/AppLayoutHeader.vue'
+import AppLayoutPage from '@/common/app-layout/components/AppLayoutPage.vue'
+import AppLoader from '@/common/app-loader/index.vue'
+import AppSelect from '@/common/app-select/AppSelect.vue'
+import AppSheet from '@/common/app-sheet/AppSheet.vue'
+import AppSidebar from '@/common/app-sidebar/AppSidebar.vue'
+import AppToggle from '@/common/app-toggle/AppToggle.vue'
+import AppWrapper from '@/common/app-wrapper/AppWrapper.vue'
+import AppConfirmDialog from '@/common/app-dialogs/AppConfirmDialog.vue'
+import AppDropdown from '@/common/app-dropdown/AppDropdown.vue'
+
+import useGanttService from '@/api/services/GanttService'
+import useMetricsService from '@/api/services/MetricsService'
+import useProjectsService from '@/api/services/ProjectsService'
+import useRepairsService from '@/api/services/RepairsService'
+import useTasksService from '@/api/services/TasksService'
+import useAuthService from '@/api/services/AuthService'
+import useFileService from '@/api/services/FileService'
+import ApiService from '@/api/settings/ApiService'
+
+export {
+  AppButton,
+  AppCheckbox,
+  AppDatePicker,
+  AppInput,
+  AppInputSearch,
+  AppLayout,
+  AppLayoutHeader,
+  AppLayoutPage,
+  AppLoader,
+  AppSelect,
+  AppSheet,
+  AppSidebar,
+  AppToggle,
+  AppWrapper,
+  AppConfirmDialog,
+  AppDropdown,
+}
+
+export {
+  ApiService,
+  useAuthService,
+  useGanttService,
+  useMetricsService,
+  useProjectsService,
+  useRepairsService,
+  useTasksService,
+  useFileService,
+}
+
+export type { NotificationType } from './utils/notification'
+export { notificationSettings } from './utils/notification'
+
+export * from './api/types/Api_Tasks'
+export * from './api/types/Api_Repairs'
+export * from './api/types/Api_Projects'
+// export * from '@/api/types/Api_Metrics'