diff --git a/package-lock.json b/package-lock.json index c5e3179..407ec2e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "crm", - "version": "23.09.0", + "version": "23.12.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "crm", - "version": "23.09.0", + "version": "23.12.0", "dependencies": { "@vue/compat": "^3.3.9", "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.2", - "@webitel/ui-sdk": "^23.12.120", + "@webitel/ui-sdk": "^24.2.2", "axios": "^0.27.2", "core-js": "^3.8.3", "deep-equal": "^2.2.1", @@ -5377,9 +5377,9 @@ } }, "node_modules/@webitel/ui-sdk": { - "version": "23.12.120", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.120.tgz", - "integrity": "sha512-IY3tCD8j0pMDugUNh4TPVk6dyyWy4/WV/efgodNwtP4IMzg+2r1M2wXLxroZI8dqfMuh/JOaI9w2VBwdvp/yWw==", + "version": "24.2.2", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.2.2.tgz", + "integrity": "sha512-7cO7Veu/f0rs9mV+eOVVFo0W3JSb2Kr2KzLbUEkgl+2qGZyh9Oy/jOp2luGKtkUCNVTTJcyG5CZLVWRTsAXKRg==", "dependencies": { "@floating-ui/vue": "^1.0.1", "@vuelidate/core": "^2.0.3", @@ -28348,9 +28348,9 @@ } }, "@webitel/ui-sdk": { - "version": "23.12.120", - "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-23.12.120.tgz", - "integrity": "sha512-IY3tCD8j0pMDugUNh4TPVk6dyyWy4/WV/efgodNwtP4IMzg+2r1M2wXLxroZI8dqfMuh/JOaI9w2VBwdvp/yWw==", + "version": "24.2.2", + "resolved": "https://registry.npmjs.org/@webitel/ui-sdk/-/ui-sdk-24.2.2.tgz", + "integrity": "sha512-7cO7Veu/f0rs9mV+eOVVFo0W3JSb2Kr2KzLbUEkgl+2qGZyh9Oy/jOp2luGKtkUCNVTTJcyG5CZLVWRTsAXKRg==", "requires": { "@floating-ui/vue": "^1.0.1", "@vuelidate/core": "^2.0.3", diff --git a/package.json b/package.json index 1187650..b9d1708 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@vue/compat": "^3.3.9", "@vuelidate/core": "^2.0.0", "@vuelidate/validators": "^2.0.2", - "@webitel/ui-sdk": "^23.12.120", + "@webitel/ui-sdk": "^24.2.2", "axios": "^0.27.2", "core-js": "^3.8.3", "deep-equal": "^2.2.1", diff --git a/src/app/assets/dummy-dark.svg b/src/app/assets/dummy-dark.svg new file mode 100644 index 0000000..2f33372 --- /dev/null +++ b/src/app/assets/dummy-dark.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/app/assets/dummy-light.svg b/src/app/assets/dummy-light.svg new file mode 100644 index 0000000..1c50b99 --- /dev/null +++ b/src/app/assets/dummy-light.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/app/assets/dummy-pic.svg b/src/app/assets/dummy-pic.svg deleted file mode 100644 index 4440498..0000000 --- a/src/app/assets/dummy-pic.svg +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/modules/contacts/components/the-contacts.vue b/src/modules/contacts/components/the-contacts.vue index f72bb28..2024235 100644 --- a/src/modules/contacts/components/the-contacts.vue +++ b/src/modules/contacts/components/the-contacts.vue @@ -122,7 +122,8 @@ import DeleteConfirmationPopup import { useAccess } from '../../../app/composables/useAccess'; import ContactPopup from './contact-popup.vue'; import FilterSearch from '../modules/filters/components/filter-search.vue'; -import dummyPic from '../../../app/assets/dummy-pic.svg'; +import dummyLight from '../../../app/assets/dummy-light.svg'; +import dummyDark from '../../../app/assets/dummy-dark.svg'; const baseNamespace = 'contacts'; @@ -169,6 +170,8 @@ const path = computed(() => [ { name: t('crm') }, { name: t('contacts.contact', 2), route: '/' }, ]); +const darkMode = computed(() => store.getters['appearance/DARK_MODE']); +const dummyPic = computed(() => (darkMode.value ? dummyDark : dummyLight)); // we need to check if there's any filters which actually filter data before showing "no data" dummy @@ -189,7 +192,7 @@ const dummy = computed(() => { const isEmptyFilters = isEmpty(dynamicFilters); return { - src: isEmptyFilters ? '' : dummyPic, + src: isEmptyFilters ? '' : dummyPic.value, text: isEmptyFilters ? '' : t('vocabulary.emptyResultSearch'), }; }); diff --git a/src/modules/contacts/modules/emails/assets/email-dummy.svg b/src/modules/contacts/modules/emails/assets/email-dummy-dark.svg similarity index 51% rename from src/modules/contacts/modules/emails/assets/email-dummy.svg rename to src/modules/contacts/modules/emails/assets/email-dummy-dark.svg index 4dd876c..9d1b6bc 100644 --- a/src/modules/contacts/modules/emails/assets/email-dummy.svg +++ b/src/modules/contacts/modules/emails/assets/email-dummy-dark.svg @@ -1,45 +1,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/modules/contacts/modules/emails/assets/email-dummy-light.svg b/src/modules/contacts/modules/emails/assets/email-dummy-light.svg new file mode 100644 index 0000000..ae5b7af --- /dev/null +++ b/src/modules/contacts/modules/emails/assets/email-dummy-light.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/modules/contacts/modules/emails/components/the-emails.vue b/src/modules/contacts/modules/emails/components/the-emails.vue index 327e9c9..8a7ec46 100644 --- a/src/modules/contacts/modules/emails/components/the-emails.vue +++ b/src/modules/contacts/modules/emails/components/the-emails.vue @@ -18,7 +18,7 @@ @@ -78,7 +78,8 @@ import { useDeleteConfirmationPopup, } from '@webitel/ui-sdk/src/modules/DeleteConfirmationPopup/composables/useDeleteConfirmationPopup'; import { useStore } from 'vuex'; -import dummyPic from '../assets/email-dummy.svg'; +import dummyLight from '../assets/email-dummy-light.svg'; +import dummyDark from '../assets/email-dummy-dark.svg'; import CommunicationPopup from '../../../components/opened-contact-communication-popup.vue'; const access = inject('access'); @@ -120,6 +121,7 @@ const { const editedItem = ref(null); const showDummy = computed(() => !dataList.value.length); +const darkMode = computed(() => store.getters['appearance/DARK_MODE']); function setAsPrimary({ item, index }) { return store.dispatch(`${namespace}/SET_AS_PRIMARY`, { item, index }); diff --git a/src/modules/contacts/modules/phones/assets/phone-dummy.svg b/src/modules/contacts/modules/phones/assets/phone-dummy-dark.svg similarity index 77% rename from src/modules/contacts/modules/phones/assets/phone-dummy.svg rename to src/modules/contacts/modules/phones/assets/phone-dummy-dark.svg index 069d8ad..4908852 100644 --- a/src/modules/contacts/modules/phones/assets/phone-dummy.svg +++ b/src/modules/contacts/modules/phones/assets/phone-dummy-dark.svg @@ -1,24 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/src/modules/contacts/modules/phones/assets/phone-dummy-light.svg b/src/modules/contacts/modules/phones/assets/phone-dummy-light.svg new file mode 100644 index 0000000..ff80dc9 --- /dev/null +++ b/src/modules/contacts/modules/phones/assets/phone-dummy-light.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/modules/contacts/modules/phones/components/the-phones.vue b/src/modules/contacts/modules/phones/components/the-phones.vue index 0fdaf2e..4ac8ae9 100644 --- a/src/modules/contacts/modules/phones/components/the-phones.vue +++ b/src/modules/contacts/modules/phones/components/the-phones.vue @@ -18,7 +18,7 @@ @@ -78,7 +78,8 @@ import { useDeleteConfirmationPopup, } from '@webitel/ui-sdk/src/modules/DeleteConfirmationPopup/composables/useDeleteConfirmationPopup'; import { useStore } from 'vuex'; -import dummyPic from '../assets/phone-dummy.svg'; +import dummyLight from '../assets/phone-dummy-light.svg'; +import dummyDark from '../assets/phone-dummy-dark.svg'; import CommunicationPopup from '../../../components/opened-contact-communication-popup.vue'; const access = inject('access'); @@ -120,6 +121,7 @@ const { const editedItem = ref(null); const showDummy = computed(() => !dataList.value.length); +const darkMode = computed(() => store.getters['appearance/DARK_MODE']); function setAsPrimary({ item, index }) { return store.dispatch(`${namespace}/SET_AS_PRIMARY`, { item, index }); diff --git a/src/modules/contacts/modules/variables/components/the-variables.vue b/src/modules/contacts/modules/variables/components/the-variables.vue index b55ee1d..bec7272 100644 --- a/src/modules/contacts/modules/variables/components/the-variables.vue +++ b/src/modules/contacts/modules/variables/components/the-variables.vue @@ -23,7 +23,10 @@ - +
!dataList.value.length); +const darkMode = computed(() => store.getters['appearance/DARK_MODE']); async function save(item) { try {