tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity

Revert "simplified base structure:"

Browse source 
This reverts commit 78f51c0ab3.
This commit is contained in:
jona 2023-03-22 19:41:20 +01:00
parent 78f51c0ab3
commit df7b4fd912
2 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/src/components/NavBar.vue
View file

@ -16,7 +16,7 @@
</template> </template>
<template slot="start"> <template slot="start">
<b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{ <b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{
$t("Filter") $t("Explore")
}}</b-navbar-item> }}</b-navbar-item>
<b-navbar-item <b-navbar-item
v-if="currentActor.id && currentUser.isLoggedIn" v-if="currentActor.id && currentUser.isLoggedIn"

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

@ -51,26 +51,18 @@
> >
<section class="events-recent"> <section class="events-recent">
<h2 class="title"> <h2 class="title">
{{ $t("Upcoming events") }} {{ $t("Last published events") }}
</h2> </h2>
<p> <p>
<i18n tag="span" path="On {instance} and other federated instances"> <i18n tag="span" path="On {instance} and other federated instances">
<b slot="instance">{{ config.name }}</b> <b slot="instance">{{ config.name }}</b>
</i18n> </i18n>
</p> </p>
<div v-if="events.elements.length > 0"> <div v-if="this.events.total > 0">
<multi-card class="my-4" :events="events.elements" /> <multi-card :events="events.elements.slice(0, 6)" />
<div class="pagination" v-if="events.total > EVENT_PAGE_LIMIT">
<b-pagination
:total="events.total"
v-model="featuredEventPage"
:per-page="EVENT_PAGE_LIMIT"
>
</b-pagination>
</div>
<span class="view-all"> <span class="view-all">
<router-link :to="{ name: RouteName.SEARCH }" <router-link :to="{ name: RouteName.SEARCH }"
>{{ $t("Filter") }} >></router-link >{{ $t("View everything") }} >></router-link
> >
</span> </span>
</div> </div>
@ -199,7 +191,7 @@
/> />
<section class="events-recent"> <section class="events-recent">
<h2 class="title"> <h2 class="title">
{{ $t("Upcoming events") }} {{ $t("Last published events") }}
</h2> </h2>
<p> <p>
<i18n tag="span" path="On {instance} and other federated instances"> <i18n tag="span" path="On {instance} and other federated instances">
@ -208,10 +200,10 @@
</p> </p>
<div v-if="events.total > 0"> <div v-if="events.total > 0">
<multi-card :events="events.elements" /> <multi-card :events="events.elements.slice(0, 8)" />
<span class="view-all"> <span class="view-all">
<router-link :to="{ name: RouteName.SEARCH }" <router-link :to="{ name: RouteName.SEARCH }"
>{{ $t("Filter") }} >></router-link >{{ $t("View everything") }} >></router-link
> >
</span> </span>
</div> </div>
@ -255,16 +247,13 @@ import { IConfig } from "../types/config.model";
import { IFollowedGroupEvent } from "../types/followedGroupEvent.model"; import { IFollowedGroupEvent } from "../types/followedGroupEvent.model";
import Subtitle from "../components/Utils/Subtitle.vue"; import Subtitle from "../components/Utils/Subtitle.vue";
const EVENT_PAGE_LIMIT = 161;
@Component({ @Component({
apollo: { apollo: {
events: { events: {
query: FETCH_EVENTS, query: FETCH_EVENTS,
variables: { variables: {
orderBy: EventSortField.BEGINS_ON, orderBy: EventSortField.INSERTED_AT,
direction: SortDirection.ASC, direction: SortDirection.DESC,
limit: EVENT_PAGE_LIMIT,
}, },
}, },
currentActor: { currentActor: {