Merge pull request #6953 from Ocelot-Social-Community/6678-add-chat-i…

…tem-to-avatar-navigation-menu feat(webapp): add chat item to avatar navigation menu and change title of notification by removing `All …`
Ocelot-Social-Community · Jan 26, 2024 · ca26f21 · ca26f21
2 parents 701bc21 + fcfc7e9
commit ca26f21
Show file tree

Hide file tree

Showing 15 changed files with 176 additions and 42 deletions.
diff --git a/webapp/components/AvatarMenu/AvatarMenu.spec.js b/webapp/components/AvatarMenu/AvatarMenu.spec.js
@@ -113,9 +113,9 @@ describe('AvatarMenu.vue', () => {
           expect(settingsLink.exists()).toBe(true)
         })
 
-        it('displays a total of 4 links', () => {
+        it('displays a total of 6 links', () => {
           const allLinks = wrapper.findAll('.ds-menu-item')
-          expect(allLinks).toHaveLength(4)
+          expect(allLinks).toHaveLength(6)
         })
       })
 
@@ -139,9 +139,9 @@ describe('AvatarMenu.vue', () => {
           expect(moderationLink.exists()).toBe(true)
         })
 
-        it('displays a total of 5 links', () => {
+        it('displays a total of 7 links', () => {
           const allLinks = wrapper.findAll('.ds-menu-item')
-          expect(allLinks).toHaveLength(5)
+          expect(allLinks).toHaveLength(7)
         })
       })
 
@@ -165,9 +165,9 @@ describe('AvatarMenu.vue', () => {
           expect(adminLink.exists()).toBe(true)
         })
 
-        it('displays a total of 6 links', () => {
+        it('displays a total of 8 links', () => {
           const allLinks = wrapper.findAll('.ds-menu-item')
-          expect(allLinks).toHaveLength(6)
+          expect(allLinks).toHaveLength(8)
         })
       })
     })

diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue
@@ -93,7 +93,17 @@ export default {
           icon: 'users',
         },
         {
-          name: this.$t('notifications.pageLink'),
+          name: this.$t('header.avatarMenu.map'),
+          path: `/map`,
+          icon: 'globe',
+        },
+        {
+          name: this.$t('header.avatarMenu.chats'),
+          path: `/chat`,
+          icon: 'chat-bubble',
+        },
+        {
+          name: this.$t('header.avatarMenu.notifications'),
           path: '/notifications',
           icon: 'bell',
         },

diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -4,7 +4,7 @@
       ghost
       circle
       v-tooltip="{
-        content: $t('header.chat.tooltip'),
+        content: $t('header.chats.tooltip'),
         placement: 'bottom-start',
       }"
     >

diff --git a/webapp/components/Group/GroupButton.vue b/webapp/components/Group/GroupButton.vue
@@ -6,7 +6,7 @@
         circle
         ghost
         v-tooltip="{
-          content: $t('group.button.tooltip'),
+          content: $t('header.groups.tooltip'),
           placement: 'bottom-start',
         }"
       />

diff --git a/webapp/components/Map/MapButton.vue b/webapp/components/Map/MapButton.vue
@@ -6,7 +6,7 @@
         circle
         ghost
         v-tooltip="{
-          content: $t('map.button.tooltip'),
+          content: $t('header.map.tooltip'),
           placement: 'bottom-start',
         }"
       >

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -9,7 +9,7 @@
       ghost
       circle
       v-tooltip="{
-        content: $t('notifications.headerMenuButton.tooltip'),
+        content: $t('header.notifications.tooltip'),
         placement: 'bottom-start',
       }"
     />
@@ -20,7 +20,7 @@
         ghost
         circle
         v-tooltip="{
-          content: $t('notifications.headerMenuButton.tooltip'),
+          content: $t('header.notifications.tooltip'),
           placement: 'bottom-start',
         }"
         @click="toggleMenu"

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
@@ -481,9 +481,6 @@
     "addUserNoOptions": "Keine Nutzer gefunden!",
     "addUserPlaceholder": "Nutzername",
     "allGroups": "Alle Gruppen",
-    "button": {
-      "tooltip": "Gruppen anzeigen"
-    },
     "categories": "Thema ::: Themen",
     "categoriesTitle": "Themen der Gruppe",
     "changeMemberRole": "Die Rolle wurde auf „{role}“ geändert!",
