Imrpove style
This commit is contained in:
1 parent
5cf45c2084
commit
a57fa574eb
6 files changed
+298
-117
No files matched your search
@@ -7,6 +7,7 @@ require_relative "lib/contact_form"
|
||||
require_relative "lib/contact_mailer"
|
||||
require_relative "lib/document_renderer"
|
||||
|
||||
# Application et plugins Roda
|
||||
class Netig < Roda
|
||||
plugin :render, escape: true
|
||||
plugin :public
|
||||
@@ -15,125 +16,18 @@ class Netig < Roda
|
||||
plugin :route_csrf, csrf_failure: :empty_403
|
||||
plugin :hash_branches
|
||||
plugin :flash
|
||||
end
|
||||
|
||||
plugin :rodauth do
|
||||
db DB
|
||||
# Authentification
|
||||
require_relative "config/rodauth"
|
||||
|
||||
enable :login, :logout, :create_account, :verify_account
|
||||
|
||||
domain ENV.fetch("RODAUTH_DOMAIN")
|
||||
|
||||
account_unverified_status_value 1
|
||||
account_open_status_value 2
|
||||
|
||||
base_url ENV.fetch("BASE_URL")
|
||||
hmac_secret ENV.fetch("RODAUTH_HMAC_SECRET")
|
||||
|
||||
email_from "NETig <noreply@netig.net>"
|
||||
|
||||
login_label "Adresse électronique"
|
||||
password_label "Mot de passe"
|
||||
login_button "Se connecter"
|
||||
|
||||
login_notice_flash "Vous êtes maintenant connecté."
|
||||
login_error_flash "La connexion a échoué."
|
||||
logout_notice_flash "Vous êtes maintenant déconnecté."
|
||||
|
||||
login_redirect "/temporary_page"
|
||||
login_return_to_requested_location? true
|
||||
|
||||
create_account_page_title "Créer un compte — NETig"
|
||||
create_account_button "Créer mon compte"
|
||||
create_account_link_text "Créer un compte"
|
||||
|
||||
verify_account_page_title "Vérifier votre adresse électronique — NETig"
|
||||
verify_account_button "Confirmer mon adresse électronique"
|
||||
verify_account_set_password? true
|
||||
|
||||
verify_account_email_subject "Confirmez votre adresse électronique — NETig"
|
||||
|
||||
verify_account_email_body do
|
||||
<<~EMAIL
|
||||
Bonjour,
|
||||
|
||||
Pour vérifier votre adresse électronique et activer votre compte
|
||||
NETig, ouvrez le lien suivant :
|
||||
|
||||
#{verify_account_email_link}
|
||||
|
||||
Si vous n'êtes pas à l'origine de cette demande, ignorez ce message.
|
||||
|
||||
L'équipe NETig
|
||||
EMAIL
|
||||
end
|
||||
|
||||
verify_account_email_sent_notice_flash(
|
||||
"Un courriel de vérification vient de vous être envoyé."
|
||||
)
|
||||
|
||||
verify_account_notice_flash(
|
||||
"Votre adresse électronique est maintenant vérifiée."
|
||||
)
|
||||
|
||||
before_create_account do
|
||||
case param("kind")
|
||||
when "individual"
|
||||
throw_error_status(
|
||||
422, "first_name", "doit être renseigné"
|
||||
) if param("first_name").to_s.strip.empty?
|
||||
|
||||
throw_error_status(
|
||||
422, "last_name", "doit être renseigné"
|
||||
) if param("last_name").to_s.strip.empty?
|
||||
|
||||
when "organization"
|
||||
throw_error_status(
|
||||
422, "organization_name", "doit être renseignée"
|
||||
) if param("organization_name").to_s.strip.empty?
|
||||
|
||||
else
|
||||
throw_error_status(
|
||||
422, "kind", "choisissez un type de compte"
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
after_create_account do
|
||||
member = if param("kind") == "individual"
|
||||
{
|
||||
kind: "individual",
|
||||
first_name: param("first_name").to_s.strip,
|
||||
last_name: param("last_name").to_s.strip,
|
||||
organization_name: nil
|
||||
}
|
||||
else
|
||||
{
|
||||
kind: "organization",
|
||||
first_name: nil,
|
||||
last_name: nil,
|
||||
organization_name: param("organization_name").to_s.strip
|
||||
}
|
||||
end
|
||||
|
||||
db[:members].insert(
|
||||
member.merge(
|
||||
account_id: account[:id],
|
||||
core_member: false
|
||||
)
|
||||
)
|
||||
end
|
||||
|
||||
already_logged_in do
|
||||
request.redirect("/")
|
||||
end
|
||||
|
||||
logout_redirect "/"
|
||||
end
|
||||
|
||||
require_relative "lib/authorization"
|
||||
require_relative "routes/noyau"
|
||||
require_relative "routes/contact"
|
||||
# Autorisations et routes secondaires
|
||||
require_relative "lib/authorization"
|
||||
require_relative "routes/noyau"
|
||||
require_relative "routes/contact"
|
||||
|
||||
# Routes principales
|
||||
class Netig
|
||||
route do |r|
|
||||
r.rodauth
|
||||
|
||||
@@ -141,11 +35,13 @@ class Netig < Roda
|
||||
check_csrf!
|
||||
r.hash_branches
|
||||
|
||||
# Accueil
|
||||
r.root do
|
||||
@canonical_url = "https://netig.net/"
|
||||
view "index"
|
||||
end
|
||||
|
||||
# Statuts
|
||||
r.get "statutes" do
|
||||
@page_title = "Statuts — NETig"
|
||||
@page_description = "Statuts de l'association NETig."
|
||||
@@ -156,6 +52,7 @@ class Netig < Roda
|
||||
view "document"
|
||||
end
|
||||
|
||||
# Mentions légales
|
||||
r.get "legal" do
|
||||
@page_title = "Mentions légales — NETig"
|
||||
@page_description = "Mentions légales de l'association NETig."
|
||||
@@ -166,6 +63,7 @@ class Netig < Roda
|
||||
view "document"
|
||||
end
|
||||
|
||||
# Page temporaire
|
||||
r.get "temporary_page" do
|
||||
@page_title = "Page temporaire — NETig"
|
||||
@page_description = "Cette page n'existe pas encore."
|
||||
|
||||
Reference in new issue
Block a user