api stuff is ... there

1 files changed, 10 insertions, 11 deletions

diff --git a/app/server/site.js b/app/server/site.js
index 44c4508..160c7b6 100644
--- a/app/server/site.js
+++ b/app/server/site.js
@@ -1,34 +1,31 @@
-require('dotenv').config()
 const express = require('express')
 const http = require('http')
 const path = require('path')
-const api = require('./util/api')
 const multer = require('multer')()
 const upload = require('./util/upload')
 const bodyParser = require('body-parser')
 // const multer = require('multer')
 // const upload = multer({ dest: 'uploads/' })
 
-export const app = express()
+export const app = new express()
 export const server = http.createServer(app)
-server.listen(process.env.EXPRESS_PORT, () => {
-  console.log('Cortex remote listening on http://localhost:' + server.address().port)
-})
 
 app.disable('x-powered-by')
 app.use(bodyParser.json())
 app.use(bodyParser.urlencoded({ extended: false }))
 app.use(express.query())
-app.use(express.static())
-app.use(express.static(path.join(__dirname, '../public'), { extensions: ['html'] }))
+app.use(express.static(path.join(__dirname, '../../public')))
 
-upload.init()
+export const io = require('socket.io').listen(server)
+console.log(io)
+import { api } from './util/api'
 
 const api_folders = api(app, 'folder')
 const api_files = api(app, 'file')
 const api_jobs = api(app, 'job')
 const api_tasks = api(app, 'task')
 
+upload.init()
 // app.use('/upload', require('./upload'))
 
 app.post('/folders/:id',
@@ -88,7 +85,9 @@ app.post('/folders/:id',
     })
   })
 
-app.get('/:module/:mode/', serve_index)
-app.get('/', serve_index)
+// require('./bridge')
 
 function serve_index(req, res) { res.sendFile(path.join(__dirname, '../../public', 'index.html')) }
+
+// app.get('/:module/:mode/', serve_index)
+app.get('/', serve_index)