This commit is contained in:
ThatOneCalculator 2022-11-14 19:13:04 -08:00
parent 5f15ca4fde
commit 7ff47714e0
7 changed files with 45 additions and 40 deletions

View File

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

View File

@ -1,7 +1,7 @@
<template> <template>
<MkStickyContainer> <MkStickyContainer>
<template #header><MkPageHeader :actions="headerActions"/></template> <template #header><MkPageHeader :actions="headerActions"/></template>
<MkSpacer :content-max="800"> <MkSpacer :content-max="800">
<div v-if="clip"> <div v-if="clip">
<div class="okzinsic _panel"> <div class="okzinsic _panel">
<div v-if="clip.description" class="description"> <div v-if="clip.description" class="description">
@ -20,7 +20,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { computed, watch, provide } from 'vue'; import { computed, watch, provide } from 'vue';
import * as misskey from 'misskey-js'; import type * as misskey from 'misskey-js';
import XNotes from '@/components/MkNotes.vue'; import XNotes from '@/components/MkNotes.vue';
import { $i } from '@/account'; import { $i } from '@/account';
import { i18n } from '@/i18n'; import { i18n } from '@/i18n';

View File

@ -1,11 +1,15 @@
<template> <template>
<div> <div>
<MkPagination v-slot="{items}" ref="list" :pagination="pagination"> <MkSpacer :content-max="800">
<MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap"> <MkPagination v-slot="{items}" ref="list" :pagination="pagination">
<b>{{ item.name }}</b> <MkA v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap">
<div v-if="item.description" class="description">{{ item.description }}</div> <div class="_panel">
</MkA> <b>{{ item.name }}</b>
</MkPagination> <Mfm v-if="item.description" class="description" :text="item.description"/>
</div>
</MkA>
</MkPagination>
</MkSpacer>
</div> </div>
</template> </template>

View File

@ -1,10 +1,12 @@
<template> <template>
<div> <div>
<MkPagination v-slot="{items}" :pagination="pagination"> <MkSpacer :content-max="800">
<div class="jrnovfpt"> <MkPagination v-slot="{items}" :pagination="pagination">
<MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/> <div class="jrnovfpt">
</div> <MkGalleryPostPreview v-for="post in items" :key="post.id" :post="post" class="post"/>
</MkPagination> </div>
</MkPagination>
</MkSpacer>
</div> </div>
</template> </template>

View File

@ -86,29 +86,24 @@ const headerTabs = $computed(() =>
icon: 'ph-user-bold ph-large', icon: 'ph-user-bold ph-large',
}, },
...(($i && $i.id === user.id) || user.publicReactions ...(($i && $i.id === user.id) || user.publicReactions
? [ ? [{
{ key: 'reactions',
key: 'reactions', title: i18n.ts.reaction,
title: i18n.ts.reaction, icon: 'ph-smiley-bold ph-large',
icon: 'ph-smiley-bold ph-large', }] : []),
}, ...(user.instance == null ? [{
]
: []),
{
key: 'clips', key: 'clips',
title: i18n.ts.clips, title: i18n.ts.clips,
icon: 'ph-paperclip-bold ph-large', icon: 'ph-paperclip-bold ph-large',
}, }, {
{
key: 'pages', key: 'pages',
title: i18n.ts.pages, title: i18n.ts.pages,
icon: 'ph-file-text-bold ph-large', icon: 'ph-file-text-bold ph-large',
}, }, {
{
key: 'gallery', key: 'gallery',
title: i18n.ts.gallery, title: i18n.ts.gallery,
icon: 'ph-image-square-bold ph-large', icon: 'ph-image-square-bold ph-large',
}, }] : []),
] ]
: null, : null,
); );

View File

@ -1,8 +1,10 @@
<template> <template>
<div> <div>
<MkPagination v-slot="{items}" ref="list" :pagination="pagination"> <MkSpacer :content-max="800">
<MkPagePreview v-for="page in items" :key="page.id" :page="page" class="_gap"/> <MkPagination v-slot="{items}" ref="list" :pagination="pagination">
</MkPagination> <MkPagePreview v-for="page in items" :key="page.id" :page="page" class="_gap"/>
</MkPagination>
</MkSpacer>
</div> </div>
</template> </template>

View File

@ -1,15 +1,17 @@
<template> <template>
<div> <div>
<MkPagination v-slot="{items}" ref="list" :pagination="pagination"> <MkSpacer :content-max="800">
<div v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap afdcfbfb"> <MkPagination v-slot="{items}" ref="list" :pagination="pagination">
<div class="header"> <div v-for="item in items" :key="item.id" :to="`/clips/${item.id}`" class="item _panel _gap afdcfbfb">
<MkAvatar class="avatar" :user="user"/> <div class="header">
<MkReactionIcon class="reaction" :reaction="item.type" :custom-emojis="item.note.emojis" :no-style="true"/> <MkAvatar class="avatar" :user="user"/>
<MkTime :time="item.createdAt" class="createdAt"/> <MkReactionIcon class="reaction" :reaction="item.type" :custom-emojis="item.note.emojis" :no-style="true"/>
<MkTime :time="item.createdAt" class="createdAt"/>
</div>
<MkNote :key="item.id" :note="item.note"/>
</div> </div>
<MkNote :key="item.id" :note="item.note"/> </MkPagination>
</div> </MkSpacer>
</MkPagination>
</div> </div>
</template> </template>