Skip to content

Commit

Permalink
[refactor] uniformización de estilo de código del servidor
Browse files Browse the repository at this point in the history
  • Loading branch information
bjrmatos committed Mar 23, 2015
1 parent c51a29e commit 57ff8fc
Show file tree
Hide file tree
Showing 9 changed files with 7,346 additions and 5,888 deletions.
40 changes: 18 additions & 22 deletions config/express.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@

var path = require('path')
, util = require('util')
, serveStatic = require('serve-static')
, bodyParser = require('body-Parser')
//, methodOverride = require('method-override')
, express = require("express")
, app = express()
;





app.set('port', process.env.PORT || 3000);
app.use(serveStatic(path.join('./public'), { maxAge: 86400000 }));
app.set('views', './src/views');
app.engine('jade', require("jade").__express);
app.set('view engine', 'jade');
//app.use(methodOverride())
app.use(bodyParser.urlencoded({extended: true}));
app.use(bodyParser.json())

var path = require('path'),
util = require('util'),
serveStatic = require('serve-static'),
bodyParser = require('body-parser'),
// methodOverride = require('method-override')
express = require('express'),
app = express();

app.engine('jade', require('jade').__express);

app.set('port', process.env.PORT || 3000);
app.set('views', './src/views');
app.set('view engine', 'jade');

app.use(serveStatic(path.join('./public'), { maxAge: 86400000 }));
// app.use(methodOverride())
app.use(bodyParser.urlencoded({ extended: true }));
app.use(bodyParser.json());

module.exports = app;
56 changes: 24 additions & 32 deletions config/mongoose.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,25 @@
var dbURI = 'mongodb://127.0.0.1/cms';
var mongoose = require("mongoose");

var mongoose = require('mongoose'),
dbURI = 'mongodb://127.0.0.1/cms';


mongoose.connect(dbURI);

mongoose.connection.on('connected', function () {

console.log('Mongoose default connection open to ' + dbURI);

});

// 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('reconnect', function () {
console.log('Mongoose Reconected'+ date());
});
mongoose.connection.on('disconnected', function () {

console.log('Mongoodb disconnected...trying to reconnect '+ new Date());
mongoose.connect(dbURI);
});


module.exports = mongoose;
mongoose.connect(dbURI);

mongoose.connection.on('connected', function() {
console.log('Mongoose default connection open to ' + dbURI);
});

// 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('reconnect', function() {
console.log('Mongoose Reconected' + new Date());
});

mongoose.connection.on('disconnected', function() {
console.log('Mongoodb disconnected...trying to reconnect ' + new Date());
mongoose.connect(dbURI);
});

module.exports = mongoose;
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,17 @@
"url": "https://github.com/reactjs-hispano/Cms-Reactjs/issues"
},
"dependencies": {
"body-parser": "*",
"express": "*",
"jade": "*",
"mongoose" : "*" ,
"serve-static": "*",
"body-Parser": "*",
"jwt-simple":"*",
"flux": "*",
"jade": "*",
"jwt-simple": "*",
"keymirror": "*",
"mongoose": "*",
"object-assign": "*",
"react": "*"
"react": "*",
"serve-static": "*",
"superagent": "^1.1.0"
},
"devDependencies": {
"browserify": "*",
Expand All @@ -34,7 +35,7 @@
},
"scripts": {
"start": "watchify public/js/app.js -o public/js/bundle.js -d -v",
"build": "NODE_ENV=production browserify . | uglifyjs -cm > public/js/bundle.min.js"
"build": "NODE_ENV=production browserify . | uglifyjs -cm > public/js/bundle.min.js",
"check-hints": "jshint ./src ",
"check-code-style": "jscs ./src --max-errors 5 --verbose"
},
Expand Down
16 changes: 7 additions & 9 deletions public/js/app.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
var Cms = require('./components/Cms.react');
var React = require('react'),
Cms = require('./components/Cms.react');

// export for http://fb.me/react-devtools, only in development mode
if (process.env.NODE_ENV === 'development') {
window.React = React;
}

var React = require('react');
window.React = React; // export for http://fb.me/react-devtools


React.render(
<Cms />,
document.body
);
React.render(<Cms />, document.body);
Loading

0 comments on commit 57ff8fc

Please sign in to comment.