From 5744923265ff51e392575edfd6a8182589105dc6 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Wed, 12 Aug 2020 01:59:27 +0300
Subject: feat: PollCreation page and Fab component

---
 src/containers/Feed/Feed.tsx                      |  11 ++-
 src/containers/Page/Page.tsx                      |   2 +
 src/containers/PollCreation/PollCreation.tsx      | 105 ++++++++++++++++++++++
 src/containers/PollCreation/PollCreationImage.tsx |  95 ++++++++++++++++++++
 src/containers/PollCreation/types.ts              |   7 ++
 src/containers/Profile/Profile.tsx                |   2 +
 6 files changed, 216 insertions(+), 6 deletions(-)
 create mode 100644 src/containers/PollCreation/PollCreation.tsx
 create mode 100644 src/containers/PollCreation/PollCreationImage.tsx
 create mode 100644 src/containers/PollCreation/types.ts

(limited to 'src/containers')

diff --git a/src/containers/Feed/Feed.tsx b/src/containers/Feed/Feed.tsx
index e923bdd..ad306da 100644
--- a/src/containers/Feed/Feed.tsx
+++ b/src/containers/Feed/Feed.tsx
@@ -1,23 +1,22 @@
 import React from 'react';
+import { useHistory } from 'react-router-dom'
 import { Poll } from 'which-types';
 import { Container } from '@material-ui/core/';
 
 import PollsList from '../../components/PollsList/PollsList';
-import PollSubmission from './PollSubmission';
+import Fab from '../../components/Fab/Fab';
 import { useAuth } from '../../hooks/useAuth';
 import { useFeed } from '../../hooks/APIClient';
 
