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

Commit ae01c14

Browse files
SamR1SamR1
committed
display tag when filtering on tags
1 parent 11d5472 commit ae01c14

File tree

7 files changed

+28
-7
lines changed

7 files changed

+28
-7
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.7a582916.css rel=preload as=style><link href=/static/css/chunk-vendors.96a655cf.css rel=preload as=style><link href=/static/js/app.3390fb01.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.7a582916.css rel=stylesheet></head><body><div id=app></div><script src=/static/js/chunk-vendors.5cae8d60.js></script><script src=/static/js/app.3390fb01.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.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>

‎rdltr/dist/static/css/app.7a582916.css renamed to ‎rdltr/dist/static/css/app.9ee5d275.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.3390fb01.js

-2
This file was deleted.

‎rdltr/dist/static/js/app.3390fb01.js.map

-1
This file was deleted.

‎rdltr/dist/static/js/app.da7c2cc0.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.da7c2cc0.js.map

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

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

+23-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55
</p>
66
<div v-else>
77
<div class="row articles-msg" v-if="pagination.total > 0">
8-
{{ pagination.total }}
9-
{{ `article${pagination.total !== 1 ? 's' : ''}` }}
8+
<div>
9+
{{ pagination.total }}
10+
{{ `article${pagination.total !== 1 ? 's' : ''}` }}
11+
</div>
12+
<div v-if="tag" class="display-tag">
13+
<app-badge :tag_id="tag.id" :is-tag="true" :name="tag.name" />
14+
</div>
1015
</div>
1116
<div class="row">
1217
<p class="text-center articles-msg" v-if="articles.length === 0">
@@ -28,11 +33,13 @@
2833

2934
<script>
3035
import ArticleCard from './articleCard'
36+
import CustomBadge from '../common/customBagde'
3137
import Pagination from '../home/pagination'
3238
3339
export default {
3440
components: {
3541
AppArticleCard: ArticleCard,
42+
AppBadge: CustomBadge,
3643
AppPagination: Pagination,
3744
},
3845
computed: {
@@ -45,6 +52,14 @@ export default {
4552
pagination() {
4653
return this.$store.getters.pagination
4754
},
55+
tag: function() {
56+
if ('tag_id' in this.$route.query && this.$store.getters.user.tags) {
57+
return this.$store.getters.user.tags.filter(
58+
tag => tag.id === +this.$route.query['tag_id']
59+
)[0]
60+
}
61+
return null
62+
},
4863
},
4964
watch: {
5065
$route(to) {
@@ -73,6 +88,12 @@ export default {
7388
7489
.articles-msg {
7590
margin-left: 1em;
91+
align-items: center;
92+
}
93+
94+
.display-tag {
95+
margin-left: 0.5em;
96+
margin-top: -4px;
7697
}
7798
7899
a {

0 commit comments

Comments
 (0)