Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -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=
9 changes: 6 additions & 3 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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");
});
1 change: 1 addition & 0 deletions src/config/app.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

5 changes: 5 additions & 0 deletions src/config/app.keys.js
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 2 additions & 2 deletions src/config/database.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { Sequelize } = require("sequelize");
const {Sequelize} = require("sequelize");
const databaseSetup = require("./database.keys");

const sequelize = new Sequelize({
Expand All @@ -10,4 +10,4 @@ const sequelize = new Sequelize({
logging: databaseSetup.logging
});

module.exports = sequelize;
module.exports = {sequelize};
8 changes: 3 additions & 5 deletions src/config/database.keys.js
Original file line number Diff line number Diff line change
@@ -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,
}
11 changes: 0 additions & 11 deletions src/config/index.config.js

This file was deleted.

8 changes: 5 additions & 3 deletions src/config/init.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const databaseConfig = require("./database.config");
const {sequelize} = require("./database.config");
const port = require("./app.keys");

module.exports = {
databaseConfig
}
sequelize,
port,
};
20 changes: 10 additions & 10 deletions src/database/mysql.connection.js
Original file line number Diff line number Diff line change
@@ -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;
module.exports = sequelize;
4 changes: 4 additions & 0 deletions src/routes/api.routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;