IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2026-04-06 01:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix review

Browse Source
This commit is contained in:
ogerly 2022-09-22 18:42:58 +02:00
parent 1af5ce9e30
commit 858739eaa0
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/schema/resolvers/users/location.spec.js
View File

@ -121,7 +121,7 @@ describe('Location Service', () => {
const result = await query({ query: queryLocations, variables }) const result = await query({ query: queryLocations, variables })
expect(result.data.queryLocations).toEqual( expect(result.data.queryLocations).toEqual(
expect.arrayContaining([ expect.arrayContaining([
{ id: 'place.14094307404564380', place_name: 'Berlin, Germany' }, { id: expect.stringMatching(/^place\.[0-9]+$/), place_name: 'Berlin, Germany' },
{ {
id: expect.stringMatching(/^place\.[0-9]+$/), id: expect.stringMatching(/^place\.[0-9]+$/),
place_name: 'Berlin, Maryland, United States', place_name: 'Berlin, Maryland, United States',

2
webapp/assets/_new/styles/tokens.scss
View File

@ -374,4 +374,4 @@ $color-footer-link: $color-primary;
* @tokens Locale Menu Color * @tokens Locale Menu Color
*/ */
$color-locale-menu: $text-color-soft; $color-locale-menu: $text-color-soft;

10
webapp/components/FilterMenu/CategoriesMenu.vue
View File

@ -1,13 +1,6 @@
<template> <template>
<dropdown ref="category-menu" placement="top-start" :offset="8" class="category-menu"> <dropdown ref="category-menu" placement="top-start" :offset="8" class="category-menu">
<a <a href="#" slot="default" slot-scope="{ toggleMenu }" @click.prevent="toggleMenu()">
href="#"
slot="default"
:filled="filterActive"
:ghost="!filterActive"
slot-scope="{ toggleMenu }"
@click.prevent="toggleMenu()"
>
<ds-text bold size="large">{{ $t('admin.categories.name') }}</ds-text> <ds-text bold size="large">{{ $t('admin.categories.name') }}</ds-text>
</a> </a>
<template slot="popover"> <template slot="popover">
@ -41,6 +34,7 @@ export default {
}, },
computed: { computed: {
...mapGetters({ ...mapGetters({
// TODO: implement visibility of active filter later on
filterActive: 'posts/isActive', filterActive: 'posts/isActive',
}), }),
}, },