diff --git a/web/satellite/.eslintrc.js b/web/satellite/.eslintrc.js index 477c19ae5..aa9d9ef3c 100644 --- a/web/satellite/.eslintrc.js +++ b/web/satellite/.eslintrc.js @@ -45,7 +45,7 @@ module.exports = { }, { 'group': 'internal', - 'pattern': '@?(poc)/components/**', + 'pattern': '@?(poc)/{components,views}/**', 'position': 'after', }, { diff --git a/web/satellite/src/App.vue b/web/satellite/src/App.vue index afaac2794..eabb9a597 100644 --- a/web/satellite/src/App.vue +++ b/web/satellite/src/App.vue @@ -17,8 +17,8 @@ import { computed, onBeforeUnmount, onMounted, ref } from 'vue'; import { useNotify } from '@/utils/hooks'; import { useAppStore } from '@/store/modules/appStore'; import { useConfigStore } from '@/store/modules/configStore'; -import ErrorPage from '@/views/ErrorPage.vue'; +import ErrorPage from '@/views/ErrorPage.vue'; import BrandedLoader from '@/components/common/BrandedLoader.vue'; import NotificationArea from '@/components/notifications/NotificationArea.vue'; diff --git a/web/satellite/src/components/common/VBanner.vue b/web/satellite/src/components/common/VBanner.vue index 7fd77fa93..22f01566e 100644 --- a/web/satellite/src/components/common/VBanner.vue +++ b/web/satellite/src/components/common/VBanner.vue @@ -10,9 +10,25 @@ >
- +

+ {{ title }} + {{ message }} +

+
- + @@ -24,13 +40,23 @@ import CloseIcon from '@/../static/images/notifications/closeSmall.svg'; const props = withDefaults(defineProps<{ severity?: 'info' | 'warning' | 'critical'; + title?: string; + message?: string; + linkText?: string; + href?: string; onClick?: () => void; + onLinkClick?: () => void; onClose?: () => void; dashboardRef: HTMLElement; }>(), { severity: 'info', - onClick: () => () => {}, - onClose: () => () => {}, + title: '', + message: '', + linkText: '', + href: '', + onClick: () => {}, + onLinkClick: () => {}, + onClose: () => {}, }); const isShown = ref(true); @@ -39,9 +65,7 @@ const resizeObserver = ref(); function closeClicked(): void { isShown.value = false; - if (props.onClose) { - props.onClose(); - } + props.onClose(); } function onBannerResize(): void { @@ -104,7 +128,7 @@ watch(() => props.dashboardRef, () => { border: 1px solid var(--c-yellow-2); :deep(.icon-path) { - fill: var(--c-yellow-3) !important; + fill: var(--c-yellow-5) !important; } } @@ -126,7 +150,22 @@ watch(() => props.dashboardRef, () => { display: flex; align-items: center; justify-content: space-between; - column-gap: 10px; + gap: 10px; + + @media screen and (width <= 500px) { + flex-direction: column; + } + + &__title { + font-family: 'font_medium', sans-serif; + } + + &__link { + color: black; + text-decoration: underline !important; + white-space: nowrap; + cursor: pointer; + } } &__close { @@ -143,18 +182,4 @@ watch(() => props.dashboardRef, () => { } } } - -.bold { - font-family: 'font_bold', sans-serif; -} - -.medium { - font-family: 'font_medium', sans-serif; -} - -.link { - color: black; - text-decoration: underline !important; - cursor: pointer; -} diff --git a/web/satellite/src/components/modals/LimitWarningModal.vue b/web/satellite/src/components/modals/LimitWarningModal.vue index 5a1e2829d..c471b5db2 100644 --- a/web/satellite/src/components/modals/LimitWarningModal.vue +++ b/web/satellite/src/components/modals/LimitWarningModal.vue @@ -5,9 +5,29 @@