Skip to content

Commit

Permalink
Merge pull request #28 from misterzik/development
Browse files Browse the repository at this point in the history
(Enhance)Struct:Infra-v3.2.1
  • Loading branch information
misterzik authored Jun 24, 2023
2 parents d00a1b2 + 4dc8584 commit 6ebb94f
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 23 deletions.
4 changes: 3 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.github
demo
demo
routes/db
routes/api
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@misterzik/espressojs",
"version": "3.2.0",
"version": "3.2.1",
"description": "EspressoJS Introducing Espresso.JS, your ultimate Express configuration starting point and boilerplate. With its simplicity and lack of opinionation, EspressoJS offers plug-and-play configurations built on top of Express.",
"main": "index.js",
"scripts": {
Expand Down
20 changes: 10 additions & 10 deletions routes/api/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ const express = require("express");
const router = express.Router();
const configuration = require("../../server");

// const { getAPI, getItem, getItemId } = require("../utils");
// 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);
// });
const { getAPI, getItem, getItemId } = require("../utils");
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);
});

module.exports = { router, configuration };
6 changes: 3 additions & 3 deletions routes/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

const Path = require("path");
const configuration = require("../server");
const api = require("./api");
const db = require("./db");
const api = require(path.join(rootDir, "routes", "api.js"));
const db = require(path.join(rootDir, "routes", "db.js"));

module.exports = (app) => {
app.get("/", function (res) {
Expand All @@ -22,7 +22,7 @@ module.exports = (app) => {
app.use("/api", api);
}
if (configuration.mongo_isEnabled === true) {
db(app);
app.use("/api", db);
}
app.use(function (req, res, next) {
res.status(404).send("404 - Sorry can't find that!");
Expand Down

0 comments on commit 6ebb94f

Please sign in to comment.