From e1fbe580765db37e289bdc085bb5968a487b9654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mois=C3=A9s=20Masis?= Date: Mon, 28 Nov 2022 14:49:25 +0000 Subject: [PATCH] Pending changes exported from your codespace --- .env.example | 16 ++++++++++++++++ src/app.js | 9 ++++++--- src/config/app.config.js | 1 + src/config/app.keys.js | 5 +++++ src/config/database.config.js | 4 ++-- src/config/database.keys.js | 8 +++----- src/config/index.config.js | 11 ----------- src/config/init.js | 8 +++++--- src/database/mysql.connection.js | 20 ++++++++++---------- src/routes/api.routes.js | 4 ++++ 10 files changed, 52 insertions(+), 34 deletions(-) create mode 100644 .env.example delete mode 100644 src/config/index.config.js diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..85af7de --- /dev/null +++ b/.env.example @@ -0,0 +1,16 @@ +## Server +PORT= + +## Database +DATABASE_HOST= +DATABASE_USERNAME= +DATABASE_PASSWORD= +DATABASE= + +## Tokens +TOKEN_SECRET= + +## Service Cloudinary +CLOUDINARY_NAME= +CLOUDINARY_API_KEY= +CLOUDINARY_API_SECRET= \ No newline at end of file diff --git a/src/app.js b/src/app.js index 48deca6..c5b7c2d 100644 --- a/src/app.js +++ b/src/app.js @@ -2,10 +2,13 @@ const bodyParser = require("body-parser"); const express = require("express"); const passport = require("passport"); const dotenv = require("dotenv"); +const path = require('path') const app = express(); -dotenv.config(); +const {port} = require('./config/init') + +dotenv.config({ path: path.resolve(__dirname, '../.env') }); app.use(express.urlencoded({extended:false})); app.use(bodyParser.json()); @@ -14,7 +17,7 @@ app.use(passport.session()); app.use("/api", require("./routes/api.routes")); -app.listen(process.env.PORT, () => { - console.log("Server started on port ", process.env.PORT); +app.listen(port, () => { + console.log("Server started on port ", port); require("./database/mysql.connection"); }); diff --git a/src/config/app.config.js b/src/config/app.config.js index e69de29..8b13789 100644 --- a/src/config/app.config.js +++ b/src/config/app.config.js @@ -0,0 +1 @@ + diff --git a/src/config/app.keys.js b/src/config/app.keys.js index e69de29..f6f4b1b 100644 --- a/src/config/app.keys.js +++ b/src/config/app.keys.js @@ -0,0 +1,5 @@ +let port; +if (process.env.NODE_ENV === 'development')port = 8080; +if (process.env.NODE_ENV === 'production')port = process.env.PORT; + +module.exports = port; \ No newline at end of file diff --git a/src/config/database.config.js b/src/config/database.config.js index a46fc23..6a1cd28 100644 --- a/src/config/database.config.js +++ b/src/config/database.config.js @@ -1,4 +1,4 @@ -const { Sequelize } = require("sequelize"); +const {Sequelize} = require("sequelize"); const databaseSetup = require("./database.keys"); const sequelize = new Sequelize({ @@ -10,4 +10,4 @@ const sequelize = new Sequelize({ logging: databaseSetup.logging }); -module.exports = sequelize; \ No newline at end of file +module.exports = {sequelize}; \ No newline at end of file diff --git a/src/config/database.keys.js b/src/config/database.keys.js index 5b668a4..53477a7 100644 --- a/src/config/database.keys.js +++ b/src/config/database.keys.js @@ -1,10 +1,8 @@ -const { database } = require("./index.config"); - module.exports = { database: process.env.DATABASE, - username: process.env.USERNAME, - host: process.env.HOST, - password: process.env.PASSWORD, + username: process.env.DATABASE_USERNAME, + host: process.env.DATABASE_HOST, + password: process.env.DATABASE_PASSWORD, dialect: "mysql", logging: false, } \ No newline at end of file diff --git a/src/config/index.config.js b/src/config/index.config.js deleted file mode 100644 index 18725aa..0000000 --- a/src/config/index.config.js +++ /dev/null @@ -1,11 +0,0 @@ -process.env.PORT = process.env.PORT || 3306; - -process.env.HOST = process.env.HOST || 'bl43zms6b77ogo59tjoa-mysql.services.clever-cloud.com'; - -process.env.USERNAME = 'uoanjs5ogdrsilmo'; - -process.env.PASSWORD = 'rHBKCOxPcIUeuN9vxQId'; - -process.env.DATABASE = 'bl43zms6b77ogo59tjoa'; - -process.env.SECRET = 'miclavesecretauwu'; diff --git a/src/config/init.js b/src/config/init.js index 07a762c..d3cc4ff 100644 --- a/src/config/init.js +++ b/src/config/init.js @@ -1,5 +1,7 @@ -const databaseConfig = require("./database.config"); +const {sequelize} = require("./database.config"); +const port = require("./app.keys"); module.exports = { - databaseConfig -} \ No newline at end of file + sequelize, + port, +}; diff --git a/src/database/mysql.connection.js b/src/database/mysql.connection.js index f091ce4..c26f44e 100644 --- a/src/database/mysql.connection.js +++ b/src/database/mysql.connection.js @@ -1,12 +1,12 @@ -const { databaseConfig } = require("../config/init"); +const { sequelize } = require("../config/init"); -databaseConfig - .sync({ force: false }) - .then(() => { - console.log("Database connection"); - }) - .catch((err) => { - console.log("Database connection error", err); - });  +sequelize + .sync({ force: false }) + .then(() => { + console.log("Database connection"); + }) + .catch((err) => { + console.log("Database connection error :", err); + }); -module.exports = databaseConfig; \ No newline at end of file +module.exports = sequelize; diff --git a/src/routes/api.routes.js b/src/routes/api.routes.js index 4dc8e90..363b652 100644 --- a/src/routes/api.routes.js +++ b/src/routes/api.routes.js @@ -50,4 +50,8 @@ app.delete('/contact/:id', DeleteContact); //Login app.post('/login', LoginUserPost); +app.get("/help",(req,res)=>{ + res.send("hello") +}) + module.exports = app; \ No newline at end of file