beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

moved dropzone to gallery to avoid trigerring it on login page

Browse source
This commit is contained in:
Abhinav-grd 2021-03-19 01:46:18 +05:30
parent c3ada5c6f7
commit 93ca29e0b8
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/FullScreenDropZone.tsx
View file

@ -19,7 +19,8 @@ const DropDiv = styled.div`
const Overlay = styled.div<{ isDragActive: boolean }>`
border-width: 8px;
left: 0;
top: 0;
outline: none;
transition: border 0.24s ease-in-out;
height: 100%;

9
src/pages/_app.tsx
View file

@ -222,10 +222,7 @@ export default function App({ Component, pageProps, err }) {
accept: 'image/*, video/*, application/json, ',
});
return (
<FullScreenDropZone
getRootProps={getRootProps}
getInputProps={getInputProps}
>
<>
<Head>
<title>{constants.TITLE}</title>
<script async src={`https://sa.ente.io/latest.js`} />
@ -252,6 +249,8 @@ export default function App({ Component, pageProps, err }) {
</Container>
) : (
<Component
getRootProps={getRootProps}
getInputProps={getInputProps}
openFileUploader={open}
acceptedFiles={acceptedFiles}
uploadModalView={uploadModalView}
@ -261,6 +260,6 @@ export default function App({ Component, pageProps, err }) {
err={err}
/>
)}
</FullScreenDropZone>
</>
);
}

10
src/pages/gallery/index.tsx
View file

@ -25,6 +25,7 @@ import {
import constants from 'utils/strings/constants';
import AlertBanner from './components/AlertBanner';
import { Alert, Button, Jumbotron } from 'react-bootstrap';
import FullScreenDropZone from 'components/FullScreenDropZone';
const DATE_CONTAINER_HEIGHT = 45;
const IMAGE_CONTAINER_HEIGHT = 200;
@ -111,6 +112,8 @@ const DateContainer = styled.div`
`;
interface Props {
getRootProps;
getInputProps;
openFileUploader;
acceptedFiles;
uploadModalView;
@ -337,7 +340,10 @@ export default function Gallery(props: Props) {
};
return (
<>
<FullScreenDropZone
getRootProps={props.getRootProps}
getInputProps={props.getInputProps}
>
<LoadingBar color="#2dc262" ref={loadingBar} />
{isFirstLoad && (
<div className="text-center">
@ -526,6 +532,6 @@ export default function Gallery(props: Props) {
{constants.INSTALL_MOBILE_APP()}
</Alert>
)}
</>
</FullScreenDropZone>
);
}