diff --git a/src/components/ExportInProgress.tsx b/src/components/ExportInProgress.tsx
index 0e87bc290..c27632418 100644
--- a/src/components/ExportInProgress.tsx
+++ b/src/components/ExportInProgress.tsx
@@ -1,9 +1,16 @@
import React from 'react';
-import { Button, ProgressBar } from 'react-bootstrap';
import { ExportProgress } from 'types/export';
-import { styled } from '@mui/material';
+import {
+ Box,
+ Button,
+ DialogActions,
+ DialogContent,
+ styled,
+} from '@mui/material';
import constants from 'utils/strings/constants';
import { ExportStage } from 'constants/export';
+import VerticallyCentered, { FlexWrapper } from './Container';
+import { ProgressBar } from 'react-bootstrap';
export const ComfySpan = styled('span')`
word-spacing: 1rem;
@@ -11,10 +18,6 @@ export const ComfySpan = styled('span')`
`;
interface Props {
- show: boolean;
- onHide: () => void;
- exportFolder: string;
- exportSize: string;
exportStage: ExportStage;
exportProgress: ExportProgress;
resumeExport: () => void;
@@ -25,66 +28,59 @@ interface Props {
export default function ExportInProgress(props: Props) {
return (
<>
-
-
-
- {' '}
- {props.exportProgress.current} /{' '}
- {props.exportProgress.total}{' '}
- {' '}
-
- {' '}
- files exported{' '}
- {props.exportStage === ExportStage.PAUSED && `(paused)`}
-
-
-
-
- {props.exportStage === ExportStage.PAUSED ? (
-
- ) : (
-
- )}
-
+
+
+
+
+ {' '}
+ {props.exportProgress.current} /{' '}
+ {props.exportProgress.total}{' '}
+ {' '}
+
+ {' '}
+ files exported{' '}
+ {props.exportStage === ExportStage.PAUSED &&
+ `(paused)`}
+
+
+
+
+
+
+
+
+ {props.exportStage === ExportStage.PAUSED ? (
-
-
+ ) : (
+
+ )}
+
+
>
);
}
diff --git a/src/components/ExportInit.tsx b/src/components/ExportInit.tsx
index 37f3a25ea..3c8757c45 100644
--- a/src/components/ExportInit.tsx
+++ b/src/components/ExportInit.tsx
@@ -1,22 +1,18 @@
-import { Button, DialogActions } from '@mui/material';
+import { Button, DialogActions, DialogContent } from '@mui/material';
import React from 'react';
import constants from 'utils/strings/constants';
interface Props {
- show: boolean;
- onHide: () => void;
- updateExportFolder: (newFolder: string) => void;
- exportFolder: string;
startExport: () => void;
- exportSize: string;
- selectExportDirectory: () => void;
}
-export default function ExportInit(props: Props) {
+export default function ExportInit({ startExport }: Props) {
return (
-
-
-
+
+
+
+
+
);
}
diff --git a/src/components/ExportModal.tsx b/src/components/ExportModal.tsx
index 9d7d3cdb5..7a94c0ee2 100644
--- a/src/components/ExportModal.tsx
+++ b/src/components/ExportModal.tsx
@@ -299,23 +299,12 @@ export default function ExportModal(props: Props) {
const ExportDynamicContent = () => {
switch (exportStage) {
case ExportStage.INIT:
- return (
-
- );
+ return ;
+
case ExportStage.INPROGRESS:
case ExportStage.PAUSED:
return (
-
+
-
-
+
+
);
}