Update app.js

1 files changed, 30 insertions, 8 deletions

diff --git a/app.js b/app.js
index f6a6122..413114c 100644
--- a/app.js
+++ b/app.js
@@ -8,7 +8,6 @@ const fs = require('fs')
 const path = require('path')
 const { readdirSync } = require('fs')
 const session = require('./src/session')()
-const routesConfig = require('./config/routes')
 const mime = {
     html: 'text/html',
     txt: 'text/plain',
@@ -22,6 +21,7 @@ const mime = {
     ico: 'image/ico',
     svg: 'image/svg+xml',
     js: 'application/javascript',
+    json: 'application/json',
     mp4: 'video/mp4',
     webm: 'video/webm',
     ttf: 'application/x-font-truetype',
@@ -41,6 +41,7 @@ const assetDir = () => {
         .map(dir => dir.name)
 }
 
+// ! Setup later
 /*
 const limiter = rateLimit({
     windowMS: 30 * 1000,
@@ -54,9 +55,6 @@ const sitemap = require('./src/sitemap')
 const logger = require('./src/logger')({
     baseURL: process.env.baseURL
 })
-const controller = require('./src/controller')({
-    baseURL: process.env.baseURL
-})
 
 const createLog = (req, res, next) => {
     const { cookies } = req
@@ -166,13 +164,28 @@ const handleRoutes = (req, res, next) => {
     }
 }
 
-const routes = routesConfig({
+const routeData = {
     app: app,
     validateCookie: validateCookie,
-    log: createLog,
+    //log: createLog,
     mime: mime,
     session: session
+}
+
+const routeConfigData = routeData
+routeConfigData.logger = logger
+
+const controller = require('./src/controller')({
+    baseURL: process.env.baseURL,
+    app: app,
+    validateCookie: validateCookie,
+    log: createLog,
+    mime: mime,
+    session: session,
+    logger: logger,
+    mime: mime
 })
+
 app.route(/(.*)/)
     .get(validateCookie, createLog, (req, res) => {
         this.path = {
@@ -194,26 +207,33 @@ app.route(/(.*)/)
                     })
                     break
                 case 'sitemap.xml':
+                    // ! Output as XML
                     const data = sitemap({baseURL: process.env.baseURL})
                     data.Sitemap().then(output => {
                         res.send(output)
                     })
                     break
                 case 'rss':
+                    // ! Weird output
+                    // ! Move to `routes`
                     rss({
                         baseURL: process.env.baseURL
                     })
                     break
+                case 'devlog':
+                    break
                 case 'deverror':
                     break
                 default:
-                    const response = controller.Init({
+                    const temp = controller.Init({
                         req: req,
                         res: res,
                         path: this.path.string,
-                        baseURL: process.env.baseURL
+                        baseURL: process.env.baseURL,
+                        routeData: routeConfigData
                     })
 
+                    const response = temp.template
                     res.send(response)
                     break
             }
@@ -223,10 +243,12 @@ app.route(/(.*)/)
     .put(createLog, (req, res) => {})
     .delete(createLog, (req, res) => {})
     .patch(createLog, (req, res) => {})
+    /*
     .all(createLog, (req, res) => {
         res.set('Content-Type', mime.html)
         res.status(404).send('You are not allowed to access this resource')
     })
+    */
 
 app.listen(process.env.PORT, () => {
     logger.Info(`Listening on: ${process.env.baseURL}`)