Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
eb2657a
added yaml
Feb 25, 2022
c551144
added files2
Feb 25, 2022
09c6068
commit 2
Feb 25, 2022
bd1fde7
thrid commit
Feb 25, 2022
76ef007
Update README.md
harpreetsinghwalia13 Feb 25, 2022
4657a46
Update home.html
harpreetsinghwalia13 Feb 25, 2022
e53c353
commmmmit
harpreetsinghwalia13 Feb 25, 2022
1ee600d
Merge branch 'master' into master
harpreetsinghwalia Feb 25, 2022
b638c9a
comiit 2
harpreetsinghwalia13 Feb 25, 2022
a53eecf
Merge pull request #1 from harpreetsinghwalia13/master
harpreetsinghwalia Feb 25, 2022
d593563
Update footer.html
harpreetsinghwalia13 Feb 25, 2022
9661939
Update header.html
harpreetsinghwalia13 Feb 28, 2022
75eeeee
Merge pull request #3 from harpreetsinghwalia13/master
harpreetsinghwalia13 Feb 28, 2022
3925ba9
PR Number 4
harpreetsinghwalia13 Feb 28, 2022
d059d9d
PR4
harpreetsinghwalia13 Feb 28, 2022
afacd48
Update header.html
harpreetsinghwalia13 Feb 28, 2022
6f93da7
Update header.html
harpreetsinghwalia13 Feb 28, 2022
1f9c072
Merge branch 'master' into master
harpreetsinghwalia Feb 28, 2022
186c1af
[skip travis] Update README
harpreetsinghwalia13 Feb 28, 2022
a7a25af
[skip travis] Update README
harpreetsinghwalia13 Feb 28, 2022
777f77a
Merge pull request #4 from harpreetsinghwalia13/master
harpreetsinghwalia13 Feb 28, 2022
a514639
Update movie.html
harpreetsinghwalia13 Feb 28, 2022
960608c
Merge pull request #5 from harpreetsinghwalia13/master
harpreetsinghwalia Feb 28, 2022
81bad9a
skip travis
harpreetsinghwalia13 Feb 28, 2022
9ecd68d
skip travis
harpreetsinghwalia13 Feb 28, 2022
ba9d2f1
Merge branch 'master' into master
harpreetsinghwalia Feb 28, 2022
f2df13d
[skip travis]
harpreetsinghwalia13 Feb 28, 2022
77edb45
[skip travis] Model
harpreetsinghwalia13 Feb 28, 2022
316c504
Merge pull request #7 from harpreetsinghwalia13/master
harpreetsinghwalia13 Feb 28, 2022
827ff1f
Update movie.js
harpreetsinghwalia13 Feb 28, 2022
4ed8940
[skip travis]
harpreetsinghwalia13 Feb 28, 2022
710901b
Merge pull request #8 from harpreetsinghwalia13/master
harpreetsinghwalia13 Feb 28, 2022
5e08737
[skip travis]
harpreetsinghwalia13 Feb 28, 2022
cf60174
Merge pull request #9 from harpreetsinghwalia13/master
harpreetsinghwalia Feb 28, 2022
8145e14
Commit without skip
harpreetsinghwalia13 Feb 28, 2022
1b36fc9
Commit without Skkip
harpreetsinghwalia13 Feb 28, 2022
6666ddc
merggge without skip
harpreetsinghwalia Feb 28, 2022
0bfa165
[skip travis]
harpreetsinghwalia13 Feb 28, 2022
97409b7
Merge pull request #11 from harpreetsinghwalia13/master
harpreetsinghwalia Feb 28, 2022
f7fe6cc
Update .travis.yml
harpreetsinghwalia13 Feb 28, 2022
6b821f7
Update .travis.yml
harpreetsinghwalia13 Feb 28, 2022
c19f7ae
Merge pull request #12 from harpreetsinghwalia13/master
harpreetsinghwalia Mar 1, 2022
3b30b7f
Commit Condition Added - test 1
harpreetsinghwalia13 Mar 1, 2022
e13e905
Merge pull request #13 from harpreetsinghwalia13/master
harpreetsinghwalia13 Mar 1, 2022
a1c4aaa
Test 2 happening
harpreetsinghwalia13 Mar 1, 2022
5b3d488
Merge pull request #14 from harpreetsinghwalia13/master
harpreetsinghwalia Mar 1, 2022
44ef951
build
harpreetsinghwalia13 Mar 1, 2022
6e78a61
build
harpreetsinghwalia13 Mar 1, 2022
729be83
Merge branch 'master' into master
harpreetsinghwalia Mar 1, 2022
c0d70c0
Merge pull request #15 from harpreetsinghwalia13/master
harpreetsinghwalia Mar 1, 2022
714fabd
build
harpreetsinghwalia13 Mar 1, 2022
f72cd72
Merge pull request #16 from harpreetsinghwalia13/master
harpreetsinghwalia13 Mar 1, 2022
0a24b7c
test
harpreetsinghwalia13 Mar 1, 2022
36ad3bc
Merge pull request #17 from harpreetsinghwalia13/master
harpreetsinghwalia13 Mar 1, 2022
34f5af6
Update README.md
harpreetsinghwalia13 Mar 1, 2022
2b22176
Update Readme 2
harpreetsinghwalia13 Mar 1, 2022
5db4c46
Merge pull request #18 from harpreetsinghwalia13/master
harpreetsinghwalia Mar 1, 2022
97c9186
no bld
harpreetsinghwalia13 Mar 1, 2022
f586aeb
Update app.js
harpreetsinghwalia13 Mar 1, 2022
a33eabb
Update package.json
harpreetsinghwalia13 Mar 1, 2022
bdc2c0c
nothing to bld
harpreetsinghwalia13 Mar 1, 2022
cffa650
this will bld
harpreetsinghwalia13 Mar 1, 2022
2e0abd6
Update index.js
harpreetsinghwalia13 Mar 1, 2022
70f1130
Merge pull request #19 from harpreetsinghwalia13/master
harpreetsinghwalia Mar 1, 2022
db5c4c9
Update home.html
harpreetsinghwalia13 Mar 1, 2022
fa285c7
Merge pull request #20 from harpreetsinghwalia13/master
harpreetsinghwalia Mar 1, 2022
a839c02
Update README.md
harpreetsinghwalia13 Mar 1, 2022
978a049
Merge pull request #21 from harpreetsinghwalia13/master
harpreetsinghwalia Mar 1, 2022
a703b68
Update README.md
harpreetsinghwalia13 Mar 1, 2022
0da17af
Merge pull request #22 from harpreetsinghwalia13/master
harpreetsinghwalia Mar 1, 2022
b7a505d
Update README.md
harpreetsinghwalia13 Sep 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
language: node_js
node_js:
- 7
if: commit_message =~ ^build
37 changes: 2 additions & 35 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,35 +1,2 @@
Express3 Demo
==============================

