From d73bafec97cd7d8eda887d21870427262befab0f Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 24 May 2023 10:56:02 +0200
Subject: [PATCH 1/9] fix(front): reset page number to 1 when search criteria
 changes

Closes #1272

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/SearchView.vue | 48 ++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/js/src/views/SearchView.vue b/js/src/views/SearchView.vue
index ad09e1d2..5d76def9 100644
--- 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>>;

From a7c8cc0b9f02c4c440fcb59d8385647947c7ce85 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 24 May 2023 10:56:25 +0200
Subject: [PATCH 2/9] style(lint): lint front-end code

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/Settings/AccountSettings.vue | 3 ++-
 js/src/views/User/ResendConfirmation.vue  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/src/views/Settings/AccountSettings.vue b/js/src/views/Settings/AccountSettings.vue
index fbe1a141..001328f0 100644
--- 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"
diff --git a/js/src/views/User/ResendConfirmation.vue b/js/src/views/User/ResendConfirmation.vue
index f13f122e..aa811c17 100644
--- 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">

From 6bd8034fe816a432c3547de6d1ad8a18e73dc314 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 24 May 2023 11:14:16 +0200
Subject: [PATCH 3/9] feat(i18n): activate japanese language

Closes #1293

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/i18n/langs.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/i18n/langs.json b/js/src/i18n/langs.json
index e0a717dd..9a651d89 100644
--- a/js/src/i18n/langs.json
+++ b/js/src/i18n/langs.json
@@ -15,6 +15,7 @@
   "hu": "Magyar",
   "id": "Bahasa Indonesia",
   "it": "Italiano",
+  "ja": "日本語",
   "nl": "Nederlands",
   "nn": "Nynorsk",
   "oc": "Occitan",

From 94182aed2d8a22d00534f6376dfda2658bc8ba7e Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 24 May 2023 11:17:30 +0200
Subject: [PATCH 4/9] feat(i18n): activate croatian language

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 config/prod.exs        | 1 +
 js/src/i18n/langs.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/prod.exs b/config/prod.exs
index fc98b346..718bc628 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -30,6 +30,7 @@ config :mobilizon, :cldr,
     "fr",
     "gd",
     "gl",
+    "hr",
     "hu",
     "id",
     "it",
diff --git a/js/src/i18n/langs.json b/js/src/i18n/langs.json
index 9a651d89..f7ab603a 100644
--- a/js/src/i18n/langs.json
+++ b/js/src/i18n/langs.json
@@ -12,6 +12,7 @@
   "fr": "Français",
   "gd": "Gàidhlig",
   "gl": "Galego",
+  "hr": "Hrvatski",
   "hu": "Magyar",
   "id": "Bahasa Indonesia",
   "it": "Italiano",

From 6858bcbbda6d8527bd15b9138e7bb30c5ead72d7 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 24 May 2023 11:34:25 +0200
Subject: [PATCH 5/9] fix(front): remove cache-only for ABOUT GraphQL details
 on homepage

Otherwise this doesn't show the title of the instance when going back

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/HomeView.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/js/src/views/HomeView.vue b/js/src/views/HomeView.vue
index b82ae1a0..15cacd6f 100644
--- 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);
 

From 643a5b5921f91fed6a9f674c0ab3a36bf2d05835 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 24 May 2023 11:44:20 +0200
Subject: [PATCH 6/9] fix(i18n): fix Swedish translations error that prevented
 Participate button from showing up

Closes #1281

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/i18n/sv.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/i18n/sv.json b/js/src/i18n/sv.json
index cc10ddd6..06ba7dbd 100644
--- 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": "",

From 6da0dba0fd6d071ce5978802104538d0c2ef7dae Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 24 May 2023 11:50:38 +0200
Subject: [PATCH 7/9] fix(front): remove leftover console.logs

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Event/FullAddressAutoComplete.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/js/src/components/Event/FullAddressAutoComplete.vue b/js/src/components/Event/FullAddressAutoComplete.vue
index 0e6cfb51..eaaa9291 100644
--- 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 ?? ""
     );

From d5a6df9940fb458c5dbaee149015c02ebc370c6b Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 24 May 2023 12:11:00 +0200
Subject: [PATCH 8/9] feat(front): redirect user to homepage on disconnect when
 currently on private page

Closes #1278

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/NavBar.vue | 25 ++++++++++++++++++++++---
 js/src/i18n/en_US.json       |  5 +++--
 js/src/i18n/fr_FR.json       |  5 +++--
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue
index 423a662d..bd0bff4c 100644
--- 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>
diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json
index c45617d6..4690f637 100644
--- 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."
 }
\ No newline at end of file
diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json
index 2510c96a..2b12e4bd 100644
--- 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."
 }

From d47b69d6caa7c4405ab2e573ba407f9b2450c3bb Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 24 May 2023 12:11:25 +0200
Subject: [PATCH 9/9] fix(front): improve UI of the glossary page

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/views/About/GlossaryView.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/js/src/views/About/GlossaryView.vue b/js/src/views/About/GlossaryView.vue
index d18b5b21..7ac4e1d6 100644
--- 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."