linting and cleanup

src/pages/_app.jsx

@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-props-no-spreading */
 import { SWRConfig } from "swr";
 import "styles/globals.css";
 import "styles/weather-icons.css";

src/pages/api/bookmarks.js

@@ -1,6 +1,8 @@
 import { promises as fs } from "fs";
 import path from "path";
+
 import yaml from "js-yaml";
+
 import checkAndCopyConfig from "utils/config";
 
 export default async function handler(req, res) {
@@ -11,17 +13,13 @@ export default async function handler(req, res) {
   const bookmarks = yaml.load(fileContents);
 
   // map easy to write YAML objects into easy to consume JS arrays
-  const bookmarksArray = bookmarks.map((group) => {
-    return {
-      name: Object.keys(group)[0],
-      bookmarks: group[Object.keys(group)[0]].map((entries) => {
-        return {
-          name: Object.keys(entries)[0],
-          ...entries[Object.keys(entries)[0]][0],
-        };
-      }),
-    };
-  });
+  const bookmarksArray = bookmarks.map((group) => ({
+    name: Object.keys(group)[0],
+    bookmarks: group[Object.keys(group)[0]].map((entries) => ({
+      name: Object.keys(entries)[0],
+      ...entries[Object.keys(entries)[0]][0],
+    })),
+  }));
 
   res.send(bookmarksArray);
 }

src/pages/api/docker/stats/[...service].js

@@ -1,4 +1,5 @@
 import Docker from "dockerode";
+
 import getDockerArguments from "utils/docker";
 
 export default async function handler(req, res) {
@@ -21,30 +22,30 @@ export default async function handler(req, res) {
     // bad docker connections can result in a <Buffer ...> object?
     // in any case, this ensures the result is the expected array
     if (!Array.isArray(containers)) {
-      return res.status(500).send({
+      res.status(500).send({
         error: "query failed",
       });
+      return;
     }
 
-    const containerNames = containers.map((container) => {
-      return container.Names[0].replace(/^\//, "");
-    });
+    const containerNames = containers.map((container) => container.Names[0].replace(/^\//, ""));
     const containerExists = containerNames.includes(containerName);
 
     if (!containerExists) {
-      return res.status(200).send({
+      res.status(200).send({
         error: "not found",
       });
+      return;
     }
 
     const container = docker.getContainer(containerName);
     const stats = await container.stats({ stream: false });
 
-    return res.status(200).json({
-      stats: stats,
+    res.status(200).json({
+      stats,
     });
   } catch {
-    return res.status(500).send({
+    res.status(500).send({
       error: "unknown error",
     });
   }

src/pages/api/docker/status/[...service].js

@@ -1,4 +1,5 @@
 import Docker from "dockerode";
+
 import getDockerArguments from "utils/docker";
 
 export default async function handler(req, res) {
@@ -25,9 +26,7 @@ export default async function handler(req, res) {
       });
     }
 
-    const containerNames = containers.map((container) => {
-      return container.Names[0].replace(/^\//, "");
-    });
+    const containerNames = containers.map((container) => container.Names[0].replace(/^\//, ""));
     const containerExists = containerNames.includes(containerName);
 
     if (!containerExists) {

src/pages/api/proxy.js

@@ -1,4 +1,5 @@
 import https from "https";
+
 import getRawBody from "raw-body";
 
 import { httpRequest, httpsRequest } from "utils/http";
@@ -11,7 +12,8 @@ export const config = {
 
 export default async function handler(req, res) {
   const headers = ["X-API-Key", "Authorization"].reduce((obj, key) => {
-    if (req.headers && req.headers.hasOwnProperty(key.toLowerCase())) {
+    if (req.headers && Object.prototype.hasOwnProperty.call(req.headers, key.toLowerCase())) {
+      // eslint-disable-next-line no-param-reassign
       obj[key] = req.headers[key.toLowerCase()];
     }
     return obj;
@@ -29,23 +31,9 @@ export default async function handler(req, res) {
     const [status, contentType, data] = await httpsRequest(url, {
       agent: httpsAgent,
       method: req.method,
-      headers: headers,
+      headers,
       body:
-        req.method == "GET" || req.method == "HEAD"
-          ? null
-          : await getRawBody(req, {
-              encoding: "utf8",
-            }),
-    });
-
-    res.setHeader("Content-Type", contentType);
-    return res.status(status).send(data);
-  } else {
-    const [status, contentType, data] = await httpRequest(url, {
-      method: req.method,
-      headers: headers,
-      body:
-        req.method == "GET" || req.method == "HEAD"
+        req.method === "GET" || req.method === "HEAD"
           ? null
           : await getRawBody(req, {
               encoding: "utf8",
@@ -55,4 +43,17 @@ export default async function handler(req, res) {
     res.setHeader("Content-Type", contentType);
     return res.status(status).send(data);
   }
+  const [status, contentType, data] = await httpRequest(url, {
+    method: req.method,
+    headers,
+    body:
+      req.method === "GET" || req.method === "HEAD"
+        ? null
+        : await getRawBody(req, {
+            encoding: "utf8",
+          }),
+  });
+
+  res.setHeader("Content-Type", contentType);
+  return res.status(status).send(data);
 }

src/pages/api/services/index.js

@@ -1,6 +1,8 @@
 import { promises as fs } from "fs";
 import path from "path";
+
 import yaml from "js-yaml";
+
 import checkAndCopyConfig from "utils/config";
 
 export default async function handler(req, res) {
@@ -11,30 +13,28 @@ export default async function handler(req, res) {
   const services = yaml.load(fileContents);
 
   // map easy to write YAML objects into easy to consume JS arrays
-  const servicesArray = services.map((group) => {
-    return {
-      name: Object.keys(group)[0],
-      services: group[Object.keys(group)[0]].map((entries) => {
-        const { widget, ...service } = entries[Object.keys(entries)[0]];
-        let res = {
-          name: Object.keys(entries)[0],
-          ...service,
+  const servicesArray = services.map((group) => ({
+    name: Object.keys(group)[0],
+    services: group[Object.keys(group)[0]].map((entries) => {
+      const { widget, ...service } = entries[Object.keys(entries)[0]];
+      const result = {
+        name: Object.keys(entries)[0],
+        ...service,
+      };
+
+      if (widget) {
+        const { type } = widget;
+
+        result.widget = {
+          type,
+          service_group: Object.keys(group)[0],
+          service_name: Object.keys(entries)[0],
         };
+      }
 
-        if (widget) {
-          const { type } = widget;
-
-          res.widget = {
-            type: type,
-            service_group: Object.keys(group)[0],
-            service_name: Object.keys(entries)[0],
-          };
-        }
-
-        return res;
-      }),
-    };
-  });
+      return result;
+    }),
+  }));
 
   res.send(servicesArray);
 }

src/pages/api/services/proxy.js

@@ -33,5 +33,5 @@ export default async function handler(req, res) {
     return serviceProxyHandler(req, res);
   }
 
-  res.status(403).json({ error: "Unkown proxy service type" });
+  return res.status(403).json({ error: "Unkown proxy service type" });
 }

src/pages/api/widgets/index.js

@@ -1,6 +1,8 @@
 import { promises as fs } from "fs";
 import path from "path";
+
 import yaml from "js-yaml";
+
 import checkAndCopyConfig from "utils/config";
 
 export default async function handler(req, res) {
@@ -11,12 +13,10 @@ export default async function handler(req, res) {
   const widgets = yaml.load(fileContents);
 
   // map easy to write YAML objects into easy to consume JS arrays
-  const widgetsArray = widgets.map((group) => {
-    return {
-      type: Object.keys(group)[0],
-      options: { ...group[Object.keys(group)[0]] },
-    };
-  });
+  const widgetsArray = widgets.map((group) => ({
+    type: Object.keys(group)[0],
+    options: { ...group[Object.keys(group)[0]] },
+  }));
 
   res.send(widgetsArray);
 }

src/pages/api/widgets/openweathermap.js

@@ -22,7 +22,7 @@ export default async function handler(req, res) {
     return res.status(400).json({ error: "Missing API key" });
   }
 
-  const api_url = `https://api.openweathermap.org/data/2.5/weather?lat=${latitude}&lon=${longitude}&appid=${apiKey}&units=${units}`;
+  const apiUrl = `https://api.openweathermap.org/data/2.5/weather?lat=${latitude}&lon=${longitude}&appid=${apiKey}&units=${units}`;
 
-  res.send(await cachedFetch(api_url, cache));
+  return res.send(await cachedFetch(apiUrl, cache));
 }

src/pages/api/widgets/resources.js

@@ -1,26 +1,30 @@
-import { cpu, drive, mem, netstat } from "node-os-utils";
+import { cpu, drive, mem } from "node-os-utils";
 
 export default async function handler(req, res) {
   const { type, target } = req.query;
 
-  if (type == "cpu") {
+  if (type === "cpu") {
     return res.status(200).json({
       cpu: {
         usage: await cpu.usage(1000),
         load: cpu.loadavgTime(5),
       },
     });
-  } else if (type == "disk") {
+  }
+
+  if (type === "disk") {
     return res.status(200).json({
       drive: await drive.info(target || "/"),
     });
-  } else if (type == "memory") {
+  }
+
+  if (type === "memory") {
     return res.status(200).json({
       memory: await mem.info(),
     });
-  } else {
-    return res.status(400).json({
-      error: "invalid type",
-    });
   }
+
+  return res.status(400).json({
+    error: "invalid type",
+  });
 }

src/pages/api/widgets/weather.js

@@ -22,7 +22,7 @@ export default async function handler(req, res) {
     return res.status(400).json({ error: "Missing API key" });
   }
 
-  const api_url = `http://api.weatherapi.com/v1/current.json?q=${latitude},${longitude}&key=${apiKey}`;
+  const apiUrl = `http://api.weatherapi.com/v1/current.json?q=${latitude},${longitude}&key=${apiKey}`;
 
-  res.send(await cachedFetch(api_url, cache));
+  return res.send(await cachedFetch(apiUrl, cache));
 }

src/pages/index.jsx

@@ -2,13 +2,11 @@ import useSWR from "swr";
 import Head from "next/head";
 import dynamic from "next/dynamic";
 
-import { ThemeProvider } from "utils/theme-context";
-
 import ServicesGroup from "components/services/group";
 import BookmarksGroup from "components/bookmarks/group";
 import Widget from "components/widget";
 import { ColorProvider } from "utils/color-context";
-import Search from "components/widgets/search/search";
+import { ThemeProvider } from "utils/theme-context";
 
 const ThemeToggle = dynamic(() => import("components/theme-toggle"), {
   ssr: false,
@@ -19,12 +17,11 @@ const ColorToggle = dynamic(() => import("components/color-toggle"), {
 });
 
 const rightAlignedWidgets = ["weatherapi", "openweathermap", "weather", "search"];
-const expandedWidgets = ["search"];
 
 export default function Home() {
-  const { data: services, error: servicesError } = useSWR("/api/services");
-  const { data: bookmarks, error: bookmarksError } = useSWR("/api/bookmarks");
-  const { data: widgets, error: widgetsError } = useSWR("/api/widgets");
+  const { data: services } = useSWR("/api/services");
+  const { data: bookmarks } = useSWR("/api/bookmarks");
+  const { data: widgets } = useSWR("/api/widgets");
 
   return (
     <ColorProvider>
@@ -38,15 +35,15 @@ export default function Home() {
               <>
                 {widgets
                   .filter((widget) => !rightAlignedWidgets.includes(widget.type))
-                  .map((widget, i) => (
-                    <Widget key={i} widget={widget} />
+                  .map((widget) => (
+                    <Widget key={widget} widget={widget} />
                   ))}
 
                 <div className="flex flex-wrap basis-full space-x-0 sm:space-x-4 grow sm:basis-auto justify-between md:justify-end mt-2 md:mt-0">
                   {widgets
                     .filter((widget) => rightAlignedWidgets.includes(widget.type))
-                    .map((widget, i) => (
-                      <Widget key={i} widget={widget} />
+                    .map((widget) => (
+                      <Widget key={widget} widget={widget} />
                     ))}
                 </div>
               </>