prepare qrcode

alsotang · alsotang · commit 1ccb293e5a6c · 2016-07-17T16:31:46.000+08:00
diff --git a/app.js b/app.js
@@ -5,6 +5,9 @@ var multer = require('multer');
 var request = require('request')
 var qsLib = require('qs')
 var _ = require('lodash')
+var session = require('express-session')
+var flash = require('connect-flash');
+var yaqrcode = require('yaqrcode');
 
 var authMiddleware = require('./middleware/auth')
 
@@ -13,11 +16,15 @@ var app = express();
 app.set('views', './view')
 app.set('view engine', 'ejs');
 
-app.use(bodyParser.urlencoded({extended: true}))
 
 app.use('/static', express.static('./static'))
 app.use(authMiddleware.userAuth)
 
+app.use(bodyParser.urlencoded({extended: true}))
+app.use(session({
+  secret: 'project-9',
+}))
+app.use(flash());
 
 app.use(function (req, res, next) {
   res.locals.tabname = res.locals.tabname || '';
@@ -100,7 +107,8 @@ app.get('/showlist', function (req, res) {
     res.render('list', {
       list: listInfo.list.reverse(),
       labels: labels,
-      tabname: 'showlist'
+      tabname: 'showlist',
+      info: req.flash('info')
     })
   })
 })
@@ -113,12 +121,38 @@ app.get('/showpic/:picid', function (req, res) {
 
     var picInfo = _.find(listInfo.list, {_id: req.params.picid})
 
+    var picUrl = config.my_main_page + req.originalUrl
+
     res.render('pic_detail', {
       picInfo: picInfo,
+      picUrl: picUrl,
     })
   })
 })
 
+
+app.post('/delpic', function (req, res) {
+  var picid = req.body.picid;
+
+  var delUrl = config.api_backend + '/delete'
+
+  request.post({
+    url: delUrl,
+    json: true,
+    body: {
+      id: picid
+    }
+  }, function (err, response) {
+    if (err) {
+      return res.send(err);
+    }
+
+    req.flash('info', '删除成功！')
+
+    res.redirect('/showlist')
+  })
+})
+
 app.listen(config.web_app_port, function () {
   console.log(`${new Date}, app is listening at ${config.web_app_port}`)
 });
diff --git a/config.js b/config.js
@@ -6,6 +6,8 @@ var config = {
     linktang: 'muerqiaohuiche',
   },
   api_backend: 'http://119.29.70.101:3000',
+
+  my_main_page: 'http://project9.qcourse.net',
 }
 
 
diff --git a/package.json b/package.json
@@ -25,6 +25,9 @@
     "multer": "^1.1.0",
     "request": "^2.73.0",
     "qs": "^6.2.0",
-    "lodash": "^4.13.1"
+    "lodash": "^4.13.1",
+    "express-session": "^1.14.0",
+    "connect-flash": "^0.1.1",
+    "yaqrcode": "^0.2.1"
   }
 }
diff --git a/readme.md b/readme.md
@@ -9,8 +9,6 @@
 1. 作为一个授权用户，我可以输入一个关键词来搜索之前上传的图片，支持搜索名称、标签、alt文本
 1. 作为一个授权用户，我可以点击搜索结果中的某一张照片，并打开照片详情页，查看图片的所有详细字段
 1. 作为一个授权用户，我可以删除一张我之前上传的照片
-1. 作为一个授权用户，我可以将某个照片的下载地址制作成短地址，并生成所对应的二维码，显示在图片详情页
-1. 我可以用微信扫描生成的二维码，在微信中打开对应的图片
-
+1. 作为一个授权用户，我可以将某个照片的下载地址生成对应的二维码，显示在图片详情页
 
 想要了解项目的完整构建过程，请参考[wiki](https://github.com/qcourse/node-project-9/wiki/)。
diff --git a/view/footer.ejs b/view/footer.ejs
@@ -1,5 +1,3 @@
 
-<script src="/static/vendor/jquery-2.2.4.js"></script>
-<script src="/static/vendor/bootstrap-3.3.6-dist/js/bootstrap.js"></script>
 </body>
 </html>
diff --git a/view/header.ejs b/view/header.ejs
@@ -3,6 +3,9 @@
     <link rel="stylesheet" href="/static/vendor/bootstrap-3.3.6-dist/css/bootstrap.css">
     <link rel="stylesheet" href="/static/vendor/bootstrap-3.3.6-dist/css/bootstrap-theme.css">
     <link rel="stylesheet" href="/static/css/custom.css">
+
+    <script src="/static/vendor/jquery-2.2.4.js"></script>
+    <script src="/static/vendor/bootstrap-3.3.6-dist/js/bootstrap.js"></script>
 </head>
 <body>
 
diff --git a/view/list.ejs b/view/list.ejs
@@ -1,6 +1,15 @@
 <%- include('./header') %>
 
 <div class="container">
+
+    <% if (info.length !== 0) {%>
+      <div class="alert alert-success" role="alert">
+          <% info.forEach(function (msg) { %>
+            <%= msg %>
+          <% }) %>
+      </div>
+    <% } %>
+
     <div class="row"><p>共 <%= list.length %> 张</p></div>
     <div class="row">
         <p>
@@ -16,7 +25,6 @@
             var pic = list[i];
         %>
             <div class="col-xs-6 col-md-3">
-
                 <a href="/showpic/<%- pic._id %>" class="thumbnail">
                     <img src="<%- pic.url %>" alt="<%- pic.meta.alt %>">
                 </a>
diff --git a/view/pic_detail.ejs b/view/pic_detail.ejs
@@ -9,11 +9,31 @@
                     <h3>名字：<%= picInfo.name %></h3>
                     <p>alt文本：<%= picInfo.meta.alt %></p>
                     <p>标签：<%= picInfo.meta.labels %></p>
+                    <p>
+                        <form action="/delpic" method="POST" data-action="delpic">
+                            <input type="hidden" name="picid" value="<%- picInfo._id%>">
+                            <input type="submit" class="btn btn-danger" value="删除">
+                        </form>
+                    </p>
                 </div>
             </div>
         </div>
 
+        <div class="col-xs-6">
+            <%- picUrl %>
+        </div>
+
     </div>
 </div>
 
-<%- include('./footer') %>
+<script>
+    $(function () {
+        $('[data-action="delpic"]').on('submit', function () {
+            return confirm('确认删除这张照片吗？')
+        })
+    })
+</script>
+
+
+<%- include('./footer') %>
+

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ var config = {`
`6`	`6`	`linktang: 'muerqiaohuiche',`
`7`	`7`	`},`
`8`	`8`	`api_backend: 'http://119.29.70.101:3000',`
	`9`	`+`
	`10`	`+ my_main_page: 'http://project9.qcourse.net',`
`9`	`11`	`}`
`10`	`12`
`11`	`13`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@`
`25`	`25`	`"multer": "^1.1.0",`
`26`	`26`	`"request": "^2.73.0",`
`27`	`27`	`"qs": "^6.2.0",`
`28`		`- "lodash": "^4.13.1"`
	`28`	`+ "lodash": "^4.13.1",`
	`29`	`+ "express-session": "^1.14.0",`
	`30`	`+ "connect-flash": "^0.1.1",`
	`31`	`+ "yaqrcode": "^0.2.1"`
`29`	`32`	`}`
`30`	`33`	`}`