From 2c3266f3bd8dd04ef21e19949de5538c594dc7e8 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Tue, 28 Jun 2022 13:02:04 +0530 Subject: [PATCH] reorganise upload components --- src/components/{pages/gallery => Upload}/UploadButton.tsx | 0 src/components/{ => Upload}/UploadProgress/dialog.tsx | 0 src/components/{ => Upload}/UploadProgress/footer.tsx | 0 src/components/{ => Upload}/UploadProgress/header.tsx | 0 .../{ => Upload}/UploadProgress/inProgressSection.tsx | 0 src/components/{ => Upload}/UploadProgress/index.tsx | 0 src/components/{ => Upload}/UploadProgress/minimized.tsx | 0 .../{ => Upload}/UploadProgress/progressBar.tsx | 0 .../{ => Upload}/UploadProgress/resultSection.tsx | 0 src/components/{ => Upload}/UploadProgress/section.tsx | 0 .../{ => Upload}/UploadProgress/styledComponents.tsx | 0 src/components/{ => Upload}/UploadProgress/title.tsx | 0 .../gallery => Upload}/UploadStrategyChoiceModal.tsx | 0 src/components/{ => Upload}/UploadTypeSelector/index.tsx | 0 src/components/{ => Upload}/UploadTypeSelector/option.tsx | 0 .../{pages/gallery/Upload.tsx => Upload/Uploader.tsx} | 8 ++++---- src/components/pages/gallery/Navbar.tsx | 2 +- src/pages/gallery/index.tsx | 4 ++-- src/services/importService.ts | 2 +- 19 files changed, 8 insertions(+), 8 deletions(-) rename src/components/{pages/gallery => Upload}/UploadButton.tsx (100%) rename src/components/{ => Upload}/UploadProgress/dialog.tsx (100%) rename src/components/{ => Upload}/UploadProgress/footer.tsx (100%) rename src/components/{ => Upload}/UploadProgress/header.tsx (100%) rename src/components/{ => Upload}/UploadProgress/inProgressSection.tsx (100%) rename src/components/{ => Upload}/UploadProgress/index.tsx (100%) rename src/components/{ => Upload}/UploadProgress/minimized.tsx (100%) rename src/components/{ => Upload}/UploadProgress/progressBar.tsx (100%) rename src/components/{ => Upload}/UploadProgress/resultSection.tsx (100%) rename src/components/{ => Upload}/UploadProgress/section.tsx (100%) rename src/components/{ => Upload}/UploadProgress/styledComponents.tsx (100%) rename src/components/{ => Upload}/UploadProgress/title.tsx (100%) rename src/components/{pages/gallery => Upload}/UploadStrategyChoiceModal.tsx (100%) rename src/components/{ => Upload}/UploadTypeSelector/index.tsx (100%) rename src/components/{ => Upload}/UploadTypeSelector/option.tsx (100%) rename src/components/{pages/gallery/Upload.tsx => Upload/Uploader.tsx} (98%) diff --git a/src/components/pages/gallery/UploadButton.tsx b/src/components/Upload/UploadButton.tsx similarity index 100% rename from src/components/pages/gallery/UploadButton.tsx rename to src/components/Upload/UploadButton.tsx diff --git a/src/components/UploadProgress/dialog.tsx b/src/components/Upload/UploadProgress/dialog.tsx similarity index 100% rename from src/components/UploadProgress/dialog.tsx rename to src/components/Upload/UploadProgress/dialog.tsx diff --git a/src/components/UploadProgress/footer.tsx b/src/components/Upload/UploadProgress/footer.tsx similarity index 100% rename from src/components/UploadProgress/footer.tsx rename to src/components/Upload/UploadProgress/footer.tsx diff --git a/src/components/UploadProgress/header.tsx b/src/components/Upload/UploadProgress/header.tsx similarity index 100% rename from src/components/UploadProgress/header.tsx rename to src/components/Upload/UploadProgress/header.tsx diff --git a/src/components/UploadProgress/inProgressSection.tsx b/src/components/Upload/UploadProgress/inProgressSection.tsx similarity index 100% rename from src/components/UploadProgress/inProgressSection.tsx rename to src/components/Upload/UploadProgress/inProgressSection.tsx diff --git a/src/components/UploadProgress/index.tsx b/src/components/Upload/UploadProgress/index.tsx similarity index 100% rename from src/components/UploadProgress/index.tsx rename to src/components/Upload/UploadProgress/index.tsx diff --git a/src/components/UploadProgress/minimized.tsx b/src/components/Upload/UploadProgress/minimized.tsx similarity index 100% rename from src/components/UploadProgress/minimized.tsx rename to src/components/Upload/UploadProgress/minimized.tsx diff --git a/src/components/UploadProgress/progressBar.tsx b/src/components/Upload/UploadProgress/progressBar.tsx similarity index 100% rename from src/components/UploadProgress/progressBar.tsx rename to src/components/Upload/UploadProgress/progressBar.tsx diff --git a/src/components/UploadProgress/resultSection.tsx b/src/components/Upload/UploadProgress/resultSection.tsx similarity index 100% rename from src/components/UploadProgress/resultSection.tsx rename to src/components/Upload/UploadProgress/resultSection.tsx diff --git a/src/components/UploadProgress/section.tsx b/src/components/Upload/UploadProgress/section.tsx similarity index 100% rename from src/components/UploadProgress/section.tsx rename to src/components/Upload/UploadProgress/section.tsx diff --git a/src/components/UploadProgress/styledComponents.tsx b/src/components/Upload/UploadProgress/styledComponents.tsx similarity index 100% rename from src/components/UploadProgress/styledComponents.tsx rename to src/components/Upload/UploadProgress/styledComponents.tsx diff --git a/src/components/UploadProgress/title.tsx b/src/components/Upload/UploadProgress/title.tsx similarity index 100% rename from src/components/UploadProgress/title.tsx rename to src/components/Upload/UploadProgress/title.tsx diff --git a/src/components/pages/gallery/UploadStrategyChoiceModal.tsx b/src/components/Upload/UploadStrategyChoiceModal.tsx similarity index 100% rename from src/components/pages/gallery/UploadStrategyChoiceModal.tsx rename to src/components/Upload/UploadStrategyChoiceModal.tsx diff --git a/src/components/UploadTypeSelector/index.tsx b/src/components/Upload/UploadTypeSelector/index.tsx similarity index 100% rename from src/components/UploadTypeSelector/index.tsx rename to src/components/Upload/UploadTypeSelector/index.tsx diff --git a/src/components/UploadTypeSelector/option.tsx b/src/components/Upload/UploadTypeSelector/option.tsx similarity index 100% rename from src/components/UploadTypeSelector/option.tsx rename to src/components/Upload/UploadTypeSelector/option.tsx diff --git a/src/components/pages/gallery/Upload.tsx b/src/components/Upload/Uploader.tsx similarity index 98% rename from src/components/pages/gallery/Upload.tsx rename to src/components/Upload/Uploader.tsx index f0a3fb9b9..3b206f94d 100644 --- a/src/components/pages/gallery/Upload.tsx +++ b/src/components/Upload/Uploader.tsx @@ -2,10 +2,10 @@ import React, { useContext, useEffect, useRef, useState } from 'react'; import { syncCollections, createAlbum } from 'services/collectionService'; import constants from 'utils/strings/constants'; -import UploadProgress from '../../UploadProgress'; +import UploadProgress from './UploadProgress'; import UploadStrategyChoiceModal from './UploadStrategyChoiceModal'; -import { SetCollectionNamerAttributes } from '../../Collections/CollectionNamer'; +import { SetCollectionNamerAttributes } from '../Collections/CollectionNamer'; import { SetCollectionSelectorAttributes } from 'types/gallery'; import { GalleryContext } from 'pages/gallery'; import { AppContext } from 'pages/_app'; @@ -19,7 +19,6 @@ import { CustomError } from 'utils/error'; import { Collection } from 'types/collection'; import { SetLoading, SetFiles } from 'types/gallery'; import { ElectronFile, FileWithCollection } from 'types/upload'; -import UploadTypeSelector from '../../UploadTypeSelector'; import Router from 'next/router'; import { isCanvasBlocked } from 'utils/upload/isCanvasBlocked'; import { downloadApp } from 'utils/common'; @@ -34,6 +33,7 @@ import { import { UPLOAD_STAGES } from 'constants/upload'; import importService from 'services/importService'; import { getDownloadAppMessage } from 'utils/ui'; +import UploadTypeSelector from './UploadTypeSelector'; const FIRST_ALBUM_NAME = 'My First Album'; @@ -80,7 +80,7 @@ const NULL_ANALYSIS_RESULT = { multipleFolders: false, }; -export default function Upload(props: Props) { +export default function Uploader(props: Props) { const [uploadProgressView, setUploadProgressView] = useState(false); const [uploadStage, setUploadStage] = useState(); const [uploadFileNames, setUploadFileNames] = useState(); diff --git a/src/components/pages/gallery/Navbar.tsx b/src/components/pages/gallery/Navbar.tsx index 9ffb2f9c7..1e83db503 100644 --- a/src/components/pages/gallery/Navbar.tsx +++ b/src/components/pages/gallery/Navbar.tsx @@ -1,7 +1,6 @@ import React from 'react'; import NavbarBase from 'components/Navbar/base'; import SidebarToggler from 'components/Navbar/SidebarToggler'; -import UploadButton from './UploadButton'; import { getNonTrashedUniqueUserFiles } from 'utils/file'; import SearchBar from 'components/Search/SearchBar'; import { FluidContainer } from 'components/Container'; @@ -9,6 +8,7 @@ import { EnteLogo } from 'components/EnteLogo'; import { Collection } from 'types/collection'; import { EnteFile } from 'types/file'; import { UpdateSearch } from 'types/search'; +import UploadButton from 'components/Upload/UploadButton'; interface Iprops { openSidebar: () => void; diff --git a/src/pages/gallery/index.tsx b/src/pages/gallery/index.tsx index 652ba1186..26997befc 100644 --- a/src/pages/gallery/index.tsx +++ b/src/pages/gallery/index.tsx @@ -57,7 +57,7 @@ import CollectionNamer, { CollectionNamerAttributes, } from 'components/Collections/CollectionNamer'; import PlanSelector from 'components/pages/gallery/PlanSelector'; -import Upload from 'components/pages/gallery/Upload'; +import Uploader from 'components/Upload/Uploader'; import { ALL_SECTION, ARCHIVE_SECTION, @@ -692,7 +692,7 @@ export default function Gallery() { setPhotoListHeader={setPhotoListHeader} /> -