diff --git a/web/satellite/.eslintrc.cjs b/web/satellite/.eslintrc.cjs index aafe290ed8ed..d4f6a15344aa 100644 --- a/web/satellite/.eslintrc.cjs +++ b/web/satellite/.eslintrc.cjs @@ -46,7 +46,7 @@ module.exports = { }, { 'group': 'internal', - 'pattern': '@?(poc)/{components,views,layouts}/**', + 'pattern': '@/{components,views,layouts}/**', 'position': 'after', }, { @@ -56,7 +56,7 @@ module.exports = { }, { 'group': 'internal', - 'pattern': '@poc/assets/**', + 'pattern': '@/assets/**', 'position': 'after', }, ], diff --git a/web/satellite/index.html b/web/satellite/index.html index b5ecb9f6f275..fb02e5627cf8 100644 --- a/web/satellite/index.html +++ b/web/satellite/index.html @@ -9,6 +9,6 @@
- + diff --git a/web/satellite/vuetify-poc/src/App.vue b/web/satellite/src/App.vue similarity index 94% rename from web/satellite/vuetify-poc/src/App.vue rename to web/satellite/src/App.vue index 6b369ecfdefa..d0f7ec0d27a0 100644 --- a/web/satellite/vuetify-poc/src/App.vue +++ b/web/satellite/src/App.vue @@ -14,7 +14,7 @@ import { useTheme } from 'vuetify'; import { useRoute, useRouter } from 'vue-router'; import { useConfigStore } from '@/store/modules/configStore'; -import { useAppStore } from '@poc/store/appStore'; +import { useAppStore } from '@/store/modules/appStore'; import { APIError } from '@/utils/error'; import { ErrorUnauthorized } from '@/api/errors/ErrorUnauthorized'; import { useABTestingStore } from '@/store/modules/abTestingStore'; @@ -25,11 +25,11 @@ import { useNotify } from '@/utils/hooks'; import { useBillingStore } from '@/store/modules/billingStore'; import { AnalyticsErrorEventSource, AnalyticsEvent } from '@/utils/constants/analyticsEventNames'; import { RouteConfig } from '@/types/router'; -import { ROUTES } from '@poc/router'; +import { ROUTES } from '@/router'; -import Notifications from '@poc/layouts/default/Notifications.vue'; -import ErrorPage from '@poc/components/ErrorPage.vue'; -import BrandedLoader from '@poc/components/utils/BrandedLoader.vue'; +import Notifications from '@/layouts/default/Notifications.vue'; +import ErrorPage from '@/components/ErrorPage.vue'; +import BrandedLoader from '@/components/utils/BrandedLoader.vue'; const appStore = useAppStore(); const abTestingStore = useABTestingStore(); diff --git a/web/satellite/static/images/accessGrants/newCreateFlow/accessCreated.svg b/web/satellite/src/assets/createAccessGrantFlow/accessCreated.svg similarity index 100% rename from web/satellite/static/images/accessGrants/newCreateFlow/accessCreated.svg rename to web/satellite/src/assets/createAccessGrantFlow/accessCreated.svg diff --git a/web/satellite/static/images/accessGrants/newCreateFlow/accessEncryption.svg b/web/satellite/src/assets/createAccessGrantFlow/accessEncryption.svg similarity index 100% rename from web/satellite/static/images/accessGrants/newCreateFlow/accessEncryption.svg rename to web/satellite/src/assets/createAccessGrantFlow/accessEncryption.svg diff --git a/web/satellite/static/images/accessGrants/newCreateFlow/choosePermission.svg b/web/satellite/src/assets/createAccessGrantFlow/choosePermission.svg similarity index 100% rename from web/satellite/static/images/accessGrants/newCreateFlow/choosePermission.svg rename to web/satellite/src/assets/createAccessGrantFlow/choosePermission.svg diff --git a/web/satellite/static/images/accessGrants/newCreateFlow/cliAccessCreated.svg b/web/satellite/src/assets/createAccessGrantFlow/cliAccessCreated.svg similarity index 100% rename from web/satellite/static/images/accessGrants/newCreateFlow/cliAccessCreated.svg rename to web/satellite/src/assets/createAccessGrantFlow/cliAccessCreated.svg diff --git a/web/satellite/static/images/accessGrants/newCreateFlow/confirmDetails.svg b/web/satellite/src/assets/createAccessGrantFlow/confirmDetails.svg similarity index 100% rename from web/satellite/static/images/accessGrants/newCreateFlow/confirmDetails.svg rename to web/satellite/src/assets/createAccessGrantFlow/confirmDetails.svg diff --git a/web/satellite/static/images/accessGrants/newCreateFlow/createNewAccess.svg b/web/satellite/src/assets/createAccessGrantFlow/createNewAccess.svg similarity index 100% rename from web/satellite/static/images/accessGrants/newCreateFlow/createNewAccess.svg rename to web/satellite/src/assets/createAccessGrantFlow/createNewAccess.svg diff --git a/web/satellite/static/images/accessGrants/newCreateFlow/credentialsCreated.svg b/web/satellite/src/assets/createAccessGrantFlow/credentialsCreated.svg similarity index 100% rename from web/satellite/static/images/accessGrants/newCreateFlow/credentialsCreated.svg rename to web/satellite/src/assets/createAccessGrantFlow/credentialsCreated.svg diff --git a/web/satellite/static/images/accessGrants/newCreateFlow/encryptionInfo.svg b/web/satellite/src/assets/createAccessGrantFlow/encryptionInfo.svg similarity index 100% rename from web/satellite/static/images/accessGrants/newCreateFlow/encryptionInfo.svg rename to web/satellite/src/assets/createAccessGrantFlow/encryptionInfo.svg diff --git a/web/satellite/static/images/accessGrants/newCreateFlow/passphraseGenerated.svg b/web/satellite/src/assets/createAccessGrantFlow/passphraseGenerated.svg similarity index 100% rename from web/satellite/static/images/accessGrants/newCreateFlow/passphraseGenerated.svg rename to web/satellite/src/assets/createAccessGrantFlow/passphraseGenerated.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-audio-tonal.svg b/web/satellite/src/assets/icon-audio-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-audio-tonal.svg rename to web/satellite/src/assets/icon-audio-tonal.svg diff --git a/web/satellite/vuetify-poc/src/assets/bg.svg b/web/satellite/src/assets/icon-bg.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/bg.svg rename to web/satellite/src/assets/icon-bg.svg diff --git a/web/satellite/static/images/common/blueBox.svg b/web/satellite/src/assets/icon-blue-box.svg similarity index 100% rename from web/satellite/static/images/common/blueBox.svg rename to web/satellite/src/assets/icon-blue-box.svg diff --git a/web/satellite/static/images/modals/boxesIcon.svg b/web/satellite/src/assets/icon-boxes.svg similarity index 100% rename from web/satellite/static/images/modals/boxesIcon.svg rename to web/satellite/src/assets/icon-boxes.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-bucket-tonal.svg b/web/satellite/src/assets/icon-bucket-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-bucket-tonal.svg rename to web/satellite/src/assets/icon-bucket-tonal.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-bucket.svg b/web/satellite/src/assets/icon-bucket.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-bucket.svg rename to web/satellite/src/assets/icon-bucket.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-change-name.svg b/web/satellite/src/assets/icon-change-name.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-change-name.svg rename to web/satellite/src/assets/icon-change-name.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-change-password.svg b/web/satellite/src/assets/icon-change-password.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-change-password.svg rename to web/satellite/src/assets/icon-change-password.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-check-color.svg b/web/satellite/src/assets/icon-check-color.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-check-color.svg rename to web/satellite/src/assets/icon-check-color.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-close.svg b/web/satellite/src/assets/icon-close.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-close.svg rename to web/satellite/src/assets/icon-close.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-download.svg b/web/satellite/src/assets/icon-download.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-download.svg rename to web/satellite/src/assets/icon-download.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-dropdown.svg b/web/satellite/src/assets/icon-dropdown.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-dropdown.svg rename to web/satellite/src/assets/icon-dropdown.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-file-tonal.svg b/web/satellite/src/assets/icon-file-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-file-tonal.svg rename to web/satellite/src/assets/icon-file-tonal.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-folder-tonal.svg b/web/satellite/src/assets/icon-folder-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-folder-tonal.svg rename to web/satellite/src/assets/icon-folder-tonal.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-folder.svg b/web/satellite/src/assets/icon-folder.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-folder.svg rename to web/satellite/src/assets/icon-folder.svg diff --git a/web/satellite/static/images/account/billing/greenCoupon.svg b/web/satellite/src/assets/icon-green-coupon.svg similarity index 100% rename from web/satellite/static/images/account/billing/greenCoupon.svg rename to web/satellite/src/assets/icon-green-coupon.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-image-tonal.svg b/web/satellite/src/assets/icon-image-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-image-tonal.svg rename to web/satellite/src/assets/icon-image-tonal.svg diff --git a/web/satellite/static/images/modals/limit.svg b/web/satellite/src/assets/icon-limit.svg similarity index 100% rename from web/satellite/static/images/modals/limit.svg rename to web/satellite/src/assets/icon-limit.svg diff --git a/web/satellite/static/images/common/loadIcon.svg b/web/satellite/src/assets/icon-load.svg similarity index 100% rename from web/satellite/static/images/common/loadIcon.svg rename to web/satellite/src/assets/icon-load.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-mfa.svg b/web/satellite/src/assets/icon-mfa.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-mfa.svg rename to web/satellite/src/assets/icon-mfa.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-more.svg b/web/satellite/src/assets/icon-more.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-more.svg rename to web/satellite/src/assets/icon-more.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-pdf-tonal.svg b/web/satellite/src/assets/icon-pdf-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-pdf-tonal.svg rename to web/satellite/src/assets/icon-pdf-tonal.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-project-tonal.svg b/web/satellite/src/assets/icon-project-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-project-tonal.svg rename to web/satellite/src/assets/icon-project-tonal.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-remove-member.svg b/web/satellite/src/assets/icon-remove-member.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-remove-member.svg rename to web/satellite/src/assets/icon-remove-member.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-right.svg b/web/satellite/src/assets/icon-right.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-right.svg rename to web/satellite/src/assets/icon-right.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-session-timeout.svg b/web/satellite/src/assets/icon-session-timeout.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-session-timeout.svg rename to web/satellite/src/assets/icon-session-timeout.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-spreadsheet-tonal.svg b/web/satellite/src/assets/icon-spreadsheet-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-spreadsheet-tonal.svg rename to web/satellite/src/assets/icon-spreadsheet-tonal.svg diff --git a/web/satellite/static/images/modals/upgradeFlow/success.svg b/web/satellite/src/assets/icon-success.svg similarity index 100% rename from web/satellite/static/images/modals/upgradeFlow/success.svg rename to web/satellite/src/assets/icon-success.svg diff --git a/web/satellite/static/images/team/teamMembers.svg b/web/satellite/src/assets/icon-team-members.svg similarity index 100% rename from web/satellite/static/images/team/teamMembers.svg rename to web/satellite/src/assets/icon-team-members.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-text-tonal.svg b/web/satellite/src/assets/icon-text-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-text-tonal.svg rename to web/satellite/src/assets/icon-text-tonal.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-video-tonal.svg b/web/satellite/src/assets/icon-video-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-video-tonal.svg rename to web/satellite/src/assets/icon-video-tonal.svg diff --git a/web/satellite/static/images/errors/world.svg b/web/satellite/src/assets/icon-world.svg similarity index 100% rename from web/satellite/static/images/errors/world.svg rename to web/satellite/src/assets/icon-world.svg diff --git a/web/satellite/vuetify-poc/src/assets/icon-zip-tonal.svg b/web/satellite/src/assets/icon-zip-tonal.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/icon-zip-tonal.svg rename to web/satellite/src/assets/icon-zip-tonal.svg diff --git a/web/satellite/vuetify-poc/src/assets/logo-dark.svg b/web/satellite/src/assets/logo-dark.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/logo-dark.svg rename to web/satellite/src/assets/logo-dark.svg diff --git a/web/satellite/vuetify-poc/src/assets/logo.svg b/web/satellite/src/assets/logo.svg similarity index 100% rename from web/satellite/vuetify-poc/src/assets/logo.svg rename to web/satellite/src/assets/logo.svg diff --git a/web/satellite/vuetify-poc/src/components/AccessTableComponent.vue b/web/satellite/src/components/AccessTableComponent.vue similarity index 96% rename from web/satellite/vuetify-poc/src/components/AccessTableComponent.vue rename to web/satellite/src/components/AccessTableComponent.vue index ede00bcfe1e9..33b39a03700e 100644 --- a/web/satellite/vuetify-poc/src/components/AccessTableComponent.vue +++ b/web/satellite/src/components/AccessTableComponent.vue @@ -131,11 +131,10 @@ import { useAccessGrantsStore } from '@/store/modules/accessGrantsStore'; import { useNotify } from '@/utils/hooks'; import { useProjectsStore } from '@/store/modules/projectsStore'; import { DEFAULT_PAGE_LIMIT } from '@/types/pagination'; -import { SortDirection, tableSizeOptions } from '@/types/common'; -import { MAX_SEARCH_VALUE_LENGTH } from '@poc/types/common'; +import { SortDirection, tableSizeOptions, MAX_SEARCH_VALUE_LENGTH } from '@/types/common'; -import DeleteAccessDialog from '@poc/components/dialogs/DeleteAccessDialog.vue'; -import IconTrash from '@poc/components/icons/IconTrash.vue'; +import DeleteAccessDialog from '@/components/dialogs/DeleteAccessDialog.vue'; +import IconTrash from '@/components/icons/IconTrash.vue'; const agStore = useAccessGrantsStore(); const projectsStore = useProjectsStore(); diff --git a/web/satellite/vuetify-poc/src/components/AddCreditCardComponent.vue b/web/satellite/src/components/AddCreditCardComponent.vue similarity index 95% rename from web/satellite/vuetify-poc/src/components/AddCreditCardComponent.vue rename to web/satellite/src/components/AddCreditCardComponent.vue index bbb3072a44c9..88707b0c890a 100644 --- a/web/satellite/vuetify-poc/src/components/AddCreditCardComponent.vue +++ b/web/satellite/src/components/AddCreditCardComponent.vue @@ -55,8 +55,8 @@ import { AnalyticsErrorEventSource, AnalyticsEvent } from '@/utils/constants/ana import { useConfigStore } from '@/store/modules/configStore'; import { useAnalyticsStore } from '@/store/modules/analyticsStore'; -import StripeCardElement from '@/components/account/billing/paymentMethods/StripeCardElement.vue'; -import StripeCardInput from '@/components/account/billing/paymentMethods/StripeCardInput.vue'; +import StripeCardElement from '@/components/StripeCardElement.vue'; +import StripeCardInput from '@/components/StripeCardInput.vue'; interface StripeForm { onSubmit(): Promise; @@ -121,4 +121,4 @@ async function addCardToDB(res: string): Promise { notify.notifyError(error, AnalyticsErrorEventSource.BILLING_PAYMENT_METHODS_TAB); } } - \ No newline at end of file + diff --git a/web/satellite/src/components/project/dashboard/BandwidthChart.vue b/web/satellite/src/components/BandwidthChart.vue similarity index 98% rename from web/satellite/src/components/project/dashboard/BandwidthChart.vue rename to web/satellite/src/components/BandwidthChart.vue index 5fa88cdd16eb..ed1391305a5a 100644 --- a/web/satellite/src/components/project/dashboard/BandwidthChart.vue +++ b/web/satellite/src/components/BandwidthChart.vue @@ -20,7 +20,7 @@ import { Tooltip, TooltipParams, TooltipId, ChartTooltipData } from '@/types/cha import { DataStamp } from '@/types/projects'; import { ChartUtils } from '@/utils/chart'; -import VChart from '@/components/common/VChart.vue'; +import VChart from '@/components/VChart.vue'; const props = withDefaults(defineProps<{ data: DataStamp[], diff --git a/web/satellite/vuetify-poc/src/components/BrowserBreadcrumbsComponent.vue b/web/satellite/src/components/BrowserBreadcrumbsComponent.vue similarity index 92% rename from web/satellite/vuetify-poc/src/components/BrowserBreadcrumbsComponent.vue rename to web/satellite/src/components/BrowserBreadcrumbsComponent.vue index 1da9e17b0714..21acb3f46748 100644 --- a/web/satellite/vuetify-poc/src/components/BrowserBreadcrumbsComponent.vue +++ b/web/satellite/src/components/BrowserBreadcrumbsComponent.vue @@ -4,7 +4,7 @@ @@ -15,7 +15,7 @@ import { VBreadcrumbs } from 'vuetify/components'; import { useBucketsStore } from '@/store/modules/bucketsStore'; import { useProjectsStore } from '@/store/modules/projectsStore'; -import { ROUTES } from '@poc/router'; +import { ROUTES } from '@/router'; const projectsStore = useProjectsStore(); const bucketsStore = useBucketsStore(); diff --git a/web/satellite/vuetify-poc/src/components/BrowserCardViewComponent.vue b/web/satellite/src/components/BrowserCardViewComponent.vue similarity index 98% rename from web/satellite/vuetify-poc/src/components/BrowserCardViewComponent.vue rename to web/satellite/src/components/BrowserCardViewComponent.vue index 0d45b02ea1eb..36ab639b5d1c 100644 --- a/web/satellite/vuetify-poc/src/components/BrowserCardViewComponent.vue +++ b/web/satellite/src/components/BrowserCardViewComponent.vue @@ -202,12 +202,12 @@ import { useConfigStore } from '@/store/modules/configStore'; import { BrowserObjectTypeInfo, BrowserObjectWrapper, EXTENSION_INFOS, FILE_INFO, FOLDER_INFO } from '@/types/browser'; import { useLinksharing } from '@/composables/useLinksharing'; import { useAnalyticsStore } from '@/store/modules/analyticsStore'; -import { ROUTES } from '@poc/router'; +import { ROUTES } from '@/router'; -import FilePreviewDialog from '@poc/components/dialogs/FilePreviewDialog.vue'; -import DeleteFileDialog from '@poc/components/dialogs/DeleteFileDialog.vue'; -import ShareDialog from '@poc/components/dialogs/ShareDialog.vue'; -import FileCard from '@poc/components/FileCard.vue'; +import FilePreviewDialog from '@/components/dialogs/FilePreviewDialog.vue'; +import DeleteFileDialog from '@/components/dialogs/DeleteFileDialog.vue'; +import ShareDialog from '@/components/dialogs/ShareDialog.vue'; +import FileCard from '@/components/FileCard.vue'; type SortKey = 'name' | 'type' | 'size' | 'date'; diff --git a/web/satellite/vuetify-poc/src/components/BrowserRowActions.vue b/web/satellite/src/components/BrowserRowActions.vue similarity index 95% rename from web/satellite/vuetify-poc/src/components/BrowserRowActions.vue rename to web/satellite/src/components/BrowserRowActions.vue index 9befdb862291..e597adb26b55 100644 --- a/web/satellite/vuetify-poc/src/components/BrowserRowActions.vue +++ b/web/satellite/src/components/BrowserRowActions.vue @@ -119,10 +119,10 @@ import { useNotify } from '@/utils/hooks'; import { AnalyticsErrorEventSource } from '@/utils/constants/analyticsEventNames'; import { useBucketsStore } from '@/store/modules/bucketsStore'; -import IconDownload from '@poc/components/icons/IconDownload.vue'; -import IconShare from '@poc/components/icons/IconShare.vue'; -import IconPreview from '@poc/components/icons/IconPreview.vue'; -import IconTrash from '@poc/components/icons/IconTrash.vue'; +import IconDownload from '@/components/icons/IconDownload.vue'; +import IconShare from '@/components/icons/IconShare.vue'; +import IconPreview from '@/components/icons/IconPreview.vue'; +import IconTrash from '@/components/icons/IconTrash.vue'; const obStore = useObjectBrowserStore(); const bucketsStore = useBucketsStore(); diff --git a/web/satellite/vuetify-poc/src/components/BrowserSnackbarComponent.vue b/web/satellite/src/components/BrowserSnackbarComponent.vue similarity index 96% rename from web/satellite/vuetify-poc/src/components/BrowserSnackbarComponent.vue rename to web/satellite/src/components/BrowserSnackbarComponent.vue index ded96bfd4971..38870ddfdd4e 100644 --- a/web/satellite/vuetify-poc/src/components/BrowserSnackbarComponent.vue +++ b/web/satellite/src/components/BrowserSnackbarComponent.vue @@ -100,15 +100,15 @@ import { BrowserObject, UploadingBrowserObject, UploadingStatus, useObjectBrowse import { AnalyticsErrorEventSource } from '@/utils/constants/analyticsEventNames'; import { Duration } from '@/utils/time'; import { useNotify } from '@/utils/hooks'; -import { useAppStore as useV1AppStore } from '@/store/modules/appStore'; +import { useAppStore } from '@/store/modules/appStore'; import { useBucketsStore } from '@/store/modules/bucketsStore'; import { useProjectsStore } from '@/store/modules/projectsStore'; -import { ROUTES } from '@poc/router'; +import { ROUTES } from '@/router'; -import UploadItem from '@poc/components/UploadItem.vue'; -import FilePreviewDialog from '@poc/components/dialogs/FilePreviewDialog.vue'; +import UploadItem from '@/components/UploadItem.vue'; +import FilePreviewDialog from '@/components/dialogs/FilePreviewDialog.vue'; -const v1AppStore = useV1AppStore(); +const appStore = useAppStore(); const obStore = useObjectBrowserStore(); const bucketsStore = useBucketsStore(); const projectsStore = useProjectsStore(); @@ -125,7 +125,7 @@ const previewDialog = ref(false); /** * Indicates whether objects upload modal should be shown. */ -const isObjectsUploadModal = computed(() => v1AppStore.state.isUploadingModal); +const isObjectsUploadModal = computed(() => appStore.state.isUploadingModal); /** * Returns header's status label. @@ -277,7 +277,7 @@ function startInterval(): void { function closeDialog(): void { isExpanded.value = false; - v1AppStore.setUploadingModal(false); + appStore.setUploadingModal(false); obStore.clearUploading(); } @@ -325,4 +325,4 @@ onMounted(() => { overflow-y: auto; max-height: 200px; } - \ No newline at end of file + diff --git a/web/satellite/vuetify-poc/src/components/BrowserTableComponent.vue b/web/satellite/src/components/BrowserTableComponent.vue similarity index 97% rename from web/satellite/vuetify-poc/src/components/BrowserTableComponent.vue rename to web/satellite/src/components/BrowserTableComponent.vue index d8bb66210ed9..6996a63a6992 100644 --- a/web/satellite/vuetify-poc/src/components/BrowserTableComponent.vue +++ b/web/satellite/src/components/BrowserTableComponent.vue @@ -175,13 +175,13 @@ import { useAppStore } from '@/store/modules/appStore'; import { BrowserObjectTypeInfo, BrowserObjectWrapper, EXTENSION_INFOS, FILE_INFO, FOLDER_INFO } from '@/types/browser'; import { useAnalyticsStore } from '@/store/modules/analyticsStore'; import { useUsersStore } from '@/store/modules/usersStore'; -import { ROUTES } from '@poc/router'; +import { ROUTES } from '@/router'; -import BrowserRowActions from '@poc/components/BrowserRowActions.vue'; -import FilePreviewDialog from '@poc/components/dialogs/FilePreviewDialog.vue'; -import DeleteFileDialog from '@poc/components/dialogs/DeleteFileDialog.vue'; -import ShareDialog from '@poc/components/dialogs/ShareDialog.vue'; -import IconTrash from '@poc/components/icons/IconTrash.vue'; +import BrowserRowActions from '@/components/BrowserRowActions.vue'; +import FilePreviewDialog from '@/components/dialogs/FilePreviewDialog.vue'; +import DeleteFileDialog from '@/components/dialogs/DeleteFileDialog.vue'; +import ShareDialog from '@/components/dialogs/ShareDialog.vue'; +import IconTrash from '@/components/icons/IconTrash.vue'; type SortKey = 'name' | 'type' | 'size' | 'date'; diff --git a/web/satellite/vuetify-poc/src/components/BucketsDataTable.vue b/web/satellite/src/components/BucketsDataTable.vue similarity index 95% rename from web/satellite/vuetify-poc/src/components/BucketsDataTable.vue rename to web/satellite/src/components/BucketsDataTable.vue index 8a0b63516e58..8bc46c42a666 100644 --- a/web/satellite/vuetify-poc/src/components/BucketsDataTable.vue +++ b/web/satellite/src/components/BucketsDataTable.vue @@ -158,21 +158,20 @@ import { useNotify } from '@/utils/hooks'; import { AnalyticsErrorEventSource } from '@/utils/constants/analyticsEventNames'; import { useProjectsStore } from '@/store/modules/projectsStore'; import { DEFAULT_PAGE_LIMIT } from '@/types/pagination'; -import { tableSizeOptions } from '@/types/common'; +import { tableSizeOptions, MAX_SEARCH_VALUE_LENGTH } from '@/types/common'; import { RouteConfig } from '@/types/router'; import { EdgeCredentials } from '@/types/accessGrants'; import { useAnalyticsStore } from '@/store/modules/analyticsStore'; -import { MAX_SEARCH_VALUE_LENGTH } from '@poc/types/common'; -import { ROUTES } from '@poc/router'; - -import IconTrash from '@poc/components/icons/IconTrash.vue'; -import IconShare from '@poc/components/icons/IconShare.vue'; -import IconBucket from '@poc/components/icons/IconBucket.vue'; -import DeleteBucketDialog from '@poc/components/dialogs/DeleteBucketDialog.vue'; -import EnterBucketPassphraseDialog from '@poc/components/dialogs/EnterBucketPassphraseDialog.vue'; -import ShareDialog from '@poc/components/dialogs/ShareDialog.vue'; -import BucketDetailsDialog from '@poc/components/dialogs/BucketDetailsDialog.vue'; -import IconVersioning from '@poc/components/icons/IconVersioning.vue'; +import { ROUTES } from '@/router'; + +import IconTrash from '@/components/icons/IconTrash.vue'; +import IconShare from '@/components/icons/IconShare.vue'; +import IconBucket from '@/components/icons/IconBucket.vue'; +import DeleteBucketDialog from '@/components/dialogs/DeleteBucketDialog.vue'; +import EnterBucketPassphraseDialog from '@/components/dialogs/EnterBucketPassphraseDialog.vue'; +import ShareDialog from '@/components/dialogs/ShareDialog.vue'; +import BucketDetailsDialog from '@/components/dialogs/BucketDetailsDialog.vue'; +import IconVersioning from '@/components/icons/IconVersioning.vue'; const analyticsStore = useAnalyticsStore(); const bucketsStore = useBucketsStore(); diff --git a/web/satellite/vuetify-poc/src/components/CardStatsComponent.vue b/web/satellite/src/components/CardStatsComponent.vue similarity index 78% rename from web/satellite/vuetify-poc/src/components/CardStatsComponent.vue rename to web/satellite/src/components/CardStatsComponent.vue index c0f466c8290a..59265e0ee86a 100644 --- a/web/satellite/vuetify-poc/src/components/CardStatsComponent.vue +++ b/web/satellite/src/components/CardStatsComponent.vue @@ -19,12 +19,12 @@ import { computed, Component } from 'vue'; import { VCard, VCardText, VChip, VCardTitle } from 'vuetify/components'; -import IconFile from '@poc/components/icons/IconFile.vue'; -import IconGlobe from '@poc/components/icons/IconGlobe.vue'; -import IconBucket from '@poc/components/icons/IconBucket.vue'; -import IconAccess from '@poc/components/icons/IconAccess.vue'; -import IconTeam from '@poc/components/icons/IconTeam.vue'; -import IconCard from '@poc/components/icons/IconCard.vue'; +import IconFile from '@/components/icons/IconFile.vue'; +import IconGlobe from '@/components/icons/IconGlobe.vue'; +import IconBucket from '@/components/icons/IconBucket.vue'; +import IconAccess from '@/components/icons/IconAccess.vue'; +import IconTeam from '@/components/icons/IconTeam.vue'; +import IconCard from '@/components/icons/IconCard.vue'; const props = defineProps<{ title: string; diff --git a/web/satellite/vuetify-poc/src/components/CreditCardComponent.vue b/web/satellite/src/components/CreditCardComponent.vue similarity index 91% rename from web/satellite/vuetify-poc/src/components/CreditCardComponent.vue rename to web/satellite/src/components/CreditCardComponent.vue index 4b5c01db5f7f..938c4756300f 100644 --- a/web/satellite/vuetify-poc/src/components/CreditCardComponent.vue +++ b/web/satellite/src/components/CreditCardComponent.vue @@ -32,8 +32,8 @@ import { VBtn, VCard, VCardText, VChip, VDivider, VRow } from 'vuetify/component import { useUsersStore } from '@/store/modules/usersStore'; import { CreditCard } from '@/types/payments'; -import RemoveCreditCardDialog from '@poc/components/dialogs/RemoveCreditCardDialog.vue'; -import EditDefaultCreditCardDialog from '@poc/components/dialogs/EditDefaultCreditCardDialog.vue'; +import RemoveCreditCardDialog from '@/components/dialogs/RemoveCreditCardDialog.vue'; +import EditDefaultCreditCardDialog from '@/components/dialogs/EditDefaultCreditCardDialog.vue'; const usersStore = useUsersStore(); diff --git a/web/satellite/vuetify-poc/src/components/ErrorPage.vue b/web/satellite/src/components/ErrorPage.vue similarity index 94% rename from web/satellite/vuetify-poc/src/components/ErrorPage.vue rename to web/satellite/src/components/ErrorPage.vue index b5ddd8e4184f..6123f51b433c 100644 --- a/web/satellite/vuetify-poc/src/components/ErrorPage.vue +++ b/web/satellite/src/components/ErrorPage.vue @@ -7,7 +7,7 @@