Added root file routing and improved service workers

Luciano Nooijen · Luciano Nooijen · commit 61afdfd731d8 · 2018-11-03T13:09:17.000+01:00
diff --git a/pages/_document.js b/pages/_document.js
@@ -20,12 +20,13 @@ export default class SiteDocument extends Document {
                     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
                     <meta httpEquiv="X-UA-Compatible" content="ie=edge" />
                     <meta name="robots" content="index, follow"/>
+                    <link type="text/plain" rel="author" href="/humans.txt" />
                     <meta name="revisit-after" content="1 day"/>
                     <meta name="googlebot" content="noodp"/>
                     <meta name="theme-color" content={theme.colors.primary}/>
                     <link rel="shortcut icon" href="/static/icons/favicon.png" />
                     <link rel="apple-touch-icon" href="/static/icons/favicon.png" />
-                    <link rel="manifest" href="/static/manifest.json" />
+                    <link rel="manifest" href="/manifest.json" />
                     <link rel="stylesheet" href="https://use.typekit.net/kcu2skl.css"/>
                     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Space+Mono"/>
                     <GlobalStyles/>
@@ -36,7 +37,7 @@ export default class SiteDocument extends Document {
                     { getNoscriptTag() }
                     <div className="root">{main}</div>
                     <NextScript />
-                    <script src="/static/register-service-worker.js"/>
+                    <script src="/register-service-worker.js"/>
                 </body>
             </html>
         );
diff --git a/server/files/manifest.json b/server/files/manifest.json
@@ -1,7 +1,7 @@
 {
-    "name": "Bytecode",
+    "name": "Bytecode Website",
     "short_name": "Bytecode",
-    "theme_color": "#6ca57b",
+    "theme_color": "#23be87",
     "background_color": "#1a1a1a",
     "display": "standalone",
     "scope": "/",
diff --git a/server/files/register-service-worker.js b/server/files/register-service-worker.js
@@ -2,8 +2,8 @@
 
 if ('serviceWorker' in navigator) {
     navigator.serviceWorker
-        .register('/static/service-worker.js', {
-            scope: '/static/',
+        .register('/service-worker.js', {
+            scope: '/',
         })
         .then(reg => console.log(`Service worker registered. Scope is ${reg.scope}`))
         .catch(err => `Error while registering service worker: ${err}`);
diff --git a/server/files/service-worker.js b/server/files/service-worker.js
@@ -2,9 +2,9 @@
 
 console.log('Service worker file opened!');
 
-const CACHE_NAME = 'bytecode-static-dev';
-// const urlsToCache = ['/', '/over', '/services', '/cases', '/contact'];
-const urlsToCache = [''];
+const CACHE_NAME = 'bytecode';
+const urlsToCache = ['/', '/over', '/services', '/cases', '/contact'];
+// const urlsToCache = [''];
 
 self.addEventListener('install', event => {
     console.log('Service worker installing...');
diff --git a/server/server.js b/server/server.js
@@ -19,10 +19,27 @@ const port = process.env.PORT || 4000;
 const app = next({ dev });
 const handle = app.getRequestHandler();
 
+/* eslint-disable max-len, prettier/prettier */
+const rootFileRouter = server => {
+    const rootFileRoutes = [
+        'robots.txt',
+        'humans.txt',
+        'manifest.json',
+        'register-service-worker.js',
+        'service-worker.js',
+        'sitemap.xml',
+    ];
+    rootFileRoutes.forEach(file => {
+        server.get(`/${file}`, (req, res) => res.sendFile(`${__dirname}/files/${file}`));
+    });
+};
+/* eslint-enable */
+
 app.prepare().then(() => {
     const server = express();
     server.use(bodyParser.json());
     server.use(helmet());
+    rootFileRouter(server);
     server.get('*', (req, res) => router(req, res, app, handle));
     server.post('/post', (req, res) => handlePost(req, res));
     server.listen(port, err => {
