From 3bf26de6500e986005afb63385f28a4412607651 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 26 Oct 2022 14:18:33 +0200 Subject: [PATCH] rename route from my-groups to groups --- webapp/components/AvatarMenu/AvatarMenu.spec.js | 4 ++-- webapp/components/AvatarMenu/AvatarMenu.vue | 4 ++-- webapp/components/Group/GroupButton.vue | 2 +- webapp/components/Group/GroupForm.vue | 2 +- webapp/locales/de.json | 4 ++-- webapp/locales/en.json | 4 ++-- webapp/pages/group/create.vue | 1 - webapp/pages/{my-groups.vue => groups.vue} | 0 8 files changed, 10 insertions(+), 11 deletions(-) rename webapp/pages/{my-groups.vue => groups.vue} (100%) diff --git a/webapp/components/AvatarMenu/AvatarMenu.spec.js b/webapp/components/AvatarMenu/AvatarMenu.spec.js index 15f536ee7..5495c9ae6 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.spec.js +++ b/webapp/components/AvatarMenu/AvatarMenu.spec.js @@ -90,10 +90,10 @@ describe('AvatarMenu.vue', () => { expect(profileLink.exists()).toBe(true) }) - it('displays a link to "My groups"', () => { + it('displays a link to "Groups"', () => { const profileLink = wrapper .findAll('.ds-menu-item span') - .at(wrapper.vm.routes.findIndex((route) => route.path === '/my-groups')) + .at(wrapper.vm.routes.findIndex((route) => route.path === '/groups')) expect(profileLink.exists()).toBe(true) }) diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue index 5caec07f2..a5b56ba43 100644 --- a/webapp/components/AvatarMenu/AvatarMenu.vue +++ b/webapp/components/AvatarMenu/AvatarMenu.vue @@ -77,8 +77,8 @@ export default { icon: 'user', }, { - name: this.$t('header.avatarMenu.myGroups'), - path: '/my-groups', + name: this.$t('header.avatarMenu.Groups'), + path: '/groups', icon: 'users', }, { diff --git a/webapp/components/Group/GroupButton.vue b/webapp/components/Group/GroupButton.vue index 2000e3046..db72467ef 100644 --- a/webapp/components/Group/GroupButton.vue +++ b/webapp/components/Group/GroupButton.vue @@ -1,5 +1,5 @@ diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue index e0166bb45..6604a56d5 100644 --- a/webapp/components/Group/GroupForm.vue +++ b/webapp/components/Group/GroupForm.vue @@ -163,7 +163,7 @@ - + {{ $t('actions.cancel') }} diff --git a/webapp/locales/de.json b/webapp/locales/de.json index e93584e2f..cc2acd05e 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -427,6 +427,7 @@ "general": "Allgemein", "goal": "Ziel der Gruppe", "groupCreated": "Die Gruppe wurde angelegt!", + "Groups": "Gruppen", "in": "in", "joinLeaveButton": { "iAmMember": "Bin Mitglied", @@ -448,7 +449,6 @@ "membersCount": "Mitglied ::: Mitglieder", "membersListTitle": "Gruppenmitglieder", "membersListTitleNotAllowedSeeingGroupMembers": "Gruppenmitglieder unsichtbar", - "myGroups": "Meine Gruppen", "name": "Gruppenname", "radius": "Radius", "removeMember": "Mitglied aus der Gruppe entfernen?", @@ -477,7 +477,7 @@ }, "header": { "avatarMenu": { - "myGroups": "Mein Gruppen", + "Groups": "Gruppen", "myProfile": "Mein Profil" } }, diff --git a/webapp/locales/en.json b/webapp/locales/en.json index be360bcdd..a0ed18c2e 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -427,6 +427,7 @@ "general": "General", "goal": "Goal of group", "groupCreated": "The group was created!", + "Groups": "Groups", "in": "in", "joinLeaveButton": { "iAmMember": "I'm a member", @@ -448,7 +449,6 @@ "membersCount": "Member ::: Members", "membersListTitle": "Group Members", "membersListTitleNotAllowedSeeingGroupMembers": "Group Members invisible", - "myGroups": "My Groups", "name": "Group name", "radius": "Radius", "removeMember": "Remove member", @@ -477,7 +477,7 @@ }, "header": { "avatarMenu": { - "myGroups": "My groups", + "Groups": "Groups", "myProfile": "My profile" } }, diff --git a/webapp/pages/group/create.vue b/webapp/pages/group/create.vue index b16cf933f..ebdbbe37c 100644 --- a/webapp/pages/group/create.vue +++ b/webapp/pages/group/create.vue @@ -58,7 +58,6 @@ export default { }, }) this.$toast.success(this.$t('group.groupCreated')) - // this.$router.history.push('/my-groups') this.$router.history.push({ name: 'group-id-slug', params: { id: responseId, slug: responseSlug }, diff --git a/webapp/pages/my-groups.vue b/webapp/pages/groups.vue similarity index 100% rename from webapp/pages/my-groups.vue rename to webapp/pages/groups.vue