liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加分享备忘åœ地址

This commit is contained in:
luchenqun 2018-10-11 21:18:52 +08:00
parent 1097633fcd
commit f66c327cec
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
database/db.js
View File

@ -1165,4 +1165,18 @@ db.updateNote = function(id, content, tag_id) {
}); });
} }
db.getNote = function(id) {
var sql = "SELECT content FROM `notes` WHERE `id` = '"+ id +"' LIMIT 0, 1";
console.log(sql);
return new Promise(function(resolve, reject) {
client.query(sql, (err, result) => {
if (err) {
reject(err);
} else {
resolve(result.length > 0 ? result[0].content : "content not exist!");
}
});
});
}
module.exports = db; module.exports = db;

4
public/scripts/controllers/note-controller.js
View File

@ -285,6 +285,10 @@ app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$wind
} }
} }
$scope.share = function (noteId) {
dataService.clipboard(`https://mybookmark.cn/api/notes/?shareNote=${noteId}`);
}
function updateSelectTag(tagId) { function updateSelectTag(tagId) {
$scope.tags.forEach((tag) => { $scope.tags.forEach((tag) => {
tag.clicked = false; tag.clicked = false;

1
public/views/note.html
View File

@ -52,6 +52,7 @@
</label> </label>
<img class="ui mini spaced image" id="noteid{{note.id}}" style="width:16px;height:16px;margin:0 8px;" ng-src="./images/copy.png" <img class="ui mini spaced image" id="noteid{{note.id}}" style="width:16px;height:16px;margin:0 8px;" ng-src="./images/copy.png"
id="url{{bookmark.id}}" ng-click="copy(note.content)" title="复制备忘"> id="url{{bookmark.id}}" ng-click="copy(note.content)" title="复制备忘">
<i class="share alternate icon" title="复制分享地址" ng-click="share(note.id)"></i>
<i class="chevron up icon" title="收起详情" ng-click="noteClick(note, true, $event)"></i> <i class="chevron up icon" title="收起详情" ng-click="noteClick(note, true, $event)"></i>
</div> </div>
</div> </div>

14
routes/api.js
View File

@ -1433,10 +1433,16 @@ api.get('/notes', function(req, res) {
return; return;
} }
var params = req.query; var params = req.query;
params.user_id = req.session.user.id; if (params.shareNote) {
db.getNotes(params) db.getNote(params.shareNote)
.then((data) => res.json(data)) .then((data) => res.send(`<body style="margin:0px;background-color:RGB(243,244,245)"><div style="text-align:center;"><pre style="padding:50px 0px 50px 0px; display: inline-block;text-align: left; font-size: 15px; font-family:italic arial,sans-serif;">${data}</pre></div></body>`))
.catch((err) => console.log('notes', err)); .catch((err) => console.log('notes', err));
} else {
params.user_id = req.session.user.id;
db.getNotes(params)
.then((data) => res.json(data))
.catch((err) => console.log('notes', err));
}
}); });
api.delete('/delNote', function(req, res) { api.delete('/delNote', function(req, res) {