Merge branch 'improve-registration-page' into 'master'
Improve registration page and add a rules option See merge request framasoft/mobilizon!467
This commit is contained in:
Thomas Citharel
commit
49de432c27
@ -111,6 +111,7 @@ export const ADMIN_SETTINGS_FRAGMENT = gql`
|
||||
instanceTerms
|
||||
instanceTermsType
|
||||
instanceTermsUrl
|
||||
instanceRules
|
||||
registrationsOpen
|
||||
}
|
||||
`;
|
||||
@ -131,6 +132,7 @@ export const SAVE_ADMIN_SETTINGS = gql`
|
||||
$instanceTerms: String
|
||||
$instanceTermsType: InstanceTermsType
|
||||
$instanceTermsUrl: String
|
||||
$instanceRules: String
|
||||
$registrationsOpen: Boolean
|
||||
) {
|
||||
saveAdminSettings(
|
||||
@ -139,6 +141,7 @@ export const SAVE_ADMIN_SETTINGS = gql`
|
||||
instanceTerms: $instanceTerms
|
||||
instanceTermsType: $instanceTermsType
|
||||
instanceTermsUrl: $instanceTermsUrl
|
||||
instanceRules: $instanceRules
|
||||
registrationsOpen: $registrationsOpen
|
||||
) {
|
||||
...adminSettingsFragment
|
||||
|
||||
@ -78,6 +78,14 @@ export const TERMS = gql`
|
||||
}
|
||||
`;
|
||||
|
||||
export const RULES = gql`
|
||||
query Rules {
|
||||
config {
|
||||
rules
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
export const TIMEZONES = gql`
|
||||
query {
|
||||
config {
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
"Are you sure you want to cancel your participation at event \"{title}\"?": "Вы сапраўды хочаце адмовіцца ад удзелу ў падзеі «{title}»?",
|
||||
"Are you sure you want to delete this event? This action cannot be reverted.": "Вы сапраўды хочаце выдаліць гэту падзею? Гэта дзеянне нельга адмяніць.",
|
||||
"Avatar": "Аватар",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Каб увайсці з уліковым запісам, патрэбна спачатку перайсці па спасылцы, якая прыйшла вам у лісце",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Каб увайсці з уліковым запісам, патрэбна спачатку перайсці па спасылцы, якая прыйшла вам у лісце.",
|
||||
"By @{username}": "Ад @{username}",
|
||||
"Cancel": "Адмяніць",
|
||||
"Cancel creation": "Адмяніць стварэнне",
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
"Are you sure you want to delete this event? This action cannot be reverted.": "Segur que vols esborrar aquesta activitat? Aquesta acció és irreversible.",
|
||||
"Avatar": "Avatar",
|
||||
"Back to previous page": "Tornar a la pàgina anterior",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Per a validar el compte i poder entrar, has de clicar l'enllaç que t'hem enviat en el mail",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Per a validar el compte i poder entrar, has de clicar l'enllaç que t'hem enviat en el mail.",
|
||||
"By @{username}": "De @{username}",
|
||||
"Cancel": "Canceŀla",
|
||||
"Cancel anonymous participation": "Cancelar la participació anònima",
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
"Are you sure you want to delete this event? This action cannot be reverted.": "Bist Du dir sicher, dass Du diese Veranstaltung löschen möchtest? Dies kann nicht rückgängig gemacht werden.",
|
||||
"Avatar": "Profilbild",
|
||||
"Back to previous page": "Zurück zur vorherigen Seite",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Bevor Du dich einloggen kannst, musst Du den Link anklicken, um deinen Account zu überprüfen.",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Bevor Du dich einloggen kannst, musst Du den Link anklicken, um deinen Account zu überprüfen.",
|
||||
"By @{username}": "Nach @{username}",
|
||||
"Cancel": "Abbrechen",
|
||||
"Cancel creation": "Erstellung abbrechen",
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
"Are you sure you want to delete this event? This action cannot be reverted.": "Are you sure you want to delete this event? This action cannot be reverted.",
|
||||
"Avatar": "Avatar",
|
||||
"Back to previous page": "Back to previous page",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Before you can login, you need to click on the link inside it to validate your account",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Before you can login, you need to click on the link inside it to validate your account.",
|
||||
"By @{username}": "By @{username}",
|
||||
"By {username} and {group}": "By {username} and {group}",
|
||||
"Cancel anonymous participation": "Cancel anonymous participation",
|
||||
@ -119,7 +119,6 @@
|
||||
"Either the participation has already been validated, either the validation token is incorrect.": "Either the participation has already been validated, either the validation token is incorrect.",
|
||||
"Email": "Email",
|
||||
"Ends on…": "Ends on…",
|
||||
"Enjoy discovering Mobilizon!": "Enjoy discovering Mobilizon!",
|
||||
"Enter the link URL": "Enter the link URL",
|
||||
"Enter your own terms. HTML tags allowed. Mobilizon.org's terms are provided as template.": "Enter your own terms. HTML tags allowed. Mobilizon.org's terms are provided as template.",
|
||||
"Error while changing email": "Error while changing email",
|
||||
@ -289,7 +288,6 @@
|
||||
"Please contact this instance's Mobilizon admin if you think this is a mistake.": "Please contact this instance's Mobilizon admin if you think this is a mistake.",
|
||||
"Please enter your password to confirm this action.": "Please enter your password to confirm this action.",
|
||||
"Please make sure the address is correct and that the page hasn't been moved.": "Please make sure the address is correct and that the page hasn't been moved.",
|
||||
"Please read the full rules": "Please read the full rules",
|
||||
"Please refresh the page and retry.": "Please refresh the page and retry.",
|
||||
"Post a comment": "Post a comment",
|
||||
"Post a reply": "Post a reply",
|
||||
@ -461,7 +459,6 @@
|
||||
"Your email is not whitelisted, you can't register.": "Your email is not whitelisted, you can't register.",
|
||||
"Your email will only be used to confirm that you're a real person and send you eventual updates for this event. It will NOT be transmitted to other instances or to the event organizer.": "Your email will only be used to confirm that you're a real person and send you eventual updates for this event. It will NOT be transmitted to other instances or to the event organizer.",
|
||||
"Your federated identity": "Your federated identity",
|
||||
"Your local administrator resumed its policy:": "Your local administrator resumed its policy:",
|
||||
"Your participation has been confirmed": "Your participation has been confirmed",
|
||||
"Your participation has been rejected": "Your participation has been rejected",
|
||||
"Your participation has been requested": "Your participation has been requested",
|
||||
@ -627,5 +624,22 @@
|
||||
"Participations": "Participations",
|
||||
"Nothing to see here": "Nothing to see here",
|
||||
"Not confirmed": "Not confirmed",
|
||||
"{actor} suspended profile {profile}": "{actor} suspended profile {profile}"
|
||||
"{actor} suspended profile {profile}": "{actor} suspended profile {profile}",
|
||||
"Suspend": "Suspend",
|
||||
"Unsuspend": "Unsuspend",
|
||||
"None": "None",
|
||||
"Disabled": "Disabled",
|
||||
"Activated": "Activated",
|
||||
"No profile matches the filters": "No profile matches the filters",
|
||||
"Mobilizon": "Mobilizon",
|
||||
"{instanceName} is an instance of the {mobilizon} software.": "{instanceName} is an instance of the {mobilizon} software.",
|
||||
"Instance Rules": "Instance Rules",
|
||||
"Rules": "Rules",
|
||||
"No rules defined yet.": "No rules defined yet.",
|
||||
"full rules": "full rules",
|
||||
"instance rules": "instance rules",
|
||||
"terms of service": "terms of service",
|
||||
"Please read the instance's {fullRules}": "Please read the instance's {fullRules}",
|
||||
"I agree to the {instanceRules} and {termsOfService}": "I agree to the {instanceRules} and {termsOfService}",
|
||||
"This email is already used.": "This email is already used."
|
||||
}
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
"Assigned to": "Asignado a",
|
||||
"Avatar": "Avatar",
|
||||
"Back to previous page": "Volver a la página anterior",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Antes de iniciar sesión, debe hacer clic en el enlace que se encuentra dentro para validar su cuenta",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Antes de iniciar sesión, debe hacer clic en el enlace que se encuentra dentro para validar su cuenta.",
|
||||
"Bold": "Negrita",
|
||||
"By @{group}": "Por @{group}",
|
||||
"By @{username}": "Por @{username}",
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
"Are you sure you want to delete this event? This action cannot be reverted.": "Haluatko varmasti poistaa tämän tapahtuman? Toimintoa ei voi perua.",
|
||||
"Avatar": "Avatar",
|
||||
"Back to previous page": "Palaa edelliselle sivulle",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Sinun on ennen sisäänkirjautumista vahvistettava tilisi napsauttamalla siinä olevaa linkkiä",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Sinun on ennen sisäänkirjautumista vahvistettava tilisi napsauttamalla siinä olevaa linkkiä.",
|
||||
"By @{username}": "Tehnyt @{username}",
|
||||
"Cancel": "Peruuta",
|
||||
"Cancel anonymous participation": "Peruuta anonyymi osallistuminen",
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
"Assigned to": "Assigné à",
|
||||
"Avatar": "Avatar",
|
||||
"Back to previous page": "Retour à la page précédente",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Avant que vous puissiez vous enregistrer, vous devez cliquer sur le lien à l'intérieur pour valider votre compte",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Avant que vous puissiez vous enregistrer, vous devez cliquer sur le lien à l'intérieur pour valider votre compte.",
|
||||
"Bold": "Gras",
|
||||
"By @{group}": "Par @{group}",
|
||||
"By @{username}": "Par @{username}",
|
||||
@ -647,5 +647,22 @@
|
||||
"Participations": "Participations",
|
||||
"Nothing to see here": "Il n'y a rien à voir ici",
|
||||
"Not confirmed": "Non confirmé·e",
|
||||
"{actor} suspended profile {profile}": "{actor} a suspendu le profil {profile}"
|
||||
"{actor} suspended profile {profile}": "{actor} a suspendu le profil {profile}",
|
||||
"Suspend": "Suspendre",
|
||||
"Unsuspend": "Annuler la suspension",
|
||||
"None": "Aucun",
|
||||
"Disabled": "Désactivé",
|
||||
"Activated": "Activé",
|
||||
"No profile matches the filters": "Aucun profil ne correspond aux filtres",
|
||||
"Mobilizon": "Mobilizon",
|
||||
"{instanceName} is an instance of the {mobilizon} software.": "{instanceName} est une instance du logiciel {mobilizon}.",
|
||||
"Instance Rules": "Règles de l'instance",
|
||||
"Rules": "Règles",
|
||||
"No rules defined yet.": "Pas de règles définies pour le moment.",
|
||||
"full rules": "règles complètes",
|
||||
"instance rules": "règles de l'instance",
|
||||
"terms of service": "conditions générales d'utilisation",
|
||||
"Please read the instance's {fullRules}": "Merci de lire les {fullRules} de l'instance",
|
||||
"I agree to the {instanceRules} and {termsOfService}": "J'accepte les {instanceRules} et les {termsOfService}",
|
||||
"This email is already used.": "Cette adresse email est déjà utilisée."
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
"Are you sure you want to cancel your participation at event \"{title}\"?": "Bent u zeker dat u uw deelname aan het evenement \"{title}\" wil annuleren?",
|
||||
"Are you sure you want to delete this event? This action cannot be reverted.": "Bent u zeker dat u dit evenement wil verwijderen? Dit kan niet ongedaan gemaakt worden.",
|
||||
"Avatar": "Profielfoto",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Voordat u zich kan aanmelden, moet u op de link erin klikken om uw account te valideren",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Voordat u zich kan aanmelden, moet u op de link erin klikken om uw account te valideren.",
|
||||
"By @{username}": "Door @{username}",
|
||||
"Cancel": "Annuleren",
|
||||
"Cancel creation": "Aanmaken annuleren",
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
"Assigned to": "Assignat a",
|
||||
"Avatar": "Avatar",
|
||||
"Back to previous page": "Tornar a pas pagina precedenta",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Abans que poscatz vos marcar, devètz clicar lo ligam dedins per validar lo compte",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Abans que poscatz vos marcar, devètz clicar lo ligam dedins per validar lo compte.",
|
||||
"By @{group}": "Per @{group}",
|
||||
"By @{username}": "Per @{username}",
|
||||
"By @{username} and @{group}": "Per @{username} e @{group}",
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
"Are you sure you want to cancel your participation at event \"{title}\"?": "Czy na pewno chcesz wycofać swój udział w wydarzeniu „{title}”?",
|
||||
"Are you sure you want to delete this event? This action cannot be reverted.": "Czy na pewno chcesz usunąć to wydarzenie? To działanie nie może zostać odwrócone.",
|
||||
"Avatar": "Awatar",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Zanim się zalogujesz, musisz odwiedzić odnośnik znajdujący się w niej, aby potwierdzić swoje konto",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Zanim się zalogujesz, musisz odwiedzić odnośnik znajdujący się w niej, aby potwierdzić swoje konto.",
|
||||
"By @{username}": "Od @{username}",
|
||||
"Cancel": "Anuluj",
|
||||
"Cancel creation": "Anuluj tworzenie",
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
"Are you sure you want to delete this event? This action cannot be reverted.": "Você está seguro que quer apagar este evento? Esta ação não pode ser desfeita.",
|
||||
"Avatar": "Avatar",
|
||||
"Back to previous page": "Voltar à página anterior",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Antes de você poder começar, você precisa clicar no link que está no interior para validar a sua conta",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Antes de você poder começar, você precisa clicar no link que está no interior para validar a sua conta.",
|
||||
"By @{username}": "Por @{username}",
|
||||
"Cancel": "Cancelar",
|
||||
"Cancel anonymous participation": "Cancelar participação anônima",
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
"Are you sure you want to cancel your participation at event \"{title}\"?": "Är du säker på att du vill avsluta ditt deltagande i evenemanget \"{title}\"?",
|
||||
"Are you sure you want to delete this event? This action cannot be reverted.": "Är du säker på att du vill radera det här evenemanget? Den här handlingen kan inte ångras.",
|
||||
"Avatar": "Avatar",
|
||||
"Before you can login, you need to click on the link inside it to validate your account": "Innan du loggar in måste du klicka på länken inuti det för att validera ditt konto",
|
||||
"Before you can login, you need to click on the link inside it to validate your account.": "Innan du loggar in måste du klicka på länken inuti det för att validera ditt konto.",
|
||||
"By @{username}": "Av @{username}",
|
||||
"Cancel": "Avbryt",
|
||||
"Cancel creation": "Avbryt skapandet",
|
||||
|
||||
@ -73,6 +73,12 @@ const router = new Router({
|
||||
component: () => import(/* webpackChunkName: "cookies" */ "@/views/Terms.vue"),
|
||||
meta: { requiredAuth: false },
|
||||
},
|
||||
{
|
||||
path: "/rules",
|
||||
name: RouteName.RULES,
|
||||
component: () => import(/* webpackChunkName: "cookies" */ "@/views/Rules.vue"),
|
||||
meta: { requiredAuth: false },
|
||||
},
|
||||
{
|
||||
path: "/interact",
|
||||
name: RouteName.INTERACT,
|
||||
|
||||
@ -13,6 +13,7 @@ enum GlobalRouteName {
|
||||
SEARCH = "Search",
|
||||
TERMS = "TERMS",
|
||||
INTERACT = "INTERACT",
|
||||
RULES = "RULES",
|
||||
}
|
||||
|
||||
// Hack to merge enums
|
||||
|
||||
@ -20,5 +20,6 @@ export interface IAdminSettings {
|
||||
instanceTerms: string;
|
||||
instanceTermsType: InstanceTermsType;
|
||||
instanceTermsUrl: string | null;
|
||||
instanceRules: string;
|
||||
registrationsOpen: boolean;
|
||||
}
|
||||
|
||||
@ -59,6 +59,7 @@ export interface IConfig {
|
||||
type: InstanceTermsType;
|
||||
url: string;
|
||||
};
|
||||
rules: string;
|
||||
resourceProviders: IProvider[];
|
||||
timezones: string[];
|
||||
features: {
|
||||
|
||||
@ -82,7 +82,7 @@ export const errors: IError[] = [
|
||||
},
|
||||
{
|
||||
match: /^This email is already used.$/,
|
||||
value: null,
|
||||
value: i18n.t("This email is already used.") as string,
|
||||
},
|
||||
{
|
||||
match: /^User account not confirmed$/,
|
||||
|
||||
@ -39,9 +39,13 @@
|
||||
</b-field>
|
||||
|
||||
<p class="control has-text-centered">
|
||||
<b-button type="is-primary" size="is-large" native-type="submit">{{
|
||||
$t("Create my profile")
|
||||
}}</b-button>
|
||||
<b-button
|
||||
type="is-primary"
|
||||
size="is-large"
|
||||
native-type="submit"
|
||||
:disabled="sendingValidation"
|
||||
>{{ $t("Create my profile") }}</b-button
|
||||
>
|
||||
</p>
|
||||
</form>
|
||||
|
||||
@ -54,11 +58,13 @@
|
||||
})
|
||||
}}
|
||||
</h2>
|
||||
<p>{{ $t("A validation email was sent to {email}", { email }) }}</p>
|
||||
<i18n path="A validation email was sent to {email}" tag="p">
|
||||
<code slot="email">{{ email }}</code>
|
||||
</i18n>
|
||||
<p>
|
||||
{{
|
||||
$t(
|
||||
"Before you can login, you need to click on the link inside it to validate your account"
|
||||
"Before you can login, you need to click on the link inside it to validate your account."
|
||||
)
|
||||
}}
|
||||
</p>
|
||||
@ -141,6 +147,7 @@ export default class Register extends mixins(identityEditionMixin) {
|
||||
);
|
||||
console.error("Error while registering person", errorCatched);
|
||||
console.error("Errors while registering person", this.errors);
|
||||
this.sendingValidation = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,6 +15,9 @@
|
||||
<p class="content" v-else>{{ $t("Registration is closed.") }}</p>
|
||||
</b-switch>
|
||||
</b-field>
|
||||
<b-field :label="$t('Instance Rules')">
|
||||
<b-input type="textarea" v-model="adminSettings.instanceRules" />
|
||||
</b-field>
|
||||
<b-field :label="$t('Instance Terms Source')">
|
||||
<div class="columns">
|
||||
<div class="column is-one-third-desktop">
|
||||
|
||||
35
js/src/views/Rules.vue
Normal file
35
js/src/views/Rules.vue
Normal file
@ -0,0 +1,35 @@
|
||||
<template>
|
||||
<div class="container section" v-if="config">
|
||||
<h2 class="title">{{ $t("Rules") }}</h2>
|
||||
<div class="content" v-html="config.rules" v-if="config.rules" />
|
||||
<p v-else>{{ $t("No rules defined yet.") }}</p>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { Component, Vue, Watch } from "vue-property-decorator";
|
||||
import { RULES } from "@/graphql/config";
|
||||
import { IConfig } from "@/types/config.model";
|
||||
import { InstanceTermsType } from "@/types/admin.model";
|
||||
import RouteName from "../router/name";
|
||||
|
||||
@Component({
|
||||
apollo: {
|
||||
config: {
|
||||
query: RULES,
|
||||
},
|
||||
},
|
||||
})
|
||||
export default class Rules extends Vue {
|
||||
config!: IConfig;
|
||||
|
||||
RouteName = RouteName;
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
@import "@/variables.scss";
|
||||
|
||||
main > .container {
|
||||
background: $white;
|
||||
}
|
||||
</style>
|
||||
@ -3,6 +3,12 @@
|
||||
<section class="hero">
|
||||
<div class="hero-body">
|
||||
<h1 class="title">{{ $t("Register an account on Mobilizon!") }}</h1>
|
||||
<i18n tag="p" path="{instanceName} is an instance of the {mobilizon} software.">
|
||||
<b slot="instanceName">{{ config.name }}</b>
|
||||
<a href="https://joinmobilizon.org" target="_blank" slot="mobilizon">{{
|
||||
$t("Mobilizon")
|
||||
}}</a>
|
||||
</i18n>
|
||||
</div>
|
||||
</section>
|
||||
<section>
|
||||
@ -22,15 +28,12 @@
|
||||
<hr />
|
||||
<div class="content">
|
||||
<subtitle>{{ $t("About this instance") }}</subtitle>
|
||||
<div class="content">
|
||||
<p>{{ $t("Your local administrator resumed its policy:") }}</p>
|
||||
<ul>
|
||||
<li>{{ $t("Enjoy discovering Mobilizon!") }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- <p>-->
|
||||
<!-- {{ $t('Please read the full rules') }}-->
|
||||
<!-- </p>-->
|
||||
<div class="content" v-html="config.description"></div>
|
||||
<i18n path="Please read the instance's {fullRules}" tag="p">
|
||||
<router-link slot="fullRules" :to="{ name: RouteName.RULES }">{{
|
||||
$t("full rules")
|
||||
}}</router-link>
|
||||
</i18n>
|
||||
</div>
|
||||
</div>
|
||||
<div class="column">
|
||||
@ -72,8 +75,26 @@
|
||||
/>
|
||||
</b-field>
|
||||
|
||||
<b-checkbox required>
|
||||
<i18n tag="span" path="I agree to the {instanceRules} and {termsOfService}">
|
||||
<router-link slot="instanceRules" :to="{ name: RouteName.RULES }">{{
|
||||
$t("instance rules")
|
||||
}}</router-link>
|
||||
<router-link slot="termsOfService" :to="{ name: RouteName.TERMS }">{{
|
||||
$t("terms of service")
|
||||
}}</router-link>
|
||||
</i18n>
|
||||
</b-checkbox>
|
||||
|
||||
<p class="control has-text-centered">
|
||||
<button class="button is-primary is-large">{{ $t("Register") }}</button>
|
||||
<b-button
|
||||
type="is-primary"
|
||||
size="is-large"
|
||||
:disabled="sendingForm"
|
||||
native-type="submit"
|
||||
>
|
||||
{{ $t("Register") }}
|
||||
</b-button>
|
||||
</p>
|
||||
<p class="control">
|
||||
<router-link
|
||||
@ -89,7 +110,6 @@
|
||||
name: RouteName.LOGIN,
|
||||
params: { email: credentials.email, password: credentials.password },
|
||||
}"
|
||||
:disabled="sendingValidation"
|
||||
>{{ $t("Login") }}</router-link
|
||||
>
|
||||
</p>
|
||||
@ -139,18 +159,16 @@ export default class Register extends Vue {
|
||||
|
||||
errors: object = {};
|
||||
|
||||
sendingValidation = false;
|
||||
|
||||
validationSent = false;
|
||||
sendingForm = false;
|
||||
|
||||
RouteName = RouteName;
|
||||
|
||||
config!: IConfig;
|
||||
|
||||
async submit() {
|
||||
this.sendingForm = true;
|
||||
this.credentials.locale = this.$i18n.locale;
|
||||
try {
|
||||
this.sendingValidation = true;
|
||||
this.errors = {};
|
||||
|
||||
await this.$apollo.mutate({
|
||||
@ -158,9 +176,7 @@ export default class Register extends Vue {
|
||||
variables: this.credentials,
|
||||
});
|
||||
|
||||
this.validationSent = true;
|
||||
|
||||
await this.$router.push({
|
||||
return this.$router.push({
|
||||
name: RouteName.REGISTER_PROFILE,
|
||||
params: { email: this.credentials.email },
|
||||
});
|
||||
@ -170,6 +186,7 @@ export default class Register extends Vue {
|
||||
acc[localError.details] = localError.message;
|
||||
return acc;
|
||||
}, {});
|
||||
this.sendingForm = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -158,7 +158,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
|
||||
registrations_open: Config.instance_registrations_open?(),
|
||||
instance_terms: Config.instance_terms(),
|
||||
instance_terms_type: Config.instance_terms_type(),
|
||||
instance_terms_url: Config.instance_terms_url()
|
||||
instance_terms_url: Config.instance_terms_url(),
|
||||
instance_rules: Config.instance_rules()
|
||||
}}
|
||||
end
|
||||
|
||||
|
||||
@ -106,7 +106,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Config do
|
||||
timezones: Tzdata.zone_list(),
|
||||
features: %{
|
||||
groups: Config.instance_group_feature_enabled?()
|
||||
}
|
||||
},
|
||||
rules: Config.instance_rules()
|
||||
}
|
||||
end
|
||||
end
|
||||
|
||||
@ -73,6 +73,7 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
|
||||
field(:instance_terms, :string)
|
||||
field(:instance_terms_type, :instance_terms_type)
|
||||
field(:instance_terms_url, :string)
|
||||
field(:instance_rules, :string)
|
||||
field(:registrations_open, :boolean)
|
||||
end
|
||||
|
||||
@ -148,6 +149,7 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
|
||||
arg(:instance_terms, :string)
|
||||
arg(:instance_terms_type, :instance_terms_type)
|
||||
arg(:instance_terms_url, :string)
|
||||
arg(:instance_rules, :string)
|
||||
arg(:registrations_open, :boolean)
|
||||
|
||||
resolve(&Admin.save_settings/3)
|
||||
|
||||
@ -28,6 +28,8 @@ defmodule Mobilizon.GraphQL.Schema.ConfigType do
|
||||
arg(:locale, :string, default_value: "en")
|
||||
resolve(&Config.terms/3)
|
||||
end
|
||||
|
||||
field(:rules, :string, description: "The instance's rules")
|
||||
end
|
||||
|
||||
object :terms do
|
||||
|
||||
@ -42,6 +42,11 @@ defmodule Mobilizon.Config do
|
||||
Mobilizon.Admin.get_admin_setting_value("instance", "instance_terms_url")
|
||||
end
|
||||
|
||||
@spec instance_rules :: String.t()
|
||||
def instance_rules do
|
||||
Mobilizon.Admin.get_admin_setting_value("instance", "instance_rules")
|
||||
end
|
||||
|
||||
@spec instance_version :: String.t()
|
||||
def instance_version, do: Mix.Project.config()[:version]
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user