Skip to content

Commit

Permalink
web/satellite: merge vuetify-poc with root folder
Browse files Browse the repository at this point in the history
Merged vuetify-poc into web/satellite folder as it is default app now.
Cleaned up unused v2 icons.

Issue:
#6724

Change-Id: I85e058de91d31cd24d48ab39eb41d8e92177faf0
  • Loading branch information
VitaliiShpital committed Feb 4, 2024
1 parent ae52fb7 commit a3f8e7a
Show file tree
Hide file tree
Showing 311 changed files with 658 additions and 945 deletions.
4 changes: 2 additions & 2 deletions web/satellite/.eslintrc.cjs
Expand Up @@ -46,7 +46,7 @@ module.exports = {
},
{
'group': 'internal',
'pattern': '@?(poc)/{components,views,layouts}/**',
'pattern': '@/{components,views,layouts}/**',
'position': 'after',
},
{
Expand All @@ -56,7 +56,7 @@ module.exports = {
},
{
'group': 'internal',
'pattern': '@poc/assets/**',
'pattern': '@/assets/**',
'position': 'after',
},
],
Expand Down
2 changes: 1 addition & 1 deletion web/satellite/index.html
Expand Up @@ -9,6 +9,6 @@
</head>
<body>
<div id="app"></div>
<script type="module" src="/vuetify-poc/src/main.ts"></script>
<script type="module" src="/src/main.ts"></script>
</body>
</html>
Expand Up @@ -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';
Expand All @@ -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();
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Expand Up @@ -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();
Expand Down
Expand Up @@ -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<void>;
Expand Down Expand Up @@ -121,4 +121,4 @@ async function addCardToDB(res: string): Promise<void> {
notify.notifyError(error, AnalyticsErrorEventSource.BILLING_PAYMENT_METHODS_TAB);
}
}
</script>
</script>
Expand Up @@ -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[],
Expand Down
Expand Up @@ -4,7 +4,7 @@
<template>
<v-breadcrumbs :items="items" active-class="font-weight-bold" class="pa-0">
<template #divider>
<img src="@poc/assets/icon-right.svg" alt="Breadcrumbs separator" width="10">
<img src="@/assets/icon-right.svg" alt="Breadcrumbs separator" width="10">
</template>
</v-breadcrumbs>
</template>
Expand All @@ -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();
Expand Down
Expand Up @@ -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';
Expand Down
Expand Up @@ -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();
Expand Down
Expand Up @@ -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();
Expand All @@ -125,7 +125,7 @@ const previewDialog = ref<boolean>(false);
/**
* Indicates whether objects upload modal should be shown.
*/
const isObjectsUploadModal = computed<boolean>(() => v1AppStore.state.isUploadingModal);
const isObjectsUploadModal = computed<boolean>(() => appStore.state.isUploadingModal);
/**
* Returns header's status label.
Expand Down Expand Up @@ -277,7 +277,7 @@ function startInterval(): void {
function closeDialog(): void {
isExpanded.value = false;
v1AppStore.setUploadingModal(false);
appStore.setUploadingModal(false);
obStore.clearUploading();
}
Expand Down Expand Up @@ -325,4 +325,4 @@ onMounted(() => {
overflow-y: auto;
max-height: 200px;
}
</style>
</style>
Expand Up @@ -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';
Expand Down
Expand Up @@ -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();
Expand Down
Expand Up @@ -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;
Expand Down
Expand Up @@ -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();
Expand Down
Expand Up @@ -7,15 +7,15 @@
<v-img
v-if="theme.global.current.value.dark"
class="error-area__logo-wrapper__logo"
src="@poc/assets/logo-dark.svg"
src="@/assets/logo-dark.svg"
width="140"
alt="Storj Logo"
@click="goToHomepage"
/>
<v-img
v-else
class="error-area__logo-wrapper__logo"
src="@poc/assets/logo.svg"
src="@/assets/logo.svg"
width="140"
alt="Storj Logo"
@click="goToHomepage"
Expand All @@ -39,7 +39,7 @@ import { useRoute, useRouter } from 'vue-router';
import { VBtn, VImg } from 'vuetify/components';
import { useTheme } from 'vuetify';
import { useAppStore } from '@poc/store/appStore';
import { useAppStore } from '@/store/modules/appStore';
import { useConfigStore } from '@/store/modules/configStore';
const appStore = useAppStore();
Expand Down Expand Up @@ -118,7 +118,7 @@ onMounted(() => {
content: '';
position: fixed;
inset: 0;
background: url('../../../static/images/errors/world.svg') no-repeat center;
background: url('../assets/icon-world.svg') no-repeat center;
background-size: auto 75%;
z-index: -1;
opacity: 0.1;
Expand Down
Expand Up @@ -67,10 +67,9 @@ import { useAnalyticsStore } from '@/store/modules/analyticsStore';
import { useNotify } from '@/utils/hooks';
import { BrowserObject, PreviewCache, useObjectBrowserStore } from '@/store/modules/objectBrowserStore';
import { useBucketsStore } from '@/store/modules/bucketsStore';
import { Size } from '@/utils/bytesSize';
import { EXTENSION_PREVIEW_TYPES, PreviewType } from '@/types/browser';
import BrowserRowActions from '@poc/components/BrowserRowActions.vue';
import BrowserRowActions from '@/components/BrowserRowActions.vue';
type BrowserObjectTypeInfo = {
title: string;
Expand Down Expand Up @@ -148,14 +147,6 @@ const previewType = computed<PreviewType>(() => {
return PreviewType.None;
});
/**
* Returns the string form of the file's size.
*/
function getFormattedSize(file: BrowserObject): string {
const size = new Size(file.Size);
return `${size.formattedBytes} ${size.label}`;
}
/**
* Returns the string form of the file's last modified date.
*/
Expand Down
Expand Up @@ -30,7 +30,7 @@ const props = defineProps<{
tooltipDisabled?: boolean;
}>();
const copiedTimeout = ref<number>();
const copiedTimeout = ref<NodeJS.Timeout>();
const justCopied = computed<boolean>(() => copiedTimeout.value !== undefined);
const isTooltip = (() => {
Expand Down
Expand Up @@ -47,10 +47,10 @@ import { useAnalyticsStore } from '@/store/modules/analyticsStore';
import { humanizeArray } from '@/utils/strings';
import { Memory } from '@/utils/bytesSize';
import { DEFAULT_PROJECT_LIMITS, useProjectsStore } from '@/store/modules/projectsStore';
import { useAppStore } from '@poc/store/appStore';
import { ROUTES } from '@poc/router';
import { useAppStore } from '@/store/modules/appStore';
import { ROUTES } from '@/router';
import EditProjectLimitDialog from '@poc/components/dialogs/EditProjectLimitDialog.vue';
import EditProjectLimitDialog from '@/components/dialogs/EditProjectLimitDialog.vue';
type BannerText = {
title: string;
Expand Down
Expand Up @@ -16,7 +16,7 @@ import { computed, ref, watch } from 'vue';
import { User } from '@/types/users';
import { useUsersStore } from '@/store/modules/usersStore';
import PartnerUpgradeNoticeBanner from '@poc/components/PartnerUpgradeNoticeBanner.vue';
import PartnerUpgradeNoticeBanner from '@/components/PartnerUpgradeNoticeBanner.vue';
const usersStore = useUsersStore();
Expand Down
Expand Up @@ -47,7 +47,7 @@ import { useConfigStore } from '@/store/modules/configStore';
import { PaymentsHttpApi } from '@/api/payments';
import { useLoading } from '@/composables/useLoading';
import UpgradeAccountDialog from '@poc/components/dialogs/upgradeAccountFlow/UpgradeAccountDialog.vue';
import UpgradeAccountDialog from '@/components/dialogs/upgradeAccountFlow/UpgradeAccountDialog.vue';
const payments: PaymentsHttpApi = new PaymentsHttpApi();
Expand Down Expand Up @@ -117,7 +117,7 @@ onBeforeMount(() => {
let config;
try {
config = (await import('@/components/account/billing/pricingPlans/pricingPlanConfig.json')).default;
config = (await import('@/configs/pricingPlanConfig.json')).default;
} catch {
model.value = false;
return;
Expand Down
Expand Up @@ -65,7 +65,6 @@ import { computed } from 'vue';
import {
VCard,
VCardItem,
VCardText,
VProgressLinear,
VCheckbox,
} from 'vuetify/components';
Expand Down

0 comments on commit a3f8e7a

Please sign in to comment.