diff --git a/components/account/AccountHeader.vue b/components/account/AccountHeader.vue index e35cf2fe..de7ec250 100644 --- a/components/account/AccountHeader.vue +++ b/components/account/AccountHeader.vue @@ -25,7 +25,7 @@ const createdAt = $computed(() => {
- +

{{ getAccountHandle(account) }}

@@ -66,13 +66,13 @@ const createdAt = $computed(() => {
- {{ account.statusesCount }} Posts + {{ account.statusesCount }} Posts - {{ account.followingCount }} Following + {{ account.followingCount }} Following - {{ account.followersCount }} Followers + {{ account.followersCount }} Followers
diff --git a/components/account/AccountInfo.vue b/components/account/AccountInfo.vue index 6b87b01f..1448bde9 100644 --- a/components/account/AccountInfo.vue +++ b/components/account/AccountInfo.vue @@ -18,7 +18,7 @@ const id = computed(() => fullServer && !account.acct.includes('@') ? `@${accoun - +

{{ id }}

diff --git a/components/account/AccountInlineInfo.vue b/components/account/AccountInlineInfo.vue index 6e96cb25..42fb8ca6 100644 --- a/components/account/AccountInlineInfo.vue +++ b/components/account/AccountInlineInfo.vue @@ -9,6 +9,6 @@ defineProps<{ diff --git a/components/account/AccountPaginator.vue b/components/account/AccountPaginator.vue index d0b135d0..faaabde7 100644 --- a/components/account/AccountPaginator.vue +++ b/components/account/AccountPaginator.vue @@ -11,7 +11,7 @@ const { paginator } = defineProps<{ diff --git a/components/common/CommonRichContent.ts b/components/content/ContentRich.ts similarity index 100% rename from components/common/CommonRichContent.ts rename to components/content/ContentRich.ts diff --git a/components/main/MainContent.vue b/components/main/MainContent.vue index b2f6fd51..870abf4a 100644 --- a/components/main/MainContent.vue +++ b/components/main/MainContent.vue @@ -7,7 +7,12 @@ >
- + + +
+ Back + +
diff --git a/components/status/StatusBody.vue b/components/status/StatusBody.vue index 0d52a7e1..02ec35e2 100644 --- a/components/status/StatusBody.vue +++ b/components/status/StatusBody.vue @@ -8,6 +8,6 @@ const { status } = defineProps<{ diff --git a/pages/@[account].vue b/pages/@[account].vue new file mode 100644 index 00000000..5d585867 --- /dev/null +++ b/pages/@[account].vue @@ -0,0 +1,31 @@ + + + diff --git a/pages/@[account]/followers.vue b/pages/@[account]/followers.vue index 034e742d..8840092c 100644 --- a/pages/@[account]/followers.vue +++ b/pages/@[account]/followers.vue @@ -8,13 +8,6 @@ const paginator = account ? masto.accounts.getFollowersIterable(account!.id!, {} diff --git a/pages/@[account]/following.vue b/pages/@[account]/following.vue index e29042e9..fc60855b 100644 --- a/pages/@[account]/following.vue +++ b/pages/@[account]/following.vue @@ -3,18 +3,11 @@ const params = useRoute().params const accountName = $computed(() => params.account as string) const account = await fetchAccountByName(accountName) -const paginator = account ? masto.accounts.getFollowingIterable(account!.id!, {}) : null +const paginator = account ? masto.accounts.getFollowingIterable(account.id, {}) : null diff --git a/pages/@[account]/index.vue b/pages/@[account]/index.vue index 2f04c891..37fe5836 100644 --- a/pages/@[account]/index.vue +++ b/pages/@[account]/index.vue @@ -12,21 +12,19 @@ const tabNames = ['Posts', 'Posts and replies'] as const // Don't use local storage because it is better to default to Posts every time you visit a user's profile. const tab = $ref('Posts') +const paginator1 = masto.accounts.getStatusesIterable(account.id, { excludeReplies: true }) +const paginator2 = masto.accounts.getStatusesIterable(account.id, { excludeReplies: false }) + const paginator = $computed(() => { - return masto.accounts.getStatusesIterable(account.id, { excludeReplies: tab === 'Posts' } as any) + return tab === 'Posts' ? paginator1 : paginator2 }) diff --git a/unocss.config.ts b/unocss.config.ts index 5a3b742e..18d32112 100644 --- a/unocss.config.ts +++ b/unocss.config.ts @@ -21,7 +21,7 @@ export default defineConfig({ 'interact-disabled': 'disabled:opacity-50 disabled:pointer-events-none disabled:saturate-0', 'btn-solid': 'px-4 py-2 rounded text-white bg-$c-primary hover:bg-$c-primary-active interact-disabled', 'btn-outline': 'px-4 py-2 rounded text-$c-primary border border-$c-primary hover:bg-$c-primary hover:text-white interact-disabled', - 'btn-text': 'px-4 py-2 text-$c-primary hover:text-$c-primary-active interact-disabled', + 'btn-text': 'px-4 py-2 text-$c-primary hover:text-$c-primary-active interact-disabled cursor-pointer', }, ], presets: [