pitchum/debianize-mobilizon
pitchum/debianize-mobilizon
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'fix-settings-menu' into 'master'

Browse Source 
Fix settings menu

See merge request framasoft/mobilizon!494
This commit is contained in:
Thomas Citharel 2020-06-25 12:51:09 +02:00
commit 97c153ada3
33 changed files with 2911 additions and 2830 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -39,6 +39,7 @@ lint:
- cd js - cd js
- yarn install - yarn install
#- yarn run lint || export EXITVALUE=1 #- yarn run lint || export EXITVALUE=1
- yarn run prettier -c .
- yarn run build - yarn run build
- cd ../ - cd ../
- exit $EXITVALUE - exit $EXITVALUE

12
js/.eslintrc.js
View File

@ -50,10 +50,12 @@ module.exports = {
ignorePatterns: ["src/typings/*.d.ts", "vue.config.js"], ignorePatterns: ["src/typings/*.d.ts", "vue.config.js"],
overrides: [{ overrides: [
files: ["**/__tests__/*.{j,t}s?(x)", "**/tests/unit/**/*.spec.{j,t}s?(x)"], {
env: { files: ["**/__tests__/*.{j,t}s?(x)", "**/tests/unit/**/*.spec.{j,t}s?(x)"],
mocha: true, env: {
mocha: true,
},
}, },
}], ],
}; };

2
js/cypress.json
View File

@ -4,4 +4,4 @@
"baseUrl": "http://localhost:4000", "baseUrl": "http://localhost:4000",
"viewportWidth": 1920, "viewportWidth": 1920,
"viewportHeight": 1080 "viewportHeight": 1080
} }

38
js/public/index.html
View File

@ -1,22 +1,22 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="<%= BASE_URL %>favicon.ico" />
<meta name="server-injected-data" />
</head>
<head> <body>
<meta charset="utf-8" /> <noscript>
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <strong
<meta name="viewport" content="width=device-width,initial-scale=1.0" /> >We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work
<link rel="icon" href="<%= BASE_URL %>favicon.ico" /> properly without JavaScript enabled. Please enable it to
<meta name="server-injected-data" /> continue.</strong
</head> >
</noscript>
<body> <div id="app"></div>
<noscript> <!-- built files will be auto injected -->
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work </body>
properly without JavaScript enabled. Please enable it to </html>
continue.</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>

8
js/src/common.scss
View File

@ -1,6 +1,6 @@
a { a {
text-decoration: underline; text-decoration: underline;
text-decoration-color: #ED8D07; text-decoration-color: #ed8d07;
text-decoration-thickness: 2px; text-decoration-thickness: 2px;
&.navbar-item, &.navbar-item,
@ -17,6 +17,10 @@ a {
} }
} }
nav.breadcrumb ul li a {
text-decoration: none;
}
input.input { input.input {
border-color: $input-border-color !important; border-color: $input-border-color !important;
} }
@ -49,4 +53,4 @@ $color-black: #000;
.mention .mention { .mention .mention {
background: initial; background: initial;
margin-right: 0; margin-right: 0;
} }

19
js/src/components/Settings/SettingMenuItem.vue
View File

