hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix lint issues

Browse Source 
And disable eslint when building in prod mode

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2020-11-30 10:24:11 +01:00
parent da42522073
commit 2d541f2e32
161 changed files with 3869 additions and 1236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/views/Group/Create.vue
View File

@@ -15,7 +15,11 @@
<label class="label">{{ $t("Federated Group Name") }}</label>
<div class="field-body">
<b-field
:message="$t('Only alphanumeric lowercased characters and underscores are supported.')"
:message="
$t(
'Only alphanumeric lowercased characters and underscores are supported.'
)
"
>
<b-input
ref="preferredUsernameInput"
@@ -27,7 +31,9 @@
:useHtml5Validation="true"
:validation-message="
group.preferredUsername
? $t('Only alphanumeric lowercased characters and underscores are supported.')
? $t(
'Only alphanumeric lowercased characters and underscores are supported.'
)
: null
"
/>
@@ -60,7 +66,9 @@
<picture-upload :textFallback="$t('Banner')" v-model="bannerFile" />
</div>
<button class="button is-primary" native-type="submit">{{ $t("Create my group") }}</button>
<button class="button is-primary" native-type="submit">
{{ $t("Create my group") }}
</button>
</form>
</section>
</template>
@@ -187,7 +195,9 @@ export default class CreateGroup extends mixins(IdentityEditionMixin) {
}
private handleError(err: any) {
this.errors.push(...err.graphQLErrors.map(({ message }: { message: string }) => message));
this.errors.push(
...err.graphQLErrors.map(({ message }: { message: string }) => message)
);
}
}
</script>

155
js/src/views/Group/Group.vue
View File

