From 60583c1496aeaf366087bff550da8e9288ff33cf Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Fri, 14 Aug 2020 01:25:56 +0300
Subject: refactor: add useS3Preupload hook

---
 src/containers/PollCreation/PollCreation.tsx | 46 ++++++++++++----------------
 1 file changed, 20 insertions(+), 26 deletions(-)

(limited to 'src/containers/PollCreation')

diff --git a/src/containers/PollCreation/PollCreation.tsx b/src/containers/PollCreation/PollCreation.tsx
index 64ab7fd..e613afd 100644
--- a/src/containers/PollCreation/PollCreation.tsx
+++ b/src/containers/PollCreation/PollCreation.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { useHistory } from 'react-router-dom';
 import { makeStyles } from '@material-ui/core/styles';
 import {
@@ -8,13 +8,14 @@ import {
   Container
 } from '@material-ui/core';
 import { useSnackbar } from 'notistack';
-import axios from 'axios';
 
 import PollCreationImage from './PollCreationImage';
 import UserStrip from '../../components/UserStrip/UserStrip';
-import { get, post } from '../../requests';
+import { post } from '../../requests';
 import { useAuth } from '../../hooks/useAuth';
 import { useFeed } from '../../hooks/APIClient';
+import useS3Preupload from '../../hooks/useS3Preupload';
+
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -26,36 +27,29 @@ const useStyles = makeStyles(theme => ({
   }
 }));
 
