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

finished with divider and fix some issues

parent f316e051

src/app/components.d.ts

+3 −2
Original line number Diff line number Diff line
@@ -30,13 +30,14 @@ 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']

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/main.ts

+23 −3
Original line number Diff line number Diff line
@@ -6,14 +6,34 @@ import PrimeVue from 'primevue/config'; 
import App from './App.vue';

import router from './router';

import Aura from '@primevue/themes/aura';

import { definePreset } from '@primevue/themes';



const app = createApp(App);



const theme = 'sky';

const MyPreset = definePreset(Aura, {

  semantic: {

    primary: {

      50: `{${theme}.50}`,

      100: `{${theme}.100}`,

      200: `{${theme}.200}`,

      300: `{${theme}.300}`,

      400: `{${theme}.400}`,

      500: `{${theme}.500}`,

      600: `{${theme}.600}`,

      700: `{${theme}.700}`,

      800: `{${theme}.800}`,

      900: `{${theme}.900}`,

      950: `{${theme}.950}`

    }

  }

});

app

  .use(PrimeVue, {

    theme: {

      preset: Aura,

      options: {}

      preset: MyPreset,

      options: {

        // darkModeSelector: '.darkModeToggle'

      }

    }

  })

  .use(createPinia())

src/app/stores/data.ts

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ export const useDataStore = defineStore('dataStore', () => { 


  function editHomeEntities(newState: IEntity) {

    homeEntities.value = newState;

    console.log('homeEntities.value', homeEntities.value);

  }



  function setHomeEntities(entities: IEntity[]) {

src/app/stores/websocket.ts

+3 −1
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ export const useWebsocketStore = defineStore('websocketStore', () => { 


  watch([filesBufferLength, homeEntities], () => {

    if (

      (homeEntities.value.length && filesBufferLength.value === imageEntitiesCount.value) ||

      (homeEntities.value.length &&

        filesBufferLength.value === imageEntitiesCount.value &&

        imageEntitiesCount.value) ||

      (isInitialAddUrlsToImageEntitiesFinished.value && filesBufferLength.value)

    ) {

      const entitiesAddedUrls = addUrlsToImageEntities(homeEntities.value);