Merge pull request #851 from hackclub/vercel-fix

move file routing logic to index.js so vercel routing works
hackclub · Aug 22, 2024 · 5839081 · 5839081
2 parents 1c8b6a4 + 8146baf
commit 5839081
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 31 deletions.
diff --git a/api/index.js b/api/index.js
@@ -12,6 +12,10 @@ import deleteFile from "../backend/api/deleteFile.js";
 
 import { supabase } from "../backend/api/supabase.js";
 
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+import path from 'path';
+
 const app = express();
 
 app.use(express.json());
@@ -55,4 +59,28 @@ app.get('/welcome-qr-code', (req, res) => {
   res.redirect('/assembly');
 });
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+app.use(express.static(join(__dirname, '../dist')));
+
+app.use((req, res, next) => {
+  let pathName = req.path;
+
+  if (pathName === "/") pathName = "/index";
+
+  if (req.path.indexOf('.') === -1) {
+    const file = path.join(__dirname, '../dist', `${pathName}.html`);
+    res.sendFile(file, (err) => {
+      if (err) next();
+    });
+  } else {
+    next();
+  }
+});
+
+app.use((req, res, next) => {
+  const file = path.join(__dirname, '../dist', `404.html`);
+  res.status(404).sendFile(file);
+});
 export default app;
diff --git a/dev_server.js b/dev_server.js
@@ -1,37 +1,6 @@
 import app from './api/index.js'
 import './build.js'
 
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
-
-import express from 'express';
-import path from 'path';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-app.use(express.static(join(__dirname, 'dist')));
-
-app.use((req, res, next) => {
-  let pathName = req.path;
-
-  if (pathName === "/") pathName = "/index";
-
-  if (req.path.indexOf('.') === -1) {
-      const file = path.join(__dirname, 'dist', `${pathName}.html`);
-      res.sendFile(file, (err) => {
-          if (err) next();
-      });
-  } else {
-      next();
-  }
-});
-
-app.use((req, res, next) => {
-  const file = path.join(__dirname, 'dist', `404.html`);
-  res.status(404).sendFile(file);
-});
-
 const port = process.env.PORT || 3000;
 
 app.listen(port, () => {