agendash 1.0.0 → 3.0.0

package/lib/middlewares/fastify.js

@@ -0,0 +1,75 @@
+const path = require("path");
+
+module.exports = (agendash) => (instance, opts, done) => {
+  const { api, requeueJobs, deleteJobs, createJob } = agendash;
+
+  instance.register(require("fastify-static"), {
+    root: path.join(__dirname, "../../public"),
+  });
+
+  instance.get("/", function (req, reply) {
+    return reply.sendFile("index.html");
+  });
+
+  instance.get("/api", async (request, response) => {
+    try {
+      const {
+        job,
+        state,
+        skip,
+        limit,
+        q,
+        property,
+        isObjectId,
+      } = request.query;
+      const apiResponse = await api(job, state, {
+        query: q,
+        property,
+        isObjectId,
+        skip,
+        limit,
+      });
+      response.send(apiResponse);
+    } catch (error) {
+      response.status(400).send(error);
+    }
+  });
+
+  instance.post("/api/jobs/requeue", async (request, response) => {
+    try {
+      const newJobs = await requeueJobs(request.body.jobIds);
+      response.send(newJobs);
+    } catch (error) {
+      response.status(404).send(error);
+    }
+  });
+
+  instance.post("/api/jobs/delete", async (request, response) => {
+    try {
+      const deleted = await deleteJobs(request.body.jobIds);
+      if (deleted) {
+        response.send({ deleted: true });
+      } else {
+        response.send({ message: "Jobs not deleted" });
+      }
+    } catch (error) {
+      response.status(404).send(error);
+    }
+  });
+
+  instance.post("/api/jobs/create", async (request, response) => {
+    try {
+      await createJob(
+        request.body.jobName,
+        request.body.jobSchedule,
+        request.body.jobRepeatEvery,
+        request.body.jobData
+      );
+      response.send({ created: true });
+    } catch (error) {
+      response.status(400).send(error);
+    }
+  });
+
+  done();
+};

package/lib/middlewares/hapi.js

@@ -1,118 +1,95 @@
-'use strict';
+const path = require("path");
+const pack = require("../../package.json");
 
-const path = require('path');
-const pack = require('../../package.json');
-
-module.exports = agendash => {
+module.exports = (agendash) => {
+  const { api, requeueJobs, deleteJobs, createJob } = agendash;
   return {
     pkg: pack,
-    register: async (server, options) => {
+    register: (server, options) => {
       server.route([
         {
-          method: 'GET',
-          path: '/{param*}',
+          method: "GET",
+          path: "/{param*}",
           handler: {
             directory: {
-              path: path.join(__dirname, '../../public')
-            }
+              path: path.join(__dirname, "../../public"),
+            },
           },
           config: {
-            auth: options.auth || false
-          }
+            auth: options.auth || false,
+          },
         },
         {
-          method: 'GET',
-          path: '/api',
-          handler: async (request, h) => {
-            try {
-              const apiResponse = await new Promise((resolve, reject) => {
-                agendash.api(request.query.job, request.query.state, (err, apiResponse) => {
-                  if (err) {
-                    return reject(err);
-                  }
-                  resolve(apiResponse);
-                });
-              });
-              return h.response(apiResponse);
-            } catch (err) {
-              return h.response(err).code(400);
-            }
+          method: "GET",
+          path: "/api",
+          handler(request) {
+            const {
+              job,
+              state,
+              limit,
+              skip,
+              q,
+              property,
+              isObjectId,
+            } = request.query;
+            return api(job, state, {
+              query: q,
+              property,
+              isObjectId,
+              skip,
+              limit,
+            });
           },
           config: {
-            auth: options.auth || false
-          }
+            auth: options.auth || false,
+          },
         },
         {
-          method: 'POST',
-          path: '/api/jobs/requeue',
-          handler: async (request, h) => {
-            try {
-              const requeueJobs = await new Promise((resolve, reject) => {
-                agendash.requeueJobs(request.payload.jobIds, (err, requeueJobs) => {
-                  if (err) {
-                    return reject(err);
-                  }
-                  resolve(requeueJobs);
-                });
-              });
-              return h.response(requeueJobs);
-            } catch (err) {
-              return h.response(err).code(404);
-            }
+          method: "POST",
+          path: "/api/jobs/requeue",
+          handler(request) {
+            return requeueJobs(request.payload.jobIds);
           },
           config: {
-            auth: options.auth || false
-          }
+            auth: options.auth || false,
+          },
         },
         {
-          method: 'POST',
-          path: '/api/jobs/delete',
-          handler: async (request, h) => {
-            try {
-              const deletedJobs = await new Promise((resolve, reject) => {
-                agendash.deleteJobs(request.payload.jobIds, err => {
-                  if (err) {
-                    return reject(err);
-                  }
-                  resolve({
-                    deleted: true
-                  });
-                });
-              });
-              return h.response(deletedJobs);
-            } catch (err) {
-              return h.response(err).code(404);
+          method: "POST",
+          path: "/api/jobs/delete",
+          async handler(request, h) {
+            const deleted = await deleteJobs(request.payload.jobIds);
+            if (deleted) {
+              return h.response({ deleted: true });
             }
+
+            return h.code(404);
           },
           config: {
-            auth: options.auth || false
-          }
+            auth: options.auth || false,
+          },
         },
         {
-          method: 'POST',
-          path: '/api/jobs/create',
-          handler: async (request, h) => {
-            try {
-              const createdJobs = await new Promise((resolve, reject) => {
-                agendash.createJob(request.payload.jobName, request.payload.jobSchedule, request.payload.jobRepeatEvery, request.payload.jobData, err => {
-                  if (err) {
-                    return reject(err);
-                  }
-                  resolve({
-                    created: true
-                  });
-                });
-              });
-              return h.response(createdJobs);
-            } catch (err) {
-              return h.response(err).code(404);
+          method: "POST",
+          path: "/api/jobs/create",
+          async handler(request, h) {
+            const created = await createJob(
+              request.payload.jobName,
+              request.payload.jobSchedule,
+              request.payload.jobRepeatEvery,
+              request.payload.jobData
+            );
+            if (created) {
+              return h.response({ created: true });
             }
+
+            return h.code(404);
           },
           config: {
-            auth: options.auth || false
-          }
-        }
+            auth: options.auth || false,
+          },
+        },
       ]);
-    }
+    },
   };
 };

