IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: lint

Browse Source
This commit is contained in:
ogerly 2020-04-17 08:51:07 +02:00
parent 2d6665b278
commit 1d79900e5e
3 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webapp/components/_new/features/SearchResults/SearchResults.vue
View File

@ -1,6 +1,8 @@
<template> <template>
<div id="search-results" class="search-results">
<div class="search-results"> <div class="search-results">
<div class="search-results">{{$t('search.results', { searchCount:searchCount, search:search })}}</div> {{ $t('search.results', { searchCount: searchCount, search: search }) }}
</div>
<tab-navigation :tabs="tabOptions" :activeTab="activeTab" @switchTab="switchTab" /> <tab-navigation :tabs="tabOptions" :activeTab="activeTab" @switchTab="switchTab" />
<section <section
:class="['results', activeTab === 'User' && '--user', !activeResourceCount > 0 && '--empty']" :class="['results', activeTab === 'User' && '--user', !activeResourceCount > 0 && '--empty']"
@ -245,8 +247,8 @@ export default {
this.posts = searchPosts.posts this.posts = searchPosts.posts
this.postCount = searchPosts.postCount this.postCount = searchPosts.postCount
this.searchCount = this.postCount + this.userCount + this.hashtagCount this.searchCount = this.postCount + this.userCount + this.hashtagCount
this.clearPage()
if (this.postCount > 0) this.activeTab = 'Post' if (this.postCount > 0) this.activeTab = 'Post'
this.clearPage
}, },
fetchPolicy: 'cache-and-network', fetchPolicy: 'cache-and-network',
}, },
@ -269,8 +271,8 @@ export default {
this.users = searchUsers.users this.users = searchUsers.users
this.userCount = searchUsers.userCount this.userCount = searchUsers.userCount
this.searchCount = this.postCount + this.userCount + this.hashtagCount this.searchCount = this.postCount + this.userCount + this.hashtagCount
this.clearPage()
if (this.postCount === 0 && this.userCount > 0) this.activeTab = 'User' if (this.postCount === 0 && this.userCount > 0) this.activeTab = 'User'
this.clearPage
}, },
fetchPolicy: 'cache-and-network', fetchPolicy: 'cache-and-network',
}, },
@ -293,9 +295,9 @@ export default {
this.hashtags = searchHashtags.hashtags this.hashtags = searchHashtags.hashtags
this.hashtagCount = searchHashtags.hashtagCount this.hashtagCount = searchHashtags.hashtagCount
this.searchCount = this.postCount + this.userCount + this.hashtagCount this.searchCount = this.postCount + this.userCount + this.hashtagCount
this.clearPage()
if (this.postCount === 0 && this.userCount === 0 && this.hashtagCount > 0) this.activeTab = 'Hashtag' if (this.postCount === 0 && this.userCount === 0 && this.hashtagCount > 0)
this.clearPage this.activeTab = 'Hashtag'
}, },
fetchPolicy: 'cache-and-network', fetchPolicy: 'cache-and-network',
}, },

8
webapp/components/_new/generic/PaginationButtons/PaginationButtons.vue
View File

@ -6,9 +6,10 @@
icon="arrow-left" icon="arrow-left"
circle circle
data-test="previous-button" data-test="previous-button"
v-scroll-to="'.main-navigation'"
/> />
<span class="pagination-pageCount"> Seite {{ hasResultPage + 1 }} / {{ Math.round(hasResultCount / 25) + 1}} </span> <span class="pagination-pageCount">
Seite {{ hasResultPage + 1 }} / {{ Math.round(hasResultCount / 25) + 1 }}
</span>
<base-button <base-button
@click="$emit('next')" @click="$emit('next')"
@ -16,7 +17,7 @@
icon="arrow-right" icon="arrow-right"
circle circle
data-test="next-button" data-test="next-button"
v-scroll-to="'.main-navigation'" v-scroll-to="'#search-results'"
/> />
</div> </div>
</template> </template>
@ -53,7 +54,6 @@ export default {
} }
.pagination-pageCount { .pagination-pageCount {
justify-content: space-around; justify-content: space-around;
margin: 8px auto; margin: 8px auto;

1
webapp/components/generic/SearchableInput/SearchableInput.vue
View File

@ -20,7 +20,6 @@
@keyup.esc.native="clear" @keyup.esc.native="clear"
@blur.capture.native="onBlur" @blur.capture.native="onBlur"
@input.exact="onSelect" @input.exact="onSelect"
> >
<template #option="{ option }"> <template #option="{ option }">
<search-heading v-if="isFirstOfType(option)" :resource-type="option.__typename" /> <search-heading v-if="isFirstOfType(option)" :resource-type="option.__typename" />