Trying to fix the heroku production bug

developeratul · Sep 14, 2021 · aecacfb · aecacfb
1 parent 51b926e
commit aecacfb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -38,17 +38,10 @@ app.use("/comment", commentRouter_1.default);
 app.use("/get_settings", settingsRouter_1.default);
 // for production
 if (process.env.NODE_ENV === "production") {
-    app.use((req, res, next) => {
-        if (req.header("x-forwarded-proto") !== "https")
-            res.redirect(`https://${req.header("host")}${req.url}`);
-        else
-            next();
-    });
-}
-if (process.env.NODE_ENV === "production") {
-    app.use(express_1.default.static("client/build"));
-    app.get("*", (req, res) => {
-        res.sendFile(path_1.default.resolve(__dirname, "client", "build", "index.html"));
+    app.use(express_1.default.static('client/build'));
+    app.get('*', function (req, res) {
+        const fullPath = path_1.default.join(__dirname, '../client', 'build', 'index.html');
+        res.sendFile(fullPath);
     });
 }
 // error handlings

diff --git a/src/index.ts b/src/index.ts
@@ -40,19 +40,12 @@ app.use("/get_settings", settingsRouter);
 
 // for production
 if (process.env.NODE_ENV === "production") {
-  app.use((req, res, next) => {
-    if (req.header("x-forwarded-proto") !== "https")
-      res.redirect(`https://${req.header("host")}${req.url}`);
-    else next();
-  });
-}
-
-if (process.env.NODE_ENV === "production") {
-  app.use(express.static("client/build"));
-
-  app.get("*", (req, res) => {
-    res.sendFile(path.resolve(__dirname, "client", "build", "index.html"));
-  });
+  app.use(express.static('client/build'))
+
+  app.get('*', function (req, res) {
+    const fullPath = path.join(__dirname,  '../client', 'build', 'index.html')
+    res.sendFile(fullPath)
+  })
 }
 
 // error handlings