+
 const Feed: React.FC = () => {
+  const classes = useStyles();
   const { data: polls, mutate } = useFeed();
   const { isAuthenticated } = useAuth();
 
-  const addPoll = (poll: Poll): void => {
-    mutate([poll, ...polls], true);
-  };
-
   return (
     <Container maxWidth="sm" disableGutters>
-      {isAuthenticated && <PollSubmission addPoll={addPoll} />}
+      {isAuthenticated && <Fab hideOnScroll />}
       <PollsList polls={polls} mutate={mutate} />
     </Container>
   );
diff --git a/src/containers/Page/Page.tsx b/src/containers/Page/Page.tsx
index d1171e6..19cf6aa 100644
--- a/src/containers/Page/Page.tsx
+++ b/src/containers/Page/Page.tsx
@@ -11,6 +11,7 @@ const Login = React.lazy(() => import('../Login/Login'));
 const Registration = React.lazy(() => import('../Registration/Registration'));
 const Home = React.lazy(() => import('../Home/Home'));
 const Notifications = React.lazy(() => import('../Notifications/Notifications'));
+const PollCreation = React.lazy(() => import('../PollCreation/PollCreation'));
 
 
 const useStyles = makeStyles(theme => ({
@@ -47,6 +48,7 @@ const Page: React.FC = () => {
             <Route exact path="/registration" component={Registration} />
             <Route exact path="/feed" component={Feed} />
             <Route exact path="/notifications" component={Notifications} />
+            <Route exact path="/new" component={PollCreation} />
             <Route path="/profile/:username" component={Profile} />
           </Switch>
         </Suspense>
diff --git a/src/containers/PollCreation/PollCreation.tsx b/src/containers/PollCreation/PollCreation.tsx
new file mode 100644
index 0000000..1f3a802
--- /dev/null
+++ b/src/containers/PollCreation/PollCreation.tsx
@@ -0,0 +1,105 @@
+import React, { useState } from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import Collapse from '@material-ui/core/Collapse';
+import {
+  Button,
+  Card,
+  ClickAwayListener,
+  Divider,
+  Container
+} from '@material-ui/core';
+import { Poll } from 'which-types';
+import { useSnackbar } from 'notistack';
+import axios from 'axios';
+
+import PollCreationImage from './PollCreationImage';
+import UserStrip from '../../components/UserStrip/UserStrip';
+import { get, post } from '../../requests';
+import { useAuth } from '../../hooks/useAuth';
+
+interface PropTypes{
+  addPoll: (poll: Poll) => void;
+}
+
+const useStyles = makeStyles(theme => ({
+  root: {
+    marginBottom: theme.spacing(4)
+  },
+  images: {
+    height: theme.spacing(50),
+    display: 'flex'
+  }
+}));
+
+const PollCreation: React.FC<PropTypes> = ({ addPoll }) => {
+  const classes = useStyles();
+  const [expanded, setExpanded] = useState(true);
+  const [left, setLeft] = useState<File>();
+  const [right, setRight] = useState<File>();
+  const { enqueueSnackbar } = useSnackbar();
+  const { user } = useAuth();
+
+  const readyToSubmit = left && right;
+
+  const handleClickAway = () => {
+    setExpanded(false);
+  };
+
+  const uploadImage = (file?: File) => {
+    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 && url.slice(0, url.indexOf('.png') + 4);
+      });
+  };
+
+  const handleClick = async () => {
+    if (expanded && readyToSubmit) {
+      const [leftUrl, rightUrl] = await Promise.all([uploadImage(left), uploadImage(right)]);
+
+      const contents = {
+        left: { url: leftUrl },
+        right: { url: rightUrl }
+      };
+
+      post('/polls/', { contents }).then(response => {
+        addPoll(response.data);
+        enqueueSnackbar('Your poll has been successfully created!', {
+          variant: 'success'
+        });
+      });
+    }
+    setExpanded(!expanded);
+  };
+
+  return (
+    <Container maxWidth="sm" disableGutters>
+      <ClickAwayListener onClickAway={handleClickAway}>
+        <Card className={classes.root}>
+          <Collapse in={expanded} timeout="auto" unmountOnExit>
+            {user && <UserStrip user={user} info="" />}
+            <Divider />
+            <div className={classes.images}>
+              <PollCreationImage file={left} setFile={setLeft} />
+              <PollCreationImage file={right} setFile={setRight} />
+            </div>
+          </Collapse>
+          <Button
+            color="primary"
+            disabled={expanded && !readyToSubmit}
+            variant={expanded ? 'contained' : 'outlined'}
+            onClick={handleClick}
+            fullWidth
+          >
+            {expanded ? 'Submit' : 'Create a Poll'}
+          </Button>
+        </Card>
+      </ClickAwayListener>
+    </Container>
+  );
+};
+
+export default PollCreation;
diff --git a/src/containers/PollCreation/PollCreationImage.tsx b/src/containers/PollCreation/PollCreationImage.tsx
new file mode 100644
index 0000000..d3203a6
--- /dev/null
+++ b/src/containers/PollCreation/PollCreationImage.tsx
@@ -0,0 +1,95 @@
+import React, { useState, useEffect } from 'react';
+import { useFilePicker, utils } from 'react-sage';
+import { makeStyles } from '@material-ui/core/styles';
+import CloudUploadIcon from '@material-ui/icons/CloudUpload';
+import { CardActionArea, CardMedia, Typography } from '@material-ui/core';
+import CancelOutlinedIcon from '@material-ui/icons/CancelOutlined';
+
+interface PropTypes {
+  file: File | undefined;
+  setFile: (file: File | undefined) => void;
+}
+
+const useStyles = makeStyles({
+  root: {
+    display: 'flex',
+    justifyContent: 'center',
+    flexDirection: 'column',
+    alignItems: 'center'
+  },
+  clearIcon: {
+    opacity: '.5',
+    fontSize: 50
+  },
+  media: {
+    height: '100%',
+    width: '100%',
+    display: 'flex',
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  text: {
+    textAlign: 'center'
+  }
+});
+
+
+const PollCreationImage: React.FC<PropTypes> = ({ file, setFile }) => {
+  const classes = useStyles();
+  const { files, onClick, HiddenFileInput } = useFilePicker();
+  const [url, setUrl] = useState<string>();
+  const [isMediaHover, setIsMediaHover] = useState(false);
+
+  const handleMouseEnter = (): void => {
+    setIsMediaHover(true);
+  };
+
+  const handleMouseLeave = (): void => {
+    setIsMediaHover(false);
+  };
+
+  useEffect(() => {
+    if (files?.length) {
+      const chosenFile = files[0];
+      setFile(chosenFile);
+      utils.loadFile(chosenFile).then(result => setUrl(result));
+    }
+  }, [files, setFile]);
+
+
+  const handleClick = () => {
+    if (file) {
+      setFile(undefined);
+    } else onClick();
+  };
+
+
+  const Upload = (
+    <>
+      <CloudUploadIcon fontSize="large" color="primary" />
+      <Typography variant="h5" className={classes.text}> Upload an image </Typography>
+      <HiddenFileInput accept=".jpg, .jpeg, .png, .gif" multiple={false} />
+    </>
+  );
+
+  const Media = (
+    <CardMedia
+      image={url}
+      className={classes.media}
+      onMouseEnter={handleMouseEnter}
+      onMouseLeave={handleMouseLeave}
+    >
+      {isMediaHover && <CancelOutlinedIcon className={classes.clearIcon} />}
+    </CardMedia>
+  );
+
+  return (
+    <>
+      <CardActionArea onClick={handleClick} className={classes.root}>
+        {file ? (url && Media) : Upload}
+      </CardActionArea>
+    </>
+  );
+};
+
+export default PollCreationImage;
diff --git a/src/containers/PollCreation/types.ts b/src/containers/PollCreation/types.ts
new file mode 100644
index 0000000..24ace4e
--- /dev/null
+++ b/src/containers/PollCreation/types.ts
@@ -0,0 +1,7 @@
+export interface ImageData {
+  url: string;
+}
+export interface Contents {
+  left: ImageData;
+  right: ImageData;
+}
diff --git a/src/containers/Profile/Profile.tsx b/src/containers/Profile/Profile.tsx
index 7e929fb..33abfc2 100644
--- a/src/containers/Profile/Profile.tsx
+++ b/src/containers/Profile/Profile.tsx
@@ -6,6 +6,7 @@ import { Container } from '@material-ui/core';
 import ProfileInfo from './ProfileInfo';
 import PollsList from '../../components/PollsList/PollsList';
 import Loading from '../../components/Loading/Loading';
+import Fab from '../../components/Fab/Fab';
 import { useAuth } from '../../hooks/useAuth';
 import { useUser, useProfile } from '../../hooks/APIClient';
 
@@ -46,6 +47,7 @@ const Profile: React.FC = () => {
           ? <Loading />
           : <PollsList polls={polls} mutate={mutatePolls} />
       }
+      {user?.username === username && <Fab />}
     </Container>
   );
 };
-- 
cgit v1.2.3


From c65923480118e90675c81782b9e3bc653e8e3b40 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Thu, 13 Aug 2020 17:20:28 +0300
Subject: fix: resolve eslint errors

---
 src/containers/Feed/Feed.tsx | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/containers')

diff --git a/src/containers/Feed/Feed.tsx b/src/containers/Feed/Feed.tsx
index ad306da..10b1adc 100644
--- a/src/containers/Feed/Feed.tsx
+++ b/src/containers/Feed/Feed.tsx
@@ -1,6 +1,4 @@
 import React from 'react';
-import { useHistory } from 'react-router-dom'
-import { Poll } from 'which-types';
 import { Container } from '@material-ui/core/';
 
 import PollsList from '../../components/PollsList/PollsList';
@@ -10,7 +8,6 @@ import { useFeed } from '../../hooks/APIClient';
 
 
 const Feed: React.FC = () => {
-  const classes = useStyles();
   const { data: polls, mutate } = useFeed();
   const { isAuthenticated } = useAuth();
 
-- 
cgit v1.2.3


From 52799ec4e4cd5801423ee0d2aa56039c061afdb4 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Thu, 13 Aug 2020 17:24:09 +0300
Subject: feat!: remove expansion from PollCreation

---
 src/containers/PollCreation/PollCreation.tsx | 48 +++++++++++-----------------
 1 file changed, 18 insertions(+), 30 deletions(-)

(limited to 'src/containers')

diff --git a/src/containers/PollCreation/PollCreation.tsx b/src/containers/PollCreation/PollCreation.tsx
index 1f3a802..7501d3a 100644
--- a/src/containers/PollCreation/PollCreation.tsx
+++ b/src/containers/PollCreation/PollCreation.tsx
@@ -1,10 +1,8 @@
 import React, { useState } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
-import Collapse from '@material-ui/core/Collapse';
 import {
   Button,
   Card,
-  ClickAwayListener,
   Divider,
   Container
 } from '@material-ui/core';
@@ -33,7 +31,6 @@ const useStyles = makeStyles(theme => ({
 
 const PollCreation: React.FC<PropTypes> = ({ addPoll }) => {
   const classes = useStyles();
-  const [expanded, setExpanded] = useState(true);
   const [left, setLeft] = useState<File>();
   const [right, setRight] = useState<File>();
   const { enqueueSnackbar } = useSnackbar();
@@ -41,10 +38,6 @@ const PollCreation: React.FC<PropTypes> = ({ addPoll }) => {
 
   const readyToSubmit = left && right;
 
-  const handleClickAway = () => {
-    setExpanded(false);
-  };
-
   const uploadImage = (file?: File) => {
     const headers = { 'Content-Type': 'image/png' };
     return get('/files')
@@ -57,7 +50,7 @@ const PollCreation: React.FC<PropTypes> = ({ addPoll }) => {
   };
 
   const handleClick = async () => {
-    if (expanded && readyToSubmit) {
+    if (readyToSubmit) {
       const [leftUrl, rightUrl] = await Promise.all([uploadImage(left), uploadImage(right)]);
 
       const contents = {
@@ -72,32 +65,27 @@ const PollCreation: React.FC<PropTypes> = ({ addPoll }) => {
         });
       });
     }
-    setExpanded(!expanded);
   };
 
   return (
     <Container maxWidth="sm" disableGutters>
-      <ClickAwayListener onClickAway={handleClickAway}>
-        <Card className={classes.root}>
-          <Collapse in={expanded} timeout="auto" unmountOnExit>
-            {user && <UserStrip user={user} info="" />}
-            <Divider />
-            <div className={classes.images}>
-              <PollCreationImage file={left} setFile={setLeft} />
-              <PollCreationImage file={right} setFile={setRight} />
-            </div>
-          </Collapse>
-          <Button
-            color="primary"
-            disabled={expanded && !readyToSubmit}
-            variant={expanded ? 'contained' : 'outlined'}
-            onClick={handleClick}
-            fullWidth
-          >
-            {expanded ? 'Submit' : 'Create a Poll'}
-          </Button>
-        </Card>
-      </ClickAwayListener>
+      <Card className={classes.root}>
+        {user && <UserStrip user={user} info="" />}
+        <Divider />
+        <div className={classes.images}>
+          <PollCreationImage file={left} setFile={setLeft} />
+          <PollCreationImage file={right} setFile={setRight} />
+        </div>
+        <Button
+          color="primary"
+          disabled={!readyToSubmit}
+          variant="contained"
+          onClick={handleClick}
+          fullWidth
+        >
+          Submit
+        </Button>
+      </Card>
     </Container>
   );
 };
-- 
cgit v1.2.3