Merge pull request #213 from C4illin/release-please--branches--main--components--convertx-frontend

issue #212

.deepsource.toml

@@ -1,7 +0,0 @@
-version = 1
-
-[[analyzers]]
-name = "javascript"
-
-  [analyzers.meta]
-  environment = ["nodejs"]

.dockerignore

@@ -1,16 +1,20 @@
-node_modules
-Dockerfile*
-docker-compose*
 .dockerignore
+.editorconfig
+.env
 .git
 .gitignore
-README.md
-LICENSE
-.vscode
-Makefile
-helm-charts
-.env
-.editorconfig
 .idea
+.vscode
+CHANGELOG.md
 coverage*
-data
+data
+docker-compose*
+Dockerfile*
+eslint.config.js
+helm-charts
+LICENSE
+Makefile
+node_modules
+prettier.config.js
+README.md
+renovate.json

.github/workflows/docker-publish.yml

@@ -1,69 +1,80 @@
-name: Docker
+name: Docker
-
+
-# This workflow uses actions that are not certified by GitHub.
+# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
+# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
+# separate terms of service, privacy policy, and support
-# documentation.
+# documentation.
-
+
-on:
+on:
-  push:
+  push:
-    branches: [ "main" ]
+    branches: [ "main" ]
-    # Publish semver tags as releases.
+    # Publish semver tags as releases.
-    tags: [ 'v*.*.*' ]
+    tags: [ 'v*.*.*' ]
-  pull_request:
+  pull_request:
-    branches: [ "main" ]
+    branches: [ "main" ]
-  workflow_dispatch:
+  workflow_dispatch:
-
+
-env:
+env:
-  # Use docker.io for Docker Hub if empty
+  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
+  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
+  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME: ${{ github.repository }}
-
+  DOCKERHUB_USERNAME: c4illin
-
+
-jobs:
+
-  build:
+jobs:
-    runs-on: ubuntu-latest
+  build:
-    permissions:
+    runs-on: ubuntu-latest
-      contents: read
+    permissions:
-      packages: write
+      contents: read
-
+      packages: write
-    steps:
+
-      - name: Checkout repository
+    steps:
-        uses: actions/checkout@v4
+      - name: Checkout repository
-
+        uses: actions/checkout@v4
-      # Workaround: https://github.com/docker/build-push-action/issues/461
+
-      - name: Setup Docker buildx
+      # Workaround: https://github.com/docker/build-push-action/issues/461
-        uses: docker/setup-buildx-action@v3
+      - name: Setup Docker buildx
-
+        uses: docker/setup-buildx-action@v3
-      # Login against a Docker registry except on PR
+
-      # https://github.com/docker/login-action
+      # Login against a Docker registry except on PR
-      - name: Log into registry ${{ env.REGISTRY }}
+      # https://github.com/docker/login-action
-        if: github.event_name != 'pull_request'
+      - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
-        with:
+        uses: docker/login-action@v3
-          registry: ${{ env.REGISTRY }}
+        with:
-          username: ${{ github.actor }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ github.actor }}
-
+          password: ${{ secrets.GITHUB_TOKEN }}
-      # Extract metadata (tags, labels) for Docker
+      
-      # https://github.com/docker/metadata-action
+      - name: Login to Docker Hub
-      - name: Extract Docker metadata
+        if: github.event_name != 'pull_request'
-        id: meta
+        uses: docker/login-action@v3
-        uses: docker/metadata-action@v5
+        with:
-        with:
+          username: ${{ env.DOCKERHUB_USERNAME }}
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
+
-      # Build and push Docker image with Buildx (don't push on PR)
+      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/build-push-action
+      # https://github.com/docker/metadata-action
-      - name: Build and push Docker image
+      - name: Extract Docker metadata
-        id: build-and-push
+        id: meta
-        uses: docker/build-push-action@v6
+        uses: docker/metadata-action@v5
-        with:
+        with:
-          context: .
+          images: |
-          platforms: linux/amd64,linux/arm64
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          push: ${{ github.event_name != 'pull_request' }}
+            ${{ env.IMAGE_NAME }}
-          tags: ${{ steps.meta.outputs.tags }}
+
-          labels: ${{ steps.meta.outputs.labels }}
+      # Build and push Docker image with Buildx (don't push on PR)
-          cache-from: type=gha
+      # https://github.com/docker/build-push-action
-          cache-to: type=gha,mode=max
+      - name: Build and push Docker image
+        id: build-and-push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+      

.github/workflows/dockerhub-description.yml

