cybele 1.8.0 → 1.9.0

data/templates/app/controllers/user/registrations_controller.rb

@@ -0,0 +1,20 @@
+class User::RegistrationsController < Devise::RegistrationsController
+  # layout 'user/application'
+  before_action :authenticate_user!, except: [:new, :create]
+  before_action :redirect_user, only: [:destroy]
+  add_breadcrumb I18n.t('activerecord.models.user'), :user_root_path
+
+  def edit
+  end
+
+  private
+
+  def redirect_user
+    redirect_to user_root_path
+  end
+
+  def after_update_path_for(resource)
+    user_root_path
+  end
+
+end

data/templates/app/controllers/user/sessions_controller.rb

@@ -0,0 +1,16 @@
+class User::SessionsController < Devise::SessionsController
+  # layout 'user/login'
+
+  private
+
+  # Overwriting the sign_out redirect path method
+  def after_sign_in_path_for(resource_or_scope)
+    user_root_path
+  end
+
+  # Overwriting the sign_out redirect path method
+  def after_sign_out_path_for(resource_or_scope)
+    new_user_session_path
+  end
+  
+end

data/templates/app/controllers/user/user_application_controller.rb

@@ -0,0 +1,20 @@
+require 'application_responder'
+
+class User::UserApplicationController < ActionController::Base
+
+  # layout 'user/application'
+  layout 'application'
+  before_filter :set_audit_user
+  before_action :authenticate_user!
+
+  self.responder = ApplicationResponder
+  respond_to :html, :json
+
+  private
+
+  def set_audit_user
+    # Set audit current user
+    Audited.current_user_method = :current_user
+  end
+
+end

data/templates/app/helpers/application_helper.rb.erb

@@ -0,0 +1,27 @@
+module ApplicationHelper
+
+  def get_countries
+    Country.all.map{|c| ["#{c.name}", c.id] }
+  end
+
+  def get_cities
+    City.all.map{|c| ["#{c.name}", c.id] }
+  end
+
+  def get_active_users
+    User.active.map{|c| ["#{c.email} - #{c.full_name}", c.id] }
+  end
+
+  def get_users
+    User.all.map{|c| ["#{c.email} - #{c.full_name}", c.id] }
+  end
+
+  def get_admins
+    Admin.all.map{|c| ["#{c.email} - #{c.full_name}", c.id] }
+  end
+
+  def get_audit_users
+    [[t('activerecord.models.admin'), 'Admin'], [t('activerecord.models.user'), 'User']]
+  end
+
+end

data/templates/app/mailers/admin_mailer.rb

@@ -0,0 +1,10 @@
+class AdminMailer < BaseMailer
+
+  def login_info(admin_id, password)
+    @admin      = Admin.find admin_id
+    @password   = password
+    @subject    = t('email.admin.login_info.title')
+    mail(to: @admin.email, subject: @subject)
+  end
+
+end

data/templates/app/mailers/base_mailer.rb

@@ -0,0 +1,4 @@
+class BaseMailer < ActionMailer::Base
+  default from: Settings.email.noreply
+  layout 'mailer'
+end

data/templates/app/mailers/user_mailer.rb

@@ -0,0 +1,10 @@
+class UserMailer < BaseMailer
+
+  def login_info(user_id, password)
+    @user      = User.find user_id
+    @password   = password
+    @subject    = t('email.user.login_info.title')
+    mail(to: @user.email, subject: @subject)
+  end
+
+end

data/templates/app/models/admin.rb

