Commit f316e051 authored by malyusgun's avatar malyusgun
Browse files

add Divider entity and start to change settings sidebar of entities

parent 06097c54

src/app/components.d.ts

+5 −2
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']
@@ -40,6 +42,7 @@ declare module 'vue' { 
    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/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;

src/app/stores/websocket.ts

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ export const useWebsocketStore = defineStore('websocketStore', () => { 
  const filesBufferLength = computed(() => filesWebsocketStore.filesBuffer.length);

  const homeEntities = computed(() => dataStore.homeEntities);

  const imageEntitiesCount = computed(

    () => homeEntities.value.filter((entity) => entity.image_width).length

    () => homeEntities.value.filter((entity) => entity?.image_width).length

  );



  const socket = ref();
@@ -50,7 +50,7 @@ export const useWebsocketStore = defineStore('websocketStore', () => { 
        }

        case 'createHomeEntity': {

          const entities = [...homeEntities.value];

          if (response.data.image_width) {

          if (response.data?.image_width) {

            response.data.imageUrl = filesWebsocketStore.imageUrl;

            filesWebsocketStore.cleanImageUrl();

          }
@@ -74,7 +74,7 @@ export const useWebsocketStore = defineStore('websocketStore', () => { 
          let entities = [...homeEntities.value];

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

            if (entity.entity_uuid !== response.data.entity_uuid) return entity;

            if (response.data.image_width) {

            if (response.data?.image_width) {

              response.data.imageUrl = filesWebsocketStore.imageUrl;

              filesWebsocketStore.cleanImageUrl();

            }