From a8127cf00aef8392af468c1e8ada4959823f89b9 Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Tue, 6 Jul 2021 13:11:27 +0200
Subject: [PATCH] re-structure the project

---
 app.js                                   | 4 ++--
 config/config.js                         | 6 ++++--
 {routes => config}/dbconn.js             | 2 +-
 {routes => config}/mailer.js             | 2 +-
 {routes => functions}/gitlab.js          | 0
 {routes => functions}/helpers.js         | 0
 {routes => functions}/methods.js         | 2 +-
 routes/{routes-project.js => project.js} | 6 +++---
 8 files changed, 12 insertions(+), 10 deletions(-)
 rename {routes => config}/dbconn.js (94%)
 rename {routes => config}/mailer.js (89%)
 rename {routes => functions}/gitlab.js (100%)
 rename {routes => functions}/helpers.js (100%)
 rename {routes => functions}/methods.js (97%)
 rename routes/{routes-project.js => project.js} (98%)

diff --git a/app.js b/app.js
index 996640b..55379ad 100644
--- a/app.js
+++ b/app.js
@@ -30,7 +30,7 @@ app.use(session(
     {
         resave: true,
         saveUninitialized: true,
-        secret: 'thisisasecret-thisisasecret-thisisasecret'
+        secret: config.app.sessionSecret
     }
 ))
 app.use(passport.initialize())
@@ -55,7 +55,7 @@ app.use(function(req, res, next) {
     next()
 })
   
-require('./routes/routes-project')(app, config, passport)
+require('./routes/project')(app, config, passport)
   
 // Handle 404
 app.use(function (req, res, next) {
diff --git a/config/config.js b/config/config.js
index a8bbdb3..7fa7d72 100644
--- a/config/config.js
+++ b/config/config.js
@@ -2,7 +2,8 @@ module.exports = {
   development: {
     app: {
       name: 'Project Page Manager',
-      port: process.env.PORT || 8888
+      port: process.env.PORT || 8888,
+      sessionSecret: 'thisisasecret-thisisasecret-thisisasecret'
     },
     passport: {
       strategy: 'saml',
@@ -37,7 +38,8 @@ module.exports = {
   testing: {
     app: {
       name: 'Project Page Manager',
-      port: process.env.PORT || 8888
+      port: process.env.PORT || 8888,
+      sessionSecret: 'thisisasecret-thisisasecret-thisisasecret'
     },
     passport: {
       strategy: 'saml',
diff --git a/routes/dbconn.js b/config/dbconn.js
similarity index 94%
rename from routes/dbconn.js
rename to config/dbconn.js
index df6b992..e79d5bc 100644
--- a/routes/dbconn.js
+++ b/config/dbconn.js
@@ -1,7 +1,7 @@
 const mysql = require('mysql')
 
 var env = process.env.NODE_ENV || 'testing';
-const config = require('../config/config')[env]
+const config = require('./config')[env]
 
 // ==== USER ACOOUNT DB CONNECTION ====
 var userConnection = mysql.createConnection({
diff --git a/routes/mailer.js b/config/mailer.js
similarity index 89%
rename from routes/mailer.js
rename to config/mailer.js
index 2c51bd7..d1e59ff 100644
--- a/routes/mailer.js
+++ b/config/mailer.js
@@ -1,7 +1,7 @@
 const nodemailer = require('nodemailer')
 
 var env = process.env.NODE_ENV || 'testing';
-const config = require('../config/config')[env]
+const config = require('./config')[env]
 
 var smtpTransport = nodemailer.createTransport({
     host: config.mailer.host,
diff --git a/routes/gitlab.js b/functions/gitlab.js
similarity index 100%
rename from routes/gitlab.js
rename to functions/gitlab.js
diff --git a/routes/helpers.js b/functions/helpers.js
similarity index 100%
rename from routes/helpers.js
rename to functions/helpers.js
diff --git a/routes/methods.js b/functions/methods.js
similarity index 97%
rename from routes/methods.js
rename to functions/methods.js
index 330df56..e5d9fb5 100644
--- a/routes/methods.js
+++ b/functions/methods.js
@@ -1,4 +1,4 @@
-const dbconn = require('./dbconn');
+const dbconn = require('../config/dbconn');
 
 var methods = {
     // test method
diff --git a/routes/routes-project.js b/routes/project.js
similarity index 98%
rename from routes/routes-project.js
rename to routes/project.js
index 1dff948..f372af3 100644
--- a/routes/routes-project.js
+++ b/routes/project.js
@@ -1,6 +1,6 @@
 //const SamlStrategy = require('passport-saml').Strategy
-const methods = require('./methods')
-const gitlab = require('./gitlab')
+const methods = require('../functions/methods')
+const gitlab = require('../functions/gitlab')
 // pwd encryption
 //const bcrypt = require('bcryptjs');
 //const saltRounds = 10;
@@ -9,7 +9,7 @@ const gitlab = require('./gitlab')
 const async = require('async')
 //const crypto = require('crypto')
 //const mailer = require('./mailer')
-const helpers = require('./helpers')
+const helpers = require('../functions/helpers')
 const pictSizeLimit = 1000000 // 1 MB
 
 module.exports = function (app) {
-- 
GitLab