From 86f186b30f8d7e2c3ed78195d3df73ba34cef780 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 7 Feb 2023 12:00:16 +0100 Subject: [PATCH 1/5] change postion add content button, refactor mobile filter menu --- webapp/constants/posts.js | 1 + webapp/pages/index.vue | 221 ++++++++++++++++++++++++++------------ 2 files changed, 151 insertions(+), 71 deletions(-) diff --git a/webapp/constants/posts.js b/webapp/constants/posts.js index 7890578c8..93f387c88 100644 --- a/webapp/constants/posts.js +++ b/webapp/constants/posts.js @@ -1,2 +1,3 @@ export const first = 12 export const offset = 0 +export const POST_ADD_BUTTON_POSITION_TOP = true diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index b0f8c8679..277e42a05 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -1,64 +1,86 @@ @@ -29,7 +29,6 @@ export default { props: { placement: { type: String }, offset: { type: [String, Number] }, - showMobileMenu: { type: Boolean, default: false }, }, computed: { ...mapGetters({ diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue index 3f22aaed8..0eb27cd2d 100644 --- a/webapp/components/FilterMenu/FilterMenuComponent.vue +++ b/webapp/components/FilterMenu/FilterMenuComponent.vue @@ -3,7 +3,7 @@

{{ $t('filter-menu.filter-by') }}

- +

{{ $t('filter-menu.order-by') }}

@@ -28,9 +28,6 @@ export default { categoriesActive: this.$env.CATEGORIES_ACTIVE, } }, - props: { - showMobileMenu: { type: Boolean, default: false }, - }, } diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue index f1883b0cc..1a7548782 100644 --- a/webapp/components/HeaderMenu/HeaderMenu.vue +++ b/webapp/components/HeaderMenu/HeaderMenu.vue @@ -149,7 +149,7 @@ style="flex-grow: 0; flex-basis: auto; padding: 20px 0" > - + diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 48043e3b9..524a530d1 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -5,7 +5,7 @@
- +
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index 28c9f0793..ca5ad7bd6 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -23,7 +23,7 @@ v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID" :row-span="1" column-span="fullWidth" - class="top-info-bar" + class="top-filter-menu" >
@@ -66,7 +66,7 @@
- +
@@ -139,9 +139,6 @@ export default { FilterMenuComponent, }, mixins: [postListActions], - props: { - showMobileMenu: { type: Boolean, default: false }, - }, data() { const { hashtag = null } = this.$route.query return { @@ -341,7 +338,8 @@ export default { box-shadow: $box-shadow-x-large; } -.top-info-bar { +.top-info-bar, +.top-filter-menu { display: flex; align-items: center; } From df22c7289e32ff5c08500d691cffded4061cd834 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 7 Feb 2023 16:40:33 +0100 Subject: [PATCH 4/5] add change showFilter by mouseleave on my-filter --- webapp/components/FilterMenu/CategoriesFilter.vue | 7 ++++++- webapp/components/FilterMenu/FilterMenuComponent.vue | 2 +- webapp/components/HeaderMenu/HeaderMenu.vue | 4 +++- webapp/pages/index.vue | 6 ++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/webapp/components/FilterMenu/CategoriesFilter.vue b/webapp/components/FilterMenu/CategoriesFilter.vue index b18091bec..bcbfc7d1c 100644 --- a/webapp/components/FilterMenu/CategoriesFilter.vue +++ b/webapp/components/FilterMenu/CategoriesFilter.vue @@ -6,7 +6,7 @@ :filled="!filteredCategoryIds.length" :label="$t('filter-menu.all')" icon="check" - @click="resetCategories" + @click="setResetCategories" />
  • @@ -62,6 +62,10 @@ export default { resetCategories: 'posts/RESET_CATEGORIES', toggleCategory: 'posts/TOGGLE_CATEGORY', }), + setResetCategories() { + this.resetCategories() + this.$emit('showFilterMenu') + }, saveCategories() { this.$apollo .mutate({ @@ -69,6 +73,7 @@ export default { variables: { activeCategories: this.filteredCategoryIds }, }) .then(() => { + this.$emit('showFilterMenu') this.$toast.success(this.$t('filter-menu.save.success')) }) .catch(() => { diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue index 0eb27cd2d..7a582a7c4 100644 --- a/webapp/components/FilterMenu/FilterMenuComponent.vue +++ b/webapp/components/FilterMenu/FilterMenuComponent.vue @@ -3,7 +3,7 @@

    {{ $t('filter-menu.filter-by') }}

    - +

    {{ $t('filter-menu.order-by') }}

    diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue index 1a7548782..f96a287e4 100644 --- a/webapp/components/HeaderMenu/HeaderMenu.vue +++ b/webapp/components/HeaderMenu/HeaderMenu.vue @@ -179,7 +179,9 @@ style="text-align: center" > - +
    + +
    diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index ca5ad7bd6..fde0a2a78 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -66,7 +66,9 @@
    - +
    + +
    @@ -203,7 +205,7 @@ export default { toggleCategory: 'posts/TOGGLE_CATEGORY', }), showFilterMenu(e) { - if (!e.target.closest('#my-filter') && !e.target.closest('.my-filter-button')) { + if (!e || (!e.target.closest('#my-filter') && !e.target.closest('.my-filter-button'))) { if (!this.showFilter) return this.showFilter = false } From 27a543ca96fe65a6042a2cd3e2851620ea27fa11 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 8 Feb 2023 12:57:10 +0100 Subject: [PATCH 5/5] add class post-add-button-bottom --- webapp/pages/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index fde0a2a78..37c07eeab 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -9,7 +9,8 @@ content: $t('contribution.newPost'), placement: 'left', }" - :class="POST_ADD_BUTTON_POSITION_TOP ? 'post-add-button-top' : 'post-add-button'" + class="post-add-button" + :class="POST_ADD_BUTTON_POSITION_TOP ? 'post-add-button-top' : 'post-add-button-bottom'" icon="plus" filled circle @@ -318,7 +319,7 @@ export default { float: right; } -.base-button.--circle.post-add-button { +.base-button.--circle.post-add-button-bottom { height: 54px; width: 54px; font-size: 26px;