wip
This commit is contained in:
		| @@ -3,7 +3,7 @@ | ||||
| 	<span slot="header" :class="$style.header"> | ||||
| 		<img :src="`${user.avatar_url}?thumbnail&size=64`" alt=""/>{{ user.name }}のフォロワー | ||||
| 	</span> | ||||
| 	<mk-followers-list :user="user"/> | ||||
| 	<mk-followers :user="user"/> | ||||
| </mk-window> | ||||
| </template> | ||||
|  | ||||
|   | ||||
| @@ -3,7 +3,7 @@ | ||||
| 	<span slot="header" :class="$style.header"> | ||||
| 		<img :src="`${user.avatar_url}?thumbnail&size=64`" alt=""/>{{ user.name }}のフォロー | ||||
| 	</span> | ||||
| 	<mk-following-list :user="user"/> | ||||
| 	<mk-following :user="user"/> | ||||
| </mk-window> | ||||
| </template> | ||||
|  | ||||
|   | ||||
| @@ -27,6 +27,9 @@ import settings from './settings.vue'; | ||||
| import calendar from './calendar.vue'; | ||||
| import activity from './activity.vue'; | ||||
| import friendsMaker from './friends-maker.vue'; | ||||
| import followers from './followers.vue'; | ||||
| import following from './following.vue'; | ||||
| import usersList from './users-list.vue'; | ||||
| import wNav from './widgets/nav.vue'; | ||||
| import wCalendar from './widgets/calendar.vue'; | ||||
| import wPhotoStream from './widgets/photo-stream.vue'; | ||||
| @@ -76,6 +79,9 @@ Vue.component('mk-settings', settings); | ||||
| Vue.component('mk-calendar', calendar); | ||||
| Vue.component('mk-activity', activity); | ||||
| Vue.component('mk-friends-maker', friendsMaker); | ||||
| Vue.component('mk-followers', followers); | ||||
| Vue.component('mk-following', following); | ||||
| Vue.component('mk-users-list', usersList); | ||||
| Vue.component('mkw-nav', wNav); | ||||
| Vue.component('mkw-calendar', wCalendar); | ||||
| Vue.component('mkw-photo-stream', wPhotoStream); | ||||
|   | ||||
| @@ -1,11 +1,11 @@ | ||||
| <template> | ||||
| <div class="mk-list-user"> | ||||
| 	<a class="avatar-anchor" :href="`/${user.username}`"> | ||||
| <div class="root item"> | ||||
| 	<router-link class="avatar-anchor" :to="`/${user.username}`" v-user-preview="user.id"> | ||||
| 		<img class="avatar" :src="`${user.avatar_url}?thumbnail&size=64`" alt="avatar"/> | ||||
| 	</a> | ||||
| 	</router-link> | ||||
| 	<div class="main"> | ||||
| 		<header> | ||||
| 			<a class="name" :href="`/${user.username}`">{{ user.name }}</a> | ||||
| 			<router-link class="name" :to="`/${user.username}`" v-user-preview="user.id">{{ user.name }}</router-link> | ||||
| 			<span class="username">@{{ user.username }}</span> | ||||
| 		</header> | ||||
| 		<div class="body"> | ||||
| @@ -25,8 +25,7 @@ export default Vue.extend({ | ||||
| </script> | ||||
| 
 | ||||
| <style lang="stylus" scoped> | ||||
| .mk-list-user | ||||
| 	margin 0 | ||||
| .root.item | ||||
| 	padding 16px | ||||
| 	font-size 16px | ||||
| 
 | ||||
| @@ -8,7 +8,7 @@ | ||||
| 	</nav> | ||||
| 	<div class="users" v-if="!fetching && users.length != 0"> | ||||
| 		<div v-for="u in users" :key="u.id"> | ||||
| 			<mk-list-user :user="u"/> | ||||
| 			<x-item :user="u"/> | ||||
| 		</div> | ||||
| 	</div> | ||||
| 	<button class="more" v-if="!fetching && next != null" @click="more" :disabled="moreFetching"> | ||||
| @@ -24,7 +24,12 @@ | ||||
|  | ||||
| <script lang="ts"> | ||||
| import Vue from 'vue'; | ||||
| import XItem from './users-list.item.vue'; | ||||
|  | ||||
| export default Vue.extend({ | ||||
| 	components: { | ||||
| 		XItem | ||||
| 	}, | ||||
| 	props: ['fetch', 'count', 'youKnowCount'], | ||||
| 	data() { | ||||
| 		return { | ||||
|   | ||||
| @@ -23,7 +23,7 @@ | ||||
|  | ||||
| <script lang="ts"> | ||||
| import Vue from 'vue'; | ||||
| import age from 's-age'; | ||||
| import * as age from 's-age'; | ||||
| import MkFollowingWindow from '../../components/following-window.vue'; | ||||
| import MkFollowersWindow from '../../components/followers-window.vue'; | ||||
|  | ||||
| @@ -37,6 +37,7 @@ export default Vue.extend({ | ||||
| 	methods: { | ||||
| 		showFollowing() { | ||||
| 			document.body.appendChild(new MkFollowingWindow({ | ||||
| 				parent: this, | ||||
| 				propsData: { | ||||
| 					user: this.user | ||||
| 				} | ||||
| @@ -45,6 +46,7 @@ export default Vue.extend({ | ||||
|  | ||||
| 		showFollowers() { | ||||
| 			document.body.appendChild(new MkFollowersWindow({ | ||||
| 				parent: this, | ||||
| 				propsData: { | ||||
| 					user: this.user | ||||
| 				} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 syuilo
					syuilo