Merge branch 'bug-fixes' into 'main'

Various fixes Closes #1272, #1293, #1281 et #1278 See merge request framasoft/mobilizon!1392
2023-05-24 10:39:58 +00:00 · 2023-05-24 10:39:58 +00:00 · d7e425dce5
parent 9249661225 d47b69d6ca
commit d7e425dce5
12 changed files with 80 additions and 40 deletions
--- a/config/prod.exs
+++ b/config/prod.exs
@ -30,6 +30,7 @@ config :mobilizon, :cldr,
    "fr",
    "gd",
    "gl",
+    "hr",
    "hu",
    "id",
    "it",
--- a/js/src/components/Event/FullAddressAutoComplete.vue
+++ b/js/src/components/Event/FullAddressAutoComplete.vue
@ -356,9 +356,6 @@ const queryText = ref();

 const queryTextWithDefault = computed({
  get() {
-    console.log("queryTextWithDefault 1", queryText.value);
-    console.log("queryTextWithDefault 2", selectedAddressText.value);
-    console.log("queryTextWithDefault 3", props.defaultText);
    return (
      queryText.value ?? selectedAddressText.value ?? props.defaultText ?? ""
    );
--- a/js/src/components/NavBar.vue
+++ b/js/src/components/NavBar.vue
@ -123,8 +123,8 @@
            </o-dropdown-item>
            <o-dropdown-item
              aria-role="listitem"
-              @click="logout"
-              @keyup.enter="logout"
+              @click="performLogout"
+              @keyup.enter="performLogout"
            >
              <span
                class="block py-2 px-4 text-sm text-zinc-700 dark:text-zinc-200 dark:hover:text-white"
@ -205,7 +205,7 @@ import { logout } from "../utils/auth";
 import { displayName } from "../types/actor";
 import RouteName from "../router/name";
 import { computed, ref, watch } from "vue";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { useI18n } from "vue-i18n";
 import AccountCircle from "vue-material-design-icons/AccountCircle.vue";
 import { useCurrentUserClient } from "@/composition/apollo/user";
@ -217,11 +217,13 @@ import { useMutation } from "@vue/apollo-composable";
 import { UPDATE_DEFAULT_ACTOR } from "@/graphql/actor";
 import { changeIdentity } from "@/utils/identity";
 import { useRegistrationConfig } from "@/composition/apollo/config";
+import { useProgrammatic } from "@oruga-ui/oruga-next";

 const { currentUser } = useCurrentUserClient();
 const { currentActor } = useCurrentActorClient();

 const router = useRouter();
+const route = useRoute();

 const { identities } = useCurrentUserIdentities();
 const { registrationsOpen, registrationsAllowlist, databaseLogin } =
@ -269,4 +271,21 @@ onDone(({ data }) => {
 });

 const showMobileMenu = ref(false);
+
+const { oruga } = useProgrammatic();
+
+const performLogout = async () => {
+  console.debug("Logging out client...");
+  await logout();
+  oruga.notification.open({
+    message: t("You have been logged-out"),
+    variant: "success",
+    position: "bottom-right",
+    duration: 5000,
+  });
+
+  if (route.meta["requiredAuth"] === true) {
+    return router.push({ name: RouteName.HOME });
+  }
+};
 </script>
--- a/js/src/i18n/en_US.json
+++ b/js/src/i18n/en_US.json
@ -371,7 +371,6 @@
  "You can add tags by hitting the Enter key or by adding a comma": "You can add tags by hitting the Enter key or by adding a comma",
  "You can try another search term or drag and drop the marker on the map": "You can try another search term or drag and drop the marker on the map",
  "You don't follow any instances yet.": "You don't follow any instances yet.",
-  "You have been disconnected": "You have been disconnected",
  "You have cancelled your participation": "You have cancelled your participation",
  "You have one event in {days} days.": "You have no events in {days} days | You have one event in {days} days. | You have {count} events in {days} days",
  "You have one event today.": "You have no events today | You have one event today. | You have {count} events today",
@ -1563,5 +1562,7 @@
  "This application asks for the following permissions:": "This application asks for the following permissions:",
  "This application will be allowed to see all of your events organized, the events you participate to, as well as every data from your groups.": "This application will be allowed to see all of your events organized, the events you participate to, as well as every data from your groups.",
  "This application will be allowed to publish and manage events, post and manage comments, participate to events, manage all of your groups, including group events, resources, posts and discussions. It will also be allowed to manage your account and profile settings.": "This application will be allowed to publish and manage events, post and manage comments, participate to events, manage all of your groups, including group events, resources, posts and discussions. It will also be allowed to manage your account and profile settings.",
-  "No apps authorized yet": "No apps authorized yet"
+  "No apps authorized yet": "No apps authorized yet",
+  "You have been logged-out": "You have been logged-out",
+  "An “application programming interface” or “API” is a communication protocol that allows software components to communicate with each other. The Mobilizon API, for example, can allow third-party software tools to communicate with Mobilizon instances to carry out certain actions, such as posting events on your behalf, automatically and remotely.": "An “application programming interface” or “API” is a communication protocol that allows software components to communicate with each other. The Mobilizon API, for example, can allow third-party software tools to communicate with Mobilizon instances to carry out certain actions, such as posting events on your behalf, automatically and remotely."
 }
--- a/js/src/i18n/fr_FR.json
+++ b/js/src/i18n/fr_FR.json
@ -1240,7 +1240,6 @@
  "You don't have any upcoming events. Maybe try another filter?": "Vous n'avez pas d'événements à venir. Essayez peut-être un autre filtre ?",
  "You excluded member {member}.": "Vous avez exclu le ou la membre {member}.",
  "You have attended {count} events in the past.": "Vous n'avez participé à aucun événement par le passé.|Vous avez participé à un événement par le passé.|Vous avez participé à {count} événements par le passé.",
-  "You have been disconnected": "Vous avez été déconnecté⋅e",
  "You have been invited by {invitedBy} to the following group:": "Vous avez été invité par {invitedBy} à rejoindre le groupe suivant :",
  "You have been removed from this group's members.": "Vous avez été exclu⋅e des membres de ce groupe.",
  "You have cancelled your participation": "Vous avez annulé votre participation",
@ -1559,5 +1558,7 @@
  "This application asks for the following permissions:": "Cette application demande les autorisations suivantes :",
  "This application will be allowed to see all of your events organized, the events you participate to, as well as every data from your groups.": "Cette application vous permettra de voir tous les événements que vous avez organisés, les événements auxquels vous participez, ainsi que toutes les données de vos groupes.",
  "This application will be allowed to publish and manage events, post and manage comments, participate to events, manage all of your groups, including group events, resources, posts and discussions. It will also be allowed to manage your account and profile settings.": "Cette application sera autorisée à publier et à gérer des événements, à publier et à gérer des commentaires, à participer à des événements, à gérer tous vos groupes, y compris les événements de groupe, les ressources, les messages et les discussions. Elle pourra également gérer les paramètres de votre compte et de votre profil.",
-  "No apps authorized yet": "Aucune application autorisée pour le moment"
+  "No apps authorized yet": "Aucune application autorisée pour le moment",
+  "You have been logged-out": "Vous avez été déconnecté·e",
+  "An “application programming interface” or “API” is a communication protocol that allows software components to communicate with each other. The Mobilizon API, for example, can allow third-party software tools to communicate with Mobilizon instances to carry out certain actions, such as posting events on your behalf, automatically and remotely.": "Une « interface de programmation d’application » ou « API » est un protocole de communication qui permet aux composants logiciels de communiquer entre eux. L'API Mobilizon, par exemple, peut permettre à des outils logiciels tiers de communiquer avec les instances Mobilizon pour effectuer certaines actions, telles que la publication d'événements en votre nom, automatiquement et à distance."
 }
--- a/js/src/i18n/langs.json
+++ b/js/src/i18n/langs.json
@ -12,9 +12,11 @@
  "fr": "Français",
  "gd": "Gàidhlig",
  "gl": "Galego",
+  "hr": "Hrvatski",
  "hu": "Magyar",
  "id": "Bahasa Indonesia",
  "it": "Italiano",
+  "ja": "日本語",
  "nl": "Nederlands",
  "nn": "Nynorsk",
  "oc": "Occitan",
--- a/js/src/i18n/sv.json
+++ b/js/src/i18n/sv.json
@ -1183,7 +1183,7 @@
  "your notification settings": "",
  "{'@'}{username}": "",
  "{approved} / {total} seats": "{approved} / {total} platser",
-  "{available}/{capacity} available places": "Inga platser kvar|{tillgängliga}/{kapacitet} tillgängliga platser",
+  "{available}/{capacity} available places": "Inga platser kvar|{available}/{capacity} tillgängliga platser",
  "{count} km": "",
  "{count} members": "",
  "{count} members or followers": "",
--- a/js/src/views/About/GlossaryView.vue
+++ b/js/src/views/About/GlossaryView.vue
@ -10,7 +10,7 @@
        }}
      </p>
      <dl>
