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/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index ec991f0ef..4256278af 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -112,16 +112,6 @@ export default {
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 }}
-
+
@@ -213,18 +343,38 @@ export default {
margin-left: auto;
text-align: right;
}
-@media only screen and (min-width: 730px) {
- .mobile-hamburger-menu {
- display: none;
- }
+
+.mobile-menu {
+ margin: 0 20px;
}
-@media only screen and (max-width: 730px) {
+.mobile-search {
+ margin-top: 20px;
+}
+
+.dynamic-branding-mobil,
+.dynamic-footer-mobil {
+ line-height: 30px;
+ font-size: large;
+}
+.dynamic-branding-mobil li {
+ margin: 17px 0;
+}
+
+@media only screen and (max-width: 810px) {
#nav-search-box,
.main-navigation-right {
margin: 10px 0px;
}
+ .main-navigation-right {
+ width: 100%;
+ }
.hide-mobile-menu {
display: none;
}
}
+@media only screen and (min-width: 810px) {
+ .main-navigation-right {
+ width: 100%;
+ }
+}
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 036aed766..67c88e4f4 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -426,6 +426,7 @@
"general": "Allgemein",
"goal": "Ziel der Gruppe",
"groupCreated": "Die Gruppe wurde angelegt!",
+ "in": "in",
"joinLeaveButton": {
"iAmMember": "Bin Mitglied",
"join": "Beitreten"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 91acdb8f6..ba1d65881 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -426,6 +426,7 @@
"general": "General",
"goal": "Goal of group",
"groupCreated": "The group was created!",
+ "in": "in",
"joinLeaveButton": {
"iAmMember": "I'm a member",
"join": "Join"
diff --git a/webapp/pages/group/_id/_slug.spec.js b/webapp/pages/group/_id/_slug.spec.js
index 058b024bf..963952f5e 100644
--- a/webapp/pages/group/_id/_slug.spec.js
+++ b/webapp/pages/group/_id/_slug.spec.js
@@ -244,8 +244,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('yoga-practice')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&yoga-practice')
})
describe('displays no(!) group location – because is "null"', () => {
@@ -397,8 +397,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('yoga-practice')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&yoga-practice')
})
describe('displays no(!) group location – because is "null"', () => {
@@ -510,8 +510,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('yoga-practice')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&yoga-practice')
})
describe('displays no(!) group location – because is "null"', () => {
@@ -623,8 +623,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('yoga-practice')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&yoga-practice')
})
describe('displays no(!) group location – because is "null"', () => {
@@ -740,8 +740,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('school-for-citizens')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&school-for-citizens')
})
describe('displays group location', () => {
@@ -857,8 +857,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('school-for-citizens')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&school-for-citizens')
})
describe('displays group location', () => {
@@ -974,8 +974,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('school-for-citizens')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&school-for-citizens')
})
describe('displays group location', () => {
@@ -1091,8 +1091,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('school-for-citizens')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&school-for-citizens')
})
describe('displays group location', () => {
@@ -1212,8 +1212,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('investigative-journalism')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&investigative-journalism')
})
describe('displays group location', () => {
@@ -1332,8 +1332,8 @@ describe('GroupProfileSlug', () => {
})
it('has group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(true)
- expect(wrapper.text()).toContain('investigative-journalism')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(true)
+ expect(wrapper.text()).toContain('&investigative-journalism')
})
describe('displays group location', () => {
@@ -1452,8 +1452,8 @@ describe('GroupProfileSlug', () => {
})
it('has no(!) group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(false)
- expect(wrapper.text()).not.toContain('investigative-journalism')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(false)
+ expect(wrapper.text()).not.toContain('&investigative-journalism')
})
describe('displays not(!) group location', () => {
@@ -1560,8 +1560,8 @@ describe('GroupProfileSlug', () => {
})
it('has no(!) group slug', () => {
- expect(wrapper.find('[data-test="at"]').exists()).toBe(false)
- expect(wrapper.text()).not.toContain('investigative-journalism')
+ // expect(wrapper.find('[data-test="ampersand"]').exists()).toBe(false)
+ expect(wrapper.text()).not.toContain('&investigative-journalism')
})
describe('displays not(!) group location', () => {
diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue
index 0c9c69c85..d1b410081 100644
--- a/webapp/pages/group/_id/_slug.vue
+++ b/webapp/pages/group/_id/_slug.vue
@@ -38,8 +38,8 @@
-
- {{ groupSlug }}
+
+ {{ `&${groupSlug}` }}
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 0516ec510..f111a4a89 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -33,7 +33,7 @@