diff --git a/js/src/views/Rules.vue b/js/src/views/Rules.vue
new file mode 100644
index 000000000..f8a48f2d8
--- /dev/null
+++ b/js/src/views/Rules.vue
@@ -0,0 +1,35 @@
+
+
+
{{ $t("Rules") }}
+
+
{{ $t("No rules defined yet.") }}
+
+
+
+
diff --git a/js/src/views/User/Register.vue b/js/src/views/User/Register.vue
index 492e4d0c9..abe9ce3a0 100644
--- a/js/src/views/User/Register.vue
+++ b/js/src/views/User/Register.vue
@@ -3,6 +3,12 @@
@@ -22,15 +28,12 @@
{{ $t("About this instance") }}
-
-
{{ $t("Your local administrator resumed its policy:") }}
-
- {{ $t("Enjoy discovering Mobilizon!") }}
-
-
-
-
-
+
+
+ {{
+ $t("full rules")
+ }}
+
@@ -72,8 +75,26 @@
/>
+
+
+ {{
+ $t("instance rules")
+ }}
+ {{
+ $t("terms of service")
+ }}
+
+
+
- {{ $t("Register") }}
+
+ {{ $t("Register") }}
+
{{ $t("Login") }}
@@ -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;
}
}
}
diff --git a/lib/graphql/resolvers/admin.ex b/lib/graphql/resolvers/admin.ex
index a179da2be..e0c10346a 100644
--- a/lib/graphql/resolvers/admin.ex
+++ b/lib/graphql/resolvers/admin.ex
@@ -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
diff --git a/lib/graphql/resolvers/config.ex b/lib/graphql/resolvers/config.ex
index 53c704391..44ddb3864 100644
--- a/lib/graphql/resolvers/config.ex
+++ b/lib/graphql/resolvers/config.ex
@@ -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
diff --git a/lib/graphql/schema/admin.ex b/lib/graphql/schema/admin.ex
index e0be917de..99ac6f238 100644
--- a/lib/graphql/schema/admin.ex
+++ b/lib/graphql/schema/admin.ex
@@ -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)
diff --git a/lib/graphql/schema/config.ex b/lib/graphql/schema/config.ex
index 17ddd8233..19b390191 100644
--- a/lib/graphql/schema/config.ex
+++ b/lib/graphql/schema/config.ex
@@ -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
diff --git a/lib/mobilizon/config.ex b/lib/mobilizon/config.ex
index 8fdd79526..0b4a97f70 100644
--- a/lib/mobilizon/config.ex
+++ b/lib/mobilizon/config.ex
@@ -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]