-
diff --git a/public/javascripts/app.js b/public/javascripts/app.js
index b0c9d9c..9b3f4ec 100644
--- a/public/javascripts/app.js
+++ b/public/javascripts/app.js
@@ -9,10 +9,12 @@ var app = app || {};
**/
app.Message = Backbone.Model.extend({
url: function() {
- return 'http://launchergap.org/1/post'
+// return 'http://alwaysladylove.com/1/post'
+ return 'http://localhost:3000/1/post'
+ ( this.id === null ? '' : '/' + this.id );
},
id: null,
+ idAttribute: '_id',
defaults: {
success: false,
errfor: {},
@@ -28,11 +30,13 @@ app.Message = Backbone.Model.extend({
app.ContentView = Backbone.View.extend({
el: '#content',
events: {
- 'click #subject': 'read'
+ 'click #subject': 'read',
+ 'click #delete': 'delete'
},
// constructor
initialize: function() {
this.model = new app.Message();
+ this.model.bind('sync', this.render, this);
this.model.bind('change', this.render, this);
this.template = _.template($('#post-list').html());
@@ -48,6 +52,19 @@ app.ContentView = Backbone.View.extend({
this.model.id = id;
this.template = _.template($('#post-single').html());
this.model.fetch();
+ },
+ delete: function(evt){
+ var self = this
+
+ this.model.destroy({
+ success: function(model, res){
+ console.log('its deleted!');
+ self.model.fetch();
+ },
+ error: function(model, res){
+ console.log('delete error');
+ }
+ });
}
});
@@ -77,7 +94,22 @@ app.FormView = Backbone.View.extend({
}
});
+app.LoginView = Backbone.View.extend({
+ el: 'body',
+ events: {
+ 'click #op-modal': 'modal'
+ },
+ render: function(){
+ this.$('#myModal').modal();
+ },
+ modal: function(e){
+ this.render();
+ }
+});
+
+
$(document).ready(function(){
app.contentView = new app.ContentView();
app.formView = new app.FormView();
-});
+ app.loginView = new app.LoginView();
+});
\ No newline at end of file
diff --git a/public/tolearn.js b/public/tolearn.js
new file mode 100644
index 0000000..d102fdd
--- /dev/null
+++ b/public/tolearn.js
@@ -0,0 +1,59 @@
+var app = app || {};
+
+app.Lessons = Backbone.Model.extend({
+ url: function(){
+ return '/learn/lessons'
+ },
+ defaults: {
+ errors: [],
+ errfor: {},
+ lessons: []
+ }
+});
+
+app.Lesson = Backbone.View.extend({
+ url: function(){
+ return '/learn/lessons/' + this.attributes.id
+ },
+ id: '',
+ defaults: {
+ errors: [],
+ errfor: {},
+ lesson: {}
+ }
+});
+
+app.ListView = Backbone.View.extend({
+ el: '#tolearnlist',
+ template: _.template( $('#tmpl-tolearnlist').html() ),
+ events: {},
+ initialize: function(){
+ this.model = new app.Lessons();
+
+ this.listenTo(this.model, 'sync', this.render);
+ this.listenTo(this.model, 'change', this.render);
+ this.model.fetch();
+ },
+ render: function(){
+ this.$el.html(this.template(this.model.attributes));
+ }
+});
+
+app.LessonView = Backbone.View.extend({
+ el: '#lessoninfo',
+ template: _.template( $('#tmpl-lessonlearn').html() ),
+ initialize: function(){
+ this.model = new app.Lesson();
+ this.listenTo(this.model, 'sync', this.render);
+ this.listenTo(this.model, 'change', this.render);
+ },
+ render: function(){
+ this.$el.html( this.template( this.model.attributes ));
+ }
+});
+
+$(document).ready(function(){
+ app.listView = new app.ListView();
+ app.lessonView = new app.LessonView();
+});
+
diff --git a/routes/chat.js b/routes/chat.js
deleted file mode 100644
index 5d27dbd..0000000
--- a/routes/chat.js
+++ /dev/null
@@ -1,47 +0,0 @@
-var express = require('express');
-var router = express.Router();
-var events = require('events');
-
-var history = [];
-
-router.post('/send/:message', function(req, res, next) {
- var workflow = new events.EventEmitter();
- var clients = req.app.clients;
-
- workflow.outcome = {
- success: false,
- errfor: {}
- };
-
- workflow.on('validation', function() {
- history.push({
- message: req.params.message,
- timestamp: new Date().getTime()
- });
- workflow.emit('broadcast');
- });
-
- workflow.on('broadcast', function() {
- for (i = 0; i < clients.length; i++) {
- var client = clients[i];
- var data = {
- type: 'message',
- data: history
- };
-
- console.log(data);
- client.sendUTF(JSON.stringify(data));
- };
-
- workflow.outcome.success = true;
- workflow.emit('response');
- });
-
- workflow.on('response', function() {
- res.send(workflow.outcome);
- });
-
- workflow.emit('validation');
-});
-
-module.exports = router;
diff --git a/routes/learn.js b/routes/learn.js
new file mode 100644
index 0000000..ba81bad
--- /dev/null
+++ b/routes/learn.js
@@ -0,0 +1,33 @@
+var express = require('express');
+var router = express.Router();
+
+
+router.get('/', function(req, res, next){
+ res.render('learn');
+});
+
+router.get('/lessons', function(req, res, next){
+ req.app.db.model.Learn
+ .find({})
+ .exec(function(err, lessons){
+ console.log(lessons);
+ res.send({
+ lessons: lessons
+ });
+ });
+});
+
+router.post('/lessons', function(req, res, next){
+ var lesson = req.app.db.model.Learn;
+
+ var doc = new lesson({
+ lessonName: req.query.lessonName,
+ lessonLearn: req.query.lessonLearn
+ });
+ console.log(doc);
+ doc.save();
+
+ res.end(console.log("it's saved"));
+});
+
+module.exports = router;
\ No newline at end of file
diff --git a/routes/login.js b/routes/login.js
new file mode 100644
index 0000000..c22d1cc
--- /dev/null
+++ b/routes/login.js
@@ -0,0 +1,23 @@
+var express = require('express');
+var router = express.Router();
+var passport = require('passport');
+
+
+/* FB auth */
+
+router.get('/login/facebook',
+ passport.authenticate('facebook'));
+
+router.get('/auth/facebook/callback',
+ passport.authenticate('facebook', { failureRedirect: '/login' }),
+ function(req, res) {
+ // Successful authentication, redirect home.
+ res.redirect('/');
+ });
+
+router.get('/login', function(req, res, next){
+ res.render('login', { title: 'Login', message: 'choose one you love!'});
+});
+
+
+module.exports = router;
diff --git a/routes/posts.js b/routes/posts.js
index e0540f9..21cb6f3 100644
--- a/routes/posts.js
+++ b/routes/posts.js
@@ -2,6 +2,7 @@ var express = require('express');
var router = express.Router();
var events = require('events');
var winston = require('winston');
+var cors = require('cors');
winston.add(winston.transports.File, {
name: 'booklog3-1',
@@ -13,8 +14,12 @@ winston.add(winston.transports.File, {
function ensureAuthenticate(req, res, next) {
if (req.isAuthenticated()) {
winston.log('info', req.user.displayName);
- return next(); }
- res.redirect('/login/facebook');
+ return next();
+ }
+
+ console.log('im not login');
+
+ res.redirect('/login');
}
router.get('/1/post', function(req, res, next) {
@@ -48,13 +53,14 @@ router.get('/1/post', function(req, res, next) {
workflow.emit('validation');
});
-router.get('/1/post/:id', function(req, res, next) {
+router.get('/1/post/:id', ensureAuthenticate, function(req, res, next) {
+ console.log('roger');
req.app.db.model.Post.findById(req.params.id, function(err, posts) {
- res.json(posts);
+ res.json(posts);
});
});
-router.post('/1/post', function(req, res, next) {
+router.post('/1/post', ensureAuthenticate, function(req, res, next) {
var workflow = new events.EventEmitter();
var Post = req.app.db.model.Post;
@@ -102,20 +108,48 @@ router.post('/1/post', function(req, res, next) {
});
router.delete('/1/post/:id', function(req, res, next) {
- req.app.db.model.Post.findByIdAndRemove(req.params.id, function(err, posts) {
- res.json(posts);
+ var workflow = new events.EventEmitter();
+ var Post = req.app.db.model.Post;
+
+ workflow.outcome = {
+ success: false,
+ errfor: {}
+ };
+
+ workflow.on('validation', function(){
+ Post.findById(req.params.id, function(err, post){
+ if(post === "undefined") {
+ workflow.outcome.errfor = "Article is't being found!";
+ return workflow.emit('response');
+ }
+
+ workflow.emit('delete');
+ });
+ });
+
+ workflow.on('delete', function(){
+ Post.findByIdAndRemove(req.params.id, function(err, posts) {
+ workflow.outcome.success = true;
+ workflow.emit('response');
+ });
});
+
+ workflow.on('response', function(){
+ res.send(workflow.outcome);
+ });
+
+ workflow.emit('validation');
});
router.put('/1/post/:id', function(req, res, next) {
var fieldsToSet = {
- title: req.query.title,
- content: req.query.content
+ title: req.query.title,
+ content: req.query.content
};
req.app.db.model.Post.findOneAndUpdate({_id: req.params.id}, fieldsToSet, function(err, post) {
- res.json(post);
+ res.json(post);
});
});
-module.exports = router;
+module.exports = router;
\ No newline at end of file
diff --git a/views/learn.jade b/views/learn.jade
new file mode 100644
index 0000000..d92497a
--- /dev/null
+++ b/views/learn.jade
@@ -0,0 +1,47 @@
+extends layout
+
+block content
+ .row
+ .col-md-6.col-sm-6
+ h2 To Learn list
+ div#tolearnlist
+ .col-md-6.col-sm-6
+ h2 Lesson Info
+ div#lessoninfo
+
+ script(type='text/template', id='tmpl-tolearnlist')
+ br
+ br
+ ul
+ <% _.each(lessons, function(lesson){ %>
+ li
+ a(href='#') <%= lesson.lessonName %>
+ <% }) %>
+
+ script(type='text/template', id='tmpl-lessonlearn')
+ br
+ br
+ div.well.non-editable
+ .row
+ h2 <%= lesson.lessonName %>
+ h6 created on <%= lesson.createdTime %>
+ p <%= lesson.lessonlearn %>
+ button.btn.btn-primary.pull-right.btn.edit Edit
+
+ div.well.editable.hide
+ .row
+ form
+ div.control-group
+ label Lesson Name:
+ div.controls
+ input.form-control(type='text', name='lessonname', value!='<%= lesson.lessonName %>')
+ br
+ div
+ button.btn.btn-large.btn-info.btn.save('type=button') Save
+ button.btn.btn-large.btn-info.btn.cancel('type=button') Cancel
+
+ script(src='javascripts/jquery.min.js')
+ script(src='javascripts/bootstrap.min.js')
+ script(src='vendor/underscore/underscore-min.js')
+ script(src='vendor/backbone/backbone-min.js')
+ script(src='tolearn.js', type='text/javascript')
\ No newline at end of file
diff --git a/views/login.jade b/views/login.jade
new file mode 100644
index 0000000..5450012
--- /dev/null
+++ b/views/login.jade
@@ -0,0 +1,18 @@
+extends layout
+
+block content
+ h1= title
+ h4= message
+ div.row
+ a(href='/login/facebook')
+ img(src='https://cdn0.iconfinder.com/data/icons/yooicons_set01_socialbookmarks/128/social_facebook_box_blue.png')
+ a(href='')
+ img(src='https://cdn0.iconfinder.com/data/icons/yooicons_set01_socialbookmarks/128/social_twitter_box_white.png')
+ a(href='')
+ img(src='https://cdn0.iconfinder.com/data/icons/yooicons_set01_socialbookmarks/128/social_google_box.png')
+
+ script(src='javascripts/jquery.min.js')
+ script(src='javascripts/bootstrap.min.js')
+ script(src='vendor/underscore/underscore-min.js')
+ script(src='vendor/backbone/backbone-min.js')
+ script(src='javascripts/app.js')
+ 
+ 
+