diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js index 7237c3a67..c12111263 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.js +++ b/src/components/settings_modal/admin_tabs/users_tab.js @@ -116,7 +116,7 @@ const UsersTab = { methods: { fetchUsers(page) { return useAdminSettingsStore() - .fetchAdminUsers({ + .fetchUsers({ ...this.fetchOptions, page, }) diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index c957fb316..d2d766a7f 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -1,7 +1,6 @@ import { get } from 'lodash' import { mapState } from 'pinia' -import Conversation from 'src/components/conversation/conversation.vue' import FollowCard from 'src/components/follow_card/follow_card.vue' import List from 'src/components/list/list.vue' import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx' @@ -205,7 +204,6 @@ const UserProfile = { List, FollowCard, TabSwitcher, - Conversation, }, } diff --git a/src/components/user_profile/user_profile.scss b/src/components/user_profile/user_profile.scss new file mode 100644 index 000000000..55caa21d9 --- /dev/null +++ b/src/components/user_profile/user_profile.scss @@ -0,0 +1,46 @@ +.user-profile { + flex: 2; + + .card-wrapper { + border-top-left-radius: var(--roundness); + border-top-right-radius: var(--roundness); + } + + .panel-footer { + border-bottom-left-radius: var(--roundness); + border-bottom-right-radius: var(--roundness); + } + + // No sticky header on user profile + --currentPanelStack: 0; + + .userlist-placeholder { + display: flex; + justify-content: center; + align-items: center; + padding: 2em; + } + + .user-info { + margin: 1.2em; + } +} + +.user-profile-placeholder { + .panel-body { + display: flex; + justify-content: center; + align-items: center; + padding: 7em; + } + + .alert { + padding: 0.75em 5em; + border-width: 2px; + + .error-message { + color: var(--text); + font-weight: bold; + } + } +} diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 51ac73a7a..6ca0c39bd 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -126,52 +126,4 @@ - + diff --git a/src/stores/admin_settings.js b/src/stores/admin_settings.js index 590ff4bef..55f6eca69 100644 --- a/src/stores/admin_settings.js +++ b/src/stores/admin_settings.js @@ -312,7 +312,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', { }, // Users stuff - async fetchAdminUsers(opts) { + async fetchUsers(opts) { const adminData = await this.backendInteractor.adminListUsers({ opts, })