lato 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebadfc10ff6859504e6fe1c2b62134c7f082ecfb1ebbdb44b8e9b100d74b0e83
-  data.tar.gz: db6025f3b928e555f05ec3e34de73ad98ae588b4a8bb979a80a2ac089a445c0b
+  metadata.gz: 9de0f3c577de71281285308e350bed0073176c965ebf547b2f25444b878c1d08
+  data.tar.gz: 3af1560ba719db9e0c70207691390bdc5f531753e6f03c7c68c26fbc9956a2cc
 SHA512:
-  metadata.gz: ded2d5b2277f408fa562c99d426932f29575adeea27d8f80730db8eab7b50227147cae213c12b7bdea78c892e67e1e5c33d749458429414a7c33328cddf7fdeb
-  data.tar.gz: 8050c958de0bdf551f3f6210823acc8969e62a55405cccddccc32f75091a5396c8d6bd1967d6bc70387baf2d50441d70a1b67dce823a1337f4a22afab4a433d3
+  metadata.gz: 7881dc95427a4bc0dd67a1639acb8522f68dcbda8fc03cbe435e4bc1ccfdd6012b55eedb445f37e9ccc1e43b400e27290379396cb749d700f518eb1bb7c1c454
+  data.tar.gz: a50fef0983d22202e8b82a5981bddac638d2adcacf0399bd34c7f0fe188fb0e9cb15583c9b3977cc723714bc50bb4315394498722cb349730376351419af53cd

data/app/controllers/lato/authentication_controller.rb

@@ -5,6 +5,7 @@ module Lato
     before_action :find_user, only: %i[verify_email verify_email_action update_password update_password_action]
     before_action :hide_sidebar
     before_action :lock_signup_if_disabled, only: %i[signup signup_action]
+    before_action :lock_recover_password_if_disabled, only: %i[recover_password recover_password_action update_password update_password_action]
 
     def signin
       @user = Lato::User.new
@@ -117,5 +118,11 @@ module Lato
 
       respond_to_with_404 
     end
+
+    def lock_recover_password_if_disabled
+      return unless Lato.config.auth_disable_recover_password
+
+      respond_to_with_404 
+    end
   end
 end

data/app/helpers/lato/components_helper.rb

@@ -111,7 +111,7 @@ module Lato
       end
 
       content_tag :div, options do
-        concat content_tag(:span, 'Si sono verificati i seguenti errori:')
+        concat content_tag(:span, "#{I18n.t('labels.there_are_some_errors')}:")
         concat errors_list
         concat button_tag('', type: 'button', class: 'btn-close', data: { bs_dismiss: 'alert' }) unless options[:fixed]
       end

data/app/models/lato/user.rb

@@ -118,7 +118,7 @@ module Lato
 
     def destroy_with_confirmation(params)
       unless params[:email_confirmation] == email
-        errors.add(:email, 'non corretto')
+        errors.add(:email, :not_correct)
         return
       end
 
@@ -128,7 +128,7 @@ module Lato
     def request_recover_password(params)
       user = Lato::User.find_by(email: params[:email])
       unless user
-        errors.add(:email, 'non registrato')
+        errors.add(:email, :not_registered)
         return
       end
 

data/app/views/lato/authentication/_form-recover-password.html.erb

@@ -9,12 +9,12 @@ user ||= Lato::User.new
     <%= lato_form_errors user, class: %w[mb-3] %>
 
     <div class="mb-3">
-      <%= lato_form_item_label form, :email, 'Inserisci la tua email' %>
+      <%= lato_form_item_label form, :email %>
       <%= lato_form_item_input_email form, :email, required: true %>
     </div>
 
     <div>
-      <%= lato_form_submit form, 'Prosegui', class: %w[d-block w-100] %>
+      <%= lato_form_submit form, I18n.t('labels.next'), class: %w[d-block w-100] %>
     </div>
   <% end %>
 <% end %>

data/app/views/lato/authentication/_form-signin.html.erb

@@ -10,21 +10,21 @@ user ||= Lato::User.new
     <%= lato_form_errors user, class: %w[mb-3] %>
     
     <div class="mb-3">
-      <%= lato_form_item_label form, :email, 'Email' %>
+      <%= lato_form_item_label form, :email %>
       <%= lato_form_item_input_email form, :email, required: true %>
     </div>
 
     <div class="mb-3">