@@ -0,0 +1,51 @@
+class Admin < ActiveRecord::Base
+  # Virtual attributes
+  attr_accessor :is_generated_password
+
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable,
+         :async,
+         :recoverable,
+         :rememberable,
+         :trackable,
+         :validatable
+
+  # Helpers
+  audited except: [:password]
+
+  # Validations
+  validates_presence_of :name, :email, :surname
+  validates :email, uniqueness: true
+
+  # Callbacks
+  after_commit :send_login_info, on: :create
+  before_validation :create_password, on: :create
+  after_initialize do |obj|
+    obj.is_generated_password = false
+  end
+
+  def active_for_authentication?
+    super && self.is_active
+  end
+
+  def full_name
+    "#{self.name} #{self.surname}"
+  end
+
+  private
+
+  def create_password
+    if self.password.nil?
+      password                    = Devise.friendly_token.first(8)
+      self.password               = password
+      self.password_confirmation  = password
+      self.is_generated_password  = true
+    end
+  end
+
+  def send_login_info
+    AdminMailer.login_info(self.id, self.password).deliver_later! if self.is_generated_password
+  end
+
+end

data/templates/app/models/audit.rb

@@ -0,0 +1,3 @@
+class Audit < Audited::Adapters::ActiveRecord::Audit
+
+end

data/templates/app/models/city.rb

@@ -0,0 +1,12 @@
+class City < ActiveRecord::Base
+
+  # Helpers
+  audited
+
+  # Relations
+  belongs_to :country
+
+  # Validations
+  validates_presence_of :name, :country_id
+
+end

data/templates/app/models/country.rb

@@ -0,0 +1,12 @@
+class Country < ActiveRecord::Base
+
+  # Helpers
+  audited
+
+  # Relations
+  has_many :cities, dependent: :restrict_with_error
+
+  # Validations
+  validates_presence_of :name
+
+end

data/templates/app/models/user.rb

@@ -0,0 +1,54 @@
+class User < ActiveRecord::Base
+  # Virtual attributes
+  attr_accessor :is_generated_password
+
+  # Scopes
+  scope :active, -> { where(is_active: true) }
+
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable,
+         :registerable,
+         :async,
+         :recoverable,
+         :rememberable,
+         :trackable,
+         :validatable
+
+  # Helpers
+  audited except: [:password]
+
+  # Validations
+  validates_presence_of :name, :email, :surname
+  validates :email, uniqueness: true
+
+  # Callbacks
+  after_commit :send_login_info, on: :create
+  before_validation :create_password, on: :create
+  after_initialize do |obj|
+    obj.is_generated_password = false
+  end
+
+  def active_for_authentication?
+    super && self.is_active
+  end
+
+  def full_name
+    "#{self.name} #{self.surname}"
+  end
+
+  private
+
+  def create_password
+    if self.password.nil?
+      password                    = Devise.friendly_token.first(8)
+      self.password               = password
+      self.password_confirmation  = password
+      self.is_generated_password  = true
+    end
+  end
+
+  def send_login_info
+    UserMailer.login_info(self.id, self.password).deliver_later! if self.is_generated_password
+  end
+end

data/templates/app/views/admin_mailer/login_info.html.haml

@@ -0,0 +1,13 @@
+%h2= t('email.hello')
+
+%p= t('email.admin.login_info.first_info')
+%p= "#{t('email.admin.login_info.second_info')} :"
+%p
+  %strong= "#{t('activerecord.attributes.admin.email')} :"
+  = @admin.email
+%p
+  %strong=  "#{t('activerecord.attributes.admin.password')} :"
+  = @password
+%p= link_to t('email.admin.login_info.btn_login'), new_admin_session_url
+
+%p= t('email.admin.login_info.last_info', link: new_admin_session_url ).html_safe

data/templates/app/views/devise/confirmations/new.html.haml

@@ -1,9 +1,10 @@
-%h2 Resend confirmation instructions
-= simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f|
+%h2
+  = t('devise.confirmation.new.title')
+= simple_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
   = f.error_notification
   = f.full_error :confirmation_token
   .form-inputs
-    = f.input :email, :required => true, :autofocus => true
+    = f.input :email, required: true, autofocus: true
   .form-actions
