Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: new ProductOrderMenu component #481

Merged
merged 2 commits into from
Mar 30, 2024
Merged

refactor: new ProductOrderMenu component #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da4085e
New ProductOrderMenu component
raphodn Mar 30, 2024
7cbeebe
Use in ProductList, BrandDetail & CategoryDetail. Update constants
raphodn Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions src/components/ProductOrderMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<template>
<v-menu scroll-strategy="close">
<template v-slot:activator="{ props }">
<v-btn v-bind="props" size="small" rounded="xl" prepend-icon="mdi-arrow-down" :append-icon="getCurrentProductOrderIcon" :active="!!productOrder">{{ $t('Common.Order') }}</v-btn>
</template>
<v-list>
<v-list-item :slim="true" v-for="order in productOrderList" :key="order.key" :prepend-icon="order.icon" :active="productOrder === order.key" @click="selectProductOrder(order.key)">
{{ $t('Common.' + order.value) }}
</v-list-item>
</v-list>
</v-menu>
</template>

<script>
import constants from '../constants'

export default {
props: {
'productOrder': String,
},
data() {
return {
productOrderList: constants.PRODUCT_ORDER_LIST,
}
},
computed: {
getCurrentProductOrderIcon() {
let currentProductOrder = this.productOrderList.find(o => o.key === this.productOrder)
return currentProductOrder ? currentProductOrder.icon : ''
},
},
emits: ['update:productOrder'],
methods: {
selectProductOrder(order) {
this.$emit('update:productOrder', order)
}
}
}
</script>
6 changes: 3 additions & 3 deletions src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ export default {
PRICE_FILTER_LIST: [
{ key: 'only_last_30d', value: 'FilterPriceMoreThan30DaysHide' },
],
ORDER_BY_PARAM: 'order_by',
PRODUCT_ORDER_BY_LIST: [
ORDER_PARAM: 'order',
PRODUCT_ORDER_LIST: [
{ key: '-unique_scans_n', value: 'OrderProductUniqueScansDESC', icon: 'mdi-barcode-scan' },
{ key: '-price_count', value: 'OrderProductPriceCountDESC', icon: 'mdi-tag-multiple-outline' },
],
PRICE_ORDER_BY_LIST: [
PRICE_ORDER_LIST: [
{ key: 'price', value: 'OrderPriceASC', icon: 'mdi-order-numeric-ascending' },
{ key: '-date', value: 'OrderPriceDateDESC', icon: 'mdi-calendar' },
{ key: '-created', value: 'OrderPriceCreatedDESC', icon: 'mdi-clock-outline' },
Expand Down
24 changes: 5 additions & 19 deletions src/views/BrandDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,7 @@
<v-row v-if="!loading">
<v-col>
<ProductFilterMenu :productFilter="productFilter" @update:productFilter="toggleProductFilter($event)"></ProductFilterMenu>

<v-menu scroll-strategy="close">
<template v-slot:activator="{ props }">
<v-btn v-bind="props" size="small" prepend-icon="mdi-arrow-down" :append-icon="getCurrentProductOrderIcon" :active="!!productOrder">{{ $t('Common.Order') }}</v-btn>
</template>
<v-list>
<v-list-item :slim="true" v-for="order in productOrderList" :key="order.key" :prepend-icon="order.icon" :active="productOrder === order.key" @click="selectProductOrder(order.key)">
{{ $t('Common.' + order.value) }}
</v-list-item>
</v-list>
</v-menu>
<ProductOrderMenu :productOrder="productOrder" @update:productOrder="selectProductOrder($event)"></ProductOrderMenu>
</v-col>
</v-row>

Expand All @@ -65,6 +55,7 @@ import { defineAsyncComponent } from 'vue'

export default {
components: {
'ProductFilterMenu': defineAsyncComponent(() => import('../components/ProductFilterMenu.vue')),
'ProductFilterMenu': defineAsyncComponent(() => import('../components/ProductFilterMenu.vue')),
'ProductCard': defineAsyncComponent(() => import('../components/ProductCard.vue')),
'OpenFoodFactsLink': defineAsyncComponent(() => import('../components/OpenFoodFactsLink.vue')),
Expand All @@ -74,8 +65,7 @@ export default {
return {
// filter & order
productFilter: '',
productOrder: constants.PRODUCT_ORDER_BY_LIST[1].key,
productOrderList: constants.PRODUCT_ORDER_BY_LIST,
productOrder: constants.PRODUCT_ORDER_LIST[1].key,
// data
brand: null, // see init
brandProductList: [],
Expand All @@ -85,10 +75,6 @@ export default {
}
},
computed: {
getCurrentProductOrderIcon() {
let currentProductOrder = this.productOrderList.find(o => o.key === this.productOrder)
return currentProductOrder ? currentProductOrder.icon : ''
},
getProductsParams() {
let defaultParams = { brands__like: this.brand, order_by: `${this.productOrder}`, page: this.brandProductPage }
if (this.productFilter && this.productFilter === 'hide_price_count_gte_1') {
Expand All @@ -99,7 +85,7 @@ export default {
},
mounted() {
this.productFilter = this.$route.query[constants.FILTER_PARAM] || this.productFilter
this.productOrder = this.$route.query[constants.ORDER_BY_PARAM] || this.productOrder
this.productOrder = this.$route.query[constants.ORDER_PARAM] || this.productOrder
this.initBrand()
},
methods: {
Expand Down Expand Up @@ -128,7 +114,7 @@ export default {
selectProductOrder(orderKey) {
if (this.productOrder !== orderKey) {
this.productOrder = orderKey
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_BY_PARAM]: this.productOrder } })
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_PARAM]: this.productOrder } })
// this.initBrand() will be called in watch $route
}
}
Expand Down
24 changes: 5 additions & 19 deletions src/views/CategoryDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,7 @@
<v-row v-if="!loading">
<v-col>
<ProductFilterMenu :productFilter="productFilter" @update:productFilter="toggleProductFilter($event)"></ProductFilterMenu>

<v-menu scroll-strategy="close">
<template v-slot:activator="{ props }">
<v-btn v-bind="props" size="small" prepend-icon="mdi-arrow-down" :append-icon="getCurrentProductOrderIcon" :active="!!productOrder">{{ $t('Common.Order') }}</v-btn>
</template>
<v-list>
<v-list-item :slim="true" v-for="order in productOrderList" :key="order.key" :prepend-icon="order.icon" :active="productOrder === order.key" @click="selectProductOrder(order.key)">
{{ $t('Common.' + order.value) }}
</v-list-item>
</v-list>
</v-menu>
<ProductOrderMenu :productOrder="productOrder" @update:productOrder="selectProductOrder($event)"></ProductOrderMenu>
</v-col>
</v-row>

Expand All @@ -66,6 +56,7 @@ import { defineAsyncComponent } from 'vue'
export default {
components: {
'ProductFilterMenu': defineAsyncComponent(() => import('../components/ProductFilterMenu.vue')),
'ProductOrderMenu': defineAsyncComponent(() => import('../components/ProductOrderMenu.vue')),
'ProductCard': defineAsyncComponent(() => import('../components/ProductCard.vue')),
'OpenFoodFactsLink': defineAsyncComponent(() => import('../components/OpenFoodFactsLink.vue')),
'ShareButton': defineAsyncComponent(() => import('../components/ShareButton.vue'))
Expand All @@ -74,8 +65,7 @@ export default {
return {
// filter & order
productFilter: '',
productOrder: constants.PRODUCT_ORDER_BY_LIST[1].key,
productOrderList: constants.PRODUCT_ORDER_BY_LIST,
productOrder: constants.PRODUCT_ORDER_LIST[1].key,
// data
category: null, // see init
categoryProductList: [],
Expand All @@ -85,10 +75,6 @@ export default {
}
},
computed: {
getCurrentProductOrderIcon() {
let currentProductOrder = this.productOrderList.find(o => o.key === this.productOrder)
return currentProductOrder ? currentProductOrder.icon : ''
},
getProductsParams() {
let defaultParams = { categories_tags__contains: this.category, order_by: `${this.productOrder}`, page: this.categoryProductPage }
if (this.productFilter && this.productFilter === 'hide_price_count_gte_1') {
Expand All @@ -99,7 +85,7 @@ export default {
},
mounted() {
this.productFilter = this.$route.query[constants.FILTER_PARAM] || this.productFilter
this.productOrder = this.$route.query[constants.ORDER_BY_PARAM] || this.productOrder
this.productOrder = this.$route.query[constants.ORDER_PARAM] || this.productOrder
this.initCategory()
},
methods: {
Expand Down Expand Up @@ -128,7 +114,7 @@ export default {
selectProductOrder(orderKey) {
if (this.productOrder !== orderKey) {
this.productOrder = orderKey
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_BY_PARAM]: this.productOrder } })
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_PARAM]: this.productOrder } })
// this.initCategory() will be called in watch $route
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/views/LocationDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,13 @@ export default {
// filter & order
priceFilter: '',
priceFilterList: constants.PRICE_FILTER_LIST,
priceOrder: constants.PRICE_ORDER_BY_LIST[1].key,
priceOrderList: constants.PRICE_ORDER_BY_LIST,
priceOrder: constants.PRICE_ORDER_LIST[1].key,
priceOrderList: constants.PRICE_ORDER_LIST,
}
},
mounted() {
this.priceFilter = this.$route.query[constants.FILTER_PARAM] || this.priceFilter
this.priceOrder = this.$route.query[constants.ORDER_BY_PARAM] || this.priceOrder
this.priceOrder = this.$route.query[constants.ORDER_PARAM] || this.priceOrder
this.getLocation(),
this.getLocationPrices()
},
Expand Down Expand Up @@ -163,7 +163,7 @@ export default {
selectPriceOrder(orderKey) {
if (this.priceOrder !== orderKey) {
this.priceOrder = orderKey
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_BY_PARAM]: this.priceOrder } })
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_PARAM]: this.priceOrder } })
// this.initLocationPrices() will be called in watch $route
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/views/ProductDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ export default {
// filter & order
priceFilter: '',
priceFilterList: constants.PRICE_FILTER_LIST,
priceOrder: constants.PRICE_ORDER_BY_LIST[1].key,
priceOrderList: constants.PRICE_ORDER_BY_LIST,
priceOrder: constants.PRICE_ORDER_LIST[1].key,
priceOrderList: constants.PRICE_ORDER_LIST,
}
},
mounted() {
this.priceFilter = this.$route.query[constants.FILTER_PARAM] || this.priceFilter
this.priceOrder = this.$route.query[constants.ORDER_BY_PARAM] || this.priceOrder
this.priceOrder = this.$route.query[constants.ORDER_PARAM] || this.priceOrder
this.getProduct(),
this.initProductPrices()
},
Expand Down Expand Up @@ -177,7 +177,7 @@ export default {
selectPriceOrder(orderKey) {
if (this.priceOrder !== orderKey) {
this.priceOrder = orderKey
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_BY_PARAM]: this.priceOrder } })
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_PARAM]: this.priceOrder } })
// this.initProductPrices() will be called in watch $route
}
}
Expand Down
23 changes: 5 additions & 18 deletions src/views/ProductList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,7 @@
{{ productTotal }}<span class="d-none d-sm-inline">&nbsp;products</span>
</v-chip>
<ProductFilterMenu :productFilter="productFilter" @update:productFilter="toggleProductFilter($event)"></ProductFilterMenu>
<v-menu scroll-strategy="close">
<template v-slot:activator="{ props }">
<v-btn v-bind="props" size="small" prepend-icon="mdi-arrow-down" :append-icon="getCurrentProductOrderIcon" :active="!!productOrder">{{ $t('Common.Order') }}</v-btn>
</template>
<v-list>
<v-list-item :slim="true" v-for="order in productOrderList" :key="order.key" :prepend-icon="order.icon" :active="productOrder === order.key" @click="selectProductOrder(order.key)">
{{ $t('Common.' + order.value) }}
</v-list-item>
</v-list>
</v-menu>
<ProductOrderMenu :productOrder="productOrder" @update:productOrder="selectProductOrder($event)"></ProductOrderMenu>
</v-col>
</v-row>

