mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
scroll and filter button merged
This commit is contained in:
parent
69e82145cd
commit
9aef64ea93
@ -5,12 +5,12 @@
|
|||||||
<hashtags-filter :hashtag="hashtag" @clearSearch="clearSearch" />
|
<hashtags-filter :hashtag="hashtag" @clearSearch="clearSearch" />
|
||||||
</ds-grid-item>
|
</ds-grid-item>
|
||||||
<!--Filter Button-->
|
<!--Filter Button-->
|
||||||
|
|
||||||
<ds-grid-item
|
<ds-grid-item
|
||||||
v-if="categoriesActive"
|
v-if="categoriesActive"
|
||||||
:row-span="1"
|
:row-span="1"
|
||||||
column-span="fullWidth"
|
column-span="fullWidth"
|
||||||
class="filterButtonMenu"
|
class="filterButtonMenu"
|
||||||
|
:class="{ 'hide-filter': hideFilter }"
|
||||||
>
|
>
|
||||||
<base-button
|
<base-button
|
||||||
class="my-filter-button"
|
class="my-filter-button"
|
||||||
@ -23,20 +23,7 @@
|
|||||||
|
|
||||||
<base-icon class="my-filter-button" :name="filterButtonIcon"></base-icon>
|
<base-icon class="my-filter-button" :name="filterButtonIcon"></base-icon>
|
||||||
</base-button>
|
</base-button>
|
||||||
<!-- <ds-button
|
|
||||||
class="my-filter-button"
|
|
||||||
v-if="!postsFilter['categories_some'] && !postsFilter['author']"
|
|
||||||
:icon="filterButtonIcon"
|
|
||||||
right
|
|
||||||
@click="showFilter = !showFilter"
|
|
||||||
>
|
|
||||||
{{ $t('contribution.filterMasonryGrid.noFilter') }}
|
|
||||||
</ds-button> -->
|
|
||||||
|
|
||||||
<span v-if="postsFilter['categories_some']">
|
<span v-if="postsFilter['categories_some']">
|
||||||
<!-- <ds-button class="my-filter-button" right @click="showFilter = !showFilter">
|
|
||||||
{{ $t('contribution.filterMasonryGrid.myTheme') }}
|
|
||||||
</ds-button> -->
|
|
||||||
<base-button class="my-filter-button" right @click="showFilter = !showFilter" filled>
|
<base-button class="my-filter-button" right @click="showFilter = !showFilter" filled>
|
||||||
{{ $t('contribution.filterMasonryGrid.myTheme') }}
|
{{ $t('contribution.filterMasonryGrid.myTheme') }}
|
||||||
</base-button>
|
</base-button>
|
||||||
@ -48,16 +35,7 @@
|
|||||||
style="margin-left: -8px"
|
style="margin-left: -8px"
|
||||||
filled
|
filled
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- <ds-button
|
|
||||||
class="filter-remove"
|
|
||||||
@click="resetCategories"
|
|
||||||
icon="close"
|
|
||||||
title="Filter löschen"
|
|
||||||
style="margin-left: -14px"
|
|
||||||
></ds-button> -->
|
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span v-if="postsFilter['author']">
|
<span v-if="postsFilter['author']">
|
||||||
<base-button class="my-filter-button" right @click="showFilter = !showFilter" filled>
|
<base-button class="my-filter-button" right @click="showFilter = !showFilter" filled>
|
||||||
{{ $t('contribution.filterMasonryGrid.myFriends') }}
|
{{ $t('contribution.filterMasonryGrid.myFriends') }}
|
||||||
@ -70,22 +48,6 @@
|
|||||||
style="margin-left: -8px"
|
style="margin-left: -8px"
|
||||||
filled
|
filled
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- <ds-button
|
|
||||||
v-if="postsFilter['author']"
|
|
||||||
class="my-filter-button"
|
|
||||||
right
|
|
||||||
@click="showFilter = !showFilter"
|
|
||||||
>
|
|
||||||
{{ $t('contribution.filterMasonryGrid.myFriends') }}
|
|
||||||
</ds-button>
|
|
||||||
<ds-button
|
|
||||||
class="filter-remove"
|
|
||||||
@click="resetByFollowed"
|
|
||||||
icon="close"
|
|
||||||
title="Filter löschen"
|
|
||||||
style="margin-left: -14px"
|
|
||||||
></ds-button> -->
|
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@ -97,7 +59,6 @@
|
|||||||
</div>
|
</div>
|
||||||
</ds-grid-item>
|
</ds-grid-item>
|
||||||
<ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
|
<ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
|
||||||
|
|
||||||
<!-- donation info -->
|
<!-- donation info -->
|
||||||
<ds-grid-item v-if="showDonations" class="top-info-bar" :row-span="1" column-span="fullWidth">
|
<ds-grid-item v-if="showDonations" class="top-info-bar" :row-span="1" column-span="fullWidth">
|
||||||
<donation-info :goal="goal" :progress="progress" />
|
<donation-info :goal="goal" :progress="progress" />
|
||||||
@ -177,6 +138,8 @@ export default {
|
|||||||
data() {
|
data() {
|
||||||
const { hashtag = null } = this.$route.query
|
const { hashtag = null } = this.$route.query
|
||||||
return {
|
return {
|
||||||
|
hideFilter: false,
|
||||||
|
revScrollpos: 0,
|
||||||
showFilter: false,
|
showFilter: false,
|
||||||
showDonations: true,
|
showDonations: true,
|
||||||
goal: 15000,
|
goal: 15000,
|
||||||
@ -225,6 +188,7 @@ export default {
|
|||||||
this.toggleCategory(this.categoryId)
|
this.toggleCategory(this.categoryId)
|
||||||
}
|
}
|
||||||
document.addEventListener('click', this.showFilterMenu)
|
document.addEventListener('click', this.showFilterMenu)
|
||||||
|
window.addEventListener('scroll', this.handleScroll)
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
...mapMutations({
|
...mapMutations({
|
||||||
@ -238,6 +202,15 @@ export default {
|
|||||||
this.showFilter = false
|
this.showFilter = false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
handleScroll() {
|
||||||
|
const currentScrollPos = window.pageYOffset
|
||||||
|
if (this.prevScrollpos > currentScrollPos) {
|
||||||
|
this.hideFilter = false
|
||||||
|
} else {
|
||||||
|
this.hideFilter = true
|
||||||
|
}
|
||||||
|
this.prevScrollpos = currentScrollPos
|
||||||
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
document.removeEventListener('click', this.showFilterMenu)
|
document.removeEventListener('click', this.showFilterMenu)
|
||||||
},
|
},
|
||||||
@ -326,6 +299,10 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hide-filter {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.base-button.--circle.post-add-button {
|
.base-button.--circle.post-add-button {
|
||||||
height: 54px;
|
height: 54px;
|
||||||
width: 54px;
|
width: 54px;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user