revert users/index.vue

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.13-rc.11",
+	"version": "12.119.0-calc.13-rc.12",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

packages/client/src/pages/user/index.vue

@@ -1,53 +1,41 @@
 <template>
 <MkStickyContainer>
-	<template #header><MkPageHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
+	<template #header>
+		<MkPageHeader
+			v-model:tab="tab"
+			:actions="headerActions"
+			:tabs="headerTabs"
+		/>
+	</template>
+	<div>
+		<transition name="fade" mode="out-in">
 			<div v-if="user">
-		<swiper
+				<XHome v-if="tab === 'home'" :user="user"/>
-			:modules="[Virtual]"
+				<XReactions v-else-if="tab === 'reactions'" :user="user"/>
-			:space-between="20"
+				<XClips v-else-if="tab === 'clips'" :user="user"/>
-			:virtual="true"
+				<XPages v-else-if="tab === 'pages'" :user="user"/>
-			:allow-touch-move="!(deviceKind === 'desktop' && !defaultStore.state.swipeOnDesktop)"
+				<XGallery v-else-if="tab === 'gallery'" :user="user"/>
-			@swiper="setSwiperRef"
-			@slide-change="onSlideChange"
-		>
-			<swiper-slide>
-				<XHome :user="user"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XReactions :user="user"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XClips :user="user"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XPages :user="user"/>
-			</swiper-slide>
-			<swiper-slide>
-				<XGallery :user="user"/>
-			</swiper-slide>
-		</swiper>
 			</div>
 			<MkError v-else-if="error" @retry="fetchUser()"/>
 			<MkLoading v-else/>
+		</transition>
+	</div>
 </MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { defineAsyncComponent, computed, inject, onMounted, onUnmounted, watch } from 'vue';
+import { defineAsyncComponent, computed, watch } from 'vue';
-import { Virtual } from 'swiper';
+import calcAge from 's-age';
-import { Swiper, SwiperSlide } from 'swiper/vue';
 import * as Acct from 'misskey-js/built/acct';
 import type * as misskey from 'misskey-js';
+import { getScrollPosition } from '@/scripts/scroll';
+import number from '@/filters/number';
 import { userPage, acct as getAcct } from '@/filters/user';
 import * as os from '@/os';
 import { useRouter } from '@/router';
 import { definePageMetadata } from '@/scripts/page-metadata';
-import { deviceKind } from '@/scripts/device-kind';
 import { i18n } from '@/i18n';
 import { $i } from '@/account';
-import { defaultStore } from '@/store';
-import 'swiper/scss';
-import 'swiper/scss/virtual';
 
 const XHome = defineAsyncComponent(() => import('./home.vue'));
 const XReactions = defineAsyncComponent(() => import('./reactions.vue'));
@@ -55,34 +43,30 @@ const XClips = defineAsyncComponent(() => import('./clips.vue'));
 const XPages = defineAsyncComponent(() => import('./pages.vue'));
 const XGallery = defineAsyncComponent(() => import('./gallery.vue'));
 
-const props = withDefaults(defineProps<{
+const props = withDefaults(
+	defineProps<{
 		acct: string;
 		page?: string;
-}>(), {
+	}>(),
+	{
 		page: 'home',
-});
+	},
+);
 
 const router = useRouter();
 
-let tabs = ['home'];
+let tab = $ref(props.page);
 let user = $ref<null | misskey.entities.UserDetailed>(null);
-if (($i && ($i.id === user?.id)) || user?.publicReactions) {
-	tabs.push('reactions');
-}
-if ((user?.instance != null)) {
-	tabs.push('clips', 'pages', 'gallery');
-}
-let tab = $ref(tabs[0]);
-watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
-
 let error = $ref(null);
 
 function fetchUser(): void {
 	if (props.acct == null) return;
 	user = null;
-	os.api('users/show', Acct.parse(props.acct)).then(u => {
+	os.api('users/show', Acct.parse(props.acct))
+		.then((u) => {
 			user = u;
-	}).catch(err => {
+		})
+		.catch((err) => {
 			error = err;
 		});
 }
@@ -93,31 +77,50 @@ watch(() => props.acct, fetchUser, {
 
 const headerActions = $computed(() => []);
 
-const headerTabs = $computed(() => user ? [{
+const headerTabs = $computed(() =>
+	user
+		? [
+			{
 				key: 'home',
 				title: i18n.ts.overview,
-	icon: 'ph-house-bold ph-lg',
+				icon: 'ph-user-bold ph-large',
-}, ...($i && ($i.id === user.id)) || user.publicReactions ? [{
+			},
+			...(($i && $i.id === user.id) || user.publicReactions
+				? [
+					{
 						key: 'reactions',
 						title: i18n.ts.reaction,
-	icon: 'ph-smiley-bold ph-lg',
+						icon: 'ph-smiley-bold ph-large',
-}] : [], {
+					},
+				]
+				: []),
+			{
 				key: 'clips',
 				title: i18n.ts.clips,
-	icon: 'ph-paperclip-bold ph-lg',
+				icon: 'ph-paperclip-bold ph-large',
-}, {
+			},
+			{
 				key: 'pages',
 				title: i18n.ts.pages,
-	icon: 'ph-file-text-bold ph-lg',
+				icon: 'ph-file-text-bold ph-large',
-}, {
+			},
+			{
 				key: 'gallery',
 				title: i18n.ts.gallery,
-	icon: 'ph-image-square-bold ph-lg',
+				icon: 'ph-image-square-bold ph-large',
-}] : null);
+			},
+		]
+		: null,
+);
 
-definePageMetadata(computed(() => user ? {
+definePageMetadata(
-	icon: 'ph-user-bold ph-lg',
+	computed(() =>
-	title: user.name ? `${user.name} (@${user.username})` : `@${user.username}`,
+		user
+			? {
+				icon: 'fas fa-user',
+				title: user.name
+					? `${user.name} (@${user.username})`
+					: `@${user.username}`,
 				subtitle: `@${getAcct(user)}`,
 				userName: user,
 				avatar: user,
@@ -125,26 +128,10 @@ definePageMetadata(computed(() => user ? {
 				share: {
 					title: user.name,
 				},
-} : null));
+			}
-
+			: null,
-let swiperRef = null;
+	),
-
+);
-function setSwiperRef(swiper) {
-	swiperRef = swiper;
-	syncSlide(tabs.indexOf(tab));
-}
-
-function onSlideChange() {
-	tab = tabs[swiperRef.activeIndex];
-}
-
-function syncSlide(index) {
-	swiperRef.slideTo(index);
-}
-
-onMounted(() => {
-	syncSlide(tabs.indexOf(swiperRef.activeIndex));
-});
 </script>
 
 <style lang="scss" scoped>