-    = f.button :submit, "Resend confirmation instructions"
-= render "devise/shared/links"
+    = f.button :submit, t('devise.confirmation.btn.resend'), class: 'btn btn-primary'
+= render 'devise/shared/links'

data/templates/app/views/devise/mailer/confirmation_instructions.html.haml

@@ -1,4 +1,6 @@
 %p
-  Welcome #{@email}!
-%p You can confirm your account email through the link below:
-%p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
+  = t( 'email.salut', user: @resource.email )
+%p
+  = "#{t( 'email.devise.confirmation_instruction.desc1')} :"
+%p
+  = link_to t( 'email.devise.confirmation_instruction.btn_confirm'), confirmation_url(@resource, confirmation_token: @token)

data/templates/app/views/devise/mailer/reset_password_instructions.html.haml

@@ -1,8 +1,8 @@
 %p
-  = t( 'email.salut', email: @resource.email )
+  = t( 'email.salut', user: @resource.email )
 %p
   = t( 'email.devise.reset_password.desc1')
-%p= link_to t( 'email.devise.reset_password.change'), edit_password_url(@resource, :reset_password_token => @token)
+%p= link_to t( 'email.devise.reset_password.change'), edit_password_url(@resource, reset_password_token: @token)
 %p
   = t( 'email.devise.reset_password.desc2')
 %p

data/templates/app/views/devise/passwords/edit.html.haml

@@ -1,11 +1,11 @@
 %h2= t('devise.password.edit.title')
-= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
   = f.error_notification
-  = f.input :reset_password_token, :as => :hidden
+  = f.input :reset_password_token, as: :hidden
   = f.full_error :reset_password_token
   .form-inputs
     = f.input :password, label: t('devise.password.edit.new_password'), required: true, autofocus: true
     = f.input :password_confirmation, label: t('devise.password.edit.confirmation'), required: true
   .form-actions
     = f.button :submit, t('devise.password.edit.button'), class: 'btn btn-primary'
-= render "devise/shared/links"
+= render 'devise/shared/links'

data/templates/app/views/devise/passwords/new.html.haml

@@ -1,9 +1,9 @@
 %h2= t('devise.password.reset.title')
-= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
+= simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
   = f.error_notification
   .form-inputs
-    = f.input :email, :required => true, :autofocus => true
+    = f.input :email, required: true, autofocus: true
   .form-actions
     = f.button :submit, t('devise.password.reset.instructions'), class: 'btn btn-primary'
 %br
-= render "devise/shared/links"
+= render 'devise/shared/links'

data/templates/app/views/devise/registrations/edit.html.haml

@@ -1,18 +1,12 @@
 %h2
   = t('devise.registration.title', model: resource.class.model_name.human )
-= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
   = f.error_notification
   .form-inputs
-    = f.input :email, :required => true, :autofocus => true
-    - if devise_mapping.confirmable? && resource.pending_reconfirmation?
-      %p
-        Currently waiting confirmation for: #{resource.unconfirmed_email}
-    = f.input :password, :autocomplete => "off", hint: t('devise.registration.hint_password'), :required => false
-    = f.input :password_confirmation, :required => false
-    = f.input :current_password, hint: t('devise.registration.hint_current_password'), :required => true
+    = f.input :email, required: true, autofocus: true
+    = f.input :password, autocomplete: 'off', hint: t('devise.registration.hint_password'), required: false
+    = f.input :password_confirmation, required: false
+    = f.input :current_password, hint: t('devise.registration.hint_current_password'), required: true
   .form-actions
     = f.button :submit, t('btn.update'), class: 'btn btn-primary'
-%h3 Cancel my account
-%p
-  Unhappy? #{link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete}
 = link_to t('btn.back'), :back

data/templates/app/views/devise/registrations/new.html.haml

@@ -1,12 +1,24 @@
 %h2
   = t('devise.registration.new.title', model: resource.class.model_name.human)
-= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
+%hr/
+- if devise_mapping.omniauthable?
+  - resource_class.omniauth_providers.each do |provider|
+    = link_to omniauth_authorize_path(resource_name, provider), class: 'btn btn-lg btn-primary btn-block' do
+      %i.fa.fa-facebook
+      = t('devise.shared.links.signup_with', name: provider.to_s.titleize)
+  %hr/
+  %h3.text-center
+    = t('view.or')
+  %hr/
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
   = f.error_notification
   .form-inputs
-    = f.input :name, :autofocus => true
-    = f.input :email, :required => true
-    = f.input :password, :required => true
-    = f.input :password_confirmation, :required => true
+    = f.input :email
+    = f.input :password
+    = f.input :password_confirmation
+    = f.input :name
+    = f.input :surname
+    = f.input :time_zone, input_html: { class: 'chosen-select'}, include_blank: t('view.select')
   .form-actions
     = f.button :submit, t('devise.registration.new.button'), class: 'btn btn-primary'
-= render "devise/shared/links"
+= render 'devise/shared/links'

data/templates/app/views/devise/sessions/new.html.haml

@@ -7,4 +7,4 @@
     = f.input :remember_me, label: t('devise.session.remember_me'), as: :boolean if devise_mapping.rememberable?
   .form-actions
     = f.button :submit, t('devise.session.button'), class: 'btn btn-primary'
-= render "devise/shared/links"
+= render 'devise/shared/links'

data/templates/app/views/devise/shared/_links.haml

@@ -17,4 +17,6 @@
 - if devise_mapping.omniauthable?
   - resource_class.omniauth_providers.each do |provider|
     = link_to  t('devise.shared.links.signin_with', name: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider)
-    %br/
+    %br/
+= link_to t('navbar.home_page'), root_path
+%br/

data/templates/app/views/devise/unlocks/new.html.haml

@@ -1,9 +1,9 @@
 %h2 Resend unlock instructions
-= simple_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f|
+= simple_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
   = f.error_notification
   = f.full_error :unlock_token
   .form-inputs
-    = f.input :email, :required => true, :autofocus => true
+    = f.input :email, required: true, autofocus: true
   .form-actions
-    = f.button :submit, "Resend unlock instructions"
-= render "devise/shared/links"
+    = f.button :submit, 'Resend unlock instructions'
+= render 'devise/shared/links'

data/templates/app/views/hq/admins/_admin.html.haml

@@ -0,0 +1,21 @@
+%tr{class: admin.is_active ? 'active' : 'passive'}
+  %td= admin.id
+  %td= admin.full_name
+  %td= mail_to admin.email, admin.email
+  %td=l admin.current_sign_in_at if admin.current_sign_in_at.present?
+  %td=l admin.last_sign_in_at if admin.last_sign_in_at.present?
+  %td= admin.is_active ? t('view.active') : t('view.passive')
+  %td.action
+    = link_to([:hq, admin], class: 'btn btn-success', data: { toggle: :tooltip}, title: t('tooltips.zoom')) do
+      %i.icon-zoom-in
+    = link_to(edit_hq_admin_path(admin) , class: 'btn btn-info', data: { toggle: :tooltip }, title: t('tooltips.edit')) do
+      %i.icon-edit
+    - if admin.id != current_admin.id
+      = link_to([:hq, admin], class: 'btn btn-danger', method: :delete, data: { confirm: t('tooltips.are_you_sure'), toggle: :tooltip }, title: t('tooltips.delete')) do
+        %i.icon-trash
+      - if admin.is_active
+        = link_to(toggle_is_active_hq_admin_path(admin), class: 'btn btn-danger', method: :post, data: { toggle: :tooltip}, title: t('view.make_passive') ) do
+          %i.icon-ban-circle
+      - else
+        = link_to(toggle_is_active_hq_admin_path(admin), class: 'btn btn-info', method: :post, data: { toggle: :tooltip}, title: t('view.make_active')) do
+          %i.icon-check