diff --git a/package.json b/package.json index 8260738..92541fc 100644 --- a/package.json +++ b/package.json @@ -1,26 +1,39 @@ { "name": "adastra-api", "version": "1.0.0", + "description": "Ad Astra API", "private": true, - "author": "adastra", + "license": "UNLICENSED", + "author": "Solide Apps ", + "contributors": [ + "Julien Gautier " + ], "main": "server.js", "scripts": { - "dev": "nodemon server.js" + "start": "APP_ENV=production node ./server.js", + "dev": "APP_ENV=development node ./server.js", + "local": "APP_ENV=local nodemon ./server.js", + "test": "newman run ./tests/api-tests.postman.json -e ./tests/env-api-tests.postman.json" + }, + "engines": { + "node": "^16.20.2 || ^18.19.1 || ^20.11.1" }, "dependencies": { + "@sendgrid/mail": "^8.1.5", "bcryptjs": "^2.4.3", "colors": "^1.4.0", "dotenv": "^16.0.3", "express": "^4.18.2", - "jsonwebtoken": "^8.5.1", + "jsonwebtoken": "^9.0.2", "morgan": "^1.10.0", - "mysql2": "^2.3.3", - "nodemon": "^2.0.20", + "mysql2": "^3.14.3", + "nodemon": "^3.1.10", "sequelize": "^6.26.0", "slugify": "^1.6.5" }, "devDependencies": { - "eslint": "^8.29.0", + "@eslint/js": "^9.0.0", + "eslint": "^9.0.0", "prettier": "^2.8.0" } -} +} \ No newline at end of file diff --git a/routes copy/articles.js b/routes copy/articles.js deleted file mode 100644 index e5c04c4..0000000 --- a/routes copy/articles.js +++ /dev/null @@ -1,30 +0,0 @@ -const express = require("express"); -const router = express.Router(); -const { - getArticle, - getArticles, - createArticle, - articlesFeed, - addFavoriteArticle, - deleteFavoriteArticle, - deleteArticle, - updateArticle, -} = require("../controllers/articles"); -const { protect } = require("../middlewares/auth"); - -router - .route("/articles") - .get(protect, getArticles) - .post(protect, createArticle); -router.route("/articles/feed").get(protect, articlesFeed); -router - .route("/articles/:slug") - .get(protect, getArticle) - .put(protect, updateArticle) - .delete(protect, deleteArticle); -router - .route("/articles/:slug/favorite") - .post(protect, addFavoriteArticle) - .delete(protect, deleteFavoriteArticle); - -module.exports = router; diff --git a/routes copy/comments.js b/routes copy/comments.js deleted file mode 100644 index 322bea3..0000000 --- a/routes copy/comments.js +++ /dev/null @@ -1,23 +0,0 @@ -const express = require("express"); -const router = express.Router(); - -const { - getComment, - getComments, - createComment, - deleteComment, -} = require("../controllers/comments"); - -const { protect } = require("../middlewares/auth"); - -router - .route("/articles/:slug/comments") - .get(protect, getComments) - .post(protect, createComment); - -router - .route("/articles/:slug/comments/:id") - .get(protect, getComment) - .delete(protect, deleteComment); - -module.exports = router; diff --git a/routes copy/profiles.js b/routes copy/profiles.js deleted file mode 100644 index d6a558b..0000000 --- a/routes copy/profiles.js +++ /dev/null @@ -1,16 +0,0 @@ -const express = require("express"); -const router = express.Router(); -const { - getProfile, - followUser, - unfollowUser, -} = require("../controllers/profiles"); -const { protect } = require("../middlewares/auth"); - -router.route("/profiles/:username").get(protect, getProfile); -router - .route("/profiles/:username/follow") - .post(protect, followUser) - .delete(protect, unfollowUser); - -module.exports = router; diff --git a/routes copy/tags.js b/routes copy/tags.js deleted file mode 100644 index 5157a6d..0000000 --- a/routes copy/tags.js +++ /dev/null @@ -1,10 +0,0 @@ -const express = require("express"); -const router = express.Router(); - -const { getTags } = require("../controllers/tags"); - -const { protect } = require("../middlewares/auth"); - -router.route("/tags/").get(getTags); - -module.exports = router; diff --git a/routes copy/users.js b/routes copy/users.js deleted file mode 100644 index 9bf832e..0000000 --- a/routes copy/users.js +++ /dev/null @@ -1,16 +0,0 @@ -const express = require("express"); -const router = express.Router(); -const { - createUser, - loginUser, - getCurrentUser, - updateUser, -} = require("../controllers/users"); -const { protect } = require("../middlewares/auth"); - -router.post("/users", createUser); -router.post("/users/login", loginUser); - -router.route("/user").get(protect, getCurrentUser).put(protect, updateUser); - -module.exports = router; diff --git a/server.js b/server.js index 7d37ec2..3527a02 100644 --- a/server.js +++ b/server.js @@ -1,10 +1,13 @@ var appEnv = process.env.APP_ENV; +console.log(`Env: ${appEnv}`); if (appEnv == undefined) { appEnv = 'development'; } +const dotenv = require("dotenv"); +dotenv.config({ path: `.env.${appEnv}` }); + const express = require("express"); const sequelize = require("./util/database"); -const dotenv = require("dotenv"); const morgan = require("morgan"); const colors = require("colors"); const { errorHandler } = require("./middlewares/errorHandler"); @@ -15,7 +18,6 @@ const Article = require("./models/Article"); const Tag = require("./models/Tag"); const Comment = require("./models/Comment"); -dotenv.config({ path: `.env.${appEnv}` }); const app = express();