natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✌️

This commit is contained in:
syuilo 2018-06-11 12:52:47 +09:00
parent c0a3ae2612
commit c3e375e8a5
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/client/app/common/views/widgets/hashtags.chart.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`"> <svg :viewBox="`0 0 ${ viewBoxX } ${ viewBoxY }`" style="overflow:visible">
<defs> <defs>
<linearGradient :id="gradientId" x1="0" x2="0" y1="1" y2="0"> <linearGradient :id="gradientId" x1="0" x2="0" y1="1" y2="0">
<stop offset="0%" stop-color="hsl(200, 80%, 70%)"></stop> <stop offset="0%" stop-color="hsl(200, 80%, 70%)"></stop>
@ -14,17 +14,17 @@
:points="polylinePoints" :points="polylinePoints"
fill="none" fill="none"
stroke="#fff" stroke="#fff"
stroke-width="0.7"/> stroke-width="2"/>
<circle <circle
:cx="headX" :cx="headX"
:cy="headY" :cy="headY"
r="1.2" r="3"
fill="#fff"/> fill="#fff"/>
</mask> </mask>
</defs> </defs>
<rect <rect
x="-2" y="-2" x="-10" y="-10"
:width="viewBoxX + 4" :height="viewBoxY + 4" :width="viewBoxX + 20" :height="viewBoxY + 20"
:style="`stroke: none; fill: url(#${ gradientId }); mask: url(#${ maskId })`"/> :style="`stroke: none; fill: url(#${ gradientId }); mask: url(#${ maskId })`"/>
</svg> </svg>
</template> </template>
@ -65,10 +65,14 @@ export default Vue.extend({
const stats = this.src.slice().reverse(); const stats = this.src.slice().reverse();
const peak = Math.max.apply(null, stats) || 1; const peak = Math.max.apply(null, stats) || 1;
const polylinePoints = stats.map((x, i) => [this.viewBoxX - ((stats.length - 1) - i), (1 - (x / peak)) * this.viewBoxY]); const polylinePoints = stats.map((n, i) => [
i * (this.viewBoxX / (stats.length - 1)),
(1 - (n / peak)) * this.viewBoxY
]);
this.polylinePoints = polylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' '); this.polylinePoints = polylinePoints.map(xy => `${xy[0]},${xy[1]}`).join(' ');
this.polygonPoints = `${this.viewBoxX - (stats.length - 1)},${ this.viewBoxY } ${ this.polylinePoints } ${ this.viewBoxX },${ this.viewBoxY }`; this.polygonPoints = `0,${ this.viewBoxY } ${ this.polylinePoints } ${ this.viewBoxX },${ this.viewBoxY }`;
this.headX = polylinePoints[polylinePoints.length - 1][0]; this.headX = polylinePoints[polylinePoints.length - 1][0];
this.headY = polylinePoints[polylinePoints.length - 1][1]; this.headY = polylinePoints[polylinePoints.length - 1][1];

6
src/client/app/common/views/widgets/hashtags.vue
View File

@ -79,16 +79,16 @@ root(isDark)
padding 16px padding 16px
&:not(:last-child) &:not(:last-child)
border-bottom solid 1px #393f4f border-bottom solid 1px isDark ? #393f4f : #eee
> .tag > .tag
flex 1 flex 1
> a > a
color #9baec8 font-size 14px
color isDark ? #9baec8 : #65727b
> .chart > .chart
width 50px
height 30px height 30px
.mkw-hashtags[data-darkmode] .mkw-hashtags[data-darkmode]

2
src/server/api/endpoints/hashtags/trend.ts
View File

@ -52,7 +52,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const hots = data[0].tags const hots = data[0].tags
.sort((a, b) => b.count - a.count) .sort((a, b) => b.count - a.count)
.map(tag => tag.tag) .map(tag => tag.tag)
.slice(0, 10); .slice(0, 5);
const countPromises: Array<Promise<number[]>> = []; const countPromises: Array<Promise<number[]>> = [];