@@ -575,11 +572,23 @@
       "button": {
         "tooltip": "Mein Profil"
       },
+      "chats": "Chats",
       "groups": "Gruppen",
-      "myProfile": "Mein Profil"
+      "map": "Landkarte",
+      "myProfile": "Mein Profil",
+      "notifications": "Benachrichtigungen"
+    },
+    "chats": {
+      "tooltip": "Chats"
+    },
+    "groups": {
+      "tooltip": "Gruppen"
+    },
+    "map": {
+      "tooltip": "Landkarte"
     },
-    "chat": {
-      "tooltip": "Meine Chats"
+    "notifications": {
+      "tooltip": "Banachrichtigungen"
     }
   },
   "index": {
@@ -620,9 +629,6 @@
   },
   "map": {
     "alertMessage": "Es kann nicht auf die Karte zugegriffen werden: Der Mapbox-Token ist auf dem Server nicht gesetzt!",
-    "button": {
-      "tooltip": "Landkarte anzeigen"
-    },
     "legend": {
       "event": "Veranstaltung",
       "group": "Gruppe",
@@ -726,9 +732,6 @@
       "unread": "Ungelesen"
     },
     "group": "Beschreibung",
-    "headerMenuButton": {
-      "tooltip": "Meine Banachrichtigungen"
-    },
     "markAllAsRead": "Markiere alle als gelesen",
     "pageLink": "Alle Benachrichtigungen",
     "post": "Beitrag oder Gruppe",

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
@@ -481,9 +481,6 @@
     "addUserNoOptions": "No users found!",
     "addUserPlaceholder": "User name",
     "allGroups": "All Groups",
-    "button": {
-      "tooltip": "Show groups"
-    },
     "categories": "Topic ::: Topics",
     "categoriesTitle": "Topics of the group",
     "changeMemberRole": "The role has been changed to “{role}”!",
@@ -575,11 +572,23 @@
       "button": {
         "tooltip": "My profile"
       },
+      "chats": "Chats",
       "groups": "Groups",
-      "myProfile": "My profile"
+      "map": "Map",
+      "myProfile": "My profile",
+      "notifications": "Notifications"
+    },
+    "chats": {
+      "tooltip": "Chats"
+    },
+    "groups": {
+      "tooltip": "Groups"
+    },
+    "map": {
+      "tooltip": "Map"
     },
-    "chat": {
-      "tooltip": "My chats"
+    "notifications": {
+      "tooltip": "Notifications"
     }
   },
   "index": {
@@ -620,9 +629,6 @@
   },
   "map": {
     "alertMessage": "The map cannot be accessed: The Mapbox token is not set on the server!",
-    "button": {
-      "tooltip": "Show map"
-    },
     "legend": {
       "event": "Event",
       "group": "Group",
@@ -726,9 +732,6 @@
       "unread": "Unread"
     },
     "group": "Description",
-    "headerMenuButton": {
-      "tooltip": "My notifications"
-    },
     "markAllAsRead": "Mark all as read",
     "pageLink": "All notifications",
     "post": "Post or Group",

diff --git a/webapp/locales/es.json b/webapp/locales/es.json
@@ -316,6 +316,26 @@
     "hashtag-search": "Buscando a #{hashtag}",
     "title": "Su burbuja de filtro"
   },
+  "header": {
+    "avatarMenu": {
+      "chats": "Chats",
+      "groups": "Grupos",
+      "map": "Mapa",
+      "notifications": "Notificaciones"
+    },
+    "chats": {
+      "tooltip": "Chats"
+    },
+    "groups": {
+      "tooltip": "Grupos"
+    },
+    "map": {
+      "tooltip": "Mapa"
+    },
+    "notifications": {
+      "tooltip": "Notificaciones"
+    }
+  },
   "index": {
     "change-filter-settings": "Cambie la configuración de sus filtros para obtener más resultados.",
     "no-results": "No se han encontrado contribuciones."

diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
@@ -306,6 +306,26 @@
     "hashtag-search": "Recherche de #{hashtag}",
     "title": "Votre bulle de filtre"
   },
