ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix test, remove unused code

Browse Source
This commit is contained in:
ogerly 2023-02-07 14:38:16 +01:00
parent 0a4e236bef
commit e8ce152f06
6 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
webapp/components/FilterMenu/CategoriesFilter.vue
View File

@ -47,9 +47,6 @@ export default {
LabeledButton,
},
mixins: [SortCategories],
props: {
showMobileMenu: { type: Boolean, default: false },
},
data() {
return {
categories: [],

3
webapp/components/FilterMenu/FilterMenu.vue
View File

@ -11,7 +11,7 @@
<base-icon class="dropdown-arrow" name="angle-down" />
</base-button>
<template slot="popover">
<filter-menu-component :showMobileMenu="showMobileMenu" />
<filter-menu-component />
</template>
</dropdown>
</template>
@ -29,7 +29,6 @@ export default {
props: {
placement: { type: String },
offset: { type: [String, Number] },
showMobileMenu: { type: Boolean, default: false },
},
computed: {
...mapGetters({

5
webapp/components/FilterMenu/FilterMenuComponent.vue
View File

@ -3,7 +3,7 @@
<div class="filter-menu-options">
<h2 class="title">{{ $t('filter-menu.filter-by') }}</h2>
<following-filter />
<categories-filter v-if="categoriesActive" :showMobileMenu="showMobileMenu" />
<categories-filter v-if="categoriesActive" />
</div>
<div class="filter-menu-options">
<h2 class="title">{{ $t('filter-menu.order-by') }}</h2>
@ -28,9 +28,6 @@ export default {
categoriesActive: this.$env.CATEGORIES_ACTIVE,
}
},
props: {
showMobileMenu: { type: Boolean, default: false },
},
}
</script>

2
webapp/components/HeaderMenu/HeaderMenu.vue
View File

@ -149,7 +149,7 @@
style="flex-grow: 0; flex-basis: auto; padding: 20px 0"
>
<client-only>
<filter-menu v-show="showFilterMenuDropdown" :showMobileMenu="showMobileMenu" />
<filter-menu v-if="showFilterMenuDropdown && SHOW_CONTENT_FILTER_HEADER_MENU" />
</client-only>
</ds-flex-item>
</ds-flex>

2
webapp/layouts/default.vue
View File

@ -5,7 +5,7 @@
</div>
<ds-container>
<div class="main-container">
<nuxt :showMobileMenu="showMobileMenu" />
<nuxt />
</div>
</ds-container>
<page-footer v-if="!isMobile" />

10
webapp/pages/index.vue
View File

@ -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"
>
<div class="filterButtonBox">
<div class="filterButtonMenu" :class="{ 'hide-filter': hideByScroll }">
@ -66,7 +66,7 @@
</span>
<div id="my-filter" v-if="showFilter">
<filter-menu-component :showMobileMenu="showMobileMenu" />
<filter-menu-component />
</div>
</div>
</div>
@ -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;
}