Merge branch 'admin-users' into shigusegubu-themes3

This commit is contained in:
Henry Jameson 2026-06-14 00:55:39 +03:00
commit 714591e63c
5 changed files with 4 additions and 8 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

@ -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">

View file

@ -28,7 +28,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

@ -15,12 +15,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,