+  "header": {
+    "avatarMenu": {
+      "chats": "Chats",
+      "groups": "Groupes",
+      "map": "Carte",
+      "notifications": "Notifications"
+    },
+    "chats": {
+      "tooltip": "Chats"
+    },
+    "groups": {
+      "tooltip": "Groupes"
+    },
+    "map": {
+      "tooltip": "Carte"
+    },
+    "notifications": {
+      "tooltip": "Notifications"
+    }
+  },
   "index": {
     "change-filter-settings": "Modifiez les paramètres de filtrage pour obtenir plus de résultats.",
     "no-results": "Pas de contribution trouvée."
@@ -407,9 +427,6 @@
       "unread": "Non lu"
     },
     "group": "Description",
-    "headerMenuButton": {
-      "tooltip": "Mes notifications"
-    },
     "markAllAsRead": "Tout marquer comme lu",
     "pageLink": "Toutes les notifications",
     "post": "Post",

diff --git a/webapp/locales/it.json b/webapp/locales/it.json
@@ -310,6 +310,22 @@
     "hashtag-search": null,
     "title": null
   },
+  "header": {
+    "avatarMenu": {
+      "chats": "Chat",
+      "groups": "Gruppi",
+      "notifications": "Notifiche"
+    },
+    "chats": {
+      "tooltip": "Chat"
+    },
+    "groups": {
+      "tooltip": "Gruppi"
+    },
+    "notifications": {
+      "tooltip": "Notifiche"
+    }
+  },
   "index": {
     "change-filter-settings": null,
     "no-results": null
@@ -356,7 +372,7 @@
       "unread": null
     },
     "markAllAsRead": "Segna tutti come letti",
-    "pageLink": null,
+    "pageLink": "Tutte le notifiche",
     "post": null,
     "reason": {
       "commented_on_post": null,

diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
@@ -93,6 +93,22 @@
     "membersCount": null,
     "membersListTitle": null
   },
+  "header": {
+    "avatarMenu": {
+      "chats": "Chats",
+      "groups": "Groepen",
+      "notifications": "Notificaties"
+    },
+    "chats": {
+      "tooltip": "Chats"
+    },
+    "groups": {
+      "tooltip": "Groepen"
+    },
+    "notifications": {
+      "tooltip": "Notificaties"
+    }
+  },
   "login": {
     "email": "Uw E-mail",
     "hello": "Hallo",
@@ -111,7 +127,7 @@
       "unread": null
     },
     "markAllAsRead": "Markeer alles als gelezen",
-    "pageLink": null,
+    "pageLink": "Alle notificaties",
     "post": null,
     "reason": {
       "commented_on_post": null,

diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
@@ -180,6 +180,22 @@
   "hashtags-filter": {
     "title": "Twoja bańka filtrująca"
   },
+  "header": {
+    "avatarMenu": {
+      "chats": "Czaty",
+      "groups": "Grupy",
+      "notifications": "Powiadomienia"
+    },
+    "chats": {
+      "tooltip": "Czaty"
+    },
+    "groups": {
+      "tooltip": "Grupy"
+    },
+    "notifications": {
+      "tooltip": "Powiadomienia"
+    }
+  },
   "login": {
     "email": "Twój adres e-mail",
     "forgotPassword": "Zapomniałeś hasła?",
@@ -203,7 +219,8 @@
     "markAllAsRead": "Oznacz wszystkie jako przeczytane",
     "menu": {
       "mentioned": "wspomiał o Tobie we wpisie"
-    }
+    },
+    "pageLink": "Wszystkie powiadomienia"
   },
   "post": {
     "comment": {

diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
@@ -348,6 +348,22 @@
     "hashtag-search": "Procurando por #{hashtag}",
     "title": "Sua bolha de filtro"
   },
+  "header": {
+    "avatarMenu": {
+      "chats": "Chats",
+      "groups": "Grupos",
+      "notifications": "Notificações"
+    },
+    "chats": {
+      "tooltip": "Chats"
+    },
+    "groups": {
+      "tooltip": "Grupos"
+    },
+    "notifications": {
+      "tooltip": "Notificações"
+    }
+  },
   "index": {
     "change-filter-settings": "Altere suas configurações de filtro para obter mais resultados.",
     "no-results": "Nenhuma contribuição encontrada."