From eb2657aac3f23c48dc5159ba7b41ea34c71fdd3f Mon Sep 17 00:00:00 2001 From: Harpreet Date: Fri, 25 Feb 2022 14:32:39 +0530 Subject: [PATCH 01/47] added yaml --- views/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.html b/views/home.html index 1ae8d6b..34031f7 100644 --- a/views/home.html +++ b/views/home.html @@ -1,4 +1,4 @@ <% include header.html %> -

Welcome <%= user.username %>, 欢迎登陆！！

+

Welcome <%= user.username %>, Gibberih

退出 <% include footer.html %> \ No newline at end of file From c551144ecfb43359a5bd30d3e94f0d11a971383e Mon Sep 17 00:00:00 2001 From: Harpreet Date: Fri, 25 Feb 2022 14:50:11 +0530 Subject: [PATCH 02/47] added files2 --- .travis.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .travis.yaml diff --git a/.travis.yaml b/.travis.yaml new file mode 100644 index 0000000..cfdba08 --- /dev/null +++ b/.travis.yaml @@ -0,0 +1,3 @@ +language: node_js +node_js: + - 7 \ No newline at end of file From 09c60688704093ec428b17bc41eedc65389cdf77 Mon Sep 17 00:00:00 2001 From: Harpreet Date: Fri, 25 Feb 2022 14:57:58 +0530 Subject: [PATCH 03/47] commit 2 --- views/home.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/views/home.html b/views/home.html index 34031f7..be9a7d1 100644 --- a/views/home.html +++ b/views/home.html @@ -1,4 +1,8 @@ <% include header.html %> +<<<<<<< HEAD

Welcome <%= user.username %>, Gibberih

+======= +

Welcome <%= user.username %>, Gibberish ！

+>>>>>>> ed7a1b502a76c544fd2d27d9af6f824eac0af375 退出 -<% include footer.html %> \ No newline at end of file +<% include footer.html %> From bd1fde74f56da70db33308643edc22e567d9134a Mon Sep 17 00:00:00 2001 From: Harpreet Date: Fri, 25 Feb 2022 15:04:44 +0530 Subject: [PATCH 04/47] thrid commit --- .travis.yaml => .travis.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .travis.yaml => .travis.yml (100%) diff --git a/.travis.yaml b/.travis.yml similarity index 100% rename from .travis.yaml rename to .travis.yml From 76ef007ed2cca6fcc8c76e6814218a819c64e0b5 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Fri, 25 Feb 2022 16:21:21 +0530 Subject: [PATCH 05/47] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d4d2286..31ceaf4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +@@@@@@@@@@@@@@@@@@@@@@@ + Express3 Demo ============================== From 4657a4625a78d32714a0340eda79f6b48f6dda23 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Fri, 25 Feb 2022 16:22:15 +0530 Subject: [PATCH 06/47] Update home.html --- views/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.html b/views/home.html index be9a7d1..e4b5885 100644 --- a/views/home.html +++ b/views/home.html @@ -1,6 +1,6 @@ <% include header.html %> <<<<<<< HEAD -

Welcome <%= user.username %>, Gibberih

+

Welcome <%= user.username %>, Walia

=======

Welcome <%= user.username %>, Gibberish ！

>>>>>>> ed7a1b502a76c544fd2d27d9af6f824eac0af375 From e53c353ee3ac1c158f19905c50a305893cae2044 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Fri, 25 Feb 2022 16:25:07 +0530 Subject: [PATCH 07/47] commmmmit --- views/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.html b/views/home.html index be9a7d1..a600eab 100644 --- a/views/home.html +++ b/views/home.html @@ -1,6 +1,6 @@ <% include header.html %> <<<<<<< HEAD -

Welcome <%= user.username %>, Gibberih

+

Welcome <%= user.username %>, Gibberih nnnnnnnn

=======

Welcome <%= user.username %>, Gibberish ！

