Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(toolbar): add coming soon to group search input #3658

Merged
merged 1 commit into from
Jun 16, 2022
Merged

feat(toolbar): add coming soon to group search input #3658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions components/views/navigation/toolbar/Toolbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,28 @@
</UiComingSoon>

<div class="vertical-divider" v-if="!$device.isMobile"></div>
<SearchInput
v-if="!$device.isMobile"
@search="handleSearch"
@change="handleChange"
:placeholder="$t('search.search')"
:searchRecommend="searchRecommend"
/>
<template v-if="!$device.isMobile">
<UiComingSoon
v-if="isGroup"
:tooltipText="$t('coming_soon.group_chat_search')"
horizontal
tooltip-position="bottom"
>
<SearchInput
@search="handleSearch"
@change="handleChange"
:placeholder="$t('search.search')"
:searchRecommend="searchRecommend"
/>
</UiComingSoon>
<SearchInput
v-else
@search="handleSearch"
@change="handleChange"
:placeholder="$t('search.search')"
:searchRecommend="searchRecommend"
/>
</template>
<SearchResult
v-if="!$device.isMobile && searchQuery"
:searchQuery="searchQuery"
Expand Down
1 change: 1 addition & 0 deletions components/views/navigation/toolbar/Toolbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export default Vue.extend({
conversation: (state) => (state as RootState).conversation,
groups: (state) => (state as RootState).groups,
friends: (state) => (state as RootState).friends,
isGroup: (state) => (state as RootState).conversation.type === 'group',
}),
...mapGetters('ui', ['showSidebar', 'allUnseenNotifications']),
showSearchResult: {
Expand Down
1 change: 1 addition & 0 deletions locales/en-US.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default {
archived: 'Archived Messages\nComing Soon',
group_call: 'Group Call\nComing Soon',
sidebar_search: 'Friends and Group Search\nComing Soon',
group_chat_search: 'Group Chat Search\nComing Soon',
},
global: {
name: 'Satellite.im',
Expand Down