feat(v3.7.9): version

* fix: handle invite deletion error

* fix: handle url deletion error

---------

Co-authored-by: dicedtomato <35403473+diced@users.noreply.github.com>

.devcontainer/Dockerfile

@@ -0,0 +1,10 @@
+FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-18
+
+RUN usermod -l zipline node \
+    && groupmod -n zipline node \
+    && usermod -d /home/zipline zipline \
+    && echo "zipline ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/zipline \
+    && chmod 0440 /etc/sudoers.d/zipline \
+    && sudo apt-get update && apt-get install gnupg2 -y
+
+USER zipline

.devcontainer/devcontainer.json

@@ -0,0 +1,56 @@
+{
+  "name": "Zipline Codespace",
+  "dockerComposeFile": "docker-compose.yml",
+  "service": "app",
+  "workspaceFolder": "/zipline",
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "username": "zipline"
+    },
+    "ghcr.io/devcontainers/features/docker-in-docker:1": {
+      "dockerDashComposeVersion": "v2",
+      "installDockerBuildx": true
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "[typescript]": {
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
+        },
+        "[typescriptreact]": {
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
+        },
+        "editor.defaultFormatter": "esbenp.prettier-vscode",
+        "editor.formatOnSave": true,
+        "files.autoSave": "afterDelay",
+        "terminal.integrated.persistentSessionReviveProcess": "never",
+        "terminal.integrated.defaultProfile.linux": "zsh",
+        "terminal.integrated.profiles.linux": {
+          "zsh": {
+            "path": "/bin/zsh",
+            "env": {
+              "ZSH_THEME": "devcontainers"
+            }
+          }
+        }
+      },
+      "extensions": ["prisma.prisma", "esbenp.prettier-vscode", "dbaeumer.vscode-eslint"]
+    }
+  },
+  "remoteUser": "zipline",
+  "updateRemoteUserUID": true,
+  "remoteEnv": {
+    "CORE_DATABASE_URL": "postgres://postgres:postgres@localhost/zip10"
+  },
+  "portsAttributes": {
+    "3000": {
+      "label": "Zipline",
+      "onAutoForward": "openBrowser"
+    },
+    "5432": {
+      "label": "Postgres"
+    }
+  },
+  "postCreateCommand": "sudo chown -R zipline:zipline /zipline && yarn install"
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,25 @@
+version: '3.8'
+services:
+  app:
+    build:
+      context: ./
+      dockerfile: Dockerfile
+    volumes:
+      - ../:/zipline:cached
+      - uploads:/zipline/uploads
+      - node_modules:/zipline/node_modules
+    command: sleep infinity
+  db:
+    image: postgres:latest
+    restart: unless-stopped
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_DATABASE=postgres
+    volumes:
+      - pg_data:/var/lib/postgresql/data
+
+volumes:
+  pg_data:
+  uploads:
+  node_modules:

.env.local.example

@@ -1,47 +1,50 @@
 # every field in here is optional except, CORE_SECRET and CORE_DATABASE_URL.
 # if CORE_SECRET is still "changethis" then zipline will exit and tell you to change it.
 
-# if using s3/swift make sure to comment out the other datasources
+# if using s3/supabase make sure to uncomment or comment out the correct lines needed.
 
-CORE_HTTPS=true
+CORE_RETURN_HTTPS=true
 CORE_SECRET="changethis"
 CORE_HOST=0.0.0.0
 CORE_PORT=3000
 CORE_DATABASE_URL="postgres://postgres:postgres@localhost/zip10"
 CORE_LOGGER=false
 CORE_STATS_INTERVAL=1800
+CORE_INVITES_INTERVAL=1800
+CORE_THUMBNAILS_INTERVAL=600
 
 # default
 DATASOURCE_TYPE=local
 DATASOURCE_LOCAL_DIRECTORY=./uploads
 
 # or you can choose to use s3
-DATASOURCE_TYPE=s3
-DATASOURCE_S3_ACCESS_KEY_ID=key
-DATASOURCE_S3_SECRET_ACCESS_KEY=secret
-DATASOURCE_S3_BUCKET=bucket
-DATASOURCE_S3_ENDPOINT=s3.amazonaws.com
-DATASOURCE_S3_REGION=us-west-2
-DATASOURCE_S3_FORCE_S3_PATH=false
-DATASOURCE_S3_USE_SSL=false
+# DATASOURCE_TYPE=s3
+# DATASOURCE_S3_ACCESS_KEY_ID=key
+# DATASOURCE_S3_SECRET_ACCESS_KEY=secret
+# DATASOURCE_S3_BUCKET=bucket
+# DATASOURCE_S3_ENDPOINT=s3.amazonaws.com
+# DATASOURCE_S3_REGION=us-west-2
+# DATASOURCE_S3_FORCE_S3_PATH=false
+# DATASOURCE_S3_USE_SSL=false
 
-# or you can use swift
-DATASOURCE_TYPE=swift
-DATASOURCE_SWIFT_CONTAINER=container
-DATASOURCE_SWIFT_AUTH_ENDPOINT="https://something/v3"
-DATASOURCE_SWIFT_USERNAME=username
-DATASOURCE_SWIFT_PASSWORD=password
-DATASOURCE_SWIFT_PROJECT_ID=project_id
-DATASOURCE_SWIFT_DOMAIN_ID=domain_id
+# or supabase
+# DATASOURCE_TYPE=supabase
+# DATASOURCE_SUPABASE_KEY=xxx
+# remember: no leading slash
+# DATASOURCE_SUPABASE_URL=https://something.supabase.co
+# DATASOURCE_SUPABASE_BUCKET=zipline
 
+UPLOADER_DEFAULT_FORMAT=RANDOM
 UPLOADER_ROUTE=/u
 UPLOADER_LENGTH=6
 UPLOADER_ADMIN_LIMIT=104900000
 UPLOADER_USER_LIMIT=104900000
-UPLOADER_DISABLED_EXTENSIONS=someext
+UPLOADER_DISABLED_EXTENSIONS=someext,anotherext
 
 URLS_ROUTE=/go
 URLS_LENGTH=6
 
-RATELIMIT_USER = 5
-RATELIMIT_ADMIN = 3
+RATELIMIT_USER=5
+RATELIMIT_ADMIN=3
+
+# for more variables checkout the docs

.eslintignore

@@ -0,0 +1,7 @@
+node_modules
+dist
+.yarn
+.devcontainer
+.github
+.next
+.vscode

.eslintrc.json

