登陆

Author: xiaolongXL

doc/demo/day1/shoppingCar/app.js

@@ -11,7 +11,6 @@ var users = require('./routes/users');
 
 var register = require('./routes/register');
 var login = require('./routes/login');
-
 var app = express();
 
 // view engine setup
@@ -23,14 +22,10 @@ app.set('view engine', 'jade');
 app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
-app.use(cookieParser('xiaolong'));
+app.use(cookieParser(''));
 app.use(session({ 
-    cookie:{
-        path: '/', 
-        httpOnly: true, 
-        secure: true, 
-        maxAge: 5
-    }
+    secret: 'xiaolong', 
+    cookie: { maxAge: 10000 }
 }));
 app.use(express.static(path.join(__dirname, 'public')));
 

doc/demo/day1/shoppingCar/npm-debug.log

@@ -17,7 +17,7 @@
 10 error You can get their info via:
 10 error     npm owner ls shoppingCar
 10 error There is likely additional logging output above.
-11 error System Darwin 13.3.0
+11 error System Darwin 14.0.0
 12 error command "node" "/usr/local/bin/npm" "start"
 13 error cwd /Users/apple/Documents/www/nodejs-tutorial/doc/demo/day1/shoppingCar
 14 error node -v v0.10.29

doc/demo/day1/shoppingCar/package.json

@@ -6,12 +6,13 @@
     "start": "node ./bin/www"
   },
   "dependencies": {
-    "express": "~4.9.0",
     "body-parser": "~1.8.1",
     "cookie-parser": "~1.3.3",
-    "morgan": "~1.3.0",
-    "serve-favicon": "~2.1.3",
     "debug": "~2.0.0",
-    "jade": "~1.6.0"
+    "express": "~4.9.0",
+    "jade": "~1.6.0",
+    "mongoose": "^3.8.18",
+    "morgan": "~1.3.0",
+    "serve-favicon": "~2.1.3"
   }
-}
+}

doc/demo/day1/shoppingCar/public/index.html

@@ -10,8 +10,6 @@
 	<script>
 	window.onload = function(){
 
-<<<<<<< HEAD
-=======
 		function reminder(msg){
 			$('body').append('<div class="store_suc"></div>');
 			$('.store_suc').html(msg).css('display','block').stop().animate({opacity:0.5},200,function(){
@@ -26,7 +24,6 @@
 			});
 		};
 
->>>>>>> 88bde3a1c7f02d2e44171c6bfaa2a5b86e878451
 		var oLogin = document.getElementById('login');
 		var oRegister = document.getElementById('register');
 
@@ -38,14 +35,6 @@
 	             url: "http://localhost:3000/login",
 	             data: {
 	             	'name':sName,
-<<<<<<< HEAD
-	             	'sex':sPassword
-	             },
-	             dataType: "json",
-	             success: function(data){
-                    if(data.code){
-	                	alert('登陆成功!');
-=======
 	             	'password':sPassword
 	             },
 	             dataType: "json",
@@ -55,7 +44,6 @@
 	                	$('.loginBox').fadeOut(500);;
 	                }else{
 	                	reminder(data.msg.detail);
->>>>>>> 88bde3a1c7f02d2e44171c6bfaa2a5b86e878451
 	                };
                   }
 	         });
@@ -70,14 +58,6 @@
 	             url: "http://localhost:3000/register",
 	             data: {
 	             	'name':sName,
-<<<<<<< HEAD
-	             	'sex':sPassword
-	             },
-	             dataType: "json",
-	             success: function(data){
-	                if(data.code){
-	                	alert('注册成功，请登陆!');
-=======
 	             	'password':sPassword
 	             },
 	             dataType: "json",
@@ -86,7 +66,6 @@
 	                	reminder('注册成功，请登陆!');
 	                }else{
 	                	reminder(data.msg.detail);
->>>>>>> 88bde3a1c7f02d2e44171c6bfaa2a5b86e878451
 	                };
 	              }
 	         });

doc/demo/day1/shoppingCar/public/stylesheets/style.css