-      <%= lato_form_item_label form, :password, 'Password' %>
+      <%= lato_form_item_label form, :password %>
       <%= lato_form_item_input_password form, :password, required: true %>
     </div>
 
     <div>
-      <%= lato_form_submit form, 'Accedi', class: %w[d-block w-100] %>
+      <%= lato_form_submit form, I18n.t('labels.signin'), class: %w[d-block w-100] %>
     </div>
     <% unless Lato.config.auth_disable_signup %>
       <div class="text-center mt-3 mb-3">
-        oppure <%= link_to 'crea un account gratuito', lato.authentication_signup_path %>
+        <%= I18n.t('labels.or').downcase %> <%= link_to I18n.t('labels.create_free_account').downcase, lato.authentication_signup_path %>
       </div>
     <% end %>
   <% end %>

data/app/views/lato/authentication/_form-signup.html.erb

@@ -10,38 +10,38 @@ user ||= Lato::User.new
     
     <div class="row">
       <div class="col col-12 col-md-6 mb-3">
-        <%= lato_form_item_label form, :first_name, 'Nome' %>
+        <%= lato_form_item_label form, :first_name %>
         <%= lato_form_item_input_text form, :first_name, required: true %>
       </div>
 
       <div class="col col-12 col-md-6 mb-3">
-        <%= lato_form_item_label form, :last_name, 'Cognome' %>
+        <%= lato_form_item_label form, :last_name %>
         <%= lato_form_item_input_text form, :last_name, required: true %>
       </div>
 
       <div class="col col-12 mb-3">
-        <%= lato_form_item_label form, :email, 'Email' %>
+        <%= lato_form_item_label form, :email %>
         <%= lato_form_item_input_email form, :email, required: true %>
       </div>
 
       <div class="col col-12 col-md-6 mb-3">
-        <%= lato_form_item_label form, :password, 'Password' %>
+        <%= lato_form_item_label form, :password %>
         <%= lato_form_item_input_password form, :password, required: true %>
       </div>
 
       <div class="col col-12 col-md-6 mb-3">
-        <%= lato_form_item_label form, :password_confirmation, 'Conferma password' %>
+        <%= lato_form_item_label form, :password_confirmation %>
         <%= lato_form_item_input_password form, :password_confirmation, required: true %>
       </div>
     </div>
 
     <div class="mb-3 text-muted" style="font-size: 14px;">
-      <%= lato_form_item_input_check form, :accepted_privacy_policy_version, "Dichiaro di aver letto e accettato la <a href=#{Lato.config.legal_privacy_policy_url} target=_blank>privacy policy</a>.", required: true %>
-      <%= lato_form_item_input_check form, :accepted_terms_and_conditions_version, "Dichiaro di aver letto e accettato i <a href=#{Lato.config.legal_terms_and_conditions_url} target=_blank>termini e condizioni</a> di utilizzo.", required: true %>
+      <%= lato_form_item_input_check form, :accepted_privacy_policy_version, I18n.t('labels.privacy_policy_checkbox', link: link_to(I18n.t('labels.privacy_policy'), Lato.config.legal_privacy_policy_url)), required: true %>
+      <%= lato_form_item_input_check form, :accepted_terms_and_conditions_version, I18n.t('labels.terms_and_conditions_checkbox', link: link_to(I18n.t('labels.terms_and_conditions'), Lato.config.legal_terms_and_conditions_url)), required: true %>
     </div>
 
     <div class="d-flex justify-content-end">
-      <%= lato_form_submit form, 'Registrati' %>
+      <%= lato_form_submit form, I18n.t('labels.signup') %>
     </div>
   <% end %>
 <% end %>

data/app/views/lato/authentication/_form-update-password.html.erb

@@ -24,7 +24,7 @@ user ||= Lato::User.new
     </div>
 
     <div class="d-flex justify-content-end">
-      <%= lato_form_submit form, 'Conferma' %>
+      <%= lato_form_submit form, I18n.t('labels.confirm') %>
     </div>
   <% end %>
 <% end %>

data/app/views/lato/authentication/recover_password.html.erb

