moved uploadService to upload sub folder

src/components/pages/gallery/Upload.tsx

@@ -1,5 +1,5 @@
 import React, { useContext, useEffect, useState } from 'react';
-import UploadService, { FileWithCollection, UPLOAD_STAGES } from 'services/uploadService';
+import UploadService, { FileWithCollection, UPLOAD_STAGES } from 'services/upload/uploadService';
 import { createAlbum } from 'services/collectionService';
 import { getLocalFiles } from 'services/fileService';
 import constants from 'utils/strings/constants';

src/components/pages/gallery/UploadProgress.tsx

@@ -3,7 +3,7 @@ import {
     Alert, Button, Modal, ProgressBar,
 } from 'react-bootstrap';
 import { FileRejection } from 'react-dropzone';
-import { UPLOAD_STAGES, FileUploadErrorCode } from 'services/uploadService';
+import { UPLOAD_STAGES, FileUploadErrorCode } from 'services/upload/uploadService';
 import constants from 'utils/strings/constants';
 
 interface Props {

src/pages/change-password/index.tsx

@@ -2,7 +2,7 @@ import React, { useState, useEffect, useContext } from 'react';
 import constants from 'utils/strings/constants';
 import { getData, LS_KEYS, setData } from 'utils/storage/localStorage';
 import { useRouter } from 'next/router';
-import { B64EncryptionResult } from 'services/uploadService';
+import { B64EncryptionResult } from 'services/upload/uploadService';
 import CryptoWorker, {
     setSessionKeys,
     generateAndSaveIntermediateKeyAttributes,

src/pages/two-factor/recover/index.tsx

@@ -9,7 +9,7 @@ import Container from 'components/Container';
 import { Card, Button } from 'react-bootstrap';
 import LogoImg from 'components/LogoImg';
 import { logError } from 'utils/sentry';
-import { B64EncryptionResult } from 'services/uploadService';
+import { B64EncryptionResult } from 'services/upload/uploadService';
 import { recoverTwoFactor, removeTwoFactor } from 'services/userService';
 
 export default function Recover() {

src/pages/two-factor/setup/index.tsx

@@ -10,7 +10,7 @@ import constants from 'utils/strings/constants';
 import Container from 'components/Container';
 import { useRouter } from 'next/router';
 import VerifyTwoFactor from 'components/VerifyTwoFactor';
-import { B64EncryptionResult } from 'services/uploadService';
+import { B64EncryptionResult } from 'services/upload/uploadService';
 import { encryptWithRecoveryKey } from 'utils/crypto';
 import { setData, LS_KEYS, getData } from 'utils/storage/localStorage';
 import { AppContext } from 'pages/_app';

src/services/collectionService.ts

@@ -7,7 +7,7 @@ import CryptoWorker from 'utils/crypto';
 import { SetDialogMessage } from 'components/MessageDialog';
 import constants from 'utils/strings/constants';
 import { getPublicKey, User } from './userService';
-import { B64EncryptionResult } from './uploadService';
+import { B64EncryptionResult } from './upload/uploadService';
 import HTTPService from './HTTPService';
 import { File } from './fileService';
 import { logError } from 'utils/sentry';

src/services/fileService.ts

@@ -2,7 +2,7 @@ import { getEndpoint } from 'utils/common/apiUtil';
 import localForage from 'utils/storage/localForage';
 
 import { getToken } from 'utils/common/key';
-import { DataStream, MetadataObject } from './uploadService';
+import { DataStream, MetadataObject } from './upload/uploadService';
 import { Collection } from './collectionService';
 import HTTPService from './HTTPService';
 import { logError } from 'utils/sentry';

src/services/upload/uploadService.ts

@@ -1,8 +1,8 @@
 import { getEndpoint } from 'utils/common/apiUtil';
-import HTTPService from './HTTPService';
+import HTTPService from '../HTTPService';
 import EXIF from 'exif-js';
-import { File, fileAttribute } from './fileService';
-import { Collection } from './collectionService';
+import { File, fileAttribute } from '../fileService';
+import { Collection } from '../collectionService';
 import { FILE_TYPE, SetFiles } from 'pages/gallery';
 import { retryAsyncFunction, sleep } from 'utils/common';
 import {

src/services/userService.ts

@@ -6,7 +6,7 @@ import { clearData } from 'utils/storage/localStorage';
 import localForage from 'utils/storage/localForage';
 import { getToken } from 'utils/common/key';
 import HTTPService from './HTTPService';
-import { B64EncryptionResult } from './uploadService';
+import { B64EncryptionResult } from './upload/uploadService';
 import { logError } from 'utils/sentry';
 import { Subscription } from './billingService';
 

src/utils/common/key.ts

@@ -1,4 +1,4 @@
-import { B64EncryptionResult } from 'services/uploadService';
+import { B64EncryptionResult } from 'services/upload/uploadService';
 import CryptoWorker from 'utils/crypto';
 import { getData, LS_KEYS } from 'utils/storage/localStorage';
 import { getKey, SESSION_KEYS } from 'utils/storage/sessionStorage';

src/utils/crypto/index.ts

@@ -1,5 +1,5 @@
 import { KEK } from 'pages/generate';
-import { B64EncryptionResult } from 'services/uploadService';
+import { B64EncryptionResult } from 'services/upload/uploadService';
 import { KeyAttributes } from 'types';
 import * as Comlink from 'comlink';
 import { runningInBrowser } from 'utils/common';

src/utils/export/index.ts

@@ -1,6 +1,6 @@
 import { ExportRecord } from 'services/exportService';
 import { File } from 'services/fileService';
-import { MetadataObject } from 'services/uploadService';
+import { MetadataObject } from 'services/upload/uploadService';
 import { formatDate } from 'utils/file';