@@ -0,0 +1,27 @@
+name: Update Docker Hub Description
+
+env:
+  IMAGE_NAME: ${{ github.repository }}
+  DOCKERHUB_USERNAME: c4illin
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - README.md
+      - .github/workflows/dockerhub-description.yml
+jobs:
+  dockerHubDescription:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Docker Hub Description
+      uses: peter-evans/dockerhub-description@v4
+      with:
+        username: ${{ env.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        repository: ${{ env.IMAGE_NAME }}
+        short-description: ${{ github.event.repository.description }}
+        enable-url-completion: true

.gitignore

@@ -48,4 +48,4 @@ package-lock.json
 /data
 /Bruno
 /tsconfig.tsbuildinfo
-/src/public/generated.css
+/public/generated.css

CHANGELOG.md

@@ -1,5 +1,64 @@
 # Changelog
 
+## [0.10.1](https://github.com/C4illin/ConvertX/compare/v0.10.0...v0.10.1) (2025-01-21)
+
+
+### Bug Fixes
+
+* ffmpeg works without ffmpeg_args ([3b7ea88](https://github.com/C4illin/ConvertX/commit/3b7ea88b7382f7c21b120bdc9bda5bb10547f55d)), closes [#212](https://github.com/C4illin/ConvertX/issues/212)
+
+## [0.10.0](https://github.com/C4illin/ConvertX/compare/v0.9.0...v0.10.0) (2025-01-18)
+
+
+### Features
+
+* add calibre ([03d3edf](https://github.com/C4illin/ConvertX/commit/03d3edfff65c252dd4b8922fc98257c089c1ff74)), closes [#191](https://github.com/C4illin/ConvertX/issues/191)
+
+
+### Bug Fixes
+
+* add FFMPEG_ARGS env variable ([f537c81](https://github.com/C4illin/ConvertX/commit/f537c81db7815df8017f834e3162291197e1c40f)), closes [#190](https://github.com/C4illin/ConvertX/issues/190)
+* add qt6-qtbase-private-dev from community repo ([95dbc9f](https://github.com/C4illin/ConvertX/commit/95dbc9f678bec7e6e2c03587e1473fb8ff708ea3))
+* skip account setup when ALLOW_UNAUTHENTICATED is true ([538c5b6](https://github.com/C4illin/ConvertX/commit/538c5b60c9e27a8184740305475245da79bae143))
+
+## [0.9.0](https://github.com/C4illin/ConvertX/compare/v0.8.1...v0.9.0) (2024-11-21)
+
+
+### Features
+
+* add inkscape for vector images ([f3740e9](https://github.com/C4illin/ConvertX/commit/f3740e9ded100b8500f3613517960248bbd3c210))
+* Allow to chose webroot ([36cb6cc](https://github.com/C4illin/ConvertX/commit/36cb6cc589d80d0a87fa8dbe605db71a9a2570f9)), closes [#180](https://github.com/C4illin/ConvertX/issues/180)
+* disable convert when uploading ([58e220e](https://github.com/C4illin/ConvertX/commit/58e220e82d7f9c163d6ea4dc31092c08a3e254f4)), closes [#177](https://github.com/C4illin/ConvertX/issues/177)
+
+
+### Bug Fixes
+
+* treat unknown as m4a ([1a442d6](https://github.com/C4illin/ConvertX/commit/1a442d6e69606afef63b1e7df36aa83d111fa23d)), closes [#178](https://github.com/C4illin/ConvertX/issues/178)
+* wait for both upload and selection ([4c05fd7](https://github.com/C4illin/ConvertX/commit/4c05fd72bbbf91ee02327f6fcbf749b78272376b)), closes [#177](https://github.com/C4illin/ConvertX/issues/177)
+
+## [0.8.1](https://github.com/C4illin/ConvertX/compare/v0.8.0...v0.8.1) (2024-10-05)
+
+
+### Bug Fixes
+
+* disable convert button when input is empty ([78844d7](https://github.com/C4illin/ConvertX/commit/78844d7bd55990789ed07c81e49043e688cbe656)), closes [#151](https://github.com/C4illin/ConvertX/issues/151)
+* resize to fit for ico ([b4e53db](https://github.com/C4illin/ConvertX/commit/b4e53dbb8e70b3a95b44e5b756759d16117a87e1)), closes [#157](https://github.com/C4illin/ConvertX/issues/157)
+* treat jfif as jpeg ([339b79f](https://github.com/C4illin/ConvertX/commit/339b79f786131deb93f0d5683e03178fdcab1ef5)), closes [#163](https://github.com/C4illin/ConvertX/issues/163)
+
+## [0.8.0](https://github.com/C4illin/ConvertX/compare/v0.7.0...v0.8.0) (2024-09-30)
+
+
+### Features
+
+* add light theme, fixes [#156](https://github.com/C4illin/ConvertX/issues/156) ([72636c5](https://github.com/C4illin/ConvertX/commit/72636c5059ebf09c8fece2e268293650b2f8ccf6))
+
+
+### Bug Fixes
+
+* add support for usd for assimp, [#144](https://github.com/C4illin/ConvertX/issues/144) ([2057167](https://github.com/C4illin/ConvertX/commit/20571675766209ad1251f07e687d29a6791afc8b))
+* cleanup formats and add opus, fixes [#159](https://github.com/C4illin/ConvertX/issues/159) ([ae1dfaf](https://github.com/C4illin/ConvertX/commit/ae1dfafc9d9116a57b08c2f7fc326990e00824b0))
+* support .awb and clean up, fixes [#153](https://github.com/C4illin/ConvertX/issues/153), [#92](https://github.com/C4illin/ConvertX/issues/92) ([1c9e67f](https://github.com/C4illin/ConvertX/commit/1c9e67fc3201e0e5dee91e8981adf34daaabf33a))
+
 ## [0.7.0](https://github.com/C4illin/ConvertX/compare/v0.6.0...v0.7.0) (2024-09-26)
 
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM oven/bun:1.1.29-alpine AS base
+FROM oven/bun:1.1.45-alpine AS base
 LABEL org.opencontainers.image.source="https://github.com/C4illin/ConvertX"
 WORKDIR /app
 
@@ -50,14 +50,20 @@ RUN apk --no-cache add  \
   vips-poppler \
   vips-jxl \
   libjxl-tools \
-  assimp
+  assimp \
+  inkscape \
+  poppler-utils
+
+RUN apk --no-cache add qt6-qtbase-private-dev --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community/
+
+RUN apk --no-cache add calibre --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing/
 
 # this might be needed for some latex use cases, will add it if needed.
 #   texmf-dist-fontsextra \
 
 COPY --from=install /temp/prod/node_modules node_modules
 COPY --from=builder /root/.cargo/bin/resvg /usr/local/bin/resvg
-COPY --from=prerelease /app/src/public/generated.css /app/src/public/
+COPY --from=prerelease /app/public/generated.css /app/public/
 # COPY --from=prerelease /app/src/index.tsx /app/src/
 # COPY --from=prerelease /app/package.json .
 COPY . .

README.md

@@ -1,111 +1,148 @@
-![ConvertX](images/logo.png)
+![ConvertX](images/logo.png)
-# ConvertX
+
-[![Docker](https://github.com/C4illin/ConvertX/actions/workflows/docker-publish.yml/badge.svg?branch=main)](https://github.com/C4illin/ConvertX/actions/workflows/docker-publish.yml)
+# ConvertX
-[![GitHub Release](https://img.shields.io/github/v/release/C4illin/ConvertX)](https://github.com/C4illin/ConvertX/pkgs/container/convertx)
+
-![GitHub commits since latest release](https://img.shields.io/github/commits-since/C4illin/ConvertX/latest)
+[![Docker](https://github.com/C4illin/ConvertX/actions/workflows/docker-publish.yml/badge.svg?branch=main)](https://github.com/C4illin/ConvertX/actions/workflows/docker-publish.yml)
-![GitHub repo size](https://img.shields.io/github/repo-size/C4illin/ConvertX)
+[![ghcr.io Pulls](https://img.shields.io/badge/dynamic/json?logo=github&url=https%3A%2F%2Fipitio.github.io%2Fbackage%2FC4illin%2FConvertX%2Fconvertx.json&query=%24.downloads&label=ghcr.io%20pulls&cacheSeconds=14400)](https://github.com/C4illin/ConvertX/pkgs/container/ConvertX)
-![Docker container size](https://ghcr-badge.egpl.dev/c4illin/convertx/size?color=%230375b6&tag=latest&label=image+size&trim=)
+[![Docker Pulls](https://img.shields.io/docker/pulls/c4illin/convertx?style=flat&logo=docker&label=dockerhub%20pulls&link=https%3A%2F%2Fhub.docker.com%2Frepository%2Fdocker%2Fc4illin%2Fconvertx%2Fgeneral)](https://hub.docker.com/r/c4illin/convertx)
-![GitHub top language](https://img.shields.io/github/languages/top/C4illin/ConvertX)
+[![GitHub Release](https://img.shields.io/github/v/release/C4illin/ConvertX)](https://github.com/C4illin/ConvertX/pkgs/container/convertx)
-
+![GitHub commits since latest release](https://img.shields.io/github/commits-since/C4illin/ConvertX/latest)
-A self-hosted online file converter. Supports over a thousand different formats. Written with TypeScript, Bun and Elysia.
+![GitHub repo size](https://img.shields.io/github/repo-size/C4illin/ConvertX)
-
+![Docker container size](https://ghcr-badge.egpl.dev/c4illin/convertx/size?color=%230375b6&tag=latest&label=image+size&trim=)
-## Features
+<!-- ![Dev image size](https://ghcr-badge.egpl.dev/c4illin/convertx/size?color=%230375b6&tag=main&label=dev+image&trim=) -->
-
+
-- Convert files to different formats
+A self-hosted online file converter. Supports over a thousand different formats. Written with TypeScript, Bun and Elysia.
-- Process multiple files at once
+
-- Password protection
+## Features
-- Multiple accounts
+
-
+- Convert files to different formats
-## Converters supported
+- Process multiple files at once
-
+- Password protection
-| Converter                                                                    | Use case      | Converts from | Converts to |
+- Multiple accounts
-|------------------------------------------------------------------------------|---------------|---------------|-------------|
+
-| [libjxl](https://github.com/libjxl/libjxl)                                   | JPEG XL       | 11            | 11          |
+## Converters supported
-| [resvg](https://github.com/RazrFalcon/resvg)                                 | SVG           | 1             | 1           |
+
-| [Vips](https://github.com/libvips/libvips)                                   | Images        | 45            | 23          |
+| Converter                                                                    | Use case      | Converts from | Converts to |
-| [Assimp](https://github.com/assimp/assimp)                                   | 3D Assets     | 70            | 24          |
+|------------------------------------------------------------------------------|---------------|---------------|-------------|
-| [XeLaTeX](https://tug.org/xetex/)                                            | LaTeX         | 1             | 1           |
+| [libjxl](https://github.com/libjxl/libjxl)                                   | JPEG XL       | 11            | 11          |
-| [Pandoc](https://pandoc.org/)                                                | Documents     | 43            | 65          |
+| [resvg](https://github.com/RazrFalcon/resvg)                                 | SVG           | 1             | 1           |
-| [GraphicsMagick](http://www.graphicsmagick.org/)                             | Images        | 166           | 133         |
+| [Vips](https://github.com/libvips/libvips)                                   | Images        | 45            | 23          |
-| [FFmpeg](https://ffmpeg.org/)                                                | Video         | ~473          | ~280        |
+| [XeLaTeX](https://tug.org/xetex/)                                            | LaTeX         | 1             | 1           |
-
+| [Calibre](https://calibre-ebook.com/)                                        | E-books       | 26            | 19          |
-<!-- many ffmpeg fileformats are duplicates -->
+| [Pandoc](https://pandoc.org/)                                                | Documents     | 43            | 65          |
-
+| [GraphicsMagick](http://www.graphicsmagick.org/)                             | Images        | 167           | 130         |
-Any missing converter? Open an issue or pull request!
+| [Inkscape](https://inkscape.org/)                                            | Vector images | 7             | 17          |
-
+| [Assimp](https://github.com/assimp/assimp)                                   | 3D Assets     | 77            | 23          |
-## Deployment
+| [FFmpeg](https://ffmpeg.org/)                                                | Video         | ~472          | ~199        |
-
+
-```yml
+<!-- many ffmpeg fileformats are duplicates -->
-# docker-compose.yml
+
-services:
+Any missing converter? Open an issue or pull request!
-  convertx: 
+
-    image: ghcr.io/c4illin/convertx
+## Deployment
-    container_name: convertx
+
-    restart: unless-stopped
+```yml
-    ports:
+# docker-compose.yml
-      - "3000:3000"
+services:
-    environment: # Defaults are listed below. All are optional.
+  convertx: 
-      - ACCOUNT_REGISTRATION=false # true or false, doesn't matter for the first account (e.g. keep this to false if you only want one account)
+    image: ghcr.io/c4illin/convertx
-      - JWT_SECRET=aLongAndSecretStringUsedToSignTheJSONWebToken1234 # will use randomUUID() by default
+    container_name: convertx
-      - HTTP_ALLOWED=false # setting this to true is unsafe, only set this to true locally
+    restart: unless-stopped
-      - ALLOW_UNAUTHENTICATED=false # allows anyone to use the service without logging in, only set this to true locally
+    ports:
-      - AUTO_DELETE_EVERY_N_HOURS=24 # checks every n hours for files older then n hours and deletes them, set to 0 to disable
+      - "3000:3000"
-    volumes:
+    environment:
-      - convertx:/app/data
+      - JWT_SECRET=aLongAndSecretStringUsedToSignTheJSONWebToken1234 # will use randomUUID() if unset
-```
+    volumes:
-
+      - ./data:/app/data
-or
+```
-
+
-```bash
+or
-docker run -p 3000:3000 -v ./data:/app/data ghcr.io/c4illin/convertx
+
-```
+```bash
-
+docker run -p 3000:3000 -v ./data:/app/data ghcr.io/c4illin/convertx
-Then visit `http://localhost:3000` in your browser and create your account. Don't leave it unconfigured and open, as anyone can register the first account.
+```
-
+
-If you get unable to open database file run `chown -R $USER:$USER path` on the path you choose.
+Then visit `http://localhost:3000` in your browser and create your account. Don't leave it unconfigured and open, as anyone can register the first account.
-
+
-### Tutorial
+If you get unable to open database file run `chown -R $USER:$USER path` on the path you choose.
-
+
-Tutorial in french: https://belginux.com/installer-convertx-avec-docker/
+### Environment variables
-
+
-## Screenshots
+All are optional, JWT_SECRET is recommended to be set.
-
+
-![ConvertX Preview](images/preview.png)
+| Name                      | Default | Description |
-
+|---------------------------|---------|-------------|
-## Development
+| JWT_SECRET                | when unset it will use the value from randomUUID() | A long and secret string used to sign the JSON Web Token |
-
+| ACCOUNT_REGISTRATION      | false | Allow users to register accounts |
-0. Install [Bun](https://bun.sh/) and Git
+| HTTP_ALLOWED              | false | Allow HTTP connections, only set this to true locally |
-1. Clone the repository
+| ALLOW_UNAUTHENTICATED     | false | Allow unauthenticated users to use the service, only set this to true locally |
-2. `bun install`
+| AUTO_DELETE_EVERY_N_HOURS | 24 | Checks every n hours for files older then n hours and deletes them, set to 0 to disable |
-3. `bun run dev`
+| WEBROOT                   |  | The address to the root path setting this to "/convert" will serve the website on "example.com/convert/" |
-
+| FFMPEG_ARGS               |  | Arguments to pass to ffmpeg, e.g. `-preset veryfast` |
-Pull requests are welcome! See below and open issues for the list of todos.
+
-
+> [!WARNING]
-## Todo
+> If you can't login, make sure you are accessing the service over https or set HTTP_ALLOWED=true
-- [x] Add messages for errors in converters
+
-- [x] Add searchable list of formats
+### Docker images
-- [ ] Add options for converters
+
-- [ ] Divide index.tsx into smaller components
+There is a `:latest` tag that is updated with every release and a `:main` tag that is updated with every push to the main branch. `:latest` is recommended for normal use.
-- [ ] Add tests
+
-- [ ] Make the upload button nicer and more easy to drop files on. Support copy paste as well if possible.
+The image is available on [GitHub Container Registry](https://github.com/C4illin/ConvertX/pkgs/container/ConvertX) and [Docker Hub](https://hub.docker.com/r/c4illin/convertx).
-- [ ] Make errors logs visible from the web ui
+
-- [ ] Add more converters:
+| Image | What it is |
-  - [ ] [deark](https://github.com/jsummers/deark)
+|-------|------------|
-  - [ ] LibreOffice
+| `image: ghcr.io/c4illin/convertx` | The latest release on ghcr |
-  - [ ] [dvisvgm](https://github.com/mgieseki/dvisvgm)
+| `image: ghcr.io/c4illin/convertx:main` | The latest commit on ghcr |
-
+| `image: c4illin/convertx` | The latest release on docker hub |
-## Contributors
+| `image: c4illin/convertx:main` | The latest commit on docker hub |
-
+
-<a href="https://github.com/C4illin/ConvertX/graphs/contributors">
+<!-- Dockerhub was introduced in 0.9.0 and older releases -->
-  <img src="https://contrib.rocks/image?repo=C4illin/ConvertX" />
+
-</a>
+### Tutorial
-
+
-## Star History
+Tutorial in french: <https://belginux.com/installer-convertx-avec-docker/>
-
+
-<a href="https://github.com/C4illin/ConvertX/stargazers">
+Tutorial in chinese: <https://xzllll.com/24092901/>
- <picture>
+
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=C4illin/ConvertX&type=Date&theme=dark" />
+## Screenshots
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=C4illin/ConvertX&type=Date" />
+
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=C4illin/ConvertX&type=Date" />
+![ConvertX Preview](images/preview.png)
- </picture>
+
-</a>
+## Development
+
+0. Install [Bun](https://bun.sh/) and Git
+1. Clone the repository
+2. `bun install`
+3. `bun run dev`
+
+Pull requests are welcome! See below and open issues for the list of todos.
+
+## Todo
+
+- [x] Add messages for errors in converters
+- [x] Add searchable list of formats
+- [ ] Add options for converters
+- [ ] Divide index.tsx into smaller components
+- [ ] Add tests
+- [ ] Make the upload button nicer and more easy to drop files on. Support copy paste as well if possible.
+- [ ] Make errors logs visible from the web ui
+- [ ] Add more converters:
+  - [ ] [deark](https://github.com/jsummers/deark)
+  - [ ] LibreOffice
+  - [ ] [dvisvgm](https://github.com/mgieseki/dvisvgm)
+
+## Contributors
+
+<a href="https://github.com/C4illin/ConvertX/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=C4illin/ConvertX" alt="Image with all contributors"/>
+</a>
+
+## Star History
+
+<a href="https://github.com/C4illin/ConvertX/stargazers">
+ <picture>
+   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=C4illin/ConvertX&type=Date&theme=dark" />
+   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=C4illin/ConvertX&type=Date" />
+   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=C4illin/ConvertX&type=Date" />
+ </picture>
+</a>

compose.yaml

@@ -1,15 +1,17 @@
-services:
+services:
-  convertx:
+  convertx:
-    build:
+    build:
-      context: .
+      context: .
-      # dockerfile: Debian.Dockerfile
+      # dockerfile: Debian.Dockerfile
-    volumes:
+    volumes:
-      - ./data:/app/data
+      - ./data:/app/data
-    environment: # Defaults are listed below. All are optional.
+    environment: # Defaults are listed below. All are optional.
-      - ACCOUNT_REGISTRATION=true # true or false, doesn't matter for the first account (e.g. keep this to false if you only want one account)
+      - ACCOUNT_REGISTRATION=true # true or false, doesn't matter for the first account (e.g. keep this to false if you only want one account)
-      - JWT_SECRET=aLongAndSecretStringUsedToSignTheJSONWebToken1234 # will use randomUUID() by default
+      - JWT_SECRET=aLongAndSecretStringUsedToSignTheJSONWebToken1234 # will use randomUUID() by default
-      - HTTP_ALLOWED=true # setting this to true is unsafe, only set this to true locally
+      - HTTP_ALLOWED=true # setting this to true is unsafe, only set this to true locally
-      - ALLOW_UNAUTHENTICATED=true # allows anyone to use the service without logging in, only set this to true locally
+      - ALLOW_UNAUTHENTICATED=true # allows anyone to use the service without logging in, only set this to true locally
-      - AUTO_DELETE_EVERY_N_HOURS=1 # checks every n hours for files older then n hours and deletes them, set to 0 to disable
+      - AUTO_DELETE_EVERY_N_HOURS=1 # checks every n hours for files older then n hours and deletes them, set to 0 to disable
-    ports:
+      # - FFMPEG_ARGS=-hwaccel vulkan # additional arguments to pass to ffmpeg
-      - 3000:3000
+      # - WEBROOT=/convertx # the root path of the web interface, leave empty to disable
+    ports:
+      - 3000:3000

eslint.config.js

@@ -1,27 +1,23 @@
-import comments from "@eslint-community/eslint-plugin-eslint-comments/configs";
 import { fixupPluginRules } from "@eslint/compat";
-import js from "@eslint/js";
+import eslint from "@eslint/js";
 import deprecationPlugin from "eslint-plugin-deprecation";
-import importPlugin from "eslint-plugin-import";
+import eslintPluginReadableTailwind from "eslint-plugin-readable-tailwind";
 import simpleImportSortPlugin from "eslint-plugin-simple-import-sort";
 import tailwind from "eslint-plugin-tailwindcss";
 import globals from "globals";
 import tseslint from "typescript-eslint";
 
 export default tseslint.config(
-  js.configs.recommended,
+  eslint.configs.recommended,
-  importPlugin.flatConfigs.recommended,
-  comments.recommended,
   ...tseslint.configs.recommended,
   ...tailwind.configs["flat/recommended"],
   {
     plugins: {
-      "@typescript-eslint": tseslint.plugin,
       deprecation: fixupPluginRules(deprecationPlugin),
-      import: fixupPluginRules(importPlugin),
       "simple-import-sort": simpleImportSortPlugin,
+      "readable-tailwind": eslintPluginReadableTailwind,
     },
-    ignores: ["**/node_modules/**", "**/public/**"],
+    ignores: ["**/node_modules/**"],
     languageOptions: {
       parserOptions: {
         projectService: true,
@@ -32,14 +28,23 @@ export default tseslint.config(
       },
       globals: {
         ...globals.node,
+        ...globals.browser,
       },
     },
-    files: ["**/*.{js,mjs,cjs}"],
+    files: ["**/*.{js,mjs,cjs,tsx,ts}"],
     rules: {
-      "tailwindcss/no-custom-classname": [
+      ...eslintPluginReadableTailwind.configs.warning.rules,
-        "error",
+      "tailwindcss/classnames-order": "off",
+      "readable-tailwind/multiline": [
+        "warn",
+        {
+          group: "newLine",
+          printWidth: 100,
+        },
+      ],
+      "tailwindcss/no-custom-classname": [
+        "warn",
         {
-          config: "./tailwind.config.js",
           whitelist: [
             "select_container",
             "convert_to_popup",
@@ -49,7 +54,6 @@ export default tseslint.config(
           ],
         },
       ],
-      "import/no-named-as-default": "off",
     },
   },
 );

package.json

@@ -1,22 +1,23 @@
 {
   "name": "convertx-frontend",
-  "version": "0.7.0",
+  "version": "0.10.1",
   "scripts": {
     "dev": "bun run --watch src/index.tsx",
     "hot": "bun run --hot src/index.tsx",
-    "format": "biome format --write ./src",
+    "format": "eslint --fix .",
-    "build": "postcss  ./src/main.css -o ./src/public/generated.css",
+    "build": "postcss ./src/main.css -o ./public/generated.css",
     "lint": "run-p 'lint:*'",
     "lint:tsc": "tsc --noEmit",
     "lint:knip": "knip",
-    "lint:biome": "biome lint --error-on-warnings ./src"
+    "lint:eslint": "eslint ."
   },
   "dependencies": {
     "@elysiajs/cookie": "^0.8.0",
-    "@elysiajs/html": "1.0.2",
+    "@elysiajs/html": "^1.2.0",
-    "@elysiajs/jwt": "^1.1.1",
+    "@elysiajs/jwt": "^1.2.0",
-    "@elysiajs/static": "1.0.3",
+    "@elysiajs/static": "^1.2.0",
-    "elysia": "^1.1.16"
+    "@kitajs/html": "^4.2.7",
+    "elysia": "^1.2.10"
   },
   "module": "src/index.tsx",
   "type": "module",
@@ -24,44 +25,31 @@
     "start": "bun run src/index.tsx"
   },
   "devDependencies": {
-    "@biomejs/biome": "1.9.2",
+    "@eslint/compat": "^1.2.5",
-    "@eslint-community/eslint-plugin-eslint-comments": "^4.4.0",
+    "@eslint/js": "^9.18.0",
-    "@eslint/compat": "^1.1.1",
+    "@ianvs/prettier-plugin-sort-imports": "^4.4.1",
-    "@eslint/js": "^9.11.1",
+    "@kitajs/ts-html-plugin": "^4.1.1",
-    "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
-    "@kitajs/ts-html-plugin": "^4.1.0",
-    "@picocss/pico": "^2.0.6",
     "@total-typescript/ts-reset": "^0.6.1",
-    "@types/bun": "^1.1.10",
+    "@types/bun": "^1.1.16",
-    "@types/eslint": "^9.6.1",
     "@types/eslint-plugin-tailwindcss": "^3.17.0",
     "@types/eslint__js": "^8.42.3",
-    "@types/node": "^22.6.1",
+    "@types/node": "^22.10.7",
-    "@typescript-eslint/eslint-plugin": "^8.7.0",
-    "@typescript-eslint/parser": "^8.7.0",
     "autoprefixer": "^10.4.20",
     "cssnano": "^7.0.6",
-    "eslint": "^9.11.1",
+    "eslint": "^9.18.0",
-    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-deprecation": "^3.0.0",
-    "eslint-plugin-import": "^2.30.0",
+    "eslint-plugin-readable-tailwind": "^1.8.2",
-    "eslint-plugin-isaacscript": "^4.0.0",
-    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-tailwindcss": "^3.17.4",
+    "eslint-plugin-tailwindcss": "^3.17.5",
-    "globals": "^15.9.0",
+    "globals": "^15.14.0",
-    "knip": "^5.30.5",
+    "knip": "^5.42.1",
-    "npm-run-all2": "^6.2.3",
+    "npm-run-all2": "^7.0.2",
-    "postcss": "^8.4.47",
+    "postcss": "^8.5.1",
     "postcss-cli": "^11.0.0",
-    "postcss-lightningcss": "^1.0.1",
+    "prettier": "^3.4.2",
-    "prettier": "^3.3.3",
     "tailwind-scrollbar": "^3.1.0",
-    "tailwindcss": "^3.4.13",
+    "tailwindcss": "^3.4.17",
-    "typescript": "^5.6.2",
+    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.7.0"
+    "typescript-eslint": "^8.20.0"
-  },
+  }
-  "trustedDependencies": [
-    "@biomejs/biome"
-  ]
 }

postcss.config.cjs

@@ -1,9 +0,0 @@
-// eslint-disable-next-line no-undef
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-    // eslint-disable-next-line no-undef
-    ...(process.env.NODE_ENV === 'production' ? { cssnano: {} } : {})
-  }
-}

postcss.config.js

@@ -0,0 +1,8 @@
+import autoprefixer from "autoprefixer";
+import cssnano from "cssnano";
+import tailwind from "tailwindcss";
+import tailwindConfig from "./tailwind.config.js";
+
+export default {
+  plugins: [autoprefixer, tailwind(tailwindConfig), cssnano],
+};

public/results.js

@@ -1,3 +1,5 @@
+const webroot = document.querySelector("meta[name='webroot']").content;
+
 window.downloadAll = function () {
   // Get all download links
   const downloadLinks = document.querySelectorAll("a[download]");
@@ -18,7 +20,7 @@ let progressElem = document.querySelector("progress");
 const refreshData = () => {
   // console.log("Refreshing data...", progressElem.value, progressElem.max);
   if (progressElem.value !== progressElem.max) {
-    fetch(`/progress/${jobId}`, {
+    fetch(`${webroot}/progress/${jobId}`, {
       method: "POST",
     })
       .then((res) => res.text())

public/script.js

@@ -1,211 +1,236 @@
-// Select the file input element
+const webroot = document.querySelector("meta[name='webroot']").content;
-const fileInput = document.querySelector('input[type="file"]');
+const fileInput = document.querySelector('input[type="file"]');
-const dropZone = document.getElementById("dropzone");
+const dropZone = document.getElementById("dropzone");
-const fileNames = [];
+const convertButton = document.querySelector("input[type='submit']");
-let fileType;
+const fileNames = [];
-
+let fileType;
-dropZone.addEventListener("dragover", (e) => {
+let pendingFiles = 0;
-  dropZone.classList.add("dragover");
+let formatSelected = false;
-});
+
-
+dropZone.addEventListener("dragover", () => {
-dropZone.addEventListener("dragleave", (e) => {
+  dropZone.classList.add("dragover");
-  dropZone.classList.remove("dragover");
+});
-});
+
-
+dropZone.addEventListener("dragleave", () => {
-const selectContainer = document.querySelector("form .select_container");
+  dropZone.classList.remove("dragover");
-
+});
-const updateSearchBar = () => {
+
-  const convertToInput = document.querySelector(
+dropZone.addEventListener("drop", () => {
-    "input[name='convert_to_search']",
+  dropZone.classList.remove("dragover");
-  );
+});
-  const convertToPopup = document.querySelector(".convert_to_popup");
+
-  const convertToGroupElements = document.querySelectorAll(".convert_to_group");
+const selectContainer = document.querySelector("form .select_container");
-  const convertToGroups = {};
+
-  const convertToElement = document.querySelector("select[name='convert_to']");
+const updateSearchBar = () => {
-
+  const convertToInput = document.querySelector(
-  const showMatching = (search) => {
+    "input[name='convert_to_search']",
-    for (const [targets, groupElement] of Object.values(convertToGroups)) {
+  );
-      let matchingTargetsFound = 0;
+  const convertToPopup = document.querySelector(".convert_to_popup");
-      for (const target of targets) {
+  const convertToGroupElements = document.querySelectorAll(".convert_to_group");
-        if (target.dataset.target.includes(search)) {
+  const convertToGroups = {};
-          matchingTargetsFound++;
+  const convertToElement = document.querySelector("select[name='convert_to']");
-          target.classList.remove("hidden");
+
-          target.classList.add("flex");
+  const showMatching = (search) => {
-        } else {
+    for (const [targets, groupElement] of Object.values(convertToGroups)) {
-          target.classList.add("hidden");
+      let matchingTargetsFound = 0;
-          target.classList.remove("flex");
+      for (const target of targets) {
-        }
+        if (target.dataset.target.includes(search)) {
-      }
+          matchingTargetsFound++;
-
+          target.classList.remove("hidden");
-      if (matchingTargetsFound === 0) {
+          target.classList.add("flex");
-        groupElement.classList.add("hidden");
+        } else {
-        groupElement.classList.remove("flex");
+          target.classList.add("hidden");
-      } else {
+          target.classList.remove("flex");
-        groupElement.classList.remove("hidden");
+        }
-        groupElement.classList.add("flex");
+      }
-      }
+
-    }
+      if (matchingTargetsFound === 0) {
-  };
+        groupElement.classList.add("hidden");
-
+        groupElement.classList.remove("flex");
-  for (const groupElement of convertToGroupElements) {
+      } else {
-    const groupName = groupElement.dataset.converter;
+        groupElement.classList.remove("hidden");
-
+        groupElement.classList.add("flex");
-    const targetElements = groupElement.querySelectorAll(".target");
+      }
-    const targets = Array.from(targetElements);
+    }
-
+  };
-    for (const target of targets) {
+
-      target.onmousedown = () => {
+  for (const groupElement of convertToGroupElements) {
-        convertToElement.value = target.dataset.value;
+    const groupName = groupElement.dataset.converter;
-        convertToInput.value = `${target.dataset.target} using ${target.dataset.converter}`;
+
-        showMatching("");
+    const targetElements = groupElement.querySelectorAll(".target");
-      };
+    const targets = Array.from(targetElements);
-    }
+
-
+    for (const target of targets) {
-    convertToGroups[groupName] = [targets, groupElement];
+      target.onmousedown = () => {
-  }
+        convertToElement.value = target.dataset.value;
-
+        convertToInput.value = `${target.dataset.target} using ${target.dataset.converter}`;
-  convertToInput.addEventListener("input", (e) => {
+        formatSelected = true;
-    showMatching(e.target.value.toLowerCase());
+        if (pendingFiles === 0 && fileNames.length > 0) {
-  });
+          convertButton.disabled = false;
-
+        }
-  convertToInput.addEventListener("blur", (e) => {
+        showMatching("");
-    // Keep the popup open even when clicking on a target button
+      };
-    // for a split second to allow the click to go through
+    }
-    if (e?.relatedTarget?.classList?.contains("target")) {
+
-      convertToPopup.classList.add("hidden");
+    convertToGroups[groupName] = [targets, groupElement];
-      convertToPopup.classList.remove("flex");
+  }
-      return;
+
-    }
+  convertToInput.addEventListener("input", (e) => {
-
+    showMatching(e.target.value.toLowerCase());
-    convertToPopup.classList.add("hidden");
+  });
-    convertToPopup.classList.remove("flex");
+
-  });
+  convertToInput.addEventListener("search", () => {
-
+    // when the user clears the search bar using the 'x' button
-  convertToInput.addEventListener("focus", () => {
+    convertButton.disabled = true;
-    convertToPopup.classList.remove("hidden");
+    formatSelected = false;
-    convertToPopup.classList.add("flex");
+  });
-  });
+
-};
+  convertToInput.addEventListener("blur", (e) => {
-
+    // Keep the popup open even when clicking on a target button
-// const convertFromSelect = document.querySelector("select[name='convert_from']");
+    // for a split second to allow the click to go through
-
+    if (e?.relatedTarget?.classList?.contains("target")) {
-// Add a 'change' event listener to the file input element
+      convertToPopup.classList.add("hidden");
-fileInput.addEventListener("change", (e) => {
+      convertToPopup.classList.remove("flex");
-  // console.log(e.target.files);
+      return;
-  // Get the selected files from the event target
+    }
-  const files = e.target.files;
+
-
+    convertToPopup.classList.add("hidden");
-  // Select the file-list table
+    convertToPopup.classList.remove("flex");
-  const fileList = document.querySelector("#file-list");
+  });
-
+
-  // Loop through the selected files
+  convertToInput.addEventListener("focus", () => {
-  for (const file of files) {
+    convertToPopup.classList.remove("hidden");
-    // Create a new table row for each file
+    convertToPopup.classList.add("flex");
-    const row = document.createElement("tr");
+  });
-    row.innerHTML = `
+};
-      <td>${file.name}</td>
+
-      <td>${(file.size / 1024).toFixed(2)} kB</td>
+// Add a 'change' event listener to the file input element
-      <td><a class="secondary" onclick="deleteRow(this)" style="cursor: pointer">Remove</a></td>
+fileInput.addEventListener("change", (e) => {
-    `;
+  // Get the selected files from the event target
-
+  const files = e.target.files;
-    if (!fileType) {
+
-      fileType = file.name.split(".").pop();
+  // Select the file-list table
-      console.log("fileType", fileType);
+  const fileList = document.querySelector("#file-list");
-      fileInput.setAttribute("accept", `.${fileType}`);
+
-      setTitle();
+  // Loop through the selected files
-
+  for (const file of files) {
-      // choose the option that matches the file type
+    // Create a new table row for each file
-      // for (const option of convertFromSelect.children) {
+    const row = document.createElement("tr");
-      //   console.log(option.value);
+    row.innerHTML = `
-      //   if (option.value === fileType) {
+      <td>${file.name}</td>
-      //     option.selected = true;
+      <td>${(file.size / 1024).toFixed(2)} kB</td>
-      //   }
+      <td><a onclick="deleteRow(this)">Remove</a></td>
-      // }
+    `;
-
+
-      fetch("/conversions", {
+    if (!fileType) {
-        method: "POST",
+      fileType = file.name.split(".").pop();
-        body: JSON.stringify({ fileType: fileType }),
+      fileInput.setAttribute("accept", `.${fileType}`);
-        headers: {
+      setTitle();
-          "Content-Type": "application/json",
+
-        },
+      // choose the option that matches the file type
-      })
+      // for (const option of convertFromSelect.children) {
-        .then((res) => res.text())
+      //   console.log(option.value);
-        .then((html) => {
+      //   if (option.value === fileType) {
-          selectContainer.innerHTML = html;
+      //     option.selected = true;
-          updateSearchBar();
+      //   }
-        })
+      // }
-        .catch((err) => console.log(err));
+
-    }
+      fetch(`${webroot}/conversions`, {
-
+        method: "POST",
-    // Append the row to the file-list table
+        body: JSON.stringify({ fileType: fileType }),
-    fileList.appendChild(row);
+        headers: {
-
+          "Content-Type": "application/json",
-    // Append the file to the hidden input
+        },
-    fileNames.push(file.name);
+      })
-  }
+        .then((res) => res.text())
-
+        .then((html) => {
-  uploadFiles(files);
+          selectContainer.innerHTML = html;
-});
+          updateSearchBar();
-
+        })
-const setTitle = () => {
+        .catch((err) => console.log(err));
-  const title = document.querySelector("h1");
+    }
-  title.textContent = `Convert ${fileType ? `.${fileType}` : ""}`;
+
-};
+    // Append the row to the file-list table
-
+    fileList.appendChild(row);
-// Add a onclick for the delete button
+
-const deleteRow = (target) => {
+    // Append the file to the hidden input
-  const filename = target.parentElement.parentElement.children[0].textContent;
+    fileNames.push(file.name);
-  const row = target.parentElement.parentElement;
+  }
-  row.remove();
+
-
+  uploadFiles(files);
-  // remove from fileNames
+});
-  const index = fileNames.indexOf(filename);
+
-  fileNames.splice(index, 1);
+const setTitle = () => {
-
+  const title = document.querySelector("h1");
-  // if fileNames is empty, reset fileType
+  title.textContent = `Convert ${fileType ? `.${fileType}` : ""}`;
-  if (fileNames.length === 0) {
+};
-    fileType = null;
+
-    fileInput.removeAttribute("accept");
+// Add a onclick for the delete button
-    setTitle();
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
-  }
+const deleteRow = (target) => {
-
+  const filename = target.parentElement.parentElement.children[0].textContent;
-  fetch("/delete", {
+  const row = target.parentElement.parentElement;
-    method: "POST",
+  row.remove();
-    body: JSON.stringify({ filename: filename }),
+
-    headers: {
+  // remove from fileNames
-      "Content-Type": "application/json",
+  const index = fileNames.indexOf(filename);
-    },
+  fileNames.splice(index, 1);
-  })
+
-    .then((res) => res.json())
+  // reset fileInput
-    .then((data) => {
+  fileInput.value = "";
-      console.log(data);
+
-    })
+  // if fileNames is empty, reset fileType
-    .catch((err) => console.log(err));
+  if (fileNames.length === 0) {
-};
+    fileType = null;
-
+    fileInput.removeAttribute("accept");
-const uploadFiles = (files) => {
+    convertButton.disabled = true;
-  const formData = new FormData();
+    setTitle();
-
+  }
-  for (const file of files) {
+
-    formData.append("file", file, file.name);
+  fetch(`${webroot}/delete`, {
-  }
+    method: "POST",
-
+    body: JSON.stringify({ filename: filename }),
-  fetch("/upload", {
+    headers: {
-    method: "POST",
+      "Content-Type": "application/json",
-    body: formData,
+    },
-  })
+  })
-    .then((res) => res.json())
+    .catch((err) => console.log(err));
-    .then((data) => {
+};
-      console.log(data);
+
-    })
+const uploadFiles = (files) => {
-    .catch((err) => console.log(err));
+  convertButton.disabled = true;
-};
+  convertButton.textContent = "Uploading...";
-
+  pendingFiles += 1;
-const formConvert = document.querySelector("form[action='/convert']");
+
-
+  const formData = new FormData();
-formConvert.addEventListener("submit", (e) => {
+
-  const hiddenInput = document.querySelector("input[name='file_names']");
+  for (const file of files) {
-  hiddenInput.value = JSON.stringify(fileNames);
+    formData.append("file", file, file.name);
-});
+  }
-
+
-updateSearchBar();
+  fetch(`${webroot}/upload`, {
+    method: "POST",
+    body: formData,
+  })
+    .then((res) => res.json())
+    .then((data) => {
+      pendingFiles -= 1;
+      if (pendingFiles === 0) {
+        if (formatSelected) {
+          convertButton.disabled = false;
+        }
+        convertButton.textContent = "Convert";
+      }
+      console.log(data);
+    })
+    .catch((err) => console.log(err));
+};
+
+const formConvert = document.querySelector(`form[action='${webroot}/convert']`);
+
+formConvert.addEventListener("submit", () => {
+  const hiddenInput = document.querySelector("input[name='file_names']");
+  hiddenInput.value = JSON.stringify(fileNames);
+});
+
+updateSearchBar();

renovate.json

@@ -1,6 +1,11 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:recommended"
+    "config:recommended",
-  ]
+    ":disableDependencyDashboard"
-}
+  ],
+  "lockFileMaintenance": {
+    "enabled": true,
+    "automerge": true
+  }
+}

src/components/base.tsx

@@ -1,32 +1,40 @@
+import { Html } from "@elysiajs/html";
+
 export const BaseHtml = ({
   children,
   title = "ConvertX",
-}: { children: JSX.Element; title?: string }) => (
+  webroot = "",
+}: {
+  children: JSX.Element;
+  title?: string;
+  webroot?: string;
+}) => (
   <html lang="en">
     <head>
       <meta charset="UTF-8" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+      <meta name="webroot" content={webroot} />
       <title safe>{title}</title>
-      <link rel="stylesheet" href="/generated.css" />
+      <link rel="stylesheet" href={`${webroot}/generated.css`} />
       <link
         rel="apple-touch-icon"
         sizes="180x180"
-        href="/apple-touch-icon.png"
+        href={`${webroot}/apple-touch-icon.png`}
       />
       <link
         rel="icon"
         type="image/png"
         sizes="32x32"
-        href="/favicon-32x32.png"
+        href={`${webroot}/favicon-32x32.png`}
       />
       <link
         rel="icon"
         type="image/png"
         sizes="16x16"
-        href="/favicon-16x16.png"
+        href={`${webroot}/favicon-16x16.png`}
       />
-      <link rel="manifest" href="/site.webmanifest" />
+      <link rel="manifest" href={`${webroot}/site.webmanifest`} />
     </head>
-    <body class="w-full bg-gray-900 text-gray-200">{children}</body>
+    <body class="w-full bg-neutral-900 text-neutral-200">{children}</body>
   </html>
 );

src/components/header.tsx

@@ -1,25 +1,44 @@
+import { Html } from "@kitajs/html";
+
 export const Header = ({
   loggedIn,
   accountRegistration,
-}: { loggedIn?: boolean; accountRegistration?: boolean }) => {
+  allowUnauthenticated,
+  webroot = "",
+}: {
+  loggedIn?: boolean;
+  accountRegistration?: boolean;
+  allowUnauthenticated?: boolean;
+  webroot?: string;
+}) => {
   let rightNav: JSX.Element;
   if (loggedIn) {
     rightNav = (
-      <ul class="flex gap-4 ">
+      <ul class="flex gap-4">
         <li>
           <a
-            class="text-lime-600 transition-all hover:text-lime-500 hover:underline"
+            class={`
-            href="/history">
+              text-accent-600 transition-all
+              hover:text-accent-500 hover:underline
+            `}
+            href={`${webroot}/history`}
+          >
             History
           </a>
         </li>
-        <li>
+        {!allowUnauthenticated ? (
-          <a
+          <li>
-            class="text-lime-600 transition-all hover:text-lime-500 hover:underline"
+            <a
-            href="/logoff">
+              class={`
-            Logout
+                text-accent-600 transition-all
-          </a>
+                hover:text-accent-500 hover:underline
-        </li>
+              `}
+              href={`${webroot}/logoff`}
+            >
+              Logout
+            </a>
+          </li>
+        ) : null}
       </ul>
     );
   } else {
@@ -27,16 +46,24 @@ export const Header = ({
       <ul class="flex gap-4">
         <li>
           <a
-            class="text-lime-600 transition-all hover:text-lime-500 hover:underline"
+            class={`
-            href="/login">
+              text-accent-600 transition-all
+              hover:text-accent-500 hover:underline
+            `}
+            href={`${webroot}/login`}
+          >
             Login
           </a>
         </li>
         {accountRegistration ? (
           <li>
             <a
-              class="text-lime-600 transition-all hover:text-lime-500 hover:underline"
+              class={`
-              href="/register">
+                text-accent-600 transition-all
+                hover:text-accent-500 hover:underline
+              `}
+              href={`${webroot}/register`}
+            >
               Register
             </a>
           </li>
@@ -47,11 +74,11 @@ export const Header = ({
 
   return (
     <header class="w-full p-4">
-      <nav class="mx-auto flex max-w-4xl justify-between rounded bg-gray-900 p-4">
+      <nav class="mx-auto flex max-w-4xl justify-between rounded bg-neutral-900 p-4">
         <ul>
           <li>
             <strong>
-              <a href="/">ConvertX</a>
+              <a href={`${webroot}/`}>ConvertX</a>
             </strong>
           </li>
         </ul>

src/converters/assimp.ts

@@ -1,139 +1,141 @@
-import { exec } from "node:child_process";
+import { exec } from "node:child_process";
-
+
-// This could be done dynamically by running `ffmpeg -formats` and parsing the output
+export const properties = {
-export const properties = {
+  from: {
-  from: {
+    object: [
-    muxer: [
+      "3d",
-        "3d",
+      "3ds",
-        "3ds",
+      "3mf",
-        "3mf",
+      "ac",
-        "ac",
+      "ac3d",
-        "ac3d",
+      "acc",
-        "acc",
+      "amf",
-        "amf",
+      "amj",
-        "ase",
+      "ase",
-        "ask",
+      "ask",
-        "assbin",
+      "assbin",
-        "b3d",
+      "b3d",
-        "blend",
+      "blend",
-        "bsp",
+      "bsp",
-        "bvh",
+      "bvh",
-        "cob",
+      "cob",
-        "csm",
+      "csm",
-        "dae",
+      "dae",
-        "dxf",
+      "dxf",
-        "enff",
+      "enff",
-        "fbx",
+      "fbx",
-        "glb",
+      "glb",
-        "gltf",
+      "gltf",
-        "hmp",
+      "hmb",
-        "ifc",
+      "hmp",
-        "ifczip",
+      "ifc",
-        "iqm",
+      "ifczip",
-        "irr",
+      "iqm",
-        "irrmesh",
+      "irr",
-        "lwo",
+      "irrmesh",
-        "lws",
+      "lwo",
-        "lxo",
+      "lws",
-        "md2",
+      "lxo",
-        "md3",
+      "m3d",
-        "md5anim",
+      "md2",
-        "md5camera",
+      "md3",
-        "md5mesh",
+      "md5anim",
-        "mdc",
+      "md5camera",
-        "mdl",
+      "md5mesh",
-        "mesh",
+      "mdc",
-        "mesh.xml",
+      "mdl",
-        "mot",
+      "mesh.xml",
-        "ms3d",
+      "mesh",
-        "ndo",
+      "mot",
-        "nff",
+      "ms3d",
-        "obj",
+      "ndo",
-        "off",
+      "nff",
-        "ogex",
+      "obj",
-        "pk3",
+      "off",
-        "ply",
+      "ogex",
-        "pmx",
+      "pk3",
-        "prj",
+      "ply",
-        "q3o",
+      "pmx",
-        "q3s",
+      "prj",
-        "raw",
+      "q3o",
-        "scn",
+      "q3s",
-        "sib",
+      "raw",
-        "smd",
+      "scn",
-        "step",
+      "sib",
-        "stl",
+      "smd",
-        "stp",
+      "step",
-        "ter",
+      "stl",
-        "uc",
+      "stp",
-        "vta",
+      "ter",
-        "x",
+      "uc",
-        "x3d",
+      "usd",
-        "x3db",
+      "usda",
-        "xgl",
+      "usdc",
-        "xml",
+      "usdz",
-        "zae",
+      "vta",
-        "zgl",
+      "x",
-    ],
+      "x3d",
-  },
+      "x3db",
-  to: {
+      "xgl",
-    muxer: [
+      "xml",
-        "collada",
+      "zae",
-        "x",
+      "zgl",
-        "stp",
+    ],
-        "obj",
+  },
-        "objnomtl",
+  to: {
-        "stl",
+    object: [
-        "stlb",
+      "3ds",
-        "ply",
+      "3mf",
-        "plyb",
+      "assbin",
-        "3ds",
+      "assjson",
-        "gltf2",
+      "assxml",
-        "glb2",
+      "collada",
-        "gltf",
+      "dae",
-        "glb",
+      "fbx",
-        "assbin",
+      "fbxa",
-        "assxml",
+      "glb",
-        "x3d",
+      "glb2",
-        "fbx",
+      "gltf",
-        "fbxa",
+      "gltf2",
-        "m3d",
+      "json",
-        "m3da",
+      "obj",
-        "3mf",
+      "objnomtl",
-        "pbrt",
+      "pbrt",
-        "assjson",
+      "ply",
-    ],
+      "plyb",
-  },
+      "stl",
-};
+      "stlb",
-
+      "stp",
-export async function convert(
+      "x",
-  filePath: string,
+    ],
-  fileType: string,
+  },
-  convertTo: string,
+};
-  targetPath: string,
+
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+export async function convert(
-  options?: any,
+  filePath: string,
-): Promise<string> {
+  fileType: string,
-  // let command = "ffmpeg";
+  convertTo: string,
-
+  targetPath: string,
-
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const command = `assimp export "${filePath}" "${targetPath}"`;
+  options?: unknown,
-
+): Promise<string> {
-  return new Promise((resolve, reject) => {
+  const command = `assimp export "${filePath}" "${targetPath}"`;
-    exec(command, (error, stdout, stderr) => {
+
-      if (error) {
+  return new Promise((resolve, reject) => {
-        reject(`error: ${error}`);
+    exec(command, (error, stdout, stderr) => {
-      }
+      if (error) {
-
+        reject(`error: ${error}`);
-      if (stdout) {
+      }
-        console.log(`stdout: ${stdout}`);
+
-      }
+      if (stdout) {
-
+        console.log(`stdout: ${stdout}`);
-      if (stderr) {
+      }
-        console.error(`stderr: ${stderr}`);
+
-      }
+      if (stderr) {
-
+        console.error(`stderr: ${stderr}`);
-      resolve("success");
+      }
-    });
+
-  });
+      resolve("Done");
-}
+    });
+  });
+}

src/converters/calibre.ts

@@ -0,0 +1,86 @@
+import { exec } from "node:child_process";
+
+export const properties = {
+  from: {
+    document: [
+      "azw4",
+      "chm",
+      "cbr",
+      "cbz",
+      "cbt",
+      "cba",
+      "cb7",
+      "djvu",
+      "docx",
+      "epub",
+      "fb2",
+      "htlz",
+      "html",
+      "lit",
+      "lrf",
+      "mobi",
+      "odt",
+      "pdb",
+      "pdf",
+      "pml",
+      "rb",
+      "rtf",
+      "recipe",
+      "snb",
+      "tcr",
+      "txt",
+    ],
+  },
+  to: {
+    document: [
+      "azw3",
+      "docx",
+      "epub",
+      "fb2",
+      "html",
+      "htmlz",
+      "lit",
+      "lrf",
+      "mobi",
+      "oeb",
+      "pdb",
+      "pdf",
+      "pml",
+      "rb",
+      "rtf",
+      "snb",
+      "tcr",
+      "txt",
+      "txtz",
+    ],
+  },
+};
+
+export async function convert(
+  filePath: string,
+  fileType: string,
+  convertTo: string,
+  targetPath: string,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  options?: unknown,
+): Promise<string> {
+  const command = `ebook-convert "${filePath}" "${targetPath}"`;
+
+  return new Promise((resolve, reject) => {
+    exec(command, (error, stdout, stderr) => {
+      if (error) {
+        reject(`error: ${error}`);
+      }
+
+      if (stdout) {
+        console.log(`stdout: ${stdout}`);
+      }
+
+      if (stderr) {
+        console.error(`stderr: ${stderr}`);
+      }
+
+      resolve("Done");
+    });
+  });
+}

src/converters/graphicsmagick.ts

@@ -313,8 +313,8 @@ export function convert(
   fileType: string,
   convertTo: string,
   targetPath: string,
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  options?: any,
+  options?: unknown,
 ): Promise<string> {
   return new Promise((resolve, reject) => {
     exec(
@@ -332,7 +332,7 @@ export function convert(
           console.error(`stderr: ${stderr}`);
         }
 
-        resolve("success");
+        resolve("Done");
       },
     );
   });

src/converters/inkscape.ts

@@ -0,0 +1,64 @@
+import { exec } from "node:child_process";
+
+export const properties = {
+    from: {
+      images: [
+        "svg",
+        "pdf",
+        "eps",
+        "ps",
+        "wmf",
+        "emf",
+        "png"
+      ]
+    },
+    to: {
+      images: [
+        "dxf",
+        "emf",
+        "eps",
+        "fxg",
+        "gpl",
+        "hpgl",
+        "html",
+        "odg",
+        "pdf",
+        "png",
+        "pov",
+        "ps",
+        "sif",
+        "svg",
+        "svgz",
+        "tex",
+        "wmf",
+      ]
+    },
+  };
+
+  export function convert(
+    filePath: string,
+    fileType: string,
+    convertTo: string,
+    targetPath: string,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    options?: unknown,
+  ): Promise<string> {
+    return new Promise((resolve, reject) => {
+      exec(`inkscape "${filePath}" -o "${targetPath}"`, (error, stdout, stderr) => {
+        if (error) {
+          reject(`error: ${error}`);
+        }
+  
+        if (stdout) {
+          console.log(`stdout: ${stdout}`);
+        }
+  
+        if (stderr) {
+          console.error(`stderr: ${stderr}`);
+        }
+  
+        resolve("Done");
+      });
+    });
+  }
+  

src/converters/libjxl.ts

@@ -39,8 +39,8 @@ export function convert(
   fileType: string,
   convertTo: string,
   targetPath: string,
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  options?: any,
+  options?: unknown,
 ): Promise<string> {
   let tool = "";
   if (fileType === "jxl") {
@@ -65,7 +65,7 @@ export function convert(
         console.error(`stderr: ${stderr}`);
       }
 
-      resolve("success");
+      resolve("Done");
     });
   });
 }

src/converters/main.ts

@@ -1,67 +1,46 @@
-import { 
-  convert as convertImage,
-  properties as propertiesImage
-} from "./vips";
-
-import {
-  convert as convertPandoc,
-  properties as propertiesPandoc,
-} from "./pandoc";
-
-import {
-  convert as convertFFmpeg,
-  properties as propertiesFFmpeg,
-} from "./ffmpeg";
-
-import {
-  convert as convertGraphicsmagick,
-  properties as propertiesGraphicsmagick,
-} from "./graphicsmagick";
-
-import {
-  convert as convertxelatex,
-  properties as propertiesxelatex,
-} from "./xelatex";
-
-import {
-  convert as convertLibjxl,
-  properties as propertiesLibjxl,
-} from "./libjxl";
-
-import {
-  convert as convertresvg,
-  properties as propertiesresvg,
-} from "./resvg";
-
-import {
-  convert as convertassimp,
-  properties as propertiesassimp,
-} from "./assimp";
-
 import { normalizeFiletype } from "../helpers/normalizeFiletype";
+import { convert as convertassimp, properties as propertiesassimp } from "./assimp";
+import { convert as convertFFmpeg, properties as propertiesFFmpeg } from "./ffmpeg";
+import { convert as convertGraphicsmagick, properties as propertiesGraphicsmagick } from "./graphicsmagick";
+import { convert as convertInkscape, properties as propertiesInkscape } from "./inkscape";
+import { convert as convertLibjxl, properties as propertiesLibjxl } from "./libjxl";
+import { convert as convertPandoc, properties as propertiesPandoc } from "./pandoc";
+import { convert as convertresvg, properties as propertiesresvg } from "./resvg";
+import { convert as convertImage, properties as propertiesImage } from "./vips";
+import { convert as convertxelatex, properties as propertiesxelatex } from "./xelatex";
+import { convert as convertCalibre, properties as propertiesCalibre } from "./calibre";
+
 
 // This should probably be reconstructed so that the functions are not imported instead the functions hook into this to make the converters more modular
 
-const properties: Record<string, {
+const properties: Record<
+  string,
+  {
     properties: {
       from: Record<string, string[]>;
       to: Record<string, string[]>;
-      options?: Record<string, Record<string, {
+      options?: Record<
+        string,
+        Record<
+          string,
+          {
             description: string;
             type: string;
             default: number;
-          }>>;
+          }
+        >
+      >;
     };
     converter: (
       filePath: string,
       fileType: string,
       convertTo: string,
       targetPath: string,
-      // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+
-      options?: any,
+      options?: unknown,
-      // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+    ) => unknown;
-    ) => any;
+  }
-  }> = {
+> = {
   libjxl: {
     properties: propertiesLibjxl,
     converter: convertLibjxl,
@@ -78,6 +57,10 @@ const properties: Record<string, {
     properties: propertiesxelatex,
     converter: convertxelatex,
   },
+  calibre: {
+    properties: propertiesCalibre,
+    converter: convertCalibre,
+  },
   pandoc: {
     properties: propertiesPandoc,
     converter: convertPandoc,
@@ -86,6 +69,10 @@ const properties: Record<string, {
     properties: propertiesGraphicsmagick,
     converter: convertGraphicsmagick,
   },
+  inkscape: {
+    properties: propertiesInkscape,
+    converter: convertInkscape,
+  },
   assimp: {
     properties: propertiesassimp,
     converter: convertassimp,
@@ -99,24 +86,19 @@ const properties: Record<string, {
 export async function mainConverter(
   inputFilePath: string,
   fileTypeOriginal: string,
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  convertTo: string,
-  convertTo: any,
   targetPath: string,
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  options?: unknown,
-  options?: any,
   converterName?: string,
 ) {
   const fileType = normalizeFiletype(fileTypeOriginal);
 
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  let converterFunc: typeof properties["libjxl"]["converter"] | undefined;
-  let converterFunc: any;
-  // let converterName = converterName;
 
   if (converterName) {
     converterFunc = properties[converterName]?.converter;
   } else {
     // Iterate over each converter in properties
-    // biome-ignore lint/style/noParameterAssign: <explanation>
     for (converterName in properties) {
       const converterObj = properties[converterName];
 
@@ -144,7 +126,7 @@ export async function mainConverter(
   }
 
   try {
-    await converterFunc(
+    const result = await converterFunc(
       inputFilePath,
       fileType,
       convertTo,
@@ -154,7 +136,13 @@ export async function mainConverter(
 
     console.log(
       `Converted ${inputFilePath} from ${fileType} to ${convertTo} successfully using ${converterName}.`,
+      result,
     );
+
+    if (typeof result === "string") {
+      return result;
+    }
+
     return "Done";
   } catch (error) {
     console.error(
@@ -190,9 +178,7 @@ for (const converterName in properties) {
   }
 }
 
-export const getPossibleTargets = (
+export const getPossibleTargets = (from: string): Record<string, string[]> => {
-  from: string,
-): Record<string, string[]> => {
   const fromClean = normalizeFiletype(from);
 
   return possibleTargets[fromClean] || {};
@@ -216,6 +202,7 @@ for (const converterName in properties) {
 }
 possibleInputs.sort();
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const getPossibleInputs = () => {
   return possibleInputs;
 };
@@ -287,4 +274,4 @@ export const getAllInputs = (converter: string) => {
 // }
 
 // // print the number of unique Inputs and Outputs
-// console.log(`Unique Formats: ${uniqueFormats.size}`);
+// console.log(`Unique Formats: ${uniqueFormats.size}`);

src/converters/pandoc.ts

@@ -124,8 +124,8 @@ export function convert(
   fileType: string,
   convertTo: string,
   targetPath: string,
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  options?: any,
+  options?: unknown,
 ): Promise<string> {
   // set xelatex here
   const xelatex = ["pdf", "latex"];
@@ -149,7 +149,7 @@ export function convert(
           console.error(`stderr: ${stderr}`);
         }
 
-        resolve("success");
+        resolve("Done");
       },
     );
   });

src/converters/resvg.ts

@@ -14,8 +14,8 @@ export function convert(
   fileType: string,
   convertTo: string,
   targetPath: string,
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  options?: any,
+  options?: unknown,
 ): Promise<string> {
   return new Promise((resolve, reject) => {
     exec(`resvg "${filePath}" "${targetPath}"`, (error, stdout, stderr) => {
@@ -31,7 +31,7 @@ export function convert(
         console.error(`stderr: ${stderr}`);
       }
 
-      resolve("success");
+      resolve("Done");
     });
   });
 }

src/converters/vips.ts

@@ -1,5 +1,6 @@
 import { exec } from "node:child_process";
 
+
 // declare possible conversions
 export const properties = {
   from: {
@@ -94,8 +95,8 @@ export function convert(
   fileType: string,
   convertTo: string,
   targetPath: string,
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  options?: any,
+  options?: unknown,
 ): Promise<string> {
   // if (fileType === "svg") {
   //   const scale = options.scale || 1;
@@ -134,8 +135,8 @@ export function convert(
           console.error(`stderr: ${stderr}`);
         }
 
-        resolve("success");
+        resolve("Done");
       },
     );
   });
-}
+}

src/converters/xelatex.ts

@@ -14,8 +14,8 @@ export function convert(
   fileType: string,
   convertTo: string,
   targetPath: string,
-  // biome-ignore lint/suspicious/noExplicitAny: <explanation>
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  options?: any,
+  options?: unknown,
 ): Promise<string> {
   return new Promise((resolve, reject) => {
     // const fileName: string = (targetPath.split("/").pop() as string).replace(".pdf", "")
@@ -39,7 +39,7 @@ export function convert(
           console.error(`stderr: ${stderr}`);
         }
 
-        resolve("success");
+        resolve("Done");
       },
     );
   });

src/helpers/normalizeFiletype.ts

@@ -1,31 +1,37 @@
-export const normalizeFiletype = (filetype: string): string => {
+export const normalizeFiletype = (filetype: string): string => {
-  const lowercaseFiletype = filetype.toLowerCase();
+  const lowercaseFiletype = filetype.toLowerCase();
-
+
-  switch (lowercaseFiletype) {
+  switch (lowercaseFiletype) {
-    case "jpg":
+    case "jfif":
-      return "jpeg";
+    case "jpg":
-    case "htm":
+      return "jpeg";
-      return "html";
+    case "htm":
-    case "tex":
+      return "html";
-      return "latex";
+    case "tex":
-    case "md":
+      return "latex";
-      return "markdown";
+    case "md":
-    default:
+      return "markdown";
-      return lowercaseFiletype;
+    case "unknown":
-  }
+      return "m4a";
-};
+    default:
-
+      return lowercaseFiletype;
-export const normalizeOutputFiletype = (filetype: string): string => {
+  }
-  const lowercaseFiletype = filetype.toLowerCase();
+};
-
+
-  switch (lowercaseFiletype) {
+export const normalizeOutputFiletype = (filetype: string): string => {
-    case "jpeg":
+  const lowercaseFiletype = filetype.toLowerCase();
-      return "jpg";
+
-    case "latex":
+  switch (lowercaseFiletype) {
-      return "tex";
+    case "jpeg":
-    case "markdown":
+      return "jpg";
-      return "md";
+    case "latex":
-    default:
+      return "tex";
-      return lowercaseFiletype;
+    case "markdown_phpextra":
-  }
+    case "markdown_strict":
-};
+    case "markdown_mmd":
+    case "markdown":
+      return "md";
+    default:
+      return lowercaseFiletype;
+  }
+};

src/helpers/printVersions.ts

@@ -53,6 +53,16 @@ if (process.env.NODE_ENV === "production") {
     }
   });
 
+  exec("inkscape --version", (error, stdout) => {
+    if (error) {
+      console.error("Inkscape is not installed.");
+    }
+
+    if (stdout) {
+      console.log(stdout.split("\n")[0]);
+    }
+  });
+
   exec("djxl --version", (error, stdout) => {
     if (error) {
       console.error("libjxl-tools is not installed.");
@@ -93,6 +103,16 @@ if (process.env.NODE_ENV === "production") {
     }
   });
 
+  exec("ebook-convert --version", (error, stdout) => {
+    if (error) {
+      console.error("ebook-convert (calibre) is not installed");
+    }
+
+    if (stdout) {
+      console.log(stdout.split("\n")[0]);
+    }
+  });
+
   exec("bun -v", (error, stdout) => {
     if (error) {
       console.error("Bun is not installed. wait what");

src/index.tsx

@@ -2,7 +2,7 @@ import { randomInt, randomUUID } from "node:crypto";
 import { rmSync } from "node:fs";
 import { mkdir, unlink } from "node:fs/promises";
 import cookie from "@elysiajs/cookie";
-import { html } from "@elysiajs/html";
+import { html, Html } from "@elysiajs/html";
 import { jwt, type JWTPayloadSpec } from "@elysiajs/jwt";
 import { staticPlugin } from "@elysiajs/static";
 import { Database } from "bun:sqlite";
@@ -37,6 +37,8 @@ const AUTO_DELETE_EVERY_N_HOURS = process.env.AUTO_DELETE_EVERY_N_HOURS
   ? Number(process.env.AUTO_DELETE_EVERY_N_HOURS)
   : 24;
 
+const WEBROOT = process.env.WEBROOT ?? "";
+
 // fileNames: fileNames,
 // filesToConvert: fileNames.length,
 // convertedFiles : 0,
@@ -112,6 +114,7 @@ const app = new Elysia({
   serve: {
     maxRequestBodySize: Number.MAX_SAFE_INTEGER,
   },
+  prefix: WEBROOT,
 })
   .use(cookie())
   .use(html())
@@ -127,29 +130,43 @@ const app = new Elysia({
   )
   .use(
     staticPlugin({
-      assets: "src/public/",
+      assets: "public",
-      prefix: "/",
+      prefix: "",
     }),
   )
+  .get("/test", () => {
+    return (
+      <html lang="en">
+        <head>
+          <title>Hello World</title>
+        </head>
+        <body>
+          <h1>Hello</h1>
+        </body>
+      </html>
+    );
+  })
   .get("/setup", ({ redirect }) => {
     if (!FIRST_RUN) {
-      return redirect("/login", 302);
+      return redirect(`${WEBROOT}/login`, 302);
     }
 
     return (
-      <BaseHtml title="ConvertX | Setup">
+      <BaseHtml title="ConvertX | Setup" webroot={WEBROOT}>
         <main class="mx-auto w-full max-w-4xl px-4">
           <h1 class="my-8 text-3xl">Welcome to ConvertX!</h1>
           <article class="article p-0">
-            <header class="w-full bg-gray-800 p-4">Create your account</header>
+            <header class="w-full bg-neutral-800 p-4">
-            <form method="post" action="/register" class="p-4">
+              Create your account
+            </header>
+            <form method="post" action={`${WEBROOT}/register`} class="p-4">
               <fieldset class="mb-4 flex flex-col gap-4">
                 <label class="flex flex-col gap-1">
                   Email
                   <input
                     type="email"
                     name="email"
-                    class="rounded bg-gray-800 p-3"
+                    class="rounded bg-neutral-800 p-3"
                     placeholder="Email"
                     autocomplete="email"
                     required
@@ -160,7 +177,7 @@ const app = new Elysia({
                   <input
                     type="password"
                     name="password"
-                    class="rounded bg-gray-800 p-3"
+                    class="rounded bg-neutral-800 p-3"
                     placeholder="Password"
                     autocomplete="current-password"
                     required
@@ -172,7 +189,10 @@ const app = new Elysia({
             <footer class="p-4">
               Report any issues on{" "}
               <a
-                class="text-lime-500 underline hover:text-lime-400"
+                class={`
+                  text-accent-500 underline
+                  hover:text-accent-400
+                `}
                 href="https://github.com/C4illin/ConvertX"
               >
                 GitHub
@@ -186,13 +206,17 @@ const app = new Elysia({
   })
   .get("/register", ({ redirect }) => {
     if (!ACCOUNT_REGISTRATION) {
-      return redirect("/login", 302);
+      return redirect(`${WEBROOT}/login`, 302);
     }
 
     return (
-      <BaseHtml title="ConvertX | Register">
+      <BaseHtml webroot={WEBROOT} title="ConvertX | Register">
         <>
-          <Header accountRegistration={ACCOUNT_REGISTRATION} />
+          <Header
+            webroot={WEBROOT}
+            accountRegistration={ACCOUNT_REGISTRATION}
+            allowUnauthenticated={ALLOW_UNAUTHENTICATED}
+          />
           <main class="w-full px-4">
             <article class="article">
               <form method="post" class="flex flex-col gap-4">
@@ -202,7 +226,7 @@ const app = new Elysia({
                     <input
                       type="email"
                       name="email"
-                      class="rounded bg-gray-800 p-3"
+                      class="rounded bg-neutral-800 p-3"
                       placeholder="Email"
                       autocomplete="email"
                       required
@@ -213,7 +237,7 @@ const app = new Elysia({
                     <input
                       type="password"
                       name="password"
-                      class="rounded bg-gray-800 p-3"
+                      class="rounded bg-neutral-800 p-3"
                       placeholder="Password"
                       autocomplete="current-password"
                       required
@@ -236,7 +260,7 @@ const app = new Elysia({
     "/register",
     async ({ body, set, redirect, jwt, cookie: { auth } }) => {
       if (!ACCOUNT_REGISTRATION && !FIRST_RUN) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       if (FIRST_RUN) {
@@ -291,13 +315,13 @@ const app = new Elysia({
         sameSite: "strict",
       });
 
-      return redirect("/", 302);
+      return redirect(`${WEBROOT}/`, 302);
     },
     { body: t.Object({ email: t.String(), password: t.String() }) },
   )
   .get("/login", async ({ jwt, redirect, cookie: { auth } }) => {
     if (FIRST_RUN) {
-      return redirect("/setup", 302);
+      return redirect(`${WEBROOT}/setup`, 302);
     }
 
     // if already logged in, redirect to home
@@ -305,16 +329,20 @@ const app = new Elysia({
       const user = await jwt.verify(auth.value);
 
       if (user) {
-        return redirect("/", 302);
+        return redirect(`${WEBROOT}/`, 302);
       }
 
       auth.remove();
     }
 
     return (
-      <BaseHtml title="ConvertX | Login">
+      <BaseHtml webroot={WEBROOT} title="ConvertX | Login">
         <>
-          <Header accountRegistration={ACCOUNT_REGISTRATION} />
+          <Header
+            webroot={WEBROOT}
+            accountRegistration={ACCOUNT_REGISTRATION}
+            allowUnauthenticated={ALLOW_UNAUTHENTICATED}
+          />
           <main class="w-full px-4">
             <article class="article">
               <form method="post" class="flex flex-col gap-4">
@@ -324,7 +352,7 @@ const app = new Elysia({
                     <input
                       type="email"
                       name="email"
-                      class="rounded bg-gray-800 p-3"
+                      class="rounded bg-neutral-800 p-3"
                       placeholder="Email"
                       autocomplete="email"
                       required
@@ -335,7 +363,7 @@ const app = new Elysia({
                     <input
                       type="password"
                       name="password"
-                      class="rounded bg-gray-800 p-3"
+                      class="rounded bg-neutral-800 p-3"
                       placeholder="Password"
                       autocomplete="current-password"
                       required
@@ -345,7 +373,7 @@ const app = new Elysia({
                 <div role="group">
                   {ACCOUNT_REGISTRATION ? (
                     <a
-                      href="/register"
+                      href={`${WEBROOT}/register`}
                       role="button"
                       class="btn-primary w-full"
                     >
@@ -412,7 +440,7 @@ const app = new Elysia({
         sameSite: "strict",
       });
 
-      return redirect("/", 302);
+      return redirect(`${WEBROOT}/`, 302);
     },
     { body: t.Object({ email: t.String(), password: t.String() }) },
   )
@@ -421,46 +449,29 @@ const app = new Elysia({
       auth.remove();
     }
 
-    return redirect("/login", 302);
+    return redirect(`${WEBROOT}/login`, 302);
   })
   .post("/logoff", ({ redirect, cookie: { auth } }) => {
     if (auth?.value) {
       auth.remove();
     }
 
-    return redirect("/login", 302);
+    return redirect(`${WEBROOT}/login`, 302);
   })
   .get("/", async ({ jwt, redirect, cookie: { auth, jobId } }) => {
-    if (FIRST_RUN) {
+    if (!ALLOW_UNAUTHENTICATED) {
-      return redirect("/setup", 302);
+      if (FIRST_RUN) {
-    }
+        return redirect(`${WEBROOT}/setup`, 302);
+      }
 
-    if (!auth?.value && !ALLOW_UNAUTHENTICATED) {
+      if (!auth?.value) {
-      return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
+      }
     }
 
     // validate jwt
     let user: ({ id: string } & JWTPayloadSpec) | false = false;
-    if (auth?.value) {
+    if (ALLOW_UNAUTHENTICATED) {
-      user = await jwt.verify(auth.value);
-
-      if (user !== false && user.id) {
-        if (Number.parseInt(user.id) < 2 ** 24 || !ALLOW_UNAUTHENTICATED) {
-          // make sure user exists in db
-          const existingUser = db
-            .query("SELECT * FROM users WHERE id = ?")
-            .as(User)
-            .get(user.id);
-
-          if (!existingUser) {
-            if (auth?.value) {
-              auth.remove();
-            }
-            return redirect("/login", 302);
-          }
-        }
-      }
-    } else if (ALLOW_UNAUTHENTICATED) {
       const newUserId = String(
         randomInt(
           2 ** 24,
@@ -486,10 +497,29 @@ const app = new Elysia({
         maxAge: 24 * 60 * 60,
         sameSite: "strict",
       });
+    } else if (auth?.value) {
+      user = await jwt.verify(auth.value);
+
+      if (user !== false && user.id) {
+        if (Number.parseInt(user.id) < 2 ** 24 || !ALLOW_UNAUTHENTICATED) {
+          // make sure user exists in db
+          const existingUser = db
+            .query("SELECT * FROM users WHERE id = ?")
+            .as(User)
+            .get(user.id);
+
+          if (!existingUser) {
+            if (auth?.value) {
+              auth.remove();
+            }
+            return redirect(`${WEBROOT}/login`, 302);
+          }
+        }
+      }
     }
 
     if (!user) {
-      return redirect("/login", 302);
+      return redirect(`${WEBROOT}/login`, 302);
     }
 
     // create a new job
@@ -519,21 +549,34 @@ const app = new Elysia({
     console.log("jobId set to:", id);
 
     return (
-      <BaseHtml>
+      <BaseHtml webroot={WEBROOT}>
         <>
-          <Header loggedIn />
+          <Header
+            webroot={WEBROOT}
+            allowUnauthenticated={ALLOW_UNAUTHENTICATED}
+            loggedIn
+          />
           <main class="w-full px-4">
             <article class="article">
               <h1 class="mb-4 text-xl">Convert</h1>
               <div class="mb-4 max-h-[50vh] overflow-y-auto scrollbar-thin">
                 <table
                   id="file-list"
-                  class="w-full table-auto rounded bg-gray-900 [&_td]:p-4 [&_tr]:rounded [&_tr]:border-b [&_tr]:border-gray-800"
+                  class={`
+                    w-full table-auto rounded bg-neutral-900
+                    [&_td]:p-4
+                    [&_tr]:rounded [&_tr]:border-b [&_tr]:border-neutral-800
+                  `}
                 />
               </div>
               <div
                 id="dropzone"
-                class="relative flex h-48 w-full items-center justify-center rounded border border-dashed border-gray-700 transition-all hover:border-gray-600 [&.dragover]:border-4 [&.dragover]:border-gray-500"
+                class={`
+                  relative flex h-48 w-full items-center justify-center rounded border border-dashed
+                  border-neutral-700 transition-all
+                  [&.dragover]:border-4 [&.dragover]:border-neutral-500
+                  hover:border-neutral-600
+                `}
               >
                 <span>
                   <b>Choose a file</b> or drag it here
@@ -548,7 +591,7 @@ const app = new Elysia({
             </article>
             <form
               method="post"
-              action="/convert"
+              action={`${WEBROOT}/convert`}
               class="relative mx-auto mb-[35vh] w-full max-w-4xl"
             >
               <input type="hidden" name="file_names" id="file_names" />
@@ -558,14 +601,22 @@ const app = new Elysia({
                   name="convert_to_search"
                   placeholder="Search for conversions"
                   autocomplete="off"
-                  class="w-full rounded bg-gray-800 p-4"
+                  class="w-full rounded bg-neutral-800 p-4"
                 />
                 <div class="select_container relative">
-                  <article class="convert_to_popup absolute z-[2] m-0 hidden h-[30vh] max-h-[50vh] w-full flex-col overflow-y-auto overflow-x-hidden rounded bg-gray-800 sm:h-[30vh]">
+                  <article
+                    class={`
+                      convert_to_popup absolute z-[2] m-0 hidden h-[30vh] max-h-[50vh] w-full
+                      flex-col overflow-y-auto overflow-x-hidden rounded bg-neutral-800
+                      sm:h-[30vh]
+                    `}
+                  >
                     {Object.entries(getAllTargets()).map(
                       ([converter, targets]) => (
                         <article
-                          class="convert_to_group w-full border-b border-gray-700 p-4 flex flex-col"
+                          class={`
+                            convert_to_group flex w-full flex-col border-b border-neutral-700 p-4
+                          `}
                           data-converter={converter}
                         >
                           <header class="mb-2 w-full text-xl font-bold" safe>
@@ -576,7 +627,10 @@ const app = new Elysia({
                               <button
                                 // https://stackoverflow.com/questions/121499/when-a-blur-event-occurs-how-can-i-find-out-which-element-focus-went-to#comment82388679_33325953
                                 tabindex={0}
-                                class="target rounded bg-gray-700 p-1 text-base hover:bg-gray-600"
+                                class={`
+                                  target rounded bg-neutral-700 p-1 text-base
+                                  hover:bg-neutral-600
+                                `}
                                 data-value={`${target},${converter}`}
                                 data-target={target}
                                 data-converter={converter}
@@ -616,7 +670,15 @@ const app = new Elysia({
                   </select>
                 </div>
               </article>
-              <input class="btn-primary w-full" type="submit" value="Convert" />
+              <input
+                class={`
+                  btn-primary w-full
+                  disabled:cursor-not-allowed disabled:opacity-50
+                `}
+                type="submit"
+                value="Convert"
+                disabled
+              />
             </form>
           </main>
           <script src="script.js" defer />
@@ -629,11 +691,17 @@ const app = new Elysia({
     ({ body }) => {
       return (
         <>
-          <article class="convert_to_popup absolute z-[2] m-0 hidden h-[50vh] max-h-[50vh] w-full flex-col overflow-y-auto overflow-x-hidden rounded bg-gray-800 sm:h-[30vh]">
+          <article
+            class={`
+              convert_to_popup absolute z-[2] m-0 hidden h-[50vh] max-h-[50vh] w-full flex-col
+              overflow-y-auto overflow-x-hidden rounded bg-neutral-800
+              sm:h-[30vh]
+            `}
+          >
             {Object.entries(getPossibleTargets(body.fileType)).map(
               ([converter, targets]) => (
                 <article
-                  class="convert_to_group w-full border-b border-gray-700 p-4 flex flex-col"
+                  class="convert_to_group flex w-full flex-col border-b border-neutral-700 p-4"
                   data-converter={converter}
                 >
                   <header class="mb-2 w-full text-xl font-bold" safe>
@@ -644,7 +712,10 @@ const app = new Elysia({
                       <button
                         // https://stackoverflow.com/questions/121499/when-a-blur-event-occurs-how-can-i-find-out-which-element-focus-went-to#comment82388679_33325953
                         tabindex={0}
-                        class="target rounded bg-gray-700 p-1 text-base hover:bg-gray-600"
+                        class={`
+                          target rounded bg-neutral-700 p-1 text-base
+                          hover:bg-neutral-600
+                        `}
                         data-value={`${target},${converter}`}
                         data-target={target}
                         data-converter={converter}
@@ -685,16 +756,16 @@ const app = new Elysia({
     "/upload",
     async ({ body, redirect, jwt, cookie: { auth, jobId } }) => {
       if (!auth?.value) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       const user = await jwt.verify(auth.value);
       if (!user) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       if (!jobId?.value) {
-        return redirect("/", 302);
+        return redirect(`${WEBROOT}/`, 302);
       }
 
       const existingJob = await db
@@ -702,7 +773,7 @@ const app = new Elysia({
         .get(jobId.value, user.id);
 
       if (!existingJob) {
-        return redirect("/", 302);
+        return redirect(`${WEBROOT}/`, 302);
       }
 
       const userUploadsDir = `${uploadsDir}${user.id}/${jobId.value}/`;
@@ -713,7 +784,6 @@ const app = new Elysia({
             await Bun.write(`${userUploadsDir}${file.name}`, file);
           }
         } else {
-          // eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/dot-notation
           await Bun.write(`${userUploadsDir}${body.file["name"]}`, body.file);
         }
       }
@@ -728,16 +798,16 @@ const app = new Elysia({
     "/delete",
     async ({ body, redirect, jwt, cookie: { auth, jobId } }) => {
       if (!auth?.value) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       const user = await jwt.verify(auth.value);
       if (!user) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       if (!jobId?.value) {
-        return redirect("/", 302);
+        return redirect(`${WEBROOT}/`, 302);
       }
 
       const existingJob = await db
@@ -745,7 +815,7 @@ const app = new Elysia({
         .get(jobId.value, user.id);
 
       if (!existingJob) {
-        return redirect("/", 302);
+        return redirect(`${WEBROOT}/`, 302);
       }
 
       const userUploadsDir = `${uploadsDir}${user.id}/${jobId.value}/`;
@@ -758,16 +828,16 @@ const app = new Elysia({
     "/convert",
     async ({ body, redirect, jwt, cookie: { auth, jobId } }) => {
       if (!auth?.value) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       const user = await jwt.verify(auth.value);
       if (!user) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       if (!jobId?.value) {
-        return redirect("/", 302);
+        return redirect(`${WEBROOT}/`, 302);
       }
 
       const existingJob = db
@@ -776,7 +846,7 @@ const app = new Elysia({
         .get(jobId.value, user.id);
 
       if (!existingJob) {
-        return redirect("/", 302);
+        return redirect(`${WEBROOT}/`, 302);
       }
 
       const userUploadsDir = `${uploadsDir}${user.id}/${jobId.value}/`;
@@ -797,7 +867,7 @@ const app = new Elysia({
       const fileNames = JSON.parse(body.file_names) as string[];
 
       if (!Array.isArray(fileNames) || fileNames.length === 0) {
-        return redirect("/", 302);
+        return redirect(`${WEBROOT}/`, 302);
       }
 
       db.query(
@@ -850,7 +920,7 @@ const app = new Elysia({
         });
 
       // Redirect the client immediately
-      return redirect(`/results/${jobId.value}`, 302);
+      return redirect(`${WEBROOT}/results/${jobId.value}`, 302);
     },
     {
       body: t.Object({
@@ -861,12 +931,12 @@ const app = new Elysia({
   )
   .get("/history", async ({ jwt, redirect, cookie: { auth } }) => {
     if (!auth?.value) {
-      return redirect("/login", 302);
+      return redirect(`${WEBROOT}/login`, 302);
     }
     const user = await jwt.verify(auth.value);
 
     if (!user) {
-      return redirect("/login", 302);
+      return redirect(`${WEBROOT}/login`, 302);
     }
 
     let userJobs = db
@@ -887,13 +957,23 @@ const app = new Elysia({
     userJobs = userJobs.filter((job) => job.num_files > 0);
 
     return (
-      <BaseHtml title="ConvertX | Results">
+      <BaseHtml webroot={WEBROOT} title="ConvertX | Results">
         <>
-          <Header loggedIn />
+          <Header
+            webroot={WEBROOT}
+            allowUnauthenticated={ALLOW_UNAUTHENTICATED}
+            loggedIn
+          />
           <main class="w-full px-4">
             <article class="article">
               <h1 class="mb-4 text-xl">Results</h1>
-              <table class="w-full table-auto rounded bg-gray-900 text-left [&_td]:p-4 [&_tr]:rounded [&_tr]:border-b [&_tr]:border-gray-800">
+              <table
+                class={`
+                  w-full table-auto rounded bg-neutral-900 text-left
+                  [&_td]:p-4
+                  [&_tr]:rounded [&_tr]:border-b [&_tr]:border-neutral-800
+                `}
+              >
                 <thead>
                   <tr>
                     <th class="px-4 py-2">Time</th>
@@ -912,8 +992,11 @@ const app = new Elysia({
                       <td safe>{job.status}</td>
                       <td>
                         <a
-                          class="text-lime-500 underline hover:text-lime-400"
+                          class={`
-                          href={`/results/${job.id}`}
+                            text-accent-500 underline
+                            hover:text-accent-400
+                          `}
+                          href={`${WEBROOT}/results/${job.id}`}
                         >
                           View
                         </a>
@@ -932,7 +1015,7 @@ const app = new Elysia({
     "/results/:jobId",
     async ({ params, jwt, set, redirect, cookie: { auth, job_id } }) => {
       if (!auth?.value) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       if (job_id?.value) {
@@ -942,7 +1025,7 @@ const app = new Elysia({
 
       const user = await jwt.verify(auth.value);
       if (!user) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       const job = db
@@ -965,9 +1048,13 @@ const app = new Elysia({
         .all(params.jobId);
 
       return (
-        <BaseHtml title="ConvertX | Result">
+        <BaseHtml webroot={WEBROOT} title="ConvertX | Result">
           <>
-            <Header loggedIn />
+            <Header
+              webroot={WEBROOT}
+              allowUnauthenticated={ALLOW_UNAUTHENTICATED}
+              loggedIn
+            />
             <main class="w-full px-4">
               <article class="article">
                 <div class="mb-4 flex items-center justify-between">
@@ -990,9 +1077,22 @@ const app = new Elysia({
                 <progress
                   max={job.num_files}
                   value={files.length}
-                  class="mb-4 inline-block h-2 w-full appearance-none overflow-hidden rounded-full border-0 bg-gray-700 bg-none text-lime-500 accent-lime-500 [&::-moz-progress-bar]:bg-gray-700 [&::-webkit-progress-value]:rounded-full [&::-webkit-progress-value]:[background:none] [&[value]::-webkit-progress-value]:bg-lime-500 [&[value]::-webkit-progress-value]:transition-[inline-size]"
+                  class={`
+                    mb-4 inline-block h-2 w-full appearance-none overflow-hidden rounded-full
+                    border-0 bg-neutral-700 bg-none text-accent-500 accent-accent-500
+                    [&::-moz-progress-bar]:bg-neutral-700 [&::-webkit-progress-value]:rounded-full
+                    [&::-webkit-progress-value]:[background:none]
+                    [&[value]::-webkit-progress-value]:bg-accent-500
+                    [&[value]::-webkit-progress-value]:transition-[inline-size]
+                  `}
                 />
-                <table class="w-full table-auto rounded bg-gray-900 text-left [&_td]:p-4 [&_tr]:rounded [&_tr]:border-b [&_tr]:border-gray-800">
+                <table
+                  class={`
+                    w-full table-auto rounded bg-neutral-900 text-left
+                    [&_td]:p-4
+                    [&_tr]:rounded [&_tr]:border-b [&_tr]:border-neutral-800
+                  `}
+                >
                   <thead>
                     <tr>
                       <th class="px-4 py-2">Converted File Name</th>
@@ -1008,16 +1108,22 @@ const app = new Elysia({
                         <td safe>{file.status}</td>
                         <td>
                           <a
-                            class="text-lime-500 underline hover:text-lime-400"
+                            class={`
-                            href={`/download/${outputPath}${file.output_file_name}`}
+                              text-accent-500 underline
+                              hover:text-accent-400
+                            `}
+                            href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
                           >
                             View
                           </a>
                         </td>
                         <td>
                           <a
-                            class="text-lime-500 underline hover:text-lime-400"
+                            class={`
-                            href={`/download/${outputPath}${file.output_file_name}`}
+                              text-accent-500 underline
+                              hover:text-accent-400
+                            `}
+                            href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
                             download={file.output_file_name}
                           >
                             Download
@@ -1029,7 +1135,7 @@ const app = new Elysia({
                 </table>
               </article>
             </main>
-            <script src="/results.js" defer />
+            <script src={`${WEBROOT}/results.js`} defer />
           </>
         </BaseHtml>
       );
@@ -1039,7 +1145,7 @@ const app = new Elysia({
     "/progress/:jobId",
     async ({ jwt, set, params, redirect, cookie: { auth, job_id } }) => {
       if (!auth?.value) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       if (job_id?.value) {
@@ -1049,7 +1155,7 @@ const app = new Elysia({
 
       const user = await jwt.verify(auth.value);
       if (!user) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       const job = db
@@ -1093,9 +1199,22 @@ const app = new Elysia({
           <progress
             max={job.num_files}
             value={files.length}
-            class="mb-4 inline-block h-2 w-full appearance-none overflow-hidden rounded-full border-0 bg-gray-700 bg-none text-lime-500 accent-lime-500 [&::-moz-progress-bar]:bg-gray-700 [&::-webkit-progress-value]:rounded-full [&::-webkit-progress-value]:[background:none] [&[value]::-webkit-progress-value]:bg-lime-500 [&[value]::-webkit-progress-value]:transition-[inline-size]"
+            class={`
+              mb-4 inline-block h-2 w-full appearance-none overflow-hidden rounded-full border-0
+              bg-neutral-700 bg-none text-accent-500 accent-accent-500
+              [&::-moz-progress-bar]:bg-neutral-700 [&::-webkit-progress-value]:rounded-full
+              [&::-webkit-progress-value]:[background:none]
+              [&[value]::-webkit-progress-value]:bg-accent-500
+              [&[value]::-webkit-progress-value]:transition-[inline-size]
+            `}
           />
-          <table class="w-full table-auto rounded bg-gray-900 text-left [&_td]:p-4 [&_tr]:rounded [&_tr]:border-b [&_tr]:border-gray-800">
+          <table
+            class={`
+              w-full table-auto rounded bg-neutral-900 text-left
+              [&_td]:p-4
+              [&_tr]:rounded [&_tr]:border-b [&_tr]:border-neutral-800
+            `}
+          >
             <thead>
               <tr>
                 <th class="px-4 py-2">Converted File Name</th>
@@ -1111,16 +1230,22 @@ const app = new Elysia({
                   <td safe>{file.status}</td>
                   <td>
                     <a
-                      class="text-lime-500 underline hover:text-lime-400"
+                      class={`
-                      href={`/download/${outputPath}${file.output_file_name}`}
+                        text-accent-500 underline
+                        hover:text-accent-400
+                      `}
+                      href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
                     >
                       View
                     </a>
                   </td>
                   <td>
                     <a
-                      class="text-lime-500 underline hover:text-lime-400"
+                      class={`
-                      href={`/download/${outputPath}${file.output_file_name}`}
+                        text-accent-500 underline
+                        hover:text-accent-400
+                      `}
+                      href={`${WEBROOT}/download/${outputPath}${file.output_file_name}`}
                       download={file.output_file_name}
                     >
                       Download
@@ -1138,12 +1263,12 @@ const app = new Elysia({
     "/download/:userId/:jobId/:fileName",
     async ({ params, jwt, redirect, cookie: { auth } }) => {
       if (!auth?.value) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       const user = await jwt.verify(auth.value);
       if (!user) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       const job = await db
@@ -1151,7 +1276,7 @@ const app = new Elysia({
         .get(user.id, params.jobId);
 
       if (!job) {
-        return redirect("/results", 302);
+        return redirect(`${WEBROOT}/results`, 302);
       }
       // parse from url encoded string
       const userId = decodeURIComponent(params.userId);
@@ -1164,22 +1289,33 @@ const app = new Elysia({
   )
   .get("/converters", async ({ jwt, redirect, cookie: { auth } }) => {
     if (!auth?.value) {
-      return redirect("/login", 302);
+      return redirect(`${WEBROOT}/login`, 302);
     }
 
     const user = await jwt.verify(auth.value);
     if (!user) {
-      return redirect("/login", 302);
+      return redirect(`${WEBROOT}/login`, 302);
     }
 
     return (
-      <BaseHtml title="ConvertX | Converters">
+      <BaseHtml webroot={WEBROOT} title="ConvertX | Converters">
         <>
-          <Header loggedIn />
+          <Header
+            webroot={WEBROOT}
+            allowUnauthenticated={ALLOW_UNAUTHENTICATED}
+            loggedIn
+          />
           <main class="w-full px-4">
             <article class="article">
               <h1 class="mb-4 text-xl">Converters</h1>
-              <table class="w-full table-auto rounded bg-gray-900 text-left [&_td]:p-4 [&_tr]:rounded [&_tr]:border-b [&_tr]:border-gray-800 [&_ul]:list-inside [&_ul]:list-disc">
+              <table
+                class={`
+                  w-full table-auto rounded bg-neutral-900 text-left
+                  [&_td]:p-4
+                  [&_tr]:rounded [&_tr]:border-b [&_tr]:border-neutral-800
+                  [&_ul]:list-inside [&_ul]:list-disc
+                `}
+              >
                 <thead>
                   <tr>
                     <th class="mx-4 my-2">Converter</th>
@@ -1227,12 +1363,12 @@ const app = new Elysia({
     async ({ params, jwt, redirect, cookie: { auth } }) => {
       // TODO: Implement zip download
       if (!auth?.value) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       const user = await jwt.verify(auth.value);
       if (!user) {
-        return redirect("/login", 302);
+        return redirect(`${WEBROOT}/login`, 302);
       }
 
       const job = await db
@@ -1240,12 +1376,12 @@ const app = new Elysia({
         .get(user.id, params.jobId);
 
       if (!job) {
-        return redirect("/results", 302);
+        return redirect(`${WEBROOT}/results`, 302);
       }
 
       // const userId = decodeURIComponent(params.userId);
       // const jobId = decodeURIComponent(params.jobId);
-      // const outputPath = `${outputDir}${userId}/${jobId}/`;
+      // const outputPath = `${outputDir}${userId}/`{jobId}/);
 
       // return Bun.zip(outputPath);
     },
@@ -1269,7 +1405,7 @@ if (process.env.NODE_ENV !== "production") {
 app.listen(3000);
 
 console.log(
-  `🦊 Elysia is running at http://${app.server?.hostname}:${app.server?.port}`,
+  `🦊 Elysia is running at http://${app.server?.hostname}:${app.server?.port}${WEBROOT}`,
 );
 
 const clearJobs = () => {

src/main.css

@@ -4,9 +4,42 @@
 
 @layer components {
   .article {
-    @apply p-4 mb-4 bg-gray-800/40 w-full mx-auto max-w-4xl rounded;
+    @apply p-4 mb-4 bg-neutral-800/40 w-full mx-auto max-w-4xl rounded;
   }
   .btn-primary {
-    @apply bg-lime-500 text-black rounded p-4 hover:bg-lime-400 cursor-pointer;
+    @apply bg-accent-500 text-contrast rounded p-4 hover:bg-accent-400 cursor-pointer transition-colors;
+  }
+}
+
+:root {
+    --contrast: 255, 255, 255;
+    --neutral-900: 243, 244, 246;
+    --neutral-800: 229, 231, 235;
+    --neutral-700: 209, 213, 219;
+    --neutral-600: 156, 163, 175;
+    --neutral-500: 180, 180, 180;
+    --neutral-400: 75, 85, 99;
+    --neutral-300: 55, 65, 81;
+    --neutral-200: 31, 41, 55;
+    --neutral-100: 17, 24, 39;
+    --accent-400: 132, 204, 22;
+    --accent-500: 101, 163, 13;
+    --accent-600: 77, 124, 15;
+  }
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --contrast: 0, 0, 0;
+    --neutral-900: 17, 24, 39;
+    --neutral-800: 31, 41, 55;
+    --neutral-700: 55, 65, 81;
+    --neutral-600: 75, 85, 99;
+    --neutral-500: 107, 114, 128;
+    --neutral-300: 209, 213, 219;
+    --neutral-400: 156, 163, 175;
+    --neutral-200: 229, 231, 235;
+    --accent-600: 101, 163, 13;
+    --accent-500: 132, 204, 22;
+    --accent-400: 163, 230, 53;
   }
 }

tailwind.config.js

@@ -1,9 +1,27 @@
-/** @type {import('tailwindcss').Config} */
+/** @type {import('tailwindcss').Config} */
-// eslint-disable-next-line no-undef
+
-module.exports = {
+import tailwindScrollbar from "tailwind-scrollbar";
-  content: ['./src/**/*.{html,js,tsx,jsx,cjs,mjs}'],
+
-  theme: {
+export default {
-    extend: {},
+  content: ["./src/**/*.{html,js,tsx,jsx,cjs,mjs}"],
-  },
+  theme: {
-  plugins: [require('tailwind-scrollbar')],
+    extend: {
-}
+      colors: {
+        contrast: "rgba(var(--contrast))",
+        "neutral-900": "rgba(var(--neutral-900))",
+        "neutral-800": "rgba(var(--neutral-800))",
+        "neutral-700": "rgba(var(--neutral-700))",
+        "neutral-600": "rgba(var(--neutral-600))",
+        "neutral-500": "rgba(var(--neutral-500))",
+        "neutral-400": "rgba(var(--neutral-400))",
+        "neutral-300": "rgba(var(--neutral-300))",
+        "neutral-200": "rgba(var(--neutral-200))",
+        "neutral-100": "rgba(var(--neutral-100))",
+        "accent-600": "rgba(var(--accent-600))",
+        "accent-500": "rgba(var(--accent-500))",
+        "accent-400": "rgba(var(--accent-400))",
+      },
+    },
+  },
+  plugins: [tailwindScrollbar],
+};

tsconfig.json

@@ -27,4 +27,4 @@
     "noImplicitOverride": true
     // "noImplicitReturns": true
   }
-}
+}