Client - add button to clear workouts filters

This commit is contained in:
Sam
2021-11-07 11:17:01 +01:00
parent d3b8ec7c89
commit a22dec457b
21 changed files with 57 additions and 22 deletions

View File

@ -151,6 +151,9 @@
<button class="confirm" @click="onFilter">
{{ $t('buttons.FILTER') }}
</button>
<button class="confirm" @click="onClearFilter">
{{ $t('buttons.CLEAR_FILTER') }}
</button>
</div>
</div>
</div>
@ -202,6 +205,10 @@
}
router.push({ path: '/workouts', query: params })
}
function onClearFilter() {
emit('filter')
router.push({ path: '/workouts', query: {} })
}
watch(
() => route.query,
@ -210,7 +217,7 @@
}
)
return { translatedSports, onFilter, handleFilterChange }
return { translatedSports, onClearFilter, onFilter, handleFilterChange }
},
})
</script>
@ -262,10 +269,11 @@
.form-button {
display: flex;
justify-content: center;
flex-wrap: wrap;
margin: $default-margin * 0.5;
button {
margin: $default-padding * 2 $default-padding * 0.5 $default-padding
$default-padding * 0.5;
margin-top: $default-margin;
width: 100%;
}
}
@ -298,6 +306,7 @@
}
.form-button {
flex-wrap: initial;
button {
margin: $default-padding $default-padding * 0.5;
width: 100%;
@ -332,10 +341,17 @@
}
}
.form-button {
flex-wrap: initial;
button {
margin: $default-padding $default-padding * 0.5;
}
}
}
@media screen and (max-width: $x-small-limit) {
.form-button {
flex-wrap: wrap;
}
}
}
</style>

View File

@ -223,7 +223,6 @@
function getWorkoutsQuery(newQuery: LocationQuery): TWorkoutsPayload {
query = getQuery(newQuery, orderByList, defaultOrder.order_by, {
defaultSort: defaultOrder.order,
query,
})
Object.keys(newQuery)
.filter((k) => workoutsPayloadKeys.includes(k))