Chapril/mobilizon.chapril.org-mobilizon
Chapril
/
mobilizon.chapril.org-mobilizon
24
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'chapril' of ssh://forge.april.org:222/Chapril/mobilizon.chapril.org-mobilizon into chapril

This commit is contained in:
Tykayn 2020-12-17 12:43:11 +01:00 committed by tykayn
parent d3860eb81e 1f35ea213a
commit fa89c90c28
2 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
js/public/img/long_logo_chapril_mobilizon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.3 KiB

54
js/src/components/NavBar.vue Normal file → Executable file
View File

@ -2,34 +2,37 @@
<template> <template>
<b-navbar type="is-secondary" wrapper-class="container" :active.sync="mobileNavbarActive"> <b-navbar type="is-secondary" wrapper-class="container" :active.sync="mobileNavbarActive">
<template slot="brand"> <template slot="brand">
<b-navbar-item href='https://www.chapril.org'> <b-navbar-item tag="router-link" :to="{ name: RouteName.HOME }">
<logo /> <img src="/img/long_logo_chapril_mobilizon.png" alt="logo mobilizon" style="width: 5em" />
</b-navbar-item> </b-navbar-item>
</template> </template>
<template slot="start"> <template slot="start">
<b-navbar-item tag="router-link" :to="{ name: RouteName.HOME }" :aria-label="$t('Home')"> <b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }"
<img src="img/mobilizon_logo.svg" alt="logo mobilizon" style='width: 5em' /> >{{ $t("Explore") }}
</b-navbar-item> </b-navbar-item>
<b-navbar-item tag="router-link" :to="{ name: RouteName.MY_EVENTS }"
<b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{ >{{ $t("My events") }}
$t("Explore") </b-navbar-item>
}}</b-navbar-item>
<b-navbar-item tag="router-link" :to="{ name: RouteName.MY_EVENTS }">{{
$t("My events")
}}</b-navbar-item>
<b-navbar-item <b-navbar-item
tag="router-link" tag="router-link"
:to="{ name: RouteName.MY_GROUPS }" :to="{ name: RouteName.MY_GROUPS }"
v-if="config && config.features.groups" v-if="config && config.features.groups"
>{{ $t("My groups") }}</b-navbar-item >{{ $t("My groups") }}
> </b-navbar-item>
<b-navbar-item tag="span" v-if="config && config.features.eventCreation"> <b-navbar-item tag="span" v-if="config && config.features.eventCreation">
<b-button tag="router-link" :to="{ name: RouteName.CREATE_EVENT }" type="is-primary">{{ <b-button tag="router-link" :to="{ name: RouteName.CREATE_EVENT }" type="is-primary"
$t("Create") >{{ $t("Create") }}
}}</b-button> </b-button>
</b-navbar-item> </b-navbar-item>
</template> </template>
<template slot="end"> <template slot="end">
<b-navbar-item
href="https://www.chapril.org"
:aria-label="'www.chapril.org'"
>
<img src="/img/pics/logo_chapril_mobilizon.png" alt="logo chapril mobilizon" />
</b-navbar-item>
<b-navbar-item tag="div"> <b-navbar-item tag="div">
<search-field @navbar-search="mobileNavbarActive = false" /> <search-field @navbar-search="mobileNavbarActive = false" />
</b-navbar-item> </b-navbar-item>
@ -70,9 +73,9 @@
<hr class="navbar-divider" /> <hr class="navbar-divider" />
</b-navbar-item> </b-navbar-item>
<b-navbar-item tag="router-link" :to="{ name: RouteName.UPDATE_IDENTITY }">{{ <b-navbar-item tag="router-link" :to="{ name: RouteName.UPDATE_IDENTITY }"
$t("My account") >{{ $t("My account") }}
}}</b-navbar-item> </b-navbar-item>
<!-- <b-navbar-item tag="router-link" :to="{ name: RouteName.CREATE_GROUP }">--> <!-- <b-navbar-item tag="router-link" :to="{ name: RouteName.CREATE_GROUP }">-->
<!-- {{ $t('Create group') }}--> <!-- {{ $t('Create group') }}-->
@ -82,8 +85,8 @@
v-if="currentUser.role === ICurrentUserRole.ADMINISTRATOR" v-if="currentUser.role === ICurrentUserRole.ADMINISTRATOR"
tag="router-link" tag="router-link"
:to="{ name: RouteName.ADMIN_DASHBOARD }" :to="{ name: RouteName.ADMIN_DASHBOARD }"
>{{ $t("Administration") }}</b-navbar-item >{{ $t("Administration") }}
> </b-navbar-item>
<b-navbar-item tag="span"> <b-navbar-item tag="span">
<span @click="logout">{{ $t("Log out") }}</span> <span @click="logout">{{ $t("Log out") }}</span>
@ -100,9 +103,9 @@
<strong>{{ $t("Sign up") }}</strong> <strong>{{ $t("Sign up") }}</strong>
</router-link> </router-link>
<router-link class="button is-light" :to="{ name: RouteName.LOGIN }">{{ <router-link class="button is-light" :to="{ name: RouteName.LOGIN }"
$t("Log in") >{{ $t("Log in") }}
}}</router-link> </router-link>
</div> </div>
</b-navbar-item> </b-navbar-item>
</template> </template>
@ -112,7 +115,6 @@
<script lang="ts"> <script lang="ts">
import { Component, Vue, Watch } from "vue-property-decorator"; import { Component, Vue, Watch } from "vue-property-decorator";
import Logo from "@/components/Logo.vue"; import Logo from "@/components/Logo.vue";
import MobilizonLogoText from "../assets/mobilizon_logo.svg";
import { GraphQLError } from "graphql"; import { GraphQLError } from "graphql";
import { loadLanguageAsync } from "@/utils/i18n"; import { loadLanguageAsync } from "@/utils/i18n";
import { CURRENT_USER_CLIENT, USER_SETTINGS } from "../graphql/user"; import { CURRENT_USER_CLIENT, USER_SETTINGS } from "../graphql/user";