diff options
author | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-07-07 17:46:58 +0300 |
---|---|---|
committer | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-07-07 17:46:58 +0300 |
commit | 08117f381c307ee8d45d1aefddc67cf6d93fbe7b (patch) | |
tree | 26b2c0fa0eafaaae9deacccdc42c89806ad31f92 /src/components | |
parent | 32659fb6082d6c88e6752a6213f2867f2fbebf6c (diff) | |
parent | f34a355320e0d47629e1312c39205c08f0b11fa0 (diff) | |
download | webui-vue-08117f381c307ee8d45d1aefddc67cf6d93fbe7b.tar.xz |
Merge branch 'sila' into sila-ui
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/_ibs/AppHeader/AppHeader.vue | 6 | ||||
-rw-r--r-- | src/components/_ibs/Global/Alert.vue | 2 | ||||
-rw-r--r-- | src/components/_ibs/Global/PageContainer.vue | 2 | ||||
-rw-r--r-- | src/components/_ibs/Global/TableDateFilter.vue | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/components/_ibs/AppHeader/AppHeader.vue b/src/components/_ibs/AppHeader/AppHeader.vue index 1c5dbd3a..e6791f0a 100644 --- a/src/components/_ibs/AppHeader/AppHeader.vue +++ b/src/components/_ibs/AppHeader/AppHeader.vue @@ -108,13 +108,13 @@ </template> <script> -import BVToastMixin from '@/components/Mixins/BVToastMixin'; +import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin'; import IconAvatar from '@carbon/icons-vue/es/user--avatar/20'; import IconClose from '@carbon/icons-vue/es/close/20'; import IconMenu from '@carbon/icons-vue/es/menu/20'; import IconRenew from '@carbon/icons-vue/es/renew/20'; -import StatusIcon from '@/components/Global/StatusIcon'; -import LoadingBar from '@/components/Global/LoadingBar'; +import StatusIcon from '@/components/_ibs/Global/StatusIcon'; +import LoadingBar from '@/components/_ibs/Global/LoadingBar'; export default { name: 'AppHeader', diff --git a/src/components/_ibs/Global/Alert.vue b/src/components/_ibs/Global/Alert.vue index e8de9e27..a3f31f61 100644 --- a/src/components/_ibs/Global/Alert.vue +++ b/src/components/_ibs/Global/Alert.vue @@ -23,7 +23,7 @@ </template> <script> -import StatusIcon from '@/components/Global/StatusIcon'; +import StatusIcon from '@/components/_ibs/Global/StatusIcon'; import { BAlert } from 'bootstrap-vue'; export default { diff --git a/src/components/_ibs/Global/PageContainer.vue b/src/components/_ibs/Global/PageContainer.vue index f598be7b..ac1de332 100644 --- a/src/components/_ibs/Global/PageContainer.vue +++ b/src/components/_ibs/Global/PageContainer.vue @@ -5,7 +5,7 @@ </template> <script> -import JumpLinkMixin from '@/components/Mixins/JumpLinkMixin'; +import JumpLinkMixin from '@/components/_ibs/Mixins/JumpLinkMixin'; export default { name: 'PageContainer', mixins: [JumpLinkMixin], diff --git a/src/components/_ibs/Global/TableDateFilter.vue b/src/components/_ibs/Global/TableDateFilter.vue index aa10cb5c..cbb8cb1f 100644 --- a/src/components/_ibs/Global/TableDateFilter.vue +++ b/src/components/_ibs/Global/TableDateFilter.vue @@ -101,7 +101,7 @@ import IconCalendar from '@carbon/icons-vue/es/calendar/20'; import { helpers } from 'vuelidate/lib/validators'; -import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; +import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js'; const isoDateRegex = /([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))/; |