Skip to content

Commit 3b8183a

Browse files
petersirkapetersirka
committed
fixed: conflicts
1 parent 4b771ca commit 3b8183a

10 files changed

Lines changed: 3 additions & 147 deletions

File tree

‎framework-install-business-logic-source/definitions/install.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
framework.on('load', function() {
2-
<<<<<<< HEAD
3-
framework.install('source', 'test', 'https://www.totaljs.com/inject-source.js');
4-
=======
52
framework.install('source', 'test', 'https://www.totaljs.com/examples/inject-source.js');
6-
>>>>>>> origin/v1.7.0
73
});

‎framework-install-config/definitions/install.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
framework.on('load', function() {
2-
<<<<<<< HEAD
3-
framework.install('config', 'https://www.totaljs.com/inject-config.txt');
4-
=======
52
framework.install('config', 'https://www.totaljs.com/examples/inject-config.txt');
6-
>>>>>>> origin/v1.7.0
73
});

‎framework-install-controller/index.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@
77
var framework = require('total.js').http('debug');
88

99
framework.on('load', function() {
10-
<<<<<<< HEAD
11-
framework.install('controller', 'https://www.totaljs.com/inject-controller.js');
12-
=======
1310
framework.install('controller', 'https://www.totaljs.com/examples/inject-controller.js');
14-
>>>>>>> origin/v1.7.0
1511
});

‎framework-install-definition/index.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@
77
var framework = require('total.js').http('debug');
88

99
framework.on('load', function() {
10-
<<<<<<< HEAD
11-
framework.install('definition', 'https://www.totaljs.com/inject-definition.js');
12-
=======
1310
framework.install('definition', 'https://www.totaljs.com/examples/inject-definition.js');
14-
>>>>>>> origin/v1.7.0
1511
});

‎framework-install-model/index.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@
77
var framework = require('total.js').http('debug');
88

99
framework.on('load', function() {
10-
<<<<<<< HEAD
11-
framework.install('model', 'https://www.totaljs.com/inject-model.js');
12-
=======
1310
framework.install('model', 'https://www.totaljs.com/examples/inject-model.js');
14-
>>>>>>> origin/v1.7.0
1511
});

‎framework-install-module/index.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,5 @@
77
var framework = require('total.js').http('debug');
88

99
framework.on('load', function() {
10-
<<<<<<< HEAD
11-
framework.install('module', 'https://www.totaljs.com/inject-module.js');
12-
=======
1310
framework.install('module', 'https://www.totaljs.com/examples/inject-module.js');
14-
>>>>>>> origin/v1.7.0
1511
});

‎mongodb/controllers/default.js‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,17 @@
11
exports.install = function(framework) {
2-
<<<<<<< HEAD
3-
framework.route('/', view_homepage);
4-
};
5-
6-
function view_homepage() {
7-
var self = this;
8-
9-
var users = DATABASE('users');
10-
11-
=======
122
framework.route('/', view_index);
133
};
144

155
function view_index() {
166
var self = this;
177
var users = DATABASE('users');
18-
>>>>>>> origin/v1.7.0
198
// or
209
// var users = framework.database('user');
2110
// or
2211
// var users = self.database('user');
23-
2412
users.find({}).limit(10).toArray(function(err, docs) {
25-
<<<<<<< HEAD
26-
self.view('homepage', docs);
27-
});
28-
29-
// or
30-
// users.find().limit(10).toArray(self.callback('homepage'));
31-
=======
3213
self.view('index', docs);
3314
});
3415
// or
3516
// users.find().limit(10).toArray(self.callback('index'));
36-
>>>>>>> origin/v1.7.0
3717
}

‎mongoose/controllers/default.js‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,12 @@ exports.install = function(framework) {
44

55
// Read all users
66
function view_index() {
7-
var self = this;
8-
<<<<<<< HEAD
9-
var User = MODEL('user').schema;
107

11-
=======
8+
var self = this;
129
var User = MODEL('user');
13-
>>>>>>> origin/v1.7.0
10+
1411
User.find(function(err, users) {
1512
self.view('index', users);
1613
});
17-
<<<<<<< HEAD
18-
19-
}
20-
21-
// Add a new user
22-
function json_homepage() {
23-
24-
var self = this;
25-
var User = MODEL('user').schema;
26-
var model = self.body;
27-
28-
var user = new User({ alias: model.alias, created: new Date() }).save(function(err) {
29-
30-
if (err)
31-
self.throw500(err);
32-
33-
// Read all users
34-
User.find(self.callback());
35-
});
3614

37-
=======
38-
>>>>>>> origin/v1.7.0
3915
}

‎mongoose/definitions/mongoose.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
// $ sudo npm install -g mongoose
22

33
var mongoose = require('mongoose');
4-
<<<<<<< HEAD
5-
mongoose.connect('mongodb://totaldemo:123456@ds029979.mongolab.com:29979/totaldemo');
6-
7-
=======
8-
mongoose.connect(CONFIG('database'));
9-
>>>>>>> origin/v1.7.0
10-
global.mongoose = mongoose;
4+
mongoose.connect(CONFIG('database'));

‎mongoose/views/homepage.html‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)