From 63740eb67f61c560a61da4c24a57837bdeeced55 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 16 Mar 2021 18:51:17 +0100
Subject: [PATCH 1/3] Set uploads directory to same directory in dev mode

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 config/dev.exs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/dev.exs b/config/dev.exs
index 97fb3b585..3209d7e56 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -91,6 +91,8 @@ config :mobilizon, :instance,
 
 # config :mobilizon, :activitypub, sign_object_fetches: false
 
+config :mobilizon, Mobilizon.Web.Upload.Uploader.Local, uploads: "uploads"
+
 config :mobilizon, :anonymous,
   reports: [
     allowed: true

From c8e39313ef60c5cb65d98aea3100d35fc0269cde Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 16 Mar 2021 18:51:34 +0100
Subject: [PATCH 2/3] Fix location field not showing in preferences if setting
 not set

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

diff --git a/js/src/views/Settings/Preferences.vue b/js/src/views/Settings/Preferences.vue
index b2aa73a7f..822554d51 100644
--- a/js/src/views/Settings/Preferences.vue
+++ b/js/src/views/Settings/Preferences.vue
@@ -59,9 +59,7 @@
       <b-field grouped>
         <b-field :label="$t('City or region')" expanded>
           <address-auto-complete
-            v-if="
-              loggedUser && loggedUser.settings && loggedUser.settings.location
-            "
+            v-if="loggedUser && loggedUser.settings"
             :type="AddressSearchType.ADMINISTRATIVE"
             :doGeoLocation="false"
             v-model="address"

From 4ff00e92b6716a3b6626f1da222743886987d11f Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 16 Mar 2021 19:08:00 +0100
Subject: [PATCH 3/3] Fix lasts events published order on the homepage

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/graphql/event.ts        |  4 ++--
 js/src/types/enums.ts          | 11 +++++++++++
 js/src/views/Home.vue          |  6 +++++-
 lib/graphql/resolvers/event.ex |  8 ++++++--
 lib/graphql/schema/event.ex    | 18 ++++++++++++++++++
 5 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/js/src/graphql/event.ts b/js/src/graphql/event.ts
index 6e532fd86..8302ca51c 100644
--- a/js/src/graphql/event.ts
+++ b/js/src/graphql/event.ts
@@ -193,8 +193,8 @@ export const FETCH_EVENT_BASIC = gql`
 `;
 
 export const FETCH_EVENTS = gql`
-  query {
-    events {
+  query FetchEvents($orderBy: EventOrderBy, $direction: SortDirection) {
+    events(orderBy: $orderBy, direction: $direction) {
       total
       elements {
         id
diff --git a/js/src/types/enums.ts b/js/src/types/enums.ts
index d6a28ff5a..3f612e64f 100644
--- a/js/src/types/enums.ts
+++ b/js/src/types/enums.ts
@@ -239,3 +239,14 @@ export enum ActivityGroupSubject {
   GROUP_CREATED = "group_created",
   GROUP_UPDATED = "group_updated",
 }
+
+export enum EventSortField {
+  BEGINS_ON = "BEGINS_ON",
+  INSERTED_AT = "INSERTED_AT",
+  UPDATED_AT = "UPDATED_AT",
+}
+
+export enum SortDirection {
+  ASC = "ASC",
+  DESC = "DESC",
+}
diff --git a/js/src/views/Home.vue b/js/src/views/Home.vue
index 8c255f654..b68eb31e5 100644
--- a/js/src/views/Home.vue
+++ b/js/src/views/Home.vue
@@ -320,7 +320,7 @@
 
 <script lang="ts">
 import { Component, Vue, Watch } from "vue-property-decorator";
-import { ParticipantRole } from "@/types/enums";
+import { EventSortField, ParticipantRole, SortDirection } from "@/types/enums";
 import { Paginate } from "@/types/paginate";
 import { supportsWebPFormat } from "@/utils/support";
 import { IParticipant, Participant } from "../types/participant.model";
@@ -347,6 +347,10 @@ import Subtitle from "../components/Utils/Subtitle.vue";
     events: {
       query: FETCH_EVENTS,
       fetchPolicy: "no-cache", // Debug me: https://github.com/apollographql/apollo-client/issues/3030
+      variables: {
+        orderBy: EventSortField.INSERTED_AT,
+        direction: SortDirection.DESC,
+      },
     },
     currentActor: {
       query: CURRENT_ACTOR_CLIENT,
diff --git a/lib/graphql/resolvers/event.ex b/lib/graphql/resolvers/event.ex
index ecca7cfd2..247ed935d 100644
--- a/lib/graphql/resolvers/event.ex
+++ b/lib/graphql/resolvers/event.ex
@@ -59,9 +59,13 @@ defmodule Mobilizon.GraphQL.Resolvers.Event do
     end
   end
 
-  def list_events(_parent, %{page: page, limit: limit}, _resolution)
+  def list_events(
+        _parent,
+        %{page: page, limit: limit, order_by: order_by, direction: direction},
+        _resolution
+      )
       when limit < @event_max_limit do
-    {:ok, Events.list_events(page, limit)}
+    {:ok, Events.list_events(page, limit, order_by, direction)}
   end
 
   def list_events(_parent, %{page: _page, limit: _limit}, _resolution) do
diff --git a/lib/graphql/schema/event.ex b/lib/graphql/schema/event.ex
index f88ad3afd..cf42ff663 100644
--- a/lib/graphql/schema/event.ex
+++ b/lib/graphql/schema/event.ex
@@ -297,11 +297,29 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
     field(:id, :string, description: "The Contact Actor ID")
   end
 
+  @desc "Available event sort fields"
+  enum :event_order_by do
+    value(:begins_on, description: "Sort by the date the event starts")
+    value(:inserted_at, description: "Sort by the date the event was created")
+    value(:updated_at, description: "Sort by the date the event was updated")
+  end
+
   object :event_queries do
     @desc "Get all events"
     field :events, :paginated_event_list do
       arg(:page, :integer, default_value: 1, description: "The page in the paginated event list")
       arg(:limit, :integer, default_value: 10, description: "The limit of events per page")
+
+      arg(:order_by, :event_order_by,
+        default_value: :begins_on,
+        description: "Order the list of events by field"
+      )
+
+      arg(:direction, :sort_direction,
+        default_value: :asc,
+        description: "Direction for the sort"
+      )
+
       resolve(&Event.list_events/3)
     end