>>>>>>> ed7a1b502a76c544fd2d27d9af6f824eac0af375 From b638c9acd8514277508545664eebd4097de45a55 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Fri, 25 Feb 2022 16:41:56 +0530 Subject: [PATCH 08/47] comiit 2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 31ceaf4..90b805d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -@@@@@@@@@@@@@@@@@@@@@@@ +YYYYYYYYyyyyYYYYYYYYYYYYYYYYY Express3 Demo ============================== From d593563957f9d8310289605e38b07ffe03bdfeb8 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Fri, 25 Feb 2022 16:46:14 +0530 Subject: [PATCH 09/47] Update footer.html --- views/footer.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/views/footer.html b/views/footer.html index c0d1d9f..b942714 100644 --- a/views/footer.html +++ b/views/footer.html @@ -2,5 +2,7 @@ + + - \ No newline at end of file + From 9661939250b72b3c4958705d8476bfc49d564ff3 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 11:51:14 +0530 Subject: [PATCH 10/47] Update header.html test commit for PR --- views/header.html | 1 + 1 file changed, 1 insertion(+) diff --git a/views/header.html b/views/header.html index 789f2ae..d55b5c0 100644 --- a/views/header.html +++ b/views/header.html @@ -1,6 +1,7 @@ + <%=: title %> From 3925ba9b600fea18aaa2049f6226fd5763b5ab71 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 11:58:16 +0530 Subject: [PATCH 11/47] PR Number 4 --- views/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/header.html b/views/header.html index d55b5c0..9f29ca0 100644 --- a/views/header.html +++ b/views/header.html @@ -1,7 +1,7 @@ - + <%=: title %> From d059d9d2b6a4e6b1091ca974acb76eea7393471a Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:04:54 +0530 Subject: [PATCH 12/47] PR4 --- views/header.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/header.html b/views/header.html index 9f29ca0..53e4704 100644 --- a/views/header.html +++ b/views/header.html @@ -2,6 +2,8 @@ + + <%=: title %> From afacd483abfdf6b72994d1a7416c63431ea9fd88 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:14:15 +0530 Subject: [PATCH 13/47] Update header.html --- views/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/header.html b/views/header.html index 53e4704..7ed16cb 100644 --- a/views/header.html +++ b/views/header.html @@ -1,7 +1,7 @@ - + From 6f93da715d37801c33ec196ee1b0ec3b2dbfaaaf Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:16:19 +0530 Subject: [PATCH 14/47] Update header.html --- views/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/header.html b/views/header.html index d55b5c0..a2e640c 100644 --- a/views/header.html +++ b/views/header.html @@ -1,7 +1,7 @@ - + <%=: title %> From 186c1af2242fff608cba844c8743940559b61545 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:52:13 +0530 Subject: [PATCH 15/47] [skip travis] Update README --- views/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/footer.html b/views/footer.html index b942714..84d74ea 100644 --- a/views/footer.html +++ b/views/footer.html @@ -3,6 +3,6 @@ - + From a7a25af0a5fb0e5abedc128cd25eaa8b2fc5913d Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 12:53:18 +0530 Subject: [PATCH 16/47] [skip travis] Update README --- views/footer.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/footer.html b/views/footer.html index b942714..2d3b4e4 100644 --- a/views/footer.html +++ b/views/footer.html @@ -1,3 +1,5 @@ + + From a514639c127804b8828144a4b76972081300e5ea Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:03:34 +0530 Subject: [PATCH 17/47] Update movie.html --- views/movie.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/movie.html b/views/movie.html index 4dc68bb..5ff9345 100644 --- a/views/movie.html +++ b/views/movie.html @@ -1,4 +1,5 @@ <% include header.html %> +
@@ -12,4 +13,4 @@
-<% include footer.html %> \ No newline at end of file +<% include footer.html %> From 81bad9aaa71dccfc594121725e1cd5e23063917a Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:12:32 +0530 Subject: [PATCH 18/47] skip travis --- app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 75725a5..806c115 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ /** - * Module dependencies. + * Module dependencies.kdjksjdksjkdjkdjfkjf */ var express = require('express') @@ -94,4 +94,4 @@ function notAuthentication(req, res, next) { return res.redirect('/'); } next(); -} \ No newline at end of file +} From 9ecd68d09495b9f1b6bac74f6a5a076f9758f387 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:13:23 +0530 Subject: [PATCH 19/47] skip travis --- app.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index 75725a5..e0d60e7 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,7 @@ /** - * Module dependencies. + * Module dependencies.ankwnjhjehruehrejrhejfbjdfbjdbfjfbe + dsllskdlskdlsdk */ var express = require('express') @@ -94,4 +95,4 @@ function notAuthentication(req, res, next) { return res.redirect('/'); } next(); -} \ No newline at end of file +} From f2df13d31a23edd8d5beaaca8b332d1d68b47d6d Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:18:04 +0530 Subject: [PATCH 20/47] [skip travis] --- views/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/index.html b/views/index.html index 2dc2c2a..0e5d278 100644 --- a/views/index.html +++ b/views/index.html @@ -1,4 +1,5 @@ <% include header.html %> +

Welcome to <%= title %>

登陆

-<% include footer.html %> \ No newline at end of file +<% include footer.html %> From 77edb45759ba0be96b44a9629ed7780f139df4c4 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:19:19 +0530 Subject: [PATCH 21/47] [skip travis] Model --- models/Movie.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/Movie.js b/models/Movie.js index d219591..88ec505 100644 --- a/models/Movie.js +++ b/models/Movie.js @@ -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(); \ No newline at end of file +module.exports = new MovieDAO(); From 827ff1f7d60777d067b33639377a9886f8998a02 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:23:08 +0530 Subject: [PATCH 22/47] Update movie.js --- public/javascripts/movie.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/javascripts/movie.js b/public/javascripts/movie.js index 180d64e..a9ea43f 100644 --- a/public/javascripts/movie.js +++ b/public/javascripts/movie.js @@ -1,5 +1,5 @@ $(function() { - +//test test test var mdata={}; var url = '/javascripts/movie.json'; @@ -42,4 +42,4 @@ $(function() { }; -}); \ No newline at end of file +}); From 4ed8940086962474908b54ed7067efafefe53ebb Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:24:06 +0530 Subject: [PATCH 23/47] [skip travis] --- routes/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes/index.js b/routes/index.js index 935c363..86d1e50 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,6 +1,6 @@ /* - * GET home page. + * GET home page.dbjshdjshdjshdsjhdjshd */ exports.index = function(req, res){ @@ -34,4 +34,4 @@ exports.logout = function(req, res){ exports.home = function(req, res){ res.render('home', { title: 'Home'}); -}; \ No newline at end of file +}; From 5e08737297b2edba68164f2763cc7ebca0da31e4 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:28:14 +0530 Subject: [PATCH 24/47] [skip travis] --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 90b805d..cda96bb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -YYYYYYYYyyyyYYYYYYYYYYYYYYYYY - +ssssssssssssssssswwsaddsdsdsdsssfsfsfssdadadaasasasasasasasasa Express3 Demo ============================== From 8145e140107a889bb116a9ac449d9f9da5db1e17 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:37:53 +0530 Subject: [PATCH 25/47] Commit without skip --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index cda96bb..8220817 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ + +This is commit without skip command + ssssssssssssssssswwsaddsdsdsdsssfsfsfssdadadaasasasasasasasasa Express3 Demo ============================== From 1b36fc914437d98ed09699b58473bdf1c72caefd Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:39:30 +0530 Subject: [PATCH 26/47] Commit without Skkip --- app.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index e25e5bc..41fef79 100644 --- a/app.js +++ b/app.js @@ -1,8 +1,10 @@ /** - * Module dependencies.ankwnjhjehruehrejrhejfbjdfbjdbfjfbe - dsllskdlskdlsdk + hjhjshdjsdhjsdhjsdhjsdh + skdjksjdksjdksjds + skdksjdksjdksjdksdj + sdksdksjksdksdnksdnksd */ From 0bfa165fbe8cd43d63d3c9268d23c64ad442caa3 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 13:48:22 +0530 Subject: [PATCH 27/47] [skip travis] [skip travis] --- app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.js b/app.js index 41fef79..6e01306 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ /** - +This is comit with Skip hjhjshdjsdhjsdhjsdhjsdh skdjksjdksjdksjds skdksjdksjdksjdksdj From f7fe6ccb0e1746d571640cf4b2830ed1e7bea999 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 22:56:57 +0530 Subject: [PATCH 28/47] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cfdba08..604ed87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ language: node_js node_js: - - 7 \ No newline at end of file + - 7 +commit_message !~ /no-deploy From 6b821f780c7efaa210052a6becf97c1a3172884a Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Mon, 28 Feb 2022 23:05:12 +0530 Subject: [PATCH 29/47] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 604ed87..c52102e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: node_js node_js: - 7 -commit_message !~ /no-deploy +commit_message: "NoCommit" From 3b30b7fe7fe17dbbefe274a3adf7d907b169f11e Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 18:38:51 +0530 Subject: [PATCH 30/47] Commit Condition Added - test 1 Commit Condition Added - test 1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c52102e..91c5eaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: node_js node_js: - 7 -commit_message: "NoCommit" +if: commit_message ~ /commit/ From a1c4aaa5991abb6d01b30e6fcd39dbf205204275 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 19:06:28 +0530 Subject: [PATCH 31/47] Test 2 happening --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 91c5eaf..cccad46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: node_js node_js: - 7 -if: commit_message ~ /commit/ +if: commit_message =~ ^build From 44ef9519207c0f8783cc535378de4caff4b11830 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 19:16:08 +0530 Subject: [PATCH 32/47] build build PR This time --- README.md | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/README.md b/README.md index 8220817..84eabdc 100644 --- a/README.md +++ b/README.md @@ -1,39 +1 @@ - -This is commit without skip command - -ssssssssssssssssswwsaddsdsdsdsssfsfsfssdadadaasasasasasasasasa -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 +EMPTY FILE From 6e78a61fdd11b93326d94e34960f23e4caab561f Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 19:16:47 +0530 Subject: [PATCH 33/47] build build this time --- README.md | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/README.md b/README.md index cda96bb..4061f28 100644 --- a/README.md +++ b/README.md @@ -1,36 +1 @@ -ssssssssssssssssswwsaddsdsdsdsssfsfsfssdadadaasasasasasasasasa -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 +EMPTY EMPTY From 714fabd52242f720fa113a0732c3b3f3d8184a25 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 19:26:20 +0530 Subject: [PATCH 34/47] build build --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 292004f..e3633a4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ -EMPTY EMPTY - +Hello World From 0a24b7cd3360ae0b36ef1f43ce530e4d6700a902 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 19:39:44 +0530 Subject: [PATCH 35/47] test build --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e3633a4..104ec18 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Hello World +Hello World. I am here From 34f5af669efb471a9d49ec372c2d36fa4e77dc81 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 19:53:27 +0530 Subject: [PATCH 36/47] Update README.md no request to buld --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 104ec18..c40ca7e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Hello World. I am here +Hello World. I am here and doing specific case testing with first commit From 2b221769168088b06f7195c1624cd21eb9296f6b Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 19:56:18 +0530 Subject: [PATCH 37/47] Update Readme 2 build --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c40ca7e..2c6faa6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Hello World. I am here and doing specific case testing with first commit +Hello World. I am here and doing specific case testing with second commit From 97c91860cfcdb939b50d802e16318d39c693ea11 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:04:02 +0530 Subject: [PATCH 38/47] no bld no bld --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c6faa6..7d61c03 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Hello World. I am here and doing specific case testing with second commit +Hello this is a first commit in readme file From f586aebb0bb35b4c17ab29df6e177d880141e7cd Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:06:08 +0530 Subject: [PATCH 39/47] Update app.js build --- app.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app.js b/app.js index 6e01306..346b985 100644 --- a/app.js +++ b/app.js @@ -1,10 +1,6 @@ /** -This is comit with Skip - hjhjshdjsdhjsdhjsdhjsdh - skdjksjdksjdksjds - skdksjdksjdksjdksdj - sdksdksjksdksdnksdnksd +this is second commit in app.js */ From a33eabbce4ab205cc7a28ea7413a783a3a428cca Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:07:33 +0530 Subject: [PATCH 40/47] Update package.json build --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 5b77ff1..c3b69a8 100644 --- a/package.json +++ b/package.json @@ -11,4 +11,5 @@ "express": "3.2.2", "ejs": "*" } -} \ No newline at end of file +} +//this is throd commit From bdc2c0cc3ae9a2449708d6aeb200e4fd0e71c588 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:14:43 +0530 Subject: [PATCH 41/47] nothing to bld nothing to bld --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c3b69a8..7f4bcba 100644 --- a/package.json +++ b/package.json @@ -12,4 +12,4 @@ "ejs": "*" } } -//this is throd commit + From cffa6506508251bcb614c053c5f68e974074c034 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:17:20 +0530 Subject: [PATCH 42/47] this will bld build --- public/javascripts/movie.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/movie.js b/public/javascripts/movie.js index a9ea43f..ae42543 100644 --- a/public/javascripts/movie.js +++ b/public/javascripts/movie.js @@ -1,5 +1,5 @@ $(function() { -//test test test +//holla hoop var mdata={}; var url = '/javascripts/movie.json'; From 2e0abd68bce9683060ee1d39cdccd6818f8ff222 Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:18:32 +0530 Subject: [PATCH 43/47] Update index.js build --- routes/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/index.js b/routes/index.js index 86d1e50..f343401 100644 --- a/routes/index.js +++ b/routes/index.js @@ -1,6 +1,6 @@ /* - * GET home page.dbjshdjshdjshdsjhdjshd + * GET home Hello world */ exports.index = function(req, res){ From db5c4c96287f99acdddf93e6d9eb4a50f4f9cdcf Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:26:36 +0530 Subject: [PATCH 44/47] Update home.html nothing blding --- views/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/home.html b/views/home.html index 1242d3a..48de1e3 100644 --- a/views/home.html +++ b/views/home.html @@ -1,4 +1,4 @@ <% include header.html %>

Welcome <%= user.username %>, Gibberih nnnnnnnn

- 退出 + chineese <% include footer.html %> From a839c026047045305c777d21581e45c746e6fc4e Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:43:04 +0530 Subject: [PATCH 45/47] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7d61c03..a0191dd 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Hello this is a first commit in readme file +keep on doing From a703b6883e9590be9a8b01a9aa2977f76ef597ab Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:47:35 +0530 Subject: [PATCH 46/47] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index a0191dd..3e70217 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ - -keep on doing +read ,meeee From b7a505dc531a3b78a63a324108d3dbfcfae0154d Mon Sep 17 00:00:00 2001 From: harpreetsinghwalia13 <93133164+harpreetsinghwalia13@users.noreply.github.com> Date: Fri, 2 Sep 2022 18:36:00 +0530 Subject: [PATCH 47/47] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3e70217..e63787e 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ read ,meeee +mkmkkm