Merge remote-tracking branch 'origin/develop' into api-refactor

This commit is contained in:
Henry Jameson 2026-06-16 16:28:01 +03:00
commit de2ffbf241
11 changed files with 46 additions and 41 deletions

View file

@ -22,7 +22,7 @@
v-if="sortedChatList.length > 0" v-if="sortedChatList.length > 0"
class="timeline" class="timeline"
> >
<List :items="sortedChatList"> <List :external-items="sortedChatList">
<template #item="{item}"> <template #item="{item}">
<ChatListItem <ChatListItem
:key="item.id" :key="item.id"

View file

@ -4,6 +4,7 @@
overflow: hidden; overflow: hidden;
box-sizing: border-box; box-sizing: border-box;
cursor: pointer; cursor: pointer;
width: 100%;
:focus { :focus {
outline: none; outline: none;

View file

@ -33,6 +33,10 @@
&:not(:last-child) { &:not(:last-child) {
border-bottom: 1px dotted var(--border); border-bottom: 1px dotted var(--border);
} }
&:empty {
border: none;
}
} }
.header { .header {

View file

@ -1,5 +1,6 @@
.FrontendsTab { .FrontendsTab {
padding: 0 1em; padding: 0 1em;
.cards-list { .cards-list {
padding: 0; padding: 0;
} }

View file

@ -20,8 +20,10 @@
flex-direction: column; flex-direction: column;
gap: 1em; gap: 1em;
border-right: 1px solid var(--border); border-right: 1px solid var(--border);
padding: 0 1em; padding: 1em;
margin-right: 1em; margin-right: 1em;
overflow: auto visible;
flex: 0 0 auto;
> div { > div {
flex: 0 1 auto; flex: 0 1 auto;

View file

@ -3,9 +3,6 @@
class="UsersTab" class="UsersTab"
:label="$t('admin_dash.users.management')" :label="$t('admin_dash.users.management')"
> >
<h3>
{{ $t('admin_dash.users.title') }}
</h3>
<div class="splitter"> <div class="splitter">
<div class="filters-section"> <div class="filters-section">
<label class="filter"> <label class="filter">
@ -136,7 +133,7 @@
<AdminUserCard :user-id="item.id" /> <AdminUserCard :user-id="item.id" />
</template> </template>
<template #empty> <template #empty>
<span>{{ $t('admin_dash.users.no_users_found')}}</span> <span>{{ $t('admin_dash.users.no_users_found') }}</span>
</template> </template>
</List> </List>
</div> </div>

View file

@ -131,40 +131,41 @@ const Status = {
Quote: defineAsyncComponent(() => import('src/components/quote/quote.vue')), Quote: defineAsyncComponent(() => import('src/components/quote/quote.vue')),
StatusActionButtons, StatusActionButtons,
}, },
props: [ props: {
'statusoid', statusoid: Object,
'replies', replies: Array,
'expandable', expandable: Boolean,
'focused', focused: Boolean,
'highlight', highlight: Boolean,
'compact', compact: Boolean,
'isPreview', isPreview: Boolean,
'noHeading', noHeading: Boolean,
'inlineExpanded', inlineExpanded: Boolean,
'showPinned', showPinned: Boolean,
'inProfile', inProfile: Boolean,
'inConversation', inConversation: Boolean,
'inQuote', inQuote: Boolean,
'profileUserId',
'simpleTree',
'showOtherRepliesAsButton',
'dive',
'ignoreMute',
'controlledThreadDisplayStatus', profileUserId: String,
'controlledToggleThreadDisplay', simpleTree: Boolean,
'controlledShowingTall', showOtherRepliesAsButton: Boolean,
'controlledToggleShowingTall', dive: Function,
'controlledExpandingSubject', ignoreMute: Boolean,
'controlledToggleExpandingSubject',
'controlledShowingLongSubject', controlledThreadDisplayStatus: String,
'controlledToggleShowingLongSubject', controlledToggleThreadDisplay: Function,
'controlledReplying', controlledShowingTall: Boolean,
'controlledToggleReplying', controlledToggleShowingTall: Function,
'controlledMediaPlaying', controlledExpandingSubject: Boolean,
'controlledSetMediaPlaying', controlledToggleExpandingSubject: Function,
], controlledShowingLongSubject: Boolean,
controlledToggleShowingLongSubject: Function,
controlledReplying: Boolean,
controlledToggleReplying: Function,
controlledMediaPlaying: Boolean,
controlledSetMediaPlaying: Function,
},
emits: ['goto', 'toggleExpanded'], emits: ['goto', 'toggleExpanded'],
data() { data() {
return { return {

View file

@ -56,6 +56,7 @@
.contents { .contents {
flex: 1 0 auto; flex: 1 0 auto;
min-height: 0; min-height: 0;
position: relative;
.hidden { .hidden {
display: none; display: none;

View file

@ -33,6 +33,7 @@
:statusoid="item" :statusoid="item"
:in-conversation="false" :in-conversation="false"
:focused="false" :focused="false"
ignore-mute
/> />
</template> </template>
</List> </List>

View file

@ -31,7 +31,6 @@ const UserReportingModal = {
return !!this.$store.state.users.currentUser return !!this.$store.state.users.currentUser
}, },
isOpen() { isOpen() {
console.log(this.reportModal)
return this.isLoggedIn && this.reportModal.activated return this.isLoggedIn && this.reportModal.activated
}, },
userId() { userId() {

View file

@ -18,12 +18,10 @@ export const useReportsStore = defineStore('reports', {
}), }),
actions: { actions: {
openUserReportingModal({ userId, statusIds = [] }) { openUserReportingModal({ userId, statusIds = [] }) {
console.log('ASS')
const preTickedStatuses = statusIds.map( const preTickedStatuses = statusIds.map(
(id) => window.vuex.state.statuses.allStatusesObject[id], (id) => window.vuex.state.statuses.allStatusesObject[id],
) )
const preTickedIds = statusIds const preTickedIds = statusIds
console.log(preTickedStatuses)
const statuses = preTickedStatuses.concat( const statuses = preTickedStatuses.concat(
filter( filter(
window.vuex.state.statuses.allStatuses, window.vuex.state.statuses.allStatuses,