package/lib/middlewares/koa.js

@@ -0,0 +1,71 @@
+const path = require("path");
+const bodyParser = require("koa-bodyparser");
+const Router = require("koa-router");
+const koaStatic = require("koa-static");
+
+module.exports = (agendash) => {
+  const middlewares = [];
+
+  middlewares.push(
+    koaStatic(path.resolve(__dirname, "../../public"), { defer: true })
+  );
+
+  middlewares.push(bodyParser());
+
+  const routerApi = new Router();
+
+  routerApi.get("/api", async ({ response, query }) => {
+    const { job, state, skip, limit, q, property, isObjectId } = query;
+    try {
+      response.body = await agendash.api(job, state, {
+        query: q,
+        property,
+        isObjectId,
+        skip,
+        limit,
+      });
+    } catch (error) {
+      response.status = 400;
+      response.body = error;
+    }
+  });
+
+  routerApi.post("/api/jobs/requeue", async ({ request, response }) => {
+    try {
+      response.body = await agendash.requeueJobs(request.body.jobIds);
+    } catch (error) {
+      response.status = 404;
+      response.body = error;
+    }
+  });
+
+  routerApi.post("/api/jobs/delete", async ({ request, response }) => {
+    try {
+      await agendash.deleteJobs(request.body.jobIds);
+      response.body = {
+        deleted: true,
+      };
+    } catch (error) {
+      response.status = 404;
+      response.body = error;
+    }
+  });
+
+  routerApi.post("/api/jobs/create", async ({ request, response }) => {
+    const { jobData, jobName, jobSchedule, jobRepeatEvery } = request.body;
+
+    try {
+      await agendash.createJob(jobName, jobSchedule, jobRepeatEvery, jobData);
+      response.body = {
+        created: true,
+      };
+    } catch (error) {
+      response.status = 404;
+      response.body = error;
+    }
+  });
+
+  middlewares.push(routerApi.middleware());
+
+  return middlewares;
+};

package/package.json

