From 85e68795a3a422f492e863252f14957fc6fc18af Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Wed, 19 Jul 2023 10:09:04 +0200
Subject: [PATCH] [fix] all group related pages are now under one route, so
 link highlighting works

---
 webapp/components/ContentMenu/GroupContentMenu.vue            | 4 ++--
 webapp/components/Group/GroupTeaser.vue                       | 2 +-
 webapp/components/Notification/Notification.vue               | 2 +-
 webapp/components/NotificationsTable/NotificationsTable.vue   | 2 +-
 webapp/components/UserTeaser/UserTeaser.vue                   | 2 +-
 webapp/components/generic/SearchableInput/SearchableInput.vue | 2 +-
 webapp/pages/{group => groups}/_id.spec.js                    | 0
 webapp/pages/{group => groups}/_id.vue                        | 2 +-
 webapp/pages/{group => groups}/_id/_slug.spec.js              | 0
 webapp/pages/{group => groups}/_id/_slug.vue                  | 0
 webapp/pages/{group => groups}/create.vue                     | 2 +-
 webapp/pages/{group => groups}/edit/_id.vue                   | 4 ++--
 webapp/pages/{group => groups}/edit/_id/index.vue             | 2 +-
 webapp/pages/{group => groups}/edit/_id/members.vue           | 0
 webapp/pages/{groups.spec.js => groups/index.spec.js}         | 2 +-
 webapp/pages/{groups.vue => groups/index.vue}                 | 2 +-
 16 files changed, 14 insertions(+), 14 deletions(-)
 rename webapp/pages/{group => groups}/_id.spec.js (100%)
 rename webapp/pages/{group => groups}/_id.vue (96%)
 rename webapp/pages/{group => groups}/_id/_slug.spec.js (100%)
 rename webapp/pages/{group => groups}/_id/_slug.vue (100%)
 rename webapp/pages/{group => groups}/create.vue (98%)
 rename webapp/pages/{group => groups}/edit/_id.vue (93%)
 rename webapp/pages/{group => groups}/edit/_id/index.vue (97%)
 rename webapp/pages/{group => groups}/edit/_id/members.vue (100%)
 rename webapp/pages/{groups.spec.js => groups/index.spec.js} (94%)
 rename webapp/pages/{groups.vue => groups/index.vue} (98%)

diff --git a/webapp/components/ContentMenu/GroupContentMenu.vue b/webapp/components/ContentMenu/GroupContentMenu.vue
index 7a7737320..1ca1b5b33 100644
--- a/webapp/components/ContentMenu/GroupContentMenu.vue
+++ b/webapp/components/ContentMenu/GroupContentMenu.vue
@@ -58,14 +58,14 @@ export default {
         routes.push({
           label: this.$t('group.contentMenu.visitGroupPage'),
           icon: 'home',
-          name: 'group-id-slug',
+          path: `/groups/${this.group.id}`,
           params: { id: this.group.id, slug: this.group.slug },
         })
       }
       if (this.group.myRole === 'owner') {
         routes.push({
           label: this.$t('admin.settings.name'),
-          path: `/group/edit/${this.group.id}`,
+          path: `/groups/edit/${this.group.id}`,
           icon: 'edit',
         })
       }
diff --git a/webapp/components/Group/GroupTeaser.vue b/webapp/components/Group/GroupTeaser.vue
index 791845c75..b75036057 100644
--- a/webapp/components/Group/GroupTeaser.vue
+++ b/webapp/components/Group/GroupTeaser.vue
@@ -1,7 +1,7 @@
 <template>
   <nuxt-link
     class="group-teaser"
-    :to="{ name: 'group-id-slug', params: { id: group.id, slug: group.slug } }"
+    :to="{ name: 'groups-id-slug', params: { id: group.id, slug: group.slug } }"
   >
     <base-card
       :class="{
diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index 9b70da794..a657b10ba 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -9,7 +9,7 @@
     <p class="description">{{ $t(`notifications.reason.${notification.reason}`) }}</p>
     <nuxt-link
       class="link"
-      :to="{ name: isGroup ? 'group-id-slug' : 'post-id-slug', params, ...hashParam }"
+      :to="{ name: isGroup ? 'groups-id-slug' : 'post-id-slug', params, ...hashParam }"
       @click.native="$emit('read')"
     >
       <base-card wideContent>
diff --git a/webapp/components/NotificationsTable/NotificationsTable.vue b/webapp/components/NotificationsTable/NotificationsTable.vue
index 41d593a23..9ff106e62 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.vue
+++ b/webapp/components/NotificationsTable/NotificationsTable.vue
@@ -65,7 +65,7 @@
                     class="notification-mention-post"
                     :class="{ 'notification-status': notification.read }"
                     :to="{
-                      name: isGroup(notification.from) ? 'group-id-slug' : 'post-id-slug',
+                      name: isGroup(notification.from) ? 'groups-id-slug' : 'post-id-slug',
                       params: params(notification.from),
                       hash: hashParam(notification.from),
                     }"
diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue
index 9fa3252ff..a82b91039 100644
--- a/webapp/components/UserTeaser/UserTeaser.vue
+++ b/webapp/components/UserTeaser/UserTeaser.vue
@@ -96,7 +96,7 @@ export default {
     groupLink() {
       const { id, slug } = this.group
       if (!(id && slug)) return ''
-      return { name: 'group-id-slug', params: { slug, id } }
+      return { name: 'groups-id-slug', params: { slug, id } }
     },
     groupSlug() {
       const { slug } = this.group || {}
diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index b0e813b45..d08655893 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -148,7 +148,7 @@ export default {
         case 'User':
           return 'profile-id-slug'
         case 'Group':
-          return 'group-id-slug'
+          return 'groups-id-slug'
         default:
           return null
       }
diff --git a/webapp/pages/group/_id.spec.js b/webapp/pages/groups/_id.spec.js
similarity index 100%
rename from webapp/pages/group/_id.spec.js
rename to webapp/pages/groups/_id.spec.js
diff --git a/webapp/pages/group/_id.vue b/webapp/pages/groups/_id.vue
similarity index 96%
rename from webapp/pages/group/_id.vue
rename to webapp/pages/groups/_id.vue
index d743633d1..ab8f3c41e 100644
--- a/webapp/pages/group/_id.vue
+++ b/webapp/pages/groups/_id.vue
@@ -24,7 +24,7 @@ const options = {
     }
   `,
   message: 'error-pages.group-not-found',
-  path: 'group',
+  path: 'groups',
 }
 const persistentLinks = PersistentLinks(options)
 
diff --git a/webapp/pages/group/_id/_slug.spec.js b/webapp/pages/groups/_id/_slug.spec.js
similarity index 100%
rename from webapp/pages/group/_id/_slug.spec.js
rename to webapp/pages/groups/_id/_slug.spec.js
diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/groups/_id/_slug.vue
similarity index 100%
rename from webapp/pages/group/_id/_slug.vue
rename to webapp/pages/groups/_id/_slug.vue
diff --git a/webapp/pages/group/create.vue b/webapp/pages/groups/create.vue
similarity index 98%
rename from webapp/pages/group/create.vue
rename to webapp/pages/groups/create.vue
index ebdbbe37c..8dd661d8d 100644
--- a/webapp/pages/group/create.vue
+++ b/webapp/pages/groups/create.vue
@@ -59,7 +59,7 @@ export default {
         })
         this.$toast.success(this.$t('group.groupCreated'))
         this.$router.history.push({
-          name: 'group-id-slug',
+          name: 'groups-id-slug',
           params: { id: responseId, slug: responseSlug },
         })
       } catch (error) {
diff --git a/webapp/pages/group/edit/_id.vue b/webapp/pages/groups/edit/_id.vue
similarity index 93%
rename from webapp/pages/group/edit/_id.vue
rename to webapp/pages/groups/edit/_id.vue
index 7a0f9d051..57c7d9f6a 100644
--- a/webapp/pages/group/edit/_id.vue
+++ b/webapp/pages/groups/edit/_id.vue
@@ -33,11 +33,11 @@ export default {
       return [
         {
           name: this.$t('group.general'),
-          path: `/group/edit/${this.group.id}`,
+          path: `/groups/edit/${this.group.id}`,
         },
         {
           name: this.$t('group.members'),
-          path: `/group/edit/${this.group.id}/members`,
+          path: `/groups/edit/${this.group.id}/members`,
         },
       ]
     },
diff --git a/webapp/pages/group/edit/_id/index.vue b/webapp/pages/groups/edit/_id/index.vue
similarity index 97%
rename from webapp/pages/group/edit/_id/index.vue
rename to webapp/pages/groups/edit/_id/index.vue
index e3c934dc5..70807b338 100644
--- a/webapp/pages/group/edit/_id/index.vue
+++ b/webapp/pages/groups/edit/_id/index.vue
@@ -60,7 +60,7 @@ export default {
         })
         this.$toast.success(this.$t('group.updatedGroup'))
         this.$router.history.push({
-          name: 'group-id-slug',
+          name: 'groups-id-slug',
           params: { id: responseId, slug: responseSlug },
         })
       } catch (error) {
diff --git a/webapp/pages/group/edit/_id/members.vue b/webapp/pages/groups/edit/_id/members.vue
similarity index 100%
rename from webapp/pages/group/edit/_id/members.vue
rename to webapp/pages/groups/edit/_id/members.vue
diff --git a/webapp/pages/groups.spec.js b/webapp/pages/groups/index.spec.js
similarity index 94%
rename from webapp/pages/groups.spec.js
rename to webapp/pages/groups/index.spec.js
index 3761f7ec2..ecb28c2c9 100644
--- a/webapp/pages/groups.spec.js
+++ b/webapp/pages/groups/index.spec.js
@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils'
-import groups from './groups.vue'
+import groups from './index.vue'
 
 const localVue = global.localVue
 
diff --git a/webapp/pages/groups.vue b/webapp/pages/groups/index.vue
similarity index 98%
rename from webapp/pages/groups.vue
rename to webapp/pages/groups/index.vue
index 52366d0af..13002859b 100644
--- a/webapp/pages/groups.vue
+++ b/webapp/pages/groups/index.vue
@@ -7,7 +7,7 @@
     <ds-space>
       <!-- create group -->
       <ds-space centered>
-        <nuxt-link :to="{ name: 'group-create' }">
+        <nuxt-link :to="{ name: 'groups-create' }">
           <base-button
             class="group-add-button"
             icon="plus"