Improve user column

This commit is contained in:
syuilo 2018-10-23 12:32:24 +09:00
parent c05853289a
commit 843dd5fb58
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 106 additions and 30 deletions

View file

@ -1109,6 +1109,12 @@ desktop/views/pages/deck/deck.tl-column.vue:
edit: "オプション" edit: "オプション"
desktop/views/pages/deck/deck.user-column.vue: desktop/views/pages/deck/deck.user-column.vue:
posts: "投稿"
following: "フォロー"
followers: "フォロワー"
images: "画像"
activity: "アクティビティ"
timeline: "タイムライン"
pinned-notes: "ピン留めされた投稿" pinned-notes: "ピン留めされた投稿"
push-to-a-list: "リストに追加" push-to-a-list: "リストに追加"

View file

@ -24,14 +24,34 @@
<div class="description"> <div class="description">
<misskey-flavored-markdown v-if="user.description" :text="user.description" :i="$store.state.i"/> <misskey-flavored-markdown v-if="user.description" :text="user.description" :i="$store.state.i"/>
</div> </div>
<div class="counts">
<div>
<b>{{ user.notesCount | number }}</b>
<span>%i18n:@posts%</span>
</div>
<div>
<b>{{ user.followingCount | number }}</b>
<span>%i18n:@following%</span>
</div>
<div>
<b>{{ user.followersCount | number }}</b>
<span>%i18n:@followers%</span>
</div>
</div>
</div> </div>
<div class="pinned" v-if="user.pinnedNotes && user.pinnedNotes.length > 0"> <div class="pinned" v-if="user.pinnedNotes && user.pinnedNotes.length > 0">
<p>%fa:thumbtack% %i18n:@pinned-notes%</p> <p class="caption" @click="toggleShowPinned">%fa:thumbtack% %i18n:@pinned-notes%</p>
<div class="notes"> <span class="angle" v-if="showPinned">%fa:angle-up%</span>
<span class="angle" v-else>%fa:angle-down%</span>
<div class="notes" v-show="showPinned">
<x-note v-for="n in user.pinnedNotes" :key="n.id" :note="n" :mini="true"/> <x-note v-for="n in user.pinnedNotes" :key="n.id" :note="n" :mini="true"/>
</div> </div>
</div> </div>
<div class="images" v-if="images.length > 0"> <div class="images" v-if="images.length > 0">
<p class="caption" @click="toggleShowImages">%fa:images R% %i18n:@images%</p>
<span class="angle" v-if="showImages">%fa:angle-up%</span>
<span class="angle" v-else>%fa:angle-down%</span>
<div v-show="showImages">
<router-link v-for="image in images" <router-link v-for="image in images"
:style="`background-image: url(${image.thumbnailUrl})`" :style="`background-image: url(${image.thumbnailUrl})`"
:key="`${image.id}:${image._note.id}`" :key="`${image.id}:${image._note.id}`"
@ -39,13 +59,22 @@
:title="`${image.name}\n${(new Date(image.createdAt)).toLocaleString()}`" :title="`${image.name}\n${(new Date(image.createdAt)).toLocaleString()}`"
></router-link> ></router-link>
</div> </div>
</div>
<div class="activity"> <div class="activity">
<p class="caption" @click="toggleShowActivity">%fa:chart-bar R% %i18n:@activity%</p>
<span class="angle" v-if="showActivity">%fa:angle-up%</span>
<span class="angle" v-else>%fa:angle-down%</span>
<div v-show="showActivity">
<div ref="chart"></div> <div ref="chart"></div>
</div> </div>
</div>
<div class="tl"> <div class="tl">
<p class="caption">%fa:comment-alt R% %i18n:@timeline%</p>
<div>
<x-notes ref="timeline" :more="existMore ? fetchMoreNotes : null"/> <x-notes ref="timeline" :more="existMore ? fetchMoreNotes : null"/>
</div> </div>
</div> </div>
</div>
</x-column> </x-column>
</template> </template>
@ -84,7 +113,10 @@ export default Vue.extend({
existMore: false, existMore: false,
moreFetching: false, moreFetching: false,
withFiles: false, withFiles: false,
images: [] images: [],
showPinned: true,
showImages: true,
showActivity: true
}; };
}, },
@ -282,6 +314,18 @@ export default Vue.extend({
compact: false, compact: false,
items: menu items: menu
}); });
},
toggleShowPinned() {
this.showPinned = !this.showPinned;
},
toggleShowImages() {
this.showImages = !this.showImages;
},
toggleShowActivity() {
this.showActivity = !this.showActivity;
} }
} }
}); });
@ -365,25 +409,50 @@ export default Vue.extend({
border-right solid 16px transparent border-right solid 16px transparent
border-bottom solid 16px var(--face) border-bottom solid 16px var(--face)
> .pinned > .counts
padding-bottom 16px display grid
background var(--deckColumnBg) grid-template-columns 1fr 1fr 1fr
margin-top 8px
border-top solid 1px var(--faceDivider)
> p > div
padding 8px 8px 0 8px
text-align center
> b
display block
font-size 120%
> span
display block
font-size 90%
opacity 0.7
> *
> p.caption
margin 0 margin 0
padding 8px 16px padding 8px 16px
font-size 12px font-size 12px
color var(--text) color var(--text)
& + .angle
position absolute
top 0
right 8px
padding 6px
font-size 14px
color var(--text)
> .pinned
> .notes > .notes
background var(--face) background var(--face)
> .images > .images
> div
display grid display grid
grid-template-columns 1fr 1fr 1fr grid-template-columns 1fr 1fr 1fr
gap 8px gap 8px
padding 16px padding 16px
margin-bottom 16px
background var(--face) background var(--face)
> * > *
@ -394,10 +463,11 @@ export default Vue.extend({
border-radius 4px border-radius 4px
> .activity > .activity
margin-bottom 16px > div
background var(--face) background var(--face)
> .tl > .tl
> div
background var(--face) background var(--face)
</style> </style>