shared-ritm 1.0.27 → 1.0.29

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

@@ -0,0 +1,12 @@
+import ApiService from '@/api/settings/ApiService';
+type LoginResponse = {
+    token: string;
+    user: any;
+};
+declare class AuthService extends ApiService {
+    login(email: string, password: string): Promise<LoginResponse>;
+    logout(): Promise<LoginResponse>;
+    configs(): Promise<any>;
+}
+export default function useAuthService(): AuthService;
+export {};

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

@@ -15,7 +15,7 @@ export default class ApiService {
     constructor();
     private getToken;
     private removeToken;
-    private logout;
+    logout(): void;
     private handleError;
     protected get<T>(url: string, options?: AxiosRequestConfig): Promise<T>;
     protected delete<T>(url: string, options?: AxiosRequestConfig): Promise<AxiosResponse<T, any>>;

package/dist/types/index.d.ts

@@ -7,12 +7,13 @@ import AppSelect from '@/common/app-select/AppSelect.vue';
 import AppWrapper from '@/common/app-wrapper/AppWrapper.vue';
 import AppSidebar from '@/common/app-sidebar/AppSidebar.vue';
 import AppLayoutHeader from '@/common/app-layout/components/AppLayoutHeader.vue';
+import AppLoader from '@/common/app-loader/index.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';
-export { AppButton, AppInput, AppToggle, AppInputSearch, AppLayout, AppSelect, AppWrapper, AppSidebar, AppLayoutHeader };
+export { AppButton, AppInput, AppToggle, AppInputSearch, AppLayout, AppSelect, AppWrapper, AppSidebar, AppLayoutHeader, AppLoader, };
 export { useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService };
 export * from '@/api/types/Api_Repairs';
 export * from '@/api/types/Api_Tasks';

package/package.json

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

package/src/api/services/AuthService.ts

@@ -0,0 +1,37 @@
+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 configs() {
+    return this.get<ConfigResponse>(`/configs`)
+  }
+}
+
+let api: AuthService
+
+export default function useAuthService() {
+  if (!api) api = new AuthService()
+  return api
+}

package/src/api/settings/ApiService.ts

@@ -57,7 +57,7 @@ export default class ApiService {
     localStorage.removeItem('token')
   }
 
