diff options
Diffstat (limited to 'apps/user_status/src')
| -rw-r--r-- | apps/user_status/src/UserStatus.vue | 6 | ||||
| -rw-r--r-- | apps/user_status/src/components/ClearAtSelect.vue | 6 | ||||
| -rw-r--r-- | apps/user_status/src/components/CustomMessageInput.vue | 6 | ||||
| -rw-r--r-- | apps/user_status/src/components/PredefinedStatus.vue | 3 | ||||
| -rw-r--r-- | apps/user_status/src/components/PredefinedStatusesList.vue | 9 | ||||
| -rw-r--r-- | apps/user_status/src/components/SetStatusModal.vue | 15 | ||||
| -rw-r--r-- | apps/user_status/src/views/Dashboard.vue | 12 |
7 files changed, 19 insertions, 38 deletions
diff --git a/apps/user_status/src/UserStatus.vue b/apps/user_status/src/UserStatus.vue index bac84e86500..997265a362b 100644 --- a/apps/user_status/src/UserStatus.vue +++ b/apps/user_status/src/UserStatus.vue @@ -23,8 +23,7 @@ <li> <div class="user-status-menu-item"> <!-- Username display --> - <a - v-if="!inline" + <a v-if="!inline" class="user-status-menu-item__header" :href="profilePageLink" @click="loadProfilePage"> @@ -50,8 +49,7 @@ </div> <!-- Status management modal --> - <SetStatusModal - v-if="isModalOpen" + <SetStatusModal v-if="isModalOpen" @close="closeModal" /> </li> </template> diff --git a/apps/user_status/src/components/ClearAtSelect.vue b/apps/user_status/src/components/ClearAtSelect.vue index cd8865edb43..09e0068f87f 100644 --- a/apps/user_status/src/components/ClearAtSelect.vue +++ b/apps/user_status/src/components/ClearAtSelect.vue @@ -21,12 +21,10 @@ <template> <div class="clear-at-select"> - <span - class="clear-at-select__label"> + <span class="clear-at-select__label"> {{ $t('user_status', 'Clear status message after') }} </span> - <Multiselect - label="label" + <Multiselect label="label" :value="option" :options="options" open-direction="top" diff --git a/apps/user_status/src/components/CustomMessageInput.vue b/apps/user_status/src/components/CustomMessageInput.vue index f5c64962b7b..88956e6871b 100644 --- a/apps/user_status/src/components/CustomMessageInput.vue +++ b/apps/user_status/src/components/CustomMessageInput.vue @@ -19,11 +19,9 @@ - --> <template> - <form - class="custom-input__form" + <form class="custom-input__form" @submit.prevent> - <input - ref="input" + <input ref="input" maxlength="80" :disabled="disabled" :placeholder="$t('user_status', 'What is your status?')" diff --git a/apps/user_status/src/components/PredefinedStatus.vue b/apps/user_status/src/components/PredefinedStatus.vue index c7fd4d63fed..f8d5fe26be4 100644 --- a/apps/user_status/src/components/PredefinedStatus.vue +++ b/apps/user_status/src/components/PredefinedStatus.vue @@ -19,8 +19,7 @@ - --> <template> - <div - class="predefined-status" + <div class="predefined-status" tabindex="0" @keyup.enter="select" @keyup.space="select" diff --git a/apps/user_status/src/components/PredefinedStatusesList.vue b/apps/user_status/src/components/PredefinedStatusesList.vue index c0b53a6d650..cff03289715 100644 --- a/apps/user_status/src/components/PredefinedStatusesList.vue +++ b/apps/user_status/src/components/PredefinedStatusesList.vue @@ -20,11 +20,9 @@ --> <template> - <div - v-if="hasLoaded" + <div v-if="hasLoaded" class="predefined-statuses-list"> - <PredefinedStatus - v-for="status in predefinedStatuses" + <PredefinedStatus v-for="status in predefinedStatuses" :key="status.id" :message-id="status.id" :icon="status.icon" @@ -32,8 +30,7 @@ :clear-at="status.clearAt" @select="selectStatus(status)" /> </div> - <div - v-else + <div v-else class="predefined-statuses-list"> <div class="icon icon-loading-small" /> </div> diff --git a/apps/user_status/src/components/SetStatusModal.vue b/apps/user_status/src/components/SetStatusModal.vue index 704e4ae3788..1e1a78203c3 100644 --- a/apps/user_status/src/components/SetStatusModal.vue +++ b/apps/user_status/src/components/SetStatusModal.vue @@ -20,8 +20,7 @@ --> <template> - <Modal - size="normal" + <Modal size="normal" :title="$t('user_status', 'Set status')" @close="closeModal"> <div class="set-status-modal"> @@ -43,21 +42,17 @@ </div> <div class="set-status-modal__custom-input"> <EmojiPicker @select="setIcon"> - <button - class="custom-input__emoji-button"> + <button class="custom-input__emoji-button"> {{ visibleIcon }} </button> </EmojiPicker> - <CustomMessageInput - ref="customMessageInput" + <CustomMessageInput ref="customMessageInput" :message="message" @change="setMessage" @submit="saveStatus" /> </div> - <PredefinedStatusesList - @selectStatus="selectPredefinedMessage" /> - <ClearAtSelect - :clear-at="clearAt" + <PredefinedStatusesList @selectStatus="selectPredefinedMessage" /> + <ClearAtSelect :clear-at="clearAt" @selectClearAt="setClearAt" /> <div class="status-buttons"> <button class="status-buttons__select" :disabled="isSavingStatus" @click="clearStatus"> diff --git a/apps/user_status/src/views/Dashboard.vue b/apps/user_status/src/views/Dashboard.vue index bc30b604a67..629a28abeb5 100644 --- a/apps/user_status/src/views/Dashboard.vue +++ b/apps/user_status/src/views/Dashboard.vue @@ -20,17 +20,14 @@ --> <template> - <DashboardWidget - id="user-status_panel" + <DashboardWidget id="user-status_panel" :items="items" :loading="loading"> <template #default="{ item }"> - <DashboardWidgetItem - :main-text="item.mainText" + <DashboardWidgetItem :main-text="item.mainText" :sub-text="item.subText"> <template #avatar> - <Avatar - class="item-avatar" + <Avatar class="item-avatar" :size="44" :user="item.avatarUsername" :display-name="item.mainText" @@ -40,8 +37,7 @@ </DashboardWidgetItem> </template> <template #empty-content> - <EmptyContent - id="user_status-widget-empty-content" + <EmptyContent id="user_status-widget-empty-content" icon="icon-user-status"> {{ t('user_status', 'No recent status changes') }} </EmptyContent> |