diff --git a/.gitignore b/.gitignore index 5148e52..780103f 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ jspm_packages # Optional REPL history .node_repl_history + +# Upload File +uploads \ No newline at end of file diff --git a/app.js b/app.js index fe91d77..91818f9 100644 --- a/app.js +++ b/app.js @@ -6,6 +6,7 @@ var cookieParser = require('cookie-parser'); var bodyParser = require('body-parser'); var session = require('express-session'); var mongoStore = require('connect-mongo')(session); +var mount_uploadify = require('uploadify'); var routes = require('./routes/index'); var users = require('./routes/users'); @@ -42,6 +43,16 @@ app.use(session({ app.use(express.static(path.join(__dirname, 'public'))); app.use('/', routes); +mount_uploadify(app, { + path: '/fileupload', + fileKey: 'myfile', + multer: { + dest: 'uploads/' + }, + callback: function(req) { + return req.files + } +}); app.use('/api', api); app.use('/users', users); diff --git a/package.json b/package.json index 2ce34dc..8fe8801 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "mysql": "^2.11.1", "node-readability": "^2.2.0", "serve-favicon": "~2.3.0", - "supervisor": "^0.11.0" + "supervisor": "^0.11.0", + "uploadify": "^1.0.7" } } diff --git a/public/index.html b/public/index.html index 294ef17..e41f7eb 100644 --- a/public/index.html +++ b/public/index.html @@ -1,62 +1,60 @@ - - - - - - - 我的书签-随时随地查看你的网络书签 - - - - - - - - -
- - -
+ + + + + + 我的书签-随时随地查看你的网络书签 + + + + + + + +
-
-
-
-
-
-     Copyright ©All Rights Reserved LCQ(假装网站有个页脚)  |  关于网站  |  联系我  |  我爱这个世界 + + +
+
+
+
+
+
+     Copyright ©All Rights Reserved LCQ(假装网站有个页脚)  |  关于网站  |  联系我  |  我爱这个世界 +
+
+ +
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/scripts/controllers/settings-controller.js b/public/scripts/controllers/settings-controller.js index 976ae33..3930b29 100644 --- a/public/scripts/controllers/settings-controller.js +++ b/public/scripts/controllers/settings-controller.js @@ -43,6 +43,19 @@ app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$ } } + setTimeout(function() { + $("#fileuploader").uploadFile({ + url: "fileupload", + multiple: true, + dragDrop: true, + fileName: "myfile", + onSuccess: function(files, response, xhr, pd) { + console.log(JSON.stringify(response[0])); + }, + }); + }, 1000); + + pubSubService.publish('Common.menuActive', { login: true, index: 3 diff --git a/public/views/settings.html b/public/views/settings.html index 2d51fae..b939bb6 100644 --- a/public/views/settings.html +++ b/public/views/settings.html @@ -6,7 +6,7 @@ 书签显示设置 - 菜单设置 + 上传书签
@@ -30,7 +30,7 @@ 书签显示设置
- 菜单设置 +
Upload