+
 const PollCreation: React.FC = () => {
   const classes = useStyles();
   const history = useHistory();
-  const [left, setLeft] = useState<File | string>();
-  const [right, setRight] = useState<File | string>();
   const { enqueueSnackbar } = useSnackbar();
   const { user } = useAuth();
   const { mutate: updateFeed } = useFeed();
-
-  const readyToSubmit = left && right;
-
-  const uploadFile = (file: File): Promise<string> => {
-    const headers = { 'Content-Type': 'image/png' };
-    return get('/files')
-      .then(response => response.data)
-      .then(uploadUrl => axios.put(uploadUrl, file, { headers }))
-      .then(response => {
-        const { config: { url } } = response;
-        return url?.slice(0, url?.indexOf('?')) || '';
-      });
-  };
-
-  const resolveFile = async (file?: File | string): Promise<string> => {
-    if (file instanceof File) return uploadFile(file);
-    return file || '';
-  };
+  const {
+    setValue: setLeft,
+    progress: progressLeft,
+    resolve: resolveLeft,
+    isReady: isLeftReady
+  } = useS3Preupload();
+  const {
+    setValue: setRight,
+    progress: progressRight,
+    resolve: resolveRight,
+    isReady: isRightReady
+  } = useS3Preupload();
 
   const handleClick = async () => {
-    if (readyToSubmit) {
-      const [leftUrl, rightUrl] = await Promise.all([resolveFile(left), resolveFile(right)]);
+    if (isLeftReady && isRightReady) {
+      const [leftUrl, rightUrl] = await Promise.all([resolveLeft(), resolveRight()]);
 
       const contents = {
         left: { url: leftUrl },
@@ -84,7 +78,7 @@ const PollCreation: React.FC = () => {
         </div>
         <Button
           color="primary"
-          disabled={!readyToSubmit}
+          disabled={!(isLeftReady && isRightReady)}
           variant="contained"
           onClick={handleClick}
           fullWidth
-- 
cgit v1.2.3


From 88d3c411efbf5f6ac74fa67e38c154f1e53d4938 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Fri, 14 Aug 2020 02:24:18 +0300
Subject: feat: show upload progress

---
 src/containers/PollCreation/PollCreation.tsx      |  8 +++---
 src/containers/PollCreation/PollCreationImage.tsx | 34 +++++++++++++++++++----
 2 files changed, 33 insertions(+), 9 deletions(-)

(limited to 'src/containers/PollCreation')

diff --git a/src/containers/PollCreation/PollCreation.tsx b/src/containers/PollCreation/PollCreation.tsx
index e613afd..e350179 100644
--- a/src/containers/PollCreation/PollCreation.tsx
+++ b/src/containers/PollCreation/PollCreation.tsx
@@ -73,17 +73,17 @@ const PollCreation: React.FC = () => {
         {user && <UserStrip user={user} info="" />}
         <Divider />
         <div className={classes.images}>
-          <PollCreationImage callback={setLeft} />
-          <PollCreationImage callback={setRight} />
+          <PollCreationImage callback={setLeft} progress={progressLeft} />
+          <PollCreationImage callback={setRight} progress={progressRight} />
         </div>
         <Button
           color="primary"
-          disabled={!(isLeftReady && isRightReady)}
+          disabled={!(isLeftReady && isRightReady) || Boolean(progressLeft || progressRight)}
           variant="contained"
           onClick={handleClick}
           fullWidth
         >
-          Submit
+          {(progressLeft || progressRight) ? 'Waiting for upload' : 'Submit'}
         </Button>
       </Card>
     </Container>
diff --git a/src/containers/PollCreation/PollCreationImage.tsx b/src/containers/PollCreation/PollCreationImage.tsx
index 1200b11..d619a8e 100644
--- a/src/containers/PollCreation/PollCreationImage.tsx
+++ b/src/containers/PollCreation/PollCreationImage.tsx
@@ -3,15 +3,17 @@ import { makeStyles } from '@material-ui/core/styles';
 import {
   CardActionArea,
   CardMedia,
-  Typography
+  Typography,
+  CircularProgress
 } from '@material-ui/core';
-import ClearIcon from '@material-ui/icons/CancelOutlined';
+import { Check, CancelOutlined } from '@material-ui/icons';
 
 import AttachLink from '../../components/AttachLink/AttachLink';
 import FileUpload from '../../components/FileUpload/FileUpload';
 
 interface PropTypes {
   callback: (file?: File | string) => void;
+  progress?: number;
 }
 
 const useStyles = makeStyles({
@@ -32,11 +34,25 @@ const useStyles = makeStyles({
     display: 'flex',
     justifyContent: 'center',
     alignItems: 'center'
+  },
+  darkOverlay: {
+    backgroundColor: 'rgba(0, 0, 0, 0.45)',
+    color: 'white',
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    transitionDuration: '0.5s'
+  },
+  invisible: {
+    backgroundColor: 'rgba(0, 0, 0, 0)',
+  },
+  icon: {
+    color: 'white'
   }
 });
 
 
-const PollCreationImage: React.FC<PropTypes> = ({ callback }) => {
+const PollCreationImage: React.FC<PropTypes> = ({ callback, progress }) => {
   const classes = useStyles();
   const [url, setUrl] = useState<string>();
 
@@ -59,9 +75,17 @@ const PollCreationImage: React.FC<PropTypes> = ({ callback }) => {
   );
 
   const Media = (
-    <CardActionArea onClick={handleClear} className={classes.root}>
+    <CardActionArea onClick={handleClear} className={classes.root} disabled={Boolean(progress)}>
       <CardMedia image={url} className={classes.media}>
-        <ClearIcon className={classes.clearIcon} />
+        <div className={`${classes.media} ${classes.darkOverlay} ${progress === 100 && classes.invisible}`}>
+          {
+            progress
+            ? progress < 100
+              ? <CircularProgress variant="static" value={progress} className={classes.icon} />
+              : <Check className={classes.icon} fontSize="large" />
+            : <CancelOutlined className={classes.icon} fontSize="large" />
+          }
+        </div>
       </CardMedia>
     </CardActionArea>
   );
-- 
cgit v1.2.3


From fca54f49bb3541f726da1becffaa60197835ca68 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Fri, 14 Aug 2020 02:45:20 +0300
Subject: refactor: resolve eslint errors

---
 src/containers/PollCreation/ImageInput.tsx        | 96 +++++++++++++++++++++++
 src/containers/PollCreation/PollCreation.tsx      | 33 +++++---
 src/containers/PollCreation/PollCreationImage.tsx | 96 -----------------------
 src/containers/PollCreation/types.ts              |  7 --
 4 files changed, 116 insertions(+), 116 deletions(-)
 create mode 100644 src/containers/PollCreation/ImageInput.tsx
 delete mode 100644 src/containers/PollCreation/PollCreationImage.tsx
 delete mode 100644 src/containers/PollCreation/types.ts

(limited to 'src/containers/PollCreation')

diff --git a/src/containers/PollCreation/ImageInput.tsx b/src/containers/PollCreation/ImageInput.tsx
new file mode 100644
index 0000000..cc60478
--- /dev/null
+++ b/src/containers/PollCreation/ImageInput.tsx
@@ -0,0 +1,96 @@
+import React, { useState } from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import {
+  CardActionArea,
+  CardMedia,
+  Typography,
+  CircularProgress
+} from '@material-ui/core';
+import { Check, CancelOutlined } from '@material-ui/icons';
+
+import AttachLink from '../../components/AttachLink/AttachLink';
+import FileUpload from '../../components/FileUpload/FileUpload';
+
+interface PropTypes {
+  callback: (file?: File | string) => void;
+  progress?: number;
+}
+
+const useStyles = makeStyles({
+  root: {
+    display: 'flex',
+    justifyContent: 'center',
+    flexDirection: 'column',
+    alignItems: 'center',
+    width: '50%'
+  },
+  clearIcon: {
+    opacity: '.5',
+    fontSize: 50
+  },
+  media: {
+    height: '100%',
+    width: '100%',
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  darkOverlay: {
+    backgroundColor: 'rgba(0, 0, 0, 0.45)',
+    color: 'white',
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    transitionDuration: '0.5s'
+  },
+  invisible: {
+    backgroundColor: 'rgba(0, 0, 0, 0)'
+  },
+  icon: {
+    color: 'white'
+  }
+});
+
+
+const ImageInput: React.FC<PropTypes> = ({ callback, progress }) => {
+  const classes = useStyles();
+  const [url, setUrl] = useState<string>();
+
+  const handleClear = (): void => {
+    setUrl(undefined);
+    callback(undefined);
+  };
+
+  const childrenCallback = (fileUrl: string, file?: File) => {
+    setUrl(fileUrl);
+    callback(file || fileUrl);
+  };
+
+  const Upload = (
+    <div className={classes.root}>
+      <FileUpload callback={childrenCallback} />
+      <Typography variant="h6"> or </Typography>
+      <AttachLink callback={childrenCallback} />
+    </div>
+  );
+
+  const Media = (
+    <CardActionArea onClick={handleClear} className={classes.root} disabled={Boolean(progress)}>
+      <CardMedia image={url} className={classes.media}>
+        <div className={`${classes.media} ${classes.darkOverlay} ${progress === 100 && classes.invisible}`}>
+          {
+            progress
+              ? progress < 100
+                ? <CircularProgress variant="static" value={progress} className={classes.icon} />
+                : <Check className={classes.icon} fontSize="large" />
+              : <CancelOutlined className={classes.icon} fontSize="large" />
+          }
+        </div>
+      </CardMedia>
+    </CardActionArea>
+  );
+
+  return url ? Media : Upload;
+};
+
+export default ImageInput;
diff --git a/src/containers/PollCreation/PollCreation.tsx b/src/containers/PollCreation/PollCreation.tsx
index e350179..107314a 100644
--- a/src/containers/PollCreation/PollCreation.tsx
+++ b/src/containers/PollCreation/PollCreation.tsx
@@ -5,11 +5,12 @@ import {
   Button,
   Card,
   Divider,
-  Container
+  Container,
+  LinearProgress
 } from '@material-ui/core';
 import { useSnackbar } from 'notistack';
 
-import PollCreationImage from './PollCreationImage';
+import ImageInput from './ImageInput';
 import UserStrip from '../../components/UserStrip/UserStrip';
 import { post } from '../../requests';
 import { useAuth } from '../../hooks/useAuth';
@@ -73,18 +74,24 @@ const PollCreation: React.FC = () => {
         {user && <UserStrip user={user} info="" />}
         <Divider />
         <div className={classes.images}>
-          <PollCreationImage callback={setLeft} progress={progressLeft} />
-          <PollCreationImage callback={setRight} progress={progressRight} />
+          <ImageInput callback={setLeft} progress={progressLeft} />
+          <ImageInput callback={setRight} progress={progressRight} />
         </div>
-        <Button
-          color="primary"
-          disabled={!(isLeftReady && isRightReady) || Boolean(progressLeft || progressRight)}
-          variant="contained"
-          onClick={handleClick}
-          fullWidth
-        >
-          {(progressLeft || progressRight) ? 'Waiting for upload' : 'Submit'}
-        </Button>
+        {
+          progressLeft || progressRight
+            ? <LinearProgress color="primary" />
+            : (
+              <Button
+                color="primary"
+                disabled={!(isLeftReady && isRightReady)}
+                variant="contained"
+                onClick={handleClick}
+                fullWidth
+              >
+                Submit
+              </Button>
+            )
+        }
       </Card>
     </Container>
   );
diff --git a/src/containers/PollCreation/PollCreationImage.tsx b/src/containers/PollCreation/PollCreationImage.tsx
deleted file mode 100644
index d619a8e..0000000
--- a/src/containers/PollCreation/PollCreationImage.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import React, { useState } from 'react';
-import { makeStyles } from '@material-ui/core/styles';
-import {
-  CardActionArea,
-  CardMedia,
-  Typography,
-  CircularProgress
-} from '@material-ui/core';
-import { Check, CancelOutlined } from '@material-ui/icons';
-
-import AttachLink from '../../components/AttachLink/AttachLink';
-import FileUpload from '../../components/FileUpload/FileUpload';
-
-interface PropTypes {
-  callback: (file?: File | string) => void;
-  progress?: number;
-}
-
-const useStyles = makeStyles({
-  root: {
-    display: 'flex',
-    justifyContent: 'center',
-    flexDirection: 'column',
-    alignItems: 'center',
-    width: '50%'
-  },
-  clearIcon: {
-    opacity: '.5',
-    fontSize: 50
-  },
-  media: {
-    height: '100%',
-    width: '100%',
-    display: 'flex',
-    justifyContent: 'center',
-    alignItems: 'center'
-  },
-  darkOverlay: {
-    backgroundColor: 'rgba(0, 0, 0, 0.45)',
-    color: 'white',
-    position: 'absolute',
-    top: 0,
-    left: 0,
-    transitionDuration: '0.5s'
-  },
-  invisible: {
-    backgroundColor: 'rgba(0, 0, 0, 0)',
-  },
-  icon: {
-    color: 'white'
-  }
-});
-
-
-const PollCreationImage: React.FC<PropTypes> = ({ callback, progress }) => {
-  const classes = useStyles();
-  const [url, setUrl] = useState<string>();
-
-  const handleClear = (): void => {
-    setUrl(undefined);
-    callback(undefined);
-  };
-
-  const childrenCallback = (fileUrl: string, file?: File) => {
-    setUrl(fileUrl);
-    callback(file || fileUrl);
-  };
-
-  const Upload = (
-    <div className={classes.root}>
-      <FileUpload callback={childrenCallback} />
-      <Typography variant="h6"> or </Typography>
-      <AttachLink callback={childrenCallback} />
-    </div>
-  );
-
-  const Media = (
-    <CardActionArea onClick={handleClear} className={classes.root} disabled={Boolean(progress)}>
-      <CardMedia image={url} className={classes.media}>
-        <div className={`${classes.media} ${classes.darkOverlay} ${progress === 100 && classes.invisible}`}>
-          {
-            progress
-            ? progress < 100
-              ? <CircularProgress variant="static" value={progress} className={classes.icon} />
-              : <Check className={classes.icon} fontSize="large" />
-            : <CancelOutlined className={classes.icon} fontSize="large" />
-          }
-        </div>
-      </CardMedia>
-    </CardActionArea>
-  );
-
-  return url ? Media : Upload;
-};
-
-export default PollCreationImage;
diff --git a/src/containers/PollCreation/types.ts b/src/containers/PollCreation/types.ts
deleted file mode 100644
index 24ace4e..0000000
--- a/src/containers/PollCreation/types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface ImageData {
-  url: string;
-}
-export interface Contents {
-  left: ImageData;
-  right: ImageData;
-}
-- 
cgit v1.2.3