From ea38ca2567af24767a87195f5940780a7068b724 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 14 Oct 2020 18:56:23 +0200 Subject: [PATCH 1/7] Remove outdated string in install assistant Signed-off-by: Thomas Citharel --- lib/mix/tasks/mobilizon/instance.ex | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/mix/tasks/mobilizon/instance.ex b/lib/mix/tasks/mobilizon/instance.ex index fb11eca03..a833edcdf 100644 --- a/lib/mix/tasks/mobilizon/instance.ex +++ b/lib/mix/tasks/mobilizon/instance.ex @@ -160,9 +160,7 @@ defmodule Mix.Tasks.Mobilizon.Instance do database_password: dbpass ) - Mix.shell().info( - "Writing config to #{config_path}. You should rename it to .env.production, .env.dev or .env.test" - ) + Mix.shell().info("Writing config to #{config_path}.") File.write(config_path, result_config) Mix.shell().info("Writing #{psql_path}.") From f0085a118172c29b3c6524386d979b8eecd23de6 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 14 Oct 2020 18:57:05 +0200 Subject: [PATCH 2/7] Fix title level on homepage Signed-off-by: Thomas Citharel --- js/src/views/Home.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue index f8689a8e3..e27316308 100644 --- a/js/src/views/Home.vue +++ b/js/src/views/Home.vue @@ -34,7 +34,7 @@
-

{{ $t("Featured events") }}

+

{{ $t("Featured events") }}

-

{{ $t("Featured events") }}

+

{{ $t("Featured events") }}