-        <dt>{{ t("Instance") }}</dt>
+        <dt class="mt-3">{{ t("Instance") }}</dt>
        <i18n-t
          tag="dd"
          keypath="An instance is an installed version of the Mobilizon software running on a server. An instance can be run by anyone using the {mobilizon_software} or other federated apps, aka the “fediverse”. This instance's name is {instance_name}. Mobilizon is a federated network of multiple instances (just like email servers), users registered on different instances may communicate even though they didn't register on the same instance."
@ -25,39 +25,39 @@
            <b>{{ config.name }}</b>
          </template>
        </i18n-t>
-        <dt>{{ t("Instance administrator") }}</dt>
-        <dd>
+        <dt class="mt-3">{{ t("Instance administrator") }}</dt>
+        <dd class="mb-2">
          {{
            t(
              "The instance administrator is the person or entity that runs this Mobilizon instance."
            )
          }}
        </dd>
-        <dt>{{ t("Application") }}</dt>
-        <dd>
+        <dt class="mt-3">{{ t("Application") }}</dt>
+        <dd class="mb-2">
          {{
            t(
              "In the following context, an application is a software, either provided by the Mobilizon team or by a 3rd-party, used to interact with your instance."
            )
          }}
        </dd>
-        <dt>{{ t("API") }}</dt>
-        <dd>
+        <dt class="mt-3">{{ t("API") }}</dt>
+        <dd class="mb-2">
          {{
            t(
              "An “application programming interface” or “API” is a communication protocol that allows software components to communicate with each other. The Mobilizon API, for example, can allow third-party software tools to communicate with Mobilizon instances to carry out certain actions, such as posting events on your behalf, automatically and remotely."
            )
          }}
        </dd>
-        <dt>{{ t("SSL/TLS") }}</dt>
+        <dt class="mt-3">{{ t("SSL/TLS") }}</dt>
        <i18n-t
          tag="dd"
          keypath="SSL and it's successor TLS are encryption technologies to secure data communications when using the service. You can recognize an encrypted connection in your browser's address line when the URL begins with {https} and the lock icon is displayed in your browser's address bar."
        >
          <template #https><code>https://</code></template>
        </i18n-t>
-        <dt>{{ t("Cookies and Local storage") }}</dt>
-        <dd>
+        <dt class="mt-3">{{ t("Cookies and Local storage") }}</dt>
+        <dd class="mb-2">
          {{
            t(
              "A cookie is a small file containing information that is sent to your computer when you visit a website. When you visit the site again, the cookie allows that site to recognize your browser. Cookies may store user preferences and other information. You can configure your browser to refuse all cookies. However, this may result in some website features or services partially working. Local storage works the same way but allows you to store more data."
--- a/js/src/views/HomeView.vue
+++ b/js/src/views/HomeView.vue
@ -236,9 +236,7 @@ const { result: aboutConfigResult } = useQuery<{
    IConfig,
    "name" | "description" | "slogan" | "registrationsOpen"
  >;
-}>(ABOUT, undefined, {
-  fetchPolicy: "cache-only",
-});
+}>(ABOUT);

 const config = computed(() => aboutConfigResult.value?.config);

--- a/js/src/views/SearchView.vue
+++ b/js/src/views/SearchView.vue
@ -868,20 +868,6 @@ const contentType = useRouteQuery(
  enumTransformer(ContentType)
 );

-watch(contentType, (newContentType: ContentType) => {
-  switch (newContentType) {
-    case ContentType.ALL:
-      page.value = 1;
-      break;
-    case ContentType.EVENTS:
-      eventPage.value = 1;
-      break;
-    case ContentType.GROUPS:
-      groupPage.value = 1;
-      break;
-  }
-});
-
 const isOnline = useRouteQuery("isOnline", false, booleanTransformer);
 const categoryOneOf = useRouteQuery("categoryOneOf", [], arrayTransformer);
 const statusOneOf = useRouteQuery(
@ -1261,6 +1247,40 @@ const boostLanguagesQuery = computed((): string[] => {
  return Array.from(languages);
 });

+// When search criteria changes, reset page number to 1
+watch(
+  [
+    contentType,
+    searchDebounced,
+    geoHashLocation,
+    start,
+    end,
+    radius,
+    isOnline,
+    categoryOneOf,
+    statusOneOf,
+    languageOneOf,
+    searchTarget,
+    bbox,
+    zoom,
+    sortBy,
+    boostLanguagesQuery,
+  ],
+  ([newContentType]) => {
+    switch (newContentType) {
+      case ContentType.ALL:
+        page.value = 1;
+        break;
+      case ContentType.EVENTS:
+        eventPage.value = 1;
+        break;
+      case ContentType.GROUPS:
+        groupPage.value = 1;
+        break;
+    }
+  }
+);
+
 const { result: searchElementsResult, loading: searchLoading } = useQuery<{
  searchEvents: Paginate<TypeNamed<IEvent>>;
  searchGroups: Paginate<TypeNamed<IGroup>>;
--- a/js/src/views/Settings/AccountSettings.vue
+++ b/js/src/views/Settings/AccountSettings.vue
@ -187,7 +187,8 @@
                        :placeholder="t('Password')"
                      />
                      <template #message>
-                        <o-notification class="mt-2 not-italic text-base"
+                        <o-notification
+                          class="mt-2 not-italic text-base"
                          variant="danger"
                          v-for="message in deletePasswordErrors"
                          :key="message"
--- a/js/src/views/User/ResendConfirmation.vue
+++ b/js/src/views/User/ResendConfirmation.vue
@ -4,7 +4,7 @@
      {{ $t("Resend confirmation email") }}
    </h1>
    <o-notification v-if="error" variant="danger">
-      {{  errorMessage  }}
+      {{ errorMessage }}
    </o-notification>
    <form v-if="!validationSent" @submit="resendConfirmationAction">
      <o-field :label="$t('Email address')" labelFor="emailAddress">