Skip to content

Commit 043b4cf

Browse files
committed
agrego rutas y se modifico el server
1 parent ad492a0 commit 043b4cf

File tree

6 files changed

+40
-57
lines changed

6 files changed

+40
-57
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ React-Cms
33

44
Cms hecho con React+flux
55

6-
para probarlo solo deben clonar y npm install, se necesita mongodb instalado.
6+
para probarlo solo deben clonar y `npm install`, se necesita mongodb instalado.

config/express.js

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11

2-
var path = require('path'),
3-
util = require('util'),
4-
serveStatic = require('serve-static'),
5-
bodyParser = require('body-parser'),
6-
// methodOverride = require('method-override')
7-
express = require('express'),
8-
app = express(),
9-
router = require("../src/lib/routes");
2+
var path = require('path'),
3+
util = require('util'),
4+
serveStatic = require('serve-static'),
5+
bodyParser = require('body-parser'),
6+
express = require('express'),
7+
app = express(),
8+
router = require("../src/lib/routes");
109

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

public/js/actions/users/UsersServerActors.js

+13-22
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,14 @@ var url ="/"+plural+"/";
1212
module.exports = {
1313

1414
get: function() {
15-
16-
request
17-
.get(url)
18-
.end(function(res){
19-
20-
if(res.body.err){
21-
console.log(res.body.err)
22-
}else{
23-
if(res.body[plural].length){//evita error al tratar de hacer init() sin users.
24-
AppDispatcher.handleServerAction({
25-
type: ActionTypes.RECEIVE_RAW_USERS,
26-
rawItems: res.body[plural]
27-
});
15+
request.get(url).end(function(err, res){
16+
if(!err && res.body[plural].length){
17+
AppDispatcher.handleServerAction({
18+
type: ActionTypes.RECEIVE_RAW_USERS,
19+
rawItems: res.body[plural]
20+
});
2821
}
29-
}
30-
31-
});
22+
});
3223
},
3324
create: function(item) {
3425
request
@@ -47,8 +38,8 @@ module.exports = {
4738

4839
});
4940

50-
}
51-
,update: function(item){
41+
},
42+
update: function(item){
5243
request
5344
.post(url)
5445
.query(item)
@@ -64,8 +55,8 @@ module.exports = {
6455
}
6556

6657
})
67-
}
68-
,search: function(by,data){
58+
},
59+
search: function(by,data){
6960

7061
var sby = by;
7162
request
@@ -84,8 +75,8 @@ module.exports = {
8475
}
8576

8677
})
87-
}
88-
,delete: function(itemID){
78+
},
79+
delete: function(itemID){
8980
request
9081
.post(url+'delete')
9182
.query({_id: itemID})

public/js/bundle.js

+14-23
Large diffs are not rendered by default.

server.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
var http = require("http"),
2-
app = require("./config/express"),
3-
db = require("./config/mongoose");
1+
var http = require("http"),
2+
app = require("./config/express"),
3+
db = require("./config/mongoose");
44

55
/*
66
@create server

src/controllers/usersCtrl.js

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ module.exports = {
44
index: function(req, res) {
55
UserModel.find({}).exec(function(err, items) {
66
if (!err) {
7+
res.set({'content-Type':'application/json'});
8+
res.status(200);
79
res.json({ err: false, users: items });
810
} else {
911
res.json({ err: err });

0 commit comments

Comments
 (0)