summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/web/app/mobile/views/components/index.ts4
-rw-r--r--src/web/app/mobile/views/components/user-followers.vue26
-rw-r--r--src/web/app/mobile/views/components/user-following.vue26
-rw-r--r--src/web/app/mobile/views/components/user-preview.vue6
-rw-r--r--src/web/app/mobile/views/components/users-list.vue7
-rw-r--r--src/web/app/mobile/views/pages/followers.vue54
-rw-r--r--src/web/app/mobile/views/pages/following.vue56
7 files changed, 92 insertions, 87 deletions
diff --git a/src/web/app/mobile/views/components/index.ts b/src/web/app/mobile/views/components/index.ts
index a2a87807d4..73cc1f9f3a 100644
--- a/src/web/app/mobile/views/components/index.ts
+++ b/src/web/app/mobile/views/components/index.ts
@@ -16,6 +16,8 @@ import friendsMaker from './friends-maker.vue';
import notification from './notification.vue';
import notifications from './notifications.vue';
import notificationPreview from './notification-preview.vue';
+import usersList from './users-list.vue';
+import userPreview from './user-preview.vue';
Vue.component('mk-ui', ui);
Vue.component('mk-home', home);
@@ -33,3 +35,5 @@ Vue.component('mk-friends-maker', friendsMaker);
Vue.component('mk-notification', notification);
Vue.component('mk-notifications', notifications);
Vue.component('mk-notification-preview', notificationPreview);
+Vue.component('mk-users-list', usersList);
+Vue.component('mk-user-preview', userPreview);
diff --git a/src/web/app/mobile/views/components/user-followers.vue b/src/web/app/mobile/views/components/user-followers.vue
deleted file mode 100644
index 771291b498..0000000000
--- a/src/web/app/mobile/views/components/user-followers.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-<mk-users-list
- :fetch="fetch"
- :count="user.followers_count"
- :you-know-count="user.followers_you_know_count"
->
- %i18n:mobile.tags.mk-user-followers.no-users%
-</mk-users-list>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-export default Vue.extend({
- props: ['user'],
- methods: {
- fetch(iknow, limit, cursor, cb) {
- (this as any).api('users/followers', {
- user_id: this.user.id,
- iknow: iknow,
- limit: limit,
- cursor: cursor ? cursor : undefined
- }).then(cb);
- }
- }
-});
-</script>
diff --git a/src/web/app/mobile/views/components/user-following.vue b/src/web/app/mobile/views/components/user-following.vue
deleted file mode 100644
index dfd6135da2..0000000000
--- a/src/web/app/mobile/views/components/user-following.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-<mk-users-list
- :fetch="fetch"
- :count="user.following_count"
- :you-know-count="user.following_you_know_count"
->
- %i18n:mobile.tags.mk-user-following.no-users%
-</mk-users-list>
-</template>
-
-<script lang="ts">
-import Vue from 'vue';
-export default Vue.extend({
- props: ['user'],
- methods: {
- fetch(iknow, limit, cursor, cb) {
- (this as any).api('users/following', {
- user_id: this.user.id,
- iknow: iknow,
- limit: limit,
- cursor: cursor ? cursor : undefined
- }).then(cb);
- }
- }
-});
-</script>
diff --git a/src/web/app/mobile/views/components/user-preview.vue b/src/web/app/mobile/views/components/user-preview.vue
index 0246cac6ab..3cbc200337 100644
--- a/src/web/app/mobile/views/components/user-preview.vue
+++ b/src/web/app/mobile/views/components/user-preview.vue
@@ -1,11 +1,11 @@
<template>
<div class="mk-user-preview">
- <a class="avatar-anchor" :href="`/${user.username}`">
+ <router-link class="avatar-anchor" :to="`/${user.username}`">
<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}`">{{ user.name }}</router-link>
<span class="username">@{{ user.username }}</span>
</header>
<div class="body">
diff --git a/src/web/app/mobile/views/components/users-list.vue b/src/web/app/mobile/views/components/users-list.vue
index 24c96aec79..d6c6261354 100644
--- a/src/web/app/mobile/views/components/users-list.vue
+++ b/src/web/app/mobile/views/components/users-list.vue
@@ -32,13 +32,18 @@ export default Vue.extend({
next: null
};
},
+ watch: {
+ mode() {
+ this._fetch();
+ }
+ },
mounted() {
this._fetch(() => {
this.$emit('loaded');
});
},
methods: {
- _fetch(cb) {
+ _fetch(cb?) {
this.fetching = true;
this.fetch(this.mode == 'iknow', this.limit, null, obj => {
this.users = obj.users;
diff --git a/src/web/app/mobile/views/pages/followers.vue b/src/web/app/mobile/views/pages/followers.vue
index 2f102bd68f..c2b6b90e29 100644
--- a/src/web/app/mobile/views/pages/followers.vue
+++ b/src/web/app/mobile/views/pages/followers.vue
@@ -1,10 +1,18 @@
<template>
<mk-ui>
- <span slot="header" v-if="!fetching">
+ <template slot="header" v-if="!fetching">
<img :src="`${user.avatar_url}?thumbnail&size=64`" alt="">
{{ '%i18n:mobile.tags.mk-user-followers-page.followers-of%'.replace('{}', user.name) }}
- </span>
- <mk-user-followers v-if="!fetching" :user="user" @loaded="onLoaded"/>
+ </template>
+ <mk-users-list
+ v-if="!fetching"
+ :fetch="fetchUsers"
+ :count="user.followers_count"
+ :you-know-count="user.followers_you_know_count"
+ @loaded="onLoaded"
+ >
+ %i18n:mobile.tags.mk-user-followers.no-users%
+ </mk-users-list>
</mk-ui>
</template>
@@ -13,29 +21,45 @@ import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
export default Vue.extend({
- props: ['username'],
data() {
return {
fetching: true,
user: null
};
},
+ watch: {
+ $route: 'fetch'
+ },
+ created() {
+ this.fetch();
+ },
mounted() {
- Progress.start();
-
- (this as any).api('users/show', {
- username: this.username
- }).then(user => {
- this.user = user;
- this.fetching = false;
-
- document.title = '%i18n:mobile.tags.mk-user-followers-page.followers-of%'.replace('{}', user.name) + ' | Misskey';
- document.documentElement.style.background = '#313a42';
- });
+ document.documentElement.style.background = '#313a42';
},
methods: {
+ fetch() {
+ Progress.start();
+ this.fetching = true;
+
+ (this as any).api('users/show', {
+ username: this.$route.params.user
+ }).then(user => {
+ this.user = user;
+ this.fetching = false;
+
+ document.title = '%i18n:mobile.tags.mk-user-followers-page.followers-of%'.replace('{}', user.name) + ' | Misskey';
+ });
+ },
onLoaded() {
Progress.done();
+ },
+ fetchUsers(iknow, limit, cursor, cb) {
+ (this as any).api('users/followers', {
+ user_id: this.user.id,
+ iknow: iknow,
+ limit: limit,
+ cursor: cursor ? cursor : undefined
+ }).then(cb);
}
}
});
diff --git a/src/web/app/mobile/views/pages/following.vue b/src/web/app/mobile/views/pages/following.vue
index 20f085a9f1..6365d3b370 100644
--- a/src/web/app/mobile/views/pages/following.vue
+++ b/src/web/app/mobile/views/pages/following.vue
@@ -1,10 +1,18 @@
<template>
<mk-ui>
- <span slot="header" v-if="!fetching">
+ <template slot="header" v-if="!fetching">
<img :src="`${user.avatar_url}?thumbnail&size=64`" alt="">
- {{ '%i18n:mobile.tags.mk-user-following-page.following-of'.replace('{}', user.name) }}
- </span>
- <mk-user-following v-if="!fetching" :user="user" @loaded="onLoaded"/>
+ {{ '%i18n:mobile.tags.mk-user-following-page.following-of%'.replace('{}', user.name) }}
+ </template>
+ <mk-users-list
+ v-if="!fetching"
+ :fetch="fetchUsers"
+ :count="user.following_count"
+ :you-know-count="user.following_you_know_count"
+ @loaded="onLoaded"
+ >
+ %i18n:mobile.tags.mk-user-following.no-users%
+ </mk-users-list>
</mk-ui>
</template>
@@ -13,29 +21,45 @@ import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
export default Vue.extend({
- props: ['username'],
data() {
return {
fetching: true,
user: null
};
},
+ watch: {
+ $route: 'fetch'
+ },
+ created() {
+ this.fetch();
+ },
mounted() {
- Progress.start();
-
- (this as any).api('users/show', {
- username: this.username
- }).then(user => {
- this.user = user;
- this.fetching = false;
-
- document.title = '%i18n:mobile.tags.mk-user-followers-page.followers-of%'.replace('{}', user.name) + ' | Misskey';
- document.documentElement.style.background = '#313a42';
- });
+ document.documentElement.style.background = '#313a42';
},
methods: {
+ fetch() {
+ Progress.start();
+ this.fetching = true;
+
+ (this as any).api('users/show', {
+ username: this.$route.params.user
+ }).then(user => {
+ this.user = user;
+ this.fetching = false;
+
+ document.title = '%i18n:mobile.tags.mk-user-followers-page.followers-of%'.replace('{}', user.name) + ' | Misskey';
+ });
+ },
onLoaded() {
Progress.done();
+ },
+ fetchUsers(iknow, limit, cursor, cb) {
+ (this as any).api('users/following', {
+ user_id: this.user.id,
+ iknow: iknow,
+ limit: limit,
+ cursor: cursor ? cursor : undefined
+ }).then(cb);
}
}
});
generated by cgit v1.3.1-freya (git 2.54.0) at 2026-05-31 07:18:41 +0000