mirror/mobilizon
1
0
Fork 0
mirror of https://framagit.org/framasoft/mobilizon.git synced 2024-12-22 07:52:43 +00:00
Code Issues Releases Wiki Activity

Extracting sorting modes into its own model

Browse source
This commit is contained in:
Gitea 2021-08-21 08:26:14 +02:00 committed by Thomas Citharel
parent 8bc216e559
commit da2ae333c9
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
2 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
js/src/types/sorting.model.ts Normal file
View file

@ -0,0 +1,19 @@
import { EventSortField, SortDirection } from "./enums";
export interface ISorting {
title: string;
orderBy: EventSortField;
direction: SortDirection;
}
export class SortingUpcoming implements ISorting {
title = "Upcoming Events";
orderBy = EventSortField.BEGINS_ON;
direction = SortDirection.ASC;
}
export class SortingCreated implements ISorting {
title = "Recently created Events";
orderBy = EventSortField.INSERTED_AT;
direction = SortDirection.DESC;
}

52
js/src/views/Home.vue
View file

@ -51,15 +51,7 @@
>
<section class="events-recent">
<h2 class="title">
{{
$t(
config &&
config.instanceHomepageSorting ===
InstanceHomepageSorting.UPCOMING
? "Upcoming Events"
: "Last published events"
)
}}
{{ $t(this.sorting.title) }}
</h2>
<p>
<i18n tag="span" path="On {instance} and other federated instances">
@ -297,15 +289,7 @@
/>
<section class="events-recent">
<h2 class="title">
{{
$t(
config &&
config.instanceHomepageSorting ===
InstanceHomepageSorting.UPCOMING
? "Upcoming Events"
: "Last published events"
)
}}
{{ $t(this.sorting.title) }}
</h2>
<p>
<i18n tag="span" path="On {instance} and other federated instances">
@ -337,12 +321,7 @@
<script lang="ts">
import { Component, Vue, Watch } from "vue-property-decorator";
import {
EventSortField,
InstanceHomepageSorting,
ParticipantRole,
SortDirection,
} from "@/types/enums";
import { InstanceHomepageSorting, ParticipantRole } from "@/types/enums";
import { Paginate } from "@/types/paginate";
import { supportsWebPFormat } from "@/utils/support";
import { IParticipant, Participant } from "../types/participant.model";
@ -362,6 +341,11 @@ import RouteName from "../router/name";
import { IEvent } from "../types/event.model";
import DateComponent from "../components/Event/DateCalendarIcon.vue";
import { CONFIG } from "../graphql/config";
import {
ISorting,
SortingCreated,
SortingUpcoming,
} from "../types/sorting.model";
import { IConfig } from "../types/config.model";
import { IFollowedGroupEvent } from "../types/followedGroupEvent.model";
import Subtitle from "../components/Utils/Subtitle.vue";
@ -371,16 +355,7 @@ import Subtitle from "../components/Utils/Subtitle.vue";
events: {
query: FETCH_EVENTS,
variables() {
return this.config?.instanceHomepageSorting ===
InstanceHomepageSorting.UPCOMING
? {
orderBy: EventSortField.BEGINS_ON,
direction: SortDirection.ASC,
}
: {
orderBy: EventSortField.INSERTED_AT,
direction: SortDirection.DESC,
};
return this.sorting;
},
},
currentActor: {
@ -549,6 +524,15 @@ export default class Home extends Vue {
);
}
get sorting(): ISorting {
switch (this.config?.instanceHomepageSorting) {
case InstanceHomepageSorting.UPCOMING:
return new SortingUpcoming();
default:
return new SortingCreated();
}
}
get thisWeekGoingToEvents(): IParticipant[] {
const res = this.currentUserParticipations.filter(
({ event, role }) =>