@@ -1,13 +1,13 @@
 <div class="w-100 h-100 d-flex justify-content-center align-items-center" style="min-height: calc(100vh - 54px - 2rem)">
   <div class="card w-100" style="max-width: 400px">
     <div class="card-header">
-      <h1 class="fs-3 mb-0 text-center">Recupero password</h1>
+      <h1 class="fs-3 mb-0 text-center"><%= I18n.t('labels.recover_password') %></h1>
     </div>
     <div class="card-body">
       <%= render 'lato/authentication/form-recover-password', user: @user %>
     </div>
     <div class="card-footer text-center">
-      <%= link_to 'Torna al login', lato.authentication_signin_path, class: 'text-muted' %>
+      <%= link_to I18n.t('labels.back_to_login'), lato.authentication_signin_path, class: 'text-muted' %>
     </div>
   </div>
 </div>

data/app/views/lato/authentication/signin.html.erb

@@ -1,13 +1,15 @@
 <div class="w-100 h-100 d-flex justify-content-center align-items-center" style="min-height: calc(100vh - 54px - 2rem)">
   <div class="card w-100" style="max-width: 400px">
     <div class="card-header">
-      <h1 class="fs-3 mb-0 text-center">Accedi</h1>
+      <h1 class="fs-3 mb-0 text-center"><%= I18n.t('labels.signin') %></h1>
     </div>
     <div class="card-body">
       <%= render 'lato/authentication/form-signin', user: @user %>
     </div>
-    <div class="card-footer text-center">
-      <%= link_to 'Hai dimenticato la password?', lato.authentication_recover_password_path, class: 'text-muted' %>
-    </div>
+    <% unless Lato.config.auth_disable_recover_password %>
+      <div class="card-footer text-center">
+        <%= link_to I18n.t('labels.forgot_your_password?'), lato.authentication_recover_password_path, class: 'text-muted' %>
+      </div>
+    <% end %>
   </div>
 </div>

data/app/views/lato/authentication/signup.html.erb

@@ -1,13 +1,13 @@
 <div class="w-100 h-100 d-flex justify-content-center align-items-center" style="min-height: calc(100vh - 54px - 2rem)">
   <div class="card w-100" style="max-width: 550px">
     <div class="card-header">
-      <h1 class="fs-3 mb-0 text-center">Registrati</h1>
+      <h1 class="fs-3 mb-0 text-center"><%= I18n.t('labels.signup') %></h1>
     </div>
     <div class="card-body">
       <%= render 'lato/authentication/form-signup', user: @user %>
     </div>
     <div class="card-footer">
-      <%= link_to 'Hai già un account?', lato.authentication_signin_path, class: 'text-muted' %>
+      <%= link_to I18n.t('labels.already_have_an_account?'), lato.authentication_signin_path, class: 'text-muted' %>
     </div>
   </div>
 </div>

data/app/views/lato/authentication/update_password.html.erb

@@ -1,13 +1,13 @@
 <div class="w-100 h-100 d-flex justify-content-center align-items-center" style="min-height: calc(100vh - 54px - 2rem)">
   <div class="card w-100" style="max-width: 400px">
     <div class="card-header">
-      <h1 class="fs-3 mb-0 text-center">Aggiornamento password</h1>
+      <h1 class="fs-3 mb-0 text-center"><%= I18n.t('labels.update_password') %></h1>
     </div>
     <div class="card-body">
       <%= render 'lato/authentication/form-update-password', user: @user %>
     </div>
     <div class="card-footer text-center">
-      <%= link_to 'Torna al login', lato.authentication_signin_path, class: 'text-muted' %>
+      <%= link_to I18n.t('labels.back_to_login'), lato.authentication_signin_path, class: 'text-muted' %>
     </div>
   </div>
 </div>

data/app/views/layouts/lato/_footer.html.erb

@@ -4,8 +4,8 @@
       © <%= Date.today.year %> - <%= link_to  Lato.config.application_company_name,  Lato.config.application_company_url, target: '_blank' %>
     </div>
     <div class="mt-2 mt-md-0">
-      <%= link_to 'Privacy policy', Lato.config.legal_privacy_policy_url %> -
-      <%= link_to 'Termini e condizioni', Lato.config.legal_terms_and_conditions_url %>
+      <%= link_to I18n.t('labels.privacy_policy'), Lato.config.legal_privacy_policy_url %> -
+      <%= link_to I18n.t('labels.terms_and_conditions'), Lato.config.legal_terms_and_conditions_url %>
     </div>
   </div>
 </div>

