diff --git a/js/src/components/NavBar.vue b/js/src/components/NavBar.vue index 8dc071f4d..7476e3d51 100644 --- a/js/src/components/NavBar.vue +++ b/js/src/components/NavBar.vue @@ -1,7 +1,7 @@ @@ -16,7 +16,7 @@ {{ - $t("Explore") + $t("Filter") }} {{ $t("Create an account") }} - + - {{ $t("Last published events") }} + {{ $t("Upcoming events") }} {{ config.name }} - - + + + + + + {{ $t("View everything") }} >>{{ $t("Filter") }} >> @@ -71,6 +79,104 @@ }} + + + + + + + + + + + + + + + + + + + + + + {{ $t("A practical tool") }} + + + + {{ $t("An ethical alternative") }} + + + + {{ $t("A federated software") }} + + + + + {{ $t("Learn more about Mobilizon") }} + + + {{ @@ -191,7 +297,7 @@ /> - {{ $t("Last published events") }} + {{ $t("Upcoming events") }} @@ -200,10 +306,10 @@ - + {{ $t("View everything") }} >>{{ $t("Filter") }} >> @@ -247,13 +353,16 @@ import { IConfig } from "../types/config.model"; import { IFollowedGroupEvent } from "../types/followedGroupEvent.model"; import Subtitle from "../components/Utils/Subtitle.vue"; +const EVENT_PAGE_LIMIT = 99; + @Component({ apollo: { events: { query: FETCH_EVENTS, variables: { - orderBy: EventSortField.INSERTED_AT, - direction: SortDirection.DESC, + orderBy: EventSortField.BEGINS_ON, + direction: SortDirection.ASC, + limit: EVENT_PAGE_LIMIT, }, }, currentActor: { @@ -565,6 +674,7 @@ section.hero { left: 0; width: 100%; height: 100%; + opacity: 0.3; z-index: -1; background: url("../../public/img/pics/homepage_background-1024w.png"); background-size: cover; diff --git a/js/src/views/Search.vue b/js/src/views/Search.vue index 6231c94a4..6167ae044 100644 --- a/js/src/views/Search.vue +++ b/js/src/views/Search.vue @@ -1,6 +1,6 @@ - {{ $t("Explore") }} + {{ $t("#{tag}", { tag }) }} @@ -125,7 +125,7 @@ v-if="!canSearchEvents && !canSearchGroups" > - {{ $t("Featured events") }} + @@ -255,9 +255,9 @@ interface ISearchTimeOption { end?: Date | null; } -const EVENT_PAGE_LIMIT = 12; +const EVENT_PAGE_LIMIT = 99; -const GROUP_PAGE_LIMIT = 12; +const GROUP_PAGE_LIMIT = 99; const DEFAULT_RADIUS = 25; // value to set if radius is null but location set
{{ config.name }}
@@ -200,10 +306,10 @@