This commit is contained in:
syuilo 2018-02-21 01:39:51 +09:00
parent 34f91f04ad
commit b2a6257f93
31 changed files with 100 additions and 94 deletions

View file

@ -1,16 +1,16 @@
<template>
<component v-bind:is="os.isSignedIn ? 'home' : 'welcome'"></component>
<component :is="os.isSignedIn ? 'home' : 'welcome'"></component>
</template>
<script lang="ts">
import Vue from 'vue';
import HomeView from './home.vue';
import WelcomeView from './welcome.vue';
import Home from './home.vue';
import Welcome from './welcome.vue';
export default Vue.extend({
components: {
home: HomeView,
welcome: WelcomeView
Home,
Welcome
}
});
</script>

View file

@ -1,5 +1,5 @@
<template>
<div class="mk-user-followers-you-know">
<div class="followers-you-know">
<p class="title">%fa:users%%i18n:desktop.tags.mk-user.followers-you-know.title%</p>
<p class="initializing" v-if="fetching">%fa:spinner .pulse .fw%%i18n:desktop.tags.mk-user.followers-you-know.loading%<mk-ellipsis/></p>
<div v-if="!fetching && users.length > 0">
@ -35,7 +35,7 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
.mk-user-followers-you-know
.followers-you-know
background #fff
border solid 1px rgba(0, 0, 0, 0.075)
border-radius 6px

View file

@ -1,5 +1,5 @@
<template>
<div class="mk-user-friends">
<div class="friends">
<p class="title">%fa:users%%i18n:desktop.tags.mk-user.frequently-replied-users.title%</p>
<p class="initializing" v-if="fetching">%fa:spinner .pulse .fw%%i18n:desktop.tags.mk-user.frequently-replied-users.loading%<mk-ellipsis/></p>
<template v-if="!fetching && users.length != 0">
@ -41,7 +41,7 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
.mk-user-friends
.friends
background #fff
border solid 1px rgba(0, 0, 0, 0.075)
border-radius 6px

View file

@ -1,5 +1,5 @@
<template>
<div class="mk-user-header" :data-is-dark-background="user.banner_url != null">
<div class="header" :data-is-dark-background="user.banner_url != null">
<div class="banner-container" :style="user.banner_url ? `background-image: url(${user.banner_url}?thumbnail&size=2048)` : ''">
<div class="banner" ref="banner" :style="user.banner_url ? `background-image: url(${user.banner_url}?thumbnail&size=2048)` : ''" @click="onBannerClick"></div>
</div>
@ -62,7 +62,7 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
.mk-user-header
.header
$banner-height = 320px
$footer-height = 58px

View file

@ -1,22 +1,22 @@
<template>
<div class="mk-user-home">
<div class="home">
<div>
<div ref="left">
<mk-user-profile :user="user"/>
<mk-user-photos :user="user"/>
<mk-user-followers-you-know v-if="os.isSignedIn && os.i.id != user.id" :user="user"/>
<x-profile :user="user"/>
<x-photos :user="user"/>
<x-followers-you-know v-if="os.isSignedIn && os.i.id != user.id" :user="user"/>
<p>%i18n:desktop.tags.mk-user.last-used-at%: <b><mk-time :time="user.last_used_at"/></b></p>
</div>
</div>
<main>
<mk-post-detail v-if="user.pinned_post" :post="user.pinned_post" compact/>
<mk-user-timeline ref="tl" :user="user"/>
<x-timeline ref="tl" :user="user"/>
</main>
<div>
<div ref="right">
<mk-calendar @chosen="warp" :start="new Date(user.created_at)"/>
<mk-activity :user="user"/>
<mk-user-friends :user="user"/>
<x-friends :user="user"/>
<div class="nav"><mk-nav/></div>
</div>
</div>
@ -25,19 +25,19 @@
<script lang="ts">
import Vue from 'vue';
import MkUserTimeline from './user-timeline.vue';
import MkUserProfile from './user-profile.vue';
import MkUserPhotos from './user-photos.vue';
import MkUserFollowersYouKnow from './user-followers-you-know.vue';
import MkUserFriends from './user-friends.vue';
import XUserTimeline from './user.timeline.vue';
import XUserProfile from './user.profile.vue';
import XUserPhotos from './user.photos.vue';
import XUserFollowersYouKnow from './user.followers-you-know.vue';
import XUserFriends from './user.friends.vue';
export default Vue.extend({
components: {
'mk-user-timeline': MkUserTimeline,
'mk-user-profile': MkUserProfile,
'mk-user-photos': MkUserPhotos,
'mk-user-followers-you-know': MkUserFollowersYouKnow,
'mk-user-friends': MkUserFriends
XUserTimeline,
XUserProfile,
XUserPhotos,
XUserFollowersYouKnow,
XUserFriends
},
props: ['user'],
methods: {
@ -49,7 +49,7 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
.mk-user-home
.home
display flex
justify-content center
margin 0 auto

View file

@ -1,5 +1,5 @@
<template>
<div class="mk-user-photos">
<div class="photos">
<p class="title">%fa:camera%%i18n:desktop.tags.mk-user.photos.title%</p>
<p class="initializing" v-if="fetching">%fa:spinner .pulse .fw%%i18n:desktop.tags.mk-user.photos.loading%<mk-ellipsis/></p>
<div class="stream" v-if="!fetching && images.length > 0">
@ -39,7 +39,7 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
.mk-user-photos
.photos
background #fff
border solid 1px rgba(0, 0, 0, 0.075)
border-radius 6px

View file

@ -1,5 +1,5 @@
<template>
<div class="mk-user-profile">
<div class="profile">
<div class="friend-form" v-if="os.isSignedIn && os.i.id != user.id">
<mk-follow-button :user="user" size="big"/>
<p class="followed" v-if="user.is_followed">%i18n:desktop.tags.mk-user.follows-you%</p>
@ -75,7 +75,7 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
.mk-user-profile
.profile
background #fff
border solid 1px rgba(0, 0, 0, 0.075)
border-radius 6px

View file

@ -1,5 +1,5 @@
<template>
<div class="mk-user-timeline">
<div class="timeline">
<header>
<span :data-is-active="mode == 'default'" @click="mode = 'default'">投稿</span>
<span :data-is-active="mode == 'with-replies'" @click="mode = 'with-replies'">投稿と返信</span>
@ -93,7 +93,7 @@ export default Vue.extend({
</script>
<style lang="stylus" scoped>
.mk-user-timeline
.timeline
background #fff
> header

View file

@ -1,9 +1,8 @@
<template>
<mk-ui>
<div class="user" v-if="!fetching">
<mk-user-header :user="user"/>
<mk-user-home v-if="page == 'home'" :user="user"/>
<mk-user-graphs v-if="page == 'graphs'" :user="user"/>
<x-header :user="user"/>
<x-home v-if="page == 'home'" :user="user"/>
</div>
</mk-ui>
</template>
@ -11,13 +10,13 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../../common/scripts/loading';
import MkUserHeader from './user-header.vue';
import MkUserHome from './user-home.vue';
import XHeader from './user.header.vue';
import XHome from './user.home.vue';
export default Vue.extend({
components: {
'mk-user-header': MkUserHeader,
'mk-user-home': MkUserHome
XHeader,
XHome
},
props: {
page: {