natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: formatting

This commit is contained in:
ThatOneCalculator 2023-05-22 08:23:00 -07:00
parent afd244351b
commit d88d74c8e0
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
4 changed files with 89 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
packages/client/src/components/MkNote.vue
View File

@ -1,8 +1,20 @@
<template>
<div :aria-label="accessibleLabel" v-if="!muted.muted" v-show="!isDeleted" ref="el" v-hotkey="keymap"
v-size="{ max: [500, 450, 350, 300] }" class="tkcbzcuz note-container" :tabindex="!isDeleted ? '-1' : null"
:class="{ renote: isRenote }">
<MkNoteSub v-if="appearNote.reply && !detailedView" :note="appearNote.reply" class="reply-to" />
<div
:aria-label="accessibleLabel"
v-if="!muted.muted"
v-show="!isDeleted"
ref="el"
v-hotkey="keymap"
v-size="{ max: [500, 450, 350, 300] }"
class="tkcbzcuz note-container"
:tabindex="!isDeleted ? '-1' : null"
:class="{ renote: isRenote }"
>
<MkNoteSub
v-if="appearNote.reply && !detailedView"
:note="appearNote.reply"
class="reply-to"
/>
<div v-if="!detailedView" class="note-context" @click="noteClick">
<div class="line"></div>
<div v-if="appearNote._prId_" class="info">
@ -18,47 +30,80 @@
{{ i18n.ts.featured }}
</div>
<div v-if="pinned" class="info">
<i class="ph-push-pin ph-bold ph-lg"></i>{{ i18n.ts.pinnedNote }}
<i class="ph-push-pin ph-bold ph-lg"></i
>{{ i18n.ts.pinnedNote }}
</div>
<div v-if="isRenote" class="renote">
<i class="ph-repeat ph-bold ph-lg"></i>
<I18n :src="i18n.ts.renotedBy" tag="span">
<template #user>
<MkA v-user-preview="note.userId" class="name" :to="userPage(note.user)" @click.stop>
<MkA
v-user-preview="note.userId"
class="name"
:to="userPage(note.user)"
@click.stop
>
<MkUserName :user="note.user" />
</MkA>
</template>
</I18n>
<div class="info">
<button ref="renoteTime" class="_button time" @click.stop="showRenoteMenu()">
<i v-if="isMyRenote" class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"></i>
<button
ref="renoteTime"
class="_button time"
@click.stop="showRenoteMenu()"
>
<i
v-if="isMyRenote"
class="ph-dots-three-outline ph-bold ph-lg dropdownIcon"
></i>
<MkTime :time="note.createdAt" />
</button>
<MkVisibility :note="note" />
</div>
</div>
</div>
<article class="article" @contextmenu.stop="onContextmenu" @click="noteClick">
<article
class="article"
@contextmenu.stop="onContextmenu"
@click="noteClick"
>
<div class="main">
<div class="header-container">
<MkAvatar class="avatar" :user="appearNote.user" />
<XNoteHeader class="header" :note="appearNote" :mini="true" />
<XNoteHeader
class="header"
:note="appearNote"
:mini="true"
/>
</div>
<div class="body">
<MkSubNoteContent class="text" :note="appearNote" :detailed="true" :detailedView="detailedView"
:parentId="appearNote.parentId" @push="(e) => router.push(notePage(e))"
@focusfooter="footerEl.focus()" @expanded="(e) => setPostExpanded(e)"></MkSubNoteContent>
<MkSubNoteContent
class="text"
:note="appearNote"
:detailed="true"
:detailedView="detailedView"
:parentId="appearNote.parentId"
@push="(e) => router.push(notePage(e))"
@focusfooter="footerEl.focus()"
@expanded="(e) => setPostExpanded(e)"
></MkSubNoteContent>
<div v-if="translating || translation" class="translation">
<MkLoading v-if="translating" mini />
<div v-else class="translated">
<b>{{
i18n.t("translatedFrom", {
x: translation.sourceLang,
})
}}:
<b
>{{
i18n.t("translatedFrom", {
x: translation.sourceLang,
})
}}:
</b>
<Mfm :text="translation.text" :author="appearNote.user" :i="$i"
:custom-emojis="appearNote.emojis" />
<Mfm
:text="translation.text"
:author="appearNote.user"
:i="$i"
:custom-emojis="appearNote.emojis"
/>
</div>
</div>
</div>
@ -440,9 +485,9 @@ const accessibleLabel = computed(() => {
if (props.note.renote) {
label += `${i18n.t("renoted")} ${props.note.renote.user.username}; `;
if (props.note.renote.cw) {
label += `${i18n.t('cw')}: ${props.note.renote.cw}; `;
label += `${i18n.t("cw")}: ${props.note.renote.cw}; `;
if (postIsExpanded.value) {
label += `${props.note.renote.text}; `;
label += `${props.note.renote.text}; `;
}
} else {
label += `${props.note.renote.text}; `;
@ -460,7 +505,7 @@ const accessibleLabel = computed(() => {
const date = new Date(props.note.createdAt);
label += `${date.toLocaleTimeString()}`;
return label;
})
});
defineExpose({
focus,

10
packages/client/src/components/MkNoteDetailed.vue
View File

@ -33,14 +33,12 @@
detailedView
></MkNote>
<MkTab
v-model="tab"
:style="'underline'"
@update:modelValue="loadTab"
>
<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
<option value="replies">
<!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
<span v-if="appearNote.repliesCount > 0" class="count">{{ appearNote.repliesCount }}</span>
<span v-if="appearNote.repliesCount > 0" class="count">{{
appearNote.repliesCount
}}</span>
{{ i18n.ts._notification._types.reply }}
</option>
<option value="renotes" v-if="appearNote.renoteCount > 0">

16
packages/client/src/ui/deck.vue
View File

@ -111,7 +111,7 @@
<div v-if="isMobile" class="buttons">
<button
:aria-label="i18n.t('menu')"
:aria-label="i18n.t('menu')"
class="button nav _button"
@click="drawerMenuShowing = true"
>
@ -120,11 +120,15 @@
><i class="ph-circle ph-fill"></i
></span>
</button>
<button :aria-label="i18n.t('home')" class="button home _button" @click="mainRouter.push('/')">
<button
:aria-label="i18n.t('home')"
class="button home _button"
@click="mainRouter.push('/')"
>
<i class="ph-house ph-bold ph-lg"></i>
</button>
<button
:aria-label="i18n.t('notifications')"
:aria-label="i18n.t('notifications')"
class="button notifications _button"
@click="mainRouter.push('/my/notifications')"
>
@ -133,7 +137,11 @@
><i class="ph-circle ph-fill"></i
></span>
</button>
<button :aria-label="i18n.t('note')" class="button post _button" @click="os.post()">
<button
:aria-label="i18n.t('note')"
class="button post _button"
@click="os.post()"
>
<i class="ph-pencil ph-bold ph-lg"></i>
</button>
</div>

10
packages/client/src/ui/universal.vue
View File

@ -36,7 +36,7 @@
<div v-if="isMobile" class="buttons">
<button
:aria-label="i18n.t('menu')"
:aria-label="i18n.t('menu')"
class="button nav _button"
@click="drawerMenuShowing = true"
>
@ -48,7 +48,7 @@
</div>
</button>
<button
:aria-label="i18n.t('home')"
:aria-label="i18n.t('home')"
class="button home _button"
@click="
mainRouter.currentRoute.value.name === 'index'
@ -65,7 +65,7 @@
</div>
</button>
<button
:aria-label="i18n.t('notifications')"
:aria-label="i18n.t('notifications')"
class="button notifications _button"
@click="
mainRouter.push('/my/notifications');
@ -83,7 +83,7 @@
</div>
</button>
<button
:aria-label="i18n.t('messaging')"
:aria-label="i18n.t('messaging')"
class="button messaging _button"
@click="
mainRouter.push('/my/messaging');
@ -103,7 +103,7 @@
</div>
</button>
<button
:aria-label="i18n.t('_deck._columns.widgets')"
:aria-label="i18n.t('_deck._columns.widgets')"
class="button widget _button"
@click="widgetsShowing = true"
>