-  private logout(): void {
+  public logout(): void {
     this.removeToken()
     window.location.href = '/sign-in'
   }

package/src/common/app-loader/index.vue

@@ -0,0 +1,41 @@
+<template>
+  <div :class="{ 'loader-backdrop': backdrop && loading }">
+    <q-spinner v-if="loading" :size="size" class="loader-spinner" :thickness="thickness" />
+  </div>
+</template>
+
+<script setup lang="ts">
+interface Props {
+  backdrop: boolean
+  loading: boolean
+  thickness: number
+  size: string
+}
+const props = withDefaults(defineProps<Props>(), {
+  backdrop: false,
+  loading: false,
+  thickness: 2,
+  size: 'md',
+})
+
+// <app-loader :loading="logged" :backdrop="true" />
+</script>
+
+<style scoped lang="scss">
+.loader {
+  &-backdrop {
+    width: 100%;
+    height: 100%;
+    background-color: rgba(255, 255, 255, 0.45);
+    position: absolute;
+    z-index: 9999;
+  }
+  &-spinner {
+    position: absolute;
+    color: #3f8cff;
+    top: 50%;
+    left: 48%;
+    z-index: 2;
+  }
+}
+</style>

package/src/common/app-page-layout/AppPageLayout.vue

@@ -1,122 +1,122 @@
-<template lang="pug">
-q-page#content(:class="$style['page-container']")
-  q-toolbar(:class="$style['toolbar']")
-    q-toolbar-title(:class="$style.title") {{ title }}
-    div(:class="$style['action-buttons']")
-      app-button(
-        rounded
-        :class="$style['button-new']"
-        :label="'Новый ремонт'"
-        @click="emits('create-repair')"
-        color="#fff"
-        icon="add"
-      )
-      app-button(rounded :class="$style['button-video-wall']" @click="emits('routing-to-video-wall')")
-        video-wall-icon
-        span Видеостена
-      app-button(rounded :class="$style.button" @click="openFullScreenWidgets")
-        q-tooltip на весь экран
-        q-icon(name="open_in_full")
-      //app-button(rounded :class="$style.button")
-      //  graph-icon
-      //app-button(rounded :class="$style.button")
-      //  time-line-icon
-  slot
-</template>
-
-<script setup lang="ts">
-import { defineProps, defineEmits, defineAsyncComponent } from 'vue'
-import AppButton from '@/common/app-button/AppButton.vue'
-import { useQuasar } from 'quasar'
-import VideoWallIcon from '@/icons/page-header/videoWallIcon.vue'
-
-const $q = useQuasar()
-
-const FullScreenDialog = defineAsyncComponent(() => import('@/components/dialogs/full-screen-widgets/index.vue'))
-// import GraphIcon from '@/icons/page-header/graphIcon.vue'
-// import TimeLineIcon from '@/icons/page-header/timeLineIcon.vue'
-interface Props {
-  title: string
-}
-const props = defineProps<Props>()
-const emits = defineEmits(['create-repair', ''])
-
-const openFullScreenWidgets = () => {
-  $q.dialog({
-    component: FullScreenDialog,
-  })
-}
-</script>
-<style module lang="scss">
-.toolbar {
-  padding: 0;
-  margin-top: 16px;
-}
-.page-container {
-  padding: 0 4px 0 0;
-  max-width: 1300px;
-  margin: 0 auto;
-  max-height: 600px;
-  overflow: auto;
-  &::-webkit-scrollbar-thumb {
-    height: 88px;
-    background-color: #d3dbeb;
-    border-radius: 6px;
-  }
-}
-.button {
-  padding: 12px;
-  background: white;
-}
-
-.button-new {
-  padding: 12px 18px;
-  background: #3f8cff;
-}
-.button-video-wall {
-  padding: 10px 18px;
-  background: white;
-  span {
-    color: #3f8cff;
-    margin-left: 8px;
-    font-size: 16px;
-    font-weight: 700;
-  }
-}
-.title {
-  color: #fff;
-  font-family: Montserrat, sans-serif;
-  font-size: 32px;
-  font-style: normal;
-  font-weight: 700;
-  line-height: normal;
-}
-
-.action-buttons {
-  position: relative;
-  display: flex;
-  align-items: center;
-  column-gap: 16px;
-}
-
-@media (max-width: 1440px) {
-  .page-container {
-    max-width: 874px;
-  }
-  .action-buttons {
-    column-gap: 8px;
-  }
-  .title {
-    font-size: 24px;
-    line-height: normal;
-  }
-  .button {
-    padding: 10px;
-    background: white;
-  }
-  .button-new {
-    padding: 10px 12px;
-    background: #3f8cff;
-  }
-}
-</style>
+<template lang="pug">
+q-page#content(:class="$style['page-container']")
+  q-toolbar(:class="$style['toolbar']")
+    q-toolbar-title(:class="$style.title") {{ title }}
+    div(:class="$style['action-buttons']")
+      app-button(
+        rounded
+        :class="$style['button-new']"
+        :label="'Новый ремонт'"
+        @click="emits('create-repair')"
+        color="#fff"
+        icon="add"
+      )
+      app-button(rounded :class="$style['button-video-wall']" @click="emits('routing-to-video-wall')")
+        video-wall-icon
+        span Видеостена
+      app-button(rounded :class="$style.button" @click="openFullScreenWidgets")
+        q-tooltip на весь экран
+        q-icon(name="open_in_full")
+      //app-button(rounded :class="$style.button")
+      //  graph-icon
+      //app-button(rounded :class="$style.button")
+      //  time-line-icon
+  slot
+</template>
+
+<script setup lang="ts">
+import { defineProps, defineEmits, defineAsyncComponent } from 'vue'
+import AppButton from '@/common/app-button/AppButton.vue'
+import { useQuasar } from 'quasar'
+import VideoWallIcon from '@/icons/page-header/videoWallIcon.vue'
+
+const $q = useQuasar()
+
+const FullScreenDialog = defineAsyncComponent(() => import('@/components/dialogs/full-screen-widgets/index.vue'))
+// import GraphIcon from '@/icons/page-header/graphIcon.vue'
+// import TimeLineIcon from '@/icons/page-header/timeLineIcon.vue'
+interface Props {
+  title: string
+}
+const props = defineProps<Props>()
+const emits = defineEmits(['create-repair', ''])
+
+const openFullScreenWidgets = () => {
+  $q.dialog({
+    component: FullScreenDialog,
+  })
+}
+</script>
+<style module lang="scss">
+.toolbar {
+  padding: 0;
+  margin-top: 16px;
+}
+.page-container {
+  padding: 0 4px 0 0;
+  max-width: 1300px;
+  margin: 0 auto;
+  max-height: 600px;
+  overflow: auto;
+  &::-webkit-scrollbar-thumb {
+    height: 88px;
+    background-color: #d3dbeb;
+    border-radius: 6px;
+  }
+}
+.button {
+  padding: 12px;
+  background: white;
+}
+
+.button-new {
+  padding: 12px 18px;
+  background: #3f8cff;
+}
+.button-video-wall {
+  padding: 10px 18px;
+  background: white;
+  span {
+    color: #3f8cff;
+    margin-left: 8px;
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+.title {
+  color: #fff;
+  font-family: Montserrat, sans-serif;
+  font-size: 32px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: normal;
+}
+
+.action-buttons {
+  position: relative;
+  display: flex;
+  align-items: center;
+  column-gap: 16px;
+}
+
+@media (max-width: 1440px) {
+  .page-container {
+    max-width: 874px;
+  }
+  .action-buttons {
+    column-gap: 8px;
+  }
+  .title {
+    font-size: 24px;
+    line-height: normal;
+  }
+  .button {
+    padding: 10px;
+    background: white;
+  }
+  .button-new {
+    padding: 10px 12px;
+    background: #3f8cff;
+  }
+}
+</style>

package/src/common/app-sidebar/AppSidebar.vue

@@ -56,7 +56,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, defineProps, ref, watch } from 'vue'
+import { computed, defineProps, defineEmits, ref, watch } from 'vue'
 import SidebarMenu from './components/SidebarMenu.vue'
 
 import { useQuasar } from 'quasar'
@@ -67,6 +67,7 @@ interface Props {
   minify?: boolean
   menuItems?: any[]
 }
+const emits = defineEmits(['logout'])
 const props = defineProps<Props>()
 const $q = useQuasar()
 
@@ -89,7 +90,7 @@ function openDrawerIsTablet() {
 }
 
 function logout(): void {
-  window.location.href = '/sign-out'
+  emits('logout')
 }
 
 watch(

package/src/index.ts

@@ -7,6 +7,7 @@ import AppSelect from '@/common/app-select/AppSelect.vue'
 import AppWrapper from '@/common/app-wrapper/AppWrapper.vue'
 import AppSidebar from '@/common/app-sidebar/AppSidebar.vue'
 import AppLayoutHeader from '@/common/app-layout/components/AppLayoutHeader.vue'
+import AppLoader from '@/common/app-loader/index.vue'
 
 import useGanttService from '@/api/services/GanttService'
 import useMetricsService from '@/api/services/MetricsService'
@@ -14,7 +15,18 @@ import useProjectsService from '@/api/services/ProjectsService'
 import useRepairsService from '@/api/services/RepairsService'
 import useTasksService from '@/api/services/TasksService'
 
-export { AppButton, AppInput, AppToggle, AppInputSearch, AppLayout, AppSelect, AppWrapper, AppSidebar, AppLayoutHeader }
+export {
+  AppButton,
+  AppInput,
+  AppToggle,
+  AppInputSearch,
+  AppLayout,
+  AppSelect,
+  AppWrapper,
+  AppSidebar,
+  AppLayoutHeader,
+  AppLoader,
+}
 
 export { useGanttService, useMetricsService, useProjectsService, useRepairsService, useTasksService }