$scope.uploads: {{uploads | json }}
diff --git a/config/config.json b/config/config.json
index ee1081f..7fff9b2 100644
--- a/config/config.json
+++ b/config/config.json
@@ -20,10 +20,10 @@
"hostname": "localhost",
"port": 5001
},
- "staticDir": "/dist",
- "publicDir": "/app",
- "uploadsTmpDir": "/.tmp",
- "uploadsDestDir": "/www/cms-content/uploads",
+ "staticDir": "www",
+ "publicDir": "www",
+ "uploadsTmpDir": ".tmp",
+ "uploadsDestDir": "www/cms-content/uploads",
"uploadsUrl": ":8181/cms-content/",
"logFormat": "[:date] - [:method] - :url - :status - :response-time ms"
}
diff --git a/package.json b/package.json
index b0ff62f..7569e87 100755
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
"logfmt": "~0.18.1",
"markdown": "~0.5.0",
"method-override": "~1.0.0",
- "mongodb": "*",
+ "mongodb": "^1.4.23",
"mongoose": "^3.8.20",
"passport": "^0.2.1",
"passport-facebook": "^1.0.3",
@@ -59,7 +59,8 @@
"promised-io": "~0.3.4",
"q": "^1.1.2",
"request": "~2.34.0",
- "socket.io": "~0.9.16"
+ "socket.io": "~0.9.16",
+ "websocket": "^1.0.14"
},
"devDependencies": {
"chai": "^1.10.0",
@@ -100,6 +101,7 @@
"gulp-ngmin": "^0.3.0",
"gulp-protractor": "0.0.11",
"gulp-uglify": "^1.0.2",
+ "intern": "^2.2.2",
"jasmine-core": "^2.1.2",
"jasmine-node": "~1.11.0",
"jasmine-reporters": "^1.0.1",
diff --git a/routes/cms-auth.js b/routes/cms-auth.js
index 06ae36b..554f0d5 100644
--- a/routes/cms-auth.js
+++ b/routes/cms-auth.js
@@ -3,23 +3,20 @@ var bodyParser = require( 'body-parser' ),
util = require('util'),
User = require( './models/user' ),
session = require( 'express-session' ),
- crypto = require( 'crypto' );
+ crypto = require( 'crypto'),
+ bcrypt = require( 'bcrypt-nodejs' );
-var bcrypt = require( 'bcrypt-nodejs' );
-
-module.exports = function (config, app) {
+var cmsAuth = function (config, app) {
console.warn( 'cms-auth' );
- mongoose.connect( config.mongodb );
+
//### hashPassword
//Hash password using basic sha1 hash.
var hashPassword = function (pass, salt) {
- var p = bcrypt.hashSync(pass);
-
- return p;
+ return bcrypt.hashSync(pass);
};
var cmsAuth = {
@@ -39,20 +36,20 @@ module.exports = function (config, app) {
query.username = req.body.email;
}
query.password = hashPassword( req.body.password, query.username );
+ console.warn('trying to login', query);
User.findOne( {username: query.username}, function (err, data) {
if (err) {
- res.jsonp( 400, err );
+ return res.jsonp( 400, err );
}
-
try {
if (data && bcrypt.compareSync(req.body.password, data.password)) {
req.session.user = data;
- res.jsonp( 200, data );
+ return res.json( 200, data );
} else {
- res.jsonp( 404, {message: 'Wrong username/password!'} );
+ return res.json( 404, {message: 'Wrong username/password!'} );
}
} catch (error) {
- res.jsonp( 404, {message: error} );
+ return res.json( 404, {message: error} );
}
} );
},
@@ -70,37 +67,39 @@ module.exports = function (config, app) {
data.username = req.body.username;
}
if (req.body.email) {
- data.username = req.body.email;
+ data.email = req.body.email;
}
+
data.password = hashPassword( req.body.password, data.username );
data.created_at = new Date();
data.updated_at = new Date();
data.active = false;
data.groups = ['public'];
- var user = new User( data );
+ console.warn('trying to register', data);
+
+
//Try and find user
User.find( {username: data.username}, function (err, u) {
- console.log(err, util.inspect(u, {colors: true}));
-
+ console.log( 'found user', err, util.inspect(u, {colors: true}));
+ var user = new User( data );
if(err){
- res.json( 400, {message: 'Problem registering!'} );
- }
-
- if (u.length > 0) {
- res.json( 400, {message: 'Username already exists!'} );
+ res.jsonp( 400, {message: 'Problem registering!'} );
}
- if(!err){
+ if (u.length) {
+ res.jsonp( 400, {message: 'Username already exists!'} );
+ } else {
user.save( function (er, ok) {
if (er) {
- res.json( 400, {message: 'Problem registering!'} );
+ return res.jsonp( 400, {message: 'Problem registering!'} );
} else {
- res.json( 201, ok );
+ return res.jsonp( 201, ok );
}
} );
}
+
} );
},
session: function (req, res, next) {
@@ -109,7 +108,7 @@ module.exports = function (config, app) {
user = req.session.user
}
console.warn(util.inspect(user, {colors: true}));
- res.send({message: 'Your session', data: user});
+ return res.send({message: 'Your session', data: user});
}
};
@@ -124,3 +123,5 @@ module.exports = function (config, app) {
app.post( config.apiBase + '/register', bodyParser.json(), cmsAuth.register );
app.get( config.apiBase + '/session', bodyParser.json(), cmsAuth.session );
};
+
+module.exports = cmsAuth;
diff --git a/routes/cms-passport.js b/routes/cms-passport.js
index c40dd4d..3e69655 100644
--- a/routes/cms-passport.js
+++ b/routes/cms-passport.js
@@ -1,127 +1,187 @@
-var passport = require( 'passport' ),
- BasicStrategy = require( 'passport-http' ).Strategy,
- LocalStrategy = require( 'passport-local' ).Strategy,
- GoogleStrategy = require( 'passport-google' ).Strategy,
- express = require( 'express' ),
- path = require( 'path' ),
- q = require( 'q' ),
- flash = require( 'connect-flash' ),
- User = require( './models/user' ),
- cookieParser = require( 'cookie-parser' ),
- bodyParser = require( 'body-parser' ),
- session = require( 'express-session' );
+var passport = require('passport'),
+ BasicStrategy = require('passport-http').BasicStrategy,
+ LocalStrategy = require('passport-local').Strategy,
+ GoogleStrategy = require('passport-google').Strategy,
+ express = require('express'),
+ path = require('path'),
+ q = require('q'),
+ flash = require('connect-flash'),
+ User = require('./models/user'),
+ cookieParser = require('cookie-parser'),
+ bodyParser = require('body-parser'),
+ session = require('express-session'),
+ mongoose = require('mongoose'),
+ util = require('util'),
+ User = require('./models/user'),
+ session = require('express-session'),
+ crypto = require('crypto'),
+ bcrypt = require('bcrypt-nodejs');
+/**
+ * I handle ensuring a user is authenticated.
+ * @param req
+ * @param res
+ * @param next
+ * @returns {*}
+ */
var ensureAuthenticated = function (req, res, next) {
if (req.isAuthenticated()) {
return next();
}
- res.redirect( '/login' );
+ res.redirect('/login');
};
-module.exports = function (config, app) {
+
+/**
+ * I am the cmsPassport module that has various ways of
+ * authenticating a user.
+ * @param config - Configuration settings
+ * @param app - Express app
+ */
+var cmsPassport = function (config, app) {
+
+var user = new User();
if (!app) {
- throw new Error( 'Must provide express application!' );
+ throw new Error('Must provide express application!');
}
- passport.serializeUser( function (user, done) {
- done( null, user.id );
- } );
-
- passport.deserializeUser( function (id, done) {
- User.findById( id, function (err, user) {
- done( err, user );
- } );
- } );
-
- passport.use( new LocalStrategy( {
- usernameField: 'email',
- passwordField: 'password',
- passReqToCallback: true
- }, function (username, password, done) {
- process.nextTick( function () {
- console.warn( 'find by username' );
- User.findByUsername( username ).then( function (user) {
- return done( null, user );
- }, function (err) {
- return done( null, false );
- } );
- } );
+ /*
+
+ */
+ var findOrCreate = function(u, done){
+ console.log('find', u);
+
+ for (var i = 0; i < u.emails.length; i++) {
+ var email = u.emails[i].value
+ User.findOne({ email: email }, function (err, user) {
+ if (err) { return done(err); }
+ if (!user) {
+ console.warn('create user', u);
+ return done(null, false);
+ }
+ return done(null, user);
+ });
}
- ) );
- passport.use( new GoogleStrategy( {
- returnURL: 'http://localhost:8181/auth/google/return', realm: 'http://localhost:8181/'
+ };
+
+ /**
+ * I handle serializing a user.
+ * @param user
+ * @param done
+ */
+ var serializeUser = function (user, done) {
+ done(null, user._id);
+ };
+
+ /**
+ * I handle deserializing a user.
+ * @param id
+ * @param done
+ */
+ var deserializeUser = function (id, done) {
+ User.findById(id, function (err, user) {
+ done(err, user);
+ });
+ };
+
+ passport.serializeUser(serializeUser);
+
+ passport.deserializeUser(deserializeUser);
+
+var strategy = function(username, password, done) {
+ console.warn('find user', username, password);
+ User.findOne({ username: username }, function (err, user) {
+ if (err) { return done(err); }
+ if (!user) { return done(null, false); }
+ if (!user.validPassword(password)) { return done(null, false); }
+ return done(null, user);
+ });
+ };
+
+ passport.use(new BasicStrategy(strategy));
+ passport.use(new LocalStrategy(strategy));
+
+ passport.use(new GoogleStrategy({
+ returnURL: config.host + config.port + '/auth/google/return',
+ realm: config.host + config.port
},
function (identifier, profile, done) {
- console.warn( 'googleCallback', profile );
+ console.warn('googleCallback', profile);
profile.openId = identifier;
- User.findOrCreate( profile, function (err, user) {
- done( err, user );
- } );
+ findOrCreate(profile, function (err, user) {
+ done(err, user);
+ });
}
- ) );
-
- app.use( express.static( path.resolve( __dirname, '../www' ) ) );
- app.set( 'views', path.resolve( __dirname, '../www' ) );
- app.set( 'view engine', 'ejs' );
- app.engine( 'ejs', require( 'ejs-locals' ) );
- app.use( cookieParser() );
- app.use( bodyParser.urlencoded( {extended: false} ) );
- app.use( bodyParser.json() );
- app.use( session( {
+ ));
+
+ app.use(express.static(path.resolve(config.publicDir)));
+ app.set('views', path.resolve(config.staticDir));
+ app.set('view engine', 'ejs');
+ app.engine('ejs', require('ejs-locals'));
+ app.use(cookieParser());
+ app.use(bodyParser.urlencoded({extended: false}));
+ app.use(bodyParser.json());
+ app.use(session({
secret: 'angular-cms',
resave: true,
saveUninitialized: true
- } ) );
- app.use( passport.initialize() );
- app.use( passport.session() );
- app.use( flash() );
-
- app.get( '/api/me', passport.authenticate( 'basic', {session: false} ), function (req, res) {
- res.json( req.user );
- } );
-
- app.all( '*', function (req, res, next) {
- console.warn( 'cmsAuth', req.params );
- next();
- } );
+ }));
+ app.use(passport.initialize());
+ app.use(passport.session());
+ app.use(flash());
- app.get( '/', function (req, res) {
- res.render( 'index', {user: req.user, message: 'Please login', status: 'info'} );
- } );
- app.get( '/account', ensureAuthenticated, function (req, res) {
- res.render( 'account', {user: req.user} );
- } );
+ app.get('/api/me', passport.authenticate('basic', {session: false}), function (req, res) {
+ res.json(req.user);
+ });
- app.get( '/login', function (req, res) {
- res.render( 'login', {user: req.user, message: 'Please login', status: 'warning'} );
- } );
-
- app.post( '/login',
- passport.authenticate( 'local', {
- successRedirect: '/',
+ app.all('*', function (req, res, next) {
+ req.config = JSON.stringify(config);
+ console.warn('cmsAuth', req.params);
+ next();
+ });
+
+ app.get('/', function (req, res) {
+ res.render('index', {user: req.user, message: 'Please login', status: 'info'});
+ });
+
+ app.get('/account', ensureAuthenticated, function (req, res) {
+ res.render('account', {
+ user: req.user,
+ config: req.config
+ });
+ });
+
+ app.get('/login', function (req, res) {
+ res.render('login', {user: req.user, message: 'Please login', status: 'warning'});
+ });
+
+ app.post('/login',
+ passport.authenticate('local', {
+ successRedirect: '/account',
failureRedirect: '/login',
failureFlash: false
- } )
+ })
);
- app.get( '/auth/user', ensureAuthenticated, function (req, res) {
- res.json( 200, req.user );
- } );
+ app.get('/auth/user', ensureAuthenticated, function (req, res) {
+ res.json(200, req.user);
+ });
- app.get( '/auth/logout', function (req, res) {
+ app.get('/auth/logout', function (req, res) {
req.logout();
- res.redirect( options.apiBase );
- } );
+ res.redirect(options.apiBase);
+ });
- app.get( '/auth/google', passport.authenticate( 'google' ) );
- app.get( '/auth/google/return',
- passport.authenticate( 'google', {
+ app.get('/auth/google', passport.authenticate('google'));
+ app.get('/auth/google/return',
+ passport.authenticate('google', {
successRedirect: '/',
failureRedirect: '/login'
- } ) );
+ }));
-};
+};
+module.exports = cmsPassport;
diff --git a/routes/cms-rest.js b/routes/cms-rest.js
index 0fd127b..c6c286a 100644
--- a/routes/cms-rest.js
+++ b/routes/cms-rest.js
@@ -1,20 +1,29 @@
-var bodyParser = require( 'body-parser' ),
+var express = require('express'),
+ bodyParser = require( 'body-parser' ),
session = require( 'express-session' ),
RestResource = require( './rest' );
module.exports = function (config, app) {
'use strict';
+ var router = express.Router();
- app.get( config.apiBase + '/plugins', RestResource.plugins );
- app.get( config.apiBase + '/readme', RestResource.readme );
- app.get( config.apiBase, RestResource.index );
+// a middleware with no mount path, gets executed for every request to the router
+ router.use(function (req, res, next) {
+ console.log('cms-rest Time:', Date.now());
+ next();
+ });
+ router.get( config.apiBase, RestResource.index );
+ router.get( config.apiBase + '/plugins', RestResource.plugins );
+ router.get( config.apiBase + '/readme', RestResource.readme );
//Dynamic REST
- app.get( config.apiBase + '/:db/:collection/:id?', RestResource.get )
- app.post( config.apiBase + '/:db/:collection/:id?', bodyParser.json(), RestResource.add )
- app.put( config.apiBase + '/:db/:collection/:id?', bodyParser.json(), RestResource.edit )
- app.delete( config.apiBase + '/:db/:collection/:id?', RestResource.destroy );
+ router.get( config.apiBase + '/:db/:collection/:id?', RestResource.get )
+ router.post( config.apiBase + '/:db/:collection/:id?', bodyParser.json(), RestResource.add )
+ router.put( config.apiBase + '/:db/:collection/:id?', bodyParser.json(), RestResource.edit )
+ router.delete( config.apiBase + '/:db/:collection/:id?', RestResource.destroy );
console.warn( 'cms-rest', 'initialized' );
+
+ app.use('/', router);
};
diff --git a/routes/cms-routes.js b/routes/cms-routes.js
index ed8b6f0..714f8e6 100644
--- a/routes/cms-routes.js
+++ b/routes/cms-routes.js
@@ -1,9 +1,49 @@
+var mongoose = require('mongoose'), http = require('http'), util = require('util');
+
module.exports.mount = function (config, app) {
+ 'use strict';
+
+ //Connect to database
+ mongoose.connect(config.mongodb);
+
+ // CONNECTION EVENTS
+// When successfully connected
+ mongoose.connection.on('connected', function () {
+ console.log('Mongoose default connection open to ' + config.mongodb);
+ });
+
+// If the connection throws an error
+ mongoose.connection.on('error',function (err) {
+ console.log('Mongoose default connection error: ' + err);
+ });
+
+// When the connection is disconnected
+ mongoose.connection.on('disconnected', function () {
+ console.log('Mongoose default connection disconnected');
+ });
+
+// If the Node process ends, close the Mongoose connection
+ process.on('SIGINT', function() {
+ mongoose.connection.close(function () {
+ console.log('Mongoose default connection disconnected through app termination');
+ process.exit(0);
+ });
+ });
+
+ var server = http.createServer(app);
+
require( './cms-auth' )( config, app );
require( './cms-passport' )( config, app );
require( './cms-rest' )( config, app );
require( './cms-proxy' )( config, app );
- require( './cms-sockets' )( config, app );
- require( './cms-server' )( config, app );
require( './cms-upload' )( config, app );
+ require( './cms-sockets' )( config, server );
+ require( './cms-server' )( config, app );
+
+
+
+ return server.listen(config.port || process.env.PORT, function () {
+ util.log('App listening on port: ' + config.port + ''.verbose);
+ util.log(util.inspect(config, {colors: true}));
+ });
};
diff --git a/routes/cms-server.js b/routes/cms-server.js
index d26cb07..d995919 100644
--- a/routes/cms-server.js
+++ b/routes/cms-server.js
@@ -1,3 +1,31 @@
+var express = require('express'),
+ path = require('path'),
+ bodyParser = require( 'body-parser' );
+
module.exports = function (config, app) {
- console.warn( 'cms-server');
+ console.warn( 'cms-server initialized');
+
+ var router = express.Router();
+
+ var options = {
+ dotfiles: 'ignore',
+ etag: false,
+ extensions: ['htm', 'html'],
+ index: false,
+ maxAge: '1d',
+ redirect: false,
+ setHeaders: function (res, path) {
+ res.set('x-timestamp', Date.now())
+ }
+ };
+
+ router.use(express.static(config.staticDir, options));
+ router.use(express.static(config.publicDir, options));
+ router.use('/', function(res, req, next){
+ req.send(config.publicDir + path.sep + 'index.html');
+ next();
+ });
+
+ app.use('/', router);
+
};
diff --git a/routes/cms-sockets.js b/routes/cms-sockets.js
index 894fc91..bc2c29d 100644
--- a/routes/cms-sockets.js
+++ b/routes/cms-sockets.js
@@ -1,11 +1,105 @@
+
const events = require('events'), util = require('util');
-var cmsSockets = function (config, app) {
+var q = require( 'q' ),
+WebSocketServer = require('websocket').server,
+WebSocketRouter = require('websocket').router;
+////////////////////////////
+//## Socket Server
+//This is a socket server implementation for 'real' time analytics and other data.
+//This is for use with geo analytics and other backend data from the app. listen for connected clients
+//
+// ### Server Channels
+//These are the events that this socket server dispatches.
+//
+//1. cms:authorization
+//2. cms:client:message
+//3. cms:client:connect
+//4. cms:client:disconnect
+//5. cms:server:message
+//6. cms:server:disconnect
+//7. cms:server:connect
+//8. cms:
+module.exports = function (config, app) {
+ 'use strict';
events.EventEmitter.call(this);
+ console.warn( 'cms-sockts initialized' );
- console.warn( 'cms-sockts' );
+ //Start the websocket server
+ //SocketServer.init(proxyServer);
+ var cmsSockets = {},
+ connections, wsserver, wsclient, router, self = cmsSockets;
-};
-util.inherits(cmsSockets, events.EventEmitter);
-module.exports = cmsSockets;
+ var delay = function (fn, time) {
+ var defer = q.defer();
+ setTimeout( function () {
+ fn();
+ defer.resolve();
+ }, time );
+ return defer.promise;
+ };
+
+ var delayedSocketPush = function(socket, time){
+ return delay( function (msg) {
+ socket.emit( 'msg', {
+ datetime: new Date(),
+ message: msg,
+ id: 'Server'
+ } );
+ }, time );
+ };
+
+ //Hold the names of events that this socket server listens for and emits
+ self.events = {
+ session: {
+ pageView: 'cms:session:pageView',
+ hashChange: 'cms:session:hashChange',
+ login: 'cms:session:login',
+ logout: 'cms:session:logout'
+ },
+ server: {
+ message: 'cms:server:message',
+ connected: 'cms:server:connect',
+ disconnected: 'cms:server:disconnect'
+ },
+ client: {
+ message: 'cms:client:message',
+ connected: 'cms:client:connect',
+ disconnected: 'cms:client:disconnect'
+ }
+ };
+
+
+ //Store a list of the connected clients
+ connections = [];
+
+ var serverConfig = {
+ httpServer: app,
+ };
+
+ wsserver = new WebSocketServer();
+ wsserver.mount(serverConfig);
+
+ router = new WebSocketRouter();
+ router.attachServer(wsserver);
+
+ router.mount('*', 'echo-protocol', function(request) {
+ console.log('mounted to echo protocol');
+ var conn = request.accept(request.origin);
+ conn.on('message', function(message) {
+ console.log('routed message', message);
+ });
+ conn.send('hey');
+ });
+
+ router.mount('*', 'update-protocol', function(request) {
+ console.log('mounted to update protocol');
+ var conn = request.accept(request.origin);
+ conn.on('message', function(message) {
+ console.log('update all the things', message);
+ }); });
+
+ util.inherits(cmsSockets, events.EventEmitter);
+
+};
diff --git a/routes/cms-upload.js b/routes/cms-upload.js
index dcad55c..9e096e3 100644
--- a/routes/cms-upload.js
+++ b/routes/cms-upload.js
@@ -1,24 +1,14 @@
var easyimage = require( 'easyimage' );
var upload = require( 'jquery-file-upload-middleware' );
var fs = require( 'fs-extra' );
+var path = require('path');
var busboy = require( 'connect-busboy' ); //middleware for form/file upload
module.exports = function (config, app) {
- app.use( busboy( {immediate: true} ) );
- app.use( function (req, res) {
- if (req.busboy) {
- req.busboy.on( 'file', function (fieldname, file, filename, encoding, mimetype) {
- // ...
- console.warn( fieldname, file, filename );
- } );
- req.busboy.on( 'field', function (key, value, keyTruncated, valueTruncated) {
- // ...
- console.log( key, value );
- } );
- // etc ...
- }
- } );
+ console.log('cms-upload intialized');
+
+
//### upload
//I handled processing a uploaded file on the v2 server.
@@ -29,7 +19,7 @@ module.exports = function (config, app) {
appid = String( req.param( 'appid' ) );
}
- console.log( util.inspect( req, {colors: true} ) );
+ console.log( 'upload', util.inspect( req, {colors: true} ) );
//Handle if dynamic filenames are enabled
var tmp_filename = req.files.file.name || 'tmp_name';
@@ -107,16 +97,51 @@ module.exports = function (config, app) {
};
//Output the results
- res.send( json );
+ res.json( json );
} );
} );
} );
} );
+
+ next();
+
};
+ app.use( busboy( {immediate: true} ) );
+ app.use( function (req, res) {
+
- app.post( config.apiBase + '/upload', upload );
+
+ if (req.busboy) {
+ req.busboy.on( 'file', function (fieldname, file, filename, encoding, mimetype) {
+ var filePath = path.normalize(config.uploadsDestDir + path.sep + filename);
+ var fstream = fs.createWriteStream(filePath);
+ file.pipe(fstream);
+ fstream.on('close', function() {
+ fs.readFile(filePath, function (err, data) {
+ if(err){
+ throw err;
+ res.status(400 ).send(err);
+ }
+
+ res.status(200).json({
+ filename: filename,
+ path: filePath
+ });
+ });
+ });
+ console.warn('busboy', fieldname, file, filename );
+ } );
+ req.busboy.on( 'field', function (key, value, keyTruncated, valueTruncated) {
+ // ...
+ console.log( 'busboy', key, value );
+ } );
+ // etc ...
+ }
+ } );
+ app.post( config.apiBase + '/upload', busboy, upload );
app.get( config.apiBase + '/upload', function (req, res, next) {
- res.send( {message: 'Upload a file with a POST.'} );
+ res.json( {message: 'Upload a file with a POST.'} );
+ next();
} );
};
diff --git a/routes/models/user.js b/routes/models/user.js
index f40eb34..1f7e6cb 100644
--- a/routes/models/user.js
+++ b/routes/models/user.js
@@ -65,7 +65,7 @@ UserSchema.method( 'findOrCreate', function (profile, fn) {
UserSchema.method( 'findByUsername', function (username, fn) {
console.warn( 'findByUsername', username );
- this.find( {username: username}, function (err, data) {
+ UserSchema.find( {username: username}, function (err, data) {
if (err) {
fn( false, err );
}
diff --git a/routes/rest.js b/routes/rest.js
index a6b68b3..37f788b 100755
--- a/routes/rest.js
+++ b/routes/rest.js
@@ -41,8 +41,8 @@ var MESSAGES = {
};
var DS = require('jps-ds').DS;
var _ds = new DS({
- //host: 'angularcms:angularcms@paulo.mongohq.com:10089/app19632340',
- host: 'localhost/angular-cms',
+ host: 'angularcms:angularcms@paulo.mongohq.com:10089/app19632340',
+ //host: 'localhost/angular-cms',
models: {
'groups': {
title: String,
@@ -193,8 +193,6 @@ var RestResource = {
});
},
-
-
//### get
//I handle gathering records dynamically from a call to the v2 api.
get: function (req, res, next) {
diff --git a/server.js b/server.js
index 1570592..7aa4c8c 100755
--- a/server.js
+++ b/server.js
@@ -56,9 +56,6 @@ var cmsRoutes = require('./routes/cms-routes');
cmsRoutes.mount(config, app);
-var webapp = http.createServer(app).listen(config.port || process.env.PORT, function () {
- util.log(String('App listening on port: ' + config.port).verbose);
-});
diff --git a/test/intern.conf.js b/test/intern.conf.js
new file mode 100644
index 0000000..a43842b
--- /dev/null
+++ b/test/intern.conf.js
@@ -0,0 +1,79 @@
+// Learn more about configuring this file at Use this document as a way to quickly start any new project.
All you get is this text and a mostly barebones HTML document.
Username: <%= user.username %>
-Email: <%= user.email %>
\ No newline at end of file +Email: <%= user.email %>
+ +