5 files changed, 33 insertions, 33 deletions

diff --git a/app/server/bridge.js b/app/server/bridge.js
index 6168580..9405dad 100644
--- a/app/server/bridge.js
+++ b/app/server/bridge.js
@@ -1,7 +1,5 @@
-import { server } from './site'
-import socket_io from 'socket.io'
+import { server, io } from './site'
 
-const io = socket_io(server)
 let relay_connected = false
 
 export const client = io.of('/client')
diff --git a/app/server/db/models.js b/app/server/db/models.js
index 2108148..1ca87d0 100644
--- a/app/server/db/models.js
+++ b/app/server/db/models.js
@@ -1,8 +1,6 @@
 
-let fs = require('fs')
 let model = require('./model')
 let bookshelf = require("./bookshelf").bookshelf
-import bridge from '../bridge'
 
 let Folder = bookshelf.Model.extend({
   tableName: 'folders',
@@ -25,29 +23,24 @@ module.exports = {
   folder: model('folder', Folder, {
     fields: "name username description".split(" "),
     afterCreate: (folder) => {
-      fs.mkdir('data/' + folder.get('id') + '/', function(){
-        console.log('created folder', folder.get('id'), folder.get('name'))
-      })
+      console.log('created folder', folder.get('id'), folder.get('name'))
     }
   }),
   file: model('file', File, {
     fields: "folder_id username name mime type duration analysis size processed generated".split(" "),
     afterCreate: (file) => {
-      bridge.processFiles()
+      console.log('created file')
+      // bridge.processFiles()
     }
   }),
   job: model('job', Job, {
     fields: "name username completed tool".split(" "),
   }),
   task: model('task', Task, {
-    fields: "job_id username completed processing tool content_file_id style_file_id output_file_id alpha iterations stdout stderr".split(" "),
+    fields: "job_id username completed processing tool alpha iterations stdout stderr".split(" "),
     afterCreate: (task) => {
-      bridge.processTasks()
-    },
-    hasOne: {
-      content_file: File,
-      style_file: File,
-      output_file: File,
+      console.log('created task')
+      // bridge.processTasks()
     }
   }),
 }
diff --git a/app/server/index.js b/app/server/index.js
index e4bafb0..1bfd9a4 100644
--- a/app/server/index.js
+++ b/app/server/index.js
@@ -1,2 +1,6 @@
-import * as site from './site'
+import { server, app } from './site'
 import * as bridge from './bridge'
+
+server.listen(process.env.EXPRESS_PORT, () => {
+  console.log('Cortex remote listening on http://localhost:' + server.address().port)
+})
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)
diff --git a/app/server/util/upload.js b/app/server/util/upload.js
index 9e15748..0f71196 100644
--- a/app/server/util/upload.js
+++ b/app/server/util/upload.js
@@ -1,12 +1,10 @@
+// called... twice?
+require('dotenv').config()
 
 var knox = require('knox')
 var uuid = require('uuid/v1')
 
-var s3 = knox.createClient({
-  key: process.env.S3_KEY,
-  secret: process.env.S3_SECRET,
-  bucket: process.env.S3_BUCKET,
-})
+var s3;
 
 var acceptableuploadTypes = {
   'image/gif': 'gif',
@@ -17,6 +15,14 @@ var acceptableuploadTypes = {
 
 module.exports = {}
 
+module.exports.init = function(){
+  s3 = knox.createClient({
+    key: process.env.S3_KEY,
+    secret: process.env.S3_SECRET,
+    bucket: process.env.S3_BUCKET,
+  })
+}
+
 module.exports.client = function(){
   return s3
 }