@@ -142,10 +146,15 @@
data: {
windowWidth: 0,
error: "",
- loading: true,
+ loading: false,
bookmarks: [],
checkedBookmarks: [],
showImage: true,
+ search: {
+ query: "",
+ keyword: "",
+ tags: []
+ },
inputBookmark: {
index: -1,
id: -1,
@@ -169,10 +178,40 @@
}
},
methods: {
+ removeSearchParam: function (param) {
+ if (this.loading) return;
+ this.search.query = this.search.query.replace(param, ' ').trim().replace(/\s+/g, ' ');
+ this.loadData();
+ },
+ reloadData: function () {
+ if (this.loading) return;
+ this.search.query = '';
+ this.loadData();
+ },
loadData: function () {
+ if (this.loading) return;
+
+ // Parse search query
+ var rxTags = /(^|\s+)#(\S+)/g,
+ tags = [];
+
+ while ((result = rxTags.exec(this.search.query)) !== null) {
+ tags.push(result[2]);
+ }
+
+ var keyword = this.search.query.replace(/(^|\s+)#(\S+)/g, ' ').trim().replace(/\s+/g, ' ');
+
+ // Fetch data
this.error = '';
this.loading = true;
- instance.get('/api/bookmarks')
+ this.search.tags = tags;
+ this.search.keyword = keyword;
+ instance.get('/api/bookmarks', {
+ params: {
+ keyword: this.search.keyword,
+ tags: this.search.tags.join(" ")
+ }
+ })
.then(function (response) {
app.loading = false;
app.bookmarks = response.data;
@@ -460,7 +499,7 @@
}
return finalContent;
- }
+ },
},
watch: {
'inputBookmark.url': function (newURL) {
diff --git a/view/less/stylesheet.less b/view/less/stylesheet.less
index 246d9461..912bd195 100644
--- a/view/less/stylesheet.less
+++ b/view/less/stylesheet.less
@@ -263,6 +263,25 @@
}
}
}
+ #search-parameter {
+ display: flex;
+ flex-flow: row wrap;
+ padding: 0 8px;
+ a {
+ display: block;
+ margin: 8px;
+ padding: 8px;
+ font-size: 0.9em;
+ background-color: @fontLightColor;
+ color: white;
+ border-radius: 16px;
+ cursor: pointer;
+ &:hover {
+ background-color: @main;
+ text-decoration: line-through;
+ }
+ }
+ }
#grid {
display: flex;
flex-flow: row;
@@ -299,6 +318,8 @@
display: flex;
flex-flow: column nowrap;
align-items: center;
+ height: auto;
+ min-height: 100vh;
a {
color: @main;
&:visited {
diff --git a/view/login.html b/view/login.html
index 3200b5cf..e9a33ba8 100644
--- a/view/login.html
+++ b/view/login.html
@@ -31,7 +31,7 @@