@@ -1,19 +1,22 @@
 {
   "name": "agendash",
-  "version": "1.0.0",
-  "description": "Agenda Dashboard",
+  "version": "3.0.0",
+  "description": "A modern dashboard for Agenda.js with Pagination and Search capabilities",
   "main": "app.js",
   "bin": "bin/agendash-standalone.js",
   "engines": {
-    "node": ">=8.9.0"
+    "node": ">=10.0.0"
   },
   "scripts": {
     "test": "run-p lint ava",
-    "lint": "xo",
+    "lint": "eslint ./",
     "ava": "ava -v -c 1"
   },
   "keywords": [
-    "agenda"
+    "agenda",
+    "agendash",
+    "dashboard",
+    "job-queues"
   ],
   "repository": {
     "type": "git",
@@ -24,43 +27,49 @@
   },
   "homepage": "https://github.com/agenda/agendash#readme",
   "license": "MIT",
+  "files": [
+    "bin",
+    "lib",
+    "public",
+    "app.js",
+    "*.png",
+    "Dockerfile",
+    "entrypoint.sh"
+  ],
   "dependencies": {
-    "agenda": "^2.0.0",
-    "async": "^2.6.0",
+    "agenda": "^4.2.1",
     "body-parser": "^1.15.0",
     "commander": "^2.9.0",
     "express": "^4.0.0",
-    "hapi": "^17.5.1",
-    "inert": "^5.1.0",
-    "semver": "^5.3.0"
+    "mongodb": "*",
+    "semver": "^7.3.4"
   },
   "devDependencies": {
-    "ava": "^0.25.0",
-    "npm-run-all": "^4.1.2",
-    "supertest": "^3.0.0",
-    "xo": "^0.18.2"
+    "@hapi/hapi": "^20.2.1",
+    "@hapi/inert": "^6.0.5",
+    "ava": "3.15.0",
+    "eslint": "7.19.0",
+    "fastify": "^3.24.0",
+    "fastify-static": "^4.5.0",
+    "koa": "2.13.1",
+    "koa-bodyparser": "4.3.0",
+    "koa-router": "10.0.0",
+    "koa-static": "5.0.0",
+    "npm-run-all": "4.1.5",
+    "prettier": "2.2.1",
+    "supertest": "^6.2.2"
   },
-  "xo": {
-    "space": 2,
-    "rules": {
-      "space-before-function-paren": [
-        "error",
-        "never"
-      ],
-      "max-params": [
-        "error",
-        5
-      ],
-      "max-nested-callbacks": [
-        "error",
-        5
-      ]
+  "eslintConfig": {
+    "parserOptions": {
+      "ecmaVersion": 2019
+    },
+    "env": {
+      "es6": true,
+      "node": true
     },
-    "envs": [
-      "node"
-    ],
-    "ignores": [
-      "public/**/*"
-    ]
-  }
+    "extends": "eslint:recommended"
+  },
+  "eslintIgnore": [
+    "public"
+  ]
 }

package/public/app/assets/ArgensdashV2Logo.svg

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 22.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 468.9 334.3" style="enable-background:new 0 0 468.9 334.3;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#36A9E1;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#FFCF02;}
+</style>
+<rect x="61.8" y="155.8" class="st0" width="46.6" height="159.2"/>
+<rect x="117.4" y="124.8" class="st0" width="46.6" height="190.2"/>
+<rect x="179.4" y="107.1" class="st1" width="46.6" height="207.9"/>
+<rect x="239.4" y="89.4" class="st1" width="46.6" height="225.6"/>
+<rect x="296.3" y="53.8" class="st0" width="46.6" height="261.2"/>
+<rect x="351.9" y="16.3" class="st0" width="46.6" height="298.7"/>
+<path class="st2" d="M178.8,241c9.4,16.8,26.6,28.8,46.6,31V150.1c-20.1,2.2-37.2,14.2-46.6,31V241z"/>
+<path class="st2" d="M238.8,150.1V272c20-2.1,37.1-13.8,46.6-30.4v-61.2C275.9,163.9,258.8,152.2,238.8,150.1z"/>
+</svg>

package/public/app/css/styles.css

@@ -0,0 +1,221 @@
+:root{
+  --secondary: #ffffff;
+  --primary: #2b2b2b;
+  --warning: rgb(255, 94, 0);
+  --pill-own-time: #00b7ff;
+}
+* {
+   font-family: 'Roboto', sans-serif;
+}
+.tittle {
+  font-family: 'Days One', sans-serif;
+  font-size: 22px;
+}
+.logo{
+  margin-bottom: 12px;
+}
+
+/* width */
+::-webkit-scrollbar {
+  width: 10px;
+}
+
+/* Track */
+::-webkit-scrollbar-track {
+  background-color: rgb(202, 202, 202);
+  box-shadow: inset 0 0 5px rgb(211, 211, 211);
+  border-radius: 10px;
+}
+
+/* Handle */
+::-webkit-scrollbar-thumb {
+  background: rgb(65, 65, 65);
+  border-radius: 10px;
+}
+
+/* Handle on hover */
+::-webkit-scrollbar-thumb:hover {
+  background: #000000;
+}
+
+body {
+  overflow-y: hidden;
+}
+
+.sidebar, main {
+  max-height: calc(100vh - 45px);
+  overflow-y: scroll;
+}
+
+.joblist {
+  overflow-y: scroll;
+}
+.sortable{
+  float: right
+}
+.sortableinactive{
+  float: right;
+  opacity: 0.2;
+}
+.table-headers, .table-row {
+  display: flex;
+  justify-content: space-between;
+}
+
+.popupmessage{
+  width: 60vw;
+  position: absolute;
+  top: 30px;
+  right: 10px;
+  z-index: 999999;
+}
+code {
+  padding: 5px;
+  background-color: #eeeeee;
+}
+.action-btn{
+  margin: 0px;
+  padding: 1px 2px;
+  cursor: pointer;
+}
+.action-btn:hover{
+  color: var(--warning-secondary);
+}
+.oi{
+  top:0px !important;
+}
+.pill-own {
+  padding: 3px 3px;
+  font-size: 10px;
+  color: var(--secondary);
+  border-radius: 3px;
+}
+.pill-big-own {
+  padding: 2px 2px;
+  font-size: 13px;
+  max-height: 23px;
+  color: var(--secondary);
+  border-radius: 3px;
+}
+.progress{
+  height: 5px;
+}
+.md-custom {
+  font-size: 21px;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.mybtn{
+  cursor: pointer;
+}
+.mybtn:hover{
+  background-color: rgb(218, 218, 218);
+}
+
+.pill-own span {
+  line-height: 12px;
+  font-size: 10px;
+  font-style: normal;
+}
+.IcoInButton{
+  font-size: 13px;
+  margin: 0 2px;
+}
+
+.json-editor {
+  height: 150px;
+}
+.card-responsive-title-container {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.card-responsive-name {
+  font-weight: 500;
+  line-height: 1.2;
+  font-size: 1.25rem;
+}
+.card-responsive-status-title {
+  color: grey;
+  font-size: 14px;
+  text-align: center;
+}
+.card-responsive-checkbox {
+  width: 22px;
+  height: 22px;
+}
+.material-icons-size {
+  font-size: 25px;
+}
+.pill-own-card {
+  display: flex;
+  align-items: center;
+  padding: 6px 10px
+}
+.pill-own-card-info {
+  font-size: 12px!important;
+  text-align: center;
+}
+@media (min-width: 768px) {
+  .col-md-10 {
+    flex: 0 0 70%;
+    max-width: 70%;
+  }
+  .col-md-2 {
+    flex: 0 0 30%;
+    max-width: 30%;
+  }
+}
+@media (min-width: 1150px) {
+  .col-md-10 {
+    flex: 0 0 80%;
+    max-width: 80%;
+  }
+  .col-md-2 {
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+}
+
+/* The sidebar menu */
+.sidebar-collapse {
+  height: 100%;
+  width: 0;
+  position: fixed;
+  z-index: 1;
+  top: 0;
+  left: 0;
+  background-color: white;
+  padding-top: 45px;
+  transition: 0.5s;
+}
+.sidebar-collapse a {
+  padding: 8px 8px 8px 32px;
+  text-decoration: none;
+  font-size: 25px;
+  color: #818181;
+  display: block;
+  transition: 0.3s;
+}
+.sidebar-collapse a:hover {
+  color: #f1f1f1;
+}
+.sidebar-collapse .closebtn {
+  position: absolute;
+  top: -10px;
+  right: 25px;
+  font-size: 36px;
+  margin-left: 50px;
+}
+.slidebar-container-button {
+  position: absolute;
+  left: 85%;
+}
+.openbtn {
+  font-size: 23px;
+  cursor: pointer;
+  background-color: #343a40;
+  color: white;
+  padding: 5px 0 0 0;
+  border: none;
+}