2.9.0

Bump elliptic from 6.5.3 to 6.5.4

.github/workflows/docker-hub.yml

@@ -0,0 +1,21 @@
+name: Publish Zipline DockerHub Image
+on:
+  push:
+    branches: [next]
+  pull_request:
+    branches: [next]
+jobs:
+  push_to_registry:
+    name: Push Docker Image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Push to Docker Hub
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: diced/zipline
+          dockerfile: Dockerfile
+          tag_with_ref: true

.github/workflows/docker.yml

@@ -0,0 +1,22 @@
+name: Publish Zipline Docker Image
+on:
+  push:
+    branches: [next]
+  pull_request:
+    branches: [next]
+jobs:
+  push_to_registry:
+    name: Push Docker Image to Github Packages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Push to GitHub Packages
+        uses: docker/build-push-action@v1
+        with:
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: docker.pkg.github.com
+          repository: diced/zipline/zipline
+          dockerfile: Dockerfile
+          tag_with_ref: true

README.md

@@ -12,27 +12,21 @@
 ![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.
 
-# Comparison
-Wondering how Zipline compares to other popular uploaders? We have done some benchmarking on other popular upload servers, see how Zipline compares.
+The best **React/Next.js** ShareX / File Uploader you would ever want.
 
-| Uploader | Average ms (3 batches/1.5k files) |
-|-|-|
-| **[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>
-*Note 2: results will vary because its very dependent on the server, location, and your internet (these tests were run on the same machine with local dbs)*
+# [Comparison between other uploaders](https://zipline.diced.wtf/docs/comparison)
 
 # Features
+
 - Configurable
 - Fast (API)
 - Built with Next.js & React
-- Support for **multible database types** (*literally the only one that supports multiple dbs*, mongo soon)
+- Support for **multible database types** (_literally the only one that supports multiple dbs_, mongo soon)
 - Token protected uploading
 - MFA with Authy/Google Authenticator
 - Easy setup instructions on [docs](https://zipline.diced.wtf/docs)
 
 # Installing
+
 [See how to install here](https://zipline.diced.wtf/docs/)

docker-compose.template.yml

@@ -0,0 +1,9 @@
+version: "3"
+services:
+  zipline:
+    ports:
+      - "8000:8000"
+    volumes:
+      - "./uploads:/opt/zipline/uploads"
+    build: .
+    tty: true

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zipline-next",
-  "version": "2.6.1",
+  "version": "2.9.0",
   "private": true,
   "dependencies": {
     "@dicedtomato/colors": "^1.0.3",
@@ -45,6 +45,8 @@
     "dev:verbose": "VERBOSE=true ts-node src",
     "build": "next build && tsc -p .",
     "start": "NODE_ENV=production node dist",
+    "start:powershell": "$env:NODE_ENV='production'; node dist",
+    "start:powershell:verbose": "$env:NODE_ENV='production'; $env:VERBOSE='true'; node dist",
     "start:verbose": "NODE_ENV=production VERBOSE=true node dist"
   },
   "devDependencies": {

setup.js

@@ -48,14 +48,14 @@ const base = {
     {
       type: 'list',
       name: 'type',
-      message: 'What database type?',
+      message: 'What database type? (you will have to install the drivers)',
       choices: [
         { name: 'postgres', extra: 'This is what we recomend using.' },
         { name: 'cockroachdb' },
         { name: 'mysql' },
         { name: 'mariadb' },
         { name: 'mssql' },
-        { name: 'sqlite3' }
+        { name: 'sqlite' }
       ]
     },
     {
@@ -103,14 +103,14 @@ const base = {
       name: 'theme',
       message: 'Theme',
       choices: [
-        { name: 'Dark Theme (recomended)' },
-        { name: 'Light Theme (warning for eyes)' }
+        { name: 'dark' },
+        { name: 'light' }
       ]
     },
     {
       type: 'confirm',
       name: 'mfa',
-      message: 'Enable MFA with Authy/Google Authenticator'
+      message: 'Enable 2 Factor Authentication with Authy/Google Authenticator'
     }
   ]);
 
@@ -165,6 +165,7 @@ const base = {
       'Head to https://zipline.diced.wtf/docs/docker to learn how to run with docker.'
     );
   }
+  if (config.database.type !== "postgres") console.log(`please head to https://zipline.diced.wtf/docs/config/getting-started#database to see what drivers you need to install for ${config.database.type}`);
 
   writeFileSync('Zipline.toml', stringify(config));
 })();

src/components/ManageUser.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import Typography from '@material-ui/core/Typography';
-import Card from '@material-ui/core/Card';
+import Paper from '@material-ui/core/Paper';
 import CardContent from '@material-ui/core/CardContent';
 import CardActions from '@material-ui/core/CardActions';
 import Dialog from '@material-ui/core/Dialog';
@@ -12,12 +12,15 @@ import Button from '@material-ui/core/Button';
 import TextField from '@material-ui/core/TextField';
 import Snackbar from '@material-ui/core/Snackbar';
 import Grid from '@material-ui/core/Grid';
+import Select from '@material-ui/core/Select';
+import MenuItem from '@material-ui/core/MenuItem';
 import Alert from '@material-ui/lab/Alert';
 import { makeStyles } from '@material-ui/core';
-import { UPDATE_USER } from '../reducer';
+import { SET_THEME, UPDATE_USER } from '../reducer';
 import { store } from '../store';
 import { useDispatch } from 'react-redux';
 import { Config } from '../lib/Config';
+import { useRouter } from 'next/router';
 
 const useStyles = makeStyles({
   margin: {
@@ -37,7 +40,12 @@ const useStyles = makeStyles({
 export default function ManageUser({ config }: { config: Config }) {
   const classes = useStyles();
   const dispatch = useDispatch();
+  const router = useRouter();
+
   const state = store.getState();
+  const [theme, setTheme] = useState(
+    state.theme === '' ? 'dark-dark' : state.theme
+  );
   const [alertOpen, setAlertOpen] = useState(false);
   const [mfaDialogOpen, setMfaDialogOpen] = useState(false);
   const [qrcode, setQRCode] = useState(null);
@@ -66,6 +74,12 @@ export default function ManageUser({ config }: { config: Config }) {
     }
   };
 
+  const handleUpdateTheme = evt => {
+    setTheme(evt.target.value);
+    dispatch({ type: SET_THEME, payload: evt.target.value });
+    router.replace('/user/manage');
+  };
+
   const disableMFA = async () => {
     await fetch('/api/mfa/disable');
     const d = await (await fetch('/api/user')).json();
@@ -157,11 +171,21 @@ export default function ManageUser({ config }: { config: Config }) {
           </Button>
         </DialogActions>
       </Dialog>
-      <Card>
+      <Paper>
         <CardContent>
           <Typography color='textSecondary' variant='h4' gutterBottom>
             Manage
           </Typography>
+          <Select
+            id='select-theme-zipline'
+            value={theme}
+            onChange={handleUpdateTheme}
+            className={classes.field}
+          >
+            <MenuItem value={'dark-dark'}>Very Dark</MenuItem>
+            <MenuItem value={'blue-dark'}>Dark Blue</MenuItem>
+            <MenuItem value={'light'}>Light</MenuItem>
+          </Select>
           <TextField
             label='Username'
             className={classes.field}
@@ -186,6 +210,13 @@ export default function ManageUser({ config }: { config: Config }) {
           />
         </CardContent>
         <CardActions>
+          <Button
+            className={classes.button}
+            color='primary'
+            onClick={handleUpdateTheme}
+          >
+            settheme
+          </Button>
           <Button
             className={classes.button}
             color='primary'
@@ -203,7 +234,7 @@ export default function ManageUser({ config }: { config: Config }) {
             </Button>
           ) : null}
         </CardActions>
-      </Card>
+      </Paper>
     </React.Fragment>
   );
 }

src/components/UI.tsx

@@ -58,13 +58,13 @@ const useStyles = makeStyles(theme => ({
   },
   appBar: {
     display: 'flex',
-    backgroundColor: theme.palette.type === 'dark' ? '#000' : '#fff',
-    color: theme.palette.type !== 'dark' ? '#000' : '#fff',
+    backgroundColor: theme.palette.background.default,
+    color: theme.palette.text.primary,
+    ...theme.overrides.MuiAppBar.root,
     [theme.breakpoints.up('sm')]: {
       width: 'calc(100%)',
       marginLeft: drawerWidth
-    },
-    borderBottom: theme.palette.type === 'dark' ? '1px solid #1f1f1f' : '1px solid #e0e0e0'
+    }
   },
   menuButton: {
     marginRight: theme.spacing(2),
@@ -188,7 +188,9 @@ export default function UI({ children }) {
                 color='inherit'
                 className={classes.rightButton}
               >
-                <Avatar src={`https://www.gravatar.com/avatar/${emailHash}.jpg`}>
+                <Avatar
+                  src={`https://www.gravatar.com/avatar/${emailHash}.jpg`}
+                >
                   {state.user.username[0].toUpperCase()}
                 </Avatar>
               </Button>
@@ -222,9 +224,7 @@ export default function UI({ children }) {
             onClose={() => setAnchorEl(null)}
           >
             <NoFocusMenuItem>
-              <Typography variant='h6'>
-                {state.user.username}
-              </Typography>
+              <Typography variant='h6'>{state.user.username}</Typography>
             </NoFocusMenuItem>
             <Divider />
             <Link href='/user/manage'>

src/components/ZiplineTheming.tsx

@@ -1,12 +1,21 @@
 import React from 'react';
 import CssBaseline from '@material-ui/core/CssBaseline';
 import { ThemeProvider } from '@material-ui/core/styles';
-import dark from '../lib/themes/dark';
+import darkdark from '../lib/themes/darkdark';
+import bluedark from '../lib/themes/bluedark';
 import light from '../lib/themes/light';
+import { useState } from 'react';
 
 export default function ZiplineTheming({ Component, pageProps, theme }) {
+  const thm = {
+    'dark-dark': darkdark,
+    light: light,
+    'blue-dark': bluedark,
+    '': darkdark
+  };
+
   return (
-    <ThemeProvider theme={theme == 'light' ? light : dark}>
+    <ThemeProvider theme={thm[theme]}>
       <CssBaseline />
       <Component {...pageProps} />
     </ThemeProvider>

src/index.ts

@@ -9,6 +9,7 @@ import { Configuration } from './lib/Config';
 import { join } from 'path';
 import { checkVersion } from './lib/Util';
 import { PluginLoader } from './lib/plugin';
+import { readdirSync, statSync } from 'fs';
 
 const dev = process.env.NODE_ENV !== 'production';
 const server = fastify({});
@@ -45,14 +46,15 @@ if (!config) {
   const path = dir.charAt(0) == '/' ? dir : join(process.cwd(), dir);
   const handle = app.getRequestHandler();
 
-  if (dev) server.get('/_next/*', async (req, reply) => {
-    await handle(req.raw, reply.raw);
-    return (reply.sent = true);
-  });
-
-  server.all('/*', async (req, reply) => {
-    await handle(req.raw, reply.raw);
-    return (reply.sent = true);
+  server.get('/*', async (req, reply) => {
+    const routeRegex = /\/_next\/static|\/((dash|user)(\/)?(.+)?)?/gi;
+    if (routeRegex.test(req.url)) {
+      await handle(req.raw, reply.raw);
+      return (reply.sent = true);
+    } else {
+      await app.render404(req.raw, reply.raw);
+      return (reply.sent = true);
+    }
   });
 
   server.setNotFoundHandler(async (req, reply) => {
@@ -74,10 +76,10 @@ if (!config) {
         plugin.onLoad(server, server.orm, app, config);
         Console.logger(PluginLoader).info(`loaded plugin: ${plugin.name}`);
       } catch (e) {
-        Console.logger(PluginLoader).error(`failed to load plugin: ${plugin.name}, ${e.message}`)
+        Console.logger(PluginLoader).error(`failed to load plugin: ${plugin.name}, ${e.message}`);
       }
     }
-  })
+  });
 
   server.listen(
     {

src/lib/Webhooks.ts

@@ -59,7 +59,7 @@ export class Webhooks {
   public static parseContent(content: string, data: WebhookData) {
     return content
       .replace(WebhookParseTokens.IMAGE_ID, data.image?.id)
-      .replace(WebhookParseTokens.IMAGE_URL, `${data.host}${data.image?.file}`)
+      .replace(WebhookParseTokens.IMAGE_URL, data.host)
       .replace(WebhookParseTokens.URL_ID, data.url?.id)
       .replace(WebhookParseTokens.URL_URL, data.host + data.url?.id)
       .replace(WebhookParseTokens.URL_VANITY, data.url?.vanity)

src/lib/controllers/ImagesController.ts

@@ -113,7 +113,7 @@ export class ImagesController {
       if (!f.length) return array;
       return [f].concat(chunk(array.slice(size, array.length), size));
     }
-    const chunks = chunk(images, 20);
+    const chunks = chunk(images, 26);
     return reply.send(chunks);
   }
 }

src/lib/controllers/MultiFactorController.ts

@@ -143,7 +143,7 @@ export class MultiFactorController {
       }
     });
 
-    if (!user) return sendError(reply, `User that was signed in was not found, and guess what you should probably clear your cookies.`);
+    if (!user) return sendError(reply, 'User that was signed in was not found, and guess what you should probably clear your cookies.');
 
     const passed = totp.verify({
       encoding: 'base32',

src/lib/controllers/RootController.ts

@@ -123,17 +123,18 @@ export class RootController {
     const data: Multipart = await req.file();
 
     if (!existsSync(config.uploader.directory)) mkdirSync(config.uploader.directory);
-
-    const ext = data.mimetype === 'application/octet-stream' ? 'bin' : data.filename.split('.')[1];
+    
+    const og = data.filename;
+    const ext = data.filename.split('.').pop();
     if (config.uploader.blacklisted.includes(ext)) return sendError(reply, 'Blacklisted file extension!');
-
+    console.log(data.filename);
     const fileName = config.uploader.original
-      ? data.filename.split('.').pop()
+      ? og
       : createRandomId(config.uploader.length);
-    const path = join(config.uploader.directory, `${fileName}.${ext}`);
+    const path = join(config.uploader.directory, config.uploader.original ? fileName : `${fileName}.${ext}`);
 
     this.logger.verbose(`attempting to save ${fileName} to db`);
-    const image = await this.images.save(new Image(fileName, ext, user.id));
+    const image = await this.images.save(new Image(config.uploader.original, fileName, ext, user.id));
     this.logger.verbose(`saved image ${image.id} to db`);
 
     this.logger.verbose(`attempting to save file ${path}`);
@@ -148,10 +149,11 @@ export class RootController {
       config.uploader.rich_content_route
         ? config.uploader.rich_content_route
         : config.uploader.route
-    }/${fileName}.${ext}`;
+    }/${config.uploader.original ? og : `${fileName}.${ext}`}`;
 
     if (this.webhooks.events.includes(WebhookType.UPLOAD)) Webhooks.sendWebhook(this.webhooks.upload.content, {
       image,
+      user,
       host
     });
 

src/lib/controllers/UserController.ts

@@ -169,7 +169,8 @@ export class UserController {
     this.logger.verbose(`set cookie for ${user.username} (${user.id})`);
     reply.setCookie('zipline', createBaseCookie(user.id), {
       path: '/',
-      maxAge: 1036800000
+      maxAge: 1036800000,
+      signed: true
     });
 
     this.logger.info(`${user.username} (${user.id}) logged in`);
@@ -193,7 +194,6 @@ export class UserController {
 
   @POST('/reset-token')
   async resetToken(req: FastifyRequest, reply: FastifyReply) {
-    if (!req.cookies.zipline) return sendError(reply, 'Not logged in.');
 
     const user = await this.users.findOne({
       where: {
@@ -224,6 +224,10 @@ export class UserController {
     }>,
     reply: FastifyReply
   ) {
+    const firstSetup = await getFirst(this.instance.orm);
+
+    if (!firstSetup && !req.cookies.zipline) return sendError(reply, 'Not logged in.');
+
     if (!req.body.username) return sendError(reply, 'Missing username.');
     if (!req.body.password) return sendError(reply, 'Missing uassword.');
 
@@ -232,6 +236,8 @@ export class UserController {
     });
     if (existing) return sendError(reply, 'User exists already');
 
+    if (req.body.username.length > 25) return sendError(reply, 'Limit 25');
+
     try {
       this.logger.verbose(`attempting to create ${req.body.username}`);
       const user = await this.users.save(
@@ -247,7 +253,6 @@ export class UserController {
         user
       });
 
-      const firstSetup = await getFirst(this.instance.orm);
       if (firstSetup) await this.instance.orm.getRepository(Zipline).update(
         {
           id: 'zipline'

src/lib/entities/Image.ts

@@ -2,7 +2,7 @@ import { Entity, Column, PrimaryColumn } from 'typeorm';
 
 @Entity({ name: 'zipline_images' })
 export class Image {
-  @PrimaryColumn('text')
+  @PrimaryColumn('varchar', { length: 255 })
   public id: string;
 
   @Column('text', { default: null })
@@ -14,9 +14,10 @@ export class Image {
   @Column('bigint', { default: '0' })
   public views: number;
 
-  public constructor(id: string, ext: string, user: number) {
+  public constructor(original: boolean, id: string, ext: string, user: number) {
     this.id = id;
-    this.file = `${id}.${ext}`;
+    if (original) this.file = id;
+    else this.file = `${id}.${ext}`;
     this.user = user;
     this.views = 0;
   }

src/lib/plugin/PluginLoader.ts

@@ -1,7 +1,7 @@
-import { FastifyInstance } from "fastify";
-import { readdirSync, statSync } from "fs";
-import { join } from "path";
-import { Plugin } from "./Plugin";
+import { FastifyInstance } from 'fastify';
+import { readdirSync, statSync } from 'fs';
+import { join } from 'path';
+import { Plugin } from './Plugin';
 
 export class PluginLoader {
   public directory: string;
@@ -15,7 +15,7 @@ export class PluginLoader {
     this.fastify = fastify;
   }
 
-  public getAllFiles(builtIn: boolean = false): string[] {
+  public getAllFiles(builtIn = false): string[] {
     const result = [];
 
     const r = (dir: string) => {
@@ -32,7 +32,7 @@ export class PluginLoader {
     return result;
   }
 
-  public async loadPlugins(builtIn: boolean = false): Promise<Plugin[]> {
+  public async loadPlugins(builtIn = false): Promise<Plugin[]> {
     const files = this.getAllFiles(builtIn);
 
     for (const pluginFile of files) {

src/lib/themes/bluedark.ts

@@ -0,0 +1,49 @@
+import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
+
+const blueDarkTheme = createMuiTheme({
+  palette: {
+    type: 'dark',
+    primary: {
+      main: '#fff'
+    },
+    secondary: {
+      main: '#4a5bb0'
+    },
+    background: {
+      default: '#0b1524',
+      paper: '#0a1930'
+    }
+  },
+  overrides: {
+    MuiListItem: {
+      root: {
+        '&$selected': {
+          backgroundColor: '#182f52'
+        }
+      }
+    },
+    MuiAppBar: {
+      root: {
+        borderBottom: '#1f1f1f',
+        backgroundColor: '#162946'
+      }
+    },
+    MuiPaper: {
+      outlined: {
+        borderColor: '#ffffff'
+      }
+    },
+    MuiCard: {
+      root: {
+        backgroundColor: '#182f52'
+      }
+    },
+    MuiButton: {
+      root: {
+        margin: '1320000'
+      }
+    }
+  }
+});
+
+export default blueDarkTheme;

src/lib/themes/darkdark.ts

@@ -1,6 +1,6 @@
 import createMuiTheme from '@material-ui/core/styles/createMuiTheme';
 
-const darkTheme = createMuiTheme({
+const darkdarkTheme = createMuiTheme({
   palette: {
     type: 'dark',
     primary: {
@@ -22,6 +22,12 @@ const darkTheme = createMuiTheme({
         }
       }
     },
+    MuiAppBar: {
+      root: {
+        borderBottom: '#1f1f1f',
+        backgroundColor: '#000000'
+      }
+    },
     MuiCard: {
       root: {
         backgroundColor: '#080808'
@@ -35,4 +41,4 @@ const darkTheme = createMuiTheme({
   }
 });
 
-export default darkTheme;
+export default darkdarkTheme;

src/lib/themes/light.ts

@@ -22,6 +22,11 @@ const lightTheme = createMuiTheme({
         }
       }
     },
+    MuiAppBar: {
+      root: {
+        borderBottom: '#1f1f1f'
+      }
+    },
     MuiCard: {
       root: {
         backgroundColor: '#fff'

src/pages/404.tsx

@@ -4,7 +4,7 @@ import Typography from '@material-ui/core/Typography';
 import CssBaseline from '@material-ui/core/CssBaseline';
 import Grid from '@material-ui/core/Grid';
 import { ThemeProvider } from '@material-ui/core/styles';
-import dark from '../lib/themes/dark';
+import dark from '../lib/themes/darkdark';
 
 export default function NotFound() {
   useEffect(() => {

src/pages/_app.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import Head from 'next/head';
 import { Provider } from 'react-redux';
@@ -8,15 +8,11 @@ import ZiplineTheming from '../components/ZiplineTheming';
 import UIPlaceholder from '../components/UIPlaceholder';
 
 function App({ Component, pageProps }) {
-  const [theme, setTheme] = useState<'dark' | 'light'>('dark');
+  const state = store.getState();
+
   useEffect(() => {
     const jssStyles = document.querySelector('#jss-server-side');
     if (jssStyles) jssStyles.parentElement.removeChild(jssStyles);
-
-    (async () => {
-      const d = await (await fetch('/api/theme')).json();
-      if (!d.error) setTheme(d.theme);
-    })();
   }, []);
   return (
     <React.Fragment>
@@ -33,7 +29,7 @@ function App({ Component, pageProps }) {
           <ZiplineTheming
             Component={Component}
             pageProps={pageProps}
-            theme={theme}
+            theme={state.theme}
           />
         </PersistGate>
       </Provider>
@@ -46,4 +42,4 @@ App.propTypes = {
   pageProps: PropTypes.object.isRequired
 };
 
-export default App;
+export default App;

src/pages/_document.tsx

@@ -3,7 +3,7 @@
 import React from 'react';
 import Document, { Html, Head, Main, NextScript } from 'next/document';
 import { ServerStyleSheets } from '@material-ui/core/styles';
-import theme from '../lib/themes/dark';
+import theme from '../lib/themes/darkdark';
 import { Config, Configuration } from '../lib/Config';
 
 export interface DocumentProps {

src/pages/dash.tsx

@@ -20,7 +20,6 @@ const useStyles = makeStyles(theme => ({
     margin: '5px'
   },
   padding: {
-    border: theme.palette.type === 'dark' ? '1px solid #1f1f1f' : '1px solid #e0e0e0',
     padding: '10px'
   },
   backdrop: {
@@ -34,7 +33,11 @@ export default function Dashboard({ config }) {
   const router = useRouter();
   const state = store.getState();
   const [loading, setLoading] = React.useState(true);
-  const [stats, setStats] = React.useState<{ totalViews: number, averageViews: number, images: number }>(null);
+  const [stats, setStats] = React.useState<{
+    totalViews: number;
+    averageViews: number;
+    images: number;
+  }>(null);
   const [recentImages, setRecentImages] = React.useState([]);
 
   if (typeof window === 'undefined') return <UIPlaceholder />;
@@ -64,7 +67,9 @@ export default function Dashboard({ config }) {
               Welcome back, {state.user.username}
             </Typography>
             <Typography color='textSecondary'>
-              You have <b>{stats.images}</b> images, with <b>{stats.totalViews}</b> ({Math.round(stats.averageViews)}) collectively.
+              You have <b>{stats.images}</b> images, with{' '}
+              <b>{stats.totalViews}</b> ({Math.round(stats.averageViews)})
+              collectively.
             </Typography>
             <Typography variant='h5'>Recent Images</Typography>
             <Grid container spacing={2}>
@@ -76,7 +81,11 @@ export default function Dashboard({ config }) {
                         <CardMedia
                           component='img'
                           height='140'
-                          image={createURL(window.location.href, config ? config.uploader.route : '/u', d.file)}
+                          image={createURL(
+                            window.location.href,
+                            config ? config.uploader.route : '/u',
+                            d.file
+                          )}
                         />
                       </CardActionArea>
                     </Card>
@@ -95,4 +104,4 @@ export default function Dashboard({ config }) {
 export async function getStaticProps() {
   const config = Configuration.readConfig();
   return { props: { config: config } };
-}
+}

src/pages/dash/images.tsx

@@ -25,7 +25,8 @@ const useStyles = makeStyles(theme => ({
     margin: '5px'
   },
   padding: {
-    border: theme.palette.type === 'dark' ? '1px solid #1f1f1f' : '1px solid #e0e0e0',
+    border:
+      theme.palette.type === 'dark' ? '1px solid #1f1f1f' : '1px solid #e0e0e0',
     padding: '10px'
   },
   backdrop: {
@@ -57,6 +58,7 @@ export default function Images({ config }) {
       const c = await (await fetch('/api/images/chunk')).json();
       if (!c.error) {
         setChunks(c);
+        console.log(c);
         return c;
       }
       return [];
@@ -110,7 +112,7 @@ export default function Images({ config }) {
             {showPagination ? (
               <>
                 <Grid container spacing={2}>
-                  {images.map(d => ((
+                  {images.map(d => (
                     <Grid
                       item
                       xs={12}
@@ -123,12 +125,16 @@ export default function Images({ config }) {
                           <CardMedia
                             component='img'
                             height='140'
-                            image={createURL(window.location.href, config ? config.uploader.route : '/u', d.file)}
+                            image={createURL(
+                              window.location.href,
+                              config ? config.uploader.route : '/u',
+                              d.file
+                            )}
                           />
                         </CardActionArea>
                       </Card>
                     </Grid>
-                  )))}
+                  ))}
                 </Grid>
                 <Pagination count={chunks.length} onChange={changePage} />
               </>
@@ -140,7 +146,7 @@ export default function Images({ config }) {
                 alignItems='center'
                 justify='center'
               >
-                <Grid item xs={6} sm={12}>
+                <Grid item xs>
                   <AddToPhotosIcon style={{ fontSize: 100 }} />
                 </Grid>
               </Grid>
@@ -179,4 +185,4 @@ export default function Images({ config }) {
 export async function getStaticProps() {
   const config = Configuration.readConfig();
   return { props: { config: config } };
-}
+}

src/pages/dash/upload.tsx

@@ -92,7 +92,7 @@ export default function Upload() {
             </Typography>
             <Box m={1}>
               <DropzoneArea
-                acceptedFiles={['image/*']}
+                acceptedFiles={['image/*', 'video/*']}
                 dropzoneText={'Drag an image or click to upload an image.'}
                 onChange={f => setFiles(f)}
                 filesLimit={1}
@@ -106,4 +106,4 @@ export default function Upload() {
     );
   }
   return <UIPlaceholder />;
-}
+}

src/reducer.ts

@@ -7,17 +7,20 @@ export const UPDATE_USER = 'UPDATE_USER';
 export const STOP_LOADING = 'STOP_LOADING';
 export const START_LOADING = 'START_LOADING';
 export const SET_THEME = 'SET_THEME';
+export type Theme = 'dark-dark' | 'light' | 'blue-dark';
 
 export interface State {
   loggedIn: boolean;
   user: User;
   loading: boolean;
+  theme: Theme;
 }
 
 const initialState: State = {
   loggedIn: false,
   user: null,
-  loading: true
+  loading: true,
+  theme: 'dark-dark'
 };
 
 export function reducer(state: State = initialState, action) {
@@ -28,6 +31,8 @@ export function reducer(state: State = initialState, action) {
       return { ...state, loggedIn: false };
     case UPDATE_USER:
       return { ...state, user: action.payload };
+    case SET_THEME:
+      return { ...state, theme: action.payload };
     case START_LOADING:
       return { ...state, loading: true };
     case STOP_LOADING: