Merge branch 'fixes' into 'main'

Fix ecto dev warning

See merge request framasoft/mobilizon!1330

js/src/views/Event/MyEventsView.vue

@@ -213,9 +213,9 @@
 <script lang="ts" setup>
 import { ParticipantRole } from "@/types/enums";
 import RouteName from "@/router/name";
-import { IParticipant } from "../../types/participant.model";
+import type { IParticipant } from "../../types/participant.model";
 import { LOGGED_USER_DRAFTS } from "../../graphql/actor";
-import { IEvent } from "../../types/event.model";
+import type { IEvent } from "../../types/event.model";
 import MultiEventMinimalistCard from "../../components/Event/MultiEventMinimalistCard.vue";
 import EventMinimalistCard from "../../components/Event/EventMinimalistCard.vue";
 import {
@@ -366,7 +366,7 @@ const monthlyFutureEvents = computed((): Map<string, Eventable[]> => {
     eventable = [...eventable, ...futureParticipations.value];
   }
   if (showMyGroups.value) {
-    eventable = [...eventable, ...groupEvents.value];
+    eventable = [...eventable, ...groupEvents.value.map(({ event }) => event)];
   }
   return monthlyEvents(eventable);
 });

js/src/views/HomeView.vue

@@ -35,12 +35,12 @@
     v-if="currentActor?.id && (welcomeBack || newRegisteredUser)"
   >
     <o-notification variant="info" v-if="welcomeBack">{{
-      $t("Welcome back {username}!", {
+      t("Welcome back {username}!", {
         username: displayName(currentActor),
       })
     }}</o-notification>
     <o-notification variant="info" v-if="newRegisteredUser">{{
-      $t("Welcome to Mobilizon, {username}!", {
+      t("Welcome to Mobilizon, {username}!", {
         username: displayName(currentActor),
       })
     }}</o-notification>
@@ -48,7 +48,7 @@
   <!-- Your upcoming events -->
   <section v-if="canShowMyUpcomingEvents" class="container mx-auto">
     <h2 class="dark:text-white font-bold">
-      {{ $t("Your upcoming events") }}
+      {{ t("Your upcoming events") }}
     </h2>
     <div
       v-for="row of goingToEvents"
@@ -57,7 +57,7 @@
     >
       <p class="date-component-container" v-if="isInLessThanSevenDays(row[0])">
         <span v-if="isToday(row[0])">{{
-          $t(
+          t(
             "You have one event today.",
             {
               count: row[1].size,
@@ -66,7 +66,7 @@
           )
         }}</span>
         <span v-else-if="isTomorrow(row[0])">{{
-          $t(
+          t(
             "You have one event tomorrow.",
             {
               count: row[1].size,
@@ -76,7 +76,7 @@
         }}</span>
         <span v-else-if="isInLessThanSevenDays(row[0])">
           {{
-            $t(
+            t(
               "You have one event in {days} days.",
               {
                 count: row[1].size,
@@ -101,16 +101,21 @@
       <router-link
         :to="{ name: RouteName.MY_EVENTS }"
         class="hover:text-slate-800 hover:dark:text-slate-400"
-        >{{ $t("View everything") }} >></router-link
+        >{{ t("View everything") }} >></router-link
       >
     </span>
   </section>
   <!-- Events from your followed groups -->
-  <section class="followActivity" v-if="canShowFollowedGroupEvents">
+  <section
-    <h2 class="title">
+    class="relative pt-10 px-2 container mx-auto px-2"
-      {{ $t("Upcoming events from your groups") }}
+    v-if="canShowFollowedGroupEvents"
+  >
+    <h2
+      class="text-xl font-bold tracking-tight text-gray-900 dark:text-gray-100 mt-0"
+    >
+      {{ t("Upcoming events from your groups") }}
     </h2>
-    <p>{{ $t("That you follow or of which you are a member") }}</p>
+    <p>{{ t("That you follow or of which you are a member") }}</p>
     <multi-card :events="filteredFollowedGroupsEvents" />
     <span
       class="block mt-2 text-right underline text-slate-700 dark:text-slate-300"
@@ -126,7 +131,7 @@
             showMyGroups: 'true',
           },
         }"
-        >{{ $t("View everything") }} >></router-link
+        >{{ t("View everything") }} >></router-link
       >
     </span>
   </section>
@@ -218,6 +223,9 @@ import { geoHashToCoords } from "@/utils/location";
 import { useServerProvidedLocation } from "@/composition/apollo/config";
 import { ABOUT } from "@/graphql/config";
 import { IConfig } from "@/types/config.model";
+import { useI18n } from "vue-i18n";
+
+const { t } = useI18n({ useScope: "global" });
 
 const EventParticipationCard = defineAsyncComponent(
   () => import("@/components/Event/EventParticipationCard.vue")

lib/mobilizon.ex

@@ -77,9 +77,7 @@ defmodule Mobilizon do
 
     ErrorReporting.configure()
 
-    if @env == :dev do
+    setup_ecto_dev_logger(@env)
-      Ecto.DevLogger.install(Storage.Repo)
-    end
 
     # Only attach the telemetry logger when we aren't in an IEx shell
     unless Code.ensure_loaded?(IEx) && IEx.started?() do
@@ -156,4 +154,10 @@ defmodule Mobilizon do
       restart: :temporary
     }
   end
+
+  defp setup_ecto_dev_logger(:dev) do
+    Ecto.DevLogger.install(Storage.Repo)
+  end
+
+  defp setup_ecto_dev_logger(_), do: nil
 end

mix.exs

@@ -223,7 +223,7 @@ defmodule Mobilizon.Mixfile do
       {:sobelow, "~> 0.8", only: [:dev, :test]},
       {:doctor, "~> 0.20.0", only: :dev},
       {:haversine, "~> 0.1.0"},
-      {:ecto_dev_logger, "~> 0.7", only: :dev}
+      {:ecto_dev_logger, "~> 0.7"}
     ] ++ oauth_deps()
   end