Merge branch 'next' of github.com:ZiplineProject/zipline into next

This commit is contained in:
dicedtomatoreal
2020-10-31 16:11:58 -07:00
2 changed files with 14 additions and 13 deletions

View File

@@ -55,8 +55,8 @@ export default function Images({ config }) {
const getChunkedImages = async () => {
const c = await (await fetch('/api/images/chunk')).json();
if (!c.error) {
setChunks([]);
return [];
setChunks(c);
return c;
}
return [];
};
@@ -136,18 +136,18 @@ export default function Images({ config }) {
<Pagination count={chunks.length} onChange={changePage} />
</>
) : (
<Grid
container
spacing={0}
direction='column'
alignItems='center'
justify='center'
>
<Grid item xs={6} sm={12}>
<AddToPhotosIcon style={{ fontSize: 100 }} />
<Grid
container
spacing={0}
direction='column'
alignItems='center'
justify='center'
>
<Grid item xs={6} sm={12}>
<AddToPhotosIcon style={{ fontSize: 100 }} />
</Grid>
</Grid>
</Grid>
)}
)}
</Paper>
) : null}
<Popover

View File

@@ -76,6 +76,7 @@ export default function Upload() {
acceptedFiles={['image/*']}
dropzoneText={'Drag an image or click to upload an image.'}
onChange={f => setFiles(f)}
maxFileSize={1073741824} // 1gb in byte
/>
</Box>
<Button onClick={handleFileUpload}>Submit</Button>