Browse Source

vision 0.0.1

maguohua 8 years ago
parent
commit
b8edb99188
11 changed files with 69 additions and 33 deletions
  1. 6 1
      .babelrc
  2. 12 0
      README.md
  3. 5 22
      app.js
  4. 3 1
      config/default.js
  5. 3 1
      config/production.js
  6. 1 1
      index.js
  7. 5 2
      models/food.js
  8. 5 4
      mongodb/db.js
  9. 5 1
      package.json
  10. 14 0
      routes/home.js
  11. 10 0
      routes/index.js

+ 6 - 1
.babelrc

@@ -1,3 +1,8 @@
 {
-  "presets": ["stage-3"]
+  	"presets": ["stage-3"],
+  	"plugins": [
+  		"transform-async-to-generator",
+        "transform-es2015-modules-commonjs",
+        "transform-export-extensions"
+    ]
 }

+ 12 - 0
README.md

@@ -34,8 +34,20 @@ npm run dev  访问: http://localhost:3000
 ```
 
 
+# 部署
+
+```
+部署服务器采用百度应用引擎BAE基础版
+
+部署方式:[百度BAE部署文档](https://cloud.baidu.com/doc/BAE/GUIGettingStarted.html) 
+
+```
+
+
+
 # 目标功能
 
+- [ ] 静态数据
 - [ ] 定位功能
 - [ ] 选择城市
 - [ ] 搜索地址

+ 5 - 22
app.js

@@ -1,28 +1,11 @@
-const express = require('express');
+import express from 'express';
+import db from './mongodb/db.js';
+import config from 'config-lite';
+import router from './routes/index.js';
 const app = express();
-const db = require('./mongodb/db.js');
-const Food = require('./models/food.js');
-const config = require('config-lite');
 
 app.use(express.static('./public'))
 
-app.get('/', async (req, res) => {
-	// const a = new Food({name: 'aaaa'});
-	// a.save((err) => {
-	// 	if (err) {
-	// 		console.log('sdfsf')
-	// 	}
-	// 	res.send('数据保存成功')
-	// })
-	const foods = await Food.findOne();
-	res.send(foods.toString());
-	// Food.findOne().then(foods => {
-	// 	res.send(foods.toString());
-	// })
-})
-app.get('/abc', (req, res) => {
-	res.json({a: 1})
-})
-
+router(app);
 
 app.listen(config.port)

+ 3 - 1
config/default.js

@@ -1,4 +1,6 @@
-module.exports = {
+'use strict';
+
+export default {
 	port: 3000,
 	url: 'mongodb://localhost:27017/bae'
 }

+ 3 - 1
config/production.js

@@ -1,4 +1,6 @@
-module.exports = {
+'use strict';
+
+export default {
 	port: 18080,
 	url: 'mongodb://d762000ca46b4ada9a372db528e48f47:786336dc346e4d3787c7cc96a4ab3312@mongo.duapp.com:8908/sxouaLdjCuZUZSRDwuGn'
 }

+ 1 - 1
index.js

@@ -1,2 +1,2 @@
-require('babel-register');
+require('babel-core/register');
 require('./app.js');

+ 5 - 2
models/food.js

@@ -1,8 +1,11 @@
-const mongoose = require('mongoose');
+'use strict';
+
+import mongoose from 'mongoose'
+
 const foodSchema = new mongoose.Schema({
 	name: String
 })
 
 const Food = mongoose.model('Food', foodSchema)
 
-module.exports = Food;
+export default Food

+ 5 - 4
mongodb/db.js

@@ -1,8 +1,9 @@
 'use strict';
-const mongoose = require('mongoose');
-mongoose.Promise = global.Promise
-const config = require('config-lite');
+
+import mongoose from 'mongoose';
+import config from 'config-lite';
 mongoose.connect(config.url);
+mongoose.Promise = global.Promise;
 
 const db = mongoose.connection;
 
@@ -10,7 +11,7 @@ db.once('open' ,() => {
 	console.log('连接数据成功')
 })
 
-module.exports = db;
+export default db;
 
 
 // var mongoose = require('mongoose');

+ 5 - 1
package.json

@@ -16,6 +16,7 @@
   "license": "ISC",
   "dependencies": {
     "babel": "^6.23.0",
+    "babel-cli": "^6.24.1",
     "babel-core": "^6.24.0",
     "babel-preset-es2015": "^6.24.0",
     "babel-preset-stage-3": "^6.22.0",
@@ -35,6 +36,9 @@
     "supervisor": "^0.12.0"
   },
   "devDependencies": {
-    
+    "babel-plugin-transform-async-to-generator": "^6.24.1",
+    "babel-plugin-transform-es2015-classes": "^6.24.1",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+    "babel-plugin-transform-export-extensions": "^6.22.0"
   }
 }

+ 14 - 0
routes/home.js

@@ -0,0 +1,14 @@
+'use strict';
+
+import express from 'express';
+import Food from '../models/food.js';
+const router = express.Router();
+
+router.get('/', async (req, res) => {
+	
+	const foods = await Food.findOne();
+	res.send(foods.toString());
+	
+});
+
+export default router;

+ 10 - 0
routes/index.js

@@ -0,0 +1,10 @@
+'use strict';
+
+import home from './home.js'
+
+export default app => {
+	app.get('/', (req, res, next) => {
+		res.redirect('/home');
+	});
+	app.use('/home', home);
+}