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.

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

feat(category detail): new category detail page #400

Merged
merged 2 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/components/ProductCategoriesDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<v-divider></v-divider>

<v-card-text v-if="categories.length">
<v-chip v-for="category in categories" :key="category" label class="mr-2 mb-2">
<v-chip v-for="category in categories" :key="category" label class="mr-2 mb-2" @click="goToCategory(category)">
{{ category }}
</v-chip>
</v-card-text>
Expand All @@ -33,6 +33,9 @@ export default {
mounted() {
},
methods: {
goToCategory(category) {
this.$router.push({ path: `/categories/${category}` })
},
close() {
this.$emit('close')
},
Expand Down
5 changes: 5 additions & 0 deletions src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@
"TopProducts": "Top products",
"BrandProductTotal": "{count} products"
},
"CategoryDetail": {
"LoadMore": "Load more",
"TopProducts": "Top products",
"CategoryProductTotal": "{count} products"
},
"Common": {
"AddToOFF": "Add to {name}",
"Filter": "Filter",
Expand Down
1 change: 1 addition & 0 deletions src/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const routes = [
{ path: '/locations', name: 'locations', component: () => import('./views/LocationList.vue'), meta: { title: 'TopLocations', icon: 'mdi-medal-outline', drawerMenu: true }},
{ path: '/locations/:id', name: 'location-detail', component: () => import('./views/LocationDetail.vue'), meta: { title: 'Location detail' }},
{ path: '/brands/:id', name: 'brand-detail', component: () => import('./views/BrandDetail.vue'), meta: { title: 'Brand detail' }},
{ path: '/categories/:id', name: 'category-detail', component: () => import('./views/CategoryDetail.vue'), meta: { title: 'Category detail' }},
{ path: '/proofs/:id', name: 'proof-detail', component: () => import('./views/ProofDetail.vue'), meta: { title: 'Proof detail', requiresAuth: true }},
{ path: '/users', name: 'users', component: () => import('./views/UserList.vue'), meta: { title: 'TopContributors', icon: 'mdi-medal-outline', drawerMenu: true }},
{ path: '/users/:username', name: 'user-detail', component: () => import('./views/UserDetail.vue'), meta: { title: 'User detail' }},
Expand Down
152 changes: 152 additions & 0 deletions src/views/CategoryDetail.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
<template>
<v-row>
<v-col cols="12" sm="6">
<v-card
:title="category"
prepend-icon="mdi-list-box-outline">
<v-card-text>
<v-chip label size="small" density="comfortable" class="mr-1">
<v-icon start icon="mdi-food-outline"></v-icon>
{{ $t('CategoryDetail.CategoryProductTotal', { count: categoryProductTotal }) }}
</v-chip>
</v-card-text>
</v-card>
</v-col>
</v-row>

<v-row class="mt-0">
<v-col cols="12">
<OpenFoodFactsButton type="category" :value="category"></OpenFoodFactsButton>
<ShareButton></ShareButton>
</v-col>
</v-row>

<br />

<h2 class="text-h6 mb-1">
{{ $t('CategoryDetail.TopProducts') }}
<v-progress-circular v-if="loading" indeterminate :size="30"></v-progress-circular>
</h2>

<v-row v-if="!loading">
<v-col>
<v-menu>
<template v-slot:activator="{ props }">
<v-btn v-bind="props" size="small" class="mr-2" prepend-icon="mdi-filter-variant" :active="!!productFilter">{{ $t('Common.Filter') }}</v-btn>
</template>
<v-list>
<v-list-item :slim="true" v-for="filter in productFilterList" :key="filter.key" :prepend-icon="(productFilter === filter.key) ? 'mdi-check-circle' : 'mdi-circle-outline'" :active="productFilter === filter.key" @click="toggleProductFilter(filter.key)">
{{ filter.value }}
</v-list-item>
</v-list>
</v-menu>

<v-menu>
<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)">
{{ order.value }}
</v-list-item>
</v-list>
</v-menu>
</v-col>
</v-row>

<v-row class="mt-0">
<v-col cols="12" sm="6" md="4" v-for="product in categoryProductList" :key="product">
<ProductCard :product="product" elevation="1" height="100%"></ProductCard>
</v-col>
</v-row>

<v-row v-if="categoryProductList.length < categoryProductTotal" class="mb-2">
<v-col align="center">
<v-btn size="small" :loading="loading" @click="getCategoryProducts">{{ $t('CategoryDetail.LoadMore') }}</v-btn>
</v-col>
</v-row>
</template>

<script>
import constants from '../constants'
import api from '../services/api'
import { defineAsyncComponent } from 'vue'

export default {
components: {
'ProductCard': defineAsyncComponent(() => import('../components/ProductCard.vue')),
'OpenFoodFactsButton': defineAsyncComponent(() => import('../components/OpenFoodFactsButton.vue')),
'ShareButton': defineAsyncComponent(() => import('../components/ShareButton.vue'))
},
data() {
return {
// filter & order
productFilter: '',
productFilterList: constants.PRODUCT_FILTER_LIST,
productOrder: constants.PRODUCT_ORDER_BY_LIST[1].key,
productOrderList: constants.PRODUCT_ORDER_BY_LIST,
// data
category: null, // see init
categoryProductList: [],
categoryProductTotal: null,
categoryProductPage: 0,
loading: false,
}
},
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') {
defaultParams['price_count'] = 0
}
return defaultParams
},
},
mounted() {
this.productFilter = this.$route.query[constants.FILTER_PARAM] || this.productFilter
this.productOrder = this.$route.query[constants.ORDER_BY_PARAM] || this.productOrder
this.initCategory()
},
methods: {
initCategory() {
this.category = this.$route.params.id
this.categoryProductList = []
this.categoryProductPage = 0
this.getCategoryProducts()
},
getCategoryProducts() {
this.loading = true
this.categoryProductPage += 1
return api.getProducts(this.getProductsParams)
.then((data) => {
this.categoryProductList.push(...data.items)
this.categoryProductTotal = data.total
this.loading = false
})
},
toggleProductFilter(filterKey) {
this.productFilter = this.productFilter ? '' : filterKey
this.$router.push({ query: { ...this.$route.query, [constants.FILTER_PARAM]: this.productFilter } })
// this.initCategory() will be called in watch $route
},
selectProductOrder(orderKey) {
if (this.productOrder !== orderKey) {
this.productOrder = orderKey
this.$router.push({ query: { ...this.$route.query, [constants.ORDER_BY_PARAM]: this.productOrder } })
// this.initCategory() will be called in watch $route
}
}
},
watch: {
$route (newCategory, oldCategory) {
if (oldCategory && newCategory && newCategory.name == 'category-detail' && oldCategory.fullPath != newCategory.fullPath) {
this.initCategory()
}
}
}
}
</script>
Loading