diff --git a/js/src/graphql/admin.ts b/js/src/graphql/admin.ts
index b135a001..292ef241 100644
--- a/js/src/graphql/admin.ts
+++ b/js/src/graphql/admin.ts
@@ -4,6 +4,7 @@ export const DASHBOARD = gql`
query {
dashboard {
lastPublicEventPublished {
+ id
uuid
title
picture {
@@ -12,10 +13,24 @@ export const DASHBOARD = gql`
url
}
}
+ lastGroupCreated {
+ id
+ preferredUsername
+ domain
+ name
+ avatar {
+ id
+ url
+ }
+ }
numberOfUsers
numberOfEvents
numberOfComments
numberOfReports
+ numberOfGroups
+ numberOfFollowers
+ numberOfFollowings
+ numberOfConfirmedParticipationsToLocalEvents
}
}
`;
diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json
index 33f56d79..44a48d42 100644
--- a/js/src/i18n/en_US.json
+++ b/js/src/i18n/en_US.json
@@ -281,7 +281,7 @@
"Public feeds": "Public feeds",
"Public iCal Feed": "Public iCal Feed",
"Publish": "Publish",
- "Published events": "Published events",
+ "Published events with {comments} comments and {participations} confirmed participations": "Published events with {comments} comments and {participations} confirmed participations",
"RSS/Atom Feed": "RSS/Atom Feed",
"Read Framasoft’s statement of intent on the Framablog": "Read Framasoft’s statement of intent on the Framablog",
"Redirecting to event…": "Redirecting to event…",
@@ -800,5 +800,8 @@
"To register for an event by choosing one of your identities": "To register for an event by choosing one of your identities",
"To create or join an group and start organizing with other people": "To create or join an group and start organizing with other people",
"About {instance}": "About {instance}",
- "Please read the {fullRules} published by {instance}'s administrators.": "Please read the {fullRules} published by {instance}'s administrators."
+ "Please read the {fullRules} published by {instance}'s administrators.": "Please read the {fullRules} published by {instance}'s administrators.",
+ "Instances following you": "Instances following you",
+ "Instances you follow": "Instances you follow",
+ "Last group created": "Last group created"
}
diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json
index f2591f63..5ae9009c 100644
--- a/js/src/i18n/fr_FR.json
+++ b/js/src/i18n/fr_FR.json
@@ -532,7 +532,7 @@
"Public page": "Page publique",
"Publication date": "Date de publication",
"Publish": "Publier",
- "Published events": "Événements publiés",
+ "Published events with {comments} comments and {participations} confirmed participations": "Événements publiés avec {comments} commentaires et {participations} participations confirmées",
"RSS/Atom Feed": "Flux RSS/Atom",
"Radius": "Rayon",
"Read Framasoft’s statement of intent on the Framablog": "Lire la note d’intention de Framasoft sur le Framablog",
@@ -850,5 +850,8 @@
"To register for an event by choosing one of your identities": "Pour s'inscrire à un évènement en choisissant une de vos identités",
"To create or join an group and start organizing with other people": "Pour créer ou rejoindre un groupe et commencer à vous organiser avec d'autres personnes",
"About {instance}": "À propos de {instance}",
- "Please read the {fullRules} published by {instance}'s administrators.": "Merci de lire les {fullRules} publiées par les administrateur·ices de {instance}."
+ "Please read the {fullRules} published by {instance}'s administrators.": "Merci de lire les {fullRules} publiées par les administrateur·ices de {instance}.",
+ "Instances following you": "Instances vous suivant",
+ "Instances you follow": "Instances que vous suivez",
+ "Last group created": "Dernier groupe créé"
}
diff --git a/js/src/types/admin.model.ts b/js/src/types/admin.model.ts
index cf50a4f3..16534d35 100644
--- a/js/src/types/admin.model.ts
+++ b/js/src/types/admin.model.ts
@@ -1,11 +1,17 @@
import { IEvent } from "@/types/event.model";
+import { IGroup } from "./actor";
export interface IDashboard {
lastPublicEventPublished: IEvent;
+ lastGroupCreated: IGroup;
numberOfUsers: number;
numberOfEvents: number;
numberOfComments: number;
numberOfReports: number;
+ numberOfGroups: number;
+ numberOfFollowers: number;
+ numberOfFollowings: number;
+ numberOfConfirmedParticipationsToLocalEvents: number;
}
export enum InstanceTermsType {
diff --git a/js/src/views/Admin/Dashboard.vue b/js/src/views/Admin/Dashboard.vue
index 18b55838..c7186642 100644
--- a/js/src/views/Admin/Dashboard.vue
+++ b/js/src/views/Admin/Dashboard.vue
@@ -18,11 +18,23 @@