From 984294661039353c1346e19a26aaf9fcab517194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=B4=E3=81=AA=E3=81=9F=E3=81=BF=E3=81=BD?= <syuilotan@yahoo.co.jp> Date: Wed, 21 Feb 2018 21:08:03 +0900 Subject: [PATCH] wip --- src/web/app/common/-tags/activity-table.tag | 57 --------------------- src/web/app/mobile/views/pages/user.vue | 7 +-- 2 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 src/web/app/common/-tags/activity-table.tag diff --git a/src/web/app/common/-tags/activity-table.tag b/src/web/app/common/-tags/activity-table.tag deleted file mode 100644 index cd74b0920..000000000 --- a/src/web/app/common/-tags/activity-table.tag +++ /dev/null @@ -1,57 +0,0 @@ -<mk-activity-table> - <svg v-if="data" ref="canvas" viewBox="0 0 53 7" preserveAspectRatio="none"> - <rect each={ data } width="1" height="1" - riot-x={ x } riot-y={ date.weekday } - rx="1" ry="1" - fill={ color } - style="transform: scale({ v });"/> - <rect class="today" width="1" height="1" - riot-x={ data[data.length - 1].x } riot-y={ data[data.length - 1].date.weekday } - rx="1" ry="1" - fill="none" - stroke-width="0.1" - stroke="#f73520"/> - </svg> - <style lang="stylus" scoped> - :scope - display block - max-width 600px - margin 0 auto - - > svg - display block - - > rect - transform-origin center - - </style> - <script lang="typescript"> - this.mixin('api'); - - this.user = this.opts.user; - - this.on('mount', () => { - this.$root.$data.os.api('aggregation/users/activity', { - user_id: this.user.id - }).then(data => { - data.forEach(d => d.total = d.posts + d.replies + d.reposts); - this.peak = Math.max.apply(null, data.map(d => d.total)) / 2; - let x = 0; - data.reverse().forEach(d => { - d.x = x; - d.date.weekday = (new Date(d.date.year, d.date.month - 1, d.date.day)).getDay(); - - d.v = d.total / this.peak; - if (d.v > 1) d.v = 1; - const ch = d.date.weekday == 0 || d.date.weekday == 6 ? 275 : 170; - const cs = d.v * 100; - const cl = 15 + ((1 - d.v) * 80); - d.color = `hsl(${ch}, ${cs}%, ${cl}%)`; - - if (d.date.weekday == 6) x++; - }); - this.update({ data }); - }); - }); - </script> -</mk-activity-table> diff --git a/src/web/app/mobile/views/pages/user.vue b/src/web/app/mobile/views/pages/user.vue index 53cde1fb6..745de2c6e 100644 --- a/src/web/app/mobile/views/pages/user.vue +++ b/src/web/app/mobile/views/pages/user.vue @@ -26,8 +26,8 @@ </p> </div> <div class="status"> - <a> - <b>{{ user.posts_count }}</b> + <a> + <b>{{ user.posts_count }}</b> <i>%i18n:mobile.tags.mk-user.posts%</i> </a> <a :href="`${user.username}/following`"> @@ -199,9 +199,6 @@ export default Vue.extend({ > i font-size 14px - > .mk-activity-table - margin 12px 0 0 0 - > nav display flex justify-content center