@ -1,24 +1,25 @@
<template> <template>
<li class="setting-menu-item" :class="{ active: isActive }"> <li class="setting-menu-item" :class="{ active: isActive }">
<router-link v-if="menuItem.to" :to="menuItem.to"> <router-link v-if="to" :to="to">
<span>{{ menuItem.title }}</span> <span>{{ title }}</span>
</router-link> </router-link>
<span v-else>{{ menuItem.title }}</span> <span v-else>{{ title }}</span>
</li> </li>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Prop, Vue } from "vue-property-decorator"; import { Component, Prop, Vue } from "vue-property-decorator";
import { ISettingMenuSection } from "@/types/setting-menu.model"; import { Route } from "vue-router";
@Component @Component
export default class SettingMenuItem extends Vue { export default class SettingMenuItem extends Vue {
@Prop({ required: true, type: Object }) menuItem!: ISettingMenuSection; @Prop({ required: false, type: String }) title!: string;
@Prop({ required: true, type: Object }) to!: Route;
get isActive() { get isActive() {
if (!this.menuItem.to) return false; if (!this.to) return false;
if (this.menuItem.to.name === this.$route.name) { if (this.to.name === this.$route.name) {
if (this.menuItem.to.params) { if (this.to.params) {
return this.menuItem.to.params.identityName === this.$route.params.identityName; return this.to.params.identityName === this.$route.params.identityName;
} }
return true; return true;
} }

28
js/src/components/Settings/SettingMenuSection.vue
View File

@ -1,27 +1,35 @@
<template> <template>
<li :class="{ active: sectionActive }"> <li :class="{ active: sectionActive }">
<router-link v-if="menuSection.to" :to="menuSection.to">{{ menuSection.title }}</router-link> <router-link v-if="to" :to="to">{{ title }}</router-link>
<b v-else>{{ menuSection.title }}</b> <b v-else>{{ title }}</b>
<ul> <ul>
<setting-menu-item :menu-item="item" v-for="item in menuSection.items" :key="item.title" /> <slot></slot>
</ul> </ul>
</li> </li>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Prop, Vue } from "vue-property-decorator"; import { Component, Prop, Vue } from "vue-property-decorator";
import { ISettingMenuSection } from "@/types/setting-menu.model";
import SettingMenuItem from "@/components/Settings/SettingMenuItem.vue"; import SettingMenuItem from "@/components/Settings/SettingMenuItem.vue";
import { Route } from "vue-router";
@Component({ @Component({
components: { SettingMenuItem }, components: { SettingMenuItem },
}) })
export default class SettingMenuSection extends Vue { export default class SettingMenuSection extends Vue {
@Prop({ required: true, type: Object }) menuSection!: ISettingMenuSection; @Prop({ required: false, type: String }) title!: string;
@Prop({ required: true, type: Object }) to!: Route;
get sectionActive(): boolean | undefined { get sectionActive() {
return ( if (this.$slots.default) {
this.menuSection.items && return this.$slots.default.some(
this.menuSection.items.some(({ to }) => to && to.name === this.$route.name) ({
); componentOptions: {
// @ts-ignore
propsData: { to },
},
}) => to && to.name === this.$route.name
);
}
return false;
} }
} }
</script> </script>

83
js/src/components/Settings/SettingsMenu.vue
View File

@ -1,27 +1,88 @@
<template> <template>
<aside> <aside>
<ul> <ul>
<SettingMenuSection :title="$t('Account')" :to="{ name: RouteName.ACCOUNT_SETTINGS }">
<SettingMenuItem
:title="this.$t('General')"
:to="{ name: RouteName.ACCOUNT_SETTINGS_GENERAL }"
/>
<SettingMenuItem :title="$t('Preferences')" :to="{ name: RouteName.PREFERENCES }" />
<SettingMenuItem
:title="this.$t('Email notifications')"
:to="{ name: RouteName.NOTIFICATIONS }"
/>
</SettingMenuSection>
<SettingMenuSection :title="$t('Profiles')" :to="{ name: RouteName.IDENTITIES }">
<SettingMenuItem
v-for="profile in identities"
:key="profile.preferredUsername"
:title="profile.preferredUsername"
:to="{
name: RouteName.UPDATE_IDENTITY,
params: { identityName: profile.preferredUsername },
}"
/>
<SettingMenuItem :title="$t('New profile')" :to="{ name: RouteName.CREATE_IDENTITY }" />
</SettingMenuSection>
<SettingMenuSection <SettingMenuSection
v-for="section in menuValue" v-if="
:key="section.title" [ICurrentUserRole.MODERATOR, ICurrentUserRole.ADMINISTRATOR].includes(
:menu-section="section" this.currentUser.role
/> )
"
:title="$t('Moderation')"
:to="{ name: RouteName.MODERATION }"
>
<SettingMenuItem :title="$t('Reports')" :to="{ name: RouteName.REPORTS }" />
<SettingMenuItem :title="$t('Moderation log')" :to="{ name: RouteName.REPORT_LOGS }" />
<SettingMenuItem :title="$t('Users')" :to="{ name: RouteName.USERS }" />
<SettingMenuItem :title="$t('Profiles')" :to="{ name: RouteName.PROFILES }" />
</SettingMenuSection>
<SettingMenuSection
v-if="this.currentUser.role == ICurrentUserRole.ADMINISTRATOR"
:title="$t('Admin')"
:to="{ name: RouteName.ADMIN }"
>
<SettingMenuItem :title="$t('Dashboard')" :to="{ name: RouteName.ADMIN_DASHBOARD }" />
<SettingMenuItem
:title="$t('Instance settings')"
:to="{ name: RouteName.ADMIN_SETTINGS }"
/>
<SettingMenuItem :title="$t('Federation')" :to="{ name: RouteName.RELAYS }" />
</SettingMenuSection>
</ul> </ul>
</aside> </aside>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Prop, Vue } from "vue-property-decorator"; import { Component, Prop, Vue } from "vue-property-decorator";
import SettingMenuSection from "@/components/Settings/SettingMenuSection.vue"; import SettingMenuSection from "./SettingMenuSection.vue";
import { ISettingMenuSection } from "@/types/setting-menu.model"; import SettingMenuItem from "./SettingMenuItem.vue";
import { IDENTITIES } from "../../graphql/actor";
import { IPerson, Person } from "../../types/actor";
import { CURRENT_USER_CLIENT } from "../../graphql/user";
import { ICurrentUser, ICurrentUserRole } from "../../types/current-user.model";
import RouteName from "../../router/name";
@Component({ @Component({
components: { SettingMenuSection }, components: { SettingMenuSection, SettingMenuItem },
apollo: {
identities: {
query: IDENTITIES,
update: (data) => data.identities.map((identity: IPerson) => new Person(identity)),
},
currentUser: CURRENT_USER_CLIENT,
},
}) })
export default class SettingsMenu extends Vue { export default class SettingsMenu extends Vue {
@Prop({ required: true, type: Array }) menu!: ISettingMenuSection[]; profiles = [];
get menuValue() { currentUser!: ICurrentUser;
return this.menu;
} identities!: IPerson[];
ICurrentUserRole = ICurrentUserRole;
RouteName = RouteName;
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

1
js/src/graphql/user.ts
View File

@ -106,6 +106,7 @@ export const USER_SETTINGS_FRAGMENT = gql`
export const USER_SETTINGS = gql` export const USER_SETTINGS = gql`
query UserSetting { query UserSetting {
loggedUser { loggedUser {
id
locale locale
settings { settings {
...UserSettingFragment ...UserSettingFragment

3
js/src/i18n/en_US.json
View File

@ -695,5 +695,6 @@
"contact uninformed": "contact uninformed", "contact uninformed": "contact uninformed",
"Can be an email or a link, or just plain text.": "Can be an email or a link, or just plain text.", "Can be an email or a link, or just plain text.": "Can be an email or a link, or just plain text.",
"No profiles found": "No profiles found", "No profiles found": "No profiles found",
"URL copied to clipboard": "URL copied to clipboard" "URL copied to clipboard": "URL copied to clipboard",
"Report #{reportNumber}": "Report #{reportNumber}"
} }

1452
js/src/i18n/es.json
View File

File diff suppressed because it is too large Load Diff

1348
js/src/i18n/fi.json
View File

File diff suppressed because it is too large Load Diff

3
js/src/i18n/fr_FR.json
View File

@ -695,5 +695,6 @@
"A place for your code of conduct, rules or guidelines. You can use HTML tags.": "Une section appropriée pour votre code de conduite, règles ou lignes directrices. Vous pouvez utiliser des balises HTML.", "A place for your code of conduct, rules or guidelines. You can use HTML tags.": "Une section appropriée pour votre code de conduite, règles ou lignes directrices. Vous pouvez utiliser des balises HTML.",
"contact uninformed": "contact non renseigné", "contact uninformed": "contact non renseigné",
"Can be an email or a link, or just plain text.": "Peut être une adresse email ou bien un lien, ou alors du simple texte brut.", "Can be an email or a link, or just plain text.": "Peut être une adresse email ou bien un lien, ou alors du simple texte brut.",
"URL copied to clipboard": "URL copiée dans le presse-papiers" "URL copied to clipboard": "URL copiée dans le presse-papiers",
"Report #{reportNumber}": "Signalement #{reportNumber}"
} }

8
js/src/types/setting-menu.model.ts
View File

@ -1,8 +0,0 @@
import { Route } from "vue-router";
export interface ISettingMenuSection {
title: string;
to: Route;
items?: ISettingMenuSection[];
parents?: ISettingMenuSection[];
}

71
js/src/variables.scss
View File

@ -7,19 +7,19 @@ $violet: #424056;
/** /**
* Text body, paragraphs * Text body, paragraphs
*/ */
$violet-1: #3A384C; $violet-1: #3a384c;
$violet-2: #474467; $violet-2: #474467;
/** /**
* Titles, dark borders, buttons * Titles, dark borders, buttons
*/ */
$violet-3: #3C376E; $violet-3: #3c376e;
/** /**
* Borders * Borders
*/ */
$borders: #D7D6DE; $borders: #d7d6de;
$backgrounds: #ECEBF2; $backgrounds: #ecebf2;
/** /**
* Text * Text
@ -29,15 +29,15 @@ $purple-1: #757199;
/** /**
* Background * Background
*/ */
$purple-2: #CDCAEA; $purple-2: #cdcaea;
$purple-3: #E6E4F4; $purple-3: #e6e4f4;
$orange-2: #ED8D07; $orange-2: #ed8d07;
$orange-3: #D35204; $orange-3: #d35204;
$yellow-1: #FFD599; $yellow-1: #ffd599;
$yellow-2: #FFF1DE; $yellow-2: #fff1de;
$yellow-3: #FBD5CB; $yellow-3: #fbd5cb;
$yellow-4: #f7ba30; $yellow-4: #f7ba30;
$primary: $bleuvert; $primary: $bleuvert;
@ -47,36 +47,45 @@ $secondary-invert: findColorInvert($secondary);
$background-color: $violet-2; $background-color: $violet-2;
$success: #0D8758; $success: #0d8758;
$success-invert: findColorInvert($success); $success-invert: findColorInvert($success);
$info: #36bcd4; $info: #36bcd4;
$info-invert: findColorInvert($info); $info-invert: findColorInvert($info);
$danger: #FF2E54; $danger: #ff2e54;
$danger-invert: findColorInvert($danger); $danger-invert: findColorInvert($danger);
$link: $primary; $link: $primary;
$link-invert: $primary-invert; $link-invert: $primary-invert;
$text: $violet-1; $text: $violet-1;
$colors: map-merge($colors, $colors: map-merge(
("primary": ($primary, $colors,
(
"primary": (
$primary,
$primary-invert, $primary-invert,
), ),
"secondary": ($secondary, "secondary": (
$secondary,
$secondary-invert, $secondary-invert,
), ),
"success": ($success, "success": (
$success,
$success-invert, $success-invert,
), ),
"info": ($info, "info": (
$info,
$info-invert, $info-invert,
), ),
"danger": ($danger, "danger": (
$danger,
$danger-invert, $danger-invert,
), ),
"link": ($link, "link": (
$link,
$link-invert, $link-invert,
), ),
)); )
);
// Navbar // Navbar
$navbar-background-color: $secondary; $navbar-background-color: $secondary;
@ -91,29 +100,21 @@ $body-background-color: #efeef4;
$fullhd-enabled: false; $fullhd-enabled: false;
$hero-body-padding-medium: 6rem 1.5rem; $hero-body-padding-medium: 6rem 1.5rem;
main>.container { main > .container {
background: $body-background-color; background: $body-background-color;
} }
$title-color: #3c376e; $title-color: #3c376e;
$title-family: "Liberation Sans", $title-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
"Helvetica Neue", serif;
Roboto,
Helvetica,
Arial,
serif;
$title-weight: 700; $title-weight: 700;
$title-size: 40px; $title-size: 40px;
$title-sub-size: 45px; $title-sub-size: 45px;
$title-sup-size: 30px; $title-sup-size: 30px;
$subtitle-color: #3a384c; $subtitle-color: #3a384c;
$subtitle-family: "Liberation Sans", $subtitle-family: "Liberation Sans", "Helvetica Neue", Roboto, Helvetica, Arial,
"Helvetica Neue", serif;
Roboto,
Helvetica,
Arial,
serif;
$subtitle-weight: 400; $subtitle-weight: 400;
$subtitle-size: 32px; $subtitle-size: 32px;
$subtitle-sub-size: 30px; $subtitle-sub-size: 30px;
@ -133,4 +134,4 @@ $subtitle-sup-size: 15px;
$input-border-color: #dbdbdb; $input-border-color: #dbdbdb;
$breadcrumb-item-color: $primary; $breadcrumb-item-color: $primary;
$checkbox-background-color: #fff; $checkbox-background-color: #fff;
$title-color: $violet-3; $title-color: $violet-3;

129
js/src/views/Account/children/EditIdentity.vue
View File

@ -1,66 +1,91 @@
<template> <template>
<div class="root" v-if="identity"> <div>
<h1 class="title"> <nav class="breadcrumb" aria-label="breadcrumbs">
<span v-if="isUpdate">{{ identity.displayName() }}</span> <ul>
<span v-else>{{ $t("I create an identity") }}</span> <li>
</h1> <router-link :to="{ name: RouteName.IDENTITIES }">{{ $t("Profiles") }}</router-link>
</li>
<li class="is-active" v-if="isUpdate && identity">
<router-link
:to="{
name: RouteName.UPDATE_IDENTITY,
params: { identityName: identity.preferredUsername },
}"
>{{ identity.name }}</router-link
>
</li>
<li class="is-active" v-else>
<router-link :to="{ name: RouteName.CREATE_IDENTITY }">{{
$t("New profile")
}}</router-link>
</li>
</ul>
</nav>
<div class="root" v-if="identity">
<h1 class="title">
<span v-if="isUpdate">{{ identity.displayName() }}</span>
<span v-else>{{ $t("I create an identity") }}</span>
</h1>
<picture-upload v-model="avatarFile" class="picture-upload" /> <picture-upload v-model="avatarFile" class="picture-upload" />
<b-field horizontal :label="$t('Display name')"> <b-field horizontal :label="$t('Display name')">
<b-input
aria-required="true"
required
v-model="identity.name"
@input="autoUpdateUsername($event)"
/>
</b-field>
<b-field
horizontal
custom-class="username-field"
expanded
:label="$t('Username')"
:message="message"
>
<b-field expanded>
<b-input <b-input
aria-required="true" aria-required="true"
required required
v-model="identity.preferredUsername" v-model="identity.name"
:disabled="isUpdate" @input="autoUpdateUsername($event)"
:use-html5-validation="!isUpdate"
pattern="[a-z0-9_]+"
/> />
<p class="control">
<span class="button is-static">@{{ getInstanceHost }}</span>
</p>
</b-field> </b-field>
</b-field>
<b-field horizontal :label="$t('Description')"> <b-field
<b-input type="textarea" aria-required="false" v-model="identity.summary" /> horizontal
</b-field> custom-class="username-field"
expanded
:label="$t('Username')"
:message="message"
>
<b-field expanded>
<b-input
aria-required="true"
required
v-model="identity.preferredUsername"
:disabled="isUpdate"
:use-html5-validation="!isUpdate"
pattern="[a-z0-9_]+"
/>
<b-notification <p class="control">
type="is-danger" <span class="button is-static">@{{ getInstanceHost }}</span>
has-icon </p>
aria-close-label="Close notification" </b-field>
role="alert" </b-field>
:key="error"
v-for="error in errors"
>{{ error }}</b-notification
>
<b-field class="submit"> <b-field horizontal :label="$t('Description')">
<div class="control"> <b-input type="textarea" aria-required="false" v-model="identity.summary" />
<button type="button" class="button is-primary" @click="submit()">{{ $t("Save") }}</button> </b-field>
<b-notification
type="is-danger"
has-icon
aria-close-label="Close notification"
role="alert"
:key="error"
v-for="error in errors"
>{{ error }}</b-notification
>
<b-field class="submit">
<div class="control">
<button type="button" class="button is-primary" @click="submit()">
{{ $t("Save") }}
</button>
</div>
</b-field>
<div class="delete-identity" v-if="isUpdate">
<span @click="openDeleteIdentityConfirmation()">{{ $t("Delete this identity") }}</span>
</div> </div>
</b-field>
<div class="delete-identity" v-if="isUpdate">
<span @click="openDeleteIdentityConfirmation()">{{ $t("Delete this identity") }}</span>
</div> </div>
</div> </div>
</template> </template>
@ -148,6 +173,8 @@ export default class EditIdentity extends mixins(identityEditionMixin) {
private currentActor: IPerson | null = null; private currentActor: IPerson | null = null;
RouteName = RouteName;
get message() { get message() {
if (this.isUpdate) return null; if (this.isUpdate) return null;
return this.$t("Only alphanumeric characters and underscores are supported."); return this.$t("Only alphanumeric characters and underscores are supported.");

102
js/src/views/Admin/Dashboard.vue
View File

@ -1,53 +1,65 @@
<template> <template>
<section> <div>
<h1 class="title">{{ $t("Administration") }}</h1> <nav class="breadcrumb" aria-label="breadcrumbs">
<div class="tile is-ancestor" v-if="dashboard"> <ul>
<div class="tile is-vertical"> <li>
<div class="tile"> <router-link :to="{ name: RouteName.ADMIN }">{{ $t("Admin") }}</router-link>
<div class="tile is-parent is-vertical is-6"> </li>
<article class="tile is-child box"> <li class="is-active">
<p class="dashboard-number">{{ dashboard.numberOfEvents }}</p> <router-link :to="{ name: RouteName.ADMIN_DASHBOARD }">{{ $t("Dashboard") }}</router-link>
<p>{{ $t("Published events") }}</p> </li>
</article> </ul>
<article class="tile is-child box"> </nav>
<p class="dashboard-number">{{ dashboard.numberOfComments }}</p> <section>
<p>{{ $t("Comments") }}</p> <h1 class="title">{{ $t("Administration") }}</h1>
</article> <div class="tile is-ancestor" v-if="dashboard">
<div class="tile is-vertical">
<div class="tile">
<div class="tile is-parent is-vertical is-6">
<article class="tile is-child box">
<p class="dashboard-number">{{ dashboard.numberOfEvents }}</p>
<p>{{ $t("Published events") }}</p>
</article>
<article class="tile is-child box">
<p class="dashboard-number">{{ dashboard.numberOfComments }}</p>
<p>{{ $t("Comments") }}</p>
</article>
</div>
<div class="tile is-parent is-vertical">
<article class="tile is-child box">
<router-link :to="{ name: RouteName.USERS }">
<p class="dashboard-number">{{ dashboard.numberOfUsers }}</p>
<p>{{ $t("Users") }}</p>
</router-link>
</article>
<article class="tile is-child box">
<router-link :to="{ name: RouteName.REPORTS }">
<p class="dashboard-number">{{ dashboard.numberOfReports }}</p>
<p>{{ $t("Opened reports") }}</p>
</router-link>
</article>
</div>
</div> </div>
<div class="tile is-parent is-vertical"> <div class="tile is-parent" v-if="dashboard.lastPublicEventPublished">
<article class="tile is-child box"> <router-link
<router-link :to="{ name: RouteName.USERS }"> :to="{
<p class="dashboard-number">{{ dashboard.numberOfUsers }}</p> name: RouteName.EVENT,
<p>{{ $t("Users") }}</p> params: { uuid: dashboard.lastPublicEventPublished.uuid },
</router-link> }"
</article> >
<article class="tile is-child box"> <article class="tile is-child box">
<router-link :to="{ name: RouteName.REPORTS }"> <p class="dashboard-number">{{ $t("Last published event") }}</p>
<p class="dashboard-number">{{ dashboard.numberOfReports }}</p> <p class="subtitle">{{ dashboard.lastPublicEventPublished.title }}</p>
<p>{{ $t("Opened reports") }}</p> <figure class="image is-4by3" v-if="dashboard.lastPublicEventPublished.picture">
</router-link> <img :src="dashboard.lastPublicEventPublished.picture.url" />
</article> </figure>
</article>
</router-link>
</div> </div>
</div> </div>
<div class="tile is-parent" v-if="dashboard.lastPublicEventPublished">
<router-link
:to="{
name: RouteName.EVENT,
params: { uuid: dashboard.lastPublicEventPublished.uuid },
}"
>
<article class="tile is-child box">
<p class="dashboard-number">{{ $t("Last published event") }}</p>
<p class="subtitle">{{ dashboard.lastPublicEventPublished.title }}</p>
<figure class="image is-4by3" v-if="dashboard.lastPublicEventPublished.picture">
<img :src="dashboard.lastPublicEventPublished.picture.url" />
</figure>
</article>
</router-link>
</div>
</div> </div>
</div> </section>
</section> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Vue } from "vue-property-decorator"; import { Component, Vue } from "vue-property-decorator";

88
js/src/views/Admin/Follows.vue
View File

@ -1,40 +1,60 @@
<template> <template>
<section> <div>
<h1 class="title">{{ $t("Instances") }}</h1> <nav class="breadcrumb" aria-label="breadcrumbs">
<div class="tabs is-boxed">
<ul> <ul>
<router-link <li>
tag="li" <router-link :to="{ name: RouteName.ADMIN }">{{ $t("Admin") }}</router-link>
active-class="is-active" </li>
:to="{ name: RouteName.RELAY_FOLLOWINGS }" <li>
exact <router-link :to="{ name: RouteName.RELAYS }">{{ $t("Federation") }}</router-link>
> </li>
<a> <li class="is-active" v-if="$route.name == RouteName.RELAY_FOLLOWINGS">
<b-icon icon="inbox-arrow-down"></b-icon> <router-link :to="{ name: RouteName.RELAY_FOLLOWINGS }">{{
<span> $t("Followings")
{{ $t("Followings") }} }}</router-link>
<b-tag rounded>{{ relayFollowings.total }}</b-tag> </li>
</span> <li class="is-active" v-if="$route.name == RouteName.RELAY_FOLLOWERS">
</a> <router-link :to="{ name: RouteName.RELAY_FOLLOWERS }">{{ $t("Followers") }}</router-link>
</router-link> </li>
<router-link
tag="li"
active-class="is-active"
:to="{ name: RouteName.RELAY_FOLLOWERS }"
exact
>
<a>
<b-icon icon="inbox-arrow-up"></b-icon>
<span>
{{ $t("Followers") }}
<b-tag rounded>{{ relayFollowers.total }}</b-tag>
</span>
</a>
</router-link>
</ul> </ul>
</div> </nav>
<router-view></router-view> <section>
</section> <h1 class="title">{{ $t("Instances") }}</h1>
<div class="tabs is-boxed">
<ul>
<router-link
tag="li"
active-class="is-active"
:to="{ name: RouteName.RELAY_FOLLOWINGS }"
exact
>
<a>
<b-icon icon="inbox-arrow-down"></b-icon>
<span>
{{ $t("Followings") }}
<b-tag rounded>{{ relayFollowings.total }}</b-tag>
</span>
</a>
</router-link>
<router-link
tag="li"
active-class="is-active"
:to="{ name: RouteName.RELAY_FOLLOWERS }"
exact
>
<a>
<b-icon icon="inbox-arrow-up"></b-icon>
<span>
{{ $t("Followers") }}
<b-tag rounded>{{ relayFollowers.total }}</b-tag>
</span>
</a>
</router-link>
</ul>
</div>
<router-view></router-view>
</section>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">

138
js/src/views/Admin/Profiles.vue
View File

@ -1,69 +1,81 @@
<template> <template>
<div v-if="persons"> <div>
<b-switch v-model="local">{{ $t("Local") }}</b-switch> <nav class="breadcrumb" aria-label="breadcrumbs">
<b-switch v-model="suspended">{{ $t("Suspended") }}</b-switch> <ul>
<b-table <li>
:data="persons.elements" <router-link :to="{ name: RouteName.MODERATION }">{{ $t("Moderation") }}</router-link>
:loading="$apollo.queries.persons.loading" </li>
paginated <li class="is-active">
backend-pagination <router-link :to="{ name: RouteName.PROFILES }">{{ $t("Profiles") }}</router-link>
backend-filtering </li>
:total="persons.total" </ul>
:per-page="PROFILES_PER_PAGE" </nav>
@page-change="onPageChange" <div v-if="persons">
@filters-change="onFiltersChange" <b-switch v-model="local">{{ $t("Local") }}</b-switch>
> <b-switch v-model="suspended">{{ $t("Suspended") }}</b-switch>
<template slot-scope="props"> <b-table
<b-table-column field="preferredUsername" :label="$t('Username')" searchable> :data="persons.elements"
<template slot="searchable" slot-scope="props"> :loading="$apollo.queries.persons.loading"
<b-input paginated
v-model="props.filters.preferredUsername" backend-pagination
placeholder="Search..." backend-filtering
icon="magnify" :total="persons.total"
size="is-small" :per-page="PROFILES_PER_PAGE"
/> @page-change="onPageChange"
</template> @filters-change="onFiltersChange"
<router-link >
class="profile" <template slot-scope="props">
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: props.row.id } }" <b-table-column field="preferredUsername" :label="$t('Username')" searchable>
> <template slot="searchable" slot-scope="props">
<article class="media"> <b-input
<figure class="media-left" v-if="props.row.avatar"> v-model="props.filters.preferredUsername"
<p class="image is-48x48"> placeholder="Search..."
<img :src="props.row.avatar.url" /> icon="magnify"
</p> size="is-small"
</figure> />
<div class="media-content"> </template>
<div class="content"> <router-link
<strong v-if="props.row.name">{{ props.row.name }}</strong class="profile"
><br v-if="props.row.name" /> :to="{ name: RouteName.ADMIN_PROFILE, params: { id: props.row.id } }"
<small>@{{ props.row.preferredUsername }}</small> >
<article class="media">
<figure class="media-left" v-if="props.row.avatar">
<p class="image is-48x48">
<img :src="props.row.avatar.url" />
</p>
</figure>
<div class="media-content">
<div class="content">
<strong v-if="props.row.name">{{ props.row.name }}</strong
><br v-if="props.row.name" />
<small>@{{ props.row.preferredUsername }}</small>
</div>
</div> </div>
</div> </article>
</article> </router-link>
</router-link> </b-table-column>
</b-table-column>
<b-table-column field="domain" :label="$t('Domain')" searchable> <b-table-column field="domain" :label="$t('Domain')" searchable>
<template slot="searchable" slot-scope="props"> <template slot="searchable" slot-scope="props">
<b-input <b-input
v-model="props.filters.domain" v-model="props.filters.domain"
placeholder="Search..." placeholder="Search..."
icon="magnify" icon="magnify"
size="is-small" size="is-small"
/> />
</template> </template>
{{ props.row.domain }} {{ props.row.domain }}
</b-table-column> </b-table-column>
</template> </template>
<template slot="empty"> <template slot="empty">
<section class="section"> <section class="section">
<div class="content has-text-grey has-text-centered"> <div class="content has-text-grey has-text-centered">
<p>{{ $t("No profile matches the filters") }}</p> <p>{{ $t("No profile matches the filters") }}</p>
</div> </div>
</section> </section>
</template> </template>
</b-table> </b-table>
</div>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">

488
js/src/views/Admin/Settings.vue
View File

@ -1,241 +1,259 @@
<template> <template>
<section v-if="adminSettings"> <div>
<form @submit.prevent="updateSettings"> <nav class="breadcrumb" aria-label="breadcrumbs">
<b-field :label="$t('Instance Name')"> <ul>
<b-input v-model="adminSettings.instanceName" /> <li>
</b-field> <router-link :to="{ name: RouteName.ADMIN }">{{ $t("Admin") }}</router-link>
<div class="field"> </li>
<label class="label has-help">{{ $t("Instance Short Description") }}</label> <li class="is-active">
<small> <router-link :to="{ name: RouteName.ADMIN_SETTINGS }">{{
{{ $t("Instance settings")
$t( }}</router-link>
"Displayed on homepage and meta tags. Describe what Mobilizon is and what makes this instance special in a single paragraph." </li>
) </ul>
}} </nav>
</small> <section v-if="adminSettings">
<b-input type="textarea" v-model="adminSettings.instanceDescription" rows="2" /> <form @submit.prevent="updateSettings">
</div> <b-field :label="$t('Instance Name')">
<div class="field"> <b-input v-model="adminSettings.instanceName" />
<label class="label has-help">{{ $t("Contact") }}</label> </b-field>
<small> <div class="field">
{{ $t("Can be an email or a link, or just plain text.") }} <label class="label has-help">{{ $t("Instance Short Description") }}</label>
</small> <small>
<b-input v-model="adminSettings.contact" /> {{
</div> $t(
<b-field :label="$t('Allow registrations')"> "Displayed on homepage and meta tags. Describe what Mobilizon is and what makes this instance special in a single paragraph."
<b-switch v-model="adminSettings.registrationsOpen"> )
<p class="content" v-if="adminSettings.registrationsOpen"> }}
{{ $t("Registration is allowed, anyone can register.") }} </small>
</p> <b-input type="textarea" v-model="adminSettings.instanceDescription" rows="2" />
<p class="content" v-else>{{ $t("Registration is closed.") }}</p>
</b-switch>
</b-field>
<div class="field">
<label class="label has-help">{{ $t("Instance Long Description") }}</label>
<small>
{{
$t(
"A place to explain who you are and the things that set your instance apart. You can use HTML tags."
)
}}
</small>
<b-input type="textarea" v-model="adminSettings.instanceLongDescription" rows="4" />
</div>
<div class="field">
<label class="label has-help">{{ $t("Instance Rules") }}</label>
<small>
{{ $t("A place for your code of conduct, rules or guidelines. You can use HTML tags.") }}
</small>
<b-input type="textarea" v-model="adminSettings.instanceRules" />
</div>
<b-field :label="$t('Instance Terms Source')">
<div class="columns">
<div class="column is-one-third-desktop">
<b-field>
<b-radio
v-model="adminSettings.instanceTermsType"
name="instanceTermsType"
:native-value="InstanceTermsType.DEFAULT"
>{{ $t("Default Mobilizon terms") }}</b-radio
>
</b-field>
<b-field>
<b-radio
v-model="adminSettings.instanceTermsType"
name="instanceTermsType"
:native-value="InstanceTermsType.URL"
>{{ $t("Custom URL") }}</b-radio
>
</b-field>
<b-field>
<b-radio
v-model="adminSettings.instanceTermsType"
name="instanceTermsType"
:native-value="InstanceTermsType.CUSTOM"
>{{ $t("Custom text") }}</b-radio
>
</b-field>
</div>
<div class="column">
<div
class="notification"
v-if="adminSettings.instanceTermsType === InstanceTermsType.DEFAULT"
>
<b>{{ $t("Default") }}</b>
<i18n
tag="p"
class="content"
path="The {default_terms} will be used. They will be translated in the user's language."
>
<a
slot="default_terms"
href="https://mobilizon.org/terms"
target="_blank"
rel="noopener"
>{{ $t("default Mobilizon terms") }}</a
>
</i18n>
<b>{{
$t(
"NOTE! The default terms have not been checked over by a lawyer and thus are unlikely to provide full legal protection for all situations for an instance admin using them. They are also not specific to all countries and jurisdictions. If you are unsure, please check with a lawyer."
)
}}</b>
</div>
<div
class="notification"
v-if="adminSettings.instanceTermsType === InstanceTermsType.URL"
>
<b>{{ $t("URL") }}</b>
<p class="content">{{ $t("Set an URL to a page with your own terms.") }}</p>
</div>
<div
class="notification"
v-if="adminSettings.instanceTermsType === InstanceTermsType.CUSTOM"
>
<b>{{ $t("Custom") }}</b>
<i18n
tag="p"
class="content"
path="Enter your own terms. HTML tags allowed. The {mobilizon_terms} are provided as template."
>
<a
slot="mobilizon_terms"
href="https://mobilizon.org/terms"
target="_blank"
rel="noopener"
>
{{ $t("default Mobilizon terms") }}</a
>
</i18n>
</div>
</div>
</div> </div>
</b-field> <div class="field">
<b-field <label class="label has-help">{{ $t("Contact") }}</label>
:label="$t('Instance Terms URL')" <small>
v-if="adminSettings.instanceTermsType === InstanceTermsType.URL" {{ $t("Can be an email or a link, or just plain text.") }}
> </small>
<b-input type="URL" v-model="adminSettings.instanceTermsUrl" /> <b-input v-model="adminSettings.contact" />
</b-field>
<b-field
:label="$t('Instance Terms')"
v-if="adminSettings.instanceTermsType === InstanceTermsType.CUSTOM"
>
<b-input type="textarea" v-model="adminSettings.instancePrivacyPolicy" />
</b-field>
<b-field :label="$t('Instance Privacy Policy Source')">
<div class="columns">
<div class="column is-one-third-desktop">
<b-field>
<b-radio
v-model="adminSettings.instancePrivacyPolicyType"
name="instancePrivacyType"
:native-value="InstancePrivacyType.DEFAULT"
>{{ $t("Default Mobilizon privacy policy") }}</b-radio
>
</b-field>
<b-field>
<b-radio
v-model="adminSettings.instancePrivacyPolicyType"
name="instancePrivacyType"
:native-value="InstancePrivacyType.URL"
>{{ $t("Custom URL") }}</b-radio
>
</b-field>
<b-field>
<b-radio
v-model="adminSettings.instancePrivacyPolicyType"
name="instancePrivacyType"
:native-value="InstancePrivacyType.CUSTOM"
>{{ $t("Custom text") }}</b-radio
>
</b-field>
</div>
<div class="column">
<div
class="notification"
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.DEFAULT"
>
<b>{{ $t("Default") }}</b>
<i18n
tag="p"
class="content"
path="The {default_privacy_policy} will be used. They will be translated in the user's language."
>
<a
slot="default_privacy_policy"
href="https://mobilizon.org/terms"
target="_blank"
rel="noopener"
>{{ $t("default Mobilizon privacy policy") }}</a
>
</i18n>
</div>
<div
class="notification"
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.URL"
>
<b>{{ $t("URL") }}</b>
<p class="content">{{ $t("Set an URL to a page with your own privacy policy.") }}</p>
</div>
<div
class="notification"
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.CUSTOM"
>
<b>{{ $t("Custom") }}</b>
<i18n
tag="p"
class="content"
path="Enter your own privacy policy. HTML tags allowed. The {mobilizon_privacy_policy} is provided as template."
>
<a
slot="mobilizon_privacy_policy"
href="https://mobilizon.org/privacy"
target="_blank"
rel="noopener"
>
{{ $t("default Mobilizon privacy policy") }}</a
>
</i18n>
</div>
</div>
</div> </div>
</b-field> <b-field :label="$t('Allow registrations')">
<b-field <b-switch v-model="adminSettings.registrationsOpen">
:label="$t('Instance Privacy Policy URL')" <p class="content" v-if="adminSettings.registrationsOpen">
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.URL" {{ $t("Registration is allowed, anyone can register.") }}
> </p>
<b-input type="URL" v-model="adminSettings.instancePrivacyPolicyUrl" /> <p class="content" v-else>{{ $t("Registration is closed.") }}</p>
</b-field> </b-switch>
<b-field </b-field>
:label="$t('Instance Privacy Policy')" <div class="field">
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.CUSTOM" <label class="label has-help">{{ $t("Instance Long Description") }}</label>
> <small>
<b-input type="textarea" v-model="adminSettings.instancePrivacyPolicy" /> {{
</b-field> $t(
<b-button native-type="submit" type="is-primary">{{ $t("Save") }}</b-button> "A place to explain who you are and the things that set your instance apart. You can use HTML tags."
</form> )
</section> }}
</small>
<b-input type="textarea" v-model="adminSettings.instanceLongDescription" rows="4" />
</div>
<div class="field">
<label class="label has-help">{{ $t("Instance Rules") }}</label>
<small>
{{
$t("A place for your code of conduct, rules or guidelines. You can use HTML tags.")
}}
</small>
<b-input type="textarea" v-model="adminSettings.instanceRules" />
</div>
<b-field :label="$t('Instance Terms Source')">
<div class="columns">
<div class="column is-one-third-desktop">
<b-field>
<b-radio
v-model="adminSettings.instanceTermsType"
name="instanceTermsType"
:native-value="InstanceTermsType.DEFAULT"
>{{ $t("Default Mobilizon terms") }}</b-radio
>
</b-field>
<b-field>
<b-radio
v-model="adminSettings.instanceTermsType"
name="instanceTermsType"
:native-value="InstanceTermsType.URL"
>{{ $t("Custom URL") }}</b-radio
>
</b-field>
<b-field>
<b-radio
v-model="adminSettings.instanceTermsType"
name="instanceTermsType"
:native-value="InstanceTermsType.CUSTOM"
>{{ $t("Custom text") }}</b-radio
>
</b-field>
</div>
<div class="column">
<div
class="notification"
v-if="adminSettings.instanceTermsType === InstanceTermsType.DEFAULT"
>
<b>{{ $t("Default") }}</b>
<i18n
tag="p"
class="content"
path="The {default_terms} will be used. They will be translated in the user's language."
>
<a
slot="default_terms"
href="https://mobilizon.org/terms"
target="_blank"
rel="noopener"
>{{ $t("default Mobilizon terms") }}</a
>
</i18n>
<b>{{
$t(
"NOTE! The default terms have not been checked over by a lawyer and thus are unlikely to provide full legal protection for all situations for an instance admin using them. They are also not specific to all countries and jurisdictions. If you are unsure, please check with a lawyer."
)
}}</b>
</div>
<div
class="notification"
v-if="adminSettings.instanceTermsType === InstanceTermsType.URL"
>
<b>{{ $t("URL") }}</b>
<p class="content">{{ $t("Set an URL to a page with your own terms.") }}</p>
</div>
<div
class="notification"
v-if="adminSettings.instanceTermsType === InstanceTermsType.CUSTOM"
>
<b>{{ $t("Custom") }}</b>
<i18n
tag="p"
class="content"
path="Enter your own terms. HTML tags allowed. The {mobilizon_terms} are provided as template."
>
<a
slot="mobilizon_terms"
href="https://mobilizon.org/terms"
target="_blank"
rel="noopener"
>
{{ $t("default Mobilizon terms") }}</a
>
</i18n>
</div>
</div>
</div>
</b-field>
<b-field
:label="$t('Instance Terms URL')"
v-if="adminSettings.instanceTermsType === InstanceTermsType.URL"
>
<b-input type="URL" v-model="adminSettings.instanceTermsUrl" />
</b-field>
<b-field
:label="$t('Instance Terms')"
v-if="adminSettings.instanceTermsType === InstanceTermsType.CUSTOM"
>
<b-input type="textarea" v-model="adminSettings.instancePrivacyPolicy" />
</b-field>
<b-field :label="$t('Instance Privacy Policy Source')">
<div class="columns">
<div class="column is-one-third-desktop">
<b-field>
<b-radio
v-model="adminSettings.instancePrivacyPolicyType"
name="instancePrivacyType"
:native-value="InstancePrivacyType.DEFAULT"
>{{ $t("Default Mobilizon privacy policy") }}</b-radio
>
</b-field>
<b-field>
<b-radio
v-model="adminSettings.instancePrivacyPolicyType"
name="instancePrivacyType"
:native-value="InstancePrivacyType.URL"
>{{ $t("Custom URL") }}</b-radio
>
</b-field>
<b-field>
<b-radio
v-model="adminSettings.instancePrivacyPolicyType"
name="instancePrivacyType"
:native-value="InstancePrivacyType.CUSTOM"
>{{ $t("Custom text") }}</b-radio
>
</b-field>
</div>
<div class="column">
<div
class="notification"
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.DEFAULT"
>
<b>{{ $t("Default") }}</b>
<i18n
tag="p"
class="content"
path="The {default_privacy_policy} will be used. They will be translated in the user's language."
>
<a
slot="default_privacy_policy"
href="https://mobilizon.org/terms"
target="_blank"
rel="noopener"
>{{ $t("default Mobilizon privacy policy") }}</a
>
</i18n>
</div>
<div
class="notification"
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.URL"
>
<b>{{ $t("URL") }}</b>
<p class="content">
{{ $t("Set an URL to a page with your own privacy policy.") }}
</p>
</div>
<div
class="notification"
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.CUSTOM"
>
<b>{{ $t("Custom") }}</b>
<i18n
tag="p"
class="content"
path="Enter your own privacy policy. HTML tags allowed. The {mobilizon_privacy_policy} is provided as template."
>
<a
slot="mobilizon_privacy_policy"
href="https://mobilizon.org/privacy"
target="_blank"
rel="noopener"
>
{{ $t("default Mobilizon privacy policy") }}</a
>
</i18n>
</div>
</div>
</div>
</b-field>
<b-field
:label="$t('Instance Privacy Policy URL')"
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.URL"
>
<b-input type="URL" v-model="adminSettings.instancePrivacyPolicyUrl" />
</b-field>
<b-field
:label="$t('Instance Privacy Policy')"
v-if="adminSettings.instancePrivacyPolicyType === InstancePrivacyType.CUSTOM"
>
<b-input type="textarea" v-model="adminSettings.instancePrivacyPolicy" />
</b-field>
<b-button native-type="submit" type="is-primary">{{ $t("Save") }}</b-button>
</form>
</section>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Vue } from "vue-property-decorator"; import { Component, Vue } from "vue-property-decorator";

154
js/src/views/Admin/Users.vue
View File

@ -1,77 +1,89 @@
<template> <template>
<div v-if="users"> <div>
<b-table <nav class="breadcrumb" aria-label="breadcrumbs">
:data="users.elements" <ul>
:loading="$apollo.queries.users.loading" <li>
paginated <router-link :to="{ name: RouteName.MODERATION }">{{ $t("Moderation") }}</router-link>
backend-pagination </li>
backend-filtering <li class="is-active">
detailed <router-link :to="{ name: RouteName.USERS }">{{ $t("Users") }}</router-link>
:show-detail-icon="true" </li>
:total="users.total" </ul>
:per-page="USERS_PER_PAGE" </nav>
:has-detailed-visible="(row => row.actors.length > 0)" <div v-if="users">
@page-change="onPageChange" <b-table
@filters-change="onFiltersChange" :data="users.elements"
> :loading="$apollo.queries.users.loading"
<template slot-scope="props"> paginated
<b-table-column field="id" width="40" numeric> backend-pagination
{{ props.row.id }} backend-filtering
</b-table-column> detailed
<b-table-column field="email" :label="$t('Email')" searchable> :show-detail-icon="true"
<template slot="searchable" slot-scope="props"> :total="users.total"
<b-input :per-page="USERS_PER_PAGE"
v-model="props.filters.email" :has-detailed-visible="(row => row.actors.length > 0)"
placeholder="Search..." @page-change="onPageChange"
icon="magnify" @filters-change="onFiltersChange"
size="is-small" >
/> <template slot-scope="props">
</template> <b-table-column field="id" width="40" numeric>
<router-link {{ props.row.id }}
class="user-profile" </b-table-column>
:to="{ name: RouteName.ADMIN_USER_PROFILE, params: { id: props.row.id } }" <b-table-column field="email" :label="$t('Email')" searchable>
:class="{ disabled: props.row.disabled }" <template slot="searchable" slot-scope="props">
> <b-input
{{ props.row.email }} v-model="props.filters.email"
</router-link> placeholder="Search..."
</b-table-column> icon="magnify"
<b-table-column field="confirmedAt" :label="$t('Confirmed at')" :centered="true"> size="is-small"
<template v-if="props.row.confirmedAt"> />
{{ props.row.confirmedAt | formatDateTimeString }} </template>
</template> <router-link
<template v-else> class="user-profile"
{{ $t("Not confirmed") }} :to="{ name: RouteName.ADMIN_USER_PROFILE, params: { id: props.row.id } }"
</template> :class="{ disabled: props.row.disabled }"
</b-table-column> >
<b-table-column field="locale" :label="$t('Language')" :centered="true"> {{ props.row.email }}
{{ props.row.locale }} </router-link>
</b-table-column> </b-table-column>
</template> <b-table-column field="confirmedAt" :label="$t('Confirmed at')" :centered="true">
<template v-if="props.row.confirmedAt">
{{ props.row.confirmedAt | formatDateTimeString }}
</template>
<template v-else>
{{ $t("Not confirmed") }}
</template>
</b-table-column>
<b-table-column field="locale" :label="$t('Language')" :centered="true">
{{ props.row.locale }}
</b-table-column>
</template>
<template slot="detail" slot-scope="props"> <template slot="detail" slot-scope="props">
<router-link <router-link
class="profile" class="profile"
v-for="actor in props.row.actors" v-for="actor in props.row.actors"
:key="actor.id" :key="actor.id"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: actor.id } }" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: actor.id } }"
> >
<article class="media"> <article class="media">
<figure class="media-left"> <figure class="media-left">
<p class="image is-64x64"> <p class="image is-64x64">
<img :src="actor.avatar.url" /> <img :src="actor.avatar.url" />
</p> </p>
</figure> </figure>
<div class="media-content"> <div class="media-content">
<div class="content"> <div class="content">
<strong v-if="actor.name">{{ actor.name }}</strong> <strong v-if="actor.name">{{ actor.name }}</strong>
<small>@{{ actor.preferredUsername }}</small> <small>@{{ actor.preferredUsername }}</small>
<p>{{ actor.summary }}</p> <p>{{ actor.summary }}</p>
</div>
</div> </div>
</div> </article>
</article> </router-link>
</router-link> </template>
</template> </b-table>
</b-table> </div>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">

4
js/src/views/Event/Event.vue
View File

@ -756,9 +756,9 @@ export default class Event extends EventMixin {
}); });
}); });
this.$on('eventDeleted', () => { this.$on("eventDeleted", () => {
return this.$router.push({ name: RouteName.HOME }); return this.$router.push({ name: RouteName.HOME });
}) });
} }
/** /**

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

@ -1,20 +1,37 @@
<template> <template>
<section class="container section" v-if="group"> <div>
<form @submit.prevent="inviteMember"> <nav class="breadcrumb" aria-label="breadcrumbs">
<b-field :label="$t('Invite a new member')" custom-class="add-relay" horizontal> <ul>
<b-field grouped expanded size="is-large"> <li>
<p class="control"> <router-link :to="{ name: RouteName.GROUP }">{{ group.name }}</router-link>
<b-input v-model="newMemberUsername" :placeholder="$t('Ex: someone@mobilizon.org')" /> </li>
</p> <li>
<p class="control"> <router-link :to="{ name: RouteName.GROUP_SETTINGS }">{{ $t("Settings") }}</router-link>
<b-button type="is-primary" native-type="submit">{{ $t("Invite member") }}</b-button> </li>
</p> <li class="is-active">
<router-link :to="{ name: RouteName.GROUP_MEMBERS_SETTINGS }">{{
$t("Members")
}}</router-link>
</li>
</ul>
</nav>
<section class="container section" v-if="group">
<form @submit.prevent="inviteMember">
<b-field :label="$t('Invite a new member')" custom-class="add-relay" horizontal>
<b-field grouped expanded size="is-large">
<p class="control">
<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>
</p>
</b-field>
</b-field> </b-field>
</b-field> </form>
</form> <h1>{{ $t("Group Members") }} ({{ group.members.total }})</h1>
<h1>{{ $t("Group Members") }} ({{ group.members.total }})</h1> <pre>{{ group.members }}</pre>
<pre>{{ group.members }}</pre> </section>
</section> </div>
</template> </template>
<script lang="ts"> <script lang="ts">

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

@ -2,19 +2,21 @@
<aside class="section container"> <aside class="section container">
<h1 class="title">{{ $t("Settings") }}</h1> <h1 class="title">{{ $t("Settings") }}</h1>
<div class="columns"> <div class="columns">
<SettingsMenu class="column is-one-quarter-desktop" :menu="menu" /> <aside class="column is-one-quarter-desktop">
<ul>
<SettingMenuSection :title="$t('Settings')" :to="{ name: RouteName.GROUP_SETTINGS }">
<SettingMenuItem
:title="this.$t('Public')"
:to="{ name: RouteName.GROUP_PUBLIC_SETTINGS }"
/>
<SettingMenuItem
:title="this.$t('Members')"
:to="{ name: RouteName.GROUP_MEMBERS_SETTINGS }"
/>
</SettingMenuSection>
</ul>
</aside>
<div class="column"> <div class="column">
<nav class="breadcrumb" aria-label="breadcrumbs">
<ul>
<li
v-for="route in routes.get($route.name)"
:class="{ 'is-active': route.to.name === $route.name }"
:key="route.title"
>
<router-link :to="{ name: route.to.name }">{{ route.title }}</router-link>
</li>
</ul>
</nav>
<router-view /> <router-view />
</div> </div>
</div> </div>
@ -22,70 +24,20 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Vue, Watch } from "vue-property-decorator"; import { Component, Vue, Watch } from "vue-property-decorator";
import SettingsMenu from "@/components/Settings/SettingsMenu.vue";
import { ISettingMenuSection } from "@/types/setting-menu.model";
import { Route } from "vue-router"; import { Route } from "vue-router";
import { IGroup, IPerson } from "@/types/actor"; import { IGroup, IPerson } from "@/types/actor";
import { FETCH_GROUP } from "@/graphql/actor"; import { FETCH_GROUP } from "@/graphql/actor";
import RouteName from "../../router/name"; import RouteName from "../../router/name";
import SettingMenuSection from "../../components/Settings/SettingMenuSection.vue";
import SettingMenuItem from "../../components/Settings/SettingMenuItem.vue";
@Component({ @Component({
components: { SettingsMenu }, components: { SettingMenuSection, SettingMenuItem },
apollo: {
group: {
query: FETCH_GROUP,
},
},
}) })
export default class Settings extends Vue { export default class Settings extends Vue {
RouteName = RouteName; RouteName = RouteName;
menu: ISettingMenuSection[] = [];
group!: IGroup[]; group!: IGroup[];
mounted() {
this.menu = [
{
title: this.$t("Settings") as string,
to: { name: RouteName.GROUP_SETTINGS } as Route,
items: [
{
title: this.$t("Public") as string,
to: { name: RouteName.GROUP_PUBLIC_SETTINGS } as Route,
},
{
title: this.$t("Members") as string,
to: { name: RouteName.GROUP_MEMBERS_SETTINGS } as Route,
},
],
},
];
}
get routes(): Map<string, Route[]> {
return this.getPath(this.menu);
}
getPath(object: ISettingMenuSection[]) {
function iter(menu: ISettingMenuSection[] | ISettingMenuSection, acc: ISettingMenuSection[]) {
if (Array.isArray(menu)) {
return menu.forEach((item: ISettingMenuSection) => {
iter(item, acc.concat(item));
});
}
if (menu.items && menu.items.length > 0) {
return menu.items.forEach((item: ISettingMenuSection) => {
iter(item, acc.concat(item));
});
}
result.set(menu.to.name, acc);
}
const result = new Map();
iter(object, []);
return result;
}
} }
</script> </script>

282
js/src/views/Moderation/Logs.vue
View File

@ -1,146 +1,160 @@
<template> <template>
<section> <div>
<ul v-if="actionLogs.length > 0"> <nav class="breadcrumb" aria-label="breadcrumbs">
<li v-for="log in actionLogs" :key="log.id"> <ul>
<div class="box"> <li>
<img class="image" :src="log.actor.avatar.url" v-if="log.actor.avatar" /> <router-link :to="{ name: RouteName.MODERATION }">{{ $t("Moderation") }}</router-link>
<i18n </li>
v-if="log.action === ActionLogAction.REPORT_UPDATE_CLOSED" <li class="is-active">
tag="span" <router-link :to="{ name: RouteName.REPORT_LOGS }">{{
path="{moderator} closed {report}" $t("Moderation log")
> }}</router-link>
<router-link </li>
slot="moderator" </ul>
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }" </nav>
>@{{ log.actor.preferredUsername }}</router-link <section>
<ul v-if="actionLogs.length > 0">
<li v-for="log in actionLogs" :key="log.id">
<div class="box">
<img class="image" :src="log.actor.avatar.url" v-if="log.actor.avatar" />
<i18n
v-if="log.action === ActionLogAction.REPORT_UPDATE_CLOSED"
tag="span"
path="{moderator} closed {report}"
> >
<router-link <router-link
:to="{ name: RouteName.REPORT, params: { reportId: log.object.id } }" slot="moderator"
slot="report" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }"
>{{ $t("report #{report_number}", { report_number: log.object.id }) }} >@{{ log.actor.preferredUsername }}</router-link
</router-link> >
</i18n> <router-link
<i18n :to="{ name: RouteName.REPORT, params: { reportId: log.object.id } }"
v-else-if="log.action === ActionLogAction.REPORT_UPDATE_OPENED" slot="report"
tag="span" >{{ $t("report #{report_number}", { report_number: log.object.id }) }}
path="{moderator} reopened {report}" </router-link>
> </i18n>
<router-link <i18n
slot="moderator" v-else-if="log.action === ActionLogAction.REPORT_UPDATE_OPENED"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }" tag="span"
>@{{ log.actor.preferredUsername }}</router-link path="{moderator} reopened {report}"
> >
<router-link <router-link
:to="{ name: RouteName.REPORT, params: { reportId: log.object.id } }" slot="moderator"
slot="report" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }"
>{{ $t("report #{report_number}", { report_number: log.object.id }) }} >@{{ log.actor.preferredUsername }}</router-link
</router-link> >
</i18n> <router-link
<i18n :to="{ name: RouteName.REPORT, params: { reportId: log.object.id } }"
v-else-if="log.action === ActionLogAction.REPORT_UPDATE_RESOLVED" slot="report"
tag="span" >{{ $t("report #{report_number}", { report_number: log.object.id }) }}
path="{moderator} marked {report} as resolved" </router-link>
> </i18n>
<router-link <i18n
slot="moderator" v-else-if="log.action === ActionLogAction.REPORT_UPDATE_RESOLVED"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }" tag="span"
>@{{ log.actor.preferredUsername }}</router-link path="{moderator} marked {report} as resolved"
> >
<router-link <router-link
:to="{ name: RouteName.REPORT, params: { reportId: log.object.id } }" slot="moderator"
slot="report" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }"
>{{ $t("report #{report_number}", { report_number: log.object.id }) }} >@{{ log.actor.preferredUsername }}</router-link
</router-link> >
</i18n> <router-link
<i18n :to="{ name: RouteName.REPORT, params: { reportId: log.object.id } }"
v-else-if="log.action === ActionLogAction.NOTE_CREATION" slot="report"
tag="span" >{{ $t("report #{report_number}", { report_number: log.object.id }) }}
path="{moderator} added a note on {report}" </router-link>
> </i18n>
<router-link <i18n
slot="moderator" v-else-if="log.action === ActionLogAction.NOTE_CREATION"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }" tag="span"
>@{{ log.actor.preferredUsername }}</router-link path="{moderator} added a note on {report}"
> >
<router-link <router-link
v-if="log.object.report" slot="moderator"
:to="{ name: RouteName.REPORT, params: { reportId: log.object.report.id } }" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }"
slot="report" >@{{ log.actor.preferredUsername }}</router-link
>{{ $t("report #{report_number}", { report_number: log.object.report.id }) }} >
</router-link> <router-link
<span v-else slot="report">{{ $t("a non-existent report") }}</span> v-if="log.object.report"
</i18n> :to="{ name: RouteName.REPORT, params: { reportId: log.object.report.id } }"
<i18n slot="report"
v-else-if="log.action === ActionLogAction.EVENT_DELETION" >{{ $t("report #{report_number}", { report_number: log.object.report.id }) }}
tag="span" </router-link>
path='{moderator} deleted an event named "{title}"' <span v-else slot="report">{{ $t("a non-existent report") }}</span>
> </i18n>
<router-link <i18n
slot="moderator" v-else-if="log.action === ActionLogAction.EVENT_DELETION"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }" tag="span"
>@{{ log.actor.preferredUsername }}</router-link path='{moderator} deleted an event named "{title}"'
> >
<b slot="title">{{ log.object.title }}</b> <router-link
</i18n> slot="moderator"
<i18n :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }"
v-else-if="log.action === ActionLogAction.ACTOR_SUSPENSION" >@{{ log.actor.preferredUsername }}</router-link
tag="span" >
path="{moderator} suspended profile {profile}" <b slot="title">{{ log.object.title }}</b>
> </i18n>
<router-link <i18n
slot="moderator" v-else-if="log.action === ActionLogAction.ACTOR_SUSPENSION"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }" tag="span"
>@{{ log.actor.preferredUsername }}</router-link path="{moderator} suspended profile {profile}"
> >
<router-link <router-link
slot="profile" slot="moderator"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.object.id } }" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }"
>{{ displayNameAndUsername(log.object) }} >@{{ log.actor.preferredUsername }}</router-link
</router-link> >
</i18n> <router-link
<i18n slot="profile"
v-else-if="log.action === ActionLogAction.ACTOR_UNSUSPENSION" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.object.id } }"
tag="span" >{{ displayNameAndUsername(log.object) }}
path="{moderator} has unsuspended profile {profile}" </router-link>
> </i18n>
<router-link <i18n
slot="moderator" v-else-if="log.action === ActionLogAction.ACTOR_UNSUSPENSION"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }" tag="span"
>@{{ log.actor.preferredUsername }}</router-link path="{moderator} has unsuspended profile {profile}"
> >
<router-link <router-link
slot="profile" slot="moderator"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.object.id } }" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }"
>{{ displayNameAndUsername(log.object) }} >@{{ log.actor.preferredUsername }}</router-link
</router-link> >
</i18n> <router-link
<i18n slot="profile"
v-else-if="log.action === ActionLogAction.USER_DELETION" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.object.id } }"
tag="span" >{{ displayNameAndUsername(log.object) }}
path="{moderator} has deleted user {user}" </router-link>
> </i18n>
<router-link <i18n
slot="moderator" v-else-if="log.action === ActionLogAction.USER_DELETION"
:to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }" tag="span"
>@{{ log.actor.preferredUsername }}</router-link path="{moderator} has deleted user {user}"
> >
<router-link <router-link
v-if="log.object.confirmedAt" slot="moderator"
slot="user" :to="{ name: RouteName.ADMIN_PROFILE, params: { id: log.actor.id } }"
:to="{ name: RouteName.ADMIN_USER_PROFILE, params: { id: log.object.id } }" >@{{ log.actor.preferredUsername }}</router-link
>{{ log.object.email }} >
</router-link> <router-link
<b v-else slot="user">{{ log.object.email }}</b> v-if="log.object.confirmedAt"
</i18n> slot="user"
<br /> :to="{ name: RouteName.ADMIN_USER_PROFILE, params: { id: log.object.id } }"
<small>{{ log.insertedAt | formatDateTimeString }}</small> >{{ log.object.email }}
</div> </router-link>
</li> <b v-else slot="user">{{ log.object.email }}</b>
</ul> </i18n>
<div v-else> <br />
<b-message type="is-info">{{ $t("No moderation logs yet") }}</b-message> <small>{{ log.insertedAt | formatDateTimeString }}</small>
</div> </div>
</section> </li>
</ul>
<div v-else>
<b-message type="is-info">{{ $t("No moderation logs yet") }}</b-message>
</div>
</section>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Vue } from "vue-property-decorator"; import { Component, Vue } from "vue-property-decorator";

395
js/src/views/Moderation/Report.vue
View File

@ -1,202 +1,219 @@
<template> <template>
<section> <div>
<b-message title="Error" type="is-danger" v-for="error in errors" :key="error"> <nav class="breadcrumb" aria-label="breadcrumbs" v-if="report">
{{ error }} <ul>
</b-message> <li>
<div class="container" v-if="report"> <router-link :to="{ name: RouteName.MODERATION }">{{ $t("Moderation") }}</router-link>
<div class="buttons"> </li>
<b-button <li>
v-if="report.status !== ReportStatusEnum.RESOLVED" <router-link :to="{ name: RouteName.REPORTS }">{{ $t("Reports") }}</router-link>
@click="updateReport(ReportStatusEnum.RESOLVED)" </li>
type="is-primary" <li class="is-active">
>{{ $t("Mark as resolved") }}</b-button <router-link :to="{ name: RouteName.REPORT, params: { id: report.id } }">{{
> $t("Report #{reportNumber}", { reportNumber: report.id })
<b-button }}</router-link>
v-if="report.status !== ReportStatusEnum.OPEN" </li>
@click="updateReport(ReportStatusEnum.OPEN)" </ul>
type="is-success" </nav>
>{{ $t("Reopen") }}</b-button <section>
> <b-message title="Error" type="is-danger" v-for="error in errors" :key="error">
<b-button {{ error }}
v-if="report.status !== ReportStatusEnum.CLOSED" </b-message>
@click="updateReport(ReportStatusEnum.CLOSED)" <div class="container" v-if="report">
type="is-danger" <div class="buttons">
>{{ $t("Close") }}</b-button <b-button
> v-if="report.status !== ReportStatusEnum.RESOLVED"
</div> @click="updateReport(ReportStatusEnum.RESOLVED)"
<div class="table-container"> type="is-primary"
<table class="table is-striped is-fullwidth"> >{{ $t("Mark as resolved") }}</b-button
<tbody> >
<tr> <b-button
<td>{{ $t("Reported identity") }}</td> v-if="report.status !== ReportStatusEnum.OPEN"
<td> @click="updateReport(ReportStatusEnum.OPEN)"
<router-link type="is-success"
:to="{ >{{ $t("Reopen") }}</b-button
name: RouteName.ADMIN_PROFILE, >
params: { id: report.reported.id }, <b-button
}" v-if="report.status !== ReportStatusEnum.CLOSED"
> @click="updateReport(ReportStatusEnum.CLOSED)"
<img type="is-danger"
v-if="report.reported.avatar" >{{ $t("Close") }}</b-button
class="image" >
:src="report.reported.avatar.url" </div>
alt="" <div class="table-container">
/> <table class="table is-striped is-fullwidth">
@{{ report.reported.preferredUsername }} <tbody>
</router-link> <tr>
</td> <td>{{ $t("Reported identity") }}</td>
</tr> <td>
<tr> <router-link
<td>{{ $t("Reported by") }}</td> :to="{
<td v-if="report.reporter.type === ActorType.APPLICATION"> name: RouteName.ADMIN_PROFILE,
{{ report.reporter.domain }} params: { id: report.reported.id },
</td> }"
<td v-else> >
<router-link <img
:to="{ v-if="report.reported.avatar"
name: RouteName.ADMIN_PROFILE, class="image"
params: { id: report.reporter.id }, :src="report.reported.avatar.url"
}" alt=""
> />
<img @{{ report.reported.preferredUsername }}
v-if="report.reporter.avatar" </router-link>
class="image" </td>
:src="report.reporter.avatar.url" </tr>
alt="" <tr>
/> <td>{{ $t("Reported by") }}</td>
@{{ report.reporter.preferredUsername }} <td v-if="report.reporter.type === ActorType.APPLICATION">
</router-link> {{ report.reporter.domain }}
</td> </td>
</tr> <td v-else>
<tr> <router-link
<td>{{ $t("Reported") }}</td> :to="{
<td>{{ report.insertedAt | formatDateTimeString }}</td> name: RouteName.ADMIN_PROFILE,
</tr> params: { id: report.reporter.id },
<tr v-if="report.updatedAt !== report.insertedAt"> }"
<td>{{ $t("Updated") }}</td> >
<td>{{ report.updatedAt | formatDateTimeString }}</td> <img
</tr> v-if="report.reporter.avatar"
<tr> class="image"
<td>{{ $t("Status") }}</td> :src="report.reporter.avatar.url"
<td> alt=""
<span v-if="report.status === ReportStatusEnum.OPEN">{{ $t("Open") }}</span> />
<span v-else-if="report.status === ReportStatusEnum.CLOSED"> @{{ report.reporter.preferredUsername }}
{{ $t("Closed") }} </router-link>
</span> </td>
<span v-else-if="report.status === ReportStatusEnum.RESOLVED"> </tr>
{{ $t("Resolved") }} <tr>
</span> <td>{{ $t("Reported") }}</td>
<span v-else>{{ $t("Unknown") }}</span> <td>{{ report.insertedAt | formatDateTimeString }}</td>
</td> </tr>
</tr> <tr v-if="report.updatedAt !== report.insertedAt">
<tr v-if="report.event && report.comments.length > 0"> <td>{{ $t("Updated") }}</td>
<td>{{ $t("Event") }}</td> <td>{{ report.updatedAt | formatDateTimeString }}</td>
<td> </tr>
<router-link :to="{ name: RouteName.EVENT, params: { uuid: report.event.uuid } }"> <tr>
{{ report.event.title }} <td>{{ $t("Status") }}</td>
</router-link> <td>
<span class="is-pulled-right"> <span v-if="report.status === ReportStatusEnum.OPEN">{{ $t("Open") }}</span>
<!-- <b-button--> <span v-else-if="report.status === ReportStatusEnum.CLOSED">
<!-- tag="router-link"--> {{ $t("Closed") }}
<!-- type="is-primary"--> </span>
<!-- :to="{ name: RouteName.EDIT_EVENT, params: {eventId: report.event.uuid } }"--> <span v-else-if="report.status === ReportStatusEnum.RESOLVED">
<!-- icon-left="pencil"--> {{ $t("Resolved") }}
<!-- size="is-small">{{ $t('Edit') }}</b-button>--> </span>
<span v-else>{{ $t("Unknown") }}</span>
</td>
</tr>
<tr v-if="report.event && report.comments.length > 0">
<td>{{ $t("Event") }}</td>
<td>
<router-link :to="{ name: RouteName.EVENT, params: { uuid: report.event.uuid } }">
{{ report.event.title }}
</router-link>
<span class="is-pulled-right">
<!-- <b-button-->
<!-- tag="router-link"-->
<!-- type="is-primary"-->
<!-- :to="{ name: RouteName.EDIT_EVENT, params: {eventId: report.event.uuid } }"-->
<!-- icon-left="pencil"-->
<!-- size="is-small">{{ $t('Edit') }}</b-button>-->
<b-button
type="is-danger"
@click="confirmEventDelete()"
icon-left="delete"
size="is-small"
>{{ $t("Delete") }}</b-button
>
</span>
</td>
</tr>
</tbody>
</table>
</div>
<div class="box report-content">
<p v-if="report.content" v-html="nl2br(report.content)" />
<p v-else>{{ $t("No comment") }}</p>
</div>
<div class="box" v-if="report.event && report.comments.length === 0">
<router-link :to="{ name: RouteName.EVENT, params: { uuid: report.event.uuid } }">
<h3 class="title">{{ report.event.title }}</h3>
<p v-html="report.event.description" />
</router-link>
<!-- <b-button-->
<!-- tag="router-link"-->
<!-- type="is-primary"-->
<!-- :to="{ name: RouteName.EDIT_EVENT, params: {eventId: report.event.uuid } }"-->
<!-- icon-left="pencil"-->
<!-- size="is-small">{{ $t('Edit') }}</b-button>-->
<b-button
type="is-danger"
@click="confirmEventDelete()"
icon-left="delete"
size="is-small"
>{{ $t("Delete") }}</b-button
>
</div>
<ul v-for="comment in report.comments" v-if="report.comments.length > 0" :key="comment.id">
<li>
<div class="box" v-if="comment">
<article class="media">
<div class="media-left">
<figure class="image is-48x48" v-if="comment.actor && comment.actor.avatar">
<img :src="comment.actor.avatar.url" alt="Image" />
</figure>
<b-icon class="media-left" v-else size="is-large" icon="account-circle" />
</div>
<div class="media-content">
<div class="content">
<span v-if="comment.actor">
<strong>{{ comment.actor.name }}</strong>
<small>@{{ comment.actor.preferredUsername }}</small>
</span>
<span v-else>{{ $t("Unknown actor") }}</span>
<br />
<p v-html="comment.text" />
</div>
<b-button <b-button
type="is-danger" type="is-danger"
@click="confirmEventDelete()" @click="confirmCommentDelete(comment)"
icon-left="delete" icon-left="delete"
size="is-small" size="is-small"
>{{ $t("Delete") }}</b-button >{{ $t("Delete") }}</b-button
> >
</span>
</td>
</tr>
</tbody>
</table>
</div>
<div class="box report-content">
<p v-if="report.content" v-html="nl2br(report.content)" />
<p v-else>{{ $t("No comment") }}</p>
</div>
<div class="box" v-if="report.event && report.comments.length === 0">
<router-link :to="{ name: RouteName.EVENT, params: { uuid: report.event.uuid } }">
<h3 class="title">{{ report.event.title }}</h3>
<p v-html="report.event.description" />
</router-link>
<!-- <b-button-->
<!-- tag="router-link"-->
<!-- type="is-primary"-->
<!-- :to="{ name: RouteName.EDIT_EVENT, params: {eventId: report.event.uuid } }"-->
<!-- icon-left="pencil"-->
<!-- size="is-small">{{ $t('Edit') }}</b-button>-->
<b-button
type="is-danger"
@click="confirmEventDelete()"
icon-left="delete"
size="is-small"
>{{ $t("Delete") }}</b-button
>
</div>
<ul v-for="comment in report.comments" v-if="report.comments.length > 0" :key="comment.id">
<li>
<div class="box" v-if="comment">
<article class="media">
<div class="media-left">
<figure class="image is-48x48" v-if="comment.actor && comment.actor.avatar">
<img :src="comment.actor.avatar.url" alt="Image" />
</figure>
<b-icon class="media-left" v-else size="is-large" icon="account-circle" />
</div>
<div class="media-content">
<div class="content">
<span v-if="comment.actor">
<strong>{{ comment.actor.name }}</strong>
<small>@{{ comment.actor.preferredUsername }}</small>
</span>
<span v-else>{{ $t("Unknown actor") }}</span>
<br />
<p v-html="comment.text" />
</div> </div>
<b-button </article>
type="is-danger" </div>
@click="confirmCommentDelete(comment)" </li>
icon-left="delete" </ul>
size="is-small"
>{{ $t("Delete") }}</b-button
>
</div>
</article>
</div>
</li>
</ul>
<h2 class="title" v-if="report.notes.length > 0">{{ $t("Notes") }}</h2> <h2 class="title" v-if="report.notes.length > 0">{{ $t("Notes") }}</h2>
<div class="box note" v-for="note in report.notes" :id="`note-${note.id}`" :key="note.id"> <div class="box note" v-for="note in report.notes" :id="`note-${note.id}`" :key="note.id">
<p>{{ note.content }}</p> <p>{{ note.content }}</p>
<router-link :to="{ name: RouteName.ADMIN_PROFILE, params: { id: note.moderator.id } }"> <router-link :to="{ name: RouteName.ADMIN_PROFILE, params: { id: note.moderator.id } }">
<img alt class="image" :src="note.moderator.avatar.url" v-if="note.moderator.avatar" /> <img alt class="image" :src="note.moderator.avatar.url" v-if="note.moderator.avatar" />
@{{ note.moderator.preferredUsername }} @{{ note.moderator.preferredUsername }}
</router-link> </router-link>
<br /> <br />
<small> <small>
<a :href="`#note-${note.id}`" v-if="note.insertedAt"> <a :href="`#note-${note.id}`" v-if="note.insertedAt">
{{ note.insertedAt | formatDateTimeString }} {{ note.insertedAt | formatDateTimeString }}
</a> </a>
</small> </small>
</div>
<form @submit="addNote()">
<b-field :label="$t('New note')" label-for="newNoteInput">
<b-input type="textarea" v-model="noteContent" id="newNoteInput"></b-input>
</b-field>
<b-button type="submit" @click="addNote">{{ $t("Add a note") }}</b-button>
</form>
</div> </div>
</section>
<form @submit="addNote()"> </div>
<b-field :label="$t('New note')" label-for="newNoteInput">
<b-input type="textarea" v-model="noteContent" id="newNoteInput"></b-input>
</b-field>
<b-button type="submit" @click="addNote">{{ $t("Add a note") }}</b-button>
</form>
</div>
</section>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Prop, Vue } from "vue-property-decorator"; import { Component, Prop, Vue } from "vue-property-decorator";

74
js/src/views/Moderation/ReportList.vue
View File

@ -1,35 +1,47 @@
<template> <template>
<section> <div>
<b-field> <nav class="breadcrumb" aria-label="breadcrumbs">
<b-radio-button v-model="filterReports" :native-value="ReportStatusEnum.OPEN">{{ <ul>
$t("Open") <li>
}}</b-radio-button> <router-link :to="{ name: RouteName.MODERATION }">{{ $t("Moderation") }}</router-link>
<b-radio-button v-model="filterReports" :native-value="ReportStatusEnum.RESOLVED">{{ </li>
$t("Resolved") <li class="is-active">
}}</b-radio-button> <router-link :to="{ name: RouteName.REPORTS }">{{ $t("Reports") }}</router-link>
<b-radio-button v-model="filterReports" :native-value="ReportStatusEnum.CLOSED">{{ </li>
$t("Closed") </ul>
}}</b-radio-button> </nav>
</b-field> <section>
<ul v-if="reports.length > 0"> <b-field>
<li v-for="report in reports" :key="report.id"> <b-radio-button v-model="filterReports" :native-value="ReportStatusEnum.OPEN">{{
<router-link :to="{ name: RouteName.REPORT, params: { reportId: report.id } }"> $t("Open")
<report-card :report="report" /> }}</b-radio-button>
</router-link> <b-radio-button v-model="filterReports" :native-value="ReportStatusEnum.RESOLVED">{{
</li> $t("Resolved")
</ul> }}</b-radio-button>
<div v-else> <b-radio-button v-model="filterReports" :native-value="ReportStatusEnum.CLOSED">{{
<b-message v-if="filterReports === ReportStatusEnum.OPEN" type="is-info"> $t("Closed")
{{ $t("No open reports yet") }} }}</b-radio-button>
</b-message> </b-field>
<b-message v-if="filterReports === ReportStatusEnum.RESOLVED" type="is-info"> <ul v-if="reports.length > 0">
{{ $t("No resolved reports yet") }} <li v-for="report in reports" :key="report.id">
</b-message> <router-link :to="{ name: RouteName.REPORT, params: { reportId: report.id } }">
<b-message v-if="filterReports === ReportStatusEnum.CLOSED" type="is-info"> <report-card :report="report" />
{{ $t("No closed reports yet") }} </router-link>
</b-message> </li>
</div> </ul>
</section> <div v-else>
<b-message v-if="filterReports === ReportStatusEnum.OPEN" type="is-info">
{{ $t("No open reports yet") }}
</b-message>
<b-message v-if="filterReports === ReportStatusEnum.RESOLVED" type="is-info">
{{ $t("No resolved reports yet") }}
</b-message>
<b-message v-if="filterReports === ReportStatusEnum.CLOSED" type="is-info">
{{ $t("No closed reports yet") }}
</b-message>
</div>
</section>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Prop, Vue, Watch } from "vue-property-decorator"; import { Component, Prop, Vue, Watch } from "vue-property-decorator";

153
js/src/views/Settings.vue
View File

@ -2,19 +2,8 @@
<div class="section container"> <div class="section container">
<h1 class="title">{{ $t("Settings") }}</h1> <h1 class="title">{{ $t("Settings") }}</h1>
<div class="columns"> <div class="columns">
<SettingsMenu class="column is-one-quarter-desktop" :menu="menu" /> <SettingsMenu class="column is-one-quarter-desktop" />
<div class="column"> <div class="column">
<nav class="breadcrumb" aria-label="breadcrumbs">
<ul>
<li
v-for="route in routes.get($route.name)"
:class="{ 'is-active': route.to.name === $route.name }"
:key="route.to.name"
>
<router-link :to="{ name: route.to.name }">{{ route.title }}</router-link>
</li>
</ul>
</nav>
<router-view /> <router-view />
</div> </div>
</div> </div>
@ -25,7 +14,6 @@ import { Component, Vue, Watch } from "vue-property-decorator";
import { Route } from "vue-router"; import { Route } from "vue-router";
import SettingsMenu from "../components/Settings/SettingsMenu.vue"; import SettingsMenu from "../components/Settings/SettingsMenu.vue";
import RouteName from "../router/name"; import RouteName from "../router/name";
import { ISettingMenuSection } from "../types/setting-menu.model";
import { IPerson, Person } from "../types/actor"; import { IPerson, Person } from "../types/actor";
import { IDENTITIES } from "../graphql/actor"; import { IDENTITIES } from "../graphql/actor";
import { CURRENT_USER_CLIENT } from "../graphql/user"; import { CURRENT_USER_CLIENT } from "../graphql/user";
@ -44,148 +32,9 @@ import { ICurrentUser, ICurrentUserRole } from "../types/current-user.model";
export default class Settings extends Vue { export default class Settings extends Vue {
RouteName = RouteName; RouteName = RouteName;
menu: ISettingMenuSection[] = [];
identities!: IPerson[]; identities!: IPerson[];
newIdentity!: ISettingMenuSection;
currentUser!: ICurrentUser; currentUser!: ICurrentUser;
mounted() {
this.newIdentity = {
title: this.$t("New profile") as string,
to: { name: RouteName.CREATE_IDENTITY } as Route,
};
this.menu = [
{
title: this.$t("Account") as string,
to: { name: RouteName.ACCOUNT_SETTINGS } as Route,
items: [
{
title: this.$t("General") as string,
to: { name: RouteName.ACCOUNT_SETTINGS_GENERAL } as Route,
},
{
title: this.$t("Preferences") as string,
to: { name: RouteName.PREFERENCES } as Route,
},
{
title: this.$t("Email notifications") as string,
to: { name: RouteName.NOTIFICATIONS } as Route,
},
],
},
{
title: this.$t("Profiles") as string,
to: { name: RouteName.IDENTITIES } as Route,
items: [this.newIdentity],
},
];
if (
[ICurrentUserRole.MODERATOR, ICurrentUserRole.ADMINISTRATOR].includes(this.currentUser.role)
) {
this.menu.push({
title: this.$t("Moderation") as string,
to: { name: RouteName.MODERATION } as Route,
items: [
{
title: this.$t("Reports") as string,
to: { name: RouteName.REPORTS } as Route,
items: [
{
title: this.$t("Report") as string,
to: { name: RouteName.REPORT } as Route,
},
],
},
{
title: this.$t("Moderation log") as string,
to: { name: RouteName.REPORT_LOGS } as Route,
},
{
title: this.$t("Users") as string,
to: { name: RouteName.USERS } as Route,
},
{
title: this.$t("Profiles") as string,
to: { name: RouteName.PROFILES } as Route,
},
],
});
}
if (this.currentUser.role === ICurrentUserRole.ADMINISTRATOR) {
this.menu.push({
title: this.$t("Admin") as string,
to: { name: RouteName.ADMIN } as Route,
items: [
{
title: this.$t("Dashboard") as string,
to: { name: RouteName.ADMIN_DASHBOARD } as Route,
},
{
title: this.$t("Instance settings") as string,
to: { name: RouteName.ADMIN_SETTINGS } as Route,
},
{
title: this.$t("Federation") as string,
to: { name: RouteName.RELAYS } as Route,
items: [
{
title: this.$t("Followings") as string,
to: { name: RouteName.RELAY_FOLLOWINGS } as Route,
},
{
title: this.$t("Followers") as string,
to: { name: RouteName.RELAY_FOLLOWERS } as Route,
},
],
},
],
});
}
}
@Watch("identities")
updateIdentities(identities: IPerson[]) {
if (!identities) return;
if (!this.menu[1].items) return;
this.menu[1].items = [];
this.menu[1].items.push(
...identities.map((identity: IPerson) => ({
to: ({
name: RouteName.UPDATE_IDENTITY,
params: { identityName: identity.preferredUsername },
} as unknown) as Route,
title: `@${identity.preferredUsername}`,
}))
);
this.menu[1].items.push(this.newIdentity);
}
get routes(): Map<string, Route[]> {
return this.getPath(this.menu);
}
getPath(object: ISettingMenuSection[]) {
function iter(menu: ISettingMenuSection[] | ISettingMenuSection, acc: ISettingMenuSection[]) {
if (Array.isArray(menu)) {
return menu.forEach((item: ISettingMenuSection) => {
iter(item, acc.concat(item));
});
}
if (menu.items && menu.items.length > 0) {
return menu.items.forEach((item: ISettingMenuSection) => {
iter(item, acc.concat(item));
});
}
result.set(menu.to.name, acc);
}
const result = new Map();
iter(object, []);
return result;
}
} }
</script> </script>

282
js/src/views/Settings/AccountSettings.vue
View File

@ -1,145 +1,159 @@
<template> <template>
<section> <div>
<div class="setting-title"> <nav class="breadcrumb" aria-label="breadcrumbs">
<h2>{{ $t("Email") }}</h2> <ul>
</div> <li>
<i18n <router-link :to="{ name: RouteName.ACCOUNT_SETTINGS }">{{ $t("Account") }}</router-link>
tag="p" </li>
class="content" <li class="is-active">
v-if="loggedUser" <router-link :to="{ name: RouteName.ACCOUNT_SETTINGS_GENERAL }">{{
path="Your current email is {email}. You use it to log in." $t("General")
> }}</router-link>
<b slot="email">{{ loggedUser.email }}</b> </li>
</i18n> </ul>
<b-notification </nav>
type="is-danger" <section>
has-icon <div class="setting-title">
aria-close-label="Close notification" <h2>{{ $t("Email") }}</h2>
role="alert" </div>
:key="error" <i18n
v-for="error in changeEmailErrors" tag="p"
>{{ error }}</b-notification class="content"
> v-if="loggedUser"
<form @submit.prevent="resetEmailAction" ref="emailForm" class="form"> path="Your current email is {email}. You use it to log in."
<b-field :label="$t('New email')">
<b-input aria-required="true" required type="email" v-model="newEmail" />
</b-field>
<p class="help">{{ $t("You'll receive a confirmation email.") }}</p>
<b-field :label="$t('Password')">
<b-input
aria-required="true"
required
type="password"
password-reveal
minlength="6"
v-model="passwordForEmailChange"
/>
</b-field>
<button
class="button is-primary"
:disabled="!($refs.emailForm && $refs.emailForm.checkValidity())"
> >
{{ $t("Change my email") }} <b slot="email">{{ loggedUser.email }}</b>
</button> </i18n>
</form> <b-notification
<div class="setting-title"> type="is-danger"
<h2>{{ $t("Password") }}</h2> has-icon
</div> aria-close-label="Close notification"
<b-notification role="alert"
type="is-danger" :key="error"
has-icon v-for="error in changeEmailErrors"
aria-close-label="Close notification" >{{ error }}</b-notification
role="alert"
:key="error"
v-for="error in changePasswordErrors"
>{{ error }}</b-notification
>
<form @submit.prevent="resetPasswordAction" ref="passwordForm" class="form">
<b-field :label="$t('Old password')">
<b-input
aria-required="true"
required
type="password"
password-reveal
minlength="6"
v-model="oldPassword"
/>
</b-field>
<b-field :label="$t('New password')">
<b-input
aria-required="true"
required
type="password"
password-reveal
minlength="6"
v-model="newPassword"
/>
</b-field>
<button
class="button is-primary"
:disabled="!($refs.passwordForm && $refs.passwordForm.checkValidity())"
> >
{{ $t("Change my password") }} <form @submit.prevent="resetEmailAction" ref="emailForm" class="form">
</button> <b-field :label="$t('New email')">
</form> <b-input aria-required="true" required type="email" v-model="newEmail" />
<div class="setting-title"> </b-field>
<h2>{{ $t("Delete account") }}</h2> <p class="help">{{ $t("You'll receive a confirmation email.") }}</p>
</div> <b-field :label="$t('Password')">
<p class="content">{{ $t("Deleting my account will delete all of my identities.") }}</p> <b-input
<b-button @click="openDeleteAccountModal" type="is-danger"> aria-required="true"
{{ $t("Delete my account") }} required
</b-button> type="password"
password-reveal
minlength="6"
v-model="passwordForEmailChange"
/>
</b-field>
<button
class="button is-primary"
:disabled="!($refs.emailForm && $refs.emailForm.checkValidity())"
>
{{ $t("Change my email") }}
</button>
</form>
<div class="setting-title">
<h2>{{ $t("Password") }}</h2>
</div>
<b-notification
type="is-danger"
has-icon
aria-close-label="Close notification"
role="alert"
:key="error"
v-for="error in changePasswordErrors"
>{{ error }}</b-notification
>
<form @submit.prevent="resetPasswordAction" ref="passwordForm" class="form">
<b-field :label="$t('Old password')">
<b-input
aria-required="true"
required
type="password"
password-reveal
minlength="6"
v-model="oldPassword"
/>
</b-field>
<b-field :label="$t('New password')">
<b-input
aria-required="true"
required
type="password"
password-reveal
minlength="6"
v-model="newPassword"
/>
</b-field>
<button
class="button is-primary"
:disabled="!($refs.passwordForm && $refs.passwordForm.checkValidity())"
>
{{ $t("Change my password") }}
</button>
</form>
<div class="setting-title">
<h2>{{ $t("Delete account") }}</h2>
</div>
<p class="content">{{ $t("Deleting my account will delete all of my identities.") }}</p>
<b-button @click="openDeleteAccountModal" type="is-danger">
{{ $t("Delete my account") }}
</b-button>
<b-modal <b-modal
:active.sync="isDeleteAccountModalActive" :active.sync="isDeleteAccountModalActive"
has-modal-card has-modal-card
full-screen full-screen
:can-cancel="false" :can-cancel="false"
> >
<section class="hero is-primary is-fullheight"> <section class="hero is-primary is-fullheight">
<div class="hero-body has-text-centered"> <div class="hero-body has-text-centered">
<div class="container"> <div class="container">
<div class="columns"> <div class="columns">
<div class="column is-one-third-desktop is-offset-one-third-desktop"> <div class="column is-one-third-desktop is-offset-one-third-desktop">
<h1 class="title">{{ $t("Deleting your Mobilizon account") }}</h1> <h1 class="title">{{ $t("Deleting your Mobilizon account") }}</h1>
<p class="content"> <p class="content">
{{ {{
$t( $t(
"Are you really sure you want to delete your whole account? You'll lose everything. Identities, settings, events created, messages and participations will be gone forever." "Are you really sure you want to delete your whole account? You'll lose everything. Identities, settings, events created, messages and participations will be gone forever."
) )
}} }}
<br /> <br />
<b>{{ $t("There will be no way to recover your data.") }}</b> <b>{{ $t("There will be no way to recover your data.") }}</b>
</p> </p>
<p class="content"> <p class="content">
{{ $t("Please enter your password to confirm this action.") }} {{ $t("Please enter your password to confirm this action.") }}
</p> </p>
<form @submit.prevent="deleteAccount"> <form @submit.prevent="deleteAccount">
<b-field> <b-field>
<b-input <b-input
type="password" type="password"
v-model="passwordForAccountDeletion" v-model="passwordForAccountDeletion"
password-reveal password-reveal
icon="lock" icon="lock"
:placeholder="$t('Password')" :placeholder="$t('Password')"
/> />
</b-field> </b-field>
<b-button native-type="submit" type="is-danger" size="is-large"> <b-button native-type="submit" type="is-danger" size="is-large">
{{ $t("Delete everything") }} {{ $t("Delete everything") }}
</b-button> </b-button>
</form> </form>
<div class="cancel-button"> <div class="cancel-button">
<b-button type="is-light" @click="isDeleteAccountModalActive = false"> <b-button type="is-light" @click="isDeleteAccountModalActive = false">
{{ $t("Cancel") }} {{ $t("Cancel") }}
</b-button> </b-button>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </section>
</section> </b-modal>
</b-modal> </section>
</section> </div>
</template> </template>
<script lang="ts"> <script lang="ts">

12
js/src/views/Settings/Notifications.vue
View File

@ -1,5 +1,17 @@
<template> <template>
<div v-if="loggedUser"> <div v-if="loggedUser">
<nav class="breadcrumb" aria-label="breadcrumbs">
<ul>
<li>
<router-link :to="{ name: RouteName.ACCOUNT_SETTINGS }">{{ $t("Account") }}</router-link>
</li>
<li class="is-active">
<router-link :to="{ name: RouteName.NOTIFICATIONS }">{{
$t("Email notifications")
}}</router-link>
</li>
</ul>
</nav>
<section> <section>
<div class="setting-title"> <div class="setting-title">
<h2>{{ $t("Participation notifications") }}</h2> <h2>{{ $t("Participation notifications") }}</h2>

79
js/src/views/Settings/Preferences.vue
View File

@ -1,38 +1,50 @@
<template> <template>
<div> <div>
<b-field :label="$t('Language')"> <nav class="breadcrumb" aria-label="breadcrumbs">
<b-select <ul>
:loading="!config || !loggedUser" <li>
v-model="$i18n.locale" <router-link :to="{ name: RouteName.ACCOUNT_SETTINGS }">{{ $t("Account") }}</router-link>
:placeholder="$t('Select a language')" </li>
> <li class="is-active">
<option v-for="(language, lang) in languages" :value="lang" :key="lang"> <router-link :to="{ name: RouteName.PREFERENCES }">{{ $t("Preferences") }}</router-link>
{{ language }} </li>
</option> </ul>
</b-select> </nav>
</b-field> <div>
<b-field :label="$t('Timezone')"> <b-field :label="$t('Language')">
<b-select <b-select
:placeholder="$t('Select a timezone')" :loading="!config || !loggedUser"
:loading="!config || !loggedUser" v-model="$i18n.locale"
v-model="selectedTimezone" :placeholder="$t('Select a language')"
> >
<optgroup :label="group" v-for="(groupTimezones, group) in timezones" :key="group"> <option v-for="(language, lang) in languages" :value="lang" :key="lang">
<option {{ language }}
v-for="timezone in groupTimezones"
:value="`${group}/${timezone}`"
:key="timezone"
>
{{ sanitize(timezone) }}
</option> </option>
</optgroup> </b-select>
</b-select> </b-field>
</b-field> <b-field :label="$t('Timezone')">
<em>{{ <b-select
$t("Timezone detected as {timezone}.", { :placeholder="$t('Select a timezone')"
timezone: Intl.DateTimeFormat().resolvedOptions().timeZone, :loading="!config || !loggedUser"
}) v-model="selectedTimezone"
}}</em> >
<optgroup :label="group" v-for="(groupTimezones, group) in timezones" :key="group">
<option
v-for="timezone in groupTimezones"
:value="`${group}/${timezone}`"
:key="timezone"
>
{{ sanitize(timezone) }}
</option>
</optgroup>
</b-select>
</b-field>
<em>{{
$t("Timezone detected as {timezone}.", {
timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
})
}}</em>
</div>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
@ -42,6 +54,7 @@ import { USER_SETTINGS, SET_USER_SETTINGS, UPDATE_USER_LOCALE } from "../../grap
import { IConfig } from "../../types/config.model"; import { IConfig } from "../../types/config.model";
import { ICurrentUser } from "../../types/current-user.model"; import { ICurrentUser } from "../../types/current-user.model";
import langs from "../../i18n/langs.json"; import langs from "../../i18n/langs.json";
import RouteName from "../../router/name";
@Component({ @Component({
apollo: { apollo: {
@ -58,6 +71,8 @@ export default class Preferences extends Vue {
locale: string | null = null; locale: string | null = null;
RouteName = RouteName;
@Watch("loggedUser") @Watch("loggedUser")
setSavedTimezone(loggedUser: ICurrentUser) { setSavedTimezone(loggedUser: ICurrentUser) {
if (loggedUser && loggedUser.settings.timezone) { if (loggedUser && loggedUser.settings.timezone) {

2
js/tsconfig.json
View File

@ -27,4 +27,4 @@
"tests/**/*.tsx" "tests/**/*.tsx"
], ],
"exclude": ["node_modules"] "exclude": ["node_modules"]
} }

153
js/yarn.lock
View File

@ -1144,9 +1144,9 @@
"@types/geojson" "*" "@types/geojson" "*"
"@types/lodash@^4.14.141": "@types/lodash@^4.14.141":
version "4.14.156" version "4.14.157"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.156.tgz#cbe30909c89a1feeb7c60803e785344ea0ec82d1" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.157.tgz#fdac1c52448861dfde1a2e1515dbc46e54926dc8"
integrity sha512-l2AgHXcKUwx2DsvP19wtRPqZ4NkONjmorOdq4sMcxIjqdIuuV/ULo2ftuv4NUpevwfW7Ju/UKLqo0ZXuEt/8lQ== integrity sha512-Ft5BNFmv2pHDgxV5JDsndOWTRJ+56zte0ZpYLowp03tW+K+t8u8YMOzAnpuqPgzX6WO1XpDIUm7u04M8vdDiVQ==
"@types/minimatch@*": "@types/minimatch@*":
version "3.0.3" version "3.0.3"
@ -1164,9 +1164,9 @@
integrity sha512-6nlq2eEh75JegDGUXis9wGTYIJpUvbori4qx++PRKQsV3YRkaqUNPNykzphniqPSZADXCouBuAnyptjUkMkhvw== integrity sha512-6nlq2eEh75JegDGUXis9wGTYIJpUvbori4qx++PRKQsV3YRkaqUNPNykzphniqPSZADXCouBuAnyptjUkMkhvw==
"@types/node@*", "@types/node@>=6": "@types/node@*", "@types/node@>=6":
version "14.0.13" version "14.0.14"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.13.tgz#ee1128e881b874c371374c1f72201893616417c9" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.14.tgz#24a0b5959f16ac141aeb0c5b3cd7a15b7c64cbce"
integrity sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA== integrity sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==
"@types/normalize-package-data@^2.4.0": "@types/normalize-package-data@^2.4.0":
version "2.4.0" version "2.4.0"
@ -1629,14 +1629,14 @@
prettier "^1.18.2" prettier "^1.18.2"
"@vue/eslint-config-airbnb@^5.0.2": "@vue/eslint-config-airbnb@^5.0.2":
version "5.0.2" version "5.1.0"
resolved "https://registry.yarnpkg.com/@vue/eslint-config-airbnb/-/eslint-config-airbnb-5.0.2.tgz#4e3ba49e8d7a7c0bf6b244b4d7a2fe488bfb9371" resolved "https://registry.yarnpkg.com/@vue/eslint-config-airbnb/-/eslint-config-airbnb-5.1.0.tgz#6a72e166af18ac821120ff36aae8b76b940f28aa"
integrity sha512-9wD5OfdkQ0TDYLRynP46AxOHck866zkvZoT8MgjyJNBPegTtrsIQ3cu10ZF4Nl/aU5qKeSOaY58D4YXPqF0NZg== integrity sha512-kme7oQRb3AY8UWd3X7d/uTkmrsbkhwcxhS7rvbxdvfJykLDy4GtO4MdQhmKWa7b8R/gjIMfBXaCN6XUZU9PC6Q==
dependencies: dependencies:
eslint-config-airbnb-base "^14.0.0" eslint-config-airbnb-base "^14.0.0"
eslint-import-resolver-node "^0.3.3" eslint-import-resolver-node "^0.3.4"
eslint-import-resolver-webpack "^0.11.1" eslint-import-resolver-webpack "^0.12.2"
eslint-plugin-import "^2.18.2" eslint-plugin-import "^2.21.2"
"@vue/eslint-config-prettier@^6.0.0": "@vue/eslint-config-prettier@^6.0.0":
version "6.0.0" version "6.0.0"
@ -2523,13 +2523,13 @@ atob@^2.1.2:
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
autoprefixer@^9.8.0: autoprefixer@^9.8.0:
version "9.8.2" version "9.8.4"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.2.tgz#7347396ee576b18687041bfbacd76d78e27baa56" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.4.tgz#736f1012673a70fa3464671d78d41abd54512863"
integrity sha512-9UwMMU8Rg7Fj0c55mbOpXrr/2WrRqoOwOlLNTyyYt+nhiyQdIBWipp5XWzt+Lge8r3DK5y+EHMc1OBf8VpZA6Q== integrity sha512-84aYfXlpUe45lvmS+HoAWKCkirI/sw4JK0/bTeeqgHYco3dcsOn0NqdejISjptsYwNji/21dnkDri9PsYKk89A==
dependencies: dependencies:
browserslist "^4.12.0" browserslist "^4.12.0"
caniuse-lite "^1.0.30001084" caniuse-lite "^1.0.30001087"
kleur "^4.0.1" colorette "^1.2.0"
normalize-range "^0.1.2" normalize-range "^0.1.2"
num2fraction "^1.2.2" num2fraction "^1.2.2"
postcss "^7.0.32" postcss "^7.0.32"
@ -2919,14 +2919,14 @@ browserslist@4.7.0:
node-releases "^1.1.29" node-releases "^1.1.29"
browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5: browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
version "4.12.0" version "4.12.1"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.0.tgz#06c6d5715a1ede6c51fc39ff67fd647f740b656d" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.12.1.tgz#6d08bef149b70d153930780ba762644e0f329122"
integrity sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg== integrity sha512-WMjXwFtPskSW1pQUDJRxvRKRkeCr7usN0O/Za76N+F4oadaTdQHotSGcX9jT/Hs7mSKPkyMFNvqawB/1HzYDKQ==
dependencies: dependencies:
caniuse-lite "^1.0.30001043" caniuse-lite "^1.0.30001088"
electron-to-chromium "^1.3.413" electron-to-chromium "^1.3.481"
node-releases "^1.1.53" escalade "^3.0.1"
pkg-up "^2.0.0" node-releases "^1.1.58"
buble@0.19.8, buble@^0.19.7: buble@0.19.8, buble@^0.19.7:
version "0.19.8" version "0.19.8"
@ -3185,10 +3185,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2" lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0" lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001084: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30000989, caniuse-lite@^1.0.30001087, caniuse-lite@^1.0.30001088:
version "1.0.30001087" version "1.0.30001088"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001087.tgz#4a0bdc5998a114fcf8b7954e7ba6c2c29831c54a" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001088.tgz#23a6b9e192106107458528858f2c0e0dba0d9073"
integrity sha512-KAQRGtt+eGCQBSp2iZTQibdCf9oe6cNTi5lmpsW38NnxP4WMYzfU6HCRmh4kJyh6LrTM9/uyElK4xcO93kafpg== integrity sha512-6eYUrlShRYveyqKG58HcyOfPgh3zb2xqs7NvT2VVtP3hEUeeWvc3lqhpeMTxYWBBeeaT9A4bKsrtjATm66BTHg==
capture-stack-trace@^1.0.0: capture-stack-trace@^1.0.0:
version "1.0.1" version "1.0.1"
@ -3692,6 +3692,11 @@ color@^3.0.0:
color-convert "^1.9.1" color-convert "^1.9.1"
color-string "^1.5.2" color-string "^1.5.2"
colorette@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.0.tgz#45306add826d196e8c87236ac05d797f25982e63"
integrity sha512-soRSroY+OF/8OdA3PTQXwaDJeMc7TfknKKrxeSCencL2a4+Tx5zhxmmv7hdpCjhKBjehzp8+bwe/T68K0hpIjw==
colors@^1.1.2: colors@^1.1.2:
version "1.4.0" version "1.4.0"
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
@ -4445,7 +4450,7 @@ de-indent@^1.0.2:
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9: debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
version "2.6.9" version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@ -4932,10 +4937,10 @@ ejs@^2.6.1:
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.413: electron-to-chromium@^1.3.103, electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.481:
version "1.3.481" version "1.3.483"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.481.tgz#0d59e72a0aaeb876b43fb1d6e84bf0dfc99617e8" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.483.tgz#9269e7cfc1c8e72709824da171cbe47ca5e3ca9e"
integrity sha512-q2PeCP2PQXSYadDo9uNY+uHXjdB9PcsUpCVoGlY8TZOPHGlXdevlqW9PkKeqCxn2QBkGB8b6AcMO++gh8X82bA== integrity sha512-+05RF8S9rk8S0G8eBCqBRBaRq7+UN3lDs2DAvnG8SBSgQO3hjy0+qt4CmRk5eiuGbTcaicgXfPmBi31a+BD3lg==
elegant-spinner@^1.0.1: elegant-spinner@^1.0.1:
version "1.0.1" version "1.0.1"
@ -4999,6 +5004,15 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
dependencies: dependencies:
once "^1.4.0" once "^1.4.0"
enhanced-resolve@^0.9.1:
version "0.9.1"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e"
integrity sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.2.0"
tapable "^0.1.8"
enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1: enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1:
version "4.2.0" version "4.2.0"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.2.0.tgz#5d43bda4a0fd447cb0ebbe71bef8deff8805ad0d"
@ -5008,15 +5022,6 @@ enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0, enhanced-resolve@^4.1.1:
memory-fs "^0.5.0" memory-fs "^0.5.0"
tapable "^1.0.0" tapable "^1.0.0"
enhanced-resolve@~0.9.0:
version "0.9.1"
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e"
integrity sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.2.0"
tapable "^0.1.8"
entities@^1.1.1: entities@^1.1.1:
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
@ -5091,6 +5096,11 @@ es6-promisify@^5.0.0:
dependencies: dependencies:
es6-promise "^4.0.3" es6-promise "^4.0.3"
escalade@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.0.1.tgz#52568a77443f6927cd0ab9c73129137533c965ed"
integrity sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA==
escape-html@~1.0.3: escape-html@~1.0.3:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@ -5129,7 +5139,7 @@ eslint-config-prettier@^6.0.0, eslint-config-prettier@^6.11.0:
dependencies: dependencies:
get-stdin "^6.0.0" get-stdin "^6.0.0"
eslint-import-resolver-node@^0.3.3: eslint-import-resolver-node@^0.3.3, eslint-import-resolver-node@^0.3.4:
version "0.3.4" version "0.3.4"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
@ -5137,21 +5147,21 @@ eslint-import-resolver-node@^0.3.3:
debug "^2.6.9" debug "^2.6.9"
resolve "^1.13.1" resolve "^1.13.1"
eslint-import-resolver-webpack@^0.11.1: eslint-import-resolver-webpack@^0.12.2:
version "0.11.1" version "0.12.2"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.11.1.tgz#fcf1fd57a775f51e18f442915f85dd6ba45d2f26" resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.2.tgz#769e86cd0c752a1536c19855ebd90aa14ce384ee"
integrity sha512-eK3zR7xVQR/MaoBWwGuD+CULYVuqe5QFlDukman71aI6IboCGzggDUohHNfu1ZeBnbHcUHJc0ywWoXUBNB6qdg== integrity sha512-7Jnm4YAoNNkvqPaZkKdIHsKGmv8/uNnYC5QsXkiSodvX4XEEfH2AKOna98FK52fCDXm3q4HzuX+7pRMKkJ64EQ==
dependencies: dependencies:
array-find "^1.0.0" array-find "^1.0.0"
debug "^2.6.8" debug "^2.6.9"
enhanced-resolve "~0.9.0" enhanced-resolve "^0.9.1"
find-root "^1.1.0" find-root "^1.1.0"
has "^1.0.1" has "^1.0.3"
interpret "^1.0.0" interpret "^1.2.0"
lodash "^4.17.4" lodash "^4.17.15"
node-libs-browser "^1.0.0 || ^2.0.0" node-libs-browser "^1.0.0 || ^2.0.0"
resolve "^1.10.0" resolve "^1.13.1"
semver "^5.3.0" semver "^5.7.1"
eslint-loader@^2.2.1: eslint-loader@^2.2.1:
version "2.2.1" version "2.2.1"
@ -5179,7 +5189,7 @@ eslint-plugin-cypress@^2.10.3:
dependencies: dependencies:
globals "^11.12.0" globals "^11.12.0"
eslint-plugin-import@^2.18.2, eslint-plugin-import@^2.20.2: eslint-plugin-import@^2.20.2, eslint-plugin-import@^2.21.2:
version "2.21.2" version "2.21.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.21.2.tgz#8fef77475cc5510801bedc95f84b932f7f334a7c" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.21.2.tgz#8fef77475cc5510801bedc95f84b932f7f334a7c"
integrity sha512-FEmxeGI6yaz+SnEB6YgNHlQK1Bs2DKLM+YF+vuTk5H8J9CLbJLtlPvRFgZZ2+sXiKAlN5dpdlrWOjK8ZoZJpQA== integrity sha512-FEmxeGI6yaz+SnEB6YgNHlQK1Bs2DKLM+YF+vuTk5H8J9CLbJLtlPvRFgZZ2+sXiKAlN5dpdlrWOjK8ZoZJpQA==
@ -6736,7 +6746,7 @@ has-yarn@^2.1.0:
resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
has@^1.0.0, has@^1.0.1, has@^1.0.3: has@^1.0.0, has@^1.0.3:
version "1.0.3" version "1.0.3"
resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
@ -7261,7 +7271,7 @@ internal-ip@^4.3.0:
default-gateway "^4.2.0" default-gateway "^4.2.0"
ipaddr.js "^1.9.0" ipaddr.js "^1.9.0"
interpret@^1.0.0, interpret@^1.2.0, interpret@^1.4.0: interpret@^1.2.0, interpret@^1.4.0:
version "1.4.0" version "1.4.0"
resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
@ -7846,9 +7856,9 @@ jest-worker@^25.4.0:
supports-color "^7.0.0" supports-color "^7.0.0"
js-base64@^2.1.8, js-base64@^2.1.9, js-base64@^2.3.2: js-base64@^2.1.8, js-base64@^2.1.9, js-base64@^2.3.2:
version "2.6.1" version "2.6.2"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.1.tgz#c328374225d2e65569791ded73c258e2c59334c7" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.2.tgz#cf9301bc5cc756892a9a6c8d7138322e5944fb0d"
integrity sha512-G5x2saUTupU9D/xBY9snJs3TxvwX8EkpLFiYlPpDt/VmMHOXprnSU1nxiTmFbijCX4BLF/cMRIfAcC5BiMYgFQ== integrity sha512-1hgLrLIrmCgZG+ID3VoLNLOSwjGnoZa8tyrUdEteMeIzsT6PH7PMLyUvbDwzNE56P3PNxyvuIOx4Uh2E5rzQIw==
js-beautify@^1.6.12: js-beautify@^1.6.12:
version "1.11.0" version "1.11.0"
@ -8212,11 +8222,6 @@ kleur@^3.0.3:
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
kleur@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.0.1.tgz#3d4948534b666e2578f93b6fafb62108e64f05ef"
integrity sha512-Qs6SqCLm63rd0kNVh+wO4XsWLU6kgfwwaPYsLiClWf0Tewkzsa6MvB21bespb8cz+ANS+2t3So1ge3gintzhlw==
latest-version@^3.0.0: latest-version@^3.0.0:
version "3.1.0" version "3.1.0"
resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15" resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz#a205383fea322b33b5ae3b18abee0dc2f356ee15"
@ -9386,7 +9391,7 @@ node-ipc@^9.1.1:
util "^0.11.0" util "^0.11.0"
vm-browserify "^1.0.1" vm-browserify "^1.0.1"
node-releases@^1.1.29, node-releases@^1.1.3, node-releases@^1.1.53: node-releases@^1.1.29, node-releases@^1.1.3, node-releases@^1.1.58:
version "1.1.58" version "1.1.58"
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.58.tgz#8ee20eef30fa60e52755fcc0942def5a734fe935"
integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg== integrity sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==
@ -10286,7 +10291,7 @@ pkg-dir@^4.1.0:
dependencies: dependencies:
find-up "^4.0.0" find-up "^4.0.0"
pkg-up@2.0.0, pkg-up@^2.0.0: pkg-up@2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
@ -11019,9 +11024,9 @@ prosemirror-view@1.14.7:
prosemirror-transform "^1.1.0" prosemirror-transform "^1.1.0"
prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3: prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3:
version "1.14.13" version "1.15.0"
resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.14.13.tgz#c86967b2679652ae21f610620f5089ba654cb413" resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.15.0.tgz#372102c91d05b3b0f371b3eb59aeacedb5011bba"
integrity sha512-UmAAi72eHApZ6KMklUTORc9FkmGXyeI+rWtqxqZ+6V4vs6K6spbOVozQChKmtVL2EjQlOILvJIJdWKWu0Hkvpw== integrity sha512-a7Q76sO/DCZr2UX2Rv1Rbw52cr9kVIz8iJOf/rq4mPN1NA3lugq2BKJgUMwlB3U4utyw3olLigqouRHM48NJyg==
dependencies: dependencies:
prosemirror-model "^1.1.0" prosemirror-model "^1.1.0"
prosemirror-state "^1.0.0" prosemirror-state "^1.0.0"
@ -12292,7 +12297,7 @@ semver-diff@^2.0.0:
dependencies: dependencies:
semver "^5.0.3" semver "^5.0.3"
"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0: "semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0, semver@^5.7.1:
version "5.7.1" version "5.7.1"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@ -14314,9 +14319,9 @@ vue-inbrowser-compiler@^4.23.3:
walkes "^0.2.1" walkes "^0.2.1"
vue-loader@^15.9.2: vue-loader@^15.9.2:
version "15.9.2" version "15.9.3"
resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.2.tgz#ae01f5f4c9c6a04bff4483912e72ef91a402c1ae" resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz#0de35d9e555d3ed53969516cac5ce25531299dda"
integrity sha512-oXBubaY//CYEISBlHX+c2YPJbmOH68xXPXjFv4MAgPqQvUsnjrBAjCJi8HXZ/r/yfn0tPL5VZj1Zcp8mJPI8VA== integrity sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==
dependencies: dependencies:
"@vue/component-compiler-utils" "^3.1.0" "@vue/component-compiler-utils" "^3.1.0"
hash-sum "^1.0.2" hash-sum "^1.0.2"