From 7eb69aa3f7e4ba4a7a385bdf4a676818724cb96a Mon Sep 17 00:00:00 2001
From: KevinMidboe <kevin.midboe@gmail.com>
Date: Fri, 20 Nov 2020 18:36:09 +0100
Subject: [PATCH] Cleaned redirects and disabled sw when localhost.

---
 server.js | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/server.js b/server.js
index 659ef0e..76103f2 100644
--- a/server.js
+++ b/server.js
@@ -71,17 +71,20 @@ app.use("/dist", express.static(path.join(__dirname, "dist")));
 
 // api endpoints
 app.use("/api/", apiRouter);
+
+// redirects
+app.get("/dagens", (req, res) => res.redirect("/#/dagens"));
+app.get("/winner/:id", (req, res) => res.redirect("/#/winner/" + req.params.id));
+
+// push-notifications & service workers
 app.use("/subscription", subscriptionApi);
-
-app.get("/dagens", function(req, res) {
-  res.redirect("/#/dagens");
-});
-app.get("/winner/:id", function(req, res) {
-  res.redirect("/#/winner/" + req.params.id);
-});
-
 app.use("/service-worker.js", function(req, res) {
-  res.sendFile(path.join(__dirname, "public/sw/serviceWorker.js"));
+  if (process.env.NODE_ENV == "development") {
+    return res.end(); // cancel serving service worker if localhost
+  }
+  res.sendFile(path.join(__dirname, "src/serviceWorker.js"));
 });
 
+app.use("/", (req, res) => res.sendFile(path.join(__dirname + "/dist/index.html")));
+
 server.listen(30030);