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

Revert "simplified base structure:"

Browse source 
This reverts commit 4e28df2f1f.
This commit is contained in:
jona 2023-03-22 21:41:30 +01:00
parent fcc810cd23
commit a48834d153
3 changed files with 15 additions and 26 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 slot="start">
<b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{
$t("Filter")
$t("Explore")
}}</b-navbar-item>
<b-navbar-item
v-if="currentActor.id && currentUser.isLoggedIn"

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

@ -31,7 +31,7 @@
v-if="config.registrationsOpen"
>{{ $t("Create an account") }}</b-button
>
<!-- We don't invite to find other instances yet chnage for commit-->
<!-- We don't invite to find other instances yet -->
<!-- <b-button v-else type="is-link" tag="a" href="https://joinmastodon.org">{{ $t('Find an instance') }}</b-button> -->
<b-button
type="is-text"
@ -51,26 +51,18 @@
>
<section class="events-recent">
<h2 class="title">
{{ $t("Upcoming events") }}
{{ $t("Last published events") }}
</h2>
<p>
<i18n tag="span" path="On {instance} and other federated instances">
<b slot="instance">{{ config.name }}</b>
</i18n>
</p>
<div v-if="events.elements.length > 0">
<multi-card class="my-4" :events="events.elements" />
<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>
<div v-if="this.events.total > 0">
<multi-card :events="events.elements.slice(0, 6)" />
<span class="view-all">
<router-link :to="{ name: RouteName.SEARCH }"
>{{ $t("Filter") }} >></router-link
>{{ $t("View everything") }} >></router-link
>
</span>
</div>
@ -297,7 +289,7 @@
/>
<section class="events-recent">
<h2 class="title">
{{ $t("Upcoming events") }}
{{ $t("Last published events") }}
</h2>
<p>
<i18n tag="span" path="On {instance} and other federated instances">
@ -306,10 +298,10 @@
</p>
<div v-if="events.total > 0">
<multi-card :events="events.elements" />
<multi-card :events="events.elements.slice(0, 8)" />
<span class="view-all">
<router-link :to="{ name: RouteName.SEARCH }"
>{{ $t("Filter") }} >></router-link
>{{ $t("View everything") }} >></router-link
>
</span>
</div>
@ -353,16 +345,13 @@ 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.BEGINS_ON,
direction: SortDirection.ASC,
limit: EVENT_PAGE_LIMIT,
orderBy: EventSortField.INSERTED_AT,
direction: SortDirection.DESC,
},
},
currentActor: {

8
js/src/views/Search.vue
View file

@ -1,6 +1,6 @@
<template>
<div class="section container">
<!-- <h1 class="title">{{ $t("Explore") }}</h1> -->
<h1 class="title">{{ $t("Explore") }}</h1>
<section v-if="tag">
<i18n path="Events tagged with {tag}">
<b-tag slot="tag" type="is-light">{{ $t("#{tag}", { tag }) }}</b-tag>
@ -125,7 +125,7 @@
v-if="!canSearchEvents && !canSearchGroups"
>
<b-loading :active.sync="$apollo.loading"></b-loading>
<!-- <h2 class="title">{{ $t("Featured events") }}</h2> -->
<h2 class="title">{{ $t("Featured events") }}</h2>
<div v-if="events.elements.length > 0">
<multi-card class="my-4" :events="events.elements" />
<div class="pagination" v-if="events.total > EVENT_PAGE_LIMIT">
@ -255,9 +255,9 @@ interface ISearchTimeOption {
end?: Date | null;
}
const EVENT_PAGE_LIMIT = 99;
const EVENT_PAGE_LIMIT = 12;
const GROUP_PAGE_LIMIT = 99;
const GROUP_PAGE_LIMIT = 12;
const DEFAULT_RADIUS = 25; // value to set if radius is null but location set