Merge branch 'improve-registration-page' into 'master'

Improve registration page and add a rules option

See merge request framasoft/mobilizon!467

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
 

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

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)

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

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]