Tykayn
973ae96f1a
- Fixed 'unsafe-inline' being in CSP - Fixed group discussions with deleted comments -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEExMITpfxOHHCvHn8FoGG53eDKB3MFAmDfELkACgkQoGG53eDK B3N88BAAjJrjwqoR4L25n0waHxITI7fIn4cJokZlMs5n+kb4KhngakzU9bJ8p++H jZb5YCC6zLe4KKRwMvPeLpH1MD6NGya9xYtZr2ub40PxaNAIFiV/9/GJ/PS91ipS RaWGA67TtJN9oMWeOWnozRR5+gs831/t5wmxJxJmiMh5QXL9kGV1FQf/WIE9iU4u dvajcHAJBTyKJjXmoUtdifsJVc2QLH513l6/EX+9NggaJTRiSgRtJGLpOqZ9i5ax Bq9OmWhAGetwK/RGzbrmEn+mJ2XmtQ9Dk+LJ6dIaRhEZt1vPXia5AnfiOvovgVhi +RqRta2wT3YWSOIfRr7WnwNVsf9ygufSTa7idVZEx/4tiBSgE0R4+9nQLvhd9q1v +DQo+V9PIKUn0RIVVR2fa6I/W7viy6TuC2D1Faegf4GubeQNDqC6UuQwZkik0B2z Js9Lwpll/HHQk5fjBBzdH8ri6pLAtmSAmADTBqXmYhHhPxlYl7Mb68DlTp9Y7KBB GoG8JpIRMH1Z601VrDN2gu49BLd+v5gJrCxqClMwfT4iK09sudJS8Fl5CV3o7Xv1 4XyYc+1k2vPjW9RXg6a+sbNndXESWF4fDCFM+5qwbLvasanW4uijDSDgD8er/pKd 2IU3nneRcaZg1mwPwrIOciiafrxxNSOFUFOiCkJjb5EDY4cjAlQ= =AdSP -----END PGP SIGNATURE----- Merge tag '1.2.3' into chapril - Improved list discussion items UI on the group panel - Fixed 'unsafe-inline' being in CSP - Fixed group discussions with deleted comments
387 lines
9.7 KiB
Vue
Executable File
387 lines
9.7 KiB
Vue
Executable File
<template>
|
|
<b-navbar
|
|
type="is-secondary"
|
|
wrapper-class="container"
|
|
:active.sync="mobileNavbarActive"
|
|
>
|
|
<template slot="brand">
|
|
<b-navbar-item
|
|
tag="router-link"
|
|
:to="{ name: RouteName.HOME }"
|
|
:aria-label="$t('Home')"
|
|
>
|
|
<img
|
|
src="/img/long_logo_chapril_mobilizon.png"
|
|
alt="logo mobilizon"
|
|
style="width: 5em"
|
|
/>
|
|
</b-navbar-item>
|
|
</template>
|
|
<template slot="start">
|
|
<b-navbar-item tag="router-link" :to="{ name: RouteName.SEARCH }">{{
|
|
$t("Explore")
|
|
}}</b-navbar-item>
|
|
<b-navbar-item
|
|
v-if="currentActor.id && currentUser.isLoggedIn"
|
|
tag="router-link"
|
|
:to="{ name: RouteName.MY_EVENTS }"
|
|
>{{ $t("My events") }}</b-navbar-item
|
|
>
|
|
<b-navbar-item
|
|
tag="router-link"
|
|
:to="{ name: RouteName.MY_GROUPS }"
|
|
v-if="
|
|
config &&
|
|
config.features.groups &&
|
|
currentActor.id &&
|
|
currentUser.isLoggedIn
|
|
"
|
|
>{{ $t("My groups") }}</b-navbar-item
|
|
>
|
|
<b-navbar-item
|
|
tag="span"
|
|
v-if="
|
|
config &&
|
|
config.features.eventCreation &&
|
|
currentActor.id &&
|
|
currentUser.isLoggedIn
|
|
"
|
|
>
|
|
<b-button
|
|
tag="router-link"
|
|
:to="{ name: RouteName.CREATE_EVENT }"
|
|
type="is-primary"
|
|
>{{ $t("Create") }}</b-button
|
|
>
|
|
</b-navbar-item>
|
|
<b-navbar-item
|
|
v-if="config && config.features.koenaConnect"
|
|
class="koena"
|
|
tag="a"
|
|
href="https://mediation.koena.net/framasoft/mobilizon/"
|
|
target="_blank"
|
|
rel="noopener"
|
|
>
|
|
<img
|
|
src="/img/koena-a11y.svg"
|
|
width="150"
|
|
alt="Contact accessibilité"
|
|
/>
|
|
</b-navbar-item>
|
|
</template>
|
|
<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">
|
|
<search-field @navbar-search="mobileNavbarActive = false" />
|
|
</b-navbar-item>
|
|
|
|
<b-navbar-dropdown
|
|
v-if="currentActor.id && currentUser.isLoggedIn"
|
|
right
|
|
collapsible
|
|
>
|
|
<template
|
|
slot="label"
|
|
v-if="currentActor"
|
|
class="navbar-dropdown-profile"
|
|
>
|
|
<div class="identity-wrapper">
|
|
<div>
|
|
<figure class="image is-32x32" v-if="currentActor.avatar">
|
|
<img
|
|
class="is-rounded"
|
|
alt="avatarUrl"
|
|
:src="currentActor.avatar.url"
|
|
/>
|
|
</figure>
|
|
<b-icon v-else icon="account-circle" />
|
|
</div>
|
|
<div class="media-content is-hidden-desktop">
|
|
<span>{{ displayName(currentActor) }}</span>
|
|
<span class="has-text-grey-dark" v-if="currentActor.name"
|
|
>@{{ currentActor.preferredUsername }}</span
|
|
>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<!-- No identities dropdown if no identities -->
|
|
<span v-if="identities.length <= 1" />
|
|
<b-navbar-item
|
|
tag="span"
|
|
v-for="identity in identities"
|
|
v-else
|
|
:active="identity.id === currentActor.id"
|
|
:key="identity.id"
|
|
>
|
|
<span @click="setIdentity(identity)">
|
|
<div class="media-left">
|
|
<figure class="image is-32x32" v-if="identity.avatar">
|
|
<img
|
|
class="is-rounded"
|
|
loading="lazy"
|
|
:src="identity.avatar.url"
|
|
alt
|
|
/>
|
|
</figure>
|
|
<b-icon v-else size="is-medium" icon="account-circle" />
|
|
</div>
|
|
|
|
<div class="media-content">
|
|
<span>{{ displayName(identity) }}</span>
|
|
<span class="has-text-grey-dark" v-if="identity.name"
|
|
>@{{ identity.preferredUsername }}</span
|
|
>
|
|
</div>
|
|
</span>
|
|
|
|
<hr class="navbar-divider" />
|
|
</b-navbar-item>
|
|
|
|
<b-navbar-item
|
|
tag="router-link"
|
|
:to="{ name: RouteName.UPDATE_IDENTITY }"
|
|
>{{ $t("My account") }}</b-navbar-item
|
|
>
|
|
<b-navbar-item
|
|
v-if="currentUser.role === ICurrentUserRole.ADMINISTRATOR"
|
|
tag="router-link"
|
|
:to="{ name: RouteName.ADMIN_DASHBOARD }"
|
|
>{{ $t("Administration") }}
|
|
</b-navbar-item>
|
|
|
|
<b-navbar-item tag="span">
|
|
<span @click="logout">{{ $t("Log out") }}</span>
|
|
</b-navbar-item>
|
|
</b-navbar-dropdown>
|
|
|
|
<b-navbar-item v-else tag="div">
|
|
<div class="buttons">
|
|
<router-link
|
|
class="button is-primary"
|
|
v-if="config && config.registrationsOpen"
|
|
:to="{ name: RouteName.REGISTER }"
|
|
>
|
|
<strong>{{ $t("Sign up") }}</strong>
|
|
</router-link>
|
|
|
|
<router-link
|
|
class="button is-light"
|
|
:to="{ name: RouteName.LOGIN }"
|
|
>{{ $t("Log in") }}</router-link
|
|
>
|
|
</div>
|
|
</b-navbar-item>
|
|
</template>
|
|
</b-navbar>
|
|
</template>
|
|
|
|
<script lang="ts">
|
|
import { Component, Vue, Watch } from "vue-property-decorator";
|
|
import Logo from "@/components/Logo.vue";
|
|
import { GraphQLError } from "graphql";
|
|
import { loadLanguageAsync } from "@/utils/i18n";
|
|
import { ICurrentUserRole } from "@/types/enums";
|
|
import { CURRENT_USER_CLIENT, USER_SETTINGS } from "../graphql/user";
|
|
import { changeIdentity, logout } from "../utils/auth";
|
|
import {
|
|
CURRENT_ACTOR_CLIENT,
|
|
IDENTITIES,
|
|
UPDATE_DEFAULT_ACTOR,
|
|
} from "../graphql/actor";
|
|
import { displayName, IPerson, Person } from "../types/actor";
|
|
import { CONFIG } from "../graphql/config";
|
|
import { IConfig } from "../types/config.model";
|
|
import { ICurrentUser, IUser } from "../types/current-user.model";
|
|
import SearchField from "./SearchField.vue";
|
|
import RouteName from "../router/name";
|
|
|
|
@Component({
|
|
apollo: {
|
|
currentUser: {
|
|
query: CURRENT_USER_CLIENT,
|
|
},
|
|
currentActor: {
|
|
query: CURRENT_ACTOR_CLIENT,
|
|
},
|
|
identities: {
|
|
query: IDENTITIES,
|
|
update: ({ identities }) =>
|
|
identities
|
|
? identities.map((identity: IPerson) => new Person(identity))
|
|
: [],
|
|
skip() {
|
|
return this.currentUser.isLoggedIn === false;
|
|
},
|
|
error({ graphQLErrors }) {
|
|
this.handleErrors(graphQLErrors);
|
|
},
|
|
},
|
|
config: CONFIG,
|
|
loggedUser: {
|
|
query: USER_SETTINGS,
|
|
skip() {
|
|
return this.currentUser.isLoggedIn === false;
|
|
},
|
|
},
|
|
},
|
|
components: {
|
|
Logo,
|
|
SearchField,
|
|
},
|
|
})
|
|
export default class NavBar extends Vue {
|
|
currentActor!: IPerson;
|
|
|
|
config!: IConfig;
|
|
|
|
currentUser!: ICurrentUser;
|
|
|
|
loggedUser!: IUser;
|
|
|
|
ICurrentUserRole = ICurrentUserRole;
|
|
|
|
identities: IPerson[] = [];
|
|
|
|
RouteName = RouteName;
|
|
|
|
mobileNavbarActive = false;
|
|
|
|
displayName = displayName;
|
|
|
|
@Watch("currentActor")
|
|
async initializeListOfIdentities(): Promise<void> {
|
|
if (!this.currentUser.isLoggedIn) return;
|
|
const { data } = await this.$apollo.query<{ identities: IPerson[] }>({
|
|
query: IDENTITIES,
|
|
});
|
|
if (data) {
|
|
this.identities = data.identities.map(
|
|
(identity: IPerson) => new Person(identity)
|
|
);
|
|
|
|
// If we don't have any identities, the user has validated their account,
|
|
// is logging for the first time but didn't create an identity somehow
|
|
if (this.identities.length === 0) {
|
|
await this.$router.push({
|
|
name: RouteName.REGISTER_PROFILE,
|
|
params: {
|
|
email: this.currentUser.email,
|
|
userAlreadyActivated: "true",
|
|
},
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
@Watch("loggedUser")
|
|
setSavedLanguage(): void {
|
|
if (this.loggedUser?.locale) {
|
|
loadLanguageAsync(this.loggedUser.locale);
|
|
}
|
|
}
|
|
|
|
async handleErrors(errors: GraphQLError[]): Promise<void> {
|
|
if (
|
|
errors.length > 0 &&
|
|
errors[0].message ===
|
|
"You need to be logged-in to view your list of identities"
|
|
) {
|
|
await this.logout();
|
|
}
|
|
}
|
|
|
|
async logout(): Promise<void> {
|
|
await logout(this.$apollo.provider.defaultClient);
|
|
this.$buefy.notification.open({
|
|
message: this.$t("You have been disconnected") as string,
|
|
type: "is-success",
|
|
position: "is-bottom-right",
|
|
duration: 5000,
|
|
});
|
|
|
|
if (this.$route.name === RouteName.HOME) return;
|
|
await this.$router.push({ name: RouteName.HOME });
|
|
}
|
|
|
|
async setIdentity(identity: IPerson): Promise<void> {
|
|
await this.$apollo.mutate({
|
|
mutation: UPDATE_DEFAULT_ACTOR,
|
|
variables: {
|
|
preferredUsername: identity.preferredUsername,
|
|
},
|
|
});
|
|
return changeIdentity(this.$apollo.provider.defaultClient, identity);
|
|
}
|
|
}
|
|
</script>
|
|
<style lang="scss" scoped>
|
|
nav {
|
|
.navbar-item {
|
|
a.button {
|
|
font-weight: bold;
|
|
}
|
|
|
|
svg {
|
|
height: 1.75rem;
|
|
}
|
|
}
|
|
|
|
.navbar-dropdown .navbar-item {
|
|
cursor: pointer;
|
|
|
|
span {
|
|
display: flex;
|
|
}
|
|
|
|
&.is-active {
|
|
background: $secondary;
|
|
}
|
|
|
|
span.icon.is-medium {
|
|
display: flex;
|
|
}
|
|
|
|
img {
|
|
max-height: 2.5em;
|
|
}
|
|
}
|
|
|
|
.navbar-item.has-dropdown a.navbar-link figure {
|
|
margin-right: 0.75rem;
|
|
display: flex;
|
|
align-items: center;
|
|
}
|
|
|
|
a.navbar-item:focus-within {
|
|
background-color: inherit;
|
|
}
|
|
|
|
.koena {
|
|
padding-top: 0;
|
|
padding-bottom: 0;
|
|
& > img {
|
|
max-height: 4rem;
|
|
padding-top: 0.2rem;
|
|
}
|
|
}
|
|
|
|
.identity-wrapper {
|
|
display: flex;
|
|
|
|
.media-content span {
|
|
display: flex;
|
|
color: $violet-2;
|
|
}
|
|
}
|
|
}
|
|
</style>
|