Expand All @@ -44,14 +35,14 @@ import { defineAsyncComponent } from 'vue'
export default {
components: {
'ProductFilterMenu': defineAsyncComponent(() => import('../components/ProductFilterMenu.vue')),
'ProductOrderMenu': defineAsyncComponent(() => import('../components/ProductOrderMenu.vue')),
'ProductCard': defineAsyncComponent(() => import('../components/ProductCard.vue')),
},
data() {
return {
// filter & order
productFilter: '',
productOrder: constants.PRODUCT_ORDER_BY_LIST[1].key,
productOrderList: constants.PRODUCT_ORDER_BY_LIST,
productOrder: constants.PRODUCT_ORDER_LIST[1].key,
// data
productList: [],
productTotal: null,
Expand All @@ -60,10 +51,6 @@ export default {
}
},
computed: {
getCurrentProductOrderIcon() {
let currentProductOrder = this.productOrderList.find(o => o.key === this.productOrder)
return currentProductOrder ? currentProductOrder.icon : ''
},
getProductsParams() {
let defaultParams = { order_by: `${this.productOrder}`, page: this.productPage }
if (this.productFilter && this.productFilter === 'hide_price_count_gte_1') {
Expand All @@ -74,7 +61,7 @@ export default {
},
mounted() {
this.productFilter = this.$route.query[constants.FILTER_PARAM] || this.productFilter
this.productOrder = this.$route.query[constants.ORDER_BY_PARAM] || this.productOrder
this.productOrder = this.$route.query[constants.ORDER_PARAM] || this.productOrder
this.initProductList()
},
methods: {
Expand Down Expand Up @@ -102,7 +89,7 @@ export default {
selectProductOrder(orderKey) {
if (this.productOrder !== orderKey) {
this.productOrder = orderKey
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_BY_PARAM]: this.productOrder } })
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_PARAM]: this.productOrder } })
// this.initProductList() will be called in watch $route
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/views/UserDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ export default {
// filter & order
priceFilter: '',
priceFilterList: constants.PRICE_FILTER_LIST,
priceOrder: constants.PRICE_ORDER_BY_LIST[1].key,
priceOrderList: constants.PRICE_ORDER_BY_LIST,
priceOrder: constants.PRICE_ORDER_LIST[1].key,
priceOrderList: constants.PRICE_ORDER_LIST,
}
},
computed: {
Expand All @@ -110,7 +110,7 @@ export default {
},
mounted() {
this.priceFilter = this.$route.query[constants.FILTER_PARAM] || this.priceFilter
this.priceOrder = this.$route.query[constants.ORDER_BY_PARAM] || this.priceOrder
this.priceOrder = this.$route.query[constants.ORDER_PARAM] || this.priceOrder
this.getUserPrices()
},
methods: {
Expand Down Expand Up @@ -138,7 +138,7 @@ export default {
selectPriceOrder(orderKey) {
if (this.priceOrder !== orderKey) {
this.priceOrder = orderKey
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_BY_PARAM]: this.priceOrder } })
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_PARAM]: this.priceOrder } })
// this.initUserPrices() will be called in watch $route
}
}
Expand Down
Loading