Nodejs给Javascript赋予了服务端应用的生命,Jquery让Javascript成为浏览中开发的利器。 最近学习了Nodejs的Express3.0的开发框架,本来是按照“node.js开发指南”书中介绍,但“node.js开发指南”讲的是Express2.x的,从Express2.x到Express3.0自己模索中还是走了不少弯路的。写篇文章总结一下。

项目分支
------------------------

+ Express 3.x Demo ( https://github.com/bsspirit/nodejs-demo/tree/express3 )
+ Express 4.x Demo ( https://github.com/bsspirit/nodejs-demo/tree/express4 )

关于作者
----------------------

* 张丹(Conan), 程序员Java,R,PHP,Javacript
* weibo:@Conan_Z
* blog: http://blog.fens.me
* email: bsspirit@gmail.com

使用说明
----------------------

Nodejs开发框架Express3.0开发手记–从零开始

http://blog.fens.me/nodejs-express3/

Mongoose使用案例:让JSON数据直接POST入MongoDB

http://blog.fens.me/nodejs-mongoose-json/

源代码下载
----------------------

程序代码已经上传到github有需要的同学,自行下载。
https://github.com/bsspirit/nodejs-demo
read ,meeee
mkmkkm
5 changes: 3 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

/**
* Module dependencies.
this is second commit in app.js

*/

var express = require('express')
Expand Down Expand Up @@ -94,4 +95,4 @@ function notAuthentication(req, res, next) {
return res.redirect('/');
}
next();
}
}
4 changes: 2 additions & 2 deletions models/Movie.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ MovieDAO.prototype.findByIdAndUpdate = function(obj,callback){
});
}


//jxznjjshdjsdjshdsjd
MovieDAO.prototype.findByName = function(name, callback) {
Movie.findOne({name:name}, function(err, obj){
callback(err, obj);
});
};

module.exports = new MovieDAO();
module.exports = new MovieDAO();
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
"express": "3.2.2",
"ejs": "*"
}
}
}

4 changes: 2 additions & 2 deletions public/javascripts/movie.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
$(function() {

//holla hoop
var mdata={};
var url = '/javascripts/movie.json';

Expand Down Expand Up @@ -42,4 +42,4 @@ $(function() {
};


});
});
4 changes: 2 additions & 2 deletions routes/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/*
* GET home page.
* GET home Hello world
*/

exports.index = function(req, res){
Expand Down Expand Up @@ -34,4 +34,4 @@ exports.logout = function(req, res){

exports.home = function(req, res){
res.render('home', { title: 'Home'});
};
};
6 changes: 5 additions & 1 deletion views/footer.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@

<!--jasjahjahsjhdjhbdhjbdhjsdbjsghduwbjbcjbchneuwc-->
<script src="/javascripts/jquery-1.9.1.min.js"></script>
<script src="/javascripts/bootstrap.min.js"></script>
<script src="/javascripts/movie.js"></script>
<script src="/javascripts/jquery.json-2.4.js"></script>
<script src="/javascripts/jquery.json-2.4.js"></script>
<!-nansnshshshshs-->
</body>
</html>
</html>
2 changes: 2 additions & 0 deletions views/header.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<!DOCTYPE html>
<html lang="en">
<head>

<!-- thios is new com mit -->
<meta charset="utf-8">
<title><%=: title %></title>
<!-- Bootstrap -->
Expand Down
6 changes: 3 additions & 3 deletions views/home.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<% include header.html %>
<h1>Welcome <%= user.username %>, 欢迎登陆!!</h1>
<a claa="btn" href="/logout">退出</a>
<% include footer.html %>
<h1>Welcome <%= user.username %>, Gibberih nnnnnnnn</h1>
<a claa="btn" href="/logout">chineese</a>
<% include footer.html %>
3 changes: 2 additions & 1 deletion views/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<% include header.html %>
<!--ajdhsjhdjshdjsd-->
<h1>Welcome to <%= title %></h1>
<p><a href="/login">登陆</a></p>
<% include footer.html %>
<% include footer.html %>
3 changes: 2 additions & 1 deletion views/movie.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<% include header.html %>
<!--kjskjkajkjkwdj-->
<div class="container-fluid">
<div class="row-fluid">
<div class="span8">
Expand All @@ -12,4 +13,4 @@
</div>
</div>
</div>
<% include footer.html %>
<% include footer.html %>