itepechi
/
akkoma-fe
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Render search results using the Conversation component

This commit is contained in:
itepechi 2023-11-03 05:47:27 +09:00
parent a88fe43f03
commit b35b8aeb01
2 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/search/search.js
View File

@ -1,6 +1,5 @@
import FollowCard from '../follow_card/follow_card.vue' import FollowCard from '../follow_card/follow_card.vue'
import Conversation from '../conversation/conversation.vue' import Conversation from '../conversation/conversation.vue'
import Status from '../status/status.vue'
import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx' import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
import SearchFilters from './search_filters.vue' import SearchFilters from './search_filters.vue'
import map from 'lodash/map' import map from 'lodash/map'
@ -20,7 +19,6 @@ const Search = {
components: { components: {
FollowCard, FollowCard,
Conversation, Conversation,
Status,
TabSwitcher, TabSwitcher,
SearchFilters SearchFilters
}, },

29
src/components/search/search.vue
View File

@ -72,15 +72,12 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div v-if="currenResultTab === 'statuses'"> <div v-if="currenResultTab === 'statuses'">
<Status <Conversation
v-for="status in visibleStatuses" v-for="status in visibleStatuses"
:key="status.id" :key="status.id"
:collapsable="false" :collapsable="true"
:expandable="false" class="status-fadein"
:compact="false" :status-id="status.id"
class="search-result"
:statusoid="status"
:no-heading="false"
/> />
<button <button
v-if="!loading && loadedInitially && lastStatusFetchCount > 0" v-if="!loading && loadedInitially && lastStatusFetchCount > 0"
@ -111,15 +108,12 @@
</div> </div>
</div> </div>
<div v-if="currenResultTab === 'media'"> <div v-if="currenResultTab === 'media'">
<Status <Conversation
v-for="media in visibleMedia" v-for="media in visibleMedia"
:key="media.id" :key="media.id"
:collapsable="false" :collapsable="true"
:expandable="false" class="status-fadein"
:compact="false" :status-id="media.id"
class="search-result"
:statusoid="media"
:no-heading="false"
/> />
<button <button
v-if="!loading && loadedInitially && lastMediaFetchCount > 0" v-if="!loading && loadedInitially && lastMediaFetchCount > 0"
@ -224,13 +218,6 @@
} }
} }
.search-result {
box-sizing: border-box;
border-bottom: 1px solid;
border-color: $fallback--border;
border-color: var(--border, $fallback--border);
}
.search-result-footer { .search-result-footer {
border-width: 1px 0 0 0; border-width: 1px 0 0 0;
border-style: solid; border-style: solid;