From 044486b9a6531ad5d77395735691a4f56970f628 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Sat, 27 May 2017 11:22:42 -0700
Subject: [PATCH] Cleanup

---
 server/api/middlewares/authentication.js |  2 +-
 server/api/middlewares/pagination.js     | 15 ++++++---------
 server/middlewares/subdomainRedirect.js  |  2 +-
 server/static/index.html                 | 10 ----------
 4 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/server/api/middlewares/authentication.js b/server/api/middlewares/authentication.js
index 7e033940..232dc38f 100644
--- a/server/api/middlewares/authentication.js
+++ b/server/api/middlewares/authentication.js
@@ -48,7 +48,7 @@ export default function auth({ require = true } = {}) {
             },
           });
         } catch (e) {
-          throw httpErrors.Unauthorized('Invalid api key');
+          throw httpErrors.Unauthorized('Invalid API key');
         }
 
         if (!apiKey) throw httpErrors.Unauthorized('Invalid token');
diff --git a/server/api/middlewares/pagination.js b/server/api/middlewares/pagination.js
index 36e8bc0d..57ebf03a 100644
--- a/server/api/middlewares/pagination.js
+++ b/server/api/middlewares/pagination.js
@@ -1,19 +1,17 @@
 import httpErrors from 'http-errors';
-var querystring = require('querystring');
+import querystring from 'querystring';
 
 export default function pagination(options) {
   return async function paginationMiddleware(ctx, next) {
     const opts = {
-      ...{
-        defaultLimit: 15,
-        maxLimit: 100,
-      },
+      defaultLimit: 15,
+      maxLimit: 100,
       ...options,
     };
 
     let query = ctx.request.query;
-    let limit = parseInt(query.limit);
-    let offset = parseInt(query.offset);
+    let limit = parseInt(query.limit, 10);
+    let offset = parseInt(query.offset, 10);
     limit = isNaN(limit) ? opts.defaultLimit : limit;
     offset = isNaN(offset) ? 0 : offset;
 
@@ -30,8 +28,7 @@ export default function pagination(options) {
 
     query.limit = ctx.state.pagination.limit;
     query.offset = ctx.state.pagination.offset + query.limit;
-    ctx.state.pagination.nextPath =
-      '/api' + ctx.request.path + '?' + querystring.stringify(query);
+    ctx.state.pagination.nextPath = `/api${ctx.request.path}?${querystring.stringify(query)}`;
 
     return next();
   };
diff --git a/server/middlewares/subdomainRedirect.js b/server/middlewares/subdomainRedirect.js
index 8989bbbe..9f6ca9ba 100644
--- a/server/middlewares/subdomainRedirect.js
+++ b/server/middlewares/subdomainRedirect.js
@@ -1,7 +1,7 @@
 export default function subdomainRedirect(options) {
   return async function subdomainRedirectMiddleware(ctx, next) {
     if (ctx.headers.host === 'beautifulatlas.com') {
-      ctx.redirect('https://www.' + ctx.headers.host + ctx.path);
+      ctx.redirect(`https://www.${ctx.headers.host}${ctx.path}`);
     } else {
       return next();
     }
diff --git a/server/static/index.html b/server/static/index.html
index 13409dce..e732e8ce 100644
--- a/server/static/index.html
+++ b/server/static/index.html
@@ -32,15 +32,5 @@
         <div class="header"></div>
       </div>
     </div>
-    <script type="text/javascript">
-      // if ('serviceWorker' in navigator) {
-      //   navigator.serviceWorker.register('/service-worker.js')
-      //   .then(function(reg) {
-      //     console.log('SW registration succeeded');
-      //   }).catch(function(error) {
-      //     console.log('SW registration failed: ' + error);
-      //   });
-      // };
-    </script>
   </body>
 </html>