@@ -4,7 +4,9 @@
<nav class="breadcrumb" aria-label="breadcrumbs">
<ul>
<li>
<router-link :to="{ name: RouteName.MY_GROUPS }">{{ $t("My groups") }}</router-link>
<router-link :to="{ name: RouteName.MY_GROUPS }">{{
$t("My groups")
}}</router-link>
</li>
<li class="is-active">
<router-link
@@ -28,8 +30,15 @@
<b-message v-if="isCurrentActorARejectedGroupMember" type="is-danger">
{{ $t("You have been removed from this group's members.") }}
</b-message>
<b-message v-if="isCurrentActorAGroupMember && isCurrentActorARecentMember" type="is-info">
{{ $t("Since you are a new member, private content can take a few minutes to appear.") }}
<b-message
v-if="isCurrentActorAGroupMember && isCurrentActorARecentMember"
type="is-info"
>
{{
$t(
"Since you are a new member, private content can take a few minutes to appear."
)
}}
</b-message>
<header class="block-container presentation">
<div class="block-column media">
@@ -96,7 +105,10 @@
</div>
<div class="block-column address" v-else>
<address v-if="physicalAddress">
<p class="addressDescription" :title="physicalAddress.poiInfos.name">
<p
class="addressDescription"
:title="physicalAddress.poiInfos.name"
>
{{ physicalAddress.poiInfos.name }}
</p>
<p>{{ physicalAddress.poiInfos.alternativeName }}</p>
@@ -113,11 +125,16 @@
:label="$t('This group is invite-only')"
position="is-bottom"
>
<b-button disabled type="is-primary">{{ $t("Join group") }}</b-button></b-tooltip
<b-button disabled type="is-primary">{{
$t("Join group")
}}</b-button></b-tooltip
>
<b-button
v-else-if="currentActor.id"
@click="joinGroup"
type="is-primary"
>{{ $t("Join group") }}</b-button
>
<b-button v-else-if="currentActor.id" @click="joinGroup" type="is-primary">{{
$t("Join group")
}}</b-button>
<b-button
tag="router-link"
:to="{
@@ -129,7 +146,12 @@
>{{ $t("Join group") }}</b-button
>
<b-dropdown aria-role="list" position="is-bottom-left">
<b-button slot="trigger" role="button" icon-right="dots-horizontal"> </b-button>
<b-button
slot="trigger"
role="button"
icon-right="dots-horizontal"
>
</b-button>
<b-dropdown-item
aria-role="listitem"
v-if="ableToReport"
@@ -143,7 +165,11 @@
</b-dropdown>
</p>
</div>
<img v-if="group.banner && group.banner.url" :src="group.banner.url" alt="" />
<img
v-if="group.banner && group.banner.url"
:src="group.banner.url"
alt=""
/>
</header>
</div>
<div v-if="isCurrentActorAGroupMember" class="block-container">
@@ -192,16 +218,27 @@
>
<template v-slot:default>
<div v-if="group.resources.elements.length > 0">
<div v-for="resource in group.resources.elements" :key="resource.id">
<div
v-for="resource in group.resources.elements"
:key="resource.id"
>
<resource-item
:resource="resource"
v-if="resource.type !== 'folder'"
:inline="true"
/>
<folder-item :resource="resource" :group="group" v-else :inline="true" />
<folder-item
:resource="resource"
:group="group"
v-else
:inline="true"
/>
</div>
</div>
<div v-else-if="group" class="content has-text-grey has-text-centered">
<div
v-else-if="group"
class="content has-text-grey has-text-centered"
>
<p>{{ $t("No resources yet") }}</p>
</div>
</template>
@@ -230,7 +267,10 @@
}"
>
<template v-slot:default>
<div class="organized-events-wrapper" v-if="group && group.organizedEvents.total > 0">
<div
class="organized-events-wrapper"
v-if="group && group.organizedEvents.total > 0"
>
<EventMinimalistCard
v-for="event in group.organizedEvents.elements"
:event="event"
@@ -238,7 +278,10 @@
class="organized-event"
/>
</div>
<div v-else-if="group" class="content has-text-grey has-text-centered">
<div
v-else-if="group"
class="content has-text-grey has-text-centered"
>
<p>{{ $t("No public upcoming events") }}</p>
</div>
<b-skeleton animated v-else></b-skeleton>
@@ -266,9 +309,16 @@
>
<template v-slot:default>
<div v-if="group.posts.total > 0" class="posts-wrapper">
<post-list-item v-for="post in group.posts.elements" :key="post.id" :post="post" />
<post-list-item
v-for="post in group.posts.elements"
:key="post.id"
:post="post"
/>
</div>
<div v-else-if="group" class="content has-text-grey has-text-centered">
<div
v-else-if="group"
class="content has-text-grey has-text-centered"
>
<p>{{ $t("No posts yet") }}</p>
</div>
</template>
@@ -292,14 +342,20 @@
<div v-else class="public-container">
<section>
<subtitle>{{ $t("About") }}</subtitle>
<div v-html="group.summary" v-if="group.summary && group.summary !== '<p></p>'" />
<div
v-html="group.summary"
v-if="group.summary && group.summary !== '<p></p>'"
/>
<div v-else-if="group" class="content has-text-grey has-text-centered">
<p>{{ $t("This group doesn't have a description yet.") }}</p>
</div>
</section>
<section>
<subtitle>{{ $t("Upcoming events") }}</subtitle>
<div class="organized-events-wrapper" v-if="group && group.organizedEvents.total > 0">
<div
class="organized-events-wrapper"
v-if="group && group.organizedEvents.total > 0"
>
<EventMinimalistCard
v-for="event in group.organizedEvents.elements"
:event="event"
@@ -322,7 +378,11 @@
<section>
<subtitle>{{ $t("Latest posts") }}</subtitle>
<div v-if="group.posts.total > 0" class="posts-wrapper">
<post-list-item v-for="post in group.posts.elements" :key="post.id" :post="post" />
<post-list-item
v-for="post in group.posts.elements"
:key="post.id"
:post="post"
/>
<router-link
:to="{
name: RouteName.POSTS,
@@ -336,7 +396,10 @@
</div>
<b-skeleton animated v-else></b-skeleton>
</section>
<b-modal v-if="physicalAddress && physicalAddress.geom" :active.sync="showMap">
<b-modal
v-if="physicalAddress && physicalAddress.geom"
:active.sync="showMap"
>
<div class="map">
<map-leaflet
:coords="physicalAddress.geom"
@@ -347,7 +410,11 @@
/>
</div>
</b-modal>
<b-modal :active.sync="isReportModalActive" has-modal-card ref="reportModal">
<b-modal
:active.sync="isReportModalActive"
has-modal-card
ref="reportModal"
>
<report-modal
:on-confirm="reportGroup"
:title="$t('Report this group')"
@@ -402,7 +469,8 @@ import ReportModal from "../../components/Report/ReportModal.vue";
GroupSection,
Invitations,
ReportModal,
"map-leaflet": () => import(/* webpackChunkName: "map" */ "../../components/Map.vue"),
"map-leaflet": () =>
import(/* webpackChunkName: "map" */ "../../components/Map.vue"),
},
metaInfo() {
return {
@@ -469,7 +537,8 @@ export default class Group extends mixins(GroupMixin) {
rejectInvitation({ id: memberId }: { id: string }): void {
const index = this.person.memberships.elements.findIndex(
(membership) => membership.role === MemberRole.INVITED && membership.id === memberId
(membership) =>
membership.role === MemberRole.INVITED && membership.id === memberId
);
if (index > -1) {
this.person.memberships.elements.splice(index, 1);
@@ -492,11 +561,15 @@ export default class Group extends mixins(GroupMixin) {
forward,
},
});
this.$notifier.success(this.$t("Group {groupTitle} reported", { groupTitle }) as string);
this.$notifier.success(
this.$t("Group {groupTitle} reported", { groupTitle }) as string
);
} catch (error) {
console.error(error);
this.$notifier.error(
this.$t("Error while reporting group {groupTitle}", { groupTitle }) as string
this.$t("Error while reporting group {groupTitle}", {
groupTitle,
}) as string
);
}
}
@@ -513,7 +586,9 @@ export default class Group extends mixins(GroupMixin) {
get groupMember(): IMember | undefined {
if (!this.person || !this.person.id) return undefined;
return this.person.memberships.elements.find(({ parent: { id } }) => id === this.group.id);
return this.person.memberships.elements.find(
({ parent: { id } }) => id === this.group.id
);
}
get groupMemberships(): (string | undefined)[] {
@@ -521,9 +596,11 @@ export default class Group extends mixins(GroupMixin) {
return this.person.memberships.elements
.filter(
(membership: IMember) =>
![MemberRole.REJECTED, MemberRole.NOT_APPROVED, MemberRole.INVITED].includes(
membership.role
)
![
MemberRole.REJECTED,
MemberRole.NOT_APPROVED,
MemberRole.INVITED,
].includes(membership.role)
)
.map(({ parent: { id } }) => id);
}
@@ -535,7 +612,10 @@ export default class Group extends mixins(GroupMixin) {
}
get isCurrentActorAGroupMember(): boolean {
return this.groupMemberships !== undefined && this.groupMemberships.includes(this.group.id);
return (
this.groupMemberships !== undefined &&
this.groupMemberships.includes(this.group.id)
);
}
get isCurrentActorARejectedGroupMember(): boolean {
@@ -573,7 +653,11 @@ export default class Group extends mixins(GroupMixin) {
get members(): IMember[] {
return this.group.members.elements.filter(
(member) =>
![MemberRole.INVITED, MemberRole.REJECTED, MemberRole.NOT_APPROVED].includes(member.role)
![
MemberRole.INVITED,
MemberRole.REJECTED,
MemberRole.NOT_APPROVED,
].includes(member.role)
);
}
@@ -584,7 +668,9 @@ export default class Group extends mixins(GroupMixin) {
get ableToReport(): boolean {
return (
this.config && (this.currentActor.id !== undefined || this.config.anonymous.reports.allowed)
this.config &&
(this.currentActor.id !== undefined ||
this.config.anonymous.reports.allowed)
);
}
}
@@ -725,7 +811,8 @@ div.container {
.media-content {
h2 {
color: #3c376e;
font-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial, serif;
font-family: "Liberation Sans", "Helvetica Neue", Roboto,
Helvetica, Arial, serif;
font-size: 1.5rem;
font-weight: 700;
}

97
js/src/views/Group/GroupMembers.vue
View File

@@ -31,9 +31,16 @@
</li>
</ul>
</nav>
<section class="container section" v-if="group && isCurrentActorAGroupAdmin">
<section
class="container section"
v-if="group && isCurrentActorAGroupAdmin"
>
<form @submit.prevent="inviteMember">
<b-field :label="$t('Invite a new member')" custom-class="add-relay" horizontal>
<b-field
:label="$t('Invite a new member')"
custom-class="add-relay"
horizontal
>
<b-field
grouped
expanded
@@ -42,10 +49,15 @@
:message="inviteError"
>
<p class="control">
<b-input v-model="newMemberUsername" :placeholder="$t('Ex: someone@mobilizon.org')" />
<b-input
v-model="newMemberUsername"
:placeholder="$t('Ex: someone@mobilizon.org')"
/>
</p>
<p class="control">
<b-button type="is-primary" native-type="submit">{{ $t("Invite member") }}</b-button>
<b-button type="is-primary" native-type="submit">{{
$t("Invite member")
}}</b-button>
</p>
</b-field>
</b-field>
@@ -97,15 +109,33 @@
@page-change="triggerLoadMoreMemberPageChange"
@sort="(field, order) => $emit('sort', field, order)"
>
<b-table-column field="actor.preferredUsername" :label="$t('Member')" v-slot="props">
<b-table-column
field="actor.preferredUsername"
:label="$t('Member')"
v-slot="props"
>
<article class="media">
<figure class="media-left image is-48x48" v-if="props.row.actor.avatar">
<img class="is-rounded" :src="props.row.actor.avatar.url" alt="" />
<figure
class="media-left image is-48x48"
v-if="props.row.actor.avatar"
>
<img
class="is-rounded"
:src="props.row.actor.avatar.url"
alt=""
/>
</figure>
<b-icon class="media-left" v-else size="is-large" icon="account-circle" />
<b-icon
class="media-left"
v-else
size="is-large"
icon="account-circle"
/>
<div class="media-content">
<div class="content">
<span v-if="props.row.actor.name">{{ props.row.actor.name }}</span
<span v-if="props.row.actor.name">{{
props.row.actor.name
}}</span
><br />
<span class="is-size-7 has-text-grey"
>@{{ usernameWithDomain(props.row.actor) }}</span
@@ -115,22 +145,37 @@
</article>
</b-table-column>
<b-table-column field="role" :label="$t('Role')" v-slot="props">
<b-tag type="is-primary" v-if="props.row.role === MemberRole.ADMINISTRATOR">
<b-tag
type="is-primary"
v-if="props.row.role === MemberRole.ADMINISTRATOR"
>
{{ $t("Administrator") }}
</b-tag>
<b-tag type="is-primary" v-else-if="props.row.role === MemberRole.MODERATOR">
<b-tag
type="is-primary"
v-else-if="props.row.role === MemberRole.MODERATOR"
>
{{ $t("Moderator") }}
</b-tag>
<b-tag v-else-if="props.row.role === MemberRole.MEMBER">
{{ $t("Member") }}
</b-tag>
<b-tag type="is-warning" v-else-if="props.row.role === MemberRole.NOT_APPROVED">
<b-tag
type="is-warning"
v-else-if="props.row.role === MemberRole.NOT_APPROVED"
>
{{ $t("Not approved") }}
</b-tag>
<b-tag type="is-danger" v-else-if="props.row.role === MemberRole.REJECTED">
<b-tag
type="is-danger"
v-else-if="props.row.role === MemberRole.REJECTED"
>
{{ $t("Rejected") }}
</b-tag>
<b-tag type="is-warning" v-else-if="props.row.role === MemberRole.INVITED">
<b-tag
type="is-warning"
v-else-if="props.row.role === MemberRole.INVITED"
>
{{ $t("Invited") }}
</b-tag>
</b-table-column>
@@ -144,13 +189,21 @@
<b-table-column field="actions" :label="$t('Actions')" v-slot="props">
<div class="buttons" v-if="props.row.actor.id !== currentActor.id">
<b-button
v-if="[MemberRole.MEMBER, MemberRole.MODERATOR].includes(props.row.role)"
v-if="
[MemberRole.MEMBER, MemberRole.MODERATOR].includes(
props.row.role
)
"
@click="promoteMember(props.row)"
icon-left="chevron-double-up"
>{{ $t("Promote") }}</b-button
>
<b-button
v-if="[MemberRole.ADMINISTRATOR, MemberRole.MODERATOR].includes(props.row.role)"
v-if="
[MemberRole.ADMINISTRATOR, MemberRole.MODERATOR].includes(
props.row.role
)
"
@click="demoteMember(props.row)"
icon-left="chevron-double-down"
>{{ $t("Demote") }}</b-button
@@ -187,7 +240,12 @@ import { FETCH_GROUP } from "@/graphql/group";
import { MemberRole } from "@/types/enums";
import { IMember } from "@/types/actor/member.model";
import RouteName from "../../router/name";
import { INVITE_MEMBER, GROUP_MEMBERS, REMOVE_MEMBER, UPDATE_MEMBER } from "../../graphql/member";
import {
INVITE_MEMBER,
GROUP_MEMBERS,
REMOVE_MEMBER,
UPDATE_MEMBER,
} from "../../graphql/member";
import { usernameWithDomain } from "../../types/actor";
@Component({
@@ -380,7 +438,10 @@ export default class GroupMembers extends mixins(GroupMixin) {
role,
},
refetchQueries: [
{ query: FETCH_GROUP, variables: { name: this.$route.params.preferredUsername } },
{
query: FETCH_GROUP,
variables: { name: this.$route.params.preferredUsername },
},
],
});
let successMessage;

19
js/src/views/Group/GroupSettings.vue
View File

@@ -31,7 +31,10 @@
</li>
</ul>
</nav>
<section class="container section" v-if="group && isCurrentActorAGroupAdmin">
<section
class="container section"
v-if="group && isCurrentActorAGroupAdmin"
>
<form @submit.prevent="updateGroup">
<b-field :label="$t('Group name')">
<b-input v-model="group.name" />
@@ -104,7 +107,11 @@
<p class="label">{{ $t("New members") }}</p>
<div class="field">
<b-radio v-model="group.openness" name="groupOpenness" :native-value="Openness.OPEN">
<b-radio
v-model="group.openness"
name="groupOpenness"
:native-value="Openness.OPEN"
>
{{ $t("Anyone can join freely") }}<br />
<small>{{
$t(
@@ -134,8 +141,12 @@
/>
<div class="buttons">
<b-button native-type="submit" type="is-primary">{{ $t("Update group") }}</b-button>
<b-button @click="confirmDeleteGroup" type="is-danger">{{ $t("Delete group") }}</b-button>
<b-button native-type="submit" type="is-primary">{{
$t("Update group")
}}</b-button>
<b-button @click="confirmDeleteGroup" type="is-danger">{{
$t("Delete group")
}}</b-button>
</div>
</form>
</section>

19
js/src/views/Group/MyGroups.vue
View File

@@ -9,9 +9,11 @@
}}
</p>
<div class="buttons">
<router-link class="button is-primary" :to="{ name: RouteName.CREATE_GROUP }">{{
$t("Create group")
}}</router-link>
<router-link
class="button is-primary"
:to="{ name: RouteName.CREATE_GROUP }"
>{{ $t("Create group") }}</router-link
>
</div>
<b-loading :active.sync="$apollo.loading"></b-loading>
<invitations
@@ -38,7 +40,10 @@
>
</b-pagination>
</section>
<b-message v-if="$apollo.loading === false && memberships.length === 0" type="is-danger">
<b-message
v-if="$apollo.loading === false && memberships.length === 0"
type="is-danger"
>
{{ $t("No groups found") }}
</b-message>
</section>
@@ -102,7 +107,8 @@ export default class MyGroups extends Vue {
rejectInvitation({ id: memberId }: { id: string }): void {
const index = this.membershipsPages.elements.findIndex(
(membership) => membership.role === MemberRole.INVITED && membership.id === memberId
(membership) =>
membership.role === MemberRole.INVITED && membership.id === memberId
);
if (index > -1) {
this.membershipsPages.elements.splice(index, 1);
@@ -139,7 +145,8 @@ export default class MyGroups extends Vue {
get memberships(): IMember[] {
if (!this.membershipsPages) return [];
return this.membershipsPages.elements.filter(
(member: IMember) => ![MemberRole.INVITED, MemberRole.REJECTED].includes(member.role)
(member: IMember) =>
![MemberRole.INVITED, MemberRole.REJECTED].includes(member.role)
);
}
}

5
js/src/views/Group/Settings.vue
View File

@@ -4,7 +4,10 @@
<div class="columns">
<aside class="column is-one-quarter-desktop">
<ul>
<SettingMenuSection :title="$t('Settings')" :to="{ name: RouteName.GROUP_SETTINGS }">
<SettingMenuSection
:title="$t('Settings')"
:to="{ name: RouteName.GROUP_SETTINGS }"
>
<SettingMenuItem
:title="this.$t('Public')"
:to="{ name: RouteName.GROUP_PUBLIC_SETTINGS }"