Date: Wed, 14 Oct 2020 18:57:44 +0200 Subject: [PATCH 3/7] Remove outdated comments in vue.config.js Signed-off-by: Thomas Citharel --- js/vue.config.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/js/vue.config.js b/js/vue.config.js index e10400d19..6a67e8a74 100644 --- a/js/vue.config.js +++ b/js/vue.config.js @@ -37,12 +37,4 @@ module.exports = { }, }, }, - // configureWebpack: { - // optimization: { - // splitChunks: { - // minSize: 10000, - // maxSize: 250000, - // }, - // }, - // }, }; From 2aad8d3960155375bda1450f38554645a237ca60 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 14 Oct 2020 18:59:36 +0200 Subject: [PATCH 4/7] Move all routes to async components Signed-off-by: Thomas Citharel --- js/src/router/actor.ts | 9 ++--- js/src/router/discussion.ts | 12 +++--- js/src/router/error.ts | 3 +- js/src/router/event.ts | 9 ++--- js/src/router/index.ts | 9 ++--- js/src/router/settings.ts | 78 ++++++++++++++++++------------------- js/src/router/user.ts | 21 ++++++---- 7 files changed, 69 insertions(+), 72 deletions(-) diff --git a/js/src/router/actor.ts b/js/src/router/actor.ts index 012dc67ae..28c6e8669 100644 --- a/js/src/router/actor.ts +++ b/js/src/router/actor.ts @@ -1,7 +1,4 @@ import { RouteConfig } from "vue-router"; -import CreateGroup from "@/views/Group/Create.vue"; -import Group from "@/views/Group/Group.vue"; -import MyGroups from "@/views/Group/MyGroups.vue"; export enum ActorRouteName { GROUP = "Group", @@ -14,20 +11,20 @@ export const actorRoutes: RouteConfig[] = [ { path: "/groups/create", name: ActorRouteName.CREATE_GROUP, - component: CreateGroup, + component: () => import(/* webpackChunkName: "CreateGroup" */ "@/views/Group/Create.vue"), meta: { requiredAuth: true }, }, { path: "/@:preferredUsername", name: ActorRouteName.GROUP, - component: Group, + component: () => import(/* webpackChunkName: "Group" */ "@/views/Group/Group.vue"), props: true, meta: { requiredAuth: false }, }, { path: "/groups/me", name: ActorRouteName.MY_GROUPS, - component: MyGroups, + component: () => import(/* webpackChunkName: "MyGroups" */ "@/views/Group/MyGroups.vue"), meta: { requiredAuth: true }, }, ]; diff --git a/js/src/router/discussion.ts b/js/src/router/discussion.ts index 1767c2845..0fb62b373 100644 --- a/js/src/router/discussion.ts +++ b/js/src/router/discussion.ts @@ -1,7 +1,4 @@ import { RouteConfig } from "vue-router"; -import CreateDiscussion from "@/views/Discussions/Create.vue"; -import DiscussionsList from "@/views/Discussions/DiscussionsList.vue"; -import discussion from "@/views/Discussions/Discussion.vue"; export enum DiscussionRouteName { DISCUSSION_LIST = "DISCUSSION_LIST", @@ -13,21 +10,24 @@ export const discussionRoutes: RouteConfig[] = [ { path: "/@:preferredUsername/discussions", name: DiscussionRouteName.DISCUSSION_LIST, - component: DiscussionsList, + component: () => + import(/* webpackChunkName: "DiscussionsList" */ "@/views/Discussions/DiscussionsList.vue"), props: true, meta: { requiredAuth: false }, }, { path: "/@:preferredUsername/discussions/new", name: DiscussionRouteName.CREATE_DISCUSSION, - component: CreateDiscussion, + component: () => + import(/* webpackChunkName: "CreateDiscussion" */ "@/views/Discussions/Create.vue"), props: true, meta: { requiredAuth: true }, }, { path: "/@:preferredUsername/c/:slug/:comment_id?", name: DiscussionRouteName.DISCUSSION, - component: discussion, + component: () => + import(/* webpackChunkName: "Discussion" */ "@/views/Discussions/Discussion.vue"), props: true, meta: { requiredAuth: false }, }, diff --git a/js/src/router/error.ts b/js/src/router/error.ts index 830226619..fc2f5af17 100644 --- a/js/src/router/error.ts +++ b/js/src/router/error.ts @@ -1,6 +1,5 @@ import { beforeRegisterGuard } from "@/router/guards/register-guard"; import { RouteConfig } from "vue-router"; -import ErrorPage from "../views/Error.vue"; export enum ErrorRouteName { ERROR = "Error", @@ -10,7 +9,7 @@ export const errorRoutes: RouteConfig[] = [ { path: "/error", name: ErrorRouteName.ERROR, - component: ErrorPage, + component: () => import(/* webpackChunkName: "Error" */ "../views/Error.vue"), beforeEnter: beforeRegisterGuard, }, ]; diff --git a/js/src/router/event.ts b/js/src/router/event.ts index c7ec47cb0..6dbc6addb 100644 --- a/js/src/router/event.ts +++ b/js/src/router/event.ts @@ -1,7 +1,4 @@ import { RouteConfig, Route } from "vue-router"; -import EventList from "../views/Event/EventList.vue"; -import Location from "../views/Location.vue"; -import Search from "../views/Search.vue"; const participations = () => import(/* webpackChunkName: "participations" */ "@/views/Event/Participants.vue"); @@ -29,7 +26,7 @@ export const eventRoutes: RouteConfig[] = [ { path: "/events/list/:location?", name: EventRouteName.EVENT_LIST, - component: EventList, + component: () => import(/* webpackChunkName: "EventList" */ "@/views/Event/EventList.vue"), meta: { requiredAuth: false }, }, { @@ -68,7 +65,7 @@ export const eventRoutes: RouteConfig[] = [ { path: "/location/new", name: EventRouteName.LOCATION, - component: Location, + component: () => import(/* webpackChunkName: "Location" */ "@/views/Location.vue"), meta: { requiredAuth: true }, }, { @@ -105,7 +102,7 @@ export const eventRoutes: RouteConfig[] = [ { path: "/tag/:tag", name: EventRouteName.TAG, - component: Search, + component: () => import(/* webpackChunkName: "Search" */ "@/views/Search.vue"), props: true, meta: { requiredAuth: false }, }, diff --git a/js/src/router/index.ts b/js/src/router/index.ts index 2ce385548..6412f937d 100644 --- a/js/src/router/index.ts +++ b/js/src/router/index.ts @@ -2,13 +2,11 @@ import Vue from "vue"; import Router, { Route } from "vue-router"; import VueScrollTo from "vue-scrollto"; import { PositionResult } from "vue-router/types/router.d"; -import PageNotFound from "../views/PageNotFound.vue"; import Home from "../views/Home.vue"; import { eventRoutes } from "./event"; import { actorRoutes } from "./actor"; import { errorRoutes } from "./error"; import { authGuardIfNeeded } from "./guards/auth-guard"; -import Search from "../views/Search.vue"; import { settingsRoutes } from "./settings"; import { groupsRoutes } from "./groups"; import { discussionRoutes } from "./discussion"; @@ -51,7 +49,7 @@ const router = new Router({ { path: "/search", name: RouteName.SEARCH, - component: Search, + component: () => import(/* webpackChunkName: "search" */ "../views/Search.vue"), props: true, meta: { requiredAuth: false }, }, @@ -115,12 +113,13 @@ const router = new Router({ { path: "/auth/:provider/callback", name: "auth-callback", - component: () => import("@/views/User/ProviderValidation.vue"), + component: () => + import(/* webpackChunkName: "ProviderValidation" */ "@/views/User/ProviderValidation.vue"), }, { path: "/404", name: RouteName.PAGE_NOT_FOUND, - component: PageNotFound, + component: () => import(/* webpackChunkName: "search" */ "../views/PageNotFound.vue"), meta: { requiredAuth: false }, }, { diff --git a/js/src/router/settings.ts b/js/src/router/settings.ts index b1cf752de..a2a700713 100644 --- a/js/src/router/settings.ts +++ b/js/src/router/settings.ts @@ -1,23 +1,4 @@ import { RouteConfig } from "vue-router"; -import Settings from "@/views/Settings.vue"; -import AccountSettings from "@/views/Settings/AccountSettings.vue"; -import Preferences from "@/views/Settings/Preferences.vue"; -import Notifications from "@/views/Settings/Notifications.vue"; -import Dashboard from "@/views/Admin/Dashboard.vue"; -import AdminSettings from "@/views/Admin/Settings.vue"; -import Follows from "@/views/Admin/Follows.vue"; -import Followings from "@/components/Admin/Followings.vue"; -import Followers from "@/components/Admin/Followers.vue"; -import ReportList from "@/views/Moderation/ReportList.vue"; -import Report from "@/views/Moderation/Report.vue"; -import Logs from "@/views/Moderation/Logs.vue"; -import EditIdentity from "@/views/Account/children/EditIdentity.vue"; -import Users from "../views/Admin/Users.vue"; -import Profiles from "../views/Admin/Profiles.vue"; -import AdminProfile from "../views/Admin/AdminProfile.vue"; -import AdminUserProfile from "../views/Admin/AdminUserProfile.vue"; -import GroupProfiles from "../views/Admin/GroupProfiles.vue"; -import AdminGroupProfile from "../views/Admin/AdminGroupProfile.vue"; export enum SettingsRouteName { SETTINGS = "SETTINGS", @@ -49,7 +30,7 @@ export enum SettingsRouteName { export const settingsRoutes: RouteConfig[] = [ { path: "/settings", - component: Settings, + component: () => import(/* webpackChunkName: "Settings" */ "@/views/Settings.vue"), props: true, meta: { requiredAuth: true }, redirect: { name: SettingsRouteName.ACCOUNT_SETTINGS }, @@ -63,21 +44,24 @@ export const settingsRoutes: RouteConfig[] = [ { path: "account/general", name: SettingsRouteName.ACCOUNT_SETTINGS_GENERAL, - component: AccountSettings, + component: () => + import(/* webpackChunkName: "AccountSettings" */ "@/views/Settings/AccountSettings.vue"), props: true, meta: { requiredAuth: true }, }, { path: "preferences", name: SettingsRouteName.PREFERENCES, - component: Preferences, + component: () => + import(/* webpackChunkName: "Preferences" */ "@/views/Settings/Preferences.vue"), props: true, meta: { requiredAuth: true }, }, { path: "notifications", name: SettingsRouteName.NOTIFICATIONS, - component: Notifications, + component: () => + import(/* webpackChunkName: "Notifications" */ "@/views/Settings/Notifications.vue"), props: true, meta: { requiredAuth: true }, }, @@ -89,55 +73,61 @@ export const settingsRoutes: RouteConfig[] = [ { path: "admin/dashboard", name: SettingsRouteName.ADMIN_DASHBOARD, - component: Dashboard, + component: () => import(/* webpackChunkName: "Dashboard" */ "@/views/Admin/Dashboard.vue"), meta: { requiredAuth: true }, }, { path: "admin/settings", name: SettingsRouteName.ADMIN_SETTINGS, - component: AdminSettings, + component: () => + import(/* webpackChunkName: "AdminSettings" */ "@/views/Admin/Settings.vue"), props: true, meta: { requiredAuth: true }, }, { path: "admin/users", name: SettingsRouteName.USERS, - component: Users, + component: () => import(/* webpackChunkName: "Users" */ "@/views/Admin/Users.vue"), props: true, meta: { requiredAuth: true }, }, { path: "admin/users/:id", name: SettingsRouteName.ADMIN_USER_PROFILE, - component: AdminUserProfile, + component: () => + import(/* webpackChunkName: "AdminUserProfile" */ "@/views/Admin/AdminUserProfile.vue"), props: true, meta: { requiredAuth: true }, }, { path: "admin/profiles", name: SettingsRouteName.PROFILES, - component: Profiles, + component: () => + import(/* webpackChunkName: "AdminProfiles" */ "@/views/Admin/Profiles.vue"), props: true, meta: { requiredAuth: true }, }, { path: "admin/profiles/:id", name: SettingsRouteName.ADMIN_PROFILE, - component: AdminProfile, + component: () => + import(/* webpackChunkName: "AdminProfile" */ "@/views/Admin/AdminProfile.vue"), props: true, meta: { requiredAuth: true }, }, { path: "admin/groups", name: SettingsRouteName.ADMIN_GROUPS, - component: GroupProfiles, + component: () => + import(/* webpackChunkName: "GroupProfiles" */ "@/views/Admin/GroupProfiles.vue"), props: true, meta: { requiredAuth: true }, }, { path: "admin/groups/:id", name: SettingsRouteName.ADMIN_GROUP_PROFILE, - component: AdminGroupProfile, + component: () => + import(/* webpackChunkName: "AdminGroupProfile" */ "@/views/Admin/AdminGroupProfile.vue"), props: true, meta: { requiredAuth: true }, }, @@ -145,17 +135,19 @@ export const settingsRoutes: RouteConfig[] = [ path: "admin/relays", name: SettingsRouteName.RELAYS, redirect: { name: SettingsRouteName.RELAY_FOLLOWINGS }, - component: Follows, + component: () => import(/* webpackChunkName: "Follows" */ "@/views/Admin/Follows.vue"), children: [ { path: "followings", name: SettingsRouteName.RELAY_FOLLOWINGS, - component: Followings, + component: () => + import(/* webpackChunkName: "Followings" */ "@/components/Admin/Followings.vue"), }, { path: "followers", name: SettingsRouteName.RELAY_FOLLOWERS, - component: Followers, + component: () => + import(/* webpackChunkName: "Followers" */ "@/components/Admin/Followers.vue"), }, ], props: true, @@ -169,21 +161,23 @@ export const settingsRoutes: RouteConfig[] = [ { path: "/moderation/reports/:filter?", name: SettingsRouteName.REPORTS, - component: ReportList, + component: () => + import(/* webpackChunkName: "ReportList" */ "@/views/Moderation/ReportList.vue"), props: true, meta: { requiredAuth: true }, }, { path: "/moderation/report/:reportId", name: SettingsRouteName.REPORT, - component: Report, + component: () => import(/* webpackChunkName: "Report" */ "@/views/Moderation/Report.vue"), props: true, meta: { requiredAuth: true }, }, { path: "/moderation/logs", name: SettingsRouteName.REPORT_LOGS, - component: Logs, + component: () => + import(/* webpackChunkName: "ModerationLogs" */ "@/views/Moderation/Logs.vue"), props: true, meta: { requiredAuth: true }, }, @@ -195,13 +189,19 @@ export const settingsRoutes: RouteConfig[] = [ { path: "/identity/create", name: SettingsRouteName.CREATE_IDENTITY, - component: EditIdentity, + component: () => + import( + /* webpackChunkName: "EditIdentity" */ "@/views/Account/children/EditIdentity.vue" + ), props: (route) => ({ identityName: route.params.identityName, isUpdate: false }), }, { path: "/identity/update/:identityName?", name: SettingsRouteName.UPDATE_IDENTITY, - component: EditIdentity, + component: () => + import( + /* webpackChunkName: "EditIdentity" */ "@/views/Account/children/EditIdentity.vue" + ), props: (route) => ({ identityName: route.params.identityName, isUpdate: true }), }, ], diff --git a/js/src/router/user.ts b/js/src/router/user.ts index e5f5e98e0..96989b5af 100644 --- a/js/src/router/user.ts +++ b/js/src/router/user.ts @@ -16,7 +16,7 @@ export const userRoutes: RouteConfig[] = [ { path: "/register/user", name: UserRouteName.REGISTER, - component: () => import("@/views/User/Register.vue"), + component: () => import(/* webpackChunkName: "RegisterUser" */ "@/views/User/Register.vue"), props: true, meta: { requiredAuth: false }, beforeEnter: beforeRegisterGuard, @@ -24,7 +24,8 @@ export const userRoutes: RouteConfig[] = [ { path: "/register/profile", name: UserRouteName.REGISTER_PROFILE, - component: () => import("@/views/Account/Register.vue"), + component: () => + import(/* webpackChunkName: "RegisterProfile" */ "@/views/Account/Register.vue"), // We can only pass string values through params, therefore props: (route) => ({ email: route.params.email, @@ -35,42 +36,46 @@ export const userRoutes: RouteConfig[] = [ { path: "/resend-instructions", name: UserRouteName.RESEND_CONFIRMATION, - component: () => import("@/views/User/ResendConfirmation.vue"), + component: () => + import(/* webpackChunkName: "ResendConfirmation" */ "@/views/User/ResendConfirmation.vue"), props: true, meta: { requiresAuth: false }, }, { path: "/password-reset/send", name: UserRouteName.SEND_PASSWORD_RESET, - component: () => import("@/views/User/SendPasswordReset.vue"), + component: () => + import(/* webpackChunkName: "SendPasswordReset" */ "@/views/User/SendPasswordReset.vue"), props: true, meta: { requiresAuth: false }, }, { path: "/password-reset/:token", name: UserRouteName.PASSWORD_RESET, - component: () => import("@/views/User/PasswordReset.vue"), + component: () => + import(/* webpackChunkName: "PasswordReset" */ "@/views/User/PasswordReset.vue"), meta: { requiresAuth: false }, props: true, }, { path: "/validate/email/:token", name: UserRouteName.EMAIL_VALIDATE, - component: () => import("@/views/User/EmailValidate.vue"), + component: () => + import(/* webpackChunkName: "EmailValidate" */ "@/views/User/EmailValidate.vue"), props: true, meta: { requiresAuth: false }, }, { path: "/validate/:token", name: UserRouteName.VALIDATE, - component: () => import("@/views/User/Validate.vue"), + component: () => import(/* webpackChunkName: "Validate" */ "@/views/User/Validate.vue"), props: true, meta: { requiresAuth: false }, }, { path: "/login", name: UserRouteName.LOGIN, - component: () => import("@/views/User/Login.vue"), + component: () => import(/* webpackChunkName: "Login" */ "@/views/User/Login.vue"), props: true, meta: { requiredAuth: false }, }, From 57a3989d4944d50235cb41f115d4f3ce1e80ed29 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 14 Oct 2020 19:04:14 +0200 Subject: [PATCH 5/7] Use modern mode Signed-off-by: Thomas Citharel --- js/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/package.json b/js/package.json index cabd2a04d..b687e60a0 100644 --- a/js/package.json +++ b/js/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "serve": "vue-cli-service serve", - "build": "vue-cli-service build", + "build": "vue-cli-service build --modern", "test:unit": "vue-cli-service test:unit", "test:e2e": "vue-cli-service test:e2e", "lint": "vue-cli-service lint" From d76489ae79fbbe3532189f181fb792b97a43061e Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 14 Oct 2020 19:10:57 +0200 Subject: [PATCH 6/7] Fix error message always showed Signed-off-by: Thomas Citharel --- js/src/views/Group/GroupSettings.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/views/Group/GroupSettings.vue b/js/src/views/Group/GroupSettings.vue index 223d29ed4..e57ad2a18 100644 --- a/js/src/views/Group/GroupSettings.vue +++ b/js/src/views/Group/GroupSettings.vue @@ -114,7 +114,7 @@
- + {{ $t("You are not an administrator for this group.") }}
From e3607b57be3697d313d2303fd491a0435cc9e6b4 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 15 Oct 2020 11:04:05 +0200 Subject: [PATCH 7/7] Improve dashboard Signed-off-by: Thomas Citharel --- js/src/graphql/admin.ts | 15 +++++ js/src/i18n/en_US.json | 7 +- js/src/i18n/fr_FR.json | 7 +- js/src/types/admin.model.ts | 6 ++ js/src/views/Admin/Dashboard.vue | 84 +++++++++++++++++++----- lib/graphql/resolvers/admin.ex | 14 +++- lib/graphql/schema/admin.ex | 10 ++- lib/mobilizon/discussions/discussions.ex | 29 +++++--- lib/mobilizon/events/events.ex | 17 +++++ lib/service/statistics/statistics.ex | 8 ++- 10 files changed, 163 insertions(+), 34 deletions(-) diff --git a/js/src/graphql/admin.ts b/js/src/graphql/admin.ts index b135a0016..292ef2414 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 33f56d792..44a48d423 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 f2591f631..5ae9009cc 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 cf50a4f32..16534d355 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 18b55838b..c71866422 100644 --- a/js/src/views/Admin/Dashboard.vue +++ b/js/src/views/Admin/Dashboard.vue @@ -18,11 +18,23 @@

