Commit ee23b136 authored by Дмитрий Малюгин's avatar Дмитрий Малюгин 🕓
Browse files

Merge branch 'feature/divider' into 'main' 

Feature/divider

See merge request !11
parents 06097c54 c2bf5973

src/app/components.d.ts

+8 −4
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@ declare module 'vue' { 
    CropImageModal: typeof import('./../modules/CropImageModal.vue')['default']

    Dialog: typeof import('primevue/dialog')['default']

    Divider: typeof import('primevue/divider')['default']

    DividerItem: typeof import('./../modules/entities/DividerItem.vue')['default']

    DividerMenu: typeof import('./../modules/entities/menu/DividerMenu.vue')['default']

    Drawer: typeof import('primevue/drawer')['default']

    EntitiesList: typeof import('./../modules/EntitiesList.vue')['default']

    EntityItem: typeof import('./../modules/EntityItem.vue')['default']

    EntitiesList: typeof import('./../modules/entities/EntitiesList.vue')['default']

    EntityItem: typeof import('./../modules/entities/EntityItem.vue')['default']

    EntityTitle: typeof import('./../components/entities/share/EntityTitle.vue')['default']

    HomePage: typeof import('./../pages/HomePage.vue')['default']

    ImageItem: typeof import('./../modules/entities/ImageItem.vue')['default']
@@ -28,18 +30,20 @@ declare module 'vue' { 
    ImageSizeMenu: typeof import('./../components/entities/image/ImageSizeMenu.vue')['default']

    ImageStateMenu: typeof import('./../components/entities/image/ImageStateMenu.vue')['default']

    LogoAndLabel: typeof import('./../components/LogoAndLabel.vue')['default']

    page: typeof import('./../modules/Home page.vue')['default']

    PageBackgroundMenu: typeof import('./../modules/PageBackgroundMenu.vue')['default']

    PageHeader: typeof import('./../modules/PageHeader.vue')['default']

    RouterLink: typeof import('vue-router')['RouterLink']

    RouterView: typeof import('vue-router')['RouterView']

    SheetPage: typeof import('./../pages/[uuid]/SheetPage.vue')['default']

    SpeedDial: typeof import('primevue/speeddial')['default']

    Splitter: typeof import('primevue/splitter')['default']

    SplitterPanel: typeof import('primevue/splitterpanel')['default']

    TelegramSection: typeof import('./../modules/TelegramSection.vue')['default']

    TextFontMenu: typeof import('./../components/entities/share/TextFontMenu.vue')['default']

    TextItem: typeof import('./../modules/entities/TextItem.vue')['default']

    TextMenu: typeof import('./../modules/entities/menu/TextMenu.vue')['default']

    TextPositionMenu: typeof import('./../components/entities/text/TextPositionMenu.vue')['default']

    TextStateMenu: typeof import('./../components/entities/text/TextStateMenu.vue')['default']

    ToggleSwitch: typeof import('primevue/toggleswitch')['default']

    Tree: typeof import('primevue/tree')['default']

    UserInfoHeaderWithSettings: typeof import('./../components/UserInfoHeaderWithSettings.vue')['default']

  }

src/app/helpers/images.ts

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ export const addUrlsToImageEntities = (entities: IEntity[]) => { 
  const filesBuffer = filesWebsocketStore.filesBuffer;

  let index = 0;

  const entitiesToReturn = entities.map((entity: IEntity) => {

    if (!entity.image_width) return entity;

    if (!entity?.image_width) return entity;

    if (entity.imageUrl) return entity;

    if (filesWebsocketStore.imageUrl) {

      // редактирование сущности изображения
@@ -26,7 +26,7 @@ export const addUrlsToImageEntities = (entities: IEntity[]) => { 
};



export const checkIsImage = (entity: IEntity) => {

  if (!entity.image_width) {

  if (!entity?.image_width) {

    return entity;

  }

  const entityToReturn = { ...entity };

src/app/helpers/index.ts

+4 −4
Original line number Diff line number Diff line
@@ -120,25 +120,25 @@ export const getImageSpeedDialSizeBiggerLabelsToRemove = (entity: IImage) => { 
  }

  if (

    initialImageWidth >= 960 ||

    initialImageHeight >= 960 ||

    initialImageHeight >= 560 ||

    (initialImageWidth >= 640 && entity.text_position)

  ) {

    elementsLabelsToRemove.push('x1.25');

    if (

      initialImageWidth >= 800 ||

      initialImageHeight >= 800 ||

      initialImageHeight >= 467 ||

      (initialImageWidth >= 533 && entity.text_position)

    ) {

      elementsLabelsToRemove.push('x1.5');

      if (

        initialImageWidth >= 685 ||

        initialImageHeight >= 685 ||

        initialImageHeight >= 400 ||

        (initialImageWidth >= 457 && entity.text_position)

      ) {

        elementsLabelsToRemove.push('x1.75');

        if (

          initialImageWidth >= 600 ||

          initialImageHeight >= 600 ||

          initialImageHeight >= 350 ||

          (initialImageWidth >= 400 && entity.text_position)

        ) {

          elementsLabelsToRemove.push('x2');

src/app/interfaces/entities.ts

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,13 @@ type ITableColumnTypes = 
  | 'rating'

  | 'knob';



export interface IDivider extends IEntity {

  entity_type: 'divider';

  entity_uuid: string;

  divider_height: number;

  divider_type: 'solid' | 'dashed' | 'dotted';

}



export interface IText extends IEntity {

  entity_type: 'text';

  entity_uuid: string;

src/app/interfaces/environment.ts

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ export interface IEntity { 
  user_nick_name?: string;

  entity_order?: number;

  entity_type: string;

  divider_height?: number;

  divider_type?: 'solid' | 'dashed' | 'dotted';

  title?: string | null;

  text?: string | null;

  font_size?: string | null;