diff --git a/cypress/integration/Moderation.ReportContent/I_click_on_the_author.js b/cypress/integration/Moderation.ReportContent/I_click_on_the_author.js index 3a6600ff6..fad21e1a6 100644 --- a/cypress/integration/Moderation.ReportContent/I_click_on_the_author.js +++ b/cypress/integration/Moderation.ReportContent/I_click_on_the_author.js @@ -1,7 +1,7 @@ import { When } from "cypress-cucumber-preprocessor/steps"; When('I click on the author', () => { - cy.get('.user-teaser') + cy.get('[data-test="avatarUserLink"]') .click() .url().should('include', '/profile/') }) \ No newline at end of file diff --git a/webapp/components/PostTeaser/PostTeaser.vue b/webapp/components/PostTeaser/PostTeaser.vue index dc1829a4d..2bd63e6ed 100644 --- a/webapp/components/PostTeaser/PostTeaser.vue +++ b/webapp/components/PostTeaser/PostTeaser.vue @@ -15,7 +15,7 @@ - +

{{ post.title }}

diff --git a/webapp/components/UserTeaser/UserTeaser.story.js b/webapp/components/UserTeaser/UserTeaser.story.js index a872b1aa4..aa8be58ff 100644 --- a/webapp/components/UserTeaser/UserTeaser.story.js +++ b/webapp/components/UserTeaser/UserTeaser.story.js @@ -56,6 +56,41 @@ export const user = { followedBy: [], socialMedia: [], } +export const group = { + id: 'g2', + name: 'Yoga Practice', + slug: 'yoga-practice', + about: null, + description: `

What Is yoga?

Yoga is not just about practicing asanas. It's about how we do it.

And practicing asanas doesn't have to be yoga, it can be more athletic than yogic.

What makes practicing asanas yogic?

The important thing is:

`, + descriptionExcerpt: `

What Is yoga?

Yoga is not just about practicing asanas. It's about how we do it.

And practicing asanas doesn't have to be yoga, it can be more athletic than yogic.

What makes practicing asanas yogic?

The important thing is:

`, + groupType: 'public', + actionRadius: 'interplanetary', + categories: [ + { + id: 'cat4', + icon: 'psyche', + name: 'psyche', + slug: 'psyche', + description: 'Seele, Gefühle, Glück', + }, + { + id: 'cat5', + icon: 'movement', + name: 'body-and-excercise', + slug: 'body-and-excercise', + description: 'Sport, Yoga, Massage, Tanzen, Entspannung', + }, + { + id: 'cat17', + icon: 'spirituality', + name: 'spirituality', + slug: 'spirituality', + description: 'Religion, Werte, Ethik', + }, + ], + locationName: null, + location: null, +} storiesOf('UserTeaser', module) .addDecorator(withA11y) @@ -68,7 +103,7 @@ storiesOf('UserTeaser', module) }), template: '', })) - .add('with Date', () => ({ + .add('with date', () => ({ components: { UserTeaser }, store: helpers.store, data: () => ({ @@ -98,3 +133,21 @@ storiesOf('UserTeaser', module) }), template: '', })) + .add('with group and date', () => ({ + components: { UserTeaser }, + store: helpers.store, + data: () => ({ + user, + group, + }), + template: '', + })) + .add('with group and date – wide', () => ({ + components: { UserTeaser }, + store: helpers.store, + data: () => ({ + user, + group, + }), + template: '', + })) diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue index 7cced8b6d..c7d3df131 100644 --- a/webapp/components/UserTeaser/UserTeaser.vue +++ b/webapp/components/UserTeaser/UserTeaser.vue @@ -4,38 +4,58 @@ {{ $t('profile.userAnonym') }}
- - -
- - {{ userSlug }} - {{ userName }} - - +
+ + + +
+
+ + + {{ userSlug }} + {{ userName }} + + +   + + + {{ $t('group.in') }} + + + + {{ groupSlug }} + {{ groupName }} + + + +
+ - + {{ userName }}
- +