data/app/views/layouts/lato/_navbar-nav_content.html.erb

@@ -1,15 +1,15 @@
 <% if @session.valid? %>
   <%= lato_navbar_nav_item :account, lato.account_path do %>
-    Account
+    <%= I18n.t('labels.account') %>
   <% end %>
   <%= lato_navbar_nav_item :authentication_logout, lato.authentication_signout_path do %>
-    Esci
+    <%= I18n.t('labels.signout') %>
   <% end %>
 <% else %>
   <%= lato_navbar_nav_item :authentication_signin, lato.authentication_signin_path do %>
-    Accedi
+    <%= I18n.t('labels.signin') %>
   <% end %>
   <%= lato_navbar_nav_item :authentication_signup, lato.authentication_signup_path do %>
-    Registrati
+    <%= I18n.t('labels.signup') %>
   <% end %>
 <% end %>

data/config/locales/en.yml

@@ -1,4 +1,23 @@
 en:
+  labels:
+    account: Account
+    signout: Logout
+    signin: Login
+    signup: Signup
+    forgot_your_password?: Forgot your password?
+    already_have_an_account?: Already have an account?
+    or: Or
+    create_free_account: Create free account
+    privacy_policy: Privacy policy
+    privacy_policy_checkbox: I accept the %{link}
+    terms_and_conditions: Terms and conditions
+    terms_and_conditions_checkbox: I accept the %{link}
+    recover_password: Recover password
+    next: Next
+    back_to_login: Back to login
+    there_are_some_errors: There are some errors
+    update_password: Update password
+    confirm: Confirm
   activerecord:
     attributes:
       lato/user:
@@ -8,10 +27,15 @@ en:
         email: Email
         accepted_privacy_policy_version: Privacy policy
         accepted_terms_and_conditions_version: Terms and conditions
+    errors:
       models:
         lato/user:
           attributes:
+            email:
+              taken: already used with another account
+              not_registered: not registered
+              not_correct: not correct
             accepted_privacy_policy_version:
               inclusion: not accepted
             accepted_terms_and_conditions_version:
-              inclusion: not accepted
+              inclusion: not accepted

data/config/locales/it.yml

@@ -1,6 +1,25 @@
 # Start from: https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/it.yml
 
 it:
+  labels:
+    account: Account
+    signout: Esci
+    signin: Accedi
+    signup: Registrati
+    forgot_your_password?: Hai dimenticato la password?
+    already_have_an_account?: Hai già un account?
+    or: Oppure
+    create_free_account: Crea un account gratuito
+    privacy_policy: Privacy policy
+    privacy_policy_checkbox: Dichiaro di aver letto e accettato la %{link}
+    terms_and_conditions: Termini e condizioni
+    terms_and_conditions_checkbox: Dichiaro di aver letto e accettato i %{link} di utilizzo
+    recover_password: Recupero password
+    next: Prosegui
+    back_to_login: Torna al login
+    there_are_some_errors: Si sono verificati i seguenti errori
+    update_password: Aggiornamento password
+    confirm: Conferma
   activerecord:
     attributes:
       lato/user:
@@ -23,6 +42,8 @@ it:
               confirmation: non corrisponde alla password
             email:
               taken: già utilizzato da un altro account
+              not_registered: non registrata
+              not_correct: non corretta
             accepted_privacy_policy_version:
               inclusion: non accettata
             accepted_terms_and_conditions_version:

data/lib/lato/config.rb

@@ -10,7 +10,7 @@ module Lato
     attr_accessor :session_lifetime, :session_root_path
 
     # Authentication configs
-    attr_accessor :auth_disable_signup
+    attr_accessor :auth_disable_signup, :auth_disable_recover_password
 
     # Assets configs
     attr_accessor :assets_stylesheet_entry
@@ -27,6 +27,7 @@ module Lato
       @application_company_url = 'https://github.com/Lato-GAM'
 
       @auth_disable_signup = false
+      @auth_disable_recover_password = false
 
       @assets_stylesheet_entry = 'application'
 

data/lib/lato/version.rb

@@ -1,3 +1,3 @@
 module Lato
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lato
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Gregorio Galante