reorganise upload components
This commit is contained in:
parent
2931b9260a
commit
2c3266f3bd
|
@ -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<UPLOAD_STAGES>();
|
||||
const [uploadFileNames, setUploadFileNames] = useState<UploadFileNames>();
|
|
@ -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;
|
||||
|
|
|
@ -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}
|
||||
/>
|
||||
|
||||
<Upload
|
||||
<Uploader
|
||||
syncWithRemote={syncWithRemote}
|
||||
showCollectionSelector={setCollectionSelectorView.bind(
|
||||
null,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { UPLOAD_TYPE } from 'components/pages/gallery/Upload';
|
||||
import { UPLOAD_TYPE } from 'components/Upload/Uploader';
|
||||
import { Collection } from 'types/collection';
|
||||
import { ElectronFile, FileWithCollection } from 'types/upload';
|
||||
import { runningInBrowser } from 'utils/common';
|
||||
|
|
Loading…
Reference in a new issue