@misterzik/espressojs 3.1.12 → 3.1.13

package/index.js

@@ -8,25 +8,28 @@
  */
 
 const fs = require("fs");
+require("dotenv").config();
 const express = require("express");
 const app = express();
 const cfg = require("./server");
-
-require("dotenv").config();
-
 const configBuffer = fs.readFileSync("./config.json"),
   configJSON = configBuffer.toString(),
   configData = JSON.parse(configJSON);
 
-const _path = require("path"),
-  _cors = require("cors"),
-  _compr = require("compression"),
-  _favicon = require("serve-favicon"),
-  _static = require("serve-static"),
-  _port = configData.port || process.env.PORT || cfg.port,
-  _routes = require("./server/routes/index");
+const Path = require("path"),
+  Cors = require("cors"),
+  Compression = require("compression"),
+  Favicon = require("serve-favicon"),
+  Static = require("serve-static"),
+  Port = configData.port || process.env.PORT || cfg.port,
+  Routes = require("./routes/index");
 
 const mongoose = require("mongoose");
+const setCustomCacheControl = (res, path) => {
+  if (Static.mime.lookup(path) === "text/html") {
+    res.setHeader("Cache-Control", "public, max-age=0");
+  }
+};
 
 if (cfg.mongo_isEnabled == true) {
   let hasPort, hasUri;
@@ -40,7 +43,6 @@ if (cfg.mongo_isEnabled == true) {
   } else {
     hasUri = cfg.mongo.uri;
   }
-
   const url = `mongodb+srv://${hasUri + hasPort + cfg.mongo.db}`;
   mongoose.Promise = global.Promise;
   mongoose
@@ -53,14 +55,13 @@ if (cfg.mongo_isEnabled == true) {
     .catch((err) => console.error(err));
 }
 
-app.use(_compr());
-app.use(_cors());
+app.use(Compression());
+app.use(Cors());
 app.use(express.urlencoded({ extended: false }));
 app.use(express.json());
-app.use(_favicon(_path.join(__dirname, "./public", "favicon.ico")));
-
+app.use(Favicon(Path.join("./public", "favicon.ico")));
 app.use(
-  _static(_path.join("./public"), {
+  Static(Path.join("./public"), {
     maxAge: "1d",
     setHeaders: setCustomCacheControl,
     etag: true,
@@ -68,13 +69,6 @@ app.use(
   })
 );
 
-function setCustomCacheControl(res, path) {
-  if (_static.mime.lookup(path) === "text/html") {
-    res.setHeader("Cache-Control", "public, max-age=0");
-  }
-}
-
-_routes(app);
-app.listen(_port);
-
+Routes(app);
+app.listen(Port);
 module.exports = app;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@misterzik/espressojs",
-    "version": "3.1.12",
+    "version": "3.1.13",
     "description": "EspressoJS / Espresso It's your one-stop Express Configuration Boiler-Plate, plug-and-play configuration to get you started with hosting your front-end projects. This is a barebones configuration with the option to scale up using MongoDB.",
     "main": "index.js",
     "scripts": {

package/{server/routes → routes}/api/index.js

@@ -7,13 +7,13 @@
  */
 
 const express = require("express");
-const cfg = require("./../../../server");
-const router = express.Router();
 const axios = require("axios");
+const router = express.Router();
+const configuration = require("../../server");
 
 const getAPI = (req, res) => {
   axios
-    .get(cfg.swapi.uri, cfg.swapi.configs)
+    .get(configuration.swapi.uri, configuration.swapi.configs)
     .then(function (response) {
       if (response.status == 200) {
         res.json(response.data);
@@ -26,7 +26,7 @@ const getAPI = (req, res) => {
 
 const getItem = (req, res, params) => {
   axios
-    .get(cfg.swapi.uri + "/" + params, cfg.swapi.configs)
+    .get(configuration.swapi.uri + "/" + params, configuration.swapi.configs)
     .then(function (response) {
       if (response.status == 200) {
         res.json(response.data);
@@ -39,7 +39,10 @@ const getItem = (req, res, params) => {
 
 const getItemId = (req, res, params, paramsId) => {
   axios
-    .get(cfg.swapi.uri + params + "/" + paramsId + "/", cfg.swapi.configs)
+    .get(
+      configuration.swapi.uri + params + "/" + paramsId + "/",
+      configuration.swapi.configs
+    )
     .then(function (response) {
       if (response.status == 200) {
         res.json(response.data);
@@ -49,15 +52,12 @@ const getItemId = (req, res, params, paramsId) => {
     })
     .catch((err) => res.send(err));
 };
-
 router.get("/v1/", (req, res) => {
   getAPI(req, res);
 });
-
 router.get("/v1/:item", (req, res, next) => {
   getItem(req, res, req.params.item);
 });
-
 router.get("/v1/:item/:itemId", (req, res, next) => {
   getItemId(req, res, req.params.item, req.params.itemId);
 });

package/{server/routes → routes}/db/index.js

@@ -2,13 +2,15 @@
  * EspressoJS - Hippie's Fav Server Plate
  * Powered by Vimedev.com Labs
  * ---
- * Client Model -- Basic Clients Collection - API CRUD
+ * Client Model - WIP
+ * -- 
+ * Basic Clients Collection - API CRUD
  * ---
  * @param {*} app - Vimedev.com Labs
  */
 
 module.exports = (app) => {
-  const clientRouter = require("../../controllers/client/client.controller.js");
+  const clientRouter = require("../../server/controllers/client/client.controller.js");
   const preFix = "/api/clients/",
     url = preFix;
 

package/{server/routes → routes}/index.js

@@ -8,20 +8,20 @@
  */
 
 module.exports = (app) => {
-  const cfg = require("./../../server"),
-    path = require("path"),
+  const configuration = require("../server"),
+    Path = require("path"),
     api = require("./api");
 
   app.get("/", function (res) {
-    res.sendFile("index.html", { root: path.join("./public") });
+    res.sendFile("index.html", { root: Path.join("./public") });
   });
 
-  if (cfg.swapi_isEnabled == true) {
+  if (configuration.swapi_isEnabled == true) {
     app.use("/api", api);
   }
 
   require("./db")(app);
-  require("./../utils/global.message")(app);
+  require("../server/utils/global.message")(app);
 
   app.use(function (req, res, next) {
     res.status(404).send("404 - Sorry can't find that!");

package/server/controllers/client/client.controller.js

@@ -2,7 +2,7 @@
  * EspressoJS - Hippie's Fav Server Plate
  * Powered by Vimedev.com Labs
  * ---
- * MongoDB Client Controller
+ * MongoDB Client Controller - WIP
  */
 
 const Client = require("../../models/client.model.js");

package/webpack.config.js

@@ -1,51 +0,0 @@
-/**
- * EspressoJS - Powered by Vimedev.com Labs
- * ---
- * Basic Web-Pack Configuration Declarations
- * ---
- *
- */
-
-const webpack = require("webpack");
-const path = require("path");
-const TerserPlugin = require("terser-webpack-plugin");
-
-/**
- * EspressoJS - Powered by Vimedev.com Labs
- * ---
- * Configuration Usage
- */
-const config = {
-  context: path.resolve(__dirname, "./public/assets/js/jQuery"),
-  entry: {
-    app: "./index.js",
-    vendor: "./other-file.js",
-  },
-  output: {
-    filename: "[name].bundle.js",
-    path: path.resolve(__dirname, "./public/assets/src"),
-  },
-  plugins: [
-    new webpack.ProvidePlugin({
-      $: "jquery",
-      jquery: "jQuery",
-      "window.jQuery": "jquery",
-    }),
-  ],
-  module: {
-    rules: [
-      {
-        test: /jquery[\\\/]src[\\\/]selector\.js$/,
-        loader: "amd-define-factory-patcher-loader",
-      },
-      {
-        test: /\.js$/,
-        exclude: /(node_modules|bower_components)/,
-        use: {
-          loader: "babel-loader",
-        },
-      },
-    ],
-  },
-};
-module.exports = config;