fix login

C4illin · May 24, 2024 · 8a32c2d · 8a32c2d
1 parent ac8f44b
commit 8a32c2d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/src/components/header.tsx b/src/components/header.tsx
@@ -7,7 +7,7 @@ export const Header = ({ loggedIn }: { loggedIn?: boolean }) => {
           <a href="/test">History</a>
         </li>
         <li>
-          <a href="/logout">Logout</a>
+          <a href="/logoff">Logout</a>
         </li>
       </ul>
     );

diff --git a/src/helpers/normalizeFiletype.ts b/src/helpers/normalizeFiletype.ts
@@ -17,8 +17,6 @@ export const normalizeOutputFiletype = (filetype: string): string => {
   switch (lowercaseFiletype) {
     case "jpeg":
       return "jpg";
-    case "mpeg4":
-      return "mp4";
     default:
       return lowercaseFiletype;
   }

diff --git a/src/index.tsx b/src/index.tsx
@@ -15,7 +15,10 @@ import {
   getAllTargets,
   getAllInputs,
 } from "./converters/main";
-import { normalizeFiletype } from "./helpers/normalizeFiletype";
+import {
+  normalizeFiletype,
+  normalizeOutputFiletype,
+} from "./helpers/normalizeFiletype";
 
 const db = new Database("./data/mydb.sqlite", { create: true });
 const uploadsDir = "./data/uploads/";
@@ -336,18 +339,18 @@ const app = new Elysia()
         sameSite: "strict",
       });
 
-      redirect("/");
+      return redirect("/");
     },
     { body: t.Object({ email: t.String(), password: t.String() }) },
   )
-  .get("/logout", ({ redirect, cookie: { auth } }) => {
+  .get("/logoff", ({ redirect, cookie: { auth } }) => {
     if (auth?.value) {
       auth.remove();
     }
 
     return redirect("/login");
   })
-  .post("/logout", ({ redirect, cookie: { auth } }) => {
+  .post("/logoff", ({ redirect, cookie: { auth } }) => {
     if (auth?.value) {
       auth.remove();
     }
@@ -415,15 +418,15 @@ const app = new Elysia()
             </div>
             <input type="file" name="file" multiple />
             {/* <label for="convert_from">Convert from</label> */}
-            <select name="convert_from" aria-label="Convert from" required>
+            {/* <select name="convert_from" aria-label="Convert from" required>
               <option selected disabled value="">
                 Convert from
               </option>
               {getPossibleInputs().map((input) => (
                 // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
                 <option>{input}</option>
               ))}
-            </select>
+            </select> */}
           </article>
           <form method="post" action="/convert">
             <input type="hidden" name="file_names" id="file_names" />
@@ -616,7 +619,7 @@ const app = new Elysia()
           const fileTypeOrig = fileName.split(".").pop() as string;
           const fileType = normalizeFiletype(fileTypeOrig);
           const newFileExt = normalizeOutputFiletype(convertTo);
-          const newFileName = fileName.replace(fileTypeOrig, convertTo);
+          const newFileName = fileName.replace(fileTypeOrig, newFileExt);
           const targetPath = `${userOutputDir}${newFileName}`;
 
           await mainConverter(
@@ -863,6 +866,7 @@ const app = new Elysia()
                         Count: {inputs.length}
                         <ul>
                           {inputs.map((input) => (
+                            // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
                             <li>{input}</li>
                           ))}
                         </ul>
@@ -871,6 +875,7 @@ const app = new Elysia()
                         Count: {targets.length}
                         <ul>
                           {targets.map((target) => (
+                            // biome-ignore lint/correctness/useJsxKeyInIterable: <explanation>
                             <li>{target}</li>
                           ))}
                         </ul>