-
Results
-
-
+function ResultsArticle({
+ job,
+ files,
+ outputPath,
+}: {
+ job: Jobs;
+ files: Filename[];
+ outputPath: string;
+}) {
+ return (
+
+
+
Results
+
+
+
-
-
-
-
- |
- Converted File Name
- |
-
- Status
- |
-
- View
- |
-
- Download
- |
-
-
-
- {files.map((file) => (
+
+
+
- |
- {file.output_file_name}
- |
- {file.status} |
-
-
- View
-
- |
-
-
- Download
-
- |
+
+ Converted File Name
+ |
+
+ Status
+ |
+
+ View
+ |
+
+ Download
+ |
- ))}
-
-
-
- )
+
+
+ {files.map((file) => (
+
+ |
+ {file.output_file_name}
+ |
+ {file.status} |
+
+
+ View
+
+ |
+
+
+ Download
+
+ |
+
+ ))}
+
+
+
+ );
}
export const results = new Elysia()
.use(userService)
- .get(
- "/results/:jobId",
- async ({ params, jwt, set, redirect, cookie: { auth, job_id } }) => {
- if (!auth?.value) {
- return redirect(`${WEBROOT}/login`, 302);
- }
+ .get("/results/:jobId", async ({ params, jwt, set, redirect, cookie: { auth, job_id } }) => {
+ if (!auth?.value) {
+ return redirect(`${WEBROOT}/login`, 302);
+ }
- if (job_id?.value) {
- // clear the job_id cookie since we are viewing the results
- job_id.remove();
- }
+ if (job_id?.value) {
+ // clear the job_id cookie since we are viewing the results
+ job_id.remove();
+ }
- const user = await jwt.verify(auth.value);
- if (!user) {
- return redirect(`${WEBROOT}/login`, 302);
- }
+ const user = await jwt.verify(auth.value);
+ if (!user) {
+ return redirect(`${WEBROOT}/login`, 302);
+ }
- const job = db
- .query("SELECT * FROM jobs WHERE user_id = ? AND id = ?")
- .as(Jobs)
- .get(user.id, params.jobId);
+ const job = db
+ .query("SELECT * FROM jobs WHERE user_id = ? AND id = ?")
+ .as(Jobs)
+ .get(user.id, params.jobId);
- if (!job) {
- set.status = 404;
- return {
- message: "Job not found.",
- };
- }
+ if (!job) {
+ set.status = 404;
+ return {
+ message: "Job not found.",
+ };
+ }
- const outputPath = `${user.id}/${params.jobId}/`;
+ const outputPath = `${user.id}/${params.jobId}/`;
- const files = db
- .query("SELECT * FROM file_names WHERE job_id = ?")
- .as(Filename)
- .all(params.jobId);
+ const files = db
+ .query("SELECT * FROM file_names WHERE job_id = ?")
+ .as(Filename)
+ .all(params.jobId);
- return (
-
- <>
-
-
-
-
-
-
-
- );
- },
- )
- .post(
- "/progress/:jobId",
- async ({ jwt, set, params, redirect, cookie: { auth, job_id } }) => {
- if (!auth?.value) {
- return redirect(`${WEBROOT}/login`, 302);
- }
+ return (
+
+ <>
+
+
+
+
+
+
+
+ );
+ })
+ .post("/progress/:jobId", async ({ jwt, set, params, redirect, cookie: { auth, job_id } }) => {
+ if (!auth?.value) {
+ return redirect(`${WEBROOT}/login`, 302);
+ }
- if (job_id?.value) {
- // clear the job_id cookie since we are viewing the results
- job_id.remove();
- }
+ if (job_id?.value) {
+ // clear the job_id cookie since we are viewing the results
+ job_id.remove();
+ }
- const user = await jwt.verify(auth.value);
- if (!user) {
- return redirect(`${WEBROOT}/login`, 302);
- }
+ const user = await jwt.verify(auth.value);
+ if (!user) {
+ return redirect(`${WEBROOT}/login`, 302);
+ }
- const job = db
- .query("SELECT * FROM jobs WHERE user_id = ? AND id = ?")
- .as(Jobs)
- .get(user.id, params.jobId);
+ const job = db
+ .query("SELECT * FROM jobs WHERE user_id = ? AND id = ?")
+ .as(Jobs)
+ .get(user.id, params.jobId);
- if (!job) {
- set.status = 404;
- return {
- message: "Job not found.",
- };
- }
+ if (!job) {
+ set.status = 404;
+ return {
+ message: "Job not found.",
+ };
+ }
- const outputPath = `${user.id}/${params.jobId}/`;
+ const outputPath = `${user.id}/${params.jobId}/`;
- const files = db
- .query("SELECT * FROM file_names WHERE job_id = ?")
- .as(Filename)
- .all(params.jobId);
+ const files = db
+ .query("SELECT * FROM file_names WHERE job_id = ?")
+ .as(Filename)
+ .all(params.jobId);
- return
;
- },
- )
\ No newline at end of file
+ return
;
+ });
diff --git a/src/pages/root.tsx b/src/pages/root.tsx
index 8c23471..35e0c86 100644
--- a/src/pages/root.tsx
+++ b/src/pages/root.tsx
@@ -1,14 +1,20 @@
-import { Elysia } from "elysia";
-import { Html } from "@elysiajs/html";
-import { FIRST_RUN, userService } from "./user";
-import { ACCOUNT_REGISTRATION, ALLOW_UNAUTHENTICATED, HIDE_HISTORY, HTTP_ALLOWED, WEBROOT } from "../helpers/env";
-import { JWTPayloadSpec } from "@elysiajs/jwt";
import { randomInt } from "node:crypto";
+import { Html } from "@elysiajs/html";
+import { JWTPayloadSpec } from "@elysiajs/jwt";
+import { Elysia } from "elysia";
import { BaseHtml } from "../components/base";
import { Header } from "../components/header";
import { getAllTargets } from "../converters/main";
import db from "../db/db";
import { User } from "../db/types";
+import {
+ ACCOUNT_REGISTRATION,
+ ALLOW_UNAUTHENTICATED,
+ HIDE_HISTORY,
+ HTTP_ALLOWED,
+ WEBROOT,
+} from "../helpers/env";
+import { FIRST_RUN, userService } from "./user";
export const root = new Elysia()
.use(userService)
@@ -27,10 +33,7 @@ export const root = new Elysia()
let user: ({ id: string } & JWTPayloadSpec) | false = false;
if (ALLOW_UNAUTHENTICATED) {
const newUserId = String(
- randomInt(
- 2 ** 24,
- Math.min(2 ** 48 + 2 ** 24 - 1, Number.MAX_SAFE_INTEGER),
- ),
+ randomInt(2 ** 24, Math.min(2 ** 48 + 2 ** 24 - 1, Number.MAX_SAFE_INTEGER)),
);
const accessToken = await jwt.sign({
id: newUserId,
@@ -54,20 +57,19 @@ export const root = new Elysia()
} 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 (
+ user !== false &&
+ user.id &&
+ (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 (!existingUser) {
+ if (auth?.value) {
+ auth.remove();
}
+ return redirect(`${WEBROOT}/login`, 302);
}
}
}
@@ -82,11 +84,9 @@ export const root = new Elysia()
new Date().toISOString(),
);
- const id = (
- db
- .query("SELECT id FROM jobs WHERE user_id = ? ORDER BY id DESC")
- .get(user.id) as { id: number }
- ).id;
+ const { id } = db
+ .query("SELECT id FROM jobs WHERE user_id = ? ORDER BY id DESC")
+ .get(user.id) as { id: number };
if (!jobId) {
return { message: "Cookies should be enabled to use this app." };
@@ -172,62 +172,53 @@ export const root = new Elysia()
sm:h-[30vh]
`}
>
- {Object.entries(getAllTargets()).map(
- ([converter, targets]) => (
-
-
-
- {targets.map((target) => (
-
- ))}
-
-
- ),
- )}
+ {Object.entries(getAllTargets()).map(([converter, targets]) => (
+
+
+
+ {targets.map((target) => (
+
+ ))}
+
+
+ ))}
{/* Hidden element which determines the format to convert the file too and the converter to use */}
-