Commit 9641a67e authored by Colin S's avatar Colin S

Moved all backend code into the express directory.

parents edd272aa 54ae7838
......@@ -16,8 +16,8 @@ module.exports = function(grunt) {
reporter: 'spec'
},
src: [
'tests/express/**/*Spec.js',
'tests/express/**/*spec.js',
'express/tests/**/*Spec.js',
'express/tests/**/*spec.js',
]
}
}
......
......@@ -4,7 +4,7 @@ require 'compass/import-once/activate'
# Set this to the root of your project when deployed:
http_path = "/"
css_dir = "public/stylesheets"
sass_dir = "src/sass"
sass_dir = "sass"
images_dir = "public/images"
javascripts_dir = "public/javascripts"
......
......@@ -20,7 +20,7 @@ app.use(bodyParser.json());
app.use(bodyParser.urlencoded());
app.use(cookieParser());
app.use(require('node-compass')({mode: 'expanded'}));
app.use(express.static(path.join(__dirname, 'public')));
app.use(express.static(path.join(__dirname, '../public')));
app.use('/', routes);
app.use('/users', users);
......
var should = require('should');
var Post = require('../../../src/js/Classes/Post.js');
var Post = require('../../classes/Post.js');
suite("A Post", function () {
......
var Profile = require('../../../src/js/Classes/Profile.js');
var Profile = require('../../classes/Profile.js');
var should = require('should');
suite("A Profile", function () {
......
var Tag = require('../../../src/js/Classes/Tag.js');
var Tag = require('../../classes/Tag.js');
var should = require('should');
suite("A Tag", function () {
......
......@@ -3,7 +3,7 @@
"version": "0.0.1",
"private": true,
"scripts": {
"start": "node ./bin/www",
"start": "node ./express/bin/www",
"test": "grunt test"
},
"dependencies": {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment