Refactor server routes for better handling of static files

vincenthphung · Jun 20, 2023 · a10cc7f · a10cc7f · vercel · Jun 20, 2023
1 parent 141c7bd
commit a10cc7f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 127 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/build/index.html b/build/index.html
@@ -1 +1,28 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="theme-color" content="#000000"/><link href="https://fonts.googleapis.com/css?family=Work+Sans:300,500,600" rel="stylesheet"/><link href="https://fonts.googleapis.com/css?family=Poppins:600" rel="stylesheet"/><link rel="manifest" href="/manifest.json"/><link rel="shortcut icon" href="/favicon.ico"/><title>ravenous</title><script defer="defer" src="/static/js/main.b75d2832.js"></script><link href="/static/css/main.62f3928e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width,initial-scale=1,shrink-to-fit=no"
+    />
+    <meta name="theme-color" content="#000000" />
+    <link
+      href="https://fonts.googleapis.com/css?family=Work+Sans:300,500,600"
+      rel="stylesheet"
+    />
+    <link
+      href="https://fonts.googleapis.com/css?family=Poppins:600"
+      rel="stylesheet"
+    />
+    <link rel="manifest" href="/manifest.json" />
+    <link rel="shortcut icon" href="/favicon.ico" />
+    <title>ravenous</title>
+    <script defer="defer" src="/static/js/main.b75d2832.js"></script>
+    <link href="/static/css/main.62f3928e.css" rel="stylesheet" />
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+  </body>
+</html>
diff --git a/build/reset.css b/build/reset.css
diff --git a/server.js b/server.js
@@ -8,8 +8,15 @@ app.use(cors());
 
 const apiKey = process.env.API_KEY; 
 
+// Serve static files from the React app
 app.use(express.static(path.join(__dirname, 'build')));
 
+// Handle the requests for the individual files like main.js, main.css, etc.
+app.get(/^\/(static|favicon\.ico|manifest\.json|logo192\.png)/, (req, res) => {
+  const filePath = path.join(__dirname, 'build', req.url);
+  res.sendFile(filePath);
+});
+
 app.get('/search', (req, res) => {
   axios({
     method: 'get',
@@ -26,8 +33,9 @@ app.get('/search', (req, res) => {
     });
 });
 
-app.get('/*', (req, res) => {
-   res.sendFile(path.join(__dirname, 'build', 'index.html'));
+// The "catchall" handler: for any request that doesn't match one above, send back React's index.html file.
+app.get('*', (req, res) => {
+  res.sendFile(path.join(__dirname, 'build', 'index.html'));
 });
 
 const port = process.env.PORT || 3000;