@@ -1,5 +1,13 @@
 {
-  "extends": ["next", "next/core-web-vitals", "plugin:prettier/recommended"],
+  "root": true,
+  "extends": [
+    "next",
+    "next/core-web-vitals",
+    "plugin:prettier/recommended",
+    "plugin:@typescript-eslint/recommended"
+  ],
+  "plugins": ["unused-imports", "@typescript-eslint"],
+  "parser": "@typescript-eslint/parser",
   "rules": {
     "linebreak-style": ["error", "unix"],
     "quotes": [
@@ -28,6 +36,14 @@
     "react/style-prop-object": "warn",
     "@next/next/no-img-element": "off",
     "jsx-a11y/alt-text": "off",
-    "react/display-name": "off"
+    "react/display-name": "off",
+    "no-unused-vars": "off",
+    "@typescript-eslint/no-unused-vars": "off",
+    "unused-imports/no-unused-imports": "error",
+    "unused-imports/no-unused-vars": [
+      "error",
+      { "vars": "all", "varsIgnorePattern": "^_", "args": "after-used", "argsIgnorePattern": "^_" }
+    ],
+    "@typescript-eslint/ban-ts-comment": "off"
   }
 }

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: diced

.github/ISSUE_TEMPLATE/bug.yml

@@ -15,10 +15,10 @@ body:
     id: version
     attributes:
       label: Version
-      description: What version of Zipline are you using?
+      description: What version (or docker image) of Zipline are you using?
       options:
+        - latest (ghcr.io/diced/zipline or ghcr.io/diced/zipline:latest)
         - upstream (ghcr.io/diced/zipline:trunk)
-        - latest (ghcr.io/diced/zipline:latest)
         - other (provide version in additional info)
     validations:
       required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,11 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Feature Request
+    url: https://github.com/diced/zipline/discussions/new?category=ideas&title=Your%20brief%20description%20here&labels=feature
+    about: Ask for a new feature
   - name: Zipline Discord
     url: https://discord.gg/EAhCRfGxCF
     about: Ask for help with anything related to Zipline!
   - name: Zipline Docs
-    url: https://zipline.diced.tech
+    url: https://zipline.diced.sh
     about: Maybe take a look a the docs?

.github/ISSUE_TEMPLATE/suggest.yml

@@ -1,12 +0,0 @@
-name: Suggestion
-description: Suggest a feature to be added
-title: 'Suggestion: '
-labels: ['suggestion']
-body:
-  - type: textarea
-    id: suggest
-    attributes:
-      label: Suggestion
-      description: Be as descriptive as possible!
-      placeholder: What do you want in Zipline?
-      value: A suggestion

.github/workflows/milestone.yml

@@ -0,0 +1,31 @@
+name: 'Issue/PR Milestones'
+
+on:
+  pull_request_target:
+    types: [opened, reopened]
+  issues:
+    types: [opened, reopened]
+
+permissions:
+  issues: write
+  checks: write
+  contents: read
+  pull-requests: write
+
+jobs:
+  set:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/github-script@v6
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const milestone = 3
+            github.rest.issues.update({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              milestone
+            })

.gitignore

@@ -41,5 +41,5 @@ yarn-error.log*
 
 # zipline
 config.toml
-uploads/
+uploads*/
 dist/

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.yarnrc.yml

@@ -5,5 +5,7 @@ nodeLinker: node-modules
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-3.2.4.cjs
+yarnPath: .yarn/releases/yarn-3.3.1.cjs

CONTRIBUTING.md

@@ -12,9 +12,9 @@ Create an issue on GitHub, please include the following (if one of them is not a
 
 ## Feature requests
 
-Create an issue on GitHub, please include the following:
+Create an discussion on GitHub, please include the following:
 
-- Breif explanation of the feature in the title (very breif please)
+- Brief explanation of the feature in the title (very brief please)
 - How it would work (detailed, but optional)
 
 ## Pull Requests (contributions to the codebase)

Dockerfile

@@ -1,64 +1,76 @@
-FROM ghcr.io/diced/prisma-binaries:4.5.x as prisma
+# Use the Prisma binaries image as the first stage
+FROM ghcr.io/diced/prisma-binaries:5.1.x as prisma
 
-FROM node:alpine3.16 AS deps
-RUN mkdir -p /prisma-engines
-WORKDIR /build
+# Use Alpine Linux as the second stage
+FROM node:18-alpine3.16 as base
 
-COPY .yarn .yarn
-COPY package.json yarn.lock .yarnrc.yml ./
-
-RUN yarn install --immutable
-
-FROM node:alpine3.16 AS builder
-WORKDIR /build
-
-COPY --from=prisma /prisma-engines /prisma-engines
-ENV PRISMA_QUERY_ENGINE_BINARY=/prisma-engines/query-engine \
-  PRISMA_MIGRATION_ENGINE_BINARY=/prisma-engines/migration-engine \
-  PRISMA_INTROSPECTION_ENGINE_BINARY=/prisma-engines/introspection-engine \
-  PRISMA_FMT_BINARY=/prisma-engines/prisma-fmt \
-  PRISMA_CLI_QUERY_ENGINE_TYPE=binary \
-  PRISMA_CLIENT_ENGINE_TYPE=binary
-
-RUN apk add --no-cache openssl openssl-dev
-
-COPY --from=deps /build/node_modules ./node_modules
-COPY src ./src
-COPY prisma ./prisma
-COPY .yarn .yarn
-COPY package.json yarn.lock .yarnrc.yml esbuild.config.js next.config.js next-env.d.ts zip-env.d.ts tsconfig.json mimes.json ./
-
-ENV ZIPLINE_DOCKER_BUILD 1
-ENV NEXT_TELEMETRY_DISABLED 1
-
-RUN yarn build
-
-FROM node:alpine3.16 AS runner
+# Set the working directory
 WORKDIR /zipline
 
+# Copy the necessary files from the project
+COPY prisma ./prisma
+
+COPY .yarn ./.yarn
+COPY package*.json ./
+COPY yarn*.lock ./
+COPY .yarnrc.yml ./
+
+# Copy the prisma binaries from prisma stage
 COPY --from=prisma /prisma-engines /prisma-engines
 ENV PRISMA_QUERY_ENGINE_BINARY=/prisma-engines/query-engine \
-  PRISMA_MIGRATION_ENGINE_BINARY=/prisma-engines/migration-engine \
-  PRISMA_INTROSPECTION_ENGINE_BINARY=/prisma-engines/introspection-engine \
-  PRISMA_FMT_BINARY=/prisma-engines/prisma-fmt \
+  PRISMA_SCHEMA_ENGINE_BINARY=/prisma-engines/schema-engine \
   PRISMA_CLI_QUERY_ENGINE_TYPE=binary \
-  PRISMA_CLIENT_ENGINE_TYPE=binary
+  PRISMA_CLIENT_ENGINE_TYPE=binary \
+  ZIPLINE_DOCKER_BUILD=true \
+  NEXT_TELEMETRY_DISABLED=1
 
-RUN apk add --no-cache openssl openssl-dev
+# Install the dependencies
+RUN yarn install --immutable
 
-ENV NODE_ENV production
-ENV NEXT_TELEMETRY_DISABLED 1
+FROM base as builder
 
-COPY --from=builder /build/.next ./.next
-COPY --from=builder /build/node_modules ./node_modules
+COPY src ./src
+COPY next.config.js ./next.config.js
+COPY tsup.config.ts ./tsup.config.ts
+COPY tsconfig.json ./tsconfig.json
+COPY mimes.json ./mimes.json
+COPY public ./public
 
-COPY --from=builder /build/next.config.js ./next.config.js
-COPY --from=builder /build/esbuild.config.js ./esbuild.config.js
-COPY --from=builder /build/src ./src
-COPY --from=builder /build/dist ./dist
-COPY --from=builder /build/prisma ./prisma
-COPY --from=builder /build/tsconfig.json ./tsconfig.json
-COPY --from=builder /build/package.json ./package.json
-COPY --from=builder /build/mimes.json ./mimes.json
+# Run the build
+RUN yarn build
 
-CMD ["node", "--enable-source-maps", "dist/server"]
+# Use Alpine Linux as the final image
+FROM base
+
+# Install the necessary packages
+RUN apk add --no-cache perl procps tini
+
+COPY --from=prisma /prisma-engines /prisma-engines
+ENV PRISMA_QUERY_ENGINE_BINARY=/prisma-engines/query-engine \
+  PRISMA_SCHEMA_ENGINE_BINARY=/prisma-engines/schema-engine \
+  PRISMA_CLI_QUERY_ENGINE_TYPE=binary \
+  PRISMA_CLIENT_ENGINE_TYPE=binary \
+  ZIPLINE_DOCKER_BUILD=true \
+  NEXT_TELEMETRY_DISABLED=1
+
+
+# Copy only the necessary files from the previous stage
+COPY --from=builder /zipline/dist ./dist
+COPY --from=builder /zipline/.next ./.next
+
+COPY --from=builder /zipline/mimes.json ./mimes.json
+COPY --from=builder /zipline/next.config.js ./next.config.js
+COPY --from=builder /zipline/public ./public
+
+# Copy Startup Script
+COPY docker-entrypoint.sh /zipline
+
+# Make Startup Script Executable
+RUN chmod a+x /zipline/docker-entrypoint.sh && rm -rf /zipline/src
+
+# Clean up
+RUN rm -rf /tmp/* /root/* 
+RUN yarn cache clean --all
+
+# Set the entrypoint to the startup script
+ENTRYPOINT ["tini", "--", "/zipline/docker-entrypoint.sh"]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 dicedtomato
+Copyright (c) 2024 dicedtomato
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,9 +8,9 @@ A ShareX/file upload server that is easy to use, packed with features, and with
 ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/diced/zipline/trunk?logo=git&logoColor=white&style=flat)
 [![Discord](https://img.shields.io/discord/729771078196527176?color=%23777ed3&label=discord&logo=discord&logoColor=white&style=flat)](https://discord.gg/EAhCRfGxCF)
 
-![Build](https://img.shields.io/github/workflow/status/diced/zipline/Build?logo=github&style=flat)
-[![Docker Image (trunk)](https://img.shields.io/github/workflow/status/diced/zipline/Push%20Docker%20Images?label=Docker%20%28trunk%29&logo=github&style=flat)](https://github.com/diced/zipline/pkgs/container/zipline/?tag=trunk)
-[![Docker Image (release)](https://img.shields.io/github/workflow/status/diced/zipline/Push%20Release%20Docker%20Images?label=Docker%20%28release%29&logo=github&style=flat)](https://github.com/diced/zipline/pkgs/container/zipline/?tag=latest)
+![Build](https://img.shields.io/github/actions/workflow/status/diced/zipline/build.yml?logo=github&style=flat&branch=trunk)
+[![Docker Image (trunk)](https://img.shields.io/github/actions/workflow/status/diced/zipline/docker.yml?label=Docker%20%28trunk%29&logo=github&style=flat&branch=trunk)](https://github.com/diced/zipline/pkgs/container/zipline/?tag=trunk)
+[![Docker Image (release)](https://img.shields.io/github/actions/workflow/status/diced/zipline/docker-release.yml?label=Docker%20%28release%29&logo=github&style=flat&branch=trunk)](https://github.com/diced/zipline/pkgs/container/zipline/?tag=latest)
 
 </div>
 
@@ -25,16 +25,18 @@ A ShareX/file upload server that is easy to use, packed with features, and with
 - Password Protected Uploads
 - URL shortening
 - Text uploading
-- URL Formats (uuid, dates, random alphanumeric, original name, zws)
+- URL Formats (uuid, dates, random alphanumeric, original name, zws, gfycat -> [animals](https://assets.gfycat.com/animals) [adjectives](https://assets.gfycat.com/adjectives))
 - Discord embeds (OG metadata)
 - Gallery viewer, and multiple file format support
 - Code highlighting
 - Fully customizable Discord webhook notifications
 - OAuth2 registration (Discord and GitHub)
+- Two-Factor authentication with Google Authenticator, Authy, etc (totp services).
 - User invites
 - File Chunking (for large files)
 - File deletion once it reaches a certain amount of views
-- Easy setup instructions on [docs](https://zipl.vercel.app/) (One command install `docker-compose up -d`)
+- Automatic video thumbnail generation
+- Easy setup instructions on [docs](https://zipl.vercel.app/) (One command install `docker compose up -d`)
 
 <details>
   <summary><h2>Screenshots (click)</h2></summary>
@@ -50,13 +52,13 @@ A ShareX/file upload server that is easy to use, packed with features, and with
 
 ## Install & run with Docker
 
-This section requires [Docker](https://docs.docker.com/get-docker/) and [docker-compose](https://docs.docker.com/compose/install/).
+This section requires [Docker](https://docs.docker.com/get-docker/) and [docker compose](https://docs.docker.com/compose/install/).
 
 ```shell
 git clone https://github.com/diced/zipline
 cd zipline
 
-docker-compose up -d
+docker compose up -d
 ```
 
 ### After installing
@@ -66,17 +68,18 @@ Ways you could generate the string could be from a password managers generator,
 
 ## Building & running from source
 
-This section requires [nodejs](https://nodejs.org), [yarn](https://yarnpkg.com/) or [npm](https://npmjs.com).
+This section requires [nodejs](https://nodejs.org), [yarn](https://yarnpkg.com/).
+
+It is recommended to not use npm, as it can cause issues with the build process.
+
+Before you run `yarn build`, you might want to configure Zipline, as when building from source Zipline will need to read some sort of configuration. The only two variables needed are `CORE_SECRET` and `CORE_DATABASE_URL`.
 
 ```shell
 git clone https://github.com/diced/zipline
 cd zipline
 
-# npm install
 yarn install
-# npm run build
 yarn build
-# npm start
 yarn start
 ```
 
@@ -109,10 +112,28 @@ This section requires [ShareX](https://www.getsharex.com/).
 
 After navigating to Zipline, click on the top right corner where it says your username and click Manage Account. Scroll down to see "ShareX Config", select the one you would prefer using. After this you can import the .sxcu into sharex. [More information here](https://zipl.vercel.app/docs/guides/uploaders/sharex)
 
-# Flameshot (Linux)
+# Flameshot (Linux(Xorg/Wayland) and macOS)
 
 This section requires [Flameshot](https://www.flameshot.org/), [jq](https://stedolan.github.io/jq/), and [xsel](https://github.com/kfish/xsel).
 
+<details>
+  <summary>Wayland instructions</summary>
+  
+If using wayland you will need to have [wl-clipboard](https://github.com/bugaevc/wl-clipboard) installed, for the `wl-copy` command.
+
+If you are not using GNOME/KDE/Qtile/Sway, and are using something like a wlroots-based compositor (ex. [Hyprland](https://github.com/hyprwm/Hyprland/), [River](https://github.com/riverwm/river), etc), you will need to set the `XDG_CURRENT_DESKTOP` environment variable to `sway`, which will just override it for this script. Adding `export XDG_CURRENT_DESKTOP=sway` to the start of the script will work.
+
+After this, replace the `xsel -ib` with `wl-copy` in the script.
+
+</details>
+
+<details>
+  <summary>Mac instructions</summary>
+
+If using macOS, you can replace the `xsel -ib` with `pbcopy` in the script.
+
+</details>
+
 You can either use the script below, or generate one directly from Zipline (just like how you can generate a ShareX config).
 To upload files using flameshot we will use a script. Replace $TOKEN and $HOST with your own values, you probably know how to do this if you use linux.
 
@@ -127,7 +148,7 @@ curl -H "Content-Type: multipart/form-data" -H "authorization: $TOKEN" -F file=@
 
 ## Bug reports
 
-Create an issue on GitHub, please include the following (if one of them is not applicable to the issue then it's not needed):
+Create an issue on GitHub and use the template, please include the following (if one of them is not applicable to the issue then it's not needed):
 
 - The steps to reproduce the bug
 - Logs of Zipline
@@ -137,11 +158,15 @@ Create an issue on GitHub, please include the following (if one of them is not a
 
 ## Feature requests
 
-Create an issue on GitHub, please include the following:
+Create a discussion on GitHub, please include the following:
 
-- Breif explanation of the feature in the title (very breif please)
-- How it would work (detailed, but optional)
+- Brief explanation of the feature in the title (very brief please)
+- How it would work (Be detailed!)
 
 ## Pull Requests (contributions to the codebase)
 
 Create a pull request on GitHub. If your PR does not pass the action checks, then please fix the errors. If your PR was submitted before a release, and I have pushed a new release, please make sure to update your PR to reflect any changes, usually this is handled by GitHub.
+
+# Documentation
+
+Documentation source code is located in [diced/zipline-docs](https://github.com/diced/zipline-docs), and can be accessed [here](https://zipl.vercel.app).

SECURITY.md

@@ -4,7 +4,7 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 3.4.8   | :white_check_mark: |
+| 3.6.x   | :white_check_mark: |
 | < 3     | :x:                |
 | < 2     | :x:                |
 

docker-compose.dev.yml

@@ -1,8 +1,7 @@
 version: '3'
 services:
   postgres:
-    image: postgres
-    restart: always
+    image: postgres:15
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
@@ -21,12 +20,11 @@ services:
       dockerfile: Dockerfile
     ports:
       - '3000:3000'
-    restart: unless-stopped
     env_file:
       - .env.local
     volumes:
-      - '$PWD/uploads:/zipline/uploads'
-      - '$PWD/public:/zipline/public'
+      - './uploads:/zipline/uploads'
+      - './public:/zipline/public'
     depends_on:
       - 'postgres'
 

docker-compose.yml

@@ -1,8 +1,8 @@
 version: '3'
 services:
   postgres:
-    image: postgres
-    restart: always
+    image: postgres:15
+    restart: unless-stopped
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=postgres
@@ -19,9 +19,9 @@ services:
     image: ghcr.io/diced/zipline
     ports:
       - '3000:3000'
-    restart: always
+    restart: unless-stopped
     environment:
-      - CORE_HTTPS=false
+      - CORE_RETURN_HTTPS=false
       - CORE_SECRET=changethis
       - CORE_HOST=0.0.0.0
       - CORE_PORT=3000
@@ -29,7 +29,7 @@ services:
       - CORE_LOGGER=true
     volumes:
       - './uploads:/zipline/uploads'
-      - '$PWD/public:/zipline/public'
+      - './public:/zipline/public'
     depends_on:
       - 'postgres'
 

docker-entrypoint.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+unset ZIPLINE_DOCKER_BUILD
+
+node --enable-source-maps dist/index.js

esbuild.config.js

@@ -1,23 +0,0 @@
-const esbuild = require('esbuild');
-const { existsSync } = require('fs');
-const { rm } = require('fs/promises');
-const { recursiveReadDir } = require('next/dist/lib/recursive-readdir');
-
-(async () => {
-  if (existsSync('./dist')) {
-    await rm('./dist', { recursive: true });
-  }
-
-  const entryPoints = await recursiveReadDir('./src', /.*\.(ts)$/, /(themes|queries|pages)/);
-
-  await esbuild.build({
-    tsconfig: 'tsconfig.json',
-    outdir: 'dist',
-    platform: 'node',
-    entryPoints,
-    format: 'cjs',
-    resolveExtensions: ['.ts', '.js'],
-    write: true,
-    sourcemap: true,
-  });
-})();

mimes.json

@@ -42,6 +42,9 @@
   ["afm", ["application/octet-stream"]],
   ["afp", ["application/vnd.ibm.modcap"]],
   ["ahead", ["application/vnd.ahead.space"]],
+  ["ahk", ["text/autohotkey"]],
+  ["ahk1", ["text/autohotkey"]],
+  ["ahk2", ["text/autohotkey"]],
   ["ai", ["application/postscript"]],
   ["aif", ["audio/aiff"]],
   ["aifc", ["audio/aiff"]],

next.config.js

@@ -2,15 +2,6 @@
  * @type {import('next').NextConfig}
  **/
 module.exports = {
-  async redirects() {
-    return [
-      {
-        source: '/',
-        destination: '/dashboard',
-        permanent: true,
-      },
-    ];
-  },
   images: {
     domains: [
       // For sharex icon in manage user

package.json

@@ -1,88 +1,104 @@
 {
   "name": "zipline",
-  "version": "3.6.1",
+  "version": "3.7.9",
   "license": "MIT",
   "scripts": {
     "dev": "npm-run-all build:server dev:run",
-    "dev:run": "cross-env DEBUG=true REACT_EDITOR=code NODE_ENV=development RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED=false node --enable-source-maps dist/server",
+    "dev:run": "cross-env DEBUG=true REACT_EDITOR=code NODE_ENV=development RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED=false node --enable-source-maps dist",
     "build": "npm-run-all build:server build:schema build:next",
     "build-ci": "cross-env ZIPLINE_DOCKER_BUILD=1 npm-run-all build:server build:schema build:next",
-    "build:server": "node esbuild.config.js",
+    "build:server": "tsup",
     "build:next": "next build",
     "build:schema": "prisma generate --schema=prisma/schema.prisma",
     "format": "prettier --write ./src/**/*.{ts,tsx} ./*.{md,js,json,yml}",
     "migrate:dev": "prisma migrate dev --create-only",
-    "start": "node dist/server",
+    "start": "node dist",
     "lint": "next lint",
-    "docker:run": "docker-compose up -d",
-    "docker:down": "docker-compose down",
-    "docker:build-dev": "docker-compose --file docker-compose.dev.yml up --build",
-    "scripts:read-config": "node dist/scripts/read-config",
-    "scripts:import-dir": "node dist/scripts/import-dir",
-    "scripts:list-users": "node dist/scripts/list-users",
-    "scripts:set-user": "node dist/scripts/set-user"
+    "compose:up": "docker compose up",
+    "compose:down": "docker compose down",
+    "compose:build-dev": "docker compose --file docker-compose.dev.yml up --build",
+    "compose:up-dev": "docker compose --file docker-compose.dev.yml up",
+    "compose:down-dev": "docker compose --file docker-compose.dev.yml down",
+    "scripts:read-config": "node --enable-source-maps dist/scripts/read-config",
+    "scripts:import-dir": "node --enable-source-maps dist/scripts/import-dir",
+    "scripts:list-users": "node --enable-source-maps dist/scripts/list-users",
+    "scripts:set-user": "node --enable-source-maps dist/scripts/set-user",
+    "scripts:clear-zero-byte": "node --enable-source-maps dist/scripts/clear-zero-byte",
+    "scripts:query-size": "node --enable-source-maps dist/scripts/query-size",
+    "scripts:clear-temp": "node --enable-source-maps dist/scripts/clear-temp"
   },
   "dependencies": {
-    "@dicedtomato/mantine-data-grid": "0.0.23",
-    "@emotion/react": "^11.10.5",
-    "@emotion/server": "^11.10.0",
-    "@mantine/core": "^5.6.3",
-    "@mantine/dropzone": "^5.6.3",
-    "@mantine/form": "^5.6.3",
-    "@mantine/hooks": "^5.6.3",
-    "@mantine/modals": "^5.6.3",
-    "@mantine/next": "^5.6.3",
-    "@mantine/notifications": "^5.6.3",
-    "@mantine/nprogress": "^5.6.3",
-    "@mantine/prism": "^5.6.3",
-    "@prisma/client": "^4.5.0",
-    "@prisma/internals": "^4.5.0",
-    "@prisma/migrate": "^4.5.0",
-    "@sapphire/shapeshift": "^3.7.0",
-    "@tanstack/react-query": "^4.13.0",
-    "argon2": "^0.30.1",
-    "chart.js": "^3.9.1",
-    "chartjs-plugin-datalabels": "^2.1.0",
-    "color-hash": "^2.0.1",
-    "colorette": "^2.0.19",
-    "cookie": "^0.5.0",
-    "dayjs": "^1.11.6",
-    "dotenv": "^16.0.3",
-    "dotenv-expand": "^9.0.0",
-    "fflate": "^0.7.4",
-    "find-my-way": "^7.3.1",
-    "minio": "^7.0.32",
+    "@emotion/react": "^11.11.1",
+    "@emotion/server": "^11.11.0",
+    "@mantine/core": "^6.0.21",
+    "@mantine/dropzone": "^6.0.21",
+    "@mantine/form": "^6.0.21",
+    "@mantine/hooks": "^6.0.21",
+    "@mantine/modals": "^6.0.21",
+    "@mantine/next": "^6.0.21",
+    "@mantine/notifications": "^6.0.21",
+    "@mantine/prism": "^6.0.21",
+    "@mantine/spotlight": "^6.0.21",
+    "@prisma/client": "^5.1.1",
+    "@prisma/internals": "^5.1.1",
+    "@prisma/migrate": "^5.1.1",
+    "@sapphire/shapeshift": "^3.9.3",
+    "@tabler/icons-react": "^2.41.0",
+    "@tanstack/react-query": "^4.28.0",
+    "argon2": "^0.31.2",
+    "cookie": "^0.6.0",
+    "dayjs": "^1.11.10",
+    "dotenv": "^16.3.1",
+    "dotenv-expand": "^10.0.0",
+    "exiftool-vendored": "^23.4.0",
+    "fastify": "^4.24.3",
+    "fastify-plugin": "^4.5.1",
+    "fflate": "^0.8.1",
+    "ffmpeg-static": "^5.2.0",
+    "find-my-way": "^7.7.0",
+    "katex": "^0.16.9",
+    "mantine-datatable": "^2.9.14",
+    "minio": "^7.1.3",
     "ms": "canary",
     "multer": "^1.4.5-lts.1",
-    "next": "^13.0.0",
-    "prisma": "^4.5.0",
+    "next": "^14.0.3",
+    "otplib": "^12.0.1",
+    "prisma": "^5.1.1",
+    "prismjs": "^1.29.0",
+    "qrcode": "^1.5.3",
     "react": "^18.2.0",
-    "react-chartjs-2": "^4.3.1",
     "react-dom": "^18.2.0",
-    "react-feather": "^2.0.10",
-    "recoil": "^0.7.6",
-    "sharp": "^0.31.1"
+    "react-markdown": "^8.0.6",
+    "recharts": "^2.10.1",
+    "recoil": "^0.7.7",
+    "remark-gfm": "^4.0.0",
+    "sharp": "^0.32.6"
   },
   "devDependencies": {
-    "@types/cookie": "^0.5.1",
-    "@types/minio": "^7.0.14",
-    "@types/multer": "^1.4.7",
-    "@types/node": "^18.11.7",
-    "@types/react": "^18.0.24",
-    "@types/sharp": "^0.31.0",
+    "@types/cookie": "^0.5.4",
+    "@types/katex": "^0.16.6",
+    "@types/minio": "^7.1.1",
+    "@types/multer": "^1.4.10",
+    "@types/node": "^18.18.10",
+    "@types/qrcode": "^1.5.5",
+    "@types/react": "^18.2.37",
+    "@types/sharp": "^0.32.0",
+    "@typescript-eslint/eslint-plugin": "^6.11.0",
+    "@typescript-eslint/parser": "^6.11.0",
     "cross-env": "^7.0.3",
-    "esbuild": "^0.15.12",
-    "eslint": "^8.26.0",
-    "eslint-config-next": "^13.0.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint": "^8.54.0",
+    "eslint-config-next": "^14.0.3",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-unused-imports": "^3.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.7.1",
-    "typescript": "^4.8.4"
+    "prettier": "^3.1.0",
+    "tsup": "^8.0.0",
+    "typescript": "^5.2.2"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/diced/zipline.git"
   },
-  "packageManager": "yarn@3.2.4"
+  "packageManager": "yarn@3.3.1"
 }

prisma/migrations/20221118014033_totp_secret/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "totpSecret" TEXT;

prisma/migrations/20221129041646_add_on_delete_to_all_relations/migration.sql

@@ -0,0 +1,26 @@
+-- DropForeignKey
+ALTER TABLE "InvisibleImage" DROP CONSTRAINT "InvisibleImage_imageId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "InvisibleUrl" DROP CONSTRAINT "InvisibleUrl_urlId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "Invite" DROP CONSTRAINT "Invite_createdById_fkey";
+
+-- DropForeignKey
+ALTER TABLE "Url" DROP CONSTRAINT "Url_userId_fkey";
+
+-- AlterTable
+ALTER TABLE "Url" ALTER COLUMN "userId" DROP NOT NULL;
+
+-- AddForeignKey
+ALTER TABLE "InvisibleImage" ADD CONSTRAINT "InvisibleImage_imageId_fkey" FOREIGN KEY ("imageId") REFERENCES "Image"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Url" ADD CONSTRAINT "Url_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "InvisibleUrl" ADD CONSTRAINT "InvisibleUrl_urlId_fkey" FOREIGN KEY ("urlId") REFERENCES "Url"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Invite" ADD CONSTRAINT "Invite_createdById_fkey" FOREIGN KEY ("createdById") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/migrations/20221207035224_add_oauth_user_id/migration.sql

@@ -0,0 +1,12 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[provider,oauthId]` on the table `OAuth` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `oauthId` to the `OAuth` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "OAuth" ADD COLUMN     "oauthId" TEXT;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "OAuth_provider_oauthId_key" ON "OAuth"("provider", "oauthId");

prisma/migrations/20230111055303_embed/migration.sql

@@ -0,0 +1,13 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `embedColor` on the `User` table. All the data in the column will be lost.
+  - You are about to drop the column `embedSiteName` on the `User` table. All the data in the column will be lost.
+  - You are about to drop the column `embedTitle` on the `User` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "User" DROP COLUMN "embedColor",
+DROP COLUMN "embedSiteName",
+DROP COLUMN "embedTitle",
+ADD COLUMN     "embed" JSONB NOT NULL DEFAULT '{}';

prisma/migrations/20230115193136_rename_fields_image/migration.sql

@@ -0,0 +1,8 @@
+-- AlterTable
+ALTER TABLE "Image" RENAME COLUMN "created_at" TO "createdAt";
+
+-- AlterTable
+ALTER TABLE "Image" RENAME COLUMN "expires_at" TO "expiresAt";
+
+-- AlterTable
+ALTER TABLE "Image" RENAME COLUMN "file" TO "name";

prisma/migrations/20230115195550_rename_fields_url/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Url" RENAME COLUMN "created_at" TO "createdAt";

prisma/migrations/20230115195803_rename_fields_stats/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable 
+ALTER TABLE "Stats" RENAME COLUMN "created_at" TO "createdAt";

prisma/migrations/20230115195906_rename_fields_invite/migration.sql

@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "Invite" RENAME COLUMN "created_at" TO "createdAt";
+
+-- AlterTable
+ALTER TABLE "Invite" RENAME COLUMN "expires_at" TO "expiresAt";

prisma/migrations/20230115200747_rename_image_file/migration.sql

@@ -0,0 +1,19 @@
+-- AlterEnum
+ALTER TYPE "ImageFormat" RENAME TO "FileNameFormat";
+
+-- AlterTable
+ALTER TABLE "Image" RENAME TO "File";
+
+-- AlterTable
+ALTER TABLE "InvisibleImage" RENAME TO "InvisibleFile";
+
+-- AlterTable
+ALTER TABLE "InvisibleFile" RENAME COLUMN "imageId" TO "fileId";
+
+-- AlterForeignKey
+ALTER TABLE "InvisibleFile" RENAME CONSTRAINT "InvisibleImage_imageId_fkey" TO "InvisibleFile_fileId_fkey";
+ALTER INDEX "InvisibleImage_imageId_key" RENAME TO "InvisibleFile_fileId_key";
+
+-- AlterForeignKey
+ALTER TABLE "InvisibleFile" RENAME CONSTRAINT "InvisibleImage_pkey" TO "InvisibleFile_pkey";
+ALTER TABLE "File" RENAME CONSTRAINT "Image_pkey" TO "File_pkey";

prisma/migrations/20230115214317_file_original_name/migration.sql

@@ -0,0 +1,8 @@
+-- AlterTable
+ALTER TABLE "File" ADD COLUMN     "originalName" TEXT;
+
+-- RenameForeignKey
+ALTER TABLE "File" RENAME CONSTRAINT "Image_userId_fkey" TO "File_userId_fkey";
+
+-- RenameIndex
+ALTER INDEX "InvisibleImage_invis_key" RENAME TO "InvisibleFile_invis_key";

prisma/migrations/20230128183334_folders/migration.sql

@@ -0,0 +1,19 @@
+-- AlterTable
+ALTER TABLE "File" ADD COLUMN     "folderId" INTEGER;
+
+-- CreateTable
+CREATE TABLE "Folder" (
+    "id" SERIAL NOT NULL,
+    "name" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "userId" INTEGER NOT NULL,
+
+    CONSTRAINT "Folder_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "Folder" ADD CONSTRAINT "Folder_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "File" ADD CONSTRAINT "File_folderId_fkey" FOREIGN KEY ("folderId") REFERENCES "Folder"("id") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/migrations/20230219001919_public_folder/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Folder" ADD COLUMN     "public" BOOLEAN NOT NULL DEFAULT false;

prisma/migrations/20230226051016_file_size/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "File" ADD COLUMN     "size" INTEGER NOT NULL DEFAULT 0;

prisma/migrations/20230319041331_remove_file_format/migration.sql

@@ -0,0 +1,11 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `format` on the `File` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "File" DROP COLUMN "format";
+
+-- DropEnum
+DROP TYPE "FileNameFormat";

prisma/migrations/20230328005320_incomplete_file/migration.sql

@@ -0,0 +1,18 @@
+-- CreateEnum
+CREATE TYPE "ProcessingStatus" AS ENUM ('PENDING', 'PROCESSING', 'COMPLETE');
+
+-- CreateTable
+CREATE TABLE "IncompleteFile" (
+    "id" SERIAL NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "status" "ProcessingStatus" NOT NULL,
+    "chunks" INTEGER NOT NULL,
+    "chunksComplete" INTEGER NOT NULL,
+    "userId" INTEGER NOT NULL,
+    "data" JSONB NOT NULL,
+
+    CONSTRAINT "IncompleteFile_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "IncompleteFile" ADD CONSTRAINT "IncompleteFile_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/migrations/20230405024416_user_uuid/migration.sql

@@ -0,0 +1,53 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[uuid]` on the table `User` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- PRISMA GENERATED BELOW
+-- -- DropForeignKey
+-- ALTER TABLE "OAuth" DROP CONSTRAINT "OAuth_userId_fkey";
+--
+-- -- AlterTable
+-- ALTER TABLE "OAuth" ALTER COLUMN "userId" SET DATA TYPE TEXT;
+--
+-- -- AlterTable
+-- ALTER TABLE "User" ADD COLUMN     "uuid" UUID NOT NULL DEFAULT gen_random_uuid();
+--
+-- -- CreateIndex
+-- CREATE UNIQUE INDEX "User_uuid_key" ON "User"("uuid");
+--
+-- -- AddForeignKey
+-- ALTER TABLE "OAuth" ADD CONSTRAINT "OAuth_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("uuid") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- User made changes below
+
+-- Rename old foreign key
+ALTER TABLE "OAuth" RENAME CONSTRAINT "OAuth_userId_fkey" TO "OAuth_userId_old_fkey";
+
+-- Rename old column
+ALTER TABLE "OAuth" RENAME COLUMN "userId" TO "userId_old";
+
+-- Add new column
+ALTER TABLE "OAuth" ADD COLUMN "userId" UUID;
+
+-- Add user uuid
+ALTER TABLE "User" ADD COLUMN "uuid" UUID NOT NULL DEFAULT gen_random_uuid();
+
+-- Update table "OAuth" with uuid
+UPDATE "OAuth" SET "userId" = "User"."uuid" FROM "User" WHERE "OAuth"."userId_old" = "User"."id";
+
+-- Alter table "OAuth" to make "userId" required
+ALTER TABLE "OAuth" ALTER COLUMN "userId" SET NOT NULL;
+
+-- Create index
+CREATE UNIQUE INDEX "User_uuid_key" ON "User"("uuid");
+
+-- Add new foreign key
+ALTER TABLE "OAuth" ADD CONSTRAINT "OAuth_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("uuid") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- Drop old foreign key
+ALTER TABLE "OAuth" DROP CONSTRAINT "OAuth_userId_old_fkey";
+
+-- Drop old column
+ALTER TABLE "OAuth" DROP COLUMN "userId_old";

prisma/migrations/20230523025656_thumbnails/migration.sql

@@ -0,0 +1,16 @@
+
+-- CreateTable
+CREATE TABLE "Thumbnail" (
+    "id" SERIAL NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "name" TEXT NOT NULL,
+    "fileId" INTEGER NOT NULL,
+
+    CONSTRAINT "Thumbnail_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Thumbnail_fileId_key" ON "Thumbnail"("fileId");
+
+-- AddForeignKey
+ALTER TABLE "Thumbnail" ADD CONSTRAINT "Thumbnail_fileId_fkey" FOREIGN KEY ("fileId") REFERENCES "File"("id") ON DELETE CASCADE ON UPDATE CASCADE;

prisma/migrations/20231109082848_fix_large_uploads/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "File" ALTER COLUMN "size" SET DATA TYPE BIGINT;

prisma/schema.prisma

@@ -8,99 +8,130 @@ generator client {
 }
 
 model User {
-  id            Int       @id @default(autoincrement())
-  username      String
-  password      String?
-  avatar        String?
-  token         String
-  administrator Boolean   @default(false)
-  superAdmin    Boolean   @default(false)
-  systemTheme   String    @default("system")
-  embedTitle    String?
-  embedColor    String    @default("#2f3136")
-  embedSiteName String?   @default("{image.file} • {user.name}")
-  ratelimit     DateTime?
-  domains       String[]
-  oauth         OAuth[]
-  images        Image[]
-  urls          Url[]
-  Invite        Invite[]
+  id             Int              @id @default(autoincrement())
+  uuid           String           @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid
+  username       String
+  password       String?
+  avatar         String?
+  token          String
+  administrator  Boolean          @default(false)
+  superAdmin     Boolean          @default(false)
+  systemTheme    String           @default("system")
+  embed          Json             @default("{}")
+  ratelimit      DateTime?
+  totpSecret     String?
+  domains        String[]
+  oauth          OAuth[]
+  files          File[]
+  urls           Url[]
+  Invite         Invite[]
+  Folder         Folder[]
+  IncompleteFile IncompleteFile[]
 }
 
-enum ImageFormat {
-  UUID
-  DATE
-  RANDOM
-  NAME
+model Folder {
+  id        Int      @id @default(autoincrement())
+  name      String
+  public    Boolean  @default(false)
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  user   User @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId Int
+
+  files File[]
 }
 
-model Image {
-  id         Int             @id @default(autoincrement())
-  file       String
-  mimetype   String          @default("image/png")
-  created_at DateTime        @default(now())
-  expires_at DateTime?
-  maxViews   Int?
-  views      Int             @default(0)
-  favorite   Boolean         @default(false)
-  embed      Boolean         @default(false)
-  password   String?
-  invisible  InvisibleImage?
-  format     ImageFormat     @default(RANDOM)
-  user       User?            @relation(fields: [userId], references: [id], onDelete: SetNull)
-  userId     Int?
+model File {
+  id           Int            @id @default(autoincrement())
+  name         String
+  originalName String?
+  mimetype     String         @default("image/png")
+  createdAt    DateTime       @default(now())
+  size         BigInt         @default(0)
+  expiresAt    DateTime?
+  maxViews     Int?
+  views        Int            @default(0)
+  favorite     Boolean        @default(false)
+  embed        Boolean        @default(false)
+  password     String?
+  invisible    InvisibleFile?
+
+  user   User? @relation(fields: [userId], references: [id], onDelete: SetNull)
+  userId Int?
+
+  folder   Folder? @relation(fields: [folderId], references: [id], onDelete: SetNull)
+  folderId Int?
+
+  thumbnail Thumbnail?
 }
 
-model InvisibleImage {
-  id      Int    @id @default(autoincrement())
-  invis   String @unique
-  imageId Int    @unique
-  image   Image  @relation(fields: [imageId], references: [id])
+model Thumbnail {
+  id        Int      @id @default(autoincrement())
+  createdAt DateTime @default(now())
+  name      String
+
+  fileId Int  @unique
+  file   File @relation(fields: [fileId], references: [id], onDelete: Cascade)
+}
+
+model InvisibleFile {
+  id    Int    @id @default(autoincrement())
+  invis String @unique
+
+  fileId Int  @unique
+  file   File @relation(fields: [fileId], references: [id], onDelete: Cascade)
 }
 
 model Url {
   id          String        @id @unique
   destination String
   vanity      String?
-  created_at  DateTime      @default(now())
+  createdAt   DateTime      @default(now())
   maxViews    Int?
   views       Int           @default(0)
   invisible   InvisibleUrl?
-  user        User          @relation(fields: [userId], references: [id])
-  userId      Int
+
+  user   User? @relation(fields: [userId], references: [id], onDelete: SetNull)
+  userId Int?
 }
 
 model InvisibleUrl {
   id    Int    @id @default(autoincrement())
   invis String @unique
+
   urlId String @unique
-  url   Url    @relation(fields: [urlId], references: [id])
+  url   Url    @relation(fields: [urlId], references: [id], onDelete: Cascade)
 }
 
 model Stats {
-  id         Int      @id @default(autoincrement())
-  created_at DateTime @default(now())
-  data       Json
+  id        Int      @id @default(autoincrement())
+  createdAt DateTime @default(now())
+  data      Json
 }
 
 model Invite {
-  id          Int       @id @default(autoincrement())
-  code        String    @unique
-  created_at  DateTime  @default(now())
-  expires_at  DateTime?
-  used        Boolean   @default(false)
-  createdBy   User      @relation(fields: [createdById], references: [id])
+  id        Int       @id @default(autoincrement())
+  code      String    @unique
+  createdAt DateTime  @default(now())
+  expiresAt DateTime?
+  used      Boolean   @default(false)
+
+  createdBy   User @relation(fields: [createdById], references: [id], onDelete: Cascade)
   createdById Int
 }
 
 model OAuth {
   id       Int            @id @default(autoincrement())
   provider OauthProviders
-  user     User           @relation(fields: [userId], references: [id], onDelete: Cascade)
-  userId   Int
+  user     User           @relation(fields: [userId], references: [uuid], onDelete: Cascade)
+  userId   String         @db.Uuid
   username String
+  oauthId  String?
   token    String
   refresh  String?
+
+  @@unique([provider, oauthId])
 }
 
 enum OauthProviders {
@@ -108,3 +139,23 @@ enum OauthProviders {
   GITHUB
   GOOGLE
 }
+
+model IncompleteFile {
+  id        Int      @id @default(autoincrement())
+  createdAt DateTime @default(now())
+
+  status         ProcessingStatus
+  chunks         Int
+  chunksComplete Int
+
+  user   User @relation(fields: [userId], references: [id], onDelete: Cascade)
+  userId Int
+
+  data Json
+}
+
+enum ProcessingStatus {
+  PENDING
+  PROCESSING
+  COMPLETE
+}

src/components/AnchorNext.tsx

@@ -0,0 +1,6 @@
+import { Anchor } from '@mantine/core';
+import Link from 'next/link';
+
+export default function AnchorNext({ href, ...others }) {
+  return <Anchor component={Link} href={href} {...others} />;
+}

src/components/CodeInput.tsx

@@ -1,15 +1,36 @@
-import { createStyles, MantineSize, Textarea } from '@mantine/core';
+import { createStyles, Textarea } from '@mantine/core';
+import { useEffect } from 'react';
 
-const useStyles = createStyles((theme, { size }: { size: MantineSize }) => ({
+const useStyles = createStyles(() => ({
   input: {
     fontFamily: 'monospace',
-    fontSize: theme.fn.size({ size, sizes: theme.fontSizes }) - 2,
     height: '80vh',
   },
 }));
 
 export default function CodeInput({ ...props }) {
-  const { classes } = useStyles({ size: 'md' }, { name: 'CodeInput' });
+  const { classes } = useStyles(null, { name: 'CodeInput' });
 
-  return <Textarea classNames={{ input: classes.input }} autoComplete='nope' {...props} />;
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if (e.key === 'Tab') {
+        if (document.activeElement?.tagName !== 'TEXTAREA') return;
+
+        e.preventDefault();
+        const target = e.target as HTMLTextAreaElement;
+        const start = target.selectionStart;
+        const end = target.selectionEnd;
+        target.value = `${target.value.substring(0, start)}  ${target.value.substring(end)}`;
+        target.selectionStart = target.selectionEnd = start + 2;
+        target.focus();
+      }
+    };
+    document.addEventListener('keydown', handleKeyDown);
+
+    return () => {
+      document.removeEventListener('keydown', handleKeyDown);
+    };
+  }, []);
+
+  return <Textarea classNames={{ input: classes.input }} {...props} />;
 }

src/components/File.tsx

@@ -1,195 +0,0 @@
-import { Button, Card, Group, LoadingOverlay, Modal, Stack, Text, Title, Tooltip } from '@mantine/core';
-import { useClipboard } from '@mantine/hooks';
-import { showNotification } from '@mantine/notifications';
-import { useFileDelete, useFileFavorite } from 'lib/queries/files';
-import { relativeTime } from 'lib/utils/client';
-import { useState } from 'react';
-import {
-  CalendarIcon,
-  ClockIcon,
-  CopyIcon,
-  CrossIcon,
-  DeleteIcon,
-  ExternalLinkIcon,
-  EyeIcon,
-  FileIcon,
-  HashIcon,
-  ImageIcon,
-  StarIcon,
-} from './icons';
-import Link from './Link';
-import MutedText from './MutedText';
-import Type from './Type';
-
-export function FileMeta({ Icon, title, subtitle, ...other }) {
-  return other.tooltip ? (
-    <Group>
-      <Icon size={24} />
-      <Tooltip label={other.tooltip}>
-        <Stack spacing={1}>
-          <Text>{title}</Text>
-          <MutedText size='md'>{subtitle}</MutedText>
-        </Stack>
-      </Tooltip>
-    </Group>
-  ) : (
-    <Group>
-      <Icon size={24} />
-      <Stack spacing={1}>
-        <Text>{title}</Text>
-        <MutedText size='md'>{subtitle}</MutedText>
-      </Stack>
-    </Group>
-  );
-}
-
-export default function File({ image, updateImages, disableMediaPreview }) {
-  const [open, setOpen] = useState(false);
-  const deleteFile = useFileDelete();
-  const favoriteFile = useFileFavorite();
-  const clipboard = useClipboard();
-
-  const loading = deleteFile.isLoading || favoriteFile.isLoading;
-
-  const handleDelete = async () => {
-    deleteFile.mutate(image.id, {
-      onSuccess: () => {
-        showNotification({
-          title: 'File Deleted',
-          message: '',
-          color: 'green',
-          icon: <DeleteIcon />,
-        });
-      },
-
-      onError: (res: any) => {
-        showNotification({
-          title: 'Failed to delete file',
-          message: res.error,
-          color: 'red',
-          icon: <CrossIcon />,
-        });
-      },
-
-      onSettled: () => {
-        setOpen(false);
-      },
-    });
-  };
-
-  const handleCopy = () => {
-    clipboard.copy(`${window.location.protocol}//${window.location.host}${image.url}`);
-    setOpen(false);
-    showNotification({
-      title: 'Copied to clipboard',
-      message: '',
-      icon: <CopyIcon />,
-    });
-  };
-
-  const handleFavorite = async () => {
-    favoriteFile.mutate(
-      { id: image.id, favorite: !image.favorite },
-      {
-        onSuccess: () => {
-          showNotification({
-            title: 'Image is now ' + (!image.favorite ? 'favorited' : 'unfavorited'),
-            message: '',
-            icon: <StarIcon />,
-          });
-        },
-
-        onError: (res: any) => {
-          showNotification({
-            title: 'Failed to favorite file',
-            message: res.error,
-            color: 'red',
-            icon: <CrossIcon />,
-          });
-        },
-      }
-    );
-  };
-
-  return (
-    <>
-      <Modal opened={open} onClose={() => setOpen(false)} title={<Title>{image.file}</Title>} size='xl'>
-        <LoadingOverlay visible={loading} />
-        <Stack>
-          <Type
-            file={image}
-            src={`/r/${image.file}`}
-            alt={image.file}
-            popup
-            sx={{ minHeight: 200 }}
-            style={{ minHeight: 200 }}
-            disableMediaPreview={false}
-          />
-          <Stack>
-            <FileMeta Icon={FileIcon} title='Name' subtitle={image.file} />
-            <FileMeta Icon={ImageIcon} title='Type' subtitle={image.mimetype} />
-            <FileMeta Icon={EyeIcon} title='Views' subtitle={image?.views?.toLocaleString()} />
-            {image.maxViews && (
-              <FileMeta
-                Icon={EyeIcon}
-                title='Max views'
-                subtitle={image?.maxViews?.toLocaleString()}
-                tooltip={`This file will be deleted after being viewed ${image?.maxViews?.toLocaleString()} times.`}
-              />
-            )}
-            <FileMeta
-              Icon={CalendarIcon}
-              title='Uploaded'
-              subtitle={relativeTime(new Date(image.created_at))}
-              tooltip={new Date(image?.created_at).toLocaleString()}
-            />
-            {image.expires_at && (
-              <FileMeta
-                Icon={ClockIcon}
-                title='Expires'
-                subtitle={relativeTime(new Date(image.expires_at))}
-                tooltip={new Date(image.expires_at).toLocaleString()}
-              />
-            )}
-            <FileMeta Icon={HashIcon} title='ID' subtitle={image.id} />
-          </Stack>
-        </Stack>
-
-        <Group position='right' mt='md'>
-          <Button onClick={handleCopy}>Copy URL</Button>
-          <Button onClick={handleDelete}>Delete</Button>
-          <Button onClick={handleFavorite}>{image.favorite ? 'Unfavorite' : 'Favorite'}</Button>
-          <Link href={image.url} target='_blank'>
-            <Button rightIcon={<ExternalLinkIcon />}>Open</Button>
-          </Link>
-        </Group>
-      </Modal>
-      <Card sx={{ maxWidth: '100%', height: '100%' }} shadow='md'>
-        <Card.Section>
-          <LoadingOverlay visible={loading} />
-          <Type
-            file={image}
-            sx={{
-              minHeight: 200,
-              maxHeight: 320,
-              fontSize: 70,
-              width: '100%',
-              cursor: 'pointer',
-            }}
-            style={{
-              minHeight: 200,
-              maxHeight: 320,
-              fontSize: 70,
-              width: '100%',
-              cursor: 'pointer',
-            }}
-            src={`/r/${image.file}`}
-            alt={image.file}
-            onClick={() => setOpen(true)}
-            disableMediaPreview={disableMediaPreview}
-          />
-        </Card.Section>
-      </Card>
-    </>
-  );
-}

src/components/File/FileModal.tsx

@@ -0,0 +1,354 @@
+import {
+  ActionIcon,
+  Group,
+  LoadingOverlay,
+  Modal,
+  Select,
+  SimpleGrid,
+  Stack,
+  Title,
+  Tooltip,
+} from '@mantine/core';
+import { useClipboard, useMediaQuery } from '@mantine/hooks';
+import { showNotification } from '@mantine/notifications';
+import {
+  IconAlarm,
+  IconCalendarPlus,
+  IconClipboardCopy,
+  IconDeviceSdCard,
+  IconExternalLink,
+  IconEye,
+  IconEyeglass,
+  IconFile,
+  IconFileDownload,
+  IconFolderCancel,
+  IconFolderMinus,
+  IconFolderPlus,
+  IconHash,
+  IconInfoCircle,
+  IconPhoto,
+  IconPhotoCancel,
+  IconPhotoMinus,
+  IconPhotoStar,
+} from '@tabler/icons-react';
+import useFetch, { ApiError } from 'hooks/useFetch';
+import { useFileDelete, useFileFavorite, UserFilesResponse } from 'lib/queries/files';
+import { useFolders } from 'lib/queries/folders';
+import { bytesToHuman } from 'lib/utils/bytes';
+import { relativeTime } from 'lib/utils/client';
+import { useState } from 'react';
+import { FileMeta } from '.';
+import Type from '../Type';
+
+export default function FileModal({
+  open,
+  setOpen,
+  file,
+  loading,
+  refresh,
+  reducedActions = false,
+  exifEnabled,
+  compress,
+  otherUser = false,
+}: {
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  file: UserFilesResponse;
+  loading: boolean;
+  refresh: () => void;
+  reducedActions?: boolean;
+  exifEnabled?: boolean;
+  compress: boolean;
+  otherUser: boolean;
+}) {
+  const deleteFile = useFileDelete();
+  const favoriteFile = useFileFavorite();
+  const folders = useFolders();
+
+  const [overrideRender, setOverrideRender] = useState(false);
+  const clipboard = useClipboard();
+
+  const handleDelete = async () => {
+    deleteFile.mutate(file.id, {
+      onSuccess: () => {
+        showNotification({
+          title: 'File Deleted',
+          message: '',
+          color: 'green',
+          icon: <IconPhotoMinus size='1rem' />,
+        });
+      },
+
+      onError: (res: ApiError) => {
+        showNotification({
+          title: 'Failed to delete file',
+          message: res.error,
+          color: 'red',
+          icon: <IconPhotoCancel size='1rem' />,
+        });
+      },
+
+      onSettled: () => {
+        setOpen(false);
+      },
+    });
+  };
+
+  const handleCopy = () => {
+    clipboard.copy(`${window.location.protocol}//${window.location.host}${file.url}`);
+    setOpen(false);
+
+    showNotification({
+      title: 'Copied to clipboard',
+      message: '',
+      icon: <IconClipboardCopy size='1rem' />,
+    });
+  };
+
+  const handleFavorite = async () => {
+    favoriteFile.mutate(
+      { id: file.id, favorite: !file.favorite },
+      {
+        onSuccess: () => {
+          showNotification({
+            title: 'The file is now ' + (!file.favorite ? 'favorited' : 'unfavorited'),
+            message: '',
+            icon: <IconPhotoStar size='1rem' />,
+          });
+        },
+
+        onError: (res: { error: string }) => {
+          showNotification({
+            title: 'Failed to favorite file',
+            message: res.error,
+            color: 'red',
+            icon: <IconPhotoCancel size='1rem' />,
+          });
+        },
+      },
+    );
+  };
+
+  const inFolder = file.folderId;
+
+  const removeFromFolder = async () => {
+    const res = await useFetch('/api/user/folders/' + file.folderId, 'DELETE', {
+      file: Number(file.id),
+    });
+
+    refresh();
+
+    if (!res.error) {
+      showNotification({
+        title: 'Removed from folder',
+        message: res.name,
+        color: 'green',
+        icon: <IconFolderMinus size='1rem' />,
+      });
+    } else {
+      showNotification({
+        title: 'Failed to remove from folder',
+        message: res.error,
+        color: 'red',
+        icon: <IconFolderCancel size='1rem' />,
+      });
+    }
+  };
+
+  const addToFolder = async (t) => {
+    const res = await useFetch('/api/user/folders/' + t, 'POST', {
+      file: Number(file.id),
+    });
+
+    refresh();
+
+    if (!res.error) {
+      showNotification({
+        title: 'Added to folder',
+        message: res.name,
+        color: 'green',
+        icon: <IconFolderPlus size='1rem' />,
+      });
+    } else {
+      showNotification({
+        title: 'Failed to add to folder',
+        message: res.error,
+        color: 'red',
+        icon: <IconFolderCancel size='1rem' />,
+      });
+    }
+  };
+
+  const createFolder = (t) => {
+    useFetch('/api/user/folders', 'POST', {
+      name: t,
+      add: [Number(file.id)],
+    }).then((res) => {
+      refresh();
+
+      if (!res.error) {
+        showNotification({
+          title: 'Created & added to folder',
+          message: res.name,
+          color: 'green',
+          icon: <IconFolderPlus size='1rem' />,
+        });
+      } else {
+        showNotification({
+          title: 'Failed to create folder',
+          message: res.error,
+          color: 'red',
+          icon: <IconFolderCancel size='1rem' />,
+        });
+      }
+    });
+    return { value: t, label: t };
+  };
+
+  return (
+    <Modal
+      opened={open}
+      onClose={() => setOpen(false)}
+      title={<Title>{file.name}</Title>}
+      size='auto'
+      fullScreen={useMediaQuery('(max-width: 600px)')}
+    >
+      <LoadingOverlay visible={loading} />
+      <Stack>
+        <Type
+          file={file}
+          src={`/r/${encodeURI(file.name)}?compress=${compress}`}
+          alt={file.name}
+          popup
+          sx={{ minHeight: 200 }}
+          style={{ minHeight: 200 }}
+          disableMediaPreview={false}
+          overrideRender={overrideRender}
+          setOverrideRender={setOverrideRender}
+        />
+        <SimpleGrid
+          my='md'
+          cols={3}
+          breakpoints={[
+            { maxWidth: 600, cols: 1 },
+            { maxWidth: 900, cols: 2 },
+            { maxWidth: 1200, cols: 3 },
+          ]}
+        >
+          <FileMeta Icon={IconFile} title='Name' subtitle={file.name} />
+          <FileMeta Icon={IconPhoto} title='Type' subtitle={file.mimetype} />
+          <FileMeta Icon={IconDeviceSdCard} title='Size' subtitle={bytesToHuman(file.size || 0)} />
+          <FileMeta Icon={IconEye} title='Views' subtitle={file?.views?.toLocaleString()} />
+          {file.maxViews && (
+            <FileMeta
+              Icon={IconEyeglass}
+              title='Max views'
+              subtitle={file?.maxViews?.toLocaleString()}
+              tooltip={`This file will be deleted after being viewed ${file?.maxViews?.toLocaleString()} times.`}
+            />
+          )}
+          <FileMeta
+            Icon={IconCalendarPlus}
+            title='Uploaded'
+            subtitle={relativeTime(new Date(file.createdAt))}
+            tooltip={new Date(file?.createdAt).toLocaleString()}
+          />
+          {file.expiresAt && !reducedActions && (
+            <FileMeta
+              Icon={IconAlarm}
+              title='Expires'
+              subtitle={relativeTime(new Date(file.expiresAt))}
+              tooltip={new Date(file.expiresAt).toLocaleString()}
+            />
+          )}
+          <FileMeta Icon={IconHash} title='ID' subtitle={file.id} />
+        </SimpleGrid>
+      </Stack>
+
+      <Group position='apart' my='md'>
+        <Group position='left'>
+          {exifEnabled && !reducedActions && (
+            <Tooltip label='View Metadata'>
+              <ActionIcon
+                color='blue'
+                variant='filled'
+                onClick={() => window.open(`/dashboard/metadata/${file.id}`, '_blank')}
+              >
+                <IconInfoCircle size='1rem' />
+              </ActionIcon>
+            </Tooltip>
+          )}
+          {reducedActions || otherUser ? null : inFolder && !folders.isLoading ? (
+            <Tooltip
+              label={`Remove from folder "${folders.data.find((f) => f.id === file.folderId)?.name ?? ''}"`}
+            >
+              <ActionIcon color='red' variant='filled' onClick={removeFromFolder} loading={folders.isLoading}>
+                <IconFolderMinus size='1rem' />
+              </ActionIcon>
+            </Tooltip>
+          ) : (
+            <Tooltip label='Add to folder'>
+              <Select
+                onChange={addToFolder}
+                placeholder='Add to folder'
+                data={[
+                  ...(folders.data ? folders.data : []).map((folder) => ({
+                    value: String(folder.id),
+                    label: `${folder.id}: ${folder.name}`,
+                  })),
+                ]}
+                searchable
+                creatable
+                getCreateLabel={(query) => `Create folder "${query}"`}
+                onCreate={createFolder}
+              />
+            </Tooltip>
+          )}
+        </Group>
+        <Group position='right'>
+          {reducedActions ? null : (
+            <>
+              <Tooltip label='Delete file'>
+                <ActionIcon color='red' variant='filled' onClick={handleDelete}>
+                  <IconPhotoMinus size='1rem' />
+                </ActionIcon>
+              </Tooltip>
+
+              <Tooltip label={file.favorite ? 'Unfavorite' : 'Favorite'}>
+                <ActionIcon
+                  color={file.favorite ? 'yellow' : 'gray'}
+                  variant='filled'
+                  onClick={handleFavorite}
+                >
+                  <IconPhotoStar size='1rem' />
+                </ActionIcon>
+              </Tooltip>
+            </>
+          )}
+
+          <Tooltip label='Open in new tab'>
+            <ActionIcon color='blue' variant='filled' onClick={() => window.open(file.url, '_blank')}>
+              <IconExternalLink size='1rem' />
+            </ActionIcon>
+          </Tooltip>
+
+          <Tooltip label='Copy URL'>
+            <ActionIcon color='blue' variant='filled' onClick={handleCopy}>
+              <IconClipboardCopy size='1rem' />
+            </ActionIcon>
+          </Tooltip>
+
+          <Tooltip label='Download'>
+            <ActionIcon
+              color='blue'
+              variant='filled'
+              onClick={() => window.open(`/r/${encodeURI(file.name)}?download=true`, '_blank')}
+            >
+              <IconFileDownload size='1rem' />
+            </ActionIcon>
+          </Tooltip>
+        </Group>
+      </Group>
+    </Modal>
+  );
+}

src/components/File/index.tsx

@@ -0,0 +1,108 @@
+import { Card, Group, LoadingOverlay, Stack, Text, Tooltip } from '@mantine/core';
+import { useFileDelete, useFileFavorite } from 'lib/queries/files';
+import { useFolders } from 'lib/queries/folders';
+import { useState } from 'react';
+import MutedText from '../MutedText';
+import Type from '../Type';
+import FileModal from './FileModal';
+
+export function FileMeta({ Icon, title, subtitle, ...other }) {
+  return other.tooltip ? (
+    <Group>
+      <Icon size={24} />
+      <Tooltip label={other.tooltip}>
+        <Stack spacing={1}>
+          <Text>{title}</Text>
+          <MutedText size='md'>{subtitle}</MutedText>
+        </Stack>
+      </Tooltip>
+    </Group>
+  ) : (
+    <Group>
+      <Icon size={24} />
+      <Stack spacing={1}>
+        <Text>{title}</Text>
+        <MutedText size='md'>{subtitle}</MutedText>
+      </Stack>
+    </Group>
+  );
+}
+
+export default function File({
+  image,
+  disableMediaPreview,
+  exifEnabled,
+  refreshImages = undefined,
+  reducedActions = false,
+  onDash,
+  otherUser = false,
+}) {
+  const [open, setOpen] = useState(false);
+  const deleteFile = useFileDelete();
+  const favoriteFile = useFileFavorite();
+  const loading = deleteFile.isLoading || favoriteFile.isLoading;
+
+  const folders = useFolders();
+
+  const refresh = () => {
+    if (!otherUser) refreshImages();
+    folders.refetch();
+  };
+
+  return (
+    <>
+      <FileModal
+        open={open}
+        setOpen={setOpen}
+        file={image}
+        loading={loading}
+        refresh={refresh}
+        reducedActions={reducedActions}
+        exifEnabled={exifEnabled}
+        compress={onDash}
+        otherUser={otherUser}
+      />
+
+      <Card
+        sx={{
+          maxWidth: '100%',
+          height: '100%',
+          '&:hover': {
+            filter: 'brightness(0.75)',
+          },
+          transition: 'filter 0.2s ease-in-out',
+          cursor: 'pointer',
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+        }}
+        shadow='md'
+        onClick={() => setOpen(true)}
+      >
+        <Card.Section>
+          <LoadingOverlay visible={loading} />
+          <Type
+            file={image}
+            sx={{
+              minHeight: 200,
+              maxHeight: 320,
+              fontSize: 70,
+              width: '100%',
+              cursor: 'pointer',
+            }}
+            style={{
+              minHeight: 200,
+              maxHeight: 320,
+              fontSize: 70,
+              width: '100%',
+              cursor: 'pointer',
+            }}
+            src={`/r/${encodeURI(image.name)}?compress=${onDash}`}
+            alt={image.name}
+            disableMediaPreview={disableMediaPreview}
+          />
+        </Card.Section>
+      </Card>
+    </>
+  );
+}

src/components/Layout.tsx

@@ -4,7 +4,6 @@ import {
   Box,
   Burger,
   Button,
-  Group,
   Header,
   Image,
   MediaQuery,
@@ -12,150 +11,120 @@ import {
   Navbar,
   NavLink,
   Paper,
-  Popover,
+  rem,
   ScrollArea,
   Select,
-  Stack,
   Text,
   Title,
   Tooltip,
-  UnstyledButton,
   useMantineTheme,
 } from '@mantine/core';
-import { useClipboard } from '@mantine/hooks';
+import { useClipboard, useMediaQuery } from '@mantine/hooks';
 import { useModals } from '@mantine/modals';
 import { showNotification } from '@mantine/notifications';
+import {
+  IconBackspace,
+  IconBrandDiscordFilled,
+  IconBrandGithubFilled,
+  IconBrandGoogle,
+  IconBrush,
+  IconClipboardCopy,
+  IconExternalLink,
+  IconFiles,
+  IconFileText,
+  IconFileUpload,
+  IconFolders,
+  IconGraph,
+  IconHome,
+  IconLink,
+  IconLogout,
+  IconReload,
+  IconSettings,
+  IconTag,
+  IconUpload,
+  IconUser,
+  IconUserCog,
+  IconUsers,
+} from '@tabler/icons-react';
 import useFetch from 'hooks/useFetch';
 import { useVersion } from 'lib/queries/version';
 import { userSelector } from 'lib/recoil/user';
 import { capitalize } from 'lib/utils/client';
+import { UserExtended } from 'middleware/withZipline';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
 import { useState } from 'react';
 import { useRecoilState } from 'recoil';
-import {
-  ActivityIcon,
-  CheckIcon,
-  CopyIcon,
-  CrossIcon,
-  DeleteIcon,
-  DiscordIcon,
-  ExternalLinkIcon,
-  FileIcon,
-  GitHubIcon,
-  GoogleIcon,
-  HomeIcon,
-  LinkIcon,
-  LogoutIcon,
-  PencilIcon,
-  SettingsIcon,
-  TagIcon,
-  TypeIcon,
-  UploadIcon,
-  UserIcon,
-} from './icons';
 import { friendlyThemeName, themes } from './Theming';
 
-function MenuItemLink(props) {
-  return (
-    <Link href={props.href} passHref legacyBehavior>
-      <MenuItem {...props} />
-    </Link>
-  );
-}
+export type NavbarItems = {
+  icon: React.ReactNode;
+  text: string;
+  link?: string;
+  children?: NavbarItems[];
+  if?: (user: UserExtended, props: unknown) => boolean;
+};
 
-function MenuItem(props) {
-  return (
-    <UnstyledButton
-      sx={(theme) => ({
-        display: 'block',
-        width: '100%',
-        padding: 5,
-        borderRadius: theme.radius.sm,
-        color: props.color
-          ? theme.fn.themeColor(props.color, theme.colorScheme === 'dark' ? 5 : 7)
-          : theme.colorScheme === 'dark'
-          ? theme.colors.dark[0]
-          : theme.black,
-        '&:hover': !props.noClick
-          ? {
-              backgroundColor: props.color
-                ? theme.fn.rgba(
-                    theme.fn.themeColor(props.color, theme.colorScheme === 'dark' ? 9 : 0),
-                    theme.colorScheme === 'dark' ? 0.2 : 1
-                  )
-                : theme.colorScheme === 'dark'
-                ? theme.fn.rgba(theme.colors.dark[3], 0.35)
-                : theme.colors.gray[0],
-            }
-          : null,
-      })}
-      {...props}
-    >
-      <Group noWrap>
-        <Box
-          sx={(theme) => ({
-            marginRight: theme.spacing.xs / 4,
-            paddingLeft: theme.spacing.xs / 2,
-
-            '& *': {
-              display: 'block',
-            },
-          })}
-        >
-          {props.icon}
-        </Box>
-        <Text size='sm'>{props.children}</Text>
-      </Group>
-    </UnstyledButton>
-  );
-}
-
-const items = [
+const items: NavbarItems[] = [
   {
-    icon: <HomeIcon size={18} />,
+    icon: <IconHome size={18} />,
     text: 'Home',
     link: '/dashboard',
   },
   {
-    icon: <FileIcon size={18} />,
+    icon: <IconFiles size={18} />,
     text: 'Files',
     link: '/dashboard/files',
   },
   {
-    icon: <ActivityIcon size={18} />,
+    icon: <IconFolders size={18} />,
+    text: 'Folders',
+    link: '/dashboard/folders',
+  },
+  {
+    icon: <IconGraph size={18} />,
     text: 'Stats',
     link: '/dashboard/stats',
   },
   {
-    icon: <LinkIcon size={18} />,
+    icon: <IconLink size={18} />,
     text: 'URLs',
     link: '/dashboard/urls',
   },
   {
-    icon: <UploadIcon size={18} />,
+    icon: <IconUpload size={18} />,
     text: 'Upload',
-    link: '/dashboard/upload/file',
+    children: [
+      {
+        icon: <IconFileUpload size={18} />,
+        text: 'File',
+        link: '/dashboard/upload/file',
+      },
+      {
+        icon: <IconFileText size={18} />,
+        text: 'Text',
+        link: '/dashboard/upload/text',
+      },
+    ],
   },
   {
-    icon: <TypeIcon size={18} />,
-    text: 'Upload Text',
-    link: '/dashboard/upload/text',
-  },
-];
-
-const admin_items = [
-  {
-    icon: <UserIcon size={18} />,
-    text: 'Users',
-    link: '/dashboard/users',
-    if: () => true,
-  },
-  {
-    icon: <TagIcon size={18} />,
-    text: 'Invites',
-    link: '/dashboard/invites',
-    if: (props) => props.invites,
+    icon: <IconUser size={18} />,
+    text: 'Administration',
+    if: (user, _) => user.administrator as boolean,
+    children: [
+      {
+        icon: <IconUsers size={18} />,
+        text: 'Users',
+        link: '/dashboard/users',
+        if: () => true,
+      },
+      {
+        icon: <IconTag size={18} />,
+        text: 'Invites',
+        link: '/dashboard/invites',
+        if: (_, props: { invites: boolean }) => props.invites,
+      },
+    ],
   },
 ];
 
@@ -165,9 +134,9 @@ export default function Layout({ children, props }) {
   const { title, oauth_providers: unparsed } = props;
   const oauth_providers = JSON.parse(unparsed);
   const icons = {
-    GitHub: GitHubIcon,
-    Discord: DiscordIcon,
-    Google: GoogleIcon,
+    GitHub: IconBrandGithubFilled,
+    Discord: IconBrandDiscordFilled,
+    Google: IconBrandGoogle,
   };
 
   for (const provider of oauth_providers) {
@@ -180,7 +149,6 @@ export default function Layout({ children, props }) {
   const [systemTheme, setSystemTheme] = useState(user.systemTheme ?? 'system');
   const version = useVersion();
   const [opened, setOpened] = useState(false); // navigation open
-  const [open, setOpen] = useState(false); // manage acc dropdown
 
   const avatar = user?.avatar ?? null;
   const router = useRouter();
@@ -201,7 +169,7 @@ export default function Layout({ children, props }) {
       title: `Theme changed to ${friendlyThemeName[value]}`,
       message: '',
       color: 'green',
-      icon: <PencilIcon />,
+      icon: <IconBrush size='1rem' />,
     });
   };
 
@@ -222,7 +190,7 @@ export default function Layout({ children, props }) {
             title: 'Token Reset Failed',
             message: a.error,
             color: 'red',
-            icon: <CrossIcon />,
+            icon: <IconReload size='1rem' />,
           });
         } else {
           showNotification({
@@ -230,7 +198,7 @@ export default function Layout({ children, props }) {
             message:
               'Your token has been reset. You will need to update any uploaders to use this new token.',
             color: 'green',
-            icon: <CheckIcon />,
+            icon: <IconReload size='1rem' />,
           });
         }
 
@@ -251,12 +219,21 @@ export default function Layout({ children, props }) {
       onConfirm: async () => {
         clipboard.copy(token);
 
-        showNotification({
-          title: 'Token Copied',
-          message: 'Your token has been copied to your clipboard.',
-          color: 'green',
-          icon: <CheckIcon />,
-        });
+        if (!navigator.clipboard)
+          showNotification({
+            title: 'Unable to copy token',
+            message:
+              "Zipline couldn't copy to your clipboard. Please copy the token manually from the settings page.",
+            color: 'red',
+            icon: <IconClipboardCopy size='1rem' />,
+          });
+        else
+          showNotification({
+            title: 'Token Copied',
+            message: 'Your token has been copied to your clipboard.',
+            color: 'green',
+            icon: <IconClipboardCopy size='1rem' />,
+          });
 
         modals.closeAll();
       },
@@ -269,52 +246,55 @@ export default function Layout({ children, props }) {
       navbar={
         <Navbar pt='sm' hiddenBreakpoint='sm' hidden={!opened} width={{ sm: 200, lg: 230 }}>
           <Navbar.Section grow component={ScrollArea}>
-            {items.map(({ icon, text, link }) => (
-              <Link href={link} key={text} passHref legacyBehavior>
-                <NavLink
-                  component='a'
-                  label={text}
-                  icon={icon}
-                  active={router.pathname === link}
-                  variant='light'
-                />
-              </Link>
-            ))}
-            {user.administrator && (
-              <NavLink
-                label='Administration'
-                icon={<SettingsIcon />}
-                childrenOffset={28}
-                defaultOpened={admin_items.map((x) => x.link).includes(router.pathname)}
-              >
-                {admin_items
-                  .filter((x) => x.if(props))
-                  .map(({ icon, text, link }) => (
-                    <Link href={link} key={text} passHref legacyBehavior>
-                      <NavLink
-                        component='a'
-                        label={text}
-                        icon={icon}
-                        active={router.pathname === link}
-                        variant='light'
-                      />
-                    </Link>
-                  ))}
-              </NavLink>
-            )}
+            {items
+              .filter((x) => (x.if ? x.if(user, props) : true))
+              .map(({ icon, text, link, children }) =>
+                children ? (
+                  <NavLink
+                    key={text}
+                    label={text}
+                    icon={icon}
+                    defaultOpened={children.map((x) => x.link).includes(router.pathname)}
+                  >
+                    {children
+                      .filter((x) => (x.if ? x.if(user, props) : true))
+                      .map(({ icon, text, link }) => (
+                        <NavLink
+                          key={text}
+                          label={text}
+                          icon={icon}
+                          active={router.pathname === link}
+                          variant='light'
+                          component={Link}
+                          href={link}
+                        />
+                      ))}
+                  </NavLink>
+                ) : (
+                  <NavLink
+                    key={text}
+                    label={text}
+                    icon={icon}
+                    active={router.pathname === link}
+                    variant='light'
+                    component={Link}
+                    href={link}
+                  />
+                ),
+              )}
           </Navbar.Section>
           <Navbar.Section>
             {external_links.length
-              ? external_links.map(({ label, link }, i) => (
-                  <Link href={link} passHref key={i} legacyBehavior>
-                    <NavLink
-                      label={label}
-                      component='a'
-                      target='_blank'
-                      variant='light'
-                      icon={<ExternalLinkIcon />}
-                    />
-                  </Link>
+              ? external_links.map(({ label, link }, i: number) => (
+                  <NavLink
+                    key={i}
+                    label={label}
+                    target='_blank'
+                    variant='light'
+                    icon={<IconExternalLink size={18} />}
+                    component={Link}
+                    href={link}
+                  />
                 ))
               : null}
           </Navbar.Section>
@@ -322,9 +302,11 @@ export default function Layout({ children, props }) {
             <Navbar.Section>
               <Tooltip
                 label={
-                  version.data.local !== version.data.upstream
-                    ? `You are running an outdated version of Zipline, refer to the docs on how to update to ${version.data.upstream}`
-                    : 'You are running the latest version of Zipline'
+                  version.data.update
+                    ? `There is a new ${version.data.updateToType} version: ${
+                        version.data.versions[version.data.updateToType]
+                      }`
+                    : `You are running the latest ${version.data.isUpstream ? 'upstream' : 'stable'} version`
                 }
               >
                 <Badge
@@ -332,9 +314,9 @@ export default function Layout({ children, props }) {
                   radius='md'
                   size='lg'
                   variant='dot'
-                  color={version.data.local !== version.data.upstream ? 'red' : 'primary'}
+                  color={version.data.update ? 'red' : 'primary'}
                 >
-                  {version.data.local}
+                  {version.data.versions.current}
                 </Badge>
               </Tooltip>
             </Navbar.Section>
@@ -354,99 +336,134 @@ export default function Layout({ children, props }) {
             </MediaQuery>
             <Title ml='sm'>{title}</Title>
             <Box sx={{ marginLeft: 'auto', marginRight: 0 }}>
-              <Popover position='bottom-end' opened={open} onClose={() => setOpen(false)}>
-                <Popover.Target>
+              <Menu
+                styles={{
+                  item: {
+                    '@media (max-width: 768px)': {
+                      padding: '1rem',
+                      width: '80vw',
+                    },
+                  },
+                }}
+              >
+                <Menu.Target>
                   <Button
-                    leftIcon={avatar ? <Image src={avatar} height={32} radius='md' /> : <SettingsIcon />}
-                    onClick={() => setOpen((o) => !o)}
-                    sx={(t) => ({
-                      backgroundColor: 'inherit',
-                      '&:hover': {
-                        backgroundColor: t.other.hover,
-                      },
-                      color: t.colorScheme === 'dark' ? 'white' : 'black',
-                    })}
+                    leftIcon={
+                      avatar ? (
+                        <Image src={avatar} height={32} width={32} fit='cover' radius='md' />
+                      ) : (
+                        <IconUserCog size='1rem' />
+                      )
+                    }
+                    variant='subtle'
+                    color='gray'
+                    compact
                     size='xl'
                     p='sm'
+                    styles={{
+                      label: {
+                        overflow: 'unset',
+                      },
+                    }}
                   >
                     {user.username}
                   </Button>
-                </Popover.Target>
+                </Menu.Target>
+                <Menu.Dropdown>
+                  <Menu.Label>
+                    {user.username} ({user.id}){' '}
+                    {user.administrator && user.username !== 'administrator' ? '(Administrator)' : ''}
+                  </Menu.Label>
+                  <Menu.Item component={Link} icon={<IconFiles size='1rem' />} href='/dashboard/files'>
+                    Files
+                  </Menu.Item>
+                  <Menu.Item
+                    component={Link}
+                    icon={<IconFileUpload size='1rem' />}
+                    href='/dashboard/upload/file'
+                  >
+                    Upload File
+                  </Menu.Item>
+                  <Menu.Item component={Link} icon={<IconLink size='1rem' />} href='/dashboard/urls'>
+                    Shorten URL
+                  </Menu.Item>
 
-                <Popover.Dropdown p={4} mr='md' sx={{ minWidth: '200px' }}>
-                  <Stack spacing={2}>
-                    <Menu.Label>
-                      {user.username} ({user.id}){' '}
-                      {user.administrator && user.username !== 'administrator' ? '(Administrator)' : ''}
-                    </Menu.Label>
-                    <MenuItemLink icon={<SettingsIcon />} href='/dashboard/manage'>
-                      Manage Account
-                    </MenuItemLink>
-                    <MenuItem
-                      icon={<CopyIcon />}
-                      onClick={() => {
-                        setOpen(false);
-                        openCopyToken();
-                      }}
-                    >
-                      Copy Token
-                    </MenuItem>
-                    <MenuItem
-                      icon={<DeleteIcon />}
-                      onClick={() => {
-                        setOpen(false);
-                        openResetToken();
-                      }}
-                      color='red'
-                    >
-                      Reset Token
-                    </MenuItem>
-                    <MenuItemLink icon={<LogoutIcon />} href='/auth/logout' color='red'>
-                      Logout
-                    </MenuItemLink>
-                    <Menu.Divider />
-                    <>
-                      {oauth_providers
-                        .filter((x) =>
-                          user.oauth
-                            ?.map(({ provider }) => provider.toLowerCase())
-                            .includes(x.name.toLowerCase())
-                        )
-                        .map(({ name, Icon }, i) => (
-                          <>
-                            <MenuItem
-                              sx={{ '&:hover': { backgroundColor: 'inherit' } }}
-                              key={i}
-                              py={5}
-                              px={4}
-                              icon={<Icon size={18} colorScheme={theme.colorScheme} />}
-                            >
-                              Logged in with {capitalize(name)}
-                            </MenuItem>
-                          </>
-                        ))}
-                      {oauth_providers.filter((x) =>
+                  <Menu.Label>Settings</Menu.Label>
+                  <Menu.Item component={Link} icon={<IconSettings size='1rem' />} href='/dashboard/manage'>
+                    Manage Account
+                  </Menu.Item>
+                  <Menu.Item
+                    icon={<IconClipboardCopy size='1rem' />}
+                    onClick={() => {
+                      openCopyToken();
+                    }}
+                  >
+                    Copy Token
+                  </Menu.Item>
+                  <Menu.Item icon={<IconLogout size='1rem' />} component={Link} href='/auth/logout'>
+                    Logout
+                  </Menu.Item>
+
+                  <Menu.Label>Danger</Menu.Label>
+                  <Menu.Item
+                    icon={<IconBackspace size='1rem' />}
+                    onClick={() => {
+                      openResetToken();
+                    }}
+                    color='red'
+                  >
+                    Reset Token
+                  </Menu.Item>
+                  <Menu.Divider />
+                  <>
+                    {oauth_providers.filter(
+                      (x) =>
                         user.oauth
                           ?.map(({ provider }) => provider.toLowerCase())
-                          .includes(x.name.toLowerCase())
-                      ).length ? (
-                        <Menu.Divider />
-                      ) : null}
-                    </>
-                    <MenuItem icon={<PencilIcon />}>
-                      <Select
-                        size='xs'
-                        data={Object.keys(themes).map((t) => ({
-                          value: t,
-                          label: friendlyThemeName[t],
-                        }))}
-                        value={systemTheme}
-                        onChange={handleUpdateTheme}
-                      />
-                    </MenuItem>
-                  </Stack>
-                </Popover.Dropdown>
-              </Popover>
+                          .includes(x.name.toLowerCase()),
+                    ).length ? (
+                      <Menu.Label>Connected Accounts</Menu.Label>
+                    ) : null}
+                    {oauth_providers
+                      .filter(
+                        (x) =>
+                          user.oauth
+                            ?.map(({ provider }) => provider.toLowerCase())
+                            .includes(x.name.toLowerCase()),
+                      )
+                      .map(({ name, Icon }, i) => (
+                        <>
+                          <Menu.Item
+                            closeMenuOnClick={false}
+                            key={i}
+                            icon={<Icon size={18} colorScheme={theme.colorScheme} />}
+                          >
+                            Logged in with {capitalize(name)}
+                          </Menu.Item>
+                        </>
+                      ))}
+                    {oauth_providers.filter(
+                      (x) =>
+                        user.oauth
+                          ?.map(({ provider }) => provider.toLowerCase())
+                          .includes(x.name.toLowerCase()),
+                    ).length ? (
+                      <Menu.Divider />
+                    ) : null}
+                  </>
+                  <Menu.Item closeMenuOnClick={false} icon={<IconBrush size='1rem' />}>
+                    <Select
+                      size={useMediaQuery('(max-width: 768px)') ? 'md' : 'xs'}
+                      data={Object.keys(themes).map((t) => ({
+                        value: t,
+                        label: friendlyThemeName[t],
+                      }))}
+                      value={systemTheme}
+                      onChange={handleUpdateTheme}
+                    />
+                  </Menu.Item>
+                </Menu.Dropdown>
+              </Menu>
             </Box>
           </div>
         </Header>
@@ -455,9 +472,15 @@ export default function Layout({ children, props }) {
       <Paper
         withBorder
         p='md'
+        mr='md'
+        mb='md'
         shadow='xs'
-        sx={(t) => ({
-          borderColor: t.colorScheme === 'dark' ? t.colors.dark[5] : t.colors.dark[0],
+        sx={(theme) => ({
+          '&[data-with-border]': {
+            border: `${rem(1)} solid ${
+              theme.colorScheme === 'dark' ? theme.colors.dark[5] : theme.colors.gray[0]
+            }`,
+          },
         })}
       >
         {children}

src/components/Link.tsx

@@ -1,5 +0,0 @@
-import { NextLink } from '@mantine/next';
-
-export default function Link(props) {
-  return <NextLink legacyBehavior {...props} />;
-}

src/components/PasswordStrength.tsx

@@ -1,13 +1,13 @@
 // https://mantine.dev/core/password-input/
 
 import { Box, PasswordInput, Popover, Progress, Text } from '@mantine/core';
+import { IconCheck, IconCross } from '@tabler/icons-react';
 import { useState } from 'react';
-import { CheckIcon, CrossIcon } from './icons';
 
 function PasswordRequirement({ meets, label }: { meets: boolean; label: string }) {
   return (
     <Text color={meets ? 'teal' : 'red'} sx={{ display: 'flex', alignItems: 'center' }} mt='sm' size='sm'>
-      {meets ? <CheckIcon /> : <CrossIcon />} <Box ml='md'>{label}</Box>
+      {meets ? <IconCheck size='1rem' /> : <IconCross size='1rem' />} <Box ml='md'>{label}</Box>
     </Text>
   );
 }

src/components/StatCard.tsx

@@ -1,9 +1,9 @@
 import { Card, createStyles, Group, Text } from '@mantine/core';
-import { ArrowDownRight, ArrowUpRight } from 'react-feather';
+import { IconArrowDownRight, IconArrowUpRight } from '@tabler/icons-react';
 
 const useStyles = createStyles((theme) => ({
   root: {
-    padding: theme.spacing.xl * 1.5,
+    padding: `calc(${theme.spacing.xl} * 1.5)`,
   },
 
   value: {
@@ -57,7 +57,7 @@ export default function StatCard({ stat }: StatsGridProps) {
           <>
             <Text color={stat.diff >= 0 ? 'teal' : 'red'} size='sm' weight={500} className={classes.diff}>
               <span>{stat.diff === Infinity ? '∞' : stat.diff}%</span>
-              {stat.diff >= 0 ? <ArrowUpRight size={16} /> : <ArrowDownRight size={16} />}
+              {stat.diff >= 0 ? <IconArrowUpRight size={16} /> : <IconArrowDownRight size={16} />}
             </Text>
           </>
         )}

src/components/Theming.tsx

@@ -15,10 +15,15 @@ import qogir_dark from 'lib/themes/qogir_dark';
 import { createEmotionCache, MantineProvider, MantineThemeOverride } from '@mantine/core';
 import { useColorScheme } from '@mantine/hooks';
 import { ModalsProvider } from '@mantine/modals';
-import { NotificationsProvider } from '@mantine/notifications';
+import { Notifications } from '@mantine/notifications';
+import { SpotlightProvider } from '@mantine/spotlight';
 import { userSelector } from 'lib/recoil/user';
 import { useRecoilValue } from 'recoil';
 
+import { createSpotlightActions } from 'lib/spotlight';
+import { useRouter } from 'next/router';
+import { IconSearch } from '@tabler/icons-react';
+
 export const themes = {
   system: (colorScheme: 'dark' | 'light') => (colorScheme === 'dark' ? dark_blue : light_blue),
   dark_blue,
@@ -52,6 +57,7 @@ const cache = createEmotionCache({ key: 'zipline' });
 export default function ZiplineTheming({ Component, pageProps, ...props }) {
   const user = useRecoilValue(userSelector);
   const colorScheme = useColorScheme();
+  const router = useRouter();
 
   let theme: MantineThemeOverride;
 
@@ -78,7 +84,7 @@ export default function ZiplineTheming({ Component, pageProps, ...props }) {
         components: {
           AppShell: {
             styles: (t) => ({
-              root: {
+              main: {
                 backgroundColor: t.other.AppShell_backgroundColor,
               },
             }),
@@ -92,9 +98,15 @@ export default function ZiplineTheming({ Component, pageProps, ...props }) {
           },
           Modal: {
             defaultProps: {
+              closeButtonProps: { size: 'lg' },
               centered: true,
-              overlayBlur: 3,
-              overlayColor: theme.colorScheme === 'dark' ? theme.colors.dark[6] : 'white',
+              transitionProps: {
+                exitDuration: 100,
+              },
+              overlayProps: {
+                blur: 6,
+                color: theme.colorScheme === 'dark' ? theme.colors.dark[6] : 'white',
+              },
             },
           },
           Popover: {
@@ -105,8 +117,8 @@ export default function ZiplineTheming({ Component, pageProps, ...props }) {
           },
           LoadingOverlay: {
             defaultProps: {
-              overlayBlur: 3,
               overlayColor: theme.colorScheme === 'dark' ? theme.colors.dark[6] : 'white',
+              overlayOpacity: 0.3,
             },
           },
           Loader: {
@@ -132,9 +144,14 @@ export default function ZiplineTheming({ Component, pageProps, ...props }) {
       }}
     >
       <ModalsProvider>
-        <NotificationsProvider>
+        <SpotlightProvider
+          searchIcon={<IconSearch size='1rem' />}
+          shortcut={['mod + k', '/']}
+          actions={createSpotlightActions(router)}
+        >
+          <Notifications position='top-center' style={{ marginTop: -10 }} />
           {props.children ? props.children : <Component {...pageProps} />}
-        </NotificationsProvider>
+        </SpotlightProvider>
       </ModalsProvider>
     </MantineProvider>
   );

src/components/Type.tsx

@@ -1,61 +1,186 @@
-import { Group, Image, Text } from '@mantine/core';
-import { Prism } from '@mantine/prism';
+import {
+  Alert,
+  Box,
+  Button,
+  Card,
+  Center,
+  Group,
+  Image,
+  LoadingOverlay,
+  Text,
+  UnstyledButton,
+} from '@mantine/core';
+import {
+  IconFile,
+  IconFileAlert,
+  IconFileText,
+  IconFileUnknown,
+  IconHeadphones,
+  IconPhotoCancel,
+  IconPlayerPlay,
+} from '@tabler/icons-react';
+import exts from 'lib/exts';
 import { useEffect, useState } from 'react';
-import { AudioIcon, FileIcon, PlayIcon } from './icons';
+import KaTeX from './render/KaTeX';
+import Markdown from './render/Markdown';
+import PrismCode from './render/PrismCode';
+
+function PlaceholderContent({ text, Icon }) {
+  return (
+    <Group sx={(t) => ({ color: t.colors.dark[2], padding: 3, justifyContent: 'center' })}>
+      <Icon size={48} />
+      <Text size='md'>{text}</Text>
+    </Group>
+  );
+}
 
 function Placeholder({ text, Icon, ...props }) {
-  if (props.disableResolve) props.src = null;
+  if (props.onClick)
+    return (
+      <UnstyledButton sx={{ height: 200 }} {...props}>
+        <Center sx={{ height: 200 }}>
+          <PlaceholderContent text={text} Icon={Icon} />
+        </Center>
+      </UnstyledButton>
+    );
 
   return (
-    <Image
-      height={200}
-      withPlaceholder
-      placeholder={
-        <Group>
-          <Icon size={48} />
-          <Text size='md'>{text}</Text>
-        </Group>
-      }
-      {...props}
-    />
+    <Box sx={{ height: 320 }} {...props}>
+      <Center sx={{ height: 320 }}>
+        <PlaceholderContent text={text} Icon={Icon} />
+      </Center>
+    </Box>
+  );
+}
+
+function VideoThumbnailPlaceholder({ file, mediaPreview, ...props }) {
+  if (!file.thumbnail || !mediaPreview)
+    return <Placeholder Icon={IconPlayerPlay} text={`Click to view video (${file.name})`} {...props} />;
+
+  return (
+    <Box sx={{ position: 'relative' }}>
+      <Image
+        src={typeof file.thumbnail === 'string' ? file.thumbnail : `/r/${file.thumbnail.name}`}
+        sx={{
+          width: '100%',
+          height: 'auto',
+        }}
+      />
+
+      <Center
+        sx={{
+          position: 'absolute',
+          height: '100%',
+          top: '50%',
+          left: '50%',
+          transform: 'translate(-50%, -50%)',
+        }}
+      >
+        <IconPlayerPlay size={48} />
+      </Center>
+    </Box>
   );
 }
 
 export default function Type({ file, popup = false, disableMediaPreview, ...props }) {
-  const type = (file.type || file.mimetype).split('/')[0];
-  const name = file.name || file.file;
+  const type =
+    (file.type ?? file.mimetype) === ''
+      ? file.name.split('.').pop()
+      : (file.type ?? file.mimetype).split('/')[0];
 
   const media = /^(video|audio|image|text)/.test(type);
 
   const [text, setText] = useState('');
+  const shouldRenderMarkdown = file.name.endsWith('.md');
+  const shouldRenderTex = file.name.endsWith('.tex');
+  const shouldRenderCode: boolean = Object.keys(exts).includes(file.name.split('.').pop());
 
-  if (type === 'text') {
+  const [loading, setLoading] = useState(type === 'text' && popup);
+
+  if ((type === 'text' || shouldRenderMarkdown || shouldRenderTex || shouldRenderCode) && popup) {
     useEffect(() => {
       (async () => {
-        const res = await fetch('/r/' + name);
+        const res = await fetch('/r/' + file.name);
         const text = await res.text();
 
         setText(text);
+        setLoading(false);
       })();
     }, []);
   }
 
-  if (media && disableMediaPreview) {
+  const renderAlert = () => {
     return (
-      <Placeholder Icon={FileIcon} text={`Click to view file (${name})`} disableResolve={true} {...props} />
+      <Alert color='blue' variant='outline' sx={{ width: '100%' }}>
+        You are{props.overrideRender ? ' not ' : ' '}viewing a rendered version of the file
+        <Button
+          mx='md'
+          onClick={() => props.setOverrideRender(!props.overrideRender)}
+          compact
+          variant='light'
+        >
+          View {props.overrideRender ? 'rendered' : 'raw'}
+        </Button>
+      </Alert>
+    );
+  };
+
+  if ((shouldRenderMarkdown || shouldRenderTex || shouldRenderCode) && !props.overrideRender && popup)
+    return (
+      <>
+        {renderAlert()}
+        <Card p='md' my='sm'>
+          {shouldRenderMarkdown && <Markdown code={text} />}
+          {shouldRenderTex && <KaTeX code={text} />}
+          {shouldRenderCode && !(shouldRenderTex || shouldRenderMarkdown) && (
+            <PrismCode code={text} ext={type} />
+          )}
+        </Card>
+      </>
+    );
+
+  if (media && disableMediaPreview) {
+    return <Placeholder Icon={IconFile} text={`Click to view file (${file.name})`} {...props} />;
+  }
+
+  if (file.password) {
+    return (
+      <Placeholder
+        Icon={IconFileAlert}
+        text={`This file is password protected. Click to view file (${file.name})`}
+        onClick={() => window.open(file.url)}
+        {...props}
+      />
     );
   }
 
   return popup ? (
     media ? (
       {
-        video: <video width='100%' autoPlay controls {...props} />,
-        image: <Image {...props} />,
-        audio: <audio autoPlay controls {...props} style={{ width: '100%' }} />,
+        video: <video width='100%' autoPlay muted controls {...props} />,
+        image: (
+          <Image
+            styles={{
+              imageWrapper: {
+                position: 'inherit',
+              },
+            }}
+            placeholder={<PlaceholderContent Icon={IconPhotoCancel} text={'Image failed to load...'} />}
+            {...props}
+          />
+        ),
+        audio: <audio autoPlay muted controls {...props} style={{ width: '100%' }} />,
         text: (
-          <Prism withLineNumbers language={name.split('.').pop()} {...props} style={{}} sx={{}}>
-            {text}
-          </Prism>
+          <>
+            {loading ? (
+              <LoadingOverlay visible={loading} />
+            ) : (
+              <>
+                {(shouldRenderMarkdown || shouldRenderTex) && renderAlert()}
+                <PrismCode code={text} ext={file.name.split('.').pop()} {...props} />
+              </>
+            )}
+          </>
         ),
       }[type]
     ) : (
@@ -63,12 +188,20 @@ export default function Type({ file, popup = false, disableMediaPreview, ...prop
     )
   ) : media ? (
     {
-      video: <Placeholder Icon={PlayIcon} text={`Click to view video (${name})`} {...props} />,
-      image: <Image {...props} />,
-      audio: <Placeholder Icon={AudioIcon} text={`Click to view audio (${name})`} {...props} />,
-      text: <Placeholder Icon={FileIcon} text={`Click to view text file (${name})`} {...props} />,
+      // video: <Placeholder Icon={IconPlayerPlay} text={`Click to view video (${file.name})`} {...props} />,
+      video: <VideoThumbnailPlaceholder file={file} mediaPreview={!disableMediaPreview} />,
+      image: (
+        <Image
+          placeholder={<PlaceholderContent Icon={IconPhotoCancel} text={'Image failed to load...'} />}
+          height={320}
+          fit='contain'
+          {...props}
+        />
+      ),
+      audio: <Placeholder Icon={IconHeadphones} text={`Click to view audio (${file.name})`} {...props} />,
+      text: <Placeholder Icon={IconFileText} text={`Click to view text file (${file.name})`} {...props} />,
     }[type]
   ) : (
-    <Placeholder Icon={FileIcon} text={`Click to view file (${name})`} {...props} />
+    <Placeholder Icon={IconFileUnknown} text={`Click to view file (${file.name})`} {...props} />
   );
 }

src/components/dropzone/Dropzone.tsx

@@ -1,21 +1,26 @@
-import { Group, Text, useMantineTheme } from '@mantine/core';
+import { Box, Group, SimpleGrid, Text } from '@mantine/core';
 import { Dropzone as MantineDropzone } from '@mantine/dropzone';
-import { ImageIcon } from 'components/icons';
+import { IconPhoto } from '@tabler/icons-react';
 
 export default function Dropzone({ loading, onDrop, children }) {
-  const theme = useMantineTheme();
-
   return (
-    <MantineDropzone onDrop={onDrop}>
-      <Group position='center' spacing='xl' style={{ minHeight: 440 }}>
-        <ImageIcon size={80} />
+    <SimpleGrid
+      cols={2}
+      breakpoints={[
+        { maxWidth: 'md', cols: 1 },
+        { maxWidth: 'xs', cols: 1 },
+      ]}
+    >
+      <MantineDropzone loading={loading} onDrop={onDrop} styles={{ inner: { pointerEvents: 'none' } }}>
+        <Group position='center' spacing='xl' style={{ minHeight: 440, flexDirection: 'column' }}>
+          <IconPhoto size={80} />
 
-        <Text size='xl' inline>
-          Drag files here or click to select files
-        </Text>
-      </Group>
-
-      <div style={{ pointerEvents: 'all' }}>{children}</div>
-    </MantineDropzone>
+          <Text size='xl' inline>
+            Drag files here or click to select files
+          </Text>
+        </Group>
+      </MantineDropzone>
+      <Box>{children}</Box>
+    </SimpleGrid>
   );
 }

src/components/dropzone/DropzoneFile.tsx

@@ -1,4 +1,5 @@
-import { Badge, Group, HoverCard, Table, useMantineTheme } from '@mantine/core';
+import { ActionIcon, Box, Card, Group, HoverCard, Table, useMantineTheme } from '@mantine/core';
+import { IconX } from '@tabler/icons-react';
 import Type from 'components/Type';
 
 export function FilePreview({ file }: { file: File }) {
@@ -16,15 +17,34 @@ export function FilePreview({ file }: { file: File }) {
   );
 }
 
-export default function FileDropzone({ file }: { file: File }) {
+export default function FileDropzone({ file, onRemove }: { file: File; onRemove: () => void }) {
   const theme = useMantineTheme();
 
   return (
     <HoverCard shadow='md'>
       <HoverCard.Target>
-        <Badge size='lg'>{file.name}</Badge>
+        <Card shadow='sm' radius='sm' p='sm'>
+          <Group position='center' spacing='xl'>
+            {file.name}
+          </Group>
+        </Card>
       </HoverCard.Target>
       <HoverCard.Dropdown>
+        <Box
+          sx={{
+            position: 'absolute',
+            top: 0,
+            right: 0,
+            zIndex: 1,
+            color: theme.colorScheme === 'dark' ? 'white' : 'white',
+          }}
+          m='xs'
+        >
+          <ActionIcon onClick={onRemove} size='sm' color='red' variant='filled'>
+            <IconX />
+          </ActionIcon>
+        </Box>
+
         <Group grow>
           <FilePreview file={file} />
 

src/components/icons/ActivityIcon.tsx

@@ -1,5 +0,0 @@
-import { Activity } from 'react-feather';
-
-export default function ActivityIcon({ ...props }) {
-  return <Activity size={15} {...props} />;
-}

src/components/icons/AudioIcon.tsx

@@ -1,5 +0,0 @@
-import { Disc } from 'react-feather';
-
-export default function AudioIcon({ ...props }) {
-  return <Disc size={15} {...props} />;
-}

src/components/icons/CalendarIcon.tsx

@@ -1,5 +0,0 @@
-import { Calendar } from 'react-feather';
-
-export default function CalendarIcon({ ...props }) {
-  return <Calendar size={15} {...props} />;
-}

src/components/icons/CheckIcon.tsx

@@ -1,5 +0,0 @@
-import { Check } from 'react-feather';
-
-export default function CheckIcon({ ...props }) {
-  return <Check size={15} {...props} />;
-}

src/components/icons/ClockIcon.tsx

@@ -1,5 +0,0 @@
-import { Clock } from 'react-feather';
-
-export default function ClockIcon({ ...props }) {
-  return <Clock size={15} {...props} />;
-}

src/components/icons/CopyIcon.tsx

@@ -1,5 +0,0 @@
-import { Copy } from 'react-feather';
-
-export default function CopyIcon({ ...props }) {
-  return <Copy size={15} {...props} />;
-}

src/components/icons/CrossIcon.tsx

@@ -1,5 +0,0 @@
-import { X } from 'react-feather';
-
-export default function CrossIcon({ ...props }) {
-  return <X size={15} {...props} />;
-}

src/components/icons/DeleteIcon.tsx

@@ -1,5 +0,0 @@
-import { Delete } from 'react-feather';
-
-export default function DeleteIcon({ ...props }) {
-  return <Delete size={15} {...props} />;
-}

src/components/icons/DiscordIcon.tsx

@@ -1,21 +0,0 @@
-// https://discord.com/branding
-
-import Image from 'next/image';
-
-export default function DiscordIcon({ ...props }) {
-  return (
-    <svg width='24' height='24' viewBox='0 0 71 55' xmlns='http://www.w3.org/2000/svg'>
-      <g clipPath='url(#clip0)'>
-        <path
-          fill={props.colorScheme === 'manage' ? '#ffffff' : '#5865F2'}
-          d='M60.1045 4.8978C55.5792 2.8214 50.7265 1.2916 45.6527 0.41542C45.5603 0.39851 45.468 0.440769 45.4204 0.525289C44.7963 1.6353 44.105 3.0834 43.6209 4.2216C38.1637 3.4046 32.7345 3.4046 27.3892 4.2216C26.905 3.0581 26.1886 1.6353 25.5617 0.525289C25.5141 0.443589 25.4218 0.40133 25.3294 0.41542C20.2584 1.2888 15.4057 2.8186 10.8776 4.8978C10.8384 4.9147 10.8048 4.9429 10.7825 4.9795C1.57795 18.7309 -0.943561 32.1443 0.293408 45.3914C0.299005 45.4562 0.335386 45.5182 0.385761 45.5576C6.45866 50.0174 12.3413 52.7249 18.1147 54.5195C18.2071 54.5477 18.305 54.5139 18.3638 54.4378C19.7295 52.5728 20.9469 50.6063 21.9907 48.5383C22.0523 48.4172 21.9935 48.2735 21.8676 48.2256C19.9366 47.4931 18.0979 46.6 16.3292 45.5858C16.1893 45.5041 16.1781 45.304 16.3068 45.2082C16.679 44.9293 17.0513 44.6391 17.4067 44.3461C17.471 44.2926 17.5606 44.2813 17.6362 44.3151C29.2558 49.6202 41.8354 49.6202 53.3179 44.3151C53.3935 44.2785 53.4831 44.2898 53.5502 44.3433C53.9057 44.6363 54.2779 44.9293 54.6529 45.2082C54.7816 45.304 54.7732 45.5041 54.6333 45.5858C52.8646 46.6197 51.0259 47.4931 49.0921 48.2228C48.9662 48.2707 48.9102 48.4172 48.9718 48.5383C50.038 50.6034 51.2554 52.5699 52.5959 54.435C52.6519 54.5139 52.7526 54.5477 52.845 54.5195C58.6464 52.7249 64.529 50.0174 70.6019 45.5576C70.6551 45.5182 70.6887 45.459 70.6943 45.3942C72.1747 30.0791 68.2147 16.7757 60.1968 4.9823C60.1772 4.9429 60.1437 4.9147 60.1045 4.8978ZM23.7259 37.3253C20.2276 37.3253 17.3451 34.1136 17.3451 30.1693C17.3451 26.225 20.1717 23.0133 23.7259 23.0133C27.308 23.0133 30.1626 26.2532 30.1066 30.1693C30.1066 34.1136 27.28 37.3253 23.7259 37.3253ZM47.3178 37.3253C43.8196 37.3253 40.9371 34.1136 40.9371 30.1693C40.9371 26.225 43.7636 23.0133 47.3178 23.0133C50.9 23.0133 53.7545 26.2532 53.6986 30.1693C53.6986 34.1136 50.9 37.3253 47.3178 37.3253Z'
-        />
-      </g>
-      <defs>
-        <clipPath id='clip0'>
-          <rect width='71' height='55' fill='white' />
-        </clipPath>
-      </defs>
-    </svg>
-  );
-}

src/components/icons/DownloadIcon.tsx

@@ -1,5 +0,0 @@
-import { Download } from 'react-feather';
-
-export default function DownloadIcon({ ...props }) {
-  return <Download size={15} {...props} />;
-}

src/components/icons/EnterIcon.tsx

@@ -1,5 +0,0 @@
-import { LogIn } from 'react-feather';
-
-export default function EnterIcon({ ...props }) {
-  return <LogIn size={15} {...props} />;
-}

src/components/icons/ExternalLinkIcon.tsx

@@ -1,5 +0,0 @@
-import { ExternalLink } from 'react-feather';
-
-export default function ExternalLinkIcon({ ...props }) {
-  return <ExternalLink size={15} {...props} />;
-}

src/components/icons/EyeIcon.tsx

@@ -1,5 +0,0 @@
-import { Eye } from 'react-feather';
-
-export default function EyeIcon({ ...props }) {
-  return <Eye size={15} {...props} />;
-}

src/components/icons/FileIcon.tsx

@@ -1,5 +0,0 @@
-import { File } from 'react-feather';
-
-export default function FileIcon({ ...props }) {
-  return <File size={15} {...props} />;
-}

src/components/icons/GitHubIcon.tsx

@@ -1,17 +0,0 @@
-import { GitHub } from 'react-feather';
-import Image from 'next/image';
-
-// https://upload.wikimedia.org/wikipedia/commons/9/91/Octicons-mark-github.svg
-export default function GitHubIcon({ colorScheme, ...props }) {
-  return (
-    <svg width={24} height={24} viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' {...props}>
-      <path
-        fillRule='evenodd'
-        clipRule='evenodd'
-        d='M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z'
-        transform='scale(64)'
-        fill={colorScheme === 'dark' ? '#FFFFFF' : '#1B1F23'}
-      />
-    </svg>
-  );
-}

src/components/icons/GoogleIcon.tsx

@@ -1,15 +0,0 @@
-// https://developers.google.com/identity/branding-guidelines
-
-import Image from 'next/image';
-
-export default function GoogleIcon({ ...props }) {
-  return (
-    <Image
-      alt='google'
-      src='https://madeby.google.com/static/images/google_g_logo.svg'
-      width={24}
-      height={24}
-      {...props}
-    />
-  );
-}

src/components/icons/HashIcon.tsx

@@ -1,5 +0,0 @@
-import { Hash } from 'react-feather';
-
-export default function HashIcon({ ...props }) {
-  return <Hash size={15} {...props} />;
-}

src/components/icons/HomeIcon.tsx

@@ -1,5 +0,0 @@
-import { Home } from 'react-feather';
-
-export default function HomeIcon({ ...props }) {
-  return <Home size={15} {...props} />;
-}

src/components/icons/ImageIcon.tsx

@@ -1,5 +0,0 @@
-import { Image as FeatherImage } from 'react-feather';
-
-export default function ImageIcon({ ...props }) {
-  return <FeatherImage size={15} {...props} />;
-}

src/components/icons/LinkIcon.tsx

@@ -1,5 +0,0 @@
-import { Link } from 'react-feather';
-
-export default function LinkIcon({ ...props }) {
-  return <Link size={15} {...props} />;
-}

src/components/icons/LogoutIcon.tsx

@@ -1,5 +0,0 @@
-import { LogOut } from 'react-feather';
-
-export default function LogoutIcon({ ...props }) {
-  return <LogOut size={15} {...props} />;
-}

src/components/icons/PencilIcon.tsx

@@ -1,5 +0,0 @@
-import { Edit2 } from 'react-feather';
-
-export default function PencilIcon({ ...props }) {
-  return <Edit2 size={15} {...props} />;
-}

src/components/icons/PlayIcon.tsx

@@ -1,5 +0,0 @@
-import { Play } from 'react-feather';
-
-export default function PlayIcon({ ...props }) {
-  return <Play size={15} {...props} />;
-}

src/components/icons/PlusIcon.tsx

@@ -1,5 +0,0 @@
-import { Plus } from 'react-feather';
-
-export default function PlusIcon({ ...props }) {
-  return <Plus size={15} {...props} />;
-}

src/components/icons/RefreshIcon.tsx

@@ -1,5 +0,0 @@
-import { RefreshCw } from 'react-feather';
-
-export default function RefreshIcon({ ...props }) {
-  return <RefreshCw size={15} {...props} />;
-}

src/components/icons/SettingsIcon.tsx

@@ -1,5 +0,0 @@
-import { Settings } from 'react-feather';
-
-export default function SettingsIcon({ ...props }) {
-  return <Settings size={15} {...props} />;
-}

src/components/icons/StarIcon.tsx

@@ -1,5 +0,0 @@
-import { Star } from 'react-feather';
-
-export default function StarIcon({ ...props }) {
-  return <Star size={15} {...props} />;
-}

src/components/icons/TagIcon.tsx

@@ -1,5 +0,0 @@
-import { Tag } from 'react-feather';
-
-export default function TagIcon({ ...props }) {
-  return <Tag size={15} {...props} />;
-}

src/components/icons/TrashIcon.tsx

@@ -1,5 +0,0 @@
-import { Trash2 } from 'react-feather';
-
-export default function TrashIcon({ ...props }) {
-  return <Trash2 size={15} {...props} />;
-}

src/components/icons/TypeIcon.tsx

@@ -1,5 +0,0 @@
-import { Type } from 'react-feather';
-
-export default function TypeIcon({ ...props }) {
-  return <Type size={15} {...props} />;
-}

src/components/icons/UploadIcon.tsx

@@ -1,5 +0,0 @@
-import { Upload } from 'react-feather';
-
-export default function UploadIcon({ ...props }) {
-  return <Upload size={15} {...props} />;
-}

src/components/icons/UserIcon.tsx

@@ -1,5 +0,0 @@
-import { User } from 'react-feather';
-
-export default function UserIcon({ ...props }) {
-  return <User size={15} {...props} />;
-}

src/components/icons/VideoIcon.tsx

@@ -1,5 +0,0 @@
-import { Video } from 'react-feather';
-
-export default function VideoIcon({ ...props }) {
-  return <Video size={15} {...props} />;
-}

src/components/icons/index.tsx

@@ -1,71 +1,4 @@
-import ActivityIcon from './ActivityIcon';
-import CheckIcon from './CheckIcon';
-import CopyIcon from './CopyIcon';
-import CrossIcon from './CrossIcon';
-import DeleteIcon from './DeleteIcon';
-import FileIcon from './FileIcon';
-import HomeIcon from './HomeIcon';
-import LinkIcon from './LinkIcon';
-import LogoutIcon from './LogoutIcon';
-import PencilIcon from './PencilIcon';
-import SettingsIcon from './SettingsIcon';
-import TypeIcon from './TypeIcon';
-import UploadIcon from './UploadIcon';
-import UserIcon from './UserIcon';
-import EnterIcon from './EnterIcon';
-import PlusIcon from './PlusIcon';
-import ImageIcon from './ImageIcon';
-import StarIcon from './StarIcon';
-import AudioIcon from './AudioIcon';
-import VideoIcon from './VideoIcon';
-import PlayIcon from './PlayIcon';
-import CalendarIcon from './CalendarIcon';
-import HashIcon from './HashIcon';
-import TagIcon from './TagIcon';
-import ClockIcon from './ClockIcon';
-import ExternalLinkIcon from './ExternalLinkIcon';
 import ShareXIcon from './ShareXIcon';
-import DownloadIcon from './DownloadIcon';
 import FlameshotIcon from './FlameshotIcon';
-import GitHubIcon from './GitHubIcon';
-import DiscordIcon from './DiscordIcon';
-import GoogleIcon from './GoogleIcon';
-import EyeIcon from './EyeIcon';
-import RefreshIcon from './RefreshIcon';
 
-export {
-  ActivityIcon,
-  CheckIcon,
-  CopyIcon,
-  CrossIcon,
-  DeleteIcon,
-  FileIcon,
-  HomeIcon,
-  LinkIcon,
-  LogoutIcon,
-  PencilIcon,
-  SettingsIcon,
-  TypeIcon,
-  UploadIcon,
-  UserIcon,
-  EnterIcon,
-  PlusIcon,
-  ImageIcon,
-  StarIcon,
-  AudioIcon,
-  VideoIcon,
-  PlayIcon,
-  CalendarIcon,
-  HashIcon,
-  TagIcon,
-  ClockIcon,
-  ExternalLinkIcon,
-  ShareXIcon,
-  DownloadIcon,
-  FlameshotIcon,
-  GitHubIcon,
-  DiscordIcon,
-  GoogleIcon,
-  EyeIcon,
-  RefreshIcon,
-};
+export { ShareXIcon, FlameshotIcon };

src/components/pages/Dashboard/RecentFiles.tsx

@@ -1,11 +1,11 @@
 import { Card as MantineCard, Center, Group, SimpleGrid, Skeleton, Title } from '@mantine/core';
 import { randomId } from '@mantine/hooks';
+import { IconCloudUpload } from '@tabler/icons-react';
 import File from 'components/File';
 import MutedText from 'components/MutedText';
-import { invalidateFiles, useRecent } from 'lib/queries/files';
-import { UploadCloud } from 'react-feather';
+import { useRecent } from 'lib/queries/files';
 
-export default function RecentFiles({ disableMediaPreview }) {
+export default function RecentFiles({ disableMediaPreview, exifEnabled, compress }) {
   const recent = useRecent('media');
 
   return (
@@ -22,8 +22,10 @@ export default function RecentFiles({ disableMediaPreview }) {
               <File
                 key={randomId()}
                 image={image}
-                updateImages={invalidateFiles}
                 disableMediaPreview={disableMediaPreview}
+                exifEnabled={exifEnabled}
+                refreshImages={recent.refetch}
+                onDash={compress}
               />
             ))
           ) : (
@@ -31,7 +33,7 @@ export default function RecentFiles({ disableMediaPreview }) {
               <Center>
                 <Group>
                   <div>
-                    <UploadCloud size={48} />
+                    <IconCloudUpload size={48} />
                   </div>
                   <div>
                     <Title>Nothing here</Title>

src/components/pages/Dashboard/StatCards.tsx

@@ -1,9 +1,8 @@
 import { SimpleGrid } from '@mantine/core';
-import { FileIcon } from 'components/icons';
+import { IconDatabase, IconEye, IconFile, IconUsers } from '@tabler/icons-react';
 import StatCard from 'components/StatCard';
 import { useStats } from 'lib/queries/stats';
 import { percentChange } from 'lib/utils/client';
-import { Database, Eye, Users } from 'react-feather';
 
 export function StatCards() {
   const stats = useStats();
@@ -21,10 +20,10 @@ export function StatCards() {
     >
       <StatCard
         stat={{
-          title: 'UPLOADED FILES',
+          title: 'FILES',
           value: stats.isSuccess ? latest.data.count.toLocaleString() : '...',
           desc: 'files have been uploaded',
-          icon: <FileIcon />,
+          icon: <IconFile />,
           diff:
             stats.isSuccess && before?.data ? percentChange(before.data.count, latest.data.count) : undefined,
         }}
@@ -34,8 +33,8 @@ export function StatCards() {
         stat={{
           title: 'STORAGE',
           value: stats.isSuccess ? latest.data.size : '...',
-          desc: 'of storage used',
-          icon: <Database size={15} />,
+          desc: 'used',
+          icon: <IconDatabase />,
           diff:
             stats.isSuccess && before?.data
               ? percentChange(before.data.size_num, latest.data.size_num)
@@ -47,8 +46,8 @@ export function StatCards() {
         stat={{
           title: 'VIEWS',
           value: stats.isSuccess ? latest.data.views_count.toLocaleString() : '...',
-          desc: 'total page views',
-          icon: <Eye size={15} />,
+          desc: 'total file views',
+          icon: <IconEye />,
           diff:
             stats.isSuccess && before?.data
               ? percentChange(before.data.views_count, latest.data.views_count)
@@ -60,8 +59,8 @@ export function StatCards() {
         stat={{
           title: 'USERS',
           value: stats.isSuccess ? latest.data.count_users.toLocaleString() : '...',
-          desc: 'total registered users',
-          icon: <Users size={15} />,
+          desc: 'users',
+          icon: <IconUsers />,
         }}
       />
     </SimpleGrid>

src/components/pages/Dashboard/index.tsx

@@ -1,151 +1,242 @@
-import { DataGrid, dateFilterFn, stringFilterFn } from '@dicedtomato/mantine-data-grid';
-import { Title, useMantineTheme, Box } from '@mantine/core';
+import { ActionIcon, Box, Group, Title, Tooltip } from '@mantine/core';
 import { useClipboard } from '@mantine/hooks';
 import { showNotification } from '@mantine/notifications';
-import { CopyIcon, CrossIcon, DeleteIcon, EnterIcon } from 'components/icons';
-import Link from 'components/Link';
+import {
+  IconClipboardCopy,
+  IconExternalLink,
+  IconGridDots,
+  IconPhotoCancel,
+  IconPhotoMinus,
+  IconPhotoUp,
+} from '@tabler/icons-react';
+import FileModal from 'components/File/FileModal';
 import MutedText from 'components/MutedText';
 import useFetch from 'lib/hooks/useFetch';
-import { useFiles, useRecent } from 'lib/queries/files';
+import { PaginatedFilesOptions, usePaginatedFiles, useRecent } from 'lib/queries/files';
 import { useStats } from 'lib/queries/stats';
 import { userSelector } from 'lib/recoil/user';
+import { bytesToHuman } from 'lib/utils/bytes';
+import { DataTable, DataTableSortStatus } from 'mantine-datatable';
+import Link from 'next/link';
+import { useEffect, useState } from 'react';
 import { useRecoilValue } from 'recoil';
 import RecentFiles from './RecentFiles';
 import { StatCards } from './StatCards';
 
-export default function Dashboard({ disableMediaPreview }) {
+export default function Dashboard({ disableMediaPreview, exifEnabled, compress }) {
   const user = useRecoilValue(userSelector);
-  const theme = useMantineTheme();
 
-  const images = useFiles();
   const recent = useRecent('media');
   const stats = useStats();
   const clipboard = useClipboard();
 
-  const updateImages = () => {
-    images.refetch();
+  // pagination
+  const [, setNumPages] = useState(0);
+  const [page, setPage] = useState(1);
+  const [numFiles, setNumFiles] = useState(0);
+
+  useEffect(() => {
+    (async () => {
+      const { count } = await useFetch('/api/user/paged?count=true');
+      setNumPages(count);
+
+      const { count: filesCount } = await useFetch('/api/user/files?count=true');
+      setNumFiles(filesCount);
+    })();
+  }, [page]);
+
+  // sorting
+  const [sortStatus, setSortStatus] = useState<DataTableSortStatus>({
+    columnAccessor: 'createdAt',
+    direction: 'asc',
+  });
+
+  const files = usePaginatedFiles(page, {
+    filter: 'none',
+
+    // only query for correct results if there is more than one page
+    // otherwise, querying has no effect
+    ...(numFiles > 1
+      ? {
+          sortBy: sortStatus.columnAccessor as PaginatedFilesOptions['sortBy'],
+          order: sortStatus.direction,
+        }
+      : {}),
+  });
+
+  // file modal on click
+  const [open, setOpen] = useState(false);
+  const [selectedFile, setSelectedFile] = useState(null);
+
+  const updateFiles = () => {
+    files.refetch();
     recent.refetch();
     stats.refetch();
   };
 
-  const deleteImage = async ({ original }) => {
+  const deleteFile = async (file) => {
     const res = await useFetch('/api/user/files', 'DELETE', {
-      id: original.id,
+      id: file.id,
     });
     if (!res.error) {
-      updateImages();
+      updateFiles();
       showNotification({
-        title: 'Image Deleted',
-        message: '',
+        title: 'File Deleted',
+        message: `${file.name}`,
         color: 'green',
-        icon: <DeleteIcon />,
+        icon: <IconPhotoMinus size='1rem' />,
       });
     } else {
       showNotification({
-        title: 'Failed to delete image',
+        title: 'Failed to Delete File',
         message: res.error,
         color: 'red',
-        icon: <CrossIcon />,
+        icon: <IconPhotoCancel size='1rem' />,
       });
     }
   };
 
-  const copyImage = async ({ original }) => {
-    clipboard.copy(`${window.location.protocol}//${window.location.host}${original.url}`);
+  const copyFile = async (file) => {
+    clipboard.copy(`${window.location.protocol}//${window.location.host}${file.url}`);
+
     showNotification({
       title: 'Copied to clipboard',
-      message: '',
-      icon: <CopyIcon />,
+      message: (
+        <a
+          href={`${window.location.protocol}//${window.location.host}${file.url}`}
+        >{`${window.location.protocol}//${window.location.host}${file.url}`}</a>
+      ),
+      icon: <IconClipboardCopy size='1rem' />,
     });
   };
 
-  const viewImage = async ({ original }) => {
-    window.open(`${window.location.protocol}//${window.location.host}${original.url}`);
+  const viewFile = async (file) => {
+    window.open(`${window.location.protocol}//${window.location.host}${file.url}`);
   };
 
   return (
     <div>
+      {selectedFile && (
+        <FileModal
+          open={open}
+          setOpen={setOpen}
+          file={selectedFile}
+          loading={files.isLoading}
+          refresh={() => files.refetch()}
+          reducedActions={false}
+          exifEnabled={exifEnabled}
+          compress={compress}
+          otherUser={false}
+        />
+      )}
+
       <Title>Welcome back, {user?.username}</Title>
       <MutedText size='md'>
-        You have <b>{images.isSuccess ? images.data.length : '...'}</b> files
+        You have <b>{numFiles === 0 ? '...' : numFiles}</b> files
       </MutedText>
 
       <StatCards />
 
-      <RecentFiles disableMediaPreview={disableMediaPreview} />
+      <RecentFiles disableMediaPreview={disableMediaPreview} exifEnabled={exifEnabled} compress={compress} />
 
       <Box my='sm'>
-        <Title>Files</Title>
-        <MutedText size='md'>
-          View your gallery <Link href='/dashboard/files'>here</Link>.
-        </MutedText>
-        <DataGrid
-          data={images.data ?? []}
-          loading={images.isLoading}
-          withPagination={true}
-          withColumnResizing={false}
-          withColumnFilters={true}
-          noEllipsis={true}
-          withSorting={true}
-          highlightOnHover={true}
-          CopyIcon={CopyIcon}
-          DeleteIcon={DeleteIcon}
-          EnterIcon={EnterIcon}
-          deleteImage={deleteImage}
-          copyImage={copyImage}
-          viewImage={viewImage}
-          styles={{
-            dataCell: {
-              width: '100%',
-            },
-            td: {
-              ':nth-child(1)': {
-                minWidth: 170,
-              },
-              ':nth-child(2)': {
-                minWidth: 100,
-              },
-            },
-            th: {
-              ':nth-child(1)': {
-                minWidth: 170,
-                padding: theme.spacing.lg,
-                borderTopLeftRadius: theme.radius.sm,
-              },
-              ':nth-child(2)': {
-                minWidth: 100,
-                padding: theme.spacing.lg,
-              },
-              ':nth-child(3)': {
-                padding: theme.spacing.lg,
-              },
-              ':nth-child(4)': {
-                padding: theme.spacing.lg,
-                borderTopRightRadius: theme.radius.sm,
-              },
-            },
-            thead: {
-              backgroundColor: theme.colors.dark[6],
-            },
-          }}
-          empty={<></>}
+        <Group mb='md'>
+          <Title>Files</Title>
+          <Tooltip label='View Gallery'>
+            <ActionIcon variant='filled' color='primary' component={Link} href='/dashboard/files'>
+              <IconGridDots size='1rem' />
+            </ActionIcon>
+          </Tooltip>
+        </Group>
+
+        <DataTable
+          withBorder
+          borderRadius='md'
+          highlightOnHover
+          verticalSpacing='sm'
           columns={[
+            { accessor: 'name', sortable: true },
+            { accessor: 'mimetype', sortable: true },
+            { accessor: 'size', sortable: true, render: (file) => bytesToHuman(file.size) },
             {
-              accessorKey: 'file',
-              header: 'Name',
-              filterFn: stringFilterFn,
+              accessor: 'createdAt',
+              sortable: true,
+              render: (file) => new Date(file.createdAt).toLocaleString(),
             },
             {
-              accessorKey: 'mimetype',
-              header: 'Type',
-              filterFn: stringFilterFn,
-            },
-            {
-              accessorKey: 'created_at',
-              header: 'Date',
-              filterFn: dateFilterFn,
+              accessor: 'actions',
+              textAlignment: 'right',
+              render: (file) => (
+                <Group spacing={4} position='right' noWrap>
+                  <Tooltip label='More details'>
+                    <ActionIcon
+                      onClick={() => {
+                        setSelectedFile(file);
+                        setOpen(true);
+                      }}
+                      color='blue'
+                    >
+                      <IconPhotoUp size='1rem' />
+                    </ActionIcon>
+                  </Tooltip>
+
+                  <Tooltip label='Open file in new tab'>
+                    <ActionIcon onClick={() => viewFile(file)} color='blue'>
+                      <IconExternalLink size='1rem' />
+                    </ActionIcon>
+                  </Tooltip>
+
+                  <ActionIcon onClick={() => copyFile(file)} color='green'>
+                    <IconClipboardCopy size='1rem' />
+                  </ActionIcon>
+                  <ActionIcon onClick={() => deleteFile(file)} color='red'>
+                    <IconPhotoMinus size='1rem' />
+                  </ActionIcon>
+                </Group>
+              ),
             },
           ]}
+          records={files.data ?? []}
+          fetching={files.isLoading}
+          loaderBackgroundBlur={5}
+          loaderVariant='dots'
+          minHeight={620}
+          page={page}
+          onPageChange={setPage}
+          recordsPerPage={16}
+          totalRecords={numFiles}
+          sortStatus={sortStatus}
+          onSortStatusChange={setSortStatus}
+          rowContextMenu={{
+            shadow: 'xl',
+            borderRadius: 'md',
+            items: (file) => [
+              {
+                key: 'view',
+                icon: <IconExternalLink size='1rem' />,
+                title: `View ${file.name}`,
+                onClick: () => viewFile(file),
+              },
+              {
+                key: 'copy',
+                icon: <IconClipboardCopy size='1rem' />,
+                title: `Copy ${file.name}`,
+                onClick: () => copyFile(file),
+              },
+              {
+                key: 'delete',
+                icon: <IconPhotoMinus size='1rem' />,
+                title: `Delete ${file.name}`,
+                onClick: () => deleteFile(file),
+              },
+            ],
+          }}
+          onCellClick={({ column, record: file }) => {
+            if (column.accessor === 'actions') return;
+
+            setSelectedFile(file);
+            setOpen(true);
+          }}
         />
       </Box>
     </div>

src/components/pages/Files/FilePagation.tsx

@@ -1,28 +1,72 @@
-import { Box, Center, Checkbox, Group, Pagination, SimpleGrid, Skeleton, Title } from '@mantine/core';
+import { Box, Button, Center, Checkbox, Group, Pagination, SimpleGrid, Skeleton, Title } from '@mantine/core';
+import { useMediaQuery } from '@mantine/hooks';
+import { IconFile } from '@tabler/icons-react';
 import File from 'components/File';
-import { FileIcon } from 'components/icons';
 import MutedText from 'components/MutedText';
+import useFetch from 'hooks/useFetch';
 import { usePaginatedFiles } from 'lib/queries/files';
-import { useState } from 'react';
+import { showNonMediaSelector } from 'lib/recoil/settings';
+import { useRouter } from 'next/router';
+import { useEffect, useState } from 'react';
+import { useRecoilState } from 'recoil';
 
-export default function FilePagation({ disableMediaPreview }) {
-  const [checked, setChecked] = useState(false);
+export default function FilePagation({ disableMediaPreview, exifEnabled, queryPage, compress }) {
+  const [checked, setChecked] = useRecoilState(showNonMediaSelector);
+  const [numPages, setNumPages] = useState(Number(queryPage)); // just set it to the queryPage, since the req may have not loaded yet
+  const [page, setPage] = useState(Number(queryPage));
 
-  const pages = usePaginatedFiles(!checked ? { filter: 'media' } : {});
-  const [page, setPage] = useState(1);
+  const isMobile = useMediaQuery('(max-width: 768px)');
+
+  const router = useRouter();
+
+  useEffect(() => {
+    (async () => {
+      router.replace(
+        {
+          query: {
+            ...router.query,
+            page: page,
+          },
+        },
+        undefined,
+        { shallow: true },
+      );
+
+      const { count } = await useFetch(`/api/user/paged?count=true${!checked ? '&filter=media' : ''}`);
+      setNumPages(count);
+    })();
+  }, [page]);
+
+  const pages = usePaginatedFiles(page, {
+    filter: !checked ? 'media' : 'none',
+  });
 
   if (pages.isSuccess && pages.data.length === 0) {
+    if (page > 1 && numPages > 0) {
+      setPage(page - 1);
+
+      return null;
+    }
+
     return (
-      <Center>
+      <Center sx={{ flexDirection: 'column' }}>
         <Group>
           <div>
-            <FileIcon size={48} />
+            <IconFile size={48} />
           </div>
           <div>
             <Title>Nothing here</Title>
             <MutedText size='md'>Upload some files and they will show up here.</MutedText>
           </div>
         </Group>
+        <Box my='sm' hidden={checked}>
+          <MutedText size='md'>
+            There might be some non-media files, would you like to show them?
+            <Button mx='sm' compact type='button' onClick={() => setChecked(true)}>
+              Show
+            </Button>
+          </MutedText>
+        </Box>
       </Center>
     );
   }
@@ -32,12 +76,14 @@ export default function FilePagation({ disableMediaPreview }) {
       <SimpleGrid cols={3} spacing='lg' breakpoints={[{ maxWidth: 'sm', cols: 1, spacing: 'sm' }]}>
         {pages.isSuccess
           ? pages.data.length
-            ? pages.data[page - 1 ?? 0].map((image) => (
+            ? pages.data.map((image) => (
                 <div key={image.id}>
                   <File
                     image={image}
-                    updateImages={() => pages.refetch()}
                     disableMediaPreview={disableMediaPreview}
+                    exifEnabled={exifEnabled}
+                    refreshImages={pages.refetch}
+                    onDash={compress}
                   />
                 </div>
               ))
@@ -58,13 +104,15 @@ export default function FilePagation({ disableMediaPreview }) {
             paddingBottom: 3,
           }}
         >
-          <div></div>
-          <Pagination total={pages.data?.length ?? 0} page={page} onChange={setPage} />
-          <Checkbox
-            label='Show non-media files'
-            checked={checked}
-            onChange={(event) => setChecked(event.currentTarget.checked)}
-          />
+          {!isMobile && <div></div>}
+          <Pagination total={numPages} value={page} onChange={setPage} withEdges />
+          {!isMobile && (
+            <Checkbox
+              label='Show non-media files'
+              checked={checked}
+              onChange={(event) => setChecked(event.currentTarget.checked)}
+            />
+          )}
         </Box>
       ) : null}
     </>