@@ -95,8 +95,6 @@ header{
 }
 .register{
 	top:170px;
-<<<<<<< HEAD
-=======
 }
 .store_suc{
 	background:black;
@@ -111,5 +109,4 @@ header{
 	padding:29px 26px;
 	text-align:center;
 	z-index:1000;
->>>>>>> 88bde3a1c7f02d2e44171c6bfaa2a5b86e878451
 }

doc/demo/day1/shoppingCar/routes/login.js

@@ -1,6 +1,5 @@
 var express = require('express');
 var router = express.Router();
-<<<<<<< HEAD
 
 /* GET home page. */
 router.post('/', function(req, res) {
@@ -12,69 +11,6 @@ router.post('/', function(req, res) {
  	res.send({
  		code:'0'
  	});
-=======
-var userArr = require('./userjson.js');
-
-function findJson(arr,str){
-	
-	for(var i=0; i<arr.length; i++){
-		if(arr[i].name == str){
-			return true;
-		};
-	};
-
-	return false;
-};
-
-function getJson(arr,attr){
-
-	for(var i=0; i<arr.length; i++){
-		var json = arr[i];
-
-		if(json.name == attr){
-			return arr[i]
-		};
-	};
-
-	return null;
-};
-
-/* GET home page. */
-router.post('/', function(req, res) {
-	var reqJson = req.body;
-	console.log(userArr);
-	if(findJson(userArr,reqJson.name)){
-
-		var userJson = getJson(userArr,reqJson.name);
-
-		if(userJson.password == reqJson.password){
-			res.send({
-		 		code:0,
-		 		msg:{
-		 			detail:'登陆成功'
-		 		}
-		 	});
-
-		}else{
-			res.send({
-		 		code:1,
-		 		msg:{
-		 			detail:'用户名或密码错误'
-		 		}
-		 	});
-		};
-	}else{
-		res.send({
-	 		code:1,
-	 		msg:{
-	 			detail:'用户名或密码错误'
-	 		}
-	 	});
-	};
-	console.log(userArr);
-	//console.log(1);
-
->>>>>>> 88bde3a1c7f02d2e44171c6bfaa2a5b86e878451
 });
 
 module.exports = router;

doc/demo/day1/shoppingCar/routes/register.js

@@ -1,63 +1,29 @@
 var express = require('express');
 var router = express.Router();
-<<<<<<< HEAD
-=======
-var userArr = require('./userjson.js');
+var mongoose = require('mongoose');
 
-function findJson(arr,str){
-	
-	for(var i=0; i<arr.length; i++){
-		if(arr[i].name == str){
-			return true;
-		};
-	};
-
-	return false;
-};
->>>>>>> 88bde3a1c7f02d2e44171c6bfaa2a5b86e878451
+mongoose.connect('mongodb://localhost:7000/mytest');
+var db = mongoose.connection;
+var kittySchema = mongoose.Schema({
+    name: String,
+    password:String
+});
+var Kitte = mongoose.model('user', kittySchema);
 
 /* GET home page. */
 router.post('/', function(req, res) {
-	var reqJson = req.body;
-<<<<<<< HEAD
-	req.session.name = reqJson.name; 
- 	res.send({
- 		code:0
- 	});
-=======
 
 	/*{
 		'name':'xxx',
 		'password':'xxx'
 	}*/
-
-
-	//判断是否已经注册
-	if(findJson(userArr,reqJson.name)){
-		res.send({
-	 		code:1,
-	 		msg:{
-	 			detail:'此用户已经注册'
-	 		}
-	 	});
-	 	
-	}else{
-		userArr.push({
-			'name':reqJson.name,
-			'password':reqJson.password
-		});
-		
-		res.send({
-	 		code:0,
-	 		msg:{
-	 			detail:'注册成功'
-	 		}
-	 	});
-	 	
+	var getJson = req.body;
+	if(){
 
 	};
- 	console.log(userArr);
->>>>>>> 88bde3a1c7f02d2e44171c6bfaa2a5b86e878451
+	/*var fluffy = new Kitte({ name: 'xiaolong' });
+	fluffy.save();*/
+
 });
 
 module.exports = router;