Skip to content
This repository was archived by the owner on May 4, 2024. It is now read-only.

Commit 8427384

Browse files
SamR1SamR1
committed
keep filters on clicking on tag badge
1 parent ae01c14 commit 8427384

12 files changed

+31
-13
lines changed

‎rdltr/dist/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><link rel=stylesheet href=https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css integrity=sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh crossorigin=anonymous><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin=anonymous><title>rdltr</title><link href=/static/css/app.9ee5d275.css rel=preload as=style><link href=/static/css/chunk-vendors.96a655cf.css rel=preload as=style><link href=/static/js/app.da7c2cc0.js rel=preload as=script><link href=/static/js/chunk-vendors.5cae8d60.js rel=preload as=script><link href=/static/css/chunk-vendors.96a655cf.css rel=stylesheet><link href=/static/css/app.9ee5d275.css rel=stylesheet></head><body><div id=app></div><script src=/static/js/chunk-vendors.5cae8d60.js></script><script src=/static/js/app.da7c2cc0.js></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><link rel=stylesheet href=https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css integrity=sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh crossorigin=anonymous><link rel=stylesheet href=https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin=anonymous><title>rdltr</title><link href=/static/css/app.addebf01.css rel=preload as=style><link href=/static/css/chunk-vendors.96a655cf.css rel=preload as=style><link href=/static/js/app.dd382558.js rel=preload as=script><link href=/static/js/chunk-vendors.208e3516.js rel=preload as=script><link href=/static/css/chunk-vendors.96a655cf.css rel=stylesheet><link href=/static/css/app.addebf01.css rel=stylesheet></head><body><div id=app></div><script src=/static/js/chunk-vendors.208e3516.js></script><script src=/static/js/app.dd382558.js></script></body></html>

‎rdltr/dist/static/css/app.9ee5d275.css renamed to ‎rdltr/dist/static/css/app.addebf01.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rdltr/dist/static/js/app.da7c2cc0.js

-2
This file was deleted.

‎rdltr/dist/static/js/app.da7c2cc0.js.map

-1
This file was deleted.

‎rdltr/dist/static/js/app.dd382558.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rdltr/dist/static/js/app.dd382558.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rdltr/dist/static/js/chunk-vendors.5cae8d60.js renamed to ‎rdltr/dist/static/js/chunk-vendors.208e3516.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rdltr/dist/static/js/chunk-vendors.208e3516.js.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rdltr/dist/static/js/chunk-vendors.5cae8d60.js.map

-1
This file was deleted.

‎rdltr_front/src/components/articles/articlesList.vue

+4-1
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,11 @@ export default {
5252
pagination() {
5353
return this.$store.getters.pagination
5454
},
55+
userTags() {
56+
return this.$store.getters.userTags
57+
},
5558
tag: function() {
56-
if ('tag_id' in this.$route.query && this.$store.getters.user.tags) {
59+
if ('tag_id' in this.$route.query && this.userTags) {
5760
return this.$store.getters.user.tags.filter(
5861
tag => tag.id === +this.$route.query['tag_id']
5962
)[0]

‎rdltr_front/src/components/common/customBagde.vue

+16-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<span :class="`badge badge-rdltr${isTag ? '-tag' : ''}`">
3-
<router-link v-if="isTag" :to="`/?tag_id=${tag_id}`">
3+
<router-link v-if="isTag" :to="fullPath(tag_id)">
44
{{ name }}
55
</router-link>
66
<span v-else>
@@ -12,6 +12,21 @@
1212
<script>
1313
export default {
1414
props: ['name', 'isTag', 'tag_id'],
15+
methods: {
16+
fullPath(tagId) {
17+
if (
18+
this.$route.fullPath.match(/\/articles\/\d+/g) ||
19+
this.$route.fullPath === '/'
20+
) {
21+
return `/?tag_id=${tagId}`
22+
}
23+
const path = this.$route.fullPath.replace(/articles\/page\/\d+/g, '')
24+
if (path.includes('tag_id')) {
25+
return path.replace(/tag_id=\d+/g, `tag_id=${tagId}`)
26+
}
27+
return `${path}&tag_id=${tagId}`
28+
},
29+
},
1530
}
1631
</script>
1732

‎rdltr_front/src/utils.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const getTargetLocationFromStore = (store, pageOffset = 0) => {
4949
if (store.onlyNotRead) {
5050
query.not_read = store.onlyNotRead
5151
}
52-
if (store.selectedTags && !store.query && !store.onlyNotRead) {
52+
if (store.selectedTags) {
5353
// for now only one tag is handled
5454
query.tag_id = store.selectedTags
5555
}

0 commit comments

Comments
 (0)