diff --git a/backend/src/app.js b/backend/app.js similarity index 100% rename from backend/src/app.js rename to backend/app.js diff --git a/backend/src/config/config.js b/backend/config/config.js similarity index 100% rename from backend/src/config/config.js rename to backend/config/config.js diff --git a/backend/src/config/db.config.js b/backend/config/db.config.js similarity index 100% rename from backend/src/config/db.config.js rename to backend/config/db.config.js diff --git a/backend/src/config/env.js b/backend/config/env.js similarity index 100% rename from backend/src/config/env.js rename to backend/config/env.js diff --git a/backend/src/controller/authController.js b/backend/controller/authController.js similarity index 100% rename from backend/src/controller/authController.js rename to backend/controller/authController.js diff --git a/backend/src/controller/testController.js b/backend/controller/testController.js similarity index 100% rename from backend/src/controller/testController.js rename to backend/controller/testController.js diff --git a/backend/src/model/role.model.js b/backend/model/role.model.js similarity index 100% rename from backend/src/model/role.model.js rename to backend/model/role.model.js diff --git a/backend/src/model/user.model.js b/backend/model/user.model.js similarity index 100% rename from backend/src/model/user.model.js rename to backend/model/user.model.js diff --git a/backend/package.json b/backend/package.json index 34e5edcf328627082ef02ab3eb0fa94d280eece6..fe61451cc9aaba1b62199245b1fa10cd2140bc62 100644 --- a/backend/package.json +++ b/backend/package.json @@ -4,7 +4,7 @@ "description": "", "main": "index.js", "scripts": { - "start": "node src/app.js", + "start": "node app.js", "test": "echo \"Error: no test specified\" && exit 1" }, "keywords": [], diff --git a/backend/src/router/router.js b/backend/router/router.js similarity index 85% rename from backend/src/router/router.js rename to backend/router/router.js index 44632f6eb0e65db8de7878bbc91bd970e5237792..21eb47b044639ddc8c9da3ae4030681359cce2b1 100644 --- a/backend/src/router/router.js +++ b/backend/router/router.js @@ -9,7 +9,4 @@ module.exports = function(app) { app.get('/api/test/admin', [authJwt.verifyToken, authJwt.isAdmin], testController.adminContent); app.get('/api/test/member', [authJwt.verifyToken], testController.memberContent); - // Sample Hello - var hello = require('../controller/hello') - app.route('/hello').get(hello.index) } \ No newline at end of file diff --git a/backend/src/router/verifyJwtToken.js b/backend/router/verifyJwtToken.js similarity index 100% rename from backend/src/router/verifyJwtToken.js rename to backend/router/verifyJwtToken.js diff --git a/backend/src/router/verifySignUp.js b/backend/router/verifySignUp.js similarity index 100% rename from backend/src/router/verifySignUp.js rename to backend/router/verifySignUp.js diff --git a/backend/src/controller/hello.js b/backend/src/controller/hello.js deleted file mode 100644 index 4fd79ffdc1e9c7bf66bdf50f4230687dc8992d8b..0000000000000000000000000000000000000000 --- a/backend/src/controller/hello.js +++ /dev/null @@ -1,21 +0,0 @@ -'use strict' -var pool = require('../config/db.config.js'); -exports.index = (req, res) => { - pool.connect((err, client, done) => { - if (err) throw err - client.query('SELECT NOW()', (err, res) => { - done() - if (err) { - console.log(err.stack) - } else { - console.log(res.rows[0].now) - } - }) - }); - res.send( - [{ - title: "Hello Cat!", - description: "Hi there! How are you?" - }] - ) - }; \ No newline at end of file