{{ dashboard.numberOfEvents }}

-

{{ $t("Published events") }}

+

-

{{ dashboard.numberOfComments }}

-

{{ $t("Comments") }}

+ +

{{ dashboard.numberOfGroups }}

+

{{ $t("Groups") }}

+
@@ -32,29 +44,66 @@

{{ $t("Users") }}

+
+ +

{{ dashboard.numberOfFollowers }}

+

{{ $t("Instances following you") }}

+ +
+
+

{{ dashboard.numberOfReports }}

{{ $t("Opened reports") }}
+
+ +

{{ dashboard.numberOfFollowings }}

+

{{ $t("Instances you follow") }}

+ +
-
- +
+
-

{{ $t("Last published event") }}

-

{{ dashboard.lastPublicEventPublished.title }}

-
- -
+ +

{{ $t("Last published event") }}

+

{{ dashboard.lastPublicEventPublished.title }}

+
+ +
+
- +
+
+
+ +

{{ $t("Last group created") }}

+

+ {{ + dashboard.lastGroupCreated.name || + dashboard.lastGroupCreated.preferredUsername + }} +

+
+ +
+ +
+
@@ -65,6 +114,7 @@ import { Component, Vue } from "vue-property-decorator"; import { DASHBOARD } from "@/graphql/admin"; import { IDashboard } from "@/types/admin.model"; +import { usernameWithDomain } from "@/types/actor"; import RouteName from "../../router/name"; @Component({ @@ -85,6 +135,8 @@ export default class Dashboard extends Vue { dashboard!: IDashboard; RouteName = RouteName; + + usernameWithDomain = usernameWithDomain; } diff --git a/lib/graphql/resolvers/admin.ex b/lib/graphql/resolvers/admin.ex index 3cb9024a2..19927d43e 100644 --- a/lib/graphql/resolvers/admin.ex +++ b/lib/graphql/resolvers/admin.ex @@ -178,13 +178,25 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do _ -> nil end + last_group_created = + case Actors.list_actors(:Group) do + %Page{elements: [group | _]} -> group + _ -> nil + end + {:ok, %{ number_of_users: Statistics.get_cached_value(:local_users), number_of_events: Statistics.get_cached_value(:local_events), + number_of_groups: Statistics.get_cached_value(:local_groups), number_of_comments: Statistics.get_cached_value(:local_comments), + number_of_confirmed_participations_to_local_events: + Statistics.get_cached_value(:confirmed_participations_to_local_events), number_of_reports: Mobilizon.Reports.count_opened_reports(), - last_public_event_published: last_public_event_published + number_of_followers: Statistics.get_cached_value(:instance_followers), + number_of_followings: Statistics.get_cached_value(:instance_followings), + last_public_event_published: last_public_event_published, + last_group_created: last_group_created }} end diff --git a/lib/graphql/schema/admin.ex b/lib/graphql/schema/admin.ex index a5b58cd03..4126f7214 100644 --- a/lib/graphql/schema/admin.ex +++ b/lib/graphql/schema/admin.ex @@ -70,11 +70,19 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do end object :dashboard do - field(:last_public_event_published, :event, description: "Last public event publish") + field(:last_public_event_published, :event, description: "Last public event published") + field(:last_group_created, :group, description: "Last public group created") field(:number_of_users, :integer, description: "The number of local users") field(:number_of_events, :integer, description: "The number of local events") field(:number_of_comments, :integer, description: "The number of local comments") + field(:number_of_groups, :integer, description: "The number of local groups") field(:number_of_reports, :integer, description: "The number of current opened reports") + field(:number_of_followers, :integer, description: "The number of instance followers") + field(:number_of_followings, :integer, description: "The number of instance followings") + + field(:number_of_confirmed_participations_to_local_events, :integer, + description: "The number of total confirmed participations to local events" + ) end object :admin_settings do diff --git a/lib/mobilizon/discussions/discussions.ex b/lib/mobilizon/discussions/discussions.ex index 630788b46..132fb647b 100644 --- a/lib/mobilizon/discussions/discussions.ex +++ b/lib/mobilizon/discussions/discussions.ex @@ -283,16 +283,24 @@ defmodule Mobilizon.Discussions do end @doc """ - Counts local comments. + Counts local comments under events """ - @spec count_local_comments :: integer - def count_local_comments, do: Repo.one(count_local_comments_query()) + @spec count_local_comments_under_events :: integer + def count_local_comments_under_events do + count_local_comments_query() + |> filter_comments_under_events() + |> Repo.one() + end @doc """ Counts all comments. """ - @spec count_comments :: integer - def count_comments, do: Repo.one(count_comments_query()) + @spec count_comments_under_events :: integer + def count_comments_under_events do + count_comments_query() + |> filter_comments_under_events() + |> Repo.one() + end def get_discussion(discussion_id) do Discussion @@ -423,11 +431,8 @@ defmodule Mobilizon.Discussions do @spec count_local_comments_query :: Ecto.Query.t() defp count_local_comments_query do - from( - c in Comment, - select: count(c.id), - where: c.local == ^true and c.visibility in ^@public_visibility - ) + count_comments_query() + |> where([c], local: true) end @spec count_comments_query :: Ecto.Query.t() @@ -439,6 +444,10 @@ defmodule Mobilizon.Discussions do ) end + defp filter_comments_under_events(query) do + where(query, [c], is_nil(c.discussion_id) and not is_nil(c.event_id)) + end + @spec preload_for_comment(Ecto.Query.t()) :: Ecto.Query.t() defp preload_for_comment(query), do: preload(query, ^@comment_preloads) end diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex index bb94c67e6..92d40e9b5 100644 --- a/lib/mobilizon/events/events.ex +++ b/lib/mobilizon/events/events.ex @@ -798,6 +798,15 @@ defmodule Mobilizon.Events do @moderator_roles [:moderator, :administrator, :creator] + @doc """ + Returns the number of participations for all local events + """ + @spec count_confirmed_participants_for_local_events :: integer() + def count_confirmed_participants_for_local_events do + count_confirmed_participants_for_local_events_query() + |> Repo.one() + end + @doc """ Returns the list of participants for an event. Default behaviour is to not return :not_approved or :not_confirmed participants @@ -1548,6 +1557,14 @@ defmodule Mobilizon.Events do from(s in Session, where: s.track_id == ^track_id) end + @spec count_confirmed_participants_for_local_events_query :: Ecto.Query.t() + defp count_confirmed_participants_for_local_events_query do + Participant + |> join(:inner, [p], e in Event, on: p.event_id == e.id) + |> where([p, e], e.local and p.role not in [^:not_approved, ^:not_confirmed, ^:rejected]) + |> select([p], count(p.id)) + end + @spec list_participants_for_event_query(String.t()) :: Ecto.Query.t() defp list_participants_for_event_query(event_id) do from( diff --git a/lib/service/statistics/statistics.ex b/lib/service/statistics/statistics.ex index 42998b968..99494726d 100644 --- a/lib/service/statistics/statistics.ex +++ b/lib/service/statistics/statistics.ex @@ -26,8 +26,12 @@ defmodule Mobilizon.Service.Statistics do Events.count_local_events() end + defp create_cache(:confirmed_participations_to_local_events) do + Events.count_confirmed_participants_for_local_events() + end + defp create_cache(:local_comments) do - Discussions.count_local_comments() + Discussions.count_local_comments_under_events() end defp create_cache(:local_groups) do @@ -39,7 +43,7 @@ defmodule Mobilizon.Service.Statistics do end defp create_cache(:federation_comments) do - Discussions.count_comments() + Discussions.count_comments_under_events() end defp create_cache(:federation_groups) do