Compare commits

..

7 Commits
2.5.4 ... 2.5.8

Author SHA1 Message Date
diced
6270c725dc 2.5.8 2020-12-06 15:32:05 -08:00
diced
b82a50ae4e use last ext 2020-12-06 15:31:54 -08:00
diced
19d2c63ea9 2.5.7 2020-11-25 21:04:33 -08:00
diced
70b5ff7562 no file type? 2020-11-25 21:04:24 -08:00
dicedtomato
15367f0495 Update README.md 2020-11-20 11:50:11 -08:00
diced
306b8812e2 2.5.5 2020-11-12 21:57:00 -08:00
diced
06c57851e4 fix bug 2020-11-12 21:56:53 -08:00
6 changed files with 12129 additions and 53 deletions

View File

@@ -1,15 +1,15 @@
<p align="center"><img src="https://raw.githubusercontent.com/ZiplineProject/zipline/next/public/zipline_small.png"/></p>
![Version](https://img.shields.io/github/package-json/v/dicedtomatoreal/zipline)
![LICENCE](https://img.shields.io/github/license/dicedtomatoreal/zipline)
![Version](https://img.shields.io/github/package-json/v/diced/zipline)
![LICENCE](https://img.shields.io/github/license/diced/zipline)
[![Discord](https://img.shields.io/discord/729771078196527176)](https://discord.gg/AtTSecwqeV)
![Stars](https://img.shields.io/github/stars/dicedtomatoreal/zipline)
![GitHub repo size](https://img.shields.io/github/repo-size/dicedtomatoreal/zipline)
![GitHub last commit (branch)](https://img.shields.io/github/last-commit/dicedtomatoreal/zipline/next)
![Stars](https://img.shields.io/github/stars/diced/zipline)
![GitHub repo size](https://img.shields.io/github/repo-size/diced/zipline)
![GitHub last commit (branch)](https://img.shields.io/github/last-commit/diced/zipline/next)
<br>
![David](https://img.shields.io/david/dicedtomatoreal/zipline)
![David](https://img.shields.io/david/dev/dicedtomatoreal/zipline)
![GitHub package.json dependency version (prod)](https://img.shields.io/github/package-json/dependency-version/dicedtomatoreal/zipline/react)
![David](https://img.shields.io/david/diced/zipline)
![David](https://img.shields.io/david/dev/diced/zipline)
![GitHub package.json dependency version (prod)](https://img.shields.io/github/package-json/dependency-version/diced/zipline/react)
# Zipline
The best and only **React + Next.js** ShareX / File Uploader you would ever want.
@@ -19,7 +19,7 @@ Wondering how Zipline compares to other popular uploaders? We have done some ben
| Uploader | Average ms (3 batches/1.5k files) |
|-|-|
| **[Zipline](https://github.com/dicedtomatoreal/zipline)** | **61 ms** |
| **[Zipline](https://github.com/diced/zipline)** | **61 ms** |
| [ShareX-Upload-Server](https://github.com/TannerReynolds/ShareX-Upload-Server) | 86 ms |
*Note: there were 3 batches of 1.5k requests, the average ms of each was averaged again*<br>
@@ -35,4 +35,4 @@ Wondering how Zipline compares to other popular uploaders? We have done some ben
- Easy setup instructions on [docs](https://zipline.diced.wtf/docs)
# Installing
[See how to install here](https://zipline.diced.wtf/docs/)
[See how to install here](https://zipline.diced.wtf/docs/)

11209
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "zipline-next",
"version": "2.5.4",
"version": "2.5.8",
"private": true,
"dependencies": {
"@dicedtomato/colors": "^1.0.3",
@@ -62,6 +62,7 @@
"eslint-plugin-react": "^7.21.3",
"mongodb": "^3.6.2",
"prettier": "2.1.2",
"release": "^6.3.0",
"ts-node": "^9.0.0",
"typescript": "^4.0.3"
}

View File

@@ -124,11 +124,11 @@ export class RootController {
if (!existsSync(config.uploader.directory)) mkdirSync(config.uploader.directory);
const ext = data.filename.split('.')[1];
const ext = data.mimetype === 'application/octet-stream' ? 'bin' : data.filename.split('.')[1];
if (config.uploader.blacklisted.includes(ext)) return sendError(reply, 'Blacklisted file extension!');
const fileName = config.uploader.original
? data.filename.split('.')[0]
? data.filename.split('.').pop()
: createRandomId(config.uploader.length);
const path = join(config.uploader.directory, `${fileName}.${ext}`);

View File

@@ -1,3 +1,6 @@
/* eslint-disable @typescript-eslint/ban-ts-comment */
// @ts-nocheck
import React from 'react';
import { useRouter } from 'next/router';
import Typography from '@material-ui/core/Typography';
@@ -60,41 +63,45 @@ export default function Upload() {
}
};
const snack = (
<Snackbar
anchorOrigin={{
vertical: 'top',
horizontal: 'center'
}}
open={alertOpen}
autoHideDuration={6000}
onClose={() => setAlertOpen(false)}
>
<Alert severity={alertSev} variant='filled'>
{alertMsg}
</Alert>
</Snackbar>
);
if (typeof window === 'undefined') return <UIPlaceholder />;
if (!state.loggedIn) router.push('/user/login');
else {
return (
<UI>
<Snackbar
anchorOrigin={{
vertical: 'top',
horizontal: 'center'
}}
open={alertOpen}
autoHideDuration={6000}
onClose={() => setAlertOpen(false)}
>
{/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
{/* @ts-ignore */}
<Alert severity={alertSev} variant='filled'>
{alertMsg}
</Alert>
</Snackbar>
<Paper elevation={3} className={classes.padding}>
<Typography variant='h5'>
Upload
</Typography>
<Box m={1}>
<DropzoneArea
acceptedFiles={['image/*']}
dropzoneText={'Drag an image or click to upload an image.'}
onChange={f => setFiles(f)}
filesLimit={1}
maxFileSize={1073741824} // 1gb in byte
/>
</Box>
<Button onClick={handleFileUpload}>Upload</Button>
</Paper>
<>
{snack}
<Paper elevation={3} className={classes.padding}>
<Typography variant='h5'>
Upload
</Typography>
<Box m={1}>
<DropzoneArea
acceptedFiles={['image/*']}
dropzoneText={'Drag an image or click to upload an image.'}
onChange={f => setFiles(f)}
filesLimit={1}
maxFileSize={1073741824} // 1gb in byte
/>
</Box>
<Button onClick={handleFileUpload}>Upload</Button>
</Paper>
</>
</UI>
);
}

879
yarn.